X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a3d36c3310d51e8fceb2ea4e7e62932cb973a67e..d416c9aa7b70da4f8998792a42616b991d882f26:/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 ef1198bc..0539cefe 100644 --- a/src/store/resource-type-filters/resource-type-filters.ts +++ b/src/store/resource-type-filters/resource-type-filters.ts @@ -3,14 +3,15 @@ // SPDX-License-Identifier: AGPL-3.0 import { difference, pipe, values, includes, __ } from 'lodash/fp'; -import { createTree, setNode, TreeNodeStatus, TreeNode, Tree } from '~/models/tree'; -import { DataTableFilterItem, DataTableFilters } from '~/components/data-table-filters/data-table-filters-tree'; -import { ResourceKind } from '~/models/resource'; -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'; +import { createTree, setNode, TreeNodeStatus, TreeNode, Tree } from 'models/tree'; +import { DataTableFilterItem, DataTableFilters } from 'components/data-table-filters/data-table-filters-tree'; +import { ResourceKind } from 'models/resource'; +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'; +import { ContainerRequestState } from 'models/container-request'; export enum ProcessStatusFilter { ALL = 'All', @@ -18,20 +19,26 @@ export enum ProcessStatusFilter { FAILED = 'Failed', COMPLETED = 'Completed', CANCELLED = 'Cancelled', - LOCKED = 'Locked', + ONHOLD = 'On hold', QUEUED = 'Queued' } export enum ObjectTypeFilter { PROJECT = 'Project', PROCESS = 'Process', - COLLECTION = 'Data Collection', + COLLECTION = 'Data collection', +} + +export enum GroupTypeFilter { + PROJECT = 'Project (normal)', + FILTER_GROUP = 'Filter group', } export enum CollectionTypeFilter { GENERAL_COLLECTION = 'General', OUTPUT_COLLECTION = 'Output', LOG_COLLECTION = 'Log', + INTERMEDIATE_COLLECTION = 'Intermediate', } export enum ProcessTypeFilter { @@ -62,7 +69,11 @@ export const getSimpleObjectTypeFilters = pipe( // causing compile issues. export const getInitialResourceTypeFilters = pipe( (): DataTableFilters => createTree(), - initFilter(ObjectTypeFilter.PROJECT), + pipe( + initFilter(ObjectTypeFilter.PROJECT), + initFilter(GroupTypeFilter.PROJECT, ObjectTypeFilter.PROJECT), + initFilter(GroupTypeFilter.FILTER_GROUP, ObjectTypeFilter.PROJECT), + ), pipe( initFilter(ObjectTypeFilter.PROCESS), initFilter(ProcessTypeFilter.MAIN_PROCESS, ObjectTypeFilter.PROCESS), @@ -72,6 +83,7 @@ export const getInitialResourceTypeFilters = pipe( initFilter(ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION), + initFilter(CollectionTypeFilter.INTERMEDIATE_COLLECTION, ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION), ), ); @@ -86,12 +98,12 @@ export const getInitialProcessStatusFilters = pipe( (): DataTableFilters => createTree(), pipe( initFilter(ProcessStatusFilter.ALL, '', true), + initFilter(ProcessStatusFilter.ONHOLD, '', false), + initFilter(ProcessStatusFilter.QUEUED, '', false), initFilter(ProcessStatusFilter.RUNNING, '', false), - initFilter(ProcessStatusFilter.FAILED, '', false), initFilter(ProcessStatusFilter.COMPLETED, '', false), initFilter(ProcessStatusFilter.CANCELLED, '', false), - initFilter(ProcessStatusFilter.QUEUED, '', false), - initFilter(ProcessStatusFilter.LOCKED, '', false), + initFilter(ProcessStatusFilter.FAILED, '', false), ), ); @@ -101,6 +113,7 @@ export const getTrashPanelTypeFilters = pipe( initFilter(ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION), + initFilter(CollectionTypeFilter.INTERMEDIATE_COLLECTION, ObjectTypeFilter.COLLECTION), initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION), ); @@ -124,10 +137,14 @@ const objectTypeToResourceKind = (type: ObjectTypeFilter) => { }; const serializeObjectTypeFilters = ({ fb, selectedFilters }: ReturnType) => { + const groupFilters = getMatchingFilters(values(GroupTypeFilter), selectedFilters); const collectionFilters = getMatchingFilters(values(CollectionTypeFilter), selectedFilters); const processFilters = getMatchingFilters(values(ProcessTypeFilter), selectedFilters); const typeFilters = pipe( () => new Set(getMatchingFilters(values(ObjectTypeFilter), selectedFilters)), + set => groupFilters.length > 0 + ? set.add(ObjectTypeFilter.PROJECT) + : set, set => collectionFilters.length > 0 ? set.add(ObjectTypeFilter.COLLECTION) : set, @@ -153,6 +170,10 @@ const collectionTypeToPropertyValue = (type: CollectionTypeFilter) => { return CollectionType.OUTPUT; case CollectionTypeFilter.LOG_COLLECTION: return CollectionType.LOG; + case CollectionTypeFilter.INTERMEDIATE_COLLECTION: + return CollectionType.INTERMEDIATE; + default: + return CollectionType.GENERAL; } }; @@ -182,6 +203,30 @@ const buildCollectionTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filter } }; +const serializeGroupTypeFilters = ({ fb, selectedFilters }: ReturnType) => pipe( + () => getMatchingFilters(values(GroupTypeFilter), selectedFilters), + filters => filters, + mappedFilters => ({ + fb: buildGroupTypeFilters({ fb, filters: mappedFilters, use_prefix: true }), + selectedFilters + }) +)(); + +const GROUP_TYPES = values(GroupTypeFilter); + +const buildGroupTypeFilters = ({ fb, filters, use_prefix }: { fb: FilterBuilder, filters: string[], use_prefix: boolean }) => { + switch (true) { + case filters.length === 0 || filters.length === GROUP_TYPES.length: + return fb; + case includes(GroupTypeFilter.PROJECT, filters): + return fb.addEqual('groups.group_class', 'project'); + case includes(GroupTypeFilter.FILTER_GROUP, filters): + return fb.addEqual('groups.group_class', 'filter'); + default: + return fb; + } +}; + const serializeProcessTypeFilters = ({ fb, selectedFilters }: ReturnType) => pipe( () => getMatchingFilters(values(ProcessTypeFilter), selectedFilters), filters => filters, @@ -210,6 +255,7 @@ const buildProcessTypeFilters = ({ fb, filters, use_prefix }: { fb: FilterBuilde export const serializeResourceTypeFilters = pipe( createFiltersBuilder, serializeObjectTypeFilters, + serializeGroupTypeFilters, serializeCollectionTypeFilters, serializeProcessTypeFilters, ({ fb }) => fb.getFilters(), @@ -234,30 +280,34 @@ export const serializeSimpleObjectTypeFilters = (filters: Tree { +export const buildProcessStatusFilters = (fb: FilterBuilder, activeStatusFilter: string, resourcePrefix?: string): FilterBuilder => { switch (activeStatusFilter) { + case ProcessStatusFilter.ONHOLD: { + fb.addDistinct('state', ContainerRequestState.FINAL, resourcePrefix); + fb.addEqual('priority', '0', resourcePrefix); + fb.addIn('container.state', [ContainerState.QUEUED, ContainerState.LOCKED], resourcePrefix); + break; + } case ProcessStatusFilter.COMPLETED: { - fb.addEqual('container.state', ContainerState.COMPLETE); - fb.addEqual('container.exit_code', '0'); + fb.addEqual('container.state', ContainerState.COMPLETE, resourcePrefix); + fb.addEqual('container.exit_code', '0', resourcePrefix); break; } case ProcessStatusFilter.FAILED: { - fb.addEqual('container.state', ContainerState.COMPLETE); - fb.addDistinct('container.exit_code', '0'); + fb.addEqual('container.state', ContainerState.COMPLETE, resourcePrefix); + fb.addDistinct('container.exit_code', '0', resourcePrefix); break; } case ProcessStatusFilter.QUEUED: { - fb.addEqual('container.state', ContainerState.QUEUED); - fb.addDistinct('container.priority', '0'); + fb.addEqual('container.state', ContainerState.QUEUED, resourcePrefix); + fb.addDistinct('priority', '0', resourcePrefix); break; } case ProcessStatusFilter.CANCELLED: - case ProcessStatusFilter.FAILED: - case ProcessStatusFilter.LOCKED: case ProcessStatusFilter.RUNNING: { - fb.addEqual('container.state', activeStatusFilter); + fb.addEqual('container.state', activeStatusFilter, resourcePrefix); break; } } return fb; -}; \ No newline at end of file +};