[ARVADOS-WORKBENCH2] created: 2.4.0-45-g57e12190
Git user
git at public.arvados.org
Fri May 13 16:07:29 UTC 2022
at 57e121908bd6a8767cb9e29288d71e51bf1c6911 (commit)
commit 57e121908bd6a8767cb9e29288d71e51bf1c6911
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri May 13 12:06:54 2022 -0400
16583: Add "Intermediate" to collection type filters
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/src/models/collection.ts b/src/models/collection.ts
index 9a5d2ee2..defaca76 100644
--- a/src/models/collection.ts
+++ b/src/models/collection.ts
@@ -70,4 +70,5 @@ export enum CollectionType {
GENERAL = 'nil',
OUTPUT = 'output',
LOG = 'log',
+ INTERMEDIATE = 'intermediate',
}
diff --git a/src/store/resource-type-filters/resource-type-filters.ts b/src/store/resource-type-filters/resource-type-filters.ts
index a39807d5..0539cefe 100644
--- a/src/store/resource-type-filters/resource-type-filters.ts
+++ b/src/store/resource-type-filters/resource-type-filters.ts
@@ -38,6 +38,7 @@ export enum CollectionTypeFilter {
GENERAL_COLLECTION = 'General',
OUTPUT_COLLECTION = 'Output',
LOG_COLLECTION = 'Log',
+ INTERMEDIATE_COLLECTION = 'Intermediate',
}
export enum ProcessTypeFilter {
@@ -82,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),
),
);
@@ -111,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),
);
@@ -167,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;
}
};
@@ -273,7 +280,7 @@ export const serializeSimpleObjectTypeFilters = (filters: Tree<DataTableFilterIt
.map(objectTypeToResourceKind);
};
-export const buildProcessStatusFilters = ( fb: FilterBuilder, activeStatusFilter: string, resourcePrefix?: string ): FilterBuilder => {
+export const buildProcessStatusFilters = (fb: FilterBuilder, activeStatusFilter: string, resourcePrefix?: string): FilterBuilder => {
switch (activeStatusFilter) {
case ProcessStatusFilter.ONHOLD: {
fb.addDistinct('state', ContainerRequestState.FINAL, resourcePrefix);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list