Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-16 09:36:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use nano id (#1234)

Browse Source
This commit is contained in:
Himself65
2023-03-01 12:16:36 -06:00
committed by GitHub
parent f888a9e6e0
commit 0df288ba2c
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/src/components/pure/quick-search-modal/Footer.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
import { useTranslation } from '@affine/i18n'; import { useTranslation } from '@affine/i18n';
import { PlusIcon } from '@blocksuite/icons'; import { PlusIcon } from '@blocksuite/icons';
import { assertEquals, uuidv4 } from '@blocksuite/store'; import { assertEquals, nanoid } from '@blocksuite/store';
import { Command } from 'cmdk'; import { Command } from 'cmdk';
import { NextRouter } from 'next/router'; import { NextRouter } from 'next/router';
import React from 'react'; import React from 'react';
@@ -30,7 +30,7 @@ export const Footer: React.FC<FooterProps> = ({
data-testid="quick-search-add-new-page" data-testid="quick-search-add-new-page"
onSelect={async () => { onSelect={async () => {
onClose(); onClose();
const id = uuidv4(); const id = nanoid();
const pageId = await createPage(id, query); const pageId = await createPage(id, query);
assertEquals(pageId, id); assertEquals(pageId, id);
router.push({ router.push({
apps/web/src/hooks/use-workspaces.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { Workspace } from '@affine/datacenter'; import { Workspace } from '@affine/datacenter';
import { uuidv4 } from '@blocksuite/store'; import { nanoid } from '@blocksuite/store';
import { useCallback, useMemo, useSyncExternalStore } from 'react'; import { useCallback, useMemo, useSyncExternalStore } from 'react';
import useSWR from 'swr'; import useSWR from 'swr';
import { IndexeddbPersistence } from 'y-indexeddb'; import { IndexeddbPersistence } from 'y-indexeddb';
@@ -37,7 +37,7 @@ declare global {
globalThis.dataCenter = dataCenter; globalThis.dataCenter = dataCenter;
function createRemLocalWorkspace(name: string) { function createRemLocalWorkspace(name: string) {
const id = uuidv4(); const id = nanoid();
const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(id); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(id);
blockSuiteWorkspace.meta.setName(name); blockSuiteWorkspace.meta.setName(name);
const workspace: LocalWorkspace = { const workspace: LocalWorkspace = {
apps/web/src/layouts/index.tsx
+2 -2
View File
@@ -1,5 +1,5 @@
import { setUpLanguage, useTranslation } from '@affine/i18n'; import { setUpLanguage, useTranslation } from '@affine/i18n';
import { assertExists, uuidv4 } from '@blocksuite/store'; import { assertExists, nanoid } from '@blocksuite/store';
import { useAtom, useAtomValue } from 'jotai'; import { useAtom, useAtomValue } from 'jotai';
import { atomWithStorage } from 'jotai/utils'; import { atomWithStorage } from 'jotai/utils';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
@@ -84,7 +84,7 @@ export const WorkspaceLayout: React.FC<React.PropsWithChildren> = ({
[currentWorkspace, isPublicWorkspace, router] [currentWorkspace, isPublicWorkspace, router]
); );
const handleCreatePage = useCallback(async () => { const handleCreatePage = useCallback(async () => {
return helper.createPage(uuidv4()); return helper.createPage(nanoid());
}, [helper]); }, [helper]);
const handleOpenWorkspaceListModal = useCallback(() => { const handleOpenWorkspaceListModal = useCallback(() => {
setOpenWorkspacesModal(true); setOpenWorkspacesModal(true);
apps/web/src/plugins/local/index.tsx
+4 -4
View File
@@ -1,4 +1,4 @@
import { assertEquals, uuidv4 } from '@blocksuite/store'; import { assertEquals, nanoid } from '@blocksuite/store';
import React from 'react'; import React from 'react';
import { IndexeddbPersistence } from 'y-indexeddb'; import { IndexeddbPersistence } from 'y-indexeddb';
@@ -33,7 +33,7 @@ export const LocalPlugin: WorkspacePlugin<RemWorkspaceFlavour.LOCAL> = {
localStorage.setItem(kStoreKey, '[]'); localStorage.setItem(kStoreKey, '[]');
ids = []; ids = [];
} }
const id = uuidv4(); const id = nanoid();
const persistence = new IndexeddbPersistence(id, blockSuiteWorkspace.doc); const persistence = new IndexeddbPersistence(id, blockSuiteWorkspace.doc);
await persistence.whenSynced.then(() => { await persistence.whenSynced.then(() => {
persistence.destroy(); persistence.destroy();
@@ -135,11 +135,11 @@ export const LocalPlugin: WorkspacePlugin<RemWorkspaceFlavour.LOCAL> = {
return; return;
} }
console.info('no local workspace found, create a new one'); console.info('no local workspace found, create a new one');
const workspaceId = uuidv4(); const workspaceId = nanoid();
const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(workspaceId); const blockSuiteWorkspace = createEmptyBlockSuiteWorkspace(workspaceId);
blockSuiteWorkspace.meta.setName('Untitled Workspace'); blockSuiteWorkspace.meta.setName('Untitled Workspace');
localStorage.setItem(kStoreKey, JSON.stringify([workspaceId])); localStorage.setItem(kStoreKey, JSON.stringify([workspaceId]));
blockSuiteWorkspace.createPage(uuidv4()); blockSuiteWorkspace.createPage(nanoid());
const workspace: LocalWorkspace = { const workspace: LocalWorkspace = {
id: workspaceId, id: workspaceId,
flavour: RemWorkspaceFlavour.LOCAL, flavour: RemWorkspaceFlavour.LOCAL,