From 82acc93fccd1193821c498fb3f4121139d614719 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Tue, 20 Dec 2022 18:34:55 +0800 Subject: [PATCH 1/3] chore: remove unreasonable import --- packages/app/src/hooks/use-page-helper.ts | 5 ++--- packages/app/src/providers/app-state-provider/context.ts | 1 - .../src/providers/editor-provider/hooks/useEditorHandler.ts | 4 ---- packages/app/src/providers/editor-provider/interface.ts | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/packages/app/src/hooks/use-page-helper.ts b/packages/app/src/hooks/use-page-helper.ts index 910e24f996..e138b74780 100644 --- a/packages/app/src/hooks/use-page-helper.ts +++ b/packages/app/src/hooks/use-page-helper.ts @@ -1,5 +1,4 @@ import { Page } from '@blocksuite/store'; -import { QueryContent } from '@blocksuite/store/dist/workspace/search'; import { PageMeta } from '@/providers/editor-provider'; import { useAppState } from '@/providers/app-state-provider'; @@ -13,7 +12,7 @@ export type EditorHandlers = { toggleDeletePage: (pageId: string) => void; toggleFavoritePage: (pageId: string) => void; // permanentlyDeletePage: (pageId: string) => void; - search: (query: QueryContent) => Map; + search: (query: string) => Map; // changeEditorMode: (pageId: string) => void; }; @@ -45,7 +44,7 @@ export const usePageHelper = (): EditorHandlers => { }); } }, - search: (query: QueryContent) => { + search: (query: string) => { return currentWorkspace!.search(query); }, }; diff --git a/packages/app/src/providers/app-state-provider/context.ts b/packages/app/src/providers/app-state-provider/context.ts index 78a6be0b45..3dd06f0433 100644 --- a/packages/app/src/providers/app-state-provider/context.ts +++ b/packages/app/src/providers/app-state-provider/context.ts @@ -7,7 +7,6 @@ import type { Workspace as StoreWorkspace, } from '@blocksuite/store'; import type { EditorContainer } from '@blocksuite/editor'; -import { QueryContent } from '@blocksuite/store/dist/workspace/search'; export type LoadWorkspaceHandler = ( workspaceId: string diff --git a/packages/app/src/providers/editor-provider/hooks/useEditorHandler.ts b/packages/app/src/providers/editor-provider/hooks/useEditorHandler.ts index c0b4c11272..ffe4c6a8da 100644 --- a/packages/app/src/providers/editor-provider/hooks/useEditorHandler.ts +++ b/packages/app/src/providers/editor-provider/hooks/useEditorHandler.ts @@ -1,4 +1,3 @@ -import { QueryContent } from '@blocksuite/store/dist/workspace/search'; import { createPage, generateDefaultPageId, initPage } from '../utils'; import { Workspace, Page } from '@blocksuite/store'; import { useRouter } from 'next/router'; @@ -70,9 +69,6 @@ export const useEditorHandler = ({ ); } }, - search: (query: QueryContent) => { - return workspace!.search(query); - }, changeEditorMode: (pageId: string) => { editor!.mode = editor!.mode === 'page' ? 'edgeless' : 'page'; workspace?.setPageMeta(pageId, { mode: editor!.mode }); diff --git a/packages/app/src/providers/editor-provider/interface.ts b/packages/app/src/providers/editor-provider/interface.ts index 1fafdf56ff..a2e893f374 100644 --- a/packages/app/src/providers/editor-provider/interface.ts +++ b/packages/app/src/providers/editor-provider/interface.ts @@ -1,6 +1,5 @@ import { PropsWithChildren } from 'react'; import { Page } from '@blocksuite/store'; -import { QueryContent } from '@blocksuite/store/dist/workspace/search'; import { PageMeta as OriginalPageMeta } from '@blocksuite/store'; import { EditorContainer } from '@blocksuite/editor'; @@ -35,6 +34,5 @@ export type EditorHandlers = { toggleDeletePage: (pageId: string) => void; toggleFavoritePage: (pageId: string) => void; permanentlyDeletePage: (pageId: string) => void; - search: (query: QueryContent) => Map; changeEditorMode: (pageId: string) => void; }; From 741419b77775fdb05dd4461794f66bc77e65a19b Mon Sep 17 00:00:00 2001 From: JimmFly Date: Tue, 20 Dec 2022 18:39:47 +0800 Subject: [PATCH 2/3] chore: update noResult svg --- .../src/components/quick-search/noResult.svg | 24 ----- .../components/quick-search/noResultSVG.tsx | 95 +++++++++++++++++++ .../src/components/quick-search/results.tsx | 10 +- 3 files changed, 97 insertions(+), 32 deletions(-) delete mode 100644 packages/app/src/components/quick-search/noResult.svg create mode 100644 packages/app/src/components/quick-search/noResultSVG.tsx diff --git a/packages/app/src/components/quick-search/noResult.svg b/packages/app/src/components/quick-search/noResult.svg deleted file mode 100644 index 7412a1b1f0..0000000000 --- a/packages/app/src/components/quick-search/noResult.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/app/src/components/quick-search/noResultSVG.tsx b/packages/app/src/components/quick-search/noResultSVG.tsx new file mode 100644 index 0000000000..16aabb73d9 --- /dev/null +++ b/packages/app/src/components/quick-search/noResultSVG.tsx @@ -0,0 +1,95 @@ +export const NoResultSVG = () => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/packages/app/src/components/quick-search/results.tsx b/packages/app/src/components/quick-search/results.tsx index 8cf3d2591a..4252943207 100644 --- a/packages/app/src/components/quick-search/results.tsx +++ b/packages/app/src/components/quick-search/results.tsx @@ -9,8 +9,7 @@ import { config } from './config'; import { useGoToPage } from '@/providers/app-state-provider/hooks'; import { usePageList } from '@/providers/app-state-provider/usePageList'; import { useLoadWorkspace } from '@/providers/app-state-provider/hooks'; -import NextImage from 'next/image'; -import noResultSVG from './noResult.svg'; +import { NoResultSVG } from './noResultSVG'; import { usePageHelper } from '@/hooks/use-page-helper'; export const Results = (props: { query: string; @@ -76,12 +75,7 @@ export const Results = (props: { ) : ( Find 0 result - + ) ) : ( From dbf942c1fc40475ffcc1839d22817a6baf06a41e Mon Sep 17 00:00:00 2001 From: MingLiang Wang Date: Tue, 20 Dec 2022 19:05:03 +0800 Subject: [PATCH 3/3] feat: decode base64 to utf8 --- .../request/authorization/authorization.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/data-services/src/request/request/authorization/authorization.ts b/packages/data-services/src/request/request/authorization/authorization.ts index b581bd5ac8..99989a444d 100644 --- a/packages/data-services/src/request/request/authorization/authorization.ts +++ b/packages/data-services/src/request/request/authorization/authorization.ts @@ -36,10 +36,23 @@ function getToken(): { accessToken: string; refreshToken: string } | null { } } +function b64DecodeUnicode(str: string) { + // Going backwards: from byte stream, to percent-encoding, to original string. + return decodeURIComponent( + window + .atob(str) + .split('') + .map(function (c) { + return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2); + }) + .join('') + ); +} + function parseAccessToken(token: string): AccessTokenMessage | null { try { const message: AccessTokenMessage = JSON.parse( - window.atob(token.split('.')[1]) + b64DecodeUnicode(token.split('.')[1]) ); return message; } catch (error) {