Shun Miyazawa 3 years ago
parent
commit
4403dd2767
1 changed files with 6 additions and 3 deletions
  1. 6 3
      packages/app/src/server/routes/apiv3/activity.ts

+ 6 - 3
packages/app/src/server/routes/apiv3/activity.ts

@@ -45,10 +45,13 @@ module.exports = (crowi: Crowi): Router => {
 
 
     try {
     try {
       const parsedSearchFilter = JSON.parse(req.query.searchFilter as string || '');
       const parsedSearchFilter = JSON.parse(req.query.searchFilter as string || '');
+
+      const query = {};
+
       const canContainActionFilterToQuery = parsedSearchFilter.action.every(a => AllSupportedActionType.includes(a));
       const canContainActionFilterToQuery = parsedSearchFilter.action.every(a => AllSupportedActionType.includes(a));
-      const query = {
-        action: canContainActionFilterToQuery ? parsedSearchFilter.action : [],
-      };
+      if (canContainActionFilterToQuery) {
+        Object.assign(query, { action: parsedSearchFilter.action });
+      }
 
 
       const paginationResult = await Activity.getPaginatedActivity(limit, offset, query);
       const paginationResult = await Activity.getPaginatedActivity(limit, offset, query);