21448: changed int tests to new menu orders Arvados-DCO-1.1-Signed-off-by: Lisa Knox...
authorLisa Knox <lisaknox83@gmail.com>
Mon, 1 Apr 2024 15:07:01 +0000 (11:07 -0400)
committerLisa Knox <lisaknox83@gmail.com>
Mon, 1 Apr 2024 15:07:01 +0000 (11:07 -0400)
15 files changed:
services/workbench2/cypress/e2e/collection.cy.js
services/workbench2/cypress/e2e/process.cy.js
services/workbench2/cypress/e2e/project.cy.js
services/workbench2/cypress/e2e/workflow.cy.js
services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
services/workbench2/src/views-components/context-menu/action-sets/collection-action-set.ts
services/workbench2/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
services/workbench2/src/views-components/context-menu/action-sets/project-action-set.ts
services/workbench2/src/views-components/context-menu/action-sets/search-results-action-set.ts
services/workbench2/src/views-components/context-menu/action-sets/workflow-action-set.ts
services/workbench2/src/views-components/context-menu/context-menu-action-set.ts
services/workbench2/src/views-components/context-menu/menu-item-sort.ts
services/workbench2/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
services/workbench2/src/views-components/multiselect-toolbar/ms-project-action-set.ts
services/workbench2/src/views-components/multiselect-toolbar/ms-workflow-action-set.ts

index 3a5cc27ec548fd335f60c599504ea3e15c8706f8..b715cd08b1794213a08058b7a2c1edb6b6bf84f9 100644 (file)
@@ -30,17 +30,17 @@ describe("Collection panel tests", function () {
     it('shows the appropriate buttons in the toolbar', () => {
 
         const msButtonTooltips = [
-            'API Details',
-            'Add to favorites',
+            'View details',
+            'Open in new tab',
             'Copy link to clipboard',
+            'Open with 3rd party client',
+            'API Details',
             'Edit collection',
-            'Make a copy',
+            'Share',
             'Move to',
+            'Make a copy',
             'Move to trash',
-            'Open in new tab',
-            'Open with 3rd party client',
-            'Share',
-            'View details',
+            'Add to favorites',
         ];
 
         cy.loginAs(activeUser);
index ccef34efbc4d91b3c2721a71bf0e807e2a01b6a2..a0893bbde0e00877cfcbf359145d4b73c7f1be48 100644 (file)
@@ -89,17 +89,16 @@ describe("Process tests", function () {
         it('shows the appropriate buttons in the toolbar', () => {
 
             const msButtonTooltips = [
+                'View details',
+                'Open in new tab',
+                'Outputs',
                 'API Details',
-                'Add to favorites',
-                'CANCEL',
-                'Copy and re-run process',
                 'Edit process',
+                'Copy and re-run process',
+                'CANCEL',
                 'Move to',
-                'Open in new tab',
-                'Outputs',
                 'Remove',
-                'Share',
-                'View details',
+                'Add to favorites',
             ];
 
             createContainerRequest(
index 912e765a88b2558de9cd1cfd27a5fa9d1e5251be..f16805149a5cd128bf7c8a12e6286dabfe5d8229 100644 (file)
@@ -219,18 +219,18 @@ describe("Project tests", function () {
     it('shows the appropriate buttons in the multiselect toolbar', () => {
 
         const msButtonTooltips = [
-            'API Details',
-            'Add to favorites',
+            'View details',
+            'Open in new tab',
             'Copy link to clipboard',
+            'Open with 3rd party client',
+            'API Details',
+            'New project',
             'Edit project',
-            'Freeze project',
+            'Share',
             'Move to',
             'Move to trash',
-            'New project',
-            'Open in new tab',
-            'Open with 3rd party client',
-            'Share',
-            'View details',
+            'Freeze project',
+            'Add to favorites',
         ];
 
         cy.loginAs(activeUser);
index f0c91a772220481c662fbd4c4aae4852f1299813..b9cf86c55652c003077b25abfa9c0498b0f0370d 100644 (file)
@@ -269,12 +269,12 @@ describe('Registered workflow panel tests', function() {
     it('shows the appropriate buttons in the multiselect toolbar', () => {
 
         const msButtonTooltips = [
-            'API Details',
-            'Copy link to clipboard',
-            'Delete Workflow',
+            'View details',
             'Open in new tab',
+            'Copy link to clipboard',
+            'API Details',
             'Run Workflow',
-            'View details',
+            'Delete Workflow',
         ];
 
         cy.createResource(activeUser.token, "workflows", {workflow: {name: "Test wf"}})
index d8a5fe9023c3532d5225393fbe6cee628830b83f..cf7763b19c2314f280e8e75d0fee059ee690e690 100644 (file)
@@ -339,7 +339,7 @@ function mapDispatchToProps(dispatch: Dispatch) {
                     const action = findActionByName(selectedAction.name as string, kindToActionSet[firstResource.kind]);
                     if (action) action.execute(dispatch, kindGroups[firstResource.kind]);
                     break;
-                case ContextMenuActionNames.COPY_TO_CLIPBOARD:
+                case ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD:
                     const selectedResources = selectedToArray(checkedList).map(uuid => getResource(uuid)(resources));
                     dispatch<any>(copyToClipboardAction(selectedResources));
                     break;
index f046ebece3307533d304bc5224d65ed92b28b5bf..7f8ad9e9e08da20e29be0f98be8d4118919f0e89 100644 (file)
@@ -56,7 +56,7 @@ const commonActionSet: ContextMenuActionSet = [
         },
         {
             icon: Link,
-            name: ContextMenuActionNames.COPY_TO_CLIPBOARD,
+            name: ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
             execute: (dispatch, resources) => {
                 dispatch<any>(copyToClipboardAction(resources));
             },
index d22c1dcdb087992d0b6bb8f0ac90de5d765ae76f..68edb13433f48a0cc8a5383f88f26cf9ae66e464 100644 (file)
@@ -42,7 +42,7 @@ export const readOnlyCollectionDirectoryItemActionSet: ContextMenuActionSet = [
         },
         {
             component: CollectionCopyToClipboardAction,
-            name: ContextMenuActionNames.COPY_TO_CLIPBOARD,
+            name: ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
             execute: () => {
                 return;
             },
index 1be6c8f13b3b398f26778c0f1fe91f8b5f9d8eb6..8ef968eea9a4025eb10f3f349001898b42be15d8 100644 (file)
@@ -41,7 +41,7 @@ export const openInNewTabMenuAction = {
 
 export const copyToClipboardMenuAction = {
     icon: Link,
-    name: ContextMenuActionNames.COPY_TO_CLIPBOARD,
+    name: ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
     execute: (dispatch, resources) => {
         dispatch(copyToClipboardAction(resources));
     },
index 54315d587714f13c8a4c6834e4b401cc499a97a0..debaf2dabfaff3403620abec4313b99d2b25e806 100644 (file)
@@ -19,7 +19,7 @@ export const searchResultsActionSet: ContextMenuActionSet = [
         },
         {
             icon: Link,
-            name: ContextMenuActionNames.COPY_TO_CLIPBOARD,
+            name: ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
             execute: (dispatch, resources) => {
                 dispatch<any>(copyToClipboardAction(resources));
             },
index e0787f94ee8d808e4ea487554871560684cd5b2e..f03340db4b91758f2c2b7130df92c1cff239e62b 100644 (file)
@@ -20,7 +20,7 @@ export const readOnlyWorkflowActionSet: ContextMenuActionSet = [
         },
         {
             icon: Link,
-            name: ContextMenuActionNames.COPY_TO_CLIPBOARD,
+            name: ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
             execute: (dispatch, resources) => {
                 dispatch<any>(copyToClipboardAction(resources));
             },
index d67c4ea7f8ff1c6abf17914010b86f09273c0d26..38de735e29779f4e1f3f54bcdba0cabe1e87df92 100644 (file)
@@ -20,7 +20,7 @@ export enum ContextMenuActionNames {
     COPY_SELECTED_INTO_EXISTING_COLLECTION = 'Copy selected into existing collection',
     COPY_SELECTED_INTO_SEPARATE_COLLECTIONS = 'Copy selected into separate collections',
     COPY_SELECTED_INTO_NEW_COLLECTION = 'Copy selected into new collection',
-    COPY_TO_CLIPBOARD = 'Copy link to clipboard',
+    COPY_LINK_TO_CLIPBOARD = 'Copy link to clipboard',
     DEACTIVATE_USER = 'Deactivate user',
     DELETE_WORKFLOW = 'Delete Workflow',
     DIVIDER = 'Divider',
index b178edfe10a03dcb213586421aabac8f7fd265d3..d11866f121a9fa9b81115531b8699bcca1795be1 100644 (file)
@@ -65,6 +65,7 @@ const processOrder = [
     ContextMenuActionNames.DIVIDER,
     ContextMenuActionNames.EDIT_PROCESS,
     ContextMenuActionNames.COPY_AND_RERUN_PROCESS,
+    ContextMenuActionNames.CANCEL,
     ContextMenuActionNames.MOVE_TO,
     ContextMenuActionNames.REMOVE,
     ContextMenuActionNames.DIVIDER,
@@ -75,7 +76,7 @@ const processOrder = [
 const projectOrder = [
     ContextMenuActionNames.VIEW_DETAILS,
     ContextMenuActionNames.OPEN_IN_NEW_TAB,
-    ContextMenuActionNames.COPY_TO_CLIPBOARD,
+    ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
     ContextMenuActionNames.OPEN_WITH_3RD_PARTY_CLIENT,
     ContextMenuActionNames.API_DETAILS,
     ContextMenuActionNames.DIVIDER,
@@ -83,7 +84,7 @@ const projectOrder = [
     ContextMenuActionNames.EDIT_PROJECT,
     ContextMenuActionNames.SHARE,
     ContextMenuActionNames.MOVE_TO,
-    ContextMenuActionNames.REMOVE,
+    ContextMenuActionNames.MOVE_TO_TRASH,
     ContextMenuActionNames.DIVIDER,
     ContextMenuActionNames.FREEZE_PROJECT,
     ContextMenuActionNames.ADD_TO_FAVORITES,
@@ -93,11 +94,10 @@ const projectOrder = [
 const collectionOrder = [
     ContextMenuActionNames.VIEW_DETAILS,
     ContextMenuActionNames.OPEN_IN_NEW_TAB,
-    ContextMenuActionNames.COPY_TO_CLIPBOARD,
+    ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
     ContextMenuActionNames.OPEN_WITH_3RD_PARTY_CLIENT,
     ContextMenuActionNames.API_DETAILS,
     ContextMenuActionNames.DIVIDER,
-    ContextMenuActionNames.NEW_COLLECTION,
     ContextMenuActionNames.EDIT_COLLECTION,
     ContextMenuActionNames.SHARE,
     ContextMenuActionNames.MOVE_TO,
@@ -111,11 +111,11 @@ const collectionOrder = [
 const workflowOrder = [
     ContextMenuActionNames.VIEW_DETAILS,
     ContextMenuActionNames.OPEN_IN_NEW_TAB,
-    ContextMenuActionNames.COPY_TO_CLIPBOARD,
+    ContextMenuActionNames.COPY_LINK_TO_CLIPBOARD,
     ContextMenuActionNames.API_DETAILS,
     ContextMenuActionNames.DIVIDER,
     ContextMenuActionNames.RUN_WORKFLOW,
-    ContextMenuActionNames.REMOVE,
+    ContextMenuActionNames.DELETE_WORKFLOW,
 ]
 
 const kindToOrder: Record<string, ContextMenuActionNames[]> = {
index d2e7b51e1d2464db28b04c9958705757f7d65683..19709faec449ef529f716ed7e4005f3f087d76b5 100644 (file)
@@ -16,7 +16,7 @@ import { openWebDavS3InfoDialog } from "store/collections/collection-info-action
 import { openSharingDialog } from "store/sharing-dialog/sharing-dialog-actions";
 
 
-const { MAKE_A_COPY, MOVE_TO, MOVE_TO_TRASH, EDIT_COLLECTION, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, SHARE} = ContextMenuActionNames;
+const { MAKE_A_COPY, MOVE_TO, MOVE_TO_TRASH, EDIT_COLLECTION, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, COPY_LINK_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, SHARE} = ContextMenuActionNames;
 
 const msCopyCollection: MultiSelectMenuAction = {
     name: MAKE_A_COPY,
@@ -60,7 +60,7 @@ const msEditCollection: MultiSelectMenuAction = {
 }
 
 const msCopyToClipboardMenuAction: MultiSelectMenuAction  = {
-    name: COPY_TO_CLIPBOARD,
+    name: COPY_LINK_TO_CLIPBOARD,
     icon: Link,
     hasAlts: false,
     isForMulti: false,
@@ -102,6 +102,6 @@ export const msCollectionActionSet: MultiSelectMenuActionSet = [
     ],
 ];
 
-export const msReadOnlyCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, OPEN_WITH_3RD_PARTY_CLIENT]);
-export const msCommonCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_WITH_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, MOVE_TO_TRASH])
-export const msOldCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_WITH_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, MOVE_TO_TRASH])
\ No newline at end of file
+export const msReadOnlyCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_LINK_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, OPEN_WITH_3RD_PARTY_CLIENT]);
+export const msCommonCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_LINK_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_WITH_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, MOVE_TO_TRASH])
+export const msOldCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_LINK_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_WITH_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, MOVE_TO_TRASH])
\ No newline at end of file
index 849dedd36d67c42aa1bca452f9d93128fb30e8f0..0723eaa497b768b7ed15b9dee5a2179644bce204 100644 (file)
@@ -27,7 +27,7 @@ const {
     ADD_TO_FAVORITES,
     ADD_TO_PUBLIC_FAVORITES,
     OPEN_IN_NEW_TAB,
-    COPY_TO_CLIPBOARD,
+    COPY_LINK_TO_CLIPBOARD,
     VIEW_DETAILS,
     API_DETAILS,
     OPEN_WITH_3RD_PARTY_CLIENT,
@@ -40,7 +40,7 @@ const {
 } = ContextMenuActionNames;
 
 const msCopyToClipboardMenuAction: MultiSelectMenuAction  = {
-    name: COPY_TO_CLIPBOARD,
+    name: COPY_LINK_TO_CLIPBOARD,
     icon: Link,
     hasAlts: false,
     isForMulti: false,
@@ -153,7 +153,7 @@ export const msCommonProjectActionFilter = new Set<string>([
     ADD_TO_FAVORITES,
     MOVE_TO_TRASH,
     API_DETAILS,
-    COPY_TO_CLIPBOARD,
+    COPY_LINK_TO_CLIPBOARD,
     EDIT_PROJECT,
     FREEZE_PROJECT,
     MOVE_TO,
@@ -163,9 +163,9 @@ export const msCommonProjectActionFilter = new Set<string>([
     SHARE,
     VIEW_DETAILS,
 ]);
-export const msReadOnlyProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS,]);
-export const msFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, FREEZE_PROJECT])
-export const msAdminFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, FREEZE_PROJECT, ADD_TO_PUBLIC_FAVORITES])
+export const msReadOnlyProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_LINK_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS,]);
+export const msFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_LINK_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, FREEZE_PROJECT])
+export const msAdminFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_LINK_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, FREEZE_PROJECT, ADD_TO_PUBLIC_FAVORITES])
 
-export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, MOVE_TO_TRASH, EDIT_PROJECT, MOVE_TO])
-export const msAdminFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, MOVE_TO_TRASH, EDIT_PROJECT, MOVE_TO, ADD_TO_PUBLIC_FAVORITES])
\ No newline at end of file
+export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_LINK_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, MOVE_TO_TRASH, EDIT_PROJECT, MOVE_TO])
+export const msAdminFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_LINK_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_WITH_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, MOVE_TO_TRASH, EDIT_PROJECT, MOVE_TO, ADD_TO_PUBLIC_FAVORITES])
\ No newline at end of file
index 25b015b47abfe0695b7cce9aa89c7cd50a94a0a6..9c5cdd79e03cc72e97659b33f1133407b53473db 100644 (file)
@@ -10,7 +10,7 @@ import { copyToClipboardAction } from 'store/open-in-new-tab/open-in-new-tab.act
 import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions';
 import { ShareIcon } from 'components/icon/icon';
 
-const { OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW, SHARE } = ContextMenuActionNames;
+const { OPEN_IN_NEW_TAB, COPY_LINK_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW, SHARE } = ContextMenuActionNames;
 
 const msRunWorkflow: MultiSelectMenuAction = {
     name: RUN_WORKFLOW,
@@ -33,7 +33,7 @@ const msDeleteWorkflow: MultiSelectMenuAction = {
 };
 
 const msCopyToClipboardMenuAction: MultiSelectMenuAction  = {
-    name: COPY_TO_CLIPBOARD,
+    name: COPY_LINK_TO_CLIPBOARD,
     icon: Link,
     hasAlts: false,
     isForMulti: false,
@@ -54,5 +54,5 @@ const msShareAction: MultiSelectMenuAction  = {
 
 export const msWorkflowActionSet: MultiSelectMenuActionSet = [[...msCommonActionSet, msRunWorkflow, msDeleteWorkflow, msCopyToClipboardMenuAction, msShareAction]];
 
-export const msReadOnlyWorkflowActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW ]);
-export const msWorkflowActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW]);
+export const msReadOnlyWorkflowActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_LINK_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW ]);
+export const msWorkflowActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_LINK_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, RUN_WORKFLOW, DELETE_WORKFLOW]);