[arvados-workbench2] updated: 2.7.0-145-gc38a6d84
git repository hosting
git at public.arvados.org
Tue Oct 17 13:52:07 UTC 2023
Summary of changes:
cypress/integration/collection.spec.js | 54 ----------------------
.../api-client-authorization-action-set.ts | 12 ++---
.../context-menu/action-sets/group-action-set.ts | 8 ++--
.../action-sets/group-member-action-set.ts | 6 +--
.../action-sets/keep-service-action-set.ts | 6 +--
.../context-menu/action-sets/link-action-set.ts | 6 +--
.../action-sets/repository-action-set.ts | 8 ++--
.../action-sets/root-project-action-set.ts | 4 +-
.../action-sets/search-results-action-set.ts | 2 +-
.../context-menu/action-sets/ssh-key-action-set.ts | 6 +--
.../action-sets/trashed-collection-action-set.ts | 2 +-
.../context-menu/action-sets/user-action-set.ts | 16 +++----
.../action-sets/virtual-machine-action-set.ts | 6 +--
src/views-components/data-explorer/renderers.tsx | 1 -
14 files changed, 38 insertions(+), 99 deletions(-)
via c38a6d84f0dc5bf5a5048095396a9142de9938d5 (commit)
from a4257a0f91ce403f09c01a89e982e5e336a0f033 (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 c38a6d84f0dc5bf5a5048095396a9142de9938d5
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Oct 17 09:51:44 2023 -0400
15768: feedback cleanup Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index 35f36e1e..f83a9741 100644
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -453,60 +453,6 @@ describe("Collection panel tests", function () {
});
});
- it("renames a file to a different directory", function () {
- // Creates the collection using the admin token so we can set up
- // a bogus manifest text without block signatures.
- cy.createCollection(adminUser.token, {
- name: `Test collection ${Math.floor(Math.random() * 999999)}`,
- owner_uuid: activeUser.user.uuid,
- manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n",
- })
- .as("testCollection")
- .then(function () {
- cy.loginAs(activeUser);
- cy.goToPath(`/collections/${this.testCollection.uuid}`);
-
- ["subdir", "G%C3%BCnter's%20file", "table%&?*2"].forEach(subdir => {
- cy.waitForDom().get("[data-cy=collection-files-panel]").contains("bar").rightclick();
- cy.get("[data-cy=context-menu]").contains("Rename").click();
- cy.get("[data-cy=form-dialog]")
- .should("contain", "Rename")
- .within(() => {
- cy.get("input").type(`{selectall}{backspace}${subdir}/foo`);
- });
- cy.get("[data-cy=form-submit-btn]").click();
- cy.get("[data-cy=collection-files-panel]").should("not.contain", "bar").and("contain", subdir);
- cy.get("[data-cy=collection-files-panel]").contains(subdir).click();
-
- // Rename 'subdir/foo' to 'bar'
- cy.wait(1000);
- cy.get("[data-cy=collection-files-panel]").contains("foo").rightclick();
- cy.get("[data-cy=context-menu]").contains("Rename").click();
- cy.get("[data-cy=form-dialog]")
- .should("contain", "Rename")
- .within(() => {
- cy.get("input").should("have.value", `${subdir}/foo`).type(`{selectall}{backspace}bar`);
- });
- cy.get("[data-cy=form-submit-btn]").click();
-
- // need to wait for dialog to dismiss
- cy.get("[data-cy=form-dialog]").should("not.exist");
-
- cy.waitForDom().get("[data-cy=collection-files-panel]").contains("Home").click();
-
- cy.wait(2000);
- cy.get("[data-cy=collection-files-panel]")
- .should("contain", subdir) // empty dir kept
- .and("contain", "bar");
-
- cy.get("[data-cy=collection-files-panel]").contains(subdir).rightclick();
- cy.get("[data-cy=context-menu]").contains("Remove").click();
- cy.get("[data-cy=confirmation-dialog-ok-btn]").click();
- cy.get("[data-cy=form-dialog]").should("not.exist");
- });
- });
- });
-
it("shows collection owner", () => {
cy.createCollection(adminUser.token, {
name: `Test collection ${Math.floor(Math.random() * 999999)}`,
diff --git a/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts b/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts
index 0d3bebb1..8e75d22f 100644
--- a/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts
+++ b/src/views-components/context-menu/action-sets/api-client-authorization-action-set.ts
@@ -16,27 +16,21 @@ export const apiClientAuthorizationActionSet: ContextMenuActionSet = [
name: "Attributes",
icon: AttributesIcon,
execute: (dispatch, resources) => {
- for (const resource of [...resources]) {
- dispatch<any>(openApiClientAuthorizationAttributesDialog(resource.uuid));
- }
+ dispatch<any>(openApiClientAuthorizationAttributesDialog(resources[0].uuid));
},
},
{
name: "API Details",
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- for (const resource of [...resources]) {
- dispatch<any>(openAdvancedTabDialog(resource.uuid));
- }
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: "Remove",
icon: RemoveIcon,
execute: (dispatch, resources) => {
- for (const resource of [...resources]) {
- dispatch<any>(openApiClientAuthorizationRemoveDialog(resource.uuid));
- }
+ dispatch<any>(openApiClientAuthorizationRemoveDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/group-action-set.ts b/src/views-components/context-menu/action-sets/group-action-set.ts
index 23d88264..816583fa 100644
--- a/src/views-components/context-menu/action-sets/group-action-set.ts
+++ b/src/views-components/context-menu/action-sets/group-action-set.ts
@@ -13,28 +13,28 @@ export const groupActionSet: ContextMenuActionSet = [
name: 'Rename',
icon: RenameIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openGroupUpdateDialog(resource)));
+ dispatch<any>(openGroupUpdateDialog(resources[0]))
},
},
{
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openGroupAttributes(resource.uuid)));
+ dispatch<any>(openGroupAttributes(resources[0].uuid))
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Remove',
icon: RemoveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openRemoveGroupDialog(resource.uuid)));
+ dispatch<any>(openRemoveGroupDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/group-member-action-set.ts b/src/views-components/context-menu/action-sets/group-member-action-set.ts
index 17b3d74c..ad1ce97c 100644
--- a/src/views-components/context-menu/action-sets/group-member-action-set.ts
+++ b/src/views-components/context-menu/action-sets/group-member-action-set.ts
@@ -13,21 +13,21 @@ export const groupMemberActionSet: ContextMenuActionSet = [
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openGroupMemberAttributes(resource.uuid)));
+ dispatch<any>(openGroupMemberAttributes(resources[0].uuid));
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Remove',
icon: RemoveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openRemoveGroupMemberDialog(resource.uuid)));
+ dispatch<any>(openRemoveGroupMemberDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/keep-service-action-set.ts b/src/views-components/context-menu/action-sets/keep-service-action-set.ts
index 0d2cbd07..2957f008 100644
--- a/src/views-components/context-menu/action-sets/keep-service-action-set.ts
+++ b/src/views-components/context-menu/action-sets/keep-service-action-set.ts
@@ -13,21 +13,21 @@ export const keepServiceActionSet: ContextMenuActionSet = [
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openKeepServiceAttributesDialog(resource.uuid)));
+ dispatch<any>(openKeepServiceAttributesDialog(resources[0].uuid));
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Remove',
icon: RemoveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openKeepServiceRemoveDialog(resource.uuid)));
+ dispatch<any>(openKeepServiceRemoveDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/link-action-set.ts b/src/views-components/context-menu/action-sets/link-action-set.ts
index 4f0b330e..86458423 100644
--- a/src/views-components/context-menu/action-sets/link-action-set.ts
+++ b/src/views-components/context-menu/action-sets/link-action-set.ts
@@ -13,21 +13,21 @@ export const linkActionSet: ContextMenuActionSet = [
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openLinkAttributesDialog(resource.uuid)));
+ dispatch<any>(openLinkAttributesDialog(resources[0].uuid));
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Remove',
icon: RemoveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openLinkRemoveDialog(resource.uuid)));
+ dispatch<any>(openLinkRemoveDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/repository-action-set.ts b/src/views-components/context-menu/action-sets/repository-action-set.ts
index e893a7fa..cbdcd004 100644
--- a/src/views-components/context-menu/action-sets/repository-action-set.ts
+++ b/src/views-components/context-menu/action-sets/repository-action-set.ts
@@ -14,28 +14,28 @@ export const repositoryActionSet: ContextMenuActionSet = [
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openRepositoryAttributes(resource.uuid)));
+ dispatch<any>(openRepositoryAttributes(resources[0].uuid));
},
},
{
name: 'Share',
icon: ShareIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openSharingDialog(resource.uuid)));
+ dispatch<any>(openSharingDialog(resources[0].uuid));
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Remove',
icon: RemoveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openRemoveRepositoryDialog(resource.uuid)));
+ dispatch<any>(openRemoveRepositoryDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/root-project-action-set.ts b/src/views-components/context-menu/action-sets/root-project-action-set.ts
index afd7a477..a779d1eb 100644
--- a/src/views-components/context-menu/action-sets/root-project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/root-project-action-set.ts
@@ -13,14 +13,14 @@ export const rootProjectActionSet: ContextMenuActionSet = [
icon: NewProjectIcon,
name: 'New project',
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openProjectCreateDialog(resource.uuid)));
+ dispatch<any>(openProjectCreateDialog(resources[0].uuid));
},
},
{
icon: CollectionIcon,
name: 'New Collection',
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openCollectionCreateDialog(resource.uuid)));
+ dispatch<any>(openCollectionCreateDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/search-results-action-set.ts b/src/views-components/context-menu/action-sets/search-results-action-set.ts
index 4921cfc3..dcc9eae2 100644
--- a/src/views-components/context-menu/action-sets/search-results-action-set.ts
+++ b/src/views-components/context-menu/action-sets/search-results-action-set.ts
@@ -35,7 +35,7 @@ export const searchResultsActionSet: ContextMenuActionSet = [
icon: AdvancedIcon,
name: 'API Details',
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
index f0620ede..c31e1681 100644
--- a/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
+++ b/src/views-components/context-menu/action-sets/ssh-key-action-set.ts
@@ -13,21 +13,21 @@ export const sshKeyActionSet: ContextMenuActionSet = [
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openSshKeyAttributesDialog(resource.uuid)));
+ dispatch<any>(openSshKeyAttributesDialog(resources[0].uuid));
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Remove',
icon: RemoveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openSshKeyRemoveDialog(resource.uuid)));
+ dispatch<any>(openSshKeyRemoveDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts b/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts
index 8b8b7c6e..3e8f0cb6 100644
--- a/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/trashed-collection-action-set.ts
@@ -28,7 +28,7 @@ export const trashedCollectionActionSet: ContextMenuActionSet = [
icon: AdvancedIcon,
name: 'API Details',
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
diff --git a/src/views-components/context-menu/action-sets/user-action-set.ts b/src/views-components/context-menu/action-sets/user-action-set.ts
index 104402a7..0108ff7e 100644
--- a/src/views-components/context-menu/action-sets/user-action-set.ts
+++ b/src/views-components/context-menu/action-sets/user-action-set.ts
@@ -32,28 +32,28 @@ export const userActionSet: ContextMenuActionSet = [
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openUserAttributes(resource.uuid)));
+ dispatch<any>(openUserAttributes(resources[0].uuid));
},
},
{
name: 'Project',
icon: ProjectIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openUserProjects(resource.uuid)));
+ dispatch<any>(openUserProjects(resources[0].uuid));
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Account Settings',
icon: UserPanelIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(navigateToUserProfile(resource.uuid)));
+ dispatch<any>(navigateToUserProfile(resources[0].uuid));
},
filters: [needsUserProfileLink],
},
@@ -63,7 +63,7 @@ export const userActionSet: ContextMenuActionSet = [
name: 'Activate User',
icon: ActiveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openActivateDialog(resource.uuid)));
+ dispatch<any>(openActivateDialog(resources[0].uuid));
},
filters: [isAdmin, canActivateUser],
},
@@ -71,7 +71,7 @@ export const userActionSet: ContextMenuActionSet = [
name: 'Setup User',
icon: AdminMenuIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openSetupDialog(resource.uuid)));
+ dispatch<any>(openSetupDialog(resources[0].uuid));
},
filters: [isAdmin, canSetupUser],
},
@@ -79,7 +79,7 @@ export const userActionSet: ContextMenuActionSet = [
name: 'Deactivate User',
icon: DeactivateUserIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openDeactivateDialog(resource.uuid)));
+ dispatch<any>(openDeactivateDialog(resources[0].uuid));
},
filters: [isAdmin, canDeactivateUser],
},
@@ -87,7 +87,7 @@ export const userActionSet: ContextMenuActionSet = [
name: 'Login As User',
icon: LoginAsIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(loginAs(resource.uuid)));
+ dispatch<any>(loginAs(resources[0].uuid));
},
filters: [isAdmin, isOtherUser],
},
diff --git a/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts b/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
index 7cb13bd2..a26cbe13 100644
--- a/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
+++ b/src/views-components/context-menu/action-sets/virtual-machine-action-set.ts
@@ -13,21 +13,21 @@ export const virtualMachineActionSet: ContextMenuActionSet = [
name: 'Attributes',
icon: AttributesIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openVirtualMachineAttributes(resource.uuid)));
+ dispatch<any>(openVirtualMachineAttributes(resources[0].uuid));
},
},
{
name: 'API Details',
icon: AdvancedIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+ dispatch<any>(openAdvancedTabDialog(resources[0].uuid));
},
},
{
name: 'Remove',
icon: RemoveIcon,
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch<any>(openRemoveVirtualMachineDialog(resource.uuid)));
+ dispatch<any>(openRemoveVirtualMachineDialog(resources[0].uuid));
},
},
],
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index dca06084..257eacfb 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -521,7 +521,6 @@ const renderResourceLink = (dispatch: Dispatch, item: Resource) => {
color="primary"
style={{ cursor: "pointer" }}
onClick={() => {
- console.log(item);
item.kind === ResourceKind.GROUP && (item as GroupResource).groupClass === "role"
? dispatch<any>(navigateToGroupDetails(item.uuid))
: dispatch<any>(navigateTo(item.uuid));
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list