X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/48ae17a520d11173e2ae96fb7c78aa4a411a489a..abe9787195984a919095b4a4c2b82c7a0baf0801:/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 e1a1b835..4ee9c5f3 100644 --- a/src/store/resource-type-filters/resource-type-filters.ts +++ b/src/store/resource-type-filters/resource-type-filters.ts @@ -11,6 +11,16 @@ import { getSelectedNodes } from '~/models/tree'; import { CollectionType } from '~/models/collection'; import { GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; +export enum ProcessStatusFilter { + ALL = 'All', + RUNNING = 'Running', + FAILED = 'Failed', + COMPLETED = 'Completed', + CANCELLED = 'Cancelled', + LOCKED = 'Locked', + QUEUED = 'Queued' +} + export enum ObjectTypeFilter { PROJECT = 'Project', PROCESS = 'Process', @@ -23,14 +33,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({ id: name, value: { name }, parent, children: [], active: false, - selected: true, + selected: isSelected !== undefined ? isSelected : true, expanded: false, status: TreeNodeStatus.LOADED, }); @@ -42,14 +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(), 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(), + 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( @@ -82,11 +118,15 @@ const objectTypeToResourceKind = (type: ObjectTypeFilter) => { const serializeObjectTypeFilters = ({ fb, selectedFilters }: ReturnType) => { 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) )(); @@ -135,10 +175,36 @@ const buildCollectionTypeFilters = ({ fb, filters }: { fb: FilterBuilder, filter } }; +const serializeProcessTypeFilters = ({ fb, selectedFilters }: ReturnType) => 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(), );