Admin - Model Registry RBAC Management Projects

opendatahub-io · Aug 8, 2024 · 5dad9b8 · 5dad9b8
1 parent 3aeb340
commit 5dad9b8
Show file tree

Hide file tree

Showing 14 changed files with 501 additions and 54 deletions.
diff --git a/frontend/src/__mocks__/mockRoleBindingK8sResource.ts b/frontend/src/__mocks__/mockRoleBindingK8sResource.ts
@@ -8,6 +8,7 @@ type MockResourceConfigType = {
   roleRefName?: string;
   uid?: string;
   modelRegistryName?: string;
+  isProjectSubject?: boolean;
 };
 
 export const mockRoleBindingK8sResource = ({
@@ -22,6 +23,7 @@ export const mockRoleBindingK8sResource = ({
   ],
   roleRefName = 'view',
   uid = genUID('rolebinding'),
+  isProjectSubject = false,
   modelRegistryName = '',
 }: MockResourceConfigType): RoleBindingKind => {
   let labels;
@@ -33,6 +35,7 @@ export const mockRoleBindingK8sResource = ({
       'app.kubernetes.io/part-of': 'model-registry',
       [KnownLabels.DASHBOARD_RESOURCE]: 'true',
       component: 'model-registry',
+      ...(isProjectSubject && { [KnownLabels.PROJECT_SUBJECT]: 'true' }),
     };
   } else {
     labels = {

diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelRegistryPermissions.ts b/frontend/src/__tests__/cypress/cypress/pages/modelRegistryPermissions.ts
@@ -3,7 +3,35 @@ import { TableRow } from './components/table';
 
 class PermissionsTableRow extends TableRow {}
 
-class UsersTab {
+class UsersTab extends Contextual<HTMLElement> {
+  findAddUserButton() {
+    return this.find().findByTestId('add-button user');
+  }
+
+  findAddGroupButton() {
+    return this.find().findByTestId('add-button group');
+  }
+
+  getUserTable() {
+    return new PermissionTable(() => this.find().findByTestId('role-binding-table User'));
+  }
+
+  getGroupTable() {
+    return new PermissionTable(() => this.find().findByTestId('role-binding-table Group'));
+  }
+}
+
+class ProjectsTab extends Contextual<HTMLElement> {
+  findAddProjectButton() {
+    return this.find().findByTestId('add-button project');
+  }
+
+  getProjectTable() {
+    return new PermissionTable(() => this.find().findByTestId('role-binding-table Group'));
+  }
+}
+
+class MRPermissions {
   visit(mrName: string, wait = true) {
     cy.visitWithLogin(`/modelRegistrySettings/permissions/${mrName}`);
     if (wait) {
@@ -16,20 +44,16 @@ class UsersTab {
     cy.testA11y();
   }
 
-  findAddUserButton() {
-    return cy.findByTestId('add-button User');
-  }
-
-  findAddGroupButton() {
-    return cy.findByTestId('add-button Group');
+  findProjectTab() {
+    return cy.findByTestId('projects-tab');
   }
 
-  getUserTable() {
-    return new PermissionTable(() => cy.findByTestId('role-binding-table User'));
+  getUsersContent() {
+    return new UsersTab(() => cy.findByTestId('users-tab-content'));
   }
 
-  getGroupTable() {
-    return new PermissionTable(() => cy.findByTestId('role-binding-table Group'));
+  getProjectsContent() {
+    return new ProjectsTab(() => cy.findByTestId('projects-tab-content'));
   }
 }
 
@@ -46,7 +70,7 @@ class PermissionTable extends Contextual<HTMLElement> {
     return this.find().findByTestId(['role-binding-name-input', id]);
   }
 
-  findGroupSelect() {
+  findNameSelect() {
     return this.find().get(`[aria-label="Name selection"]`);
   }
 
@@ -69,4 +93,4 @@ class PermissionTable extends Contextual<HTMLElement> {
   }
 }
 
-export const usersTab = new UsersTab();
+export const modelRegistryPermissions = new MRPermissions();
diff --git a/frontend/src/__tests__/cypress/cypress/pages/permissions.ts b/frontend/src/__tests__/cypress/cypress/pages/permissions.ts
@@ -15,11 +15,11 @@ class PermissionsTab {
   }
 
   findAddUserButton() {
-    return cy.findByTestId('add-button User');
+    return cy.findByTestId('add-button user');
   }
 
   findAddGroupButton() {
-    return cy.findByTestId('add-button Group');
+    return cy.findByTestId('add-button group');
   }
 
   getUserTable() {