18692: Fixed context menu naming

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

diff --git a/cypress/integration/group-manage.spec.js b/cypress/integration/group-manage.spec.js
index 969983080ec8a9364d63065eb30af5f7c0e26c8e..ffe2c8c4dfd27ac892007213c2209b0afff4686c 100644 (file)
--- 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)');
     });
 
             .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) => {
         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=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=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();
 
             // 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');
                 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 7981ace05d765b43b16acc48694e588262d269e1..8d2279158cd73fa49e8d685a810b51b5e012a01f 100644 (file)
--- 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) {
     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<ProjectResource>(ownerUuid)(resources);
         isFrozen = !!parentResource?.frozenByUuid;
         ownerUuid = parentResource?.ownerUuid;
         const parentResource: ProjectResource | undefined = getResource<ProjectResource>(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 04edba67793dbb11919bd829b58b603247ea9e99..8181045ca3346d1e378aeffedd2c014a90545a35 100644 (file)
--- 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,
 
 export const advancedAction = {
     icon: AdvancedIcon,

-    name: "Advanced",
+    name: "API Details",

     execute: (dispatch, resource) => {
         dispatch(openAdvancedTabDialog(resource.uuid));
     }
     execute: (dispatch, resource) => {
         dispatch(openAdvancedTabDialog(resource.uuid));
     }