21448: removed move to from processes Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...

diff --git a/services/workbench2/cypress/e2e/process.cy.js b/services/workbench2/cypress/e2e/process.cy.js
index a0893bbde0e00877cfcbf359145d4b73c7f1be48..43fb1d22d1d8e3e80451934f57c5cd0f61e71f5b 100644 (file)
--- a/services/workbench2/cypress/e2e/process.cy.js
+++ b/services/workbench2/cypress/e2e/process.cy.js
@@ -96,7 +96,6 @@ describe("Process tests", function () {
                 'Edit process',
                 'Copy and re-run process',
                 'CANCEL',
-                'Move to',
                 'Remove',
                 'Add to favorites',
             ];

diff --git a/services/workbench2/cypress/e2e/user-profile.cy.js b/services/workbench2/cypress/e2e/user-profile.cy.js
index baf9073d9198599951f2dee29aac85a1f1f98ce6..f5315cf456a26751c5284958f82ecfac36f30684 100644 (file)
--- a/services/workbench2/cypress/e2e/user-profile.cy.js
+++ b/services/workbench2/cypress/e2e/user-profile.cy.js
@@ -79,7 +79,7 @@ describe('User profile tests', function() {
             cy.get('[role=button]').contains('API Details');
 
             cy.get('[role=button]').should(account ? 'contain' : 'not.contain', 'Account Settings');
-            cy.get('[role=button]').should(activate ? 'contain' : 'not.contain', 'Activate User');
+            cy.get('[role=button]').should(activate ? 'contain' : 'not.contain', 'Activate user');
             cy.get('[role=button]').should(deactivate ? 'contain' : 'not.contain', 'Deactivate user');
             cy.get('[role=button]').should(login ? 'contain' : 'not.contain', 'Login as user');
             cy.get('[role=button]').should(setup ? 'contain' : 'not.contain', 'Setup User');
@@ -400,7 +400,7 @@ describe('User profile tests', function() {
 
         // Activate user
         cy.get('[data-cy=user-profile-panel-options-btn]').click();
-        cy.get('[data-cy=context-menu]').contains('Activate User').click();
+        cy.get('[data-cy=context-menu]').contains('Activate user').click();
         cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
 
         // Check that user is active
@@ -434,7 +434,7 @@ describe('User profile tests', function() {
         });
         // reactivate
         cy.get('[data-cy=user-profile-panel-options-btn]').click();
-        cy.get('[data-cy=context-menu]').contains('Activate User').click();
+        cy.get('[data-cy=context-menu]').contains('Activate user').click();
         cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
 
         // Check that user is active

diff --git a/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts
index 33d44ebf60af70cdf2f37781056e323603b01a1c..9ea83bb29f49ef2002dee9cd088fb7617852b8e0 100644 (file)
--- a/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts
+++ b/services/workbench2/src/views-components/context-menu/action-sets/process-resource-action-set.ts
@@ -93,13 +93,13 @@ export const processResourceActionSet: ContextMenuActionSet = [
                 dispatch<any>(openProcessUpdateDialog(resources[0]));
             },
         },
-        {
-            icon: MoveToIcon,
-            name: ContextMenuActionNames.MOVE_TO,
-            execute: (dispatch, resources) => {
-                dispatch<any>(openMoveProcessDialog(resources[0]));
-            },
-        },
+        // {
+        //     icon: MoveToIcon,
+        //     name: ContextMenuActionNames.MOVE_TO,
+        //     execute: (dispatch, resources) => {
+        //         dispatch<any>(openMoveProcessDialog(resources[0]));
+        //     },
+        // },
         {
             name: ContextMenuActionNames.REMOVE,
             icon: RemoveIcon,

diff --git a/services/workbench2/src/views-components/context-menu/menu-item-sort.ts b/services/workbench2/src/views-components/context-menu/menu-item-sort.ts
index ee623de841deba428d0bf577e04268bb4f7ff555..8a6b6b0e19c1c1709d49aba770a203222c6a3554 100644 (file)
--- a/services/workbench2/src/views-components/context-menu/menu-item-sort.ts
+++ b/services/workbench2/src/views-components/context-menu/menu-item-sort.ts
@@ -66,7 +66,6 @@ const processOrder = [
     ContextMenuActionNames.EDIT_PROCESS,
     ContextMenuActionNames.COPY_AND_RERUN_PROCESS,
     ContextMenuActionNames.CANCEL,
-    ContextMenuActionNames.MOVE_TO,
     ContextMenuActionNames.REMOVE,
     ContextMenuActionNames.DIVIDER,
     ContextMenuActionNames.ADD_TO_FAVORITES,
@@ -144,7 +143,7 @@ export const menuDirection = {
     HORIZONTAL: 'horizontal'
 }
 
-export const sortMenuItems = (menuKind: ContextMenuKind, menuItems: ContextMenuAction[], orthagonality: string) => {
+export const sortMenuItems = (menuKind: ContextMenuKind, menuItems: ContextMenuAction[], orthagonality: string): ContextMenuAction[] => {
 
     const preferredOrder = kindToOrder[menuKind];
     //if no specified order, sort by name

diff --git a/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts b/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts
index 586424caefca042017ba86bf8d66e1f7f3c4a416..3af26a338e3c7a681f2c330b6260839ddf0e8edd 100644 (file)
--- a/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts
+++ b/services/workbench2/src/views-components/multiselect-toolbar/ms-process-action-set.ts
@@ -34,15 +34,16 @@ const msRemoveProcess: MultiSelectMenuAction = {
     },
 }
 
-const msMoveTo: MultiSelectMenuAction = {
-    name: ContextMenuActionNames.MOVE_TO,
-    icon: MoveToIcon,
-    hasAlts: false,
-    isForMulti: true,
-    execute: (dispatch, resources) => {
-        dispatch<any>(openMoveProcessDialog(resources[0]));
-    },
-}
+// removed until auto-move children is implemented
+// const msMoveTo: MultiSelectMenuAction = {
+//     name: ContextMenuActionNames.MOVE_TO,
+//     icon: MoveToIcon,
+//     hasAlts: false,
+//     isForMulti: true,
+//     execute: (dispatch, resources) => {
+//         dispatch<any>(openMoveProcessDialog(resources[0]));
+//     },
+// }
 
 const msViewOutputs: MultiSelectMenuAction = {
     name: ContextMenuActionNames.OUTPUTS,
@@ -81,18 +82,18 @@ export const msProcessActionSet: MultiSelectMenuActionSet = [
         ...msCommonActionSet,
         msCopyAndRerunProcess,
         msRemoveProcess,
-        msMoveTo,
+        // msMoveTo,
         msViewOutputs,
         msEditProcess,
         msCancelProcess
     ]
 ];
 
-const { MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS, CANCEL } = ContextMenuActionNames
+const {REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS, CANCEL } = ContextMenuActionNames
 
-export const msCommonProcessActionFilter = new Set([MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS ]);
-export const msRunningProcessActionFilter = new Set([MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS, CANCEL ]);
+export const msCommonProcessActionFilter = new Set([REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS ]);
+export const msRunningProcessActionFilter = new Set([REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, OUTPUTS, EDIT_PROCESS, CANCEL ]);
 
 export const msReadOnlyProcessActionFilter = new Set([COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, OUTPUTS ]);
-export const msAdminProcessActionFilter = new Set([MOVE_TO, REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS ]);
+export const msAdminProcessActionFilter = new Set([REMOVE, COPY_AND_RERUN_PROCESS, ADD_TO_FAVORITES, OPEN_IN_NEW_TAB, VIEW_DETAILS, API_DETAILS, SHARE, ADD_TO_PUBLIC_FAVORITES, OUTPUTS, EDIT_PROCESS ]);