From 0df288ba2cb05d1004e99739d0fdff4745a84df6 Mon Sep 17 00:00:00 2001 From: Himself65 Date: Wed, 1 Mar 2023 12:16:36 -0600 Subject: [PATCH] refactor: use nano id (#1234) --- .../web/src/components/pure/quick-search-modal/Footer.tsx | 4 ++-- apps/web/src/hooks/use-workspaces.ts | 4 ++-- apps/web/src/layouts/index.tsx | 4 ++-- apps/web/src/plugins/local/index.tsx | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/web/src/components/pure/quick-search-modal/Footer.tsx b/apps/web/src/components/pure/quick-search-modal/Footer.tsx index eb3e03b99..8e66b522e 100644 --- a/apps/web/src/components/pure/quick-search-modal/Footer.tsx +++ b/apps/web/src/components/pure/quick-search-modal/Footer.tsx @@ -1,6 +1,6 @@ import { useTranslation } from '@affine/i18n'; import { PlusIcon } from '@blocksuite/icons'; -import { assertEquals, uuidv4 } from '@blocksuite/store'; +import { assertEquals, nanoid } from '@blocksuite/store'; import { Command } from 'cmdk'; import { NextRouter } from 'next/router'; import React from 'react'; @@ -30,7 +30,7 @@ export const Footer: React.FC = ({ data-testid="quick-search-add-new-page" onSelect={async () => { onClose(); - const id = uuidv4(); + const id = nanoid(); const pageId = await createPage(id, query); assertEquals(pageId, id); router.push({ diff --git a/apps/web/src/hooks/use-workspaces.ts b/apps/web/src/hooks/use-workspaces.ts index c6af75e39..e83989785 100644 --- a/apps/web/src/hooks/use-workspaces.ts +++ b/apps/web/src/hooks/use-workspaces.ts @@ -1,5 +1,5 @@ import { Workspace } from '@affine/datacenter'; -import { uuidv4 } from '@blocksuite/store'; +import { nanoid } from '@blocksuite/store'; import { useCallback, useMemo, useSyncExternalStore } from 'react'; import useSWR from 'swr'; import { IndexeddbPersistence } from 'y-indexeddb'; @@ -37,7 +37,7 @@ declare global { globalThis.dataCenter = dataCenter; function createRemLocalWorkspace(name: string) { - const id = uuidv4(); + const id = nanoid(); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(id); blockSuiteWorkspace.meta.setName(name); const workspace: LocalWorkspace = { diff --git a/apps/web/src/layouts/index.tsx b/apps/web/src/layouts/index.tsx index abb60e30a..0d08d7771 100644 --- a/apps/web/src/layouts/index.tsx +++ b/apps/web/src/layouts/index.tsx @@ -1,5 +1,5 @@ import { setUpLanguage, useTranslation } from '@affine/i18n'; -import { assertExists, uuidv4 } from '@blocksuite/store'; +import { assertExists, nanoid } from '@blocksuite/store'; import { useAtom, useAtomValue } from 'jotai'; import { atomWithStorage } from 'jotai/utils'; import { useRouter } from 'next/router'; @@ -84,7 +84,7 @@ export const WorkspaceLayout: React.FC = ({ [currentWorkspace, isPublicWorkspace, router] ); const handleCreatePage = useCallback(async () => { - return helper.createPage(uuidv4()); + return helper.createPage(nanoid()); }, [helper]); const handleOpenWorkspaceListModal = useCallback(() => { setOpenWorkspacesModal(true); diff --git a/apps/web/src/plugins/local/index.tsx b/apps/web/src/plugins/local/index.tsx index 6e50b1d9f..4c790b84c 100644 --- a/apps/web/src/plugins/local/index.tsx +++ b/apps/web/src/plugins/local/index.tsx @@ -1,4 +1,4 @@ -import { assertEquals, uuidv4 } from '@blocksuite/store'; +import { assertEquals, nanoid } from '@blocksuite/store'; import React from 'react'; import { IndexeddbPersistence } from 'y-indexeddb'; @@ -33,7 +33,7 @@ export const LocalPlugin: WorkspacePlugin = { localStorage.setItem(kStoreKey, '[]'); ids = []; } - const id = uuidv4(); + const id = nanoid(); const persistence = new IndexeddbPersistence(id, blockSuiteWorkspace.doc); await persistence.whenSynced.then(() => { persistence.destroy(); @@ -135,11 +135,11 @@ export const LocalPlugin: WorkspacePlugin = { return; } console.info('no local workspace found, create a new one'); - const workspaceId = uuidv4(); + const workspaceId = nanoid(); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(workspaceId); blockSuiteWorkspace.meta.setName('Untitled Workspace'); localStorage.setItem(kStoreKey, JSON.stringify([workspaceId])); - blockSuiteWorkspace.createPage(uuidv4()); + blockSuiteWorkspace.createPage(nanoid()); const workspace: LocalWorkspace = { id: workspaceId, flavour: RemWorkspaceFlavour.LOCAL,