Merge branch '15047-exclude-child-processes'

Closes #15047

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/src/store/resource-type-filters/resource-type-filters.test.ts b/src/store/resource-type-filters/resource-type-filters.test.ts
index 02f017edf309026b33786809a7f07c74b8725453..2f4d3cad524fd3c04f99d147b28ffc4be31d7070 100644 (file)
--- a/src/store/resource-type-filters/resource-type-filters.test.ts
+++ b/src/store/resource-type-filters/resource-type-filters.test.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { getInitialResourceTypeFilters, serializeResourceTypeFilters, ObjectTypeFilter, CollectionTypeFilter } from './resource-type-filters';
+import { getInitialResourceTypeFilters, serializeResourceTypeFilters, ObjectTypeFilter, CollectionTypeFilter, ProcessTypeFilter } from './resource-type-filters';
 import { ResourceKind } from '~/models/resource';
 import { deselectNode } from '~/models/tree';
 import { pipe } from 'lodash/fp';
@@ -47,4 +47,30 @@ describe("serializeResourceTypeFilters", () => {
         expect(serializedFilters)
             .toEqual(`["uuid","is_a",["${ResourceKind.COLLECTION}"]],["collections.properties.type","not in",["output"]]`);
     });
+
+    it("should serialize only main processes", () => {
+        const filters = pipe(
+            () => getInitialResourceTypeFilters(),
+            deselectNode(ObjectTypeFilter.PROJECT),
+            deselectNode(ProcessTypeFilter.CHILD_PROCESS),
+            deselectNode(ObjectTypeFilter.COLLECTION)
+        )();
+
+        const serializedFilters = serializeResourceTypeFilters(filters);
+        expect(serializedFilters)
+            .toEqual(`["uuid","is_a",["${ResourceKind.PROCESS}"]],["container_requests.requesting_container_uuid","=",null]`);
+    });
+
+    it("should serialize only child processes", () => {
+        const filters = pipe(
+            () => getInitialResourceTypeFilters(),
+            deselectNode(ObjectTypeFilter.PROJECT),
+            deselectNode(ProcessTypeFilter.MAIN_PROCESS),
+            deselectNode(ObjectTypeFilter.COLLECTION)
+        )();
+
+        const serializedFilters = serializeResourceTypeFilters(filters);
+        expect(serializedFilters)
+            .toEqual(`["uuid","is_a",["${ResourceKind.PROCESS}"]],["container_requests.requesting_container_uuid","!=",null]`);
+    });
 });

diff --git a/src/store/resource-type-filters/resource-type-filters.ts b/src/store/resource-type-filters/resource-type-filters.ts
index 8e856c9401b0f19092af0de026eb2c094f222ae9..4ee9c5f32b313fc16e4a04d230f2a09d3cacfee9 100644 (file)
--- a/src/store/resource-type-filters/resource-type-filters.ts
+++ b/src/store/resource-type-filters/resource-type-filters.ts
@@ -33,6 +33,11 @@ export enum CollectionTypeFilter {
     LOG_COLLECTION = 'Log',
 }
 
+export enum ProcessTypeFilter {
+    MAIN_PROCESS = 'Main',
+    CHILD_PROCESS = 'Child',
+}
+
 const initFilter = (name: string, parent = '', isSelected?: boolean) =>
     setNode<DataTableFilterItem>({
         id: name,
@@ -52,25 +57,35 @@ export const getSimpleObjectTypeFilters = pipe(
     initFilter(ObjectTypeFilter.COLLECTION),
 );
 
+// Using pipe() with more tha 7 arguments makes the return type be 'any',
+// causing compile issues.
 export const getInitialResourceTypeFilters = pipe(
     (): DataTableFilters => createTree<DataTableFilterItem>(),
     initFilter(ObjectTypeFilter.PROJECT),
-    initFilter(ObjectTypeFilter.PROCESS),
-    initFilter(ObjectTypeFilter.COLLECTION),
-    initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION),
-    initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION),
-    initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION),
+    pipe(
+        initFilter(ObjectTypeFilter.PROCESS),
+        initFilter(ProcessTypeFilter.MAIN_PROCESS, ObjectTypeFilter.PROCESS),
+        initFilter(ProcessTypeFilter.CHILD_PROCESS, ObjectTypeFilter.PROCESS)
+    ),
+    pipe(
+        initFilter(ObjectTypeFilter.COLLECTION),
+        initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION),
+        initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION),
+        initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION),
+    ),
 );
 
 export const getInitialProcessStatusFilters = pipe(
     (): DataTableFilters => createTree<DataTableFilterItem>(),
-    initFilter(ProcessStatusFilter.ALL, '', true),
-    initFilter(ProcessStatusFilter.RUNNING, '', false),
-    initFilter(ProcessStatusFilter.FAILED, '', false),
-    initFilter(ProcessStatusFilter.COMPLETED, '', false),
-    initFilter(ProcessStatusFilter.CANCELLED, '', false),
-    initFilter(ProcessStatusFilter.QUEUED, '', false),
-    initFilter(ProcessStatusFilter.LOCKED, '', false),
+    pipe(
+        initFilter(ProcessStatusFilter.ALL, '', true),
+        initFilter(ProcessStatusFilter.RUNNING, '', false),
+        initFilter(ProcessStatusFilter.FAILED, '', false),
+        initFilter(ProcessStatusFilter.COMPLETED, '', false),
+        initFilter(ProcessStatusFilter.CANCELLED, '', false),
+        initFilter(ProcessStatusFilter.QUEUED, '', false),
+        initFilter(ProcessStatusFilter.LOCKED, '', false),
+    ),
 );
 
 export const getTrashPanelTypeFilters = pipe(
@@ -103,11 +118,15 @@ const objectTypeToResourceKind = (type: ObjectTypeFilter) => {
 
 const serializeObjectTypeFilters = ({ fb, selectedFilters }: ReturnType<typeof createFiltersBuilder>) => {
     const collectionFilters = getMatchingFilters(values(CollectionTypeFilter), selectedFilters);
+    const processFilters = getMatchingFilters(values(ProcessTypeFilter), selectedFilters);
     const typeFilters = pipe(
         () => new Set(getMatchingFilters(values(ObjectTypeFilter), selectedFilters)),
         set => collectionFilters.length > 0
             ? set.add(ObjectTypeFilter.COLLECTION)
             : set,
+        set => processFilters.length > 0
+            ? set.add(ObjectTypeFilter.PROCESS)
+            : set,
         set => Array.from(set)
     )();
 
@@ -156,10 +175,36 @@ const buildCollectionTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filter
     }
 };
 
+const serializeProcessTypeFilters = ({ fb, selectedFilters }: ReturnType<typeof createFiltersBuilder>) => pipe(
+    () => getMatchingFilters(values(ProcessTypeFilter), selectedFilters),
+    filters => filters,
+    mappedFilters => ({
+        fb: buildProcessTypeFilters({ fb, filters: mappedFilters }),
+        selectedFilters
+    })
+)();
+
+const PROCESS_TYPES = values(ProcessTypeFilter);
+const PROCESS_PREFIX = GroupContentsResourcePrefix.PROCESS;
+
+const buildProcessTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filters: string[] }) => {
+    switch (true) {
+        case filters.length === 0 || filters.length === PROCESS_TYPES.length:
+            return fb;
+        case includes(ProcessTypeFilter.MAIN_PROCESS, filters):
+            return fb.addEqual('requesting_container_uuid', null, PROCESS_PREFIX);
+        case includes(ProcessTypeFilter.CHILD_PROCESS, filters):
+            return fb.addDistinct('requesting_container_uuid', null, PROCESS_PREFIX);
+        default:
+            return fb;
+    }
+};
+
 export const serializeResourceTypeFilters = pipe(
     createFiltersBuilder,
     serializeObjectTypeFilters,
     serializeCollectionTypeFilters,
+    serializeProcessTypeFilters,
     ({ fb }) => fb.getFilters(),
 );