Merge pull request #5625 from weseek/fix/search-highlight-snippet

fix: Search highlight snippet

packages/app/src/server/routes/search.js

@@ -159,6 +159,7 @@ module.exports = function(crowi, app) {
       result = await searchService.formatSearchResult(searchResult, delegatorName, user, userGroups);
     }
     catch (err) {
+      logger.error(err);
       return res.json(ApiResponse.error(err));
     }
     return res.json(ApiResponse.success(result));

packages/app/src/server/service/search.ts

@@ -439,11 +439,15 @@ class SearchService implements SearchQueryParser, SearchResolver {
     }
 
     if (testGrant === Page.GRANT_OWNER) {
+      if (user == null) return false;
+
       return user._id.toString() === testGrantedUser.toString();
     }
 
     if (testGrant === Page.GRANT_USER_GROUP) {
-      return userGroups.map(d => d.toString()).include(testGrantedGroup.toString());
+      if (userGroups == null) return false;
+
+      return userGroups.map(id => id.toString()).includes(testGrantedGroup.toString());
     }
 
     return true;

packages/app/src/utils/page-delete-config.ts

@@ -52,11 +52,15 @@ export const validateDeleteConfigs = (
  * @returns [(value for single), (value for recursive)]
  */
 export const prepareDeleteConfigValuesForCalc = (
-    confForSingle: IPageDeleteConfigValueToProcessValidation, confForRecursive: IPageDeleteConfigValue,
+    confForSingle: IPageDeleteConfigValueToProcessValidation | undefined, confForRecursive: IPageDeleteConfigValue | undefined,
 ): [IPageDeleteConfigValueToProcessValidation, IPageDeleteConfigValueToProcessValidation] => {
-  if (confForRecursive === Value.Inherit) {
-    return [confForSingle, confForSingle];
+  // convert undefined to default values
+  const confForSingleToReturn = confForSingle ?? Value.Anyone;
+  const confForRecursiveToReturn = confForRecursive ?? Value.Inherit;
+
+  if (confForRecursiveToReturn === Value.Inherit) {
+    return [confForSingleToReturn, confForSingleToReturn];
   }
 
-  return [confForSingle, confForRecursive];
+  return [confForSingleToReturn, confForRecursiveToReturn];
 };