Merge branch 'main' into RHOAIENG-13596_doc_links

opendatahub-io · Oct 7, 2024 · 9cbcf12 · 9cbcf12
2 parents 1d5f194 + c4e2940
commit 9cbcf12
Show file tree

Hide file tree

Showing 128 changed files with 1,174 additions and 1,183 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Node.js modules cache, repository

diff --git a/.github/workflows/vuln_scan.yml b/.github/workflows/vuln_scan.yml
@@ -17,7 +17,7 @@ jobs:
           trivy-config: .github/trivy.yaml
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: 'scan_result.sarif'
 

diff --git a/backend/src/types.ts b/backend/src/types.ts
@@ -36,7 +36,6 @@ export type DashboardConfig = K8sResourceCommon & {
       disableKServeMetrics: boolean;
       disableModelMesh: boolean;
       disableAcceleratorProfiles: boolean;
-      disablePipelineExperiments: boolean;
       disableDistributedWorkloads: boolean;
       disableModelRegistry: boolean;
       disableConnectionTypes: boolean;

diff --git a/backend/src/utils/constants.ts b/backend/src/utils/constants.ts
@@ -61,7 +61,6 @@ export const blankDashboardCR: DashboardConfig = {
       disableKServeMetrics: false,
       disableModelMesh: false,
       disableAcceleratorProfiles: false,
-      disablePipelineExperiments: false,
       disableDistributedWorkloads: false,
       disableModelRegistry: false,
       disableConnectionTypes: true,

diff --git a/docs/dashboard-config.md b/docs/dashboard-config.md
@@ -64,7 +64,6 @@ spec:
     disableKServeMetrics: false
     disableBiasMetrics: false
     disablePerformanceMetrics: false
-    disablePipelineExperiments: true
     disableDistributedWorkloads: false
     disableConnectionTypes: false
     disableStorageClasses: false
@@ -162,7 +161,6 @@ spec:
     disableKServeMetrics: true
     disableBiasMetrics: false
     disablePerformanceMetrics: false
-    disablePipelineExperiments: false
     disableNIMModelServing: true
   notebookController:
     enabled: true

diff --git a/frontend/src/__mocks__/mockDashboardConfig.ts b/frontend/src/__mocks__/mockDashboardConfig.ts
@@ -22,7 +22,6 @@ type MockDashboardConfigType = {
   disableAcceleratorProfiles?: boolean;
   disablePerformanceMetrics?: boolean;
   disableBiasMetrics?: boolean;
-  disablePipelineExperiments?: boolean;
   disableDistributedWorkloads?: boolean;
   disableModelRegistry?: boolean;
   disableConnectionTypes?: boolean;
@@ -53,7 +52,6 @@ export const mockDashboardConfig = ({
   disableAcceleratorProfiles = false,
   disablePerformanceMetrics = false,
   disableBiasMetrics = false,
-  disablePipelineExperiments = false,
   disableDistributedWorkloads = false,
   disableModelRegistry = false,
   disableConnectionTypes = true,
@@ -161,7 +159,6 @@ export const mockDashboardConfig = ({
       disableKServeMetrics,
       disableModelMesh,
       disableAcceleratorProfiles,
-      disablePipelineExperiments,
       disableDistributedWorkloads,
       disableModelRegistry,
       disableConnectionTypes,

diff --git a/frontend/src/__tests__/cypress/cypress/pages/projects.ts b/frontend/src/__tests__/cypress/cypress/pages/projects.ts
@@ -195,6 +195,34 @@ class ProjectDetails {
     );
   }
 
+  showProjectResourceDetails() {
+    return cy.findByTestId('resource-name-icon-button').click();
+  }
+
+  findProjectResourceNameText() {
+    return cy.findByTestId('resource-name-text');
+  }
+
+  findProjectResourceKindText() {
+    return cy.findByTestId('resource-kind-text');
+  }
+
+  findProjectActions() {
+    return cy.findByTestId('project-actions');
+  }
+
+  showProjectActions() {
+    cy.findByTestId('project-actions').click();
+  }
+
+  findEditProjectAction() {
+    return cy.findByTestId('edit-project-action');
+  }
+
+  findDeleteProjectAction() {
+    return cy.findByTestId('delete-project-action');
+  }
+
   findImportPipelineButton(timeout?: number) {
     return cy.findByTestId('import-pipeline-button', { timeout });
   }

diff --git a/frontend/src/__tests__/cypress/cypress/pages/workbench.ts b/frontend/src/__tests__/cypress/cypress/pages/workbench.ts
@@ -324,6 +324,10 @@ class EditSpawnerPage extends CreateSpawnerPage {
   findCancelButton() {
     return cy.findByTestId('workbench-cancel-button');
   }
+
+  findAcceleratorProfileSelect() {
+    return cy.findByTestId('accelerator-profile-select');
+  }
 }
 
 class NotFoundSpawnerPage {

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/compareRuns.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/compareRuns.cy.ts
@@ -419,12 +419,7 @@ type InterceptsType = {
 };
 
 const initIntercepts = ({ noMetrics }: InterceptsType) => {
-  cy.interceptOdh(
-    'GET /api/config',
-    mockDashboardConfig({
-      disablePipelineExperiments: false,
-    }),
-  );
+  cy.interceptOdh('GET /api/config', mockDashboardConfig({}));
   cy.interceptK8sList(
     DataSciencePipelineApplicationModel,
     mockK8sResourceList([

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/executions.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/executions.cy.ts
@@ -133,7 +133,7 @@ const shouldFilterItems = (filter: FilterArgs, query?: string) => {
 };
 
 const initIntercepts = (interceptMlmd: boolean, isExecutionsEmpty?: boolean) => {
-  cy.interceptOdh('GET /api/config', mockDashboardConfig({ disablePipelineExperiments: false }));
+  cy.interceptOdh('GET /api/config', mockDashboardConfig({}));
   cy.interceptK8sList(
     DataSciencePipelineApplicationModel,
     mockK8sResourceList([

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/experiments.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/experiments.cy.ts
@@ -393,7 +393,7 @@ describe('Runs page for archived experiment', () => {
 });
 
 const initIntercepts = () => {
-  cy.interceptOdh('GET /api/config', mockDashboardConfig({ disablePipelineExperiments: false }));
+  cy.interceptOdh('GET /api/config', mockDashboardConfig({}));
   cy.interceptK8sList(
     DataSciencePipelineApplicationModel,
     mockK8sResourceList([

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/intercepts.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/intercepts.ts
@@ -12,7 +12,7 @@ import {
 } from '~/__tests__/cypress/cypress/utils/models';
 
 export const configIntercept = (): void => {
-  cy.interceptOdh('GET /api/config', mockDashboardConfig({ disablePipelineExperiments: false }));
+  cy.interceptOdh('GET /api/config', mockDashboardConfig({}));
 };
 
 export const projectsIntercept = (

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/projectDetails.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/projectDetails.cy.ts
@@ -13,7 +13,11 @@ import { mockProjectK8sResource } from '~/__mocks__/mockProjectK8sResource';
 import { mockRouteK8sResource } from '~/__mocks__/mockRouteK8sResource';
 import { mockSecretK8sResource } from '~/__mocks__/mockSecretK8sResource';
 import { mockServingRuntimeTemplateK8sResource } from '~/__mocks__/mockServingRuntimeTemplateK8sResource';
-import { projectDetails } from '~/__tests__/cypress/cypress/pages/projects';
+import {
+  deleteProjectModal,
+  editProjectModal,
+  projectDetails,
+} from '~/__tests__/cypress/cypress/pages/projects';
 import { ServingRuntimePlatform } from '~/types';
 import {
   DataSciencePipelineApplicationModel,
@@ -31,6 +35,7 @@ import {
 } from '~/__tests__/cypress/cypress/utils/models';
 import { mockServingRuntimeK8sResource } from '~/__mocks__/mockServingRuntimeK8sResource';
 import { mockInferenceServiceK8sResource } from '~/__mocks__/mockInferenceServiceK8sResource';
+import { asProjectAdminUser } from '~/__tests__/cypress/cypress/utils/mockUsers';
 
 type HandlersProps = {
   isEmpty?: boolean;
@@ -259,6 +264,41 @@ describe('Project Details', () => {
       projectDetails.shouldBeEmptyState('Pipelines', 'pipelines-projects', true);
     });
 
+    it('Shows project information', () => {
+      initIntercepts({ disableKServeConfig: true, disableModelConfig: true });
+      projectDetails.visit('test-project');
+      projectDetails.showProjectResourceDetails();
+      projectDetails.findProjectResourceNameText().should('have.text', 'test-project');
+      projectDetails.findProjectResourceKindText().should('have.text', 'Project');
+    });
+
+    it('Should not allow actions for non-provisioning users', () => {
+      asProjectAdminUser({ isSelfProvisioner: false });
+      initIntercepts({ disableKServeConfig: true, disableModelConfig: true });
+      projectDetails.visit('test-project');
+
+      projectDetails.findProjectActions().should('not.exist');
+    });
+
+    it('Should allow actions for provisioning users', () => {
+      asProjectAdminUser({ isSelfProvisioner: true });
+      initIntercepts({ disableKServeConfig: true, disableModelConfig: true });
+      projectDetails.visit('test-project');
+
+      projectDetails.showProjectActions();
+      projectDetails.findEditProjectAction().click();
+
+      editProjectModal.shouldBeOpen();
+      editProjectModal.findCancelButton().click();
+      editProjectModal.shouldBeOpen(false);
+
+      projectDetails.showProjectActions();
+      projectDetails.findDeleteProjectAction().click();
+      deleteProjectModal.shouldBeOpen();
+      deleteProjectModal.findCancelButton().click();
+      deleteProjectModal.shouldBeOpen(false);
+    });
+
     it('Both model serving platforms are disabled', () => {
       initIntercepts({ disableKServeConfig: true, disableModelConfig: true });
       projectDetails.visit('test-project');

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts
@@ -33,9 +33,11 @@ import {
   RouteModel,
   SecretModel,
   StorageClassModel,
+  AcceleratorProfileModel,
 } from '~/__tests__/cypress/cypress/utils/models';
 import { mock200Status } from '~/__mocks__/mockK8sStatus';
 import type { NotebookSize } from '~/types';
+import { mockAcceleratorProfile } from '~/__mocks__/mockAcceleratorProfile';
 
 const configYamlPath = '../../__mocks__/mock-upload-configmap.yaml';
 
@@ -168,7 +170,22 @@ const initIntercepts = ({
   cy.interceptK8s('POST', ConfigMapModel, mockConfigMap({})).as('createConfigMap');
 
   cy.interceptK8s('POST', NotebookModel, mockNotebookK8sResource({})).as('createWorkbench');
+
+  cy.interceptK8sList(
+    AcceleratorProfileModel,
+    mockK8sResourceList([
+      mockAcceleratorProfile({
+        name: 'test-accelerator',
+        namespace: 'opendatahub',
+        displayName: 'Test Accelerator',
+        description: 'A test accelerator profile',
+        enabled: true,
+        identifier: 'test.com/accelerator',
+      }),
+    ]),
+  );
 };
+
 describe('Workbench page', () => {
   it('Empty state', () => {
     initIntercepts({ isEmpty: true });
@@ -557,6 +574,11 @@ describe('Workbench page', () => {
     editSpawnerPage.findSubmitButton().should('be.enabled');
     editSpawnerPage.k8sNameDescription.findDisplayNameInput().fill('Updated Notebook');
 
+    // Add a test for editing accelerator profile
+    editSpawnerPage.findAcceleratorProfileSelect().click();
+    editSpawnerPage.findAcceleratorProfileSelect().findSelectOption('None').click();
+    editSpawnerPage.findAcceleratorProfileSelect().should('contain', 'None');
+
     cy.interceptK8s('PUT', NotebookModel, mockNotebookK8sResource({})).as('editWorkbenchDryRun');
     cy.interceptK8s('PATCH', NotebookModel, mockNotebookK8sResource({})).as('editWorkbench');
     editSpawnerPage.findSubmitButton().click();

diff --git a/frontend/src/components/ResourceNameTooltip.tsx b/frontend/src/components/ResourceNameTooltip.tsx
@@ -5,6 +5,8 @@ import {
   DescriptionListDescription,
   DescriptionListGroup,
   DescriptionListTerm,
+  Flex,
+  FlexItem,
   Popover,
   Stack,
   StackItem,
@@ -26,9 +28,9 @@ const ResourceNameTooltip: React.FC<ResourceNameTooltipProps> = ({
   wrap = true,
 }) => (
   <div style={{ display: wrap ? 'block' : 'inline-flex' }}>
-    <span>{children}</span>
-    {resource.metadata?.name && (
-      <div style={{ display: 'inline-block', marginLeft: 'var(--pf-v5-global--spacer--xs)' }}>
+    <Flex gap={{ default: 'gapXs' }} alignItems={{ default: 'alignItemsCenter' }}>
+      <FlexItem>{children}</FlexItem>
+      {resource.metadata?.name && (
         <Popover
           position="right"
           bodyContent={
@@ -41,24 +43,35 @@ const ResourceNameTooltip: React.FC<ResourceNameTooltipProps> = ({
                   <DescriptionListGroup>
                     <DescriptionListTerm>Resource name</DescriptionListTerm>
                     <DescriptionListDescription>
-                      <ClipboardCopy hoverTip="Copy" clickTip="Copied" variant="inline-compact">
+                      <ClipboardCopy
+                        hoverTip="Copy"
+                        clickTip="Copied"
+                        variant="inline-compact"
+                        data-testid="resource-name-text"
+                      >
                         {resource.metadata.name}
                       </ClipboardCopy>
                     </DescriptionListDescription>
                   </DescriptionListGroup>
                   <DescriptionListGroup>
                     <DescriptionListTerm>Resource type</DescriptionListTerm>
-                    <DescriptionListDescription>{resource.kind}</DescriptionListDescription>
+                    <DescriptionListDescription data-testid="resource-kind-text">
+                      {resource.kind}
+                    </DescriptionListDescription>
                   </DescriptionListGroup>
                 </DescriptionList>
               </StackItem>
             </Stack>
           }
         >
-          <DashboardPopupIconButton icon={<OutlinedQuestionCircleIcon />} aria-label="More info" />
+          <DashboardPopupIconButton
+            data-testid="resource-name-icon-button"
+            icon={<OutlinedQuestionCircleIcon />}
+            aria-label="More info"
+          />
         </Popover>
-      </div>
-    )}
+      )}
+    </Flex>
   </div>
 );
 

diff --git a/frontend/src/concepts/areas/const.ts b/frontend/src/concepts/areas/const.ts
@@ -24,7 +24,6 @@ export const allFeatureFlags: string[] = Object.keys({
   disableKServeMetrics: false,
   disableModelMesh: false,
   disableAcceleratorProfiles: false,
-  disablePipelineExperiments: false,
   disableDistributedWorkloads: false,
   disableModelRegistry: false,
   disableConnectionTypes: false,
@@ -107,10 +106,6 @@ export const SupportedAreasStateMap: SupportedAreasState = {
     requiredComponents: [StackComponent.TRUSTY_AI],
     reliantAreas: [SupportedArea.BIAS_METRICS],
   },
-  [SupportedArea.PIPELINE_EXPERIMENTS]: {
-    featureFlags: ['disablePipelineExperiments'],
-    reliantAreas: [SupportedArea.DS_PIPELINES],
-  },
   [SupportedArea.DISTRIBUTED_WORKLOADS]: {
     featureFlags: ['disableDistributedWorkloads'],
     requiredComponents: [StackComponent.KUEUE],

diff --git a/frontend/src/concepts/areas/types.ts b/frontend/src/concepts/areas/types.ts
@@ -31,7 +31,6 @@ export enum SupportedArea {
 
   /* Pipelines areas */
   DS_PIPELINES = 'ds-pipelines',
-  PIPELINE_EXPERIMENTS = 'pipeline-experiments',
 
   /* Admin areas */
   BYON = 'bring-your-own-notebook',

diff --git a/frontend/src/concepts/pipelines/EnsureCompatiblePipelineServer.tsx b/frontend/src/concepts/pipelines/EnsureCompatiblePipelineServer.tsx
@@ -81,7 +81,7 @@ const EnsureCompatiblePipelineServer: React.FC<EnsureCompatiblePipelineServerPro
             </EmptyStateFooter>
           </EmptyState>
         </Bullseye>
-        <DeleteServerModal isOpen={isDeleting} onClose={() => setIsDeleting(false)} />
+        {isDeleting ? <DeleteServerModal onClose={() => setIsDeleting(false)} /> : null}
       </>
     );
   }

diff --git a/frontend/src/concepts/pipelines/content/ArchiveModal.tsx b/frontend/src/concepts/pipelines/content/ArchiveModal.tsx
@@ -10,7 +10,6 @@ interface ArchiveModalProps {
   onCancel: () => void;
   onSubmit: () => Promise<void[]>;
   children: React.ReactNode;
-  isOpen: boolean;
   testId: string;
 }
 
@@ -21,7 +20,6 @@ export const ArchiveModal: React.FC<ArchiveModalProps> = ({
   title,
   alertTitle,
   children,
-  isOpen,
   testId,
 }) => {
   const { refreshAllAPI } = usePipelinesAPI();
@@ -53,7 +51,7 @@ export const ArchiveModal: React.FC<ArchiveModalProps> = ({
 
   return (
     <Modal
-      isOpen={isOpen}
+      isOpen
       title={title}
       titleIconVariant="warning"
       variant="small"