From c2ebf0b822436eef805e74fbdfb99ba141cdc71f Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Fri, 1 Nov 2024 17:18:21 +0800
Subject: [PATCH] fix(core): handle uncaught ai flag (#8663)

---
 .../workspace/detail-page/detail-page.tsx      | 11 ++++++++++-
 tests/affine-local/e2e/ai-land.spec.ts         |  1 +
 tests/affine-local/e2e/page-properties.spec.ts | 18 ++++++++++++------
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
index 7c9d36a1a5..8665a7da23 100644
--- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
+++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
@@ -7,6 +7,7 @@ import { EditorOutlineViewer } from '@affine/core/components/blocksuite/outline-
 import { DocPropertySidebar } from '@affine/core/components/doc-properties/sidebar';
 import { useAppSettingHelper } from '@affine/core/components/hooks/affine/use-app-setting-helper';
 import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite-page-meta';
+import { ServerConfigService } from '@affine/core/modules/cloud';
 import { EditorService } from '@affine/core/modules/editor';
 import { RecentDocsService } from '@affine/core/modules/quicksearch';
 import { ViewService } from '@affine/core/modules/workbench/services/view';
@@ -69,6 +70,7 @@ const DetailPageImpl = memo(function DetailPageImpl() {
     workspaceService,
     globalContextService,
     featureFlagService,
+    serverConfigService,
   } = useServices({
     WorkbenchService,
     ViewService,
@@ -77,6 +79,7 @@ const DetailPageImpl = memo(function DetailPageImpl() {
     WorkspaceService,
     GlobalContextService,
     FeatureFlagService,
+    ServerConfigService,
   });
   const workbench = workbenchService.workbench;
   const editor = editorService.editor;
@@ -104,6 +107,12 @@ const DetailPageImpl = memo(function DetailPageImpl() {
 
   const t = useI18n();
 
+  const serverFeatures = useLiveData(
+    serverConfigService.serverConfig.features$
+  );
+  const enableAI =
+    serverFeatures?.copilot && featureFlagService.flags.enable_ai.value;
+
   useEffect(() => {
     if (isActiveView) {
       setActiveBlockSuiteEditor(editorContainer);
@@ -281,7 +290,7 @@ const DetailPageImpl = memo(function DetailPageImpl() {
         </div>
       </ViewBody>
 
-      {featureFlagService.flags.enable_ai.value && (
+      {enableAI && (
         <ViewSidebarTab
           tabId="chat"
           icon={<AiIcon />}
diff --git a/tests/affine-local/e2e/ai-land.spec.ts b/tests/affine-local/e2e/ai-land.spec.ts
index cff6de869c..175c525eac 100644
--- a/tests/affine-local/e2e/ai-land.spec.ts
+++ b/tests/affine-local/e2e/ai-land.spec.ts
@@ -7,6 +7,7 @@ import {
 import { expect } from '@playwright/test';
 
 test('Click ai-land icon', async ({ page }) => {
+  test.skip(process.env.CI !== undefined, 'Skip test in CI');
   await openHomePage(page);
   await waitForEditorLoad(page);
   await clickNewPageButton(page);
diff --git a/tests/affine-local/e2e/page-properties.spec.ts b/tests/affine-local/e2e/page-properties.spec.ts
index c714bb7339..01e497a384 100644
--- a/tests/affine-local/e2e/page-properties.spec.ts
+++ b/tests/affine-local/e2e/page-properties.spec.ts
@@ -220,9 +220,12 @@ test('check if added property is also in workspace settings', async ({
 }) => {
   await addCustomProperty(page, page, 'text');
   await openWorkspaceProperties(page);
-  await expect(
-    page.locator('[data-testid=doc-property-manager-item]:has-text("Text")')
-  ).toBeVisible();
+  const settingModal = page.locator('[data-testid=setting-modal-content]');
+  const item = settingModal.locator(
+    '[data-testid=doc-property-manager-item]:has-text("Text")'
+  );
+  await item.waitFor({ state: 'attached' });
+  await expect(item).toBeVisible();
 });
 
 test('edit property name', async ({ page }) => {
@@ -243,9 +246,12 @@ test('edit property name', async ({ page }) => {
 
   // check if the property name is also updated in workspace settings
   await openWorkspaceProperties(page);
-  await expect(
-    page.locator('[data-testid=doc-property-manager-item]:has-text("New Text")')
-  ).toBeVisible();
+  const settingModal = page.locator('[data-testid=setting-modal-content]');
+  const item = settingModal.locator(
+    '[data-testid=doc-property-manager-item]:has-text("New Text")'
+  );
+  await item.waitFor({ state: 'attached' });
+  await expect(item).toBeVisible();
 });
 
 test('delete property via property popup', async ({ page }) => {