فهرست منبع

89536 - add null check

ryo-h 4 سال پیش
والد
کامیت
734592aab1
1فایلهای تغییر یافته به همراه9 افزوده شده و 4 حذف شده
  1. 9 4
      packages/app/src/components/PageList/PageListItemL.tsx

+ 9 - 4
packages/app/src/components/PageList/PageListItemL.tsx

@@ -21,7 +21,7 @@ import {
   usePageRenameModal, usePageDuplicateModal, usePageDeleteModal, usePutBackPageModal,
   usePageRenameModal, usePageDuplicateModal, usePageDeleteModal, usePutBackPageModal,
 } from '~/stores/modal';
 } from '~/stores/modal';
 import {
 import {
-  IPageInfoAll, IPageInfoForEntity, IPageInfoForListing, IPageWithMeta, isIPageInfoForListing,
+  IPageInfoAll, IPageInfoForEntity, IPageInfoForListing, IPageWithMeta, isIPageInfoForListing, IPageInfoForOperation,
 } from '~/interfaces/page';
 } from '~/interfaces/page';
 import { IPageSearchMeta, isIPageSearchMeta } from '~/interfaces/search';
 import { IPageSearchMeta, isIPageSearchMeta } from '~/interfaces/search';
 import {
 import {
@@ -141,9 +141,14 @@ const PageListItemLSubstance: ForwardRefRenderFunction<ISelectable, Props> = (pr
 
 
   const shouldDangerouslySetInnerHTMLForPaths = elasticSearchResult != null && elasticSearchResult.highlightedPath.length > 0;
   const shouldDangerouslySetInnerHTMLForPaths = elasticSearchResult != null && elasticSearchResult.highlightedPath.length > 0;
 
 
-  const likerCount = isSelected ? pageInfo?.likerIds.length : pageData.liker.length;
-  const bookmarkCount = isSelected ? pageInfo?.bookmarkCount : pageMeta?.bookmarkCount;
-
+  let likerCount;
+  let bookmarkCount;
+  if (pageInfo != null && 'likerIds' in pageInfo) {
+    likerCount = isSelected ? pageInfo?.likerIds?.length : pageData.liker.length;
+  }
+  if (pageInfo != null && 'bookmarkCount' in pageInfo) {
+    bookmarkCount = isSelected ? pageInfo?.bookmarkCount : pageMeta?.bookmarkCount;
+  }
   return (
   return (
     <li
     <li
       key={pageData._id}
       key={pageData._id}