projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 1cc547ec76c07e1a01dd29afa6f2c699963ed667..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,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 { 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',
export enum ProcessStatusFilter {
ALL = 'All',
@@
-236,19
+237,23
@@
export const serializeSimpleObjectTypeFilters = (filters: Tree<DataTableFilterIt
export const buildProcessStatusFilters = ( fb:FilterBuilder, activeStatusFilter:string ): FilterBuilder => {
switch (activeStatusFilter) {
case ProcessStatusFilter.COMPLETED: {
export const buildProcessStatusFilters = ( fb:FilterBuilder, activeStatusFilter:string ): FilterBuilder => {
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.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;
}
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.CANCELLED:
case ProcessStatusFilter.FAILED:
case ProcessStatusFilter.LOCKED:
- case ProcessStatusFilter.QUEUED:
case ProcessStatusFilter.RUNNING: {
fb.addEqual('container.state', activeStatusFilter);
break;
case ProcessStatusFilter.RUNNING: {
fb.addEqual('container.state', activeStatusFilter);
break;