diff --git a/packages/common/env/src/workspace.ts b/packages/common/env/src/workspace.ts index 9381241e95..55cee5180e 100644 --- a/packages/common/env/src/workspace.ts +++ b/packages/common/env/src/workspace.ts @@ -1,11 +1,3 @@ -export enum WorkspaceSubPath { - ALL = 'all', - Collection = 'collection', - SETTING = 'setting', - TRASH = 'trash', - SHARED = 'shared', -} - export enum WorkspaceFlavour { /** * New AFFiNE Cloud Workspace using Nest.js Server. diff --git a/packages/frontend/core/src/commands/affine-navigation.tsx b/packages/frontend/core/src/commands/affine-navigation.tsx index 2f8ac147c4..625788c035 100644 --- a/packages/frontend/core/src/commands/affine-navigation.tsx +++ b/packages/frontend/core/src/commands/affine-navigation.tsx @@ -1,3 +1,4 @@ +import { WorkspaceSubPath } from '@affine/core/shared'; import type { useAFFiNEI18N } from '@affine/i18n/hooks'; import { ArrowRightBigIcon } from '@blocksuite/icons'; import type { Workspace } from '@blocksuite/store'; @@ -10,7 +11,6 @@ import { type PageModeOption, } from '../atoms'; import type { useNavigateHelper } from '../hooks/use-navigate-helper'; -import { WorkspaceSubPath } from '../shared'; export function registerAffineNavigationCommands({ t, diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx index dd3964bdca..fefc82518a 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx @@ -7,7 +7,7 @@ import { workspaceListAtom, workspaceManagerAtom, } from '@affine/core/modules/workspace'; -import { WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { ArrowRightSmallIcon } from '@blocksuite/icons'; import { useAtomValue, useSetAtom } from 'jotai'; diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx index 938eabdc80..644f6248f4 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/enable-cloud.tsx @@ -3,8 +3,9 @@ import { Button } from '@affine/component/ui/button'; import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { useWorkspaceInfo } from '@affine/core/hooks/use-workspace-info'; import { workspaceManagerAtom } from '@affine/core/modules/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant'; -import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceFlavour } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { Workspace } from '@affine/workspace'; import { useAtomValue, useSetAtom } from 'jotai'; diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx index e3ac93c4aa..02ff39ab84 100644 --- a/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx +++ b/packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx @@ -2,7 +2,7 @@ import { toast } from '@affine/component'; import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { usePageMetaHelper } from '@affine/core/hooks/use-block-suite-page-meta'; import { useBlockSuiteWorkspaceHelper } from '@affine/core/hooks/use-block-suite-workspace-helper'; -import { WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { initEmptyPage } from '@toeverything/infra/blocksuite'; import { useAtomValue, useSetAtom } from 'jotai'; import { useCallback, useMemo } from 'react'; diff --git a/packages/frontend/core/src/components/pure/cmdk/data.tsx b/packages/frontend/core/src/components/pure/cmdk/data.tsx index 3af7eb84ca..469a463526 100644 --- a/packages/frontend/core/src/components/pure/cmdk/data.tsx +++ b/packages/frontend/core/src/components/pure/cmdk/data.tsx @@ -7,6 +7,7 @@ import { currentWorkspaceAtom, waitForCurrentWorkspaceAtom, } from '@affine/core/modules/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import type { Collection } from '@affine/env/filter'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { EdgelessIcon, PageIcon, ViewLayersIcon } from '@blocksuite/icons'; @@ -31,7 +32,6 @@ import { import { collectionsCRUDAtom } from '../../../atoms/collections'; import { currentPageIdAtom } from '../../../atoms/mode'; import { useNavigateHelper } from '../../../hooks/use-navigate-helper'; -import { WorkspaceSubPath } from '../../../shared'; import { usePageHelper } from '../../blocksuite/block-suite-page-list/utils'; import type { CMDKCommand, CommandContext } from './types'; diff --git a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx index 739cc5f635..6896cb2f30 100644 --- a/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx +++ b/packages/frontend/core/src/components/pure/trash-page-footer/index.tsx @@ -3,7 +3,7 @@ import { ConfirmModal } from '@affine/component/ui/modal'; import { Tooltip } from '@affine/component/ui/tooltip'; import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { waitForCurrentWorkspaceAtom } from '@affine/core/modules/workspace'; -import { WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { assertExists } from '@blocksuite/global/utils'; import { DeleteIcon, ResetIcon } from '@blocksuite/icons'; diff --git a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx index 5208c995b5..b924574cc2 100644 --- a/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx +++ b/packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx @@ -9,7 +9,8 @@ import { currentWorkspaceAtom, workspaceListAtom, } from '@affine/core/modules/workspace'; -import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; +import { WorkspaceFlavour } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { WorkspaceMetadata } from '@affine/workspace'; import type { DragEndEvent } from '@dnd-kit/core'; 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 b6554a0146..d1019a878b 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/index.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/index.tsx @@ -14,8 +14,8 @@ import { import { Menu } from '@affine/component/ui/menu'; import { collectionsCRUDAtom } from '@affine/core/atoms/collections'; import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { apis, events } from '@affine/electron-api'; -import { WorkspaceSubPath } from '@affine/env/workspace'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import type { Workspace } from '@affine/workspace'; import { FolderIcon, SettingsIcon } from '@blocksuite/icons'; diff --git a/packages/frontend/core/src/components/top-tip.tsx b/packages/frontend/core/src/components/top-tip.tsx index 4caca6b19d..7c8ce14de4 100644 --- a/packages/frontend/core/src/components/top-tip.tsx +++ b/packages/frontend/core/src/components/top-tip.tsx @@ -2,6 +2,7 @@ import { BrowserWarning } from '@affine/component/affine-banner'; import { LocalDemoTips } from '@affine/component/affine-banner'; import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks'; import { workspaceManagerAtom } from '@affine/core/modules/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { WorkspaceFlavour } from '@affine/env/workspace'; import { Trans } from '@affine/i18n'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; @@ -12,7 +13,6 @@ import { useCallback, useState } from 'react'; import { authAtom } from '../atoms'; import { useCurrentLoginStatus } from '../hooks/affine/use-current-login-status'; import { useNavigateHelper } from '../hooks/use-navigate-helper'; -import { WorkspaceSubPath } from '../shared'; import { EnableAffineCloudModal } from './affine/enable-affine-cloud-modal'; const minimumChromeVersion = 106; diff --git a/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx b/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx index 830d5225d5..1d7c8e59aa 100644 --- a/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx +++ b/packages/frontend/core/src/components/workspace-upgrade/upgrade.tsx @@ -7,7 +7,7 @@ import { waitForCurrentWorkspaceAtom, workspaceManagerAtom, } from '@affine/core/modules/workspace'; -import { WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { useAtomValue } from 'jotai'; import { useState } from 'react'; diff --git a/packages/frontend/core/src/hooks/use-navigate-helper.ts b/packages/frontend/core/src/hooks/use-navigate-helper.ts index fb58c2c8cf..5e5dc12dcb 100644 --- a/packages/frontend/core/src/hooks/use-navigate-helper.ts +++ b/packages/frontend/core/src/hooks/use-navigate-helper.ts @@ -1,4 +1,4 @@ -import type { WorkspaceSubPath } from '@affine/env/workspace'; +import type { WorkspaceSubPath } from '@affine/core/shared'; import { useCallback, useMemo } from 'react'; import { type NavigateOptions, diff --git a/packages/frontend/core/src/pages/index.tsx b/packages/frontend/core/src/pages/index.tsx index 1397c4c051..03ea0d3d5c 100644 --- a/packages/frontend/core/src/pages/index.tsx +++ b/packages/frontend/core/src/pages/index.tsx @@ -1,6 +1,7 @@ import { Menu } from '@affine/component/ui/menu'; import { WorkspaceFallback } from '@affine/component/workspace'; import { workspaceListAtom } from '@affine/core/modules/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { useAtomValue } from 'jotai'; import { lazy, useEffect, useLayoutEffect, useState } from 'react'; import { type LoaderFunction, redirect } from 'react-router-dom'; @@ -9,7 +10,6 @@ import { createFirstAppData } from '../bootstrap/first-app-data'; import { UserWithWorkspaceList } from '../components/pure/workspace-slider-bar/user-with-workspace-list'; import { appConfigStorage } from '../hooks/use-app-config-storage'; import { useNavigateHelper } from '../hooks/use-navigate-helper'; -import { WorkspaceSubPath } from '../shared'; const AllWorkspaceModals = lazy(() => import('../providers/modal-provider').then(({ AllWorkspaceModals }) => ({ diff --git a/packages/frontend/core/src/pages/invite.tsx b/packages/frontend/core/src/pages/invite.tsx index 39e5c4f424..e8f46c0509 100644 --- a/packages/frontend/core/src/pages/invite.tsx +++ b/packages/frontend/core/src/pages/invite.tsx @@ -1,5 +1,5 @@ import { AcceptInvitePage } from '@affine/component/member-components'; -import { WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { acceptInviteByInviteIdMutation, type GetInviteInfoQuery, 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 79d7de919b..bbc820083a 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 @@ -3,7 +3,7 @@ import { ResizePanel } from '@affine/component/resize-panel'; import { useBlockSuitePageMeta } from '@affine/core/hooks/use-block-suite-page-meta'; import { useWorkspaceStatus } from '@affine/core/hooks/use-workspace-status'; import { waitForCurrentWorkspaceAtom } from '@affine/core/modules/workspace'; -import { WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; import { globalBlockSuiteSchema, SyncEngineStep } from '@affine/workspace'; import type { AffineEditorContainer } from '@blocksuite/presets'; import type { Page, Workspace } from '@blocksuite/store'; diff --git a/packages/frontend/core/src/providers/modal-provider.tsx b/packages/frontend/core/src/providers/modal-provider.tsx index c15d0bf245..e9cca69323 100644 --- a/packages/frontend/core/src/providers/modal-provider.tsx +++ b/packages/frontend/core/src/providers/modal-provider.tsx @@ -3,7 +3,8 @@ import { waitForCurrentWorkspaceAtom, workspaceListAtom, } from '@affine/core/modules/workspace'; -import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace'; +import { WorkspaceSubPath } from '@affine/core/shared'; +import { WorkspaceFlavour } from '@affine/env/workspace'; import { assertExists } from '@blocksuite/global/utils'; import { useAtom, useAtomValue } from 'jotai'; import type { ReactElement } from 'react';