add contributions

Author: ConorOM1

packages/cypress/cypress/fixtures/e2e/modelRegistry/testModelRegistry.yaml

@@ -82,6 +82,8 @@ ociTransferJobStartedNotification: "Model transfer job started"
 ociTransferJobFailedNotification: "Model transfer job failed"
 ociDestinationRegistry: "quay.io"
 ociDestinationUri: "quay.io/test-org/test-oci-model:v1"
+ociDestinationUsername: "dummy-oci-user"
+ociDestinationPassword: "dummy-oci-pass"
 
 # OCI Register and Store — URI origin variant
 ociUriModelName: "test-oci-uri-model"

packages/cypress/cypress/fixtures/resources/yaml/model_registry_project_rolebinding.yaml

@@ -0,0 +1,21 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{PROJECT_NAME}}-rb
+  namespace: {{NAMESPACE}}
+  labels:
+    opendatahub.io/dashboard: "true"
+    opendatahub.io/rb-project-subject: "true"
+    app: {{REGISTRY_NAME}}
+    app.kubernetes.io/component: model-registry
+    app.kubernetes.io/part-of: model-registry
+    app.kubernetes.io/name: {{REGISTRY_NAME}}
+    component: model-registry
+subjects:
+  - kind: Group
+    apiGroup: rbac.authorization.k8s.io
+    name: system:serviceaccounts:{{PROJECT_NAME}}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: registry-user-{{REGISTRY_NAME}}

packages/cypress/cypress/pages/modelRegistry.ts

@@ -58,25 +58,21 @@ class ModelRegistry {
     this.waitLanding();
   }
 
-  visit() {
-    this.visitWithRegistry('modelregistry-sample');
-  }
-
-  visitWithRegistry(registryName: string) {
-    cy.visitWithLogin(`/ai-hub/models/registry/${registryName}`);
-    this.wait();
+  visit(registryName = 'modelregistry-sample') {
+    cy.visitWithLogin(`/ai-hub/registry/${registryName}`);
+    cy.findByTestId('app-page-title', { timeout: 60000 }).should('exist');
   }
 
   navigate() {
-    appChrome.findNavItem({ name: 'Models', rootSection: 'AI hub' }).click();
+    appChrome
+      .findNavItem({ name: 'Registry', rootSection: 'AI hub', subSection: 'Models' })
+      .click();
     this.wait();
   }
 
   private wait() {
-    cy.findByTestId('app-tab-page-title').should('exist');
-    cy.findByText('Select a model registry to view and manage your registered models.', {
-      exact: false,
-    }).should('exist');
+    cy.findByTestId('app-page-title').should('exist');
+    cy.findByTestId('app-page-title').contains('Registry');
     cy.testA11y();
   }
 
@@ -134,12 +130,16 @@ class ModelRegistry {
   }
 
   tabEnabled() {
-    appChrome.findNavItem({ name: 'Models', rootSection: 'AI hub' }).should('exist');
+    appChrome
+      .findNavItem({ name: 'Registry', rootSection: 'AI hub', subSection: 'Models' })
+      .should('exist');
     return this;
   }
 
   tabDisabled() {
-    appChrome.findNavItem({ name: 'Models', rootSection: 'AI hub' }).should('not.exist');
+    appChrome
+      .findNavItem({ name: 'Registry', rootSection: 'AI hub', subSection: 'Models' })
+      .should('not.exist');
     return this;
   }
 
@@ -161,20 +161,16 @@ class ModelRegistry {
 
   getRow(name: string) {
     return new ModelRegistryTableRow(() =>
-      this.findTable().find(`[data-label="Model name"]`).contains(name).closest('tr'),
+      this.findTable().find(`[data-label="Model name"]`).contains(name).parents('tr'),
     );
   }
 
-  findModelByName(name: string) {
-    return this.getRow(name).findName();
-  }
-
   getModelVersionRow(name: string) {
     return new ModelRegistryTableRow(() =>
       this.findModelVersionsTable()
         .find(`[data-label="Version name"]`)
         .contains(name)
-        .closest('tr'),
+        .parents('tr'),
     );
   }
 
@@ -183,34 +179,21 @@ class ModelRegistry {
   }
 
   findModelRegistry() {
-    return cy.findAllByTestId('model-registry-selector-dropdown').filter(':visible').first();
+    return cy.findByTestId('model-registry-selector-dropdown');
   }
 
   findSelectModelRegistry(registryName: string) {
-    cy.url({ timeout: 30000 }).then((url) => {
-      if (url.includes(`/registry/${registryName}`)) {
-        return;
+    // Check if the registry is already selected
+    this.findModelRegistry().then(($dropdown) => {
+      if (!$dropdown.text().includes(registryName)) {
+        // Registry is not selected, perform click actions
+        this.findModelRegistry().click();
+        cy.findByTestId(registryName).click();
       }
-      cy.findAllByTestId('model-registry-selector-dropdown').filter(':visible').first().click();
-      cy.findAllByTestId(registryName).filter(':visible').first().click();
     });
-    cy.url({ timeout: 30000 }).should('include', `/registry/${registryName}`);
     return this;
   }
 
-  /** Link button in the Model name column (navigates to registered model / overview). */
-  findModelNameLinkButton(name: string) {
-    return this.getRow(name).find().find('[data-testid="model-name"] button').first();
-  }
-
-  findVersionDetailsBreadcrumbModel() {
-    return cy.findByTestId('breadcrumb-model-version');
-  }
-
-  findVersionDetailsBreadcrumbVersion() {
-    return cy.findByTestId('breadcrumb-version-name');
-  }
-
   findModelVersionsTableHeaderButton(name: string) {
     return this.findModelVersionsTable().find('thead').findByRole('button', { name });
   }

packages/cypress/cypress/pages/modelRegistry/registerAndStorePage.ts

@@ -22,8 +22,16 @@ class RegisterAndStorePage {
     return cy.findByTestId('namespace-form-group');
   }
 
-  findProjectSelectorToggle() {
-    return cy.findByTestId('project-selector-toggle');
+  findProjectSelectorToggle(timeout?: number) {
+    return cy.findByTestId('project-selector-toggle', { timeout });
+  }
+
+  findProjectSelectorSearch() {
+    return cy.findByTestId('project-selector-search');
+  }
+
+  findProjectSelectorMenuList() {
+    return cy.findByTestId('project-selector-menuList');
   }
 
   findNoAccessAlert() {

packages/cypress/cypress/pages/modelRegistry/registerModelPage.ts

@@ -82,8 +82,8 @@ class RegisterModelPage {
     return cy.findByTestId('model-name-error');
   }
 
-  findRegistrationModeToggleGroup() {
-    return cy.findByTestId('registration-mode-toggle-group');
+  findRegistrationModeToggleGroup(timeout?: number) {
+    return cy.findByTestId('registration-mode-toggle-group', { timeout });
   }
 
   findRegisterToggle() {