From 058bc034254e5fa2fe3eed6fe22fe69cc83f729d Mon Sep 17 00:00:00 2001 From: Yulia Krimerman Date: Wed, 16 Oct 2024 13:26:18 -0400 Subject: [PATCH 1/2] working version --- .../modelRegistryPermissions.cy.ts | 22 +++++++++++++++++-- .../RoleBindingPermissionsTableRow.tsx | 18 +++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts index 3f4d3d7d0d..586070c0a8 100644 --- a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts +++ b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts @@ -396,8 +396,26 @@ describe('MR Permissions', () => { it('Disabled actions on default group', () => { initIntercepts({ isEmpty: false }); modelRegistryPermissions.visit('example-mr'); - groupTable.getTableRow('example-mr-users').findKebab().should('be.disabled'); - groupTable.getTableRow('example-mr-users-2').findKebab().should('not.be.disabled'); + + cy.contains('td', 'example-mr-users') + .closest('tr') + .within(() => { + cy.get('button[aria-disabled="true"]') + .should('exist') + .and( + 'have.attr', + 'aria-label', + 'The default group always has access to model registry.', + ) + .find('svg') + .should('exist'); + }); + + cy.contains('td', 'example-mr-users-2') + .closest('tr') + .within(() => { + cy.get('button:not([aria-disabled="true"])').should('exist').and('be.visible'); + }); }); }); diff --git a/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx b/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx index c58e6dea53..a3ae77b4d1 100644 --- a/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx +++ b/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx @@ -10,7 +10,12 @@ import { TimestampTooltipVariant, Tooltip, } from '@patternfly/react-core'; -import { CheckIcon, OutlinedQuestionCircleIcon, TimesIcon } from '@patternfly/react-icons'; +import { + CheckIcon, + OutlinedQuestionCircleIcon, + TimesIcon, + EllipsisVIcon, +} from '@patternfly/react-icons'; import { ProjectKind, RoleBindingKind, RoleBindingSubject } from '~/k8sTypes'; import { relativeTime } from '~/utilities/time'; import { ProjectsContext } from '~/concepts/projects/ProjectsContext'; @@ -173,9 +178,18 @@ const RoleBindingPermissionsTableRow: React.FC + ) : isDefaultGroup ? ( + + + ) : ( Date: Thu, 17 Oct 2024 14:24:00 -0400 Subject: [PATCH 2/2] full stop added --- .../src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx b/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx index a3ae77b4d1..dd37431f10 100644 --- a/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx +++ b/frontend/src/concepts/roleBinding/RoleBindingPermissionsTableRow.tsx @@ -179,7 +179,7 @@ const RoleBindingPermissionsTableRow: React.FC ) : isDefaultGroup ? ( - +