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

Revert "nullable"

This reverts commit b51f27f08d14bc24fdc1fee35d2261bee62171db.
Shun Miyazawa 1 год назад
Родитель
Сommit
903e5c6e5d

+ 2 - 2
apps/app/src/server/service/page-grant.ts

@@ -606,9 +606,9 @@ class PageGrantService implements IPageGrantService {
       data[PageGrant.GRANT_USER_GROUP] = { applicableGroups: userRelatedGroups };
     }
     else if (grant === PageGrant.GRANT_OWNER) {
-      const grantedUser = grantedUsers?.[0];
+      const grantedUser = grantedUsers[0];
 
-      const isUserApplicable = grantedUser?.toString() === user._id.toString();
+      const isUserApplicable = grantedUser.toString() === user._id.toString();
 
       if (isUserApplicable) {
         data[PageGrant.GRANT_OWNER] = null;

+ 1 - 1
apps/app/src/server/service/page/index.ts

@@ -2705,7 +2705,7 @@ class PageService implements IPageService {
         '',
         {
           grant: notEmptyParent?.grant,
-          grantUserIds: notEmptyParent?.grantedUsers?.map(u => getIdForRef(u)),
+          grantUserIds: notEmptyParent?.grantedUsers.map(u => getIdForRef(u)),
           grantUserGroupIds: notEmptyParent?.grantedGroups,
         },
       );

+ 1 - 1
apps/app/src/server/service/search-delegator/elasticsearch.ts

@@ -358,7 +358,7 @@ class ElasticsearchDelegator implements SearchDelegator<Data, ESTermsKey, ESQuer
    * generate object that is related to page.grant*
    */
   generateDocContentsRelatedToRestriction(page: AggregatedPage) {
-    const grantedUserIds = page.grantedUsers?.map(user => getIdStringForRef(user));
+    const grantedUserIds = page.grantedUsers.map(user => getIdStringForRef(user));
     const grantedGroupIds = page.grantedGroups.map(group => getIdStringForRef(group.item));
 
     return {