From f092574812ee18b0454aa18095b04a32a0a222fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kuty=C5=82a?= Date: Tue, 4 Oct 2022 17:26:59 +0200 Subject: [PATCH 1/1] 18692: Fixed context menu naming MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła --- cypress/integration/group-manage.spec.js | 14 +++++++------- src/common/frozen-resources.ts | 1 - .../context-menu/action-sets/project-action-set.ts | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cypress/integration/group-manage.spec.js b/cypress/integration/group-manage.spec.js index 969983080e..ffe2c8c4df 100644 --- a/cypress/integration/group-manage.spec.js +++ b/cypress/integration/group-manage.spec.js @@ -254,7 +254,7 @@ describe('Group manage tests', function() { .should('not.contain', groupName + ' (renamed)'); }); - it.only('disables group-related controls for built-in groups', function() { + it('disables group-related controls for built-in groups', function() { cy.loginAs(adminUser); ['All users', 'Anonymous users', 'System group'].forEach((builtInGroup) => { @@ -262,20 +262,20 @@ describe('Group manage tests', function() { cy.get('[data-cy=groups-panel-data-explorer]').contains(builtInGroup).click(); // Check group member actions - // cy.get('[data-cy=group-members-data-explorer]') - // .within(() => { + cy.get('[data-cy=group-members-data-explorer]') + .within(() => { cy.get('[data-cy=group-member-add]').should('not.exist'); cy.get('[data-cy=user-visible-checkbox] input').should('be.disabled'); cy.get('[data-cy=resource-delete-button]').should('be.disabled'); - // cy.get('[data-cy=edit-permission-button]').should('not.exist'); - // }); + cy.get('[data-cy=edit-permission-button]').should('not.exist'); + }); // Check permissions actions cy.get('[data-cy=group-details-permissions-tab]').click(); - // cy.get('[data-cy=group-permissions-data-explorer]').within(() => { + cy.get('[data-cy=group-permissions-data-explorer]').within(() => { cy.get('[data-cy=resource-delete-button]').should('be.disabled'); cy.get('[data-cy=edit-permission-button]').should('not.exist'); - // }); + }); }); }); diff --git a/src/common/frozen-resources.ts b/src/common/frozen-resources.ts index 7981ace05d..8d2279158c 100644 --- a/src/common/frozen-resources.ts +++ b/src/common/frozen-resources.ts @@ -10,7 +10,6 @@ export const resourceIsFrozen = (resource: any, resources): boolean => { let ownerUuid: string | undefined = resource?.ownerUuid; while(!isFrozen && !!ownerUuid && ownerUuid.indexOf('000000000000000') === -1) { - console.log(isFrozen, ownerUuid, resource.uuid, resource); const parentResource: ProjectResource | undefined = getResource(ownerUuid)(resources); isFrozen = !!parentResource?.frozenByUuid; ownerUuid = parentResource?.ownerUuid; diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts index 04edba6779..8181045ca3 100644 --- a/src/views-components/context-menu/action-sets/project-action-set.ts +++ b/src/views-components/context-menu/action-sets/project-action-set.ts @@ -57,7 +57,7 @@ export const viewDetailsAction = { export const advancedAction = { icon: AdvancedIcon, - name: "Advanced", + name: "API Details", execute: (dispatch, resource) => { dispatch(openAdvancedTabDialog(resource.uuid)); } -- 2.30.2