Просмотр исходного кода

exclude null tag on server side in routes/apiv3/apiv3

yuto-oweseek 4 лет назад
Родитель
Сommit
d0cd2b5c94

+ 1 - 2
packages/app/src/components/Sidebar/RecentChanges.tsx

@@ -56,8 +56,7 @@ function LargePageItem({ page }) {
   }
 
   const tags = page.tags;
-  // when tag document is deleted from database directly tags includes null
-  const tagElements = tags.filter(tag => tag != null).map((tag) => {
+  const tagElements = tags.map((tag) => {
     return (
       <a key={tag.name} href={`/_search?q=tag:${tag.name}`} className="grw-tag-label badge badge-secondary mr-2 small">
         {tag.name}

+ 3 - 1
packages/app/src/server/routes/apiv3/pages.js

@@ -381,7 +381,9 @@ module.exports = (crowi) => {
         if (!relationsMap.has(pageId)) {
           relationsMap.set(pageId, []);
         }
-        relationsMap.get(pageId).push(relation.relatedTag);
+        if (relation.relatedTag != null) {
+          relationsMap.get(pageId).push(relation.relatedTag);
+        }
       });
       // add tags to each page
       result.pages.forEach((page) => {