Merge branch 'main' of https://github.com/opendatahub-io/odh-dashboard into feat/autorag-create

Author: Daniel Duong

.gitleaks.toml

@@ -10,6 +10,16 @@
 [allowlist]
   description = "Exclude test fixtures, mock data, sample configs, and CI resources"
   paths = [
+    # Go test files (commonly contain mock credentials)
+    '''.*_test\.go$''',
+
+    # JS/TS test files (.spec.ts, .test.tsx, etc.)
+    '''.*\.spec\.(ts|tsx|js|jsx)$''',
+    '''.*\.test\.(ts|tsx|js|jsx)$''',
+
+    # JS/TS test directories
+    '''__tests__/''',
+
     # Go testdata directories
     '''testdata/''',
 

packages/cypress/cypress/pages/modelTraining.ts

@@ -110,6 +110,16 @@ class TrainingJobTable {
     return this.findTable().find('[data-testid="no-result-found-title"]');
   }
 
+  filterByName(name: string) {
+    this.findToolbar().findByLabelText('Filter by name').clear().type(name);
+    return this;
+  }
+
+  clearNameFilter() {
+    this.findToolbar().findByLabelText('Filter by name').clear();
+    return this;
+  }
+
   shouldHaveTrainingJobs(count: number) {
     this.findRows().should('have.length', count);
     return this;
@@ -174,9 +184,13 @@ class TrainingJobTableRow extends TableRow {
   }
 
   findStatus() {
-    // Find the status label by testid (the clickable Label component)
-    // The entire Label is clickable, not just the icon
-    return this.find().find('[data-label="Status"]').findByTestId('training-job-status');
+    return this.find()
+      .find('[data-label="Status"]')
+      .find('[data-testid="training-job-status"],[data-testid="ray-job-status"]');
+  }
+
+  findStatusLoading() {
+    return this.find().find('[data-label="Status"]').findByTestId('ray-job-status-loading');
   }
 
   findStatusProgressBar() {
@@ -766,6 +780,64 @@ class RayJobDetailsTab {
   }
 }
 
+class RayJobResourcesTab {
+  findNodeConfigurationsSection() {
+    return cy.findByTestId('node-configurations-section');
+  }
+
+  findNodesValue() {
+    return cy.findByTestId('nodes-value');
+  }
+
+  findProcessesPerNodeValue() {
+    return cy.findByTestId('processes-per-node-value');
+  }
+
+  findResourcesPerNodeSection() {
+    return cy.findByTestId('resources-per-node-section');
+  }
+
+  findWorkerGroupTitle(groupName: string) {
+    return cy.findByTestId(`worker-group-${groupName}-title`);
+  }
+
+  findWorkerGroupCpuRequests(groupName: string) {
+    return cy.findByTestId(`worker-group-${groupName}-cpu-requests`);
+  }
+
+  findWorkerGroupCpuLimits(groupName: string) {
+    return cy.findByTestId(`worker-group-${groupName}-cpu-limits`);
+  }
+
+  findWorkerGroupMemoryRequests(groupName: string) {
+    return cy.findByTestId(`worker-group-${groupName}-memory-requests`);
+  }
+
+  findWorkerGroupMemoryLimits(groupName: string) {
+    return cy.findByTestId(`worker-group-${groupName}-memory-limits`);
+  }
+
+  findClusterQueueSection() {
+    return cy.findByTestId('cluster-queue-section');
+  }
+
+  findQueueValue() {
+    return cy.findByTestId('queue-value');
+  }
+
+  findQuotasSection() {
+    return cy.findByTestId('quotas-section');
+  }
+
+  findQuotaSourceValue() {
+    return cy.findByTestId('quota-source-value');
+  }
+
+  findConsumedQuotaValue() {
+    return cy.findByTestId('consumed-quota-value');
+  }
+}
+
 export const modelTrainingGlobal = new ModelTrainingGlobal();
 export const trainingJobTable = new TrainingJobTable();
 export const trainingJobDetailsDrawer = new TrainingJobDetailsDrawer();
@@ -778,3 +850,4 @@ export const scaleNodesModal = new ScaleNodesModal();
 export const pauseTrainingJobModal = new PauseTrainingJobModal();
 export const trainingJobDetailsTab = new TrainingJobDetailsTab();
 export const rayJobDetailsTab = new RayJobDetailsTab();
+export const rayJobResourcesTab = new RayJobResourcesTab();

packages/cypress/cypress/support/commands/odh.ts

@@ -91,7 +91,12 @@ import type { NimServingResponse } from '@odh-dashboard/internal/__mocks__/mockN
 import type { BuildMockPipelinveVersionsType } from '@odh-dashboard/internal/__mocks__';
 import type { ArtifactStorage } from '@odh-dashboard/internal/concepts/pipelines/types';
 import type { ConnectionTypeConfigMap } from '@odh-dashboard/internal/concepts/connectionTypes/types';
-import type { APIKey, CreateAPIKeyResponse } from '@odh-dashboard/maas/types/api-key';
+import type {
+  APIKey,
+  APIKeyListResponse,
+  BulkRevokeResponse,
+  CreateAPIKeyResponse,
+} from '@odh-dashboard/maas/types/api-key';
 
 type SuccessErrorResponse = {
   success: boolean;
@@ -1109,15 +1114,25 @@ declare global {
           response: { data: OdhResponse<Tier> },
         ) => Cypress.Chainable<null>) &
         ((
-          type: 'GET /maas/api/v1/api-keys',
-          response: { data: OdhResponse<APIKey[]> },
+          type: 'POST /maas/api/v1/api-keys/search',
+          response: { data: OdhResponse<APIKeyListResponse> },
         ) => Cypress.Chainable<null>) &
         ((
-          type: 'DELETE /maas/api/v1/api-keys',
-          response: { data: null },
+          type: 'POST /maas/api/v1/api-keys/search',
+          options: { query?: { page?: string; limit?: string } },
+          response: { data: OdhResponse<APIKeyListResponse> },
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'POST /maas/api/v1/api-keys/bulk-revoke',
+          response: { data: OdhResponse<BulkRevokeResponse> },
+        ) => Cypress.Chainable<null>) &
+        ((
+          type: 'DELETE /maas/api/v1/api-keys/:id',
+          options: { path: { id: string } },
+          response: { data: OdhResponse<APIKey> },
         ) => Cypress.Chainable<null>) &
         ((
-          type: 'POST /maas/api/v1/api-key',
+          type: 'POST /maas/api/v1/api-keys',
           response: { data: OdhResponse<CreateAPIKeyResponse> },
         ) => Cypress.Chainable<null>);
     }