refactor(core): move editor settings flag from runtime config to Feat…

…ureFlagService
toeverything · Aug 21, 2024 · 5af885b · 5af885b
1 parent cb41884
commit 5af885b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/packages/common/env/src/global.ts b/packages/common/env/src/global.ts
@@ -32,7 +32,6 @@ export const runtimeFlagsSchema = z.object({
   enableInfoModal: z.boolean(),
   enableOrganize: z.boolean(),
   enableThemeEditor: z.boolean(),
-  enableEditorSettings: z.boolean(),
 });
 
 export type RuntimeConfig = z.infer<typeof runtimeFlagsSchema>;

diff --git a/packages/common/infra/src/modules/feature-flag/constant.ts b/packages/common/infra/src/modules/feature-flag/constant.ts
@@ -91,6 +91,13 @@ export const AFFINE_FLAGS = {
     configurable: true,
     defaultState: false,
   },
+  enable_editor_settings: {
+    category: 'affine',
+    displayName: 'Editor Settings',
+    description: 'Enables editor settings.',
+    configurable: isCanaryBuild,
+    defaultState: false,
+  },
 } satisfies { [key in string]: FlagInfo };
 
 export type AFFINE_FLAGS = typeof AFFINE_FLAGS;
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx
@@ -7,7 +7,11 @@ import {
   InformationIcon,
   KeyboardIcon,
 } from '@blocksuite/icons/rc';
-import { useLiveData, useServices } from '@toeverything/infra';
+import {
+  FeatureFlagService,
+  useLiveData,
+  useServices,
+} from '@toeverything/infra';
 import type { ReactElement, SVGProps } from 'react';
 import { useEffect } from 'react';
 
@@ -33,15 +37,24 @@ export type GeneralSettingList = GeneralSettingListItem[];
 
 export const useGeneralSettingList = (): GeneralSettingList => {
   const t = useI18n();
-  const { authService, serverConfigService, userFeatureService } = useServices({
+  const {
+    authService,
+    serverConfigService,
+    userFeatureService,
+    featureFlagService,
+  } = useServices({
     AuthService,
     ServerConfigService,
     UserFeatureService,
+    FeatureFlagService,
   });
   const status = useLiveData(authService.session.status$);
   const hasPaymentFeature = useLiveData(
     serverConfigService.serverConfig.features$.map(f => f?.payment)
   );
+  const enableEditorSettings = useLiveData(
+    featureFlagService.flags.enable_editor_settings.$
+  );
 
   useEffect(() => {
     userFeatureService.userFeature.revalidate();
@@ -67,7 +80,7 @@ export const useGeneralSettingList = (): GeneralSettingList => {
       testId: 'about-panel-trigger',
     },
   ];
-  if (runtimeConfig.enableEditorSettings) {
+  if (enableEditorSettings) {
     // add editor settings to second position
     settings.splice(1, 0, {
       key: 'editor',

diff --git a/tools/cli/src/webpack/runtime-config.ts b/tools/cli/src/webpack/runtime-config.ts
@@ -28,7 +28,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
         enableNewSettingUnstableApi: false,
         enableEnhanceShareMode: false,
         enableThemeEditor: false,
-        enableEditorSettings: false,
       };
     },
     get beta() {
@@ -57,7 +56,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
         enableInfoModal: true,
         enableOrganize: true,
         enableThemeEditor: true,
-        enableEditorSettings: true,
       };
     },
   };