[arvados] updated: 2.7.0-6277-g2c736f0bab
git repository hosting
git at public.arvados.org
Mon Apr 1 16:59:51 UTC 2024
Summary of changes:
services/workbench2/cypress/e2e/process.cy.js | 1 -
services/workbench2/cypress/e2e/user-profile.cy.js | 6 ++---
.../action-sets/process-resource-action-set.ts | 14 +++++------
.../context-menu/menu-item-sort.ts | 3 +--
.../multiselect-toolbar/ms-process-action-set.ts | 29 +++++++++++-----------
5 files changed, 26 insertions(+), 27 deletions(-)
via 2c736f0babb3862b4d77210e3340473a1cf42082 (commit)
from f235379ac4b4c2216d42ae93233e5d0c5c1ae872 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 2c736f0babb3862b4d77210e3340473a1cf42082
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Mon Apr 1 12:59:47 2024 -0400
21448: removed move to from processes Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/cypress/e2e/process.cy.js b/services/workbench2/cypress/e2e/process.cy.js
index a0893bbde0..43fb1d22d1 100644
--- 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 baf9073d91..f5315cf456 100644
--- 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 33d44ebf60..9ea83bb29f 100644
--- 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 ee623de841..8a6b6b0e19 100644
--- 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 586424caef..3af26a338e 100644
--- 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 ]);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list