From a3d36c3310d51e8fceb2ea4e7e62932cb973a67e Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Thu, 23 Jan 2020 18:05:21 -0300 Subject: [PATCH] 15012: Fixes Queued process filtering. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../resource-type-filters/resource-type-filters.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/store/resource-type-filters/resource-type-filters.ts b/src/store/resource-type-filters/resource-type-filters.ts index 1cc547ec..ef1198bc 100644 --- a/src/store/resource-type-filters/resource-type-filters.ts +++ b/src/store/resource-type-filters/resource-type-filters.ts @@ -10,6 +10,7 @@ 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', @@ -236,19 +237,23 @@ export const serializeSimpleObjectTypeFilters = (filters: Tree { switch (activeStatusFilter) { case ProcessStatusFilter.COMPLETED: { - fb.addEqual('container.state', 'Complete'); + fb.addEqual('container.state', ContainerState.COMPLETE); fb.addEqual('container.exit_code', '0'); break; } case ProcessStatusFilter.FAILED: { - fb.addEqual('container.state', 'Complete'); + 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.QUEUED: case ProcessStatusFilter.RUNNING: { fb.addEqual('container.state', activeStatusFilter); break; -- 2.30.2