fix(core): fix meta.xxx is undefined (#6321)

toeverything · Mar 26, 2024 · 1606334 · 1606334
1 parent b6bba52
commit 1606334
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/packages/common/infra/src/page/record.ts b/packages/common/infra/src/page/record.ts
@@ -14,7 +14,7 @@ export class PageRecord {
     private readonly localState: WorkspaceLocalState
   ) {}
 
-  meta$ = LiveData.from<DocMeta>(
+  meta$ = LiveData.from<Partial<DocMeta>>(
     new Observable<DocMeta>(subscriber => {
       const emit = () => {
         const meta = this.workspace.docCollection.meta.docMetas.find(
@@ -60,5 +60,5 @@ export class PageRecord {
     return this.mode$.value;
   }
 
-  title$ = this.meta$.map(meta => meta.title);
+  title$ = this.meta$.map(meta => meta.title ?? '');
 }
diff --git a/packages/frontend/core/src/components/pure/cmdk/main.tsx b/packages/frontend/core/src/components/pure/cmdk/main.tsx
@@ -155,7 +155,7 @@ export const CMDKContainer = ({
   open: boolean;
   className?: string;
   query: string;
-  pageMeta?: DocMeta;
+  pageMeta?: Partial<DocMeta>;
   groups: ReturnType<typeof useCMDKCommandGroups>;
   onQueryChange: (query: string) => void;
 }>) => {
@@ -234,7 +234,7 @@ const CMDKQuickSearchModalInner = ({
   pageMeta,
   open,
   ...props
-}: CMDKModalProps & { pageMeta?: DocMeta }) => {
+}: CMDKModalProps & { pageMeta?: Partial<DocMeta> }) => {
   const [query, setQuery] = useAtom(cmdkQueryAtom);
   useLayoutEffect(() => {
     if (open) {
@@ -260,7 +260,7 @@ export const CMDKQuickSearchModal = ({
   pageMeta,
   open,
   ...props
-}: CMDKModalProps & { pageMeta?: DocMeta }) => {
+}: CMDKModalProps & { pageMeta?: Partial<DocMeta> }) => {
   return (
     <CMDKModal open={open} {...props}>
       <Suspense fallback={<Command.Loading />}>

diff --git a/packages/frontend/core/src/modules/multi-tab-sidebar/entities/tabs/journal.tsx b/packages/frontend/core/src/modules/multi-tab-sidebar/entities/tabs/journal.tsx
@@ -316,7 +316,7 @@ const ConflictList = ({
       setTrashModal({
         open: true,
         pageIds: [pageRecord.id],
-        pageTitles: [pageRecord.meta$.value.title],
+        pageTitles: [pageRecord.title$.value],
       });
     },
     [setTrashModal]

diff --git a/packages/frontend/core/src/modules/tag/entities/tag.ts b/packages/frontend/core/src/modules/tag/entities/tag.ts
@@ -50,7 +50,7 @@ export class Tag {
       return;
     }
     pageRecord?.setMeta({
-      tags: [...pageRecord.meta$.value.tags, this.id],
+      tags: [...(pageRecord.meta$.value.tags ?? []), this.id],
     });
   }
 
@@ -60,14 +60,14 @@ export class Tag {
       return;
     }
     pageRecord?.setMeta({
-      tags: pageRecord.meta$.value.tags.filter(tagId => tagId !== this.id),
+      tags: pageRecord.meta$.value.tags?.filter(tagId => tagId !== this.id),
     });
   }
 
   readonly pageIds$ = LiveData.computed(get => {
     const pages = get(this.pageRecordList.records$);
     return pages
-      .filter(page => get(page.meta$).tags.includes(this.id))
+      .filter(page => get(page.meta$).tags?.includes(this.id))
       .map(page => page.id);
   });
 }
diff --git a/packages/frontend/core/src/modules/tag/service/tag.ts b/packages/frontend/core/src/modules/tag/service/tag.ts
@@ -41,7 +41,7 @@ export class TagService {
       if (!pageRecord) return [];
       const tagIds = get(pageRecord.meta$).tags;
 
-      return get(this.tags$).filter(tag => tagIds.includes(tag.id));
+      return get(this.tags$).filter(tag => (tagIds ?? []).includes(tag.id));
     });
   }
 

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
@@ -163,7 +163,7 @@ const DetailPageImpl = memo(function DetailPageImpl() {
 
         const updatedDate = linkedPage.meta$.value.updatedDate;
         const createDate = linkedPage.meta$.value.createDate;
-        return updatedDate ? new Date(updatedDate) : new Date(createDate);
+        return new Date(updatedDate || createDate || Date.now());
       };
 
       page.setMode(mode);