From: Lisa Knox Date: Tue, 28 Nov 2023 15:12:08 +0000 (-0500) Subject: 21128: filter groups works Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx index 689384da..551a4edc 100644 --- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx +++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx @@ -151,6 +151,7 @@ const resourceSubKind = (uuid: string, resources: ResourcesState) => { case ResourceKind.PROJECT: if(resourceIsFrozen(resource, resources)) return [msResourceKind.PROJECT_FROZEN] if((resource as ProjectResource).canWrite === false) return [msResourceKind.PROJECT_READONLY] + if((resource as ProjectResource).groupClass === "filter") return [msResourceKind.PROJECT_FILTER] return [msResourceKind.PROJECT] default: return [resource.kind] diff --git a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts index de6cbc61..950996a7 100644 --- a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts +++ b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts @@ -67,6 +67,7 @@ export enum msResourceKind { PROJECT = "arvados#group", PROJECT_FROZEN = "arvados#group_frozen", PROJECT_READONLY = "arvados#group_readonly", + PROJECT_FILTER = "arvados#group_filter", REPOSITORY = "arvados#repository", SSH_KEY = "arvados#authorizedKeys", KEEP_SERVICE = "arvados#keepService", @@ -76,7 +77,7 @@ export enum msResourceKind { NONE = "arvados#none" } -const { COLLECTION, PROCESS, PROJECT, PROJECT_FROZEN, PROJECT_READONLY, WORKFLOW } = msResourceKind; +const { COLLECTION, PROCESS, PROJECT, PROJECT_FROZEN, PROJECT_READONLY,PROJECT_FILTER, WORKFLOW } = msResourceKind; export const multiselectActionsFilters: TMultiselectActionsFilters = { [COLLECTION]: [msCollectionActionSet, allActionNames(msCollectionActionSet)], @@ -84,6 +85,7 @@ export const multiselectActionsFilters: TMultiselectActionsFilters = { [PROJECT]: [msProjectActionSet, projectMSActionsFilter], [PROJECT_FROZEN]: [msProjectActionSet, allActionNames(msFrozenActionSet)], [PROJECT_READONLY]: [msProjectActionSet, allActionNames(msReadOnlyProjectActionSet)], + [PROJECT_FILTER]: [msProjectActionSet, allActionNames(msFilterGroupActionSet)], [WORKFLOW]: [msWorkflowActionSet, workflowMSActionFilter] };