From f6279ee47f2060fbf234d7e616013a7ac25d0730 Mon Sep 17 00:00:00 2001 From: L-Sun Date: Wed, 7 Aug 2024 03:46:14 +0000 Subject: [PATCH] chore(core): remove outline viewer feature flag (#7770) --- packages/common/infra/src/atom/settings.ts | 2 -- .../experimental-features/index.tsx | 21 --------------- .../view/doc-preview/doc-peek-view.tsx | 14 ++++------ .../workspace/detail-page/detail-page.tsx | 12 ++++----- .../e2e/blocksuite/outline.spec.ts | 27 +------------------ 5 files changed, 11 insertions(+), 65 deletions(-) diff --git a/packages/common/infra/src/atom/settings.ts b/packages/common/infra/src/atom/settings.ts index 96d4f8b994..b8e1831796 100644 --- a/packages/common/infra/src/atom/settings.ts +++ b/packages/common/infra/src/atom/settings.ts @@ -33,7 +33,6 @@ export type AppSetting = { autoDownloadUpdate: boolean; enableMultiView: boolean; enableTelemetry: boolean; - enableOutlineViewer: boolean; editorFlags: Partial>; }; export const windowFrameStyleOptions: AppSetting['windowFrameStyle'][] = [ @@ -75,7 +74,6 @@ const appSettingBaseAtom = atomWithStorage('affine-settings', { autoDownloadUpdate: true, enableTelemetry: true, enableMultiView: false, - enableOutlineViewer: false, editorFlags: {}, }); diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx index ed9c5d0323..9eec1433ed 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx @@ -124,26 +124,6 @@ const SplitViewSettingRow = () => { ); }; -const OutlineViewerSettingRow = () => { - const { appSettings, updateSettings } = useAppSettingHelper(); - - const onToggle = useCallback( - (checked: boolean) => { - updateSettings('enableOutlineViewer', checked); - }, - [updateSettings] - ); - - return ( - - ); -}; - // feature flag -> display name const blocksuiteFeatureFlags: Partial> = { enable_expand_database_block: 'Enable Expand Database Block', @@ -198,7 +178,6 @@ const ExperimentalFeaturesMain = () => { > - ); diff --git a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx index 26143153c5..71852c9213 100644 --- a/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx +++ b/packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx @@ -4,7 +4,6 @@ import { AIProvider } from '@affine/core/blocksuite/presets/ai'; import { AffineErrorBoundary } from '@affine/core/components/affine/affine-error-boundary'; import { BlockSuiteEditor } from '@affine/core/components/blocksuite/block-suite-editor'; import { EditorOutlineViewer } from '@affine/core/components/blocksuite/outline-viewer'; -import { useAppSettingHelper } from '@affine/core/hooks/affine/use-app-setting-helper'; import { useNavigateHelper } from '@affine/core/hooks/use-navigate-helper'; import { PageNotFound } from '@affine/core/pages/404'; import { DebugLogger } from '@affine/debug'; @@ -75,7 +74,6 @@ export function DocPeekPreview({ const workbench = useService(WorkbenchService).workbench; const peekView = useService(PeekViewService).peekView; const [editor, setEditor] = useState(null); - const { appSettings } = useAppSettingHelper(); const onRef = (editor: AffineEditorContainer) => { setEditor(editor); @@ -177,13 +175,11 @@ export function DocPeekPreview({ page={doc.blockSuiteDoc} /> - {appSettings.enableOutlineViewer && ( - - )} + diff --git a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx index cb877f9731..8c8eb7c352 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx @@ -270,13 +270,11 @@ const DetailPageImpl = memo(function DetailPageImpl() { })} /> - {appSettings.enableOutlineViewer && ( - - )} + {isInTrash ? : null} diff --git a/tests/affine-local/e2e/blocksuite/outline.spec.ts b/tests/affine-local/e2e/blocksuite/outline.spec.ts index f9d84d2310..32e79d7d0a 100644 --- a/tests/affine-local/e2e/blocksuite/outline.spec.ts +++ b/tests/affine-local/e2e/blocksuite/outline.spec.ts @@ -11,36 +11,13 @@ import { waitForEditorLoad, waitForEmptyEditor, } from '@affine-test/kit/utils/page-logic'; -import { - confirmExperimentalPrompt, - openExperimentalFeaturesPanel, - openSettingModal, -} from '@affine-test/kit/utils/setting'; -import { expect, type Page } from '@playwright/test'; - -async function enableOutlineViewer(page: Page) { - await openSettingModal(page); - await openExperimentalFeaturesPanel(page); - const prompt = page.getByTestId('experimental-prompt'); - await expect(prompt).toBeVisible(); - await confirmExperimentalPrompt(page); - const settings = page.getByTestId('experimental-settings'); - const enableOutlineViewerSetting = settings.getByTestId( - 'outline-viewer-switch' - ); - await expect(enableOutlineViewerSetting).toBeVisible(); - await enableOutlineViewerSetting.click(); - await page.waitForTimeout(500); - await page.getByTestId('modal-close-button').click(); - await page.waitForTimeout(500); -} +import { expect } from '@playwright/test'; test('outline viewer is useable', async ({ page }) => { await openHomePage(page); await waitForEditorLoad(page); await clickNewPageButton(page); await waitForEditorLoad(page); - await enableOutlineViewer(page); const title = getBlockSuiteEditorTitle(page); await title.click(); @@ -69,7 +46,6 @@ test('outline viewer should hide in edgeless mode', async ({ page }) => { await waitForEditorLoad(page); await clickNewPageButton(page); await waitForEditorLoad(page); - await enableOutlineViewer(page); const title = getBlockSuiteEditorTitle(page); await title.click(); @@ -94,7 +70,6 @@ test('outline viewer should be useable in doc peek preview', async ({ }) => { await openHomePage(page); await waitForEditorLoad(page); - await enableOutlineViewer(page); await clickNewPageButton(page); await waitForEmptyEditor(page);