TEMP

UN-OCHA · Apr 30, 2024 · 553530d · 553530d
1 parent 504b7c4
commit 553530d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/domain-services/flows/flow-search-service.ts b/src/domain-services/flows/flow-search-service.ts
@@ -344,6 +344,13 @@ export class FlowSearchService {
       { flag: isStandardFlows, category: 'Standard', id: 133 },
     ];
 
+    const inactiveStatusCategories = [
+      { id: 9, category: 'Superseded' },
+      { id: 12, category: 'Cancelled' },
+      { id: 13, category: 'Deleted' },
+      { id: 14, category: 'Restricted' },
+      { id: 87, category: 'Rejected' },
+    ];
     const shortcutFilters: ShortcutCategoryFilter[] = filters
       .filter((filter) => filter.flag !== undefined)
       .map((filter) => ({
@@ -352,6 +359,17 @@ export class FlowSearchService {
         id: filter.id,
       }));
 
+    if (shortcutFilters.length > 0 && isPendingFlows === false) {
+      const mappedInactiveStatusCategories = inactiveStatusCategories.map(
+        (filter) =>
+          ({
+            category: filter.category,
+            operation: Op.NOT_IN,
+            id: filter.id,
+          }) as ShortcutCategoryFilter
+      );
+      shortcutFilters.push(...mappedInactiveStatusCategories);
+    }
     return shortcutFilters.length > 0 ? shortcutFilters : null;
   }
 

diff --git a/...domain-services/flows/strategy/impl/get-flowIds-flow-category-conditions-strategy-impl.ts b/...domain-services/flows/strategy/impl/get-flowIds-flow-category-conditions-strategy-impl.ts
@@ -67,6 +67,7 @@ export class GetFlowIdsFromCategoryConditionsStrategyImpl
       .queryBuilder()
       .distinct('flow.id', 'flow.versionID')
       .from('flow')
+      .where('flow.deletedAt', null)
       .join('categoryRef', function () {
         this.on('flow.id', '=', 'categoryRef.objectID').andOn(
           'flow.versionID',