From c2ffcb2c2c05d8d4232b17aadf9c8fee7e46b120 Mon Sep 17 00:00:00 2001
From: forehalo <forehalo@gmail.com>
Date: Mon, 26 May 2025 12:37:14 +0000
Subject: [PATCH] chore: remove multiple cloud server flag (#12531)

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->
## Summary by CodeRabbit

- **New Features**
  - The "Add Selfhosted" and "Add Server" options are now displayed whenever the build configuration is native, without relying on feature flags.

- **Refactor**
  - Simplified conditional rendering for server addition buttons by replacing feature flag checks with build configuration checks.

- **Chores**
  - Removed the "Multiple Cloud Servers" feature flag and its related localization strings, streamlining feature management and UI labels.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../frontend/core/src/components/sign-in/sign-in.tsx   |  7 +------
 .../user-with-workspace-list/add-server/index.tsx      | 10 +++-------
 .../src/mobile/components/workspace-selector/menu.tsx  |  8 ++------
 .../frontend/core/src/modules/feature-flag/constant.ts |  9 ---------
 packages/frontend/i18n/src/i18n.gen.ts                 |  8 --------
 packages/frontend/i18n/src/resources/en.json           |  2 --
 6 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/packages/frontend/core/src/components/sign-in/sign-in.tsx b/packages/frontend/core/src/components/sign-in/sign-in.tsx
index 250d7fc12f..09126c08c5 100644
--- a/packages/frontend/core/src/components/sign-in/sign-in.tsx
+++ b/packages/frontend/core/src/components/sign-in/sign-in.tsx
@@ -10,7 +10,6 @@ import { OAuth } from '@affine/core/components/affine/auth/oauth';
 import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
 import { AuthService, ServerService } from '@affine/core/modules/cloud';
 import type { AuthSessionStatus } from '@affine/core/modules/cloud/entities/session';
-import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { ServerDeploymentType } from '@affine/graphql';
 import { Trans, useI18n } from '@affine/i18n';
 import {
@@ -61,10 +60,6 @@ export const SignInStep = ({
     )
   );
   const authService = useService(AuthService);
-  const featureFlagService = useService(FeatureFlagService);
-  const enableMultipleCloudServers = useLiveData(
-    featureFlagService.flags.enable_multiple_cloud_servers.$
-  );
   const [isMutating, setIsMutating] = useState(false);
 
   const [email, setEmail] = useState('');
@@ -181,7 +176,7 @@ export const SignInStep = ({
               <div className={style.skipDividerLine} />
             </div>
             <div className={style.skipSection}>
-              {BUILD_CONFIG.isElectron && enableMultipleCloudServers ? (
+              {BUILD_CONFIG.isNative ? (
                 <Button
                   variant="plain"
                   className={style.addSelfhostedButton}
diff --git a/packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/add-server/index.tsx b/packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/add-server/index.tsx
index a16385cebd..46b1e684ec 100644
--- a/packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/add-server/index.tsx
+++ b/packages/frontend/core/src/components/workspace-selector/user-with-workspace-list/add-server/index.tsx
@@ -1,9 +1,8 @@
 import { Divider, MenuItem } from '@affine/component';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
-import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { useI18n } from '@affine/i18n';
 import { PlusIcon } from '@blocksuite/icons/rc';
-import { useLiveData, useService } from '@toeverything/infra';
+import { useService } from '@toeverything/infra';
 import { useCallback } from 'react';
 
 import {
@@ -16,18 +15,15 @@ import { addServerDividerWrapper } from './index.css';
 export const AddServer = () => {
   const t = useI18n();
   const globalDialogService = useService(GlobalDialogService);
-  const featureFlagService = useService(FeatureFlagService);
-  const enableMultipleServer = useLiveData(
-    featureFlagService.flags.enable_multiple_cloud_servers.$
-  );
 
   const onAddServer = useCallback(() => {
     globalDialogService.open('sign-in', { step: 'addSelfhosted' });
   }, [globalDialogService]);
 
-  if (!enableMultipleServer) {
+  if (!BUILD_CONFIG.isNative) {
     return null;
   }
+
   return (
     <>
       <div className={addServerDividerWrapper}>
diff --git a/packages/frontend/core/src/mobile/components/workspace-selector/menu.tsx b/packages/frontend/core/src/mobile/components/workspace-selector/menu.tsx
index 62f07542c2..75d6ec4507 100644
--- a/packages/frontend/core/src/mobile/components/workspace-selector/menu.tsx
+++ b/packages/frontend/core/src/mobile/components/workspace-selector/menu.tsx
@@ -10,7 +10,6 @@ import {
   ServersService,
 } from '@affine/core/modules/cloud';
 import { GlobalDialogService } from '@affine/core/modules/dialogs';
-import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { GlobalContextService } from '@affine/core/modules/global-context';
 import {
   type WorkspaceMetadata,
@@ -262,18 +261,15 @@ const CloudWorkSpaceList = ({
 
 const AddServer = () => {
   const globalDialogService = useService(GlobalDialogService);
-  const featureFlagService = useService(FeatureFlagService);
-  const enableMultipleServer = useLiveData(
-    featureFlagService.flags.enable_multiple_cloud_servers.$
-  );
 
   const onAddServer = useCallback(() => {
     globalDialogService.open('sign-in', { step: 'addSelfhosted' });
   }, [globalDialogService]);
 
-  if (!enableMultipleServer) {
+  if (!BUILD_CONFIG.isNative) {
     return null;
   }
+
   return <IconButton onClick={onAddServer} size="24" icon={<SelfhostIcon />} />;
 };
 
diff --git a/packages/frontend/core/src/modules/feature-flag/constant.ts b/packages/frontend/core/src/modules/feature-flag/constant.ts
index f7ba1c721d..981049acf9 100644
--- a/packages/frontend/core/src/modules/feature-flag/constant.ts
+++ b/packages/frontend/core/src/modules/feature-flag/constant.ts
@@ -209,15 +209,6 @@ export const AFFINE_FLAGS = {
     configurable: false,
     defaultState: isMobile,
   },
-  enable_multiple_cloud_servers: {
-    category: 'affine',
-    displayName:
-      'com.affine.settings.workspace.experimental-features.enable-multiple-cloud-servers.name',
-    description:
-      'com.affine.settings.workspace.experimental-features.enable-multiple-cloud-servers.description',
-    configurable: false,
-    defaultState: isDesktopEnvironment || BUILD_CONFIG.isIOS,
-  },
   enable_mobile_edgeless_editing: {
     category: 'affine',
     displayName:
diff --git a/packages/frontend/i18n/src/i18n.gen.ts b/packages/frontend/i18n/src/i18n.gen.ts
index 7d71fc5cd0..22227a1aab 100644
--- a/packages/frontend/i18n/src/i18n.gen.ts
+++ b/packages/frontend/i18n/src/i18n.gen.ts
@@ -5834,14 +5834,6 @@ export function useAFFiNEI18N(): {
       * `Once enabled, users can import and export blocksuite snapshots.`
       */
     ["com.affine.settings.workspace.experimental-features.enable-snapshot-import-export.description"](): string;
-    /**
-      * `Multiple Cloud Servers`
-      */
-    ["com.affine.settings.workspace.experimental-features.enable-multiple-cloud-servers.name"](): string;
-    /**
-      * `Once enabled, users can connect to selfhosted cloud servers.`
-      */
-    ["com.affine.settings.workspace.experimental-features.enable-multiple-cloud-servers.description"](): string;
     /**
       * `Enable Edgeless Editing`
       */
diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.json
index 5b3b8b1f35..ba31f9eb35 100644
--- a/packages/frontend/i18n/src/resources/en.json
+++ b/packages/frontend/i18n/src/resources/en.json
@@ -1456,8 +1456,6 @@
   "com.affine.settings.workspace.experimental-features.enable-mobile-linked-doc-menu.description": "Enables the mobile linked doc menu.",
   "com.affine.settings.workspace.experimental-features.enable-snapshot-import-export.name": "Enable Snapshot Import Export",
   "com.affine.settings.workspace.experimental-features.enable-snapshot-import-export.description": "Once enabled, users can import and export blocksuite snapshots.",
-  "com.affine.settings.workspace.experimental-features.enable-multiple-cloud-servers.name": "Multiple Cloud Servers",
-  "com.affine.settings.workspace.experimental-features.enable-multiple-cloud-servers.description": "Once enabled, users can connect to selfhosted cloud servers.",
   "com.affine.settings.workspace.experimental-features.enable-mobile-edgeless-editing.name": "Enable Edgeless Editing",
   "com.affine.settings.workspace.experimental-features.enable-mobile-edgeless-editing.description": "Once enabled, users can edit edgeless canvas.",
   "com.affine.settings.workspace.experimental-features.enable-pdf-embed-preview.name": "PDF embed preview",