15012: Fixes Queued process filtering.

[arvados-workbench2.git] / src / store / resource-type-filters / resource-type-filters.ts

diff --git a/src/store/resource-type-filters/resource-type-filters.ts b/src/store/resource-type-filters/resource-type-filters.ts
index 78777be10941a0e34d8b46a186fed8a8f6bfbd4f..ef1198bc65d862554b4b655fa617a902ca9e6584 100644 (file)
--- a/src/store/resource-type-filters/resource-type-filters.ts
+++ b/src/store/resource-type-filters/resource-type-filters.ts
@@ -10,6 +10,17 @@ import { FilterBuilder } from '~/services/api/filter-builder';
 import { getSelectedNodes } from '~/models/tree';
 import { CollectionType } from '~/models/collection';
 import { GroupContentsResourcePrefix } from '~/services/groups-service/groups-service';
+import { ContainerState } from '~/models/container';
+
+export enum ProcessStatusFilter {
+    ALL = 'All',
+    RUNNING = 'Running',
+    FAILED = 'Failed',
+    COMPLETED = 'Completed',
+    CANCELLED = 'Cancelled',
+    LOCKED = 'Locked',
+    QUEUED = 'Queued'
+}
 
 export enum ObjectTypeFilter {
     PROJECT = 'Project',
@@ -23,14 +34,19 @@ export enum CollectionTypeFilter {
     LOG_COLLECTION = 'Log',
 }
 
-const initFilter = (name: string, parent = '') =>
+export enum ProcessTypeFilter {
+    MAIN_PROCESS = 'Main',
+    CHILD_PROCESS = 'Child',
+}
+
+const initFilter = (name: string, parent = '', isSelected?: boolean) =>
     setNode<DataTableFilterItem>({
         id: name,
         value: { name },
         parent,
         children: [],
         active: false,
-        selected: true,
+        selected: isSelected !== undefined ? isSelected : true,
         expanded: false,
         status: TreeNodeStatus.LOADED,
     });
@@ -42,17 +58,52 @@ export const getSimpleObjectTypeFilters = pipe(
     initFilter(ObjectTypeFilter.COLLECTION),
 );
 
+// Using pipe() with more than 7 arguments makes the return type be 'any',
+// causing compile issues.
 export const getInitialResourceTypeFilters = pipe(
     (): DataTableFilters => createTree<DataTableFilterItem>(),
     initFilter(ObjectTypeFilter.PROJECT),
-    initFilter(ObjectTypeFilter.PROCESS),
+    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 getInitialProcessTypeFilters = pipe(
+    (): DataTableFilters => createTree<DataTableFilterItem>(),
+    initFilter(ProcessTypeFilter.MAIN_PROCESS),
+    initFilter(ProcessTypeFilter.CHILD_PROCESS, '', false)
+);
+
+export const getInitialProcessStatusFilters = pipe(
+    (): DataTableFilters => createTree<DataTableFilterItem>(),
+    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(
+    (): DataTableFilters => createTree<DataTableFilterItem>(),
+    initFilter(ObjectTypeFilter.PROJECT),
     initFilter(ObjectTypeFilter.COLLECTION),
     initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION),
     initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION),
     initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION),
 );
 
-
 const createFiltersBuilder = (filters: DataTableFilters) =>
     ({ fb: new FilterBuilder(), selectedFilters: getSelectedNodes(filters) });
 
@@ -74,11 +125,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)
     )();
 
@@ -105,7 +160,7 @@ const serializeCollectionTypeFilters = ({ fb, selectedFilters }: ReturnType<type
     () => getMatchingFilters(values(CollectionTypeFilter), selectedFilters),
     filters => filters.map(collectionTypeToPropertyValue),
     mappedFilters => ({
-        fb: buildCollectiomTypeFilters({ fb, filters: mappedFilters }),
+        fb: buildCollectionTypeFilters({ fb, filters: mappedFilters }),
         selectedFilters
     })
 )();
@@ -116,7 +171,7 @@ const NON_GENERAL_COLLECTION_TYPES = difference(COLLECTION_TYPES, [CollectionTyp
 
 const COLLECTION_PROPERTIES_PREFIX = `${GroupContentsResourcePrefix.COLLECTION}.properties`;
 
-const buildCollectiomTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filters: CollectionType[] }) => {
+const buildCollectionTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filters: CollectionType[] }) => {
     switch (true) {
         case filters.length === 0 || filters.length === COLLECTION_TYPES.length:
             return fb;
@@ -127,10 +182,49 @@ const buildCollectiomTypeFilters = ({ 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, use_prefix: true }),
+        selectedFilters
+    })
+)();
+
+const PROCESS_TYPES = values(ProcessTypeFilter);
+const PROCESS_PREFIX = GroupContentsResourcePrefix.PROCESS;
+
+const buildProcessTypeFilters = ({ fb, filters, use_prefix }: { fb: FilterBuilder, filters: string[], use_prefix: boolean }) => {
+    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, use_prefix ? PROCESS_PREFIX : '');
+        case includes(ProcessTypeFilter.CHILD_PROCESS, filters):
+            return fb.addDistinct('requesting_container_uuid', null, use_prefix ? PROCESS_PREFIX : '');
+        default:
+            return fb;
+    }
+};
+
 export const serializeResourceTypeFilters = pipe(
     createFiltersBuilder,
     serializeObjectTypeFilters,
     serializeCollectionTypeFilters,
+    serializeProcessTypeFilters,
+    ({ fb }) => fb.getFilters(),
+);
+
+export const serializeOnlyProcessTypeFilters = pipe(
+    createFiltersBuilder,
+    ({ fb, selectedFilters }: ReturnType<typeof createFiltersBuilder>) => pipe(
+        () => getMatchingFilters(values(ProcessTypeFilter), selectedFilters),
+        filters => filters,
+        mappedFilters => ({
+            fb: buildProcessTypeFilters({ fb, filters: mappedFilters, use_prefix: false }),
+            selectedFilters
+        })
+    )(),
     ({ fb }) => fb.getFilters(),
 );
 
@@ -139,3 +233,31 @@ export const serializeSimpleObjectTypeFilters = (filters: Tree<DataTableFilterIt
         .map(f => f.id)
         .map(objectTypeToResourceKind);
 };
+
+export const buildProcessStatusFilters = ( fb:FilterBuilder, activeStatusFilter:string ): FilterBuilder => {
+    switch (activeStatusFilter) {
+        case ProcessStatusFilter.COMPLETED: {
+            fb.addEqual('container.state', ContainerState.COMPLETE);
+            fb.addEqual('container.exit_code', '0');
+            break;
+        }
+        case ProcessStatusFilter.FAILED: {
+            fb.addEqual('container.state', ContainerState.COMPLETE);
+            fb.addDistinct('container.exit_code', '0');
+            break;
+        }
+        case ProcessStatusFilter.QUEUED: {
+            fb.addEqual('container.state', ContainerState.QUEUED);
+            fb.addDistinct('container.priority', '0');
+            break;
+        }
+        case ProcessStatusFilter.CANCELLED:
+        case ProcessStatusFilter.FAILED:
+        case ProcessStatusFilter.LOCKED:
+        case ProcessStatusFilter.RUNNING: {
+            fb.addEqual('container.state', activeStatusFilter);
+            break;
+        }
+    }
+    return fb;
+};
\ No newline at end of file