21128: collection filters in place Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...

diff --git a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
index fdea4b967fb5c06ea6f88c2d36612598a3dcb880..e73af8bc8632e4b362dc75d75e17f9c5c01f9d51 100644 (file)
--- a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
+++ b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { MultiSelectMenuActionSet, MultiSelectMenuActionNames } from 'views-components/multiselect-toolbar/ms-menu-actions';
-import { msCollectionActionSet } from 'views-components/multiselect-toolbar/ms-collection-action-set';
+import { msCollectionActionSet, msCommonCollectionActionFilter, msReadOnlyCollectionActionFilter } from 'views-components/multiselect-toolbar/ms-collection-action-set';
 import {
     msProjectActionSet,
-    msProjectActionFilter,
+    msCommonProjectActionFilter,
     msReadOnlyProjectActionFilter,
     msFilterGroupActionFilter,
     msFrozenProjectActionFilter,
@@ -70,19 +70,20 @@ export enum msMenuResourceKind {
     SEARCH_RESULTS = 'SearchResults',
 }
 
-const { COLLECTION, COLLECTION_ADMIN, PROCESS, PROCESS_ADMIN, PROJECT, PROJECT_ADMIN, FROZEN_PROJECT, FROZEN_PROJECT_ADMIN, READONLY_PROJECT, FILTER_GROUP, WORKFLOW, READONLY_WORKFLOW } = msMenuResourceKind;
+const { COLLECTION, COLLECTION_ADMIN, READONLY_COLLECTION_FILES, PROCESS, PROCESS_ADMIN, PROJECT, PROJECT_ADMIN, FROZEN_PROJECT, FROZEN_PROJECT_ADMIN, READONLY_PROJECT, FILTER_GROUP, WORKFLOW, READONLY_WORKFLOW } = msMenuResourceKind;
 
 export type TMultiselectActionsFilters = Record<string, [MultiSelectMenuActionSet, Set<string>]>;
 
 export const multiselectActionsFilters: TMultiselectActionsFilters = {
-    [COLLECTION]: [msCollectionActionSet, allActionNames(msCollectionActionSet)],
-    [ResourceKind.COLLECTION]: [msCollectionActionSet, allActionNames(msCollectionActionSet)],
+    [COLLECTION]: [msCollectionActionSet, msCommonCollectionActionFilter],
+    [READONLY_COLLECTION_FILES]: [msCollectionActionSet, msReadOnlyCollectionActionFilter],
+    [ResourceKind.COLLECTION]: [msCollectionActionSet, msCommonCollectionActionFilter],
     [COLLECTION_ADMIN]: [msCollectionActionSet, allActionNames(msCollectionActionSet)],
     [PROCESS]: [msProcessActionSet, processResourceMSActionsFilter],
     [ResourceKind.PROCESS]: [msProcessActionSet, processResourceMSActionsFilter],
     [PROCESS_ADMIN]: [msProcessActionSet, processResourceMSActionsFilter],
-    [PROJECT]: [msProjectActionSet, msProjectActionFilter],
-    [ResourceKind.PROJECT]: [msProjectActionSet, msProjectActionFilter],
+    [PROJECT]: [msProjectActionSet, msCommonProjectActionFilter],
+    [ResourceKind.PROJECT]: [msProjectActionSet, msCommonProjectActionFilter],
     [PROJECT_ADMIN]: [msProjectActionSet, allActionNames(msProjectActionSet)],
     [FROZEN_PROJECT]: [msProjectActionSet, msFrozenProjectActionFilter],
     [FROZEN_PROJECT_ADMIN]: [msProjectActionSet, msFrozenProjectActionFilter], 

diff --git a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
index d9ad017b7e74f265d3a1a6647b3dfa2078e069b6..3156b6c37b646a6940587879c4e2097593560ac5 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
@@ -11,10 +11,10 @@ import { msCommonActionSet, MultiSelectMenuActionSet, MultiSelectMenuActionNames
 import { TrashIcon } from "components/icon/icon";
 import { openCollectionUpdateDialog } from "store/collections/collection-update-actions";
 
-const { MAKE_A_COPY, MOVE_TO, ADD_TO_TRASH, EDIT_COLLECTION } = MultiSelectMenuActionNames;
+const { MAKE_A_COPY, MOVE_TO, ADD_TO_TRASH, EDIT_COLLECTION, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW , ADD_TO_FAVORITES, SHARE} = MultiSelectMenuActionNames;
 
 const msCopyCollection: MultiSelectMenuAction = {
-    name: MultiSelectMenuActionNames.MAKE_A_COPY,
+    name: MAKE_A_COPY,
     icon: CopyIcon,
     hasAlts: false,
     isForMulti: true,
@@ -25,7 +25,7 @@ const msCopyCollection: MultiSelectMenuAction = {
 }
 
 const msMoveCollection: MultiSelectMenuAction = {
-    name: MultiSelectMenuActionNames.MOVE_TO,
+    name: MOVE_TO,
     icon: MoveToIcon,
     hasAlts: false,
     isForMulti: true,
@@ -33,7 +33,7 @@ const msMoveCollection: MultiSelectMenuAction = {
 }
 
 const msToggleTrashAction: MultiSelectMenuAction = {
-    name: MultiSelectMenuActionNames.ADD_TO_TRASH,
+    name: ADD_TO_TRASH,
     icon: TrashIcon,
     isForMulti: true,
     hasAlts: false,
@@ -64,4 +64,6 @@ export const msCollectionActionSet: MultiSelectMenuActionSet = [
     ],
 ];
 
-//edit collection
\ No newline at end of file
+export const msReadOnlyCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, OPEN_W_3RD_PARTY_CLIENT]);
+export const msCommonCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_TRASH])
+export const msOldCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_TRASH])
\ No newline at end of file

diff --git a/src/views-components/multiselect-toolbar/ms-project-action-set.ts b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
index 245fb708fa8915e102562769c321d959391910f9..221b3cf0a9ad4704ad197fa5da9ad9a8f6b45095 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-project-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
@@ -110,7 +110,7 @@ export const msProjectActionSet: MultiSelectMenuActionSet = [
     ],
 ];
 
-export const msProjectActionFilter = new Set<string>([
+export const msCommonProjectActionFilter = new Set<string>([
     ADD_TO_FAVORITES,
     ADD_TO_TRASH,
     API_DETAILS,
@@ -126,4 +126,4 @@ export const msProjectActionFilter = new Set<string>([
 ]);
 export const msReadOnlyProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS,]);
 export const msFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, FREEZE_PROJECT])
-export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, ADD_TO_TRASH, EDIT_PROJECT, MOVE_TO])
+export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, ADD_TO_TRASH, EDIT_PROJECT, MOVE_TO])
\ No newline at end of file