From e7307d969c66c8322d05f4e71209e542196f0dd0 Mon Sep 17 00:00:00 2001
From: Cats Juice <wp1298554944@hotmail.com>
Date: Thu, 25 Jan 2024 05:33:57 +0000
Subject: [PATCH] chore(core): remove journal experimental flag (#5698)

---
 packages/common/env/src/global.ts                         | 1 -
 packages/frontend/core/.webpack/runtime-config.ts         | 8 --------
 .../core/src/components/root-app-sidebar/index.tsx        | 8 +++-----
 packages/frontend/core/src/hooks/use-journal.ts           | 1 -
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/packages/common/env/src/global.ts b/packages/common/env/src/global.ts
index bc111b845..0f05b45d8 100644
--- a/packages/common/env/src/global.ts
+++ b/packages/common/env/src/global.ts
@@ -30,7 +30,6 @@ export const runtimeFlagsSchema = z.object({
   enableEnhanceShareMode: z.boolean(),
   enablePayment: z.boolean(),
   enablePageHistory: z.boolean(),
-  enableJournal: z.boolean(),
   // this is for the electron app
   serverUrlPrefix: z.string(),
   enableMoveDatabase: z.boolean(),
diff --git a/packages/frontend/core/.webpack/runtime-config.ts b/packages/frontend/core/.webpack/runtime-config.ts
index 2094657c5..6c4910ac6 100644
--- a/packages/frontend/core/.webpack/runtime-config.ts
+++ b/packages/frontend/core/.webpack/runtime-config.ts
@@ -31,7 +31,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
       enableEnhanceShareMode: false,
       enablePayment: true,
       enablePageHistory: true,
-      enableJournal: false,
       serverUrlPrefix: 'https://app.affine.pro',
       editorFlags,
       appVersion: packageJson.version,
@@ -42,7 +41,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
       return {
         ...this.stable,
         enablePageHistory: true,
-        enableJournal: false,
         serverUrlPrefix: 'https://insider.affine.pro',
         appBuildType: 'beta' as const,
       };
@@ -74,7 +72,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
       enableEnhanceShareMode: false,
       enablePayment: true,
       enablePageHistory: true,
-      enableJournal: true,
       serverUrlPrefix: 'https://affine.fail',
       editorFlags,
       appVersion: packageJson.version,
@@ -138,11 +135,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
       : buildFlags.mode === 'development'
         ? true
         : currentBuildPreset.enablePageHistory,
-    enableJournal: process.env.ENABLE_JOURNAL
-      ? process.env.ENABLE_JOURNAL === 'true'
-      : buildFlags.mode === 'development'
-        ? true
-        : currentBuildPreset.enableJournal,
   };
 
   if (buildFlags.mode === 'development') {
diff --git a/packages/frontend/core/src/components/root-app-sidebar/index.tsx b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
index 50cc07593..3e888fe86 100644
--- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx
+++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx
@@ -255,11 +255,9 @@ export const RootAppSidebar = ({
             {t['com.affine.workspaceSubPath.all']()}
           </span>
         </RouteMenuLinkItem>
-        {runtimeConfig.enableJournal ? (
-          <AppSidebarJournalButton
-            workspace={currentWorkspace.blockSuiteWorkspace}
-          />
-        ) : null}
+        <AppSidebarJournalButton
+          workspace={currentWorkspace.blockSuiteWorkspace}
+        />
         {runtimeConfig.enableNewSettingModal ? (
           <MenuItem
             data-testid="slider-bar-workspace-setting-button"
diff --git a/packages/frontend/core/src/hooks/use-journal.ts b/packages/frontend/core/src/hooks/use-journal.ts
index 646f692a0..f02a5d8bc 100644
--- a/packages/frontend/core/src/hooks/use-journal.ts
+++ b/packages/frontend/core/src/hooks/use-journal.ts
@@ -12,7 +12,6 @@ type MaybeDate = Date | string | number;
 export const JOURNAL_DATE_FORMAT = 'YYYY-MM-DD';
 
 function isJournalString(j?: string | false) {
-  if (!runtimeConfig.enableJournal) return false;
   return j ? !!j?.match(/^\d{4}-\d{2}-\d{2}$/) : false;
 }