Remove disablePipelineExperiments feature flag

opendatahub-io · Sep 30, 2024 · 8c35856 · 8c35856
1 parent 228e221
commit 8c35856
Show file tree

Hide file tree

Showing 31 changed files with 86 additions and 236 deletions.
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/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/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/content/createRun/RunPage.tsx b/frontend/src/concepts/pipelines/content/createRun/RunPage.tsx
@@ -29,7 +29,6 @@ import { ValueOf } from '~/typeHelpers';
 import { useGetSearchParamValues } from '~/utilities/useGetSearchParamValues';
 import { PipelineRunSearchParam } from '~/concepts/pipelines/content/types';
 import { asEnumMember } from '~/utilities/utils';
-import { SupportedArea, useIsAreaAvailable } from '~/concepts/areas';
 import useDefaultExperiment from '~/pages/pipelines/global/experiments/useDefaultExperiment';
 
 type RunPageProps = {
@@ -64,7 +63,6 @@ const RunPage: React.FC<RunPageProps> = ({
   const triggerType = asEnumMember(triggerTypeString, ScheduledType);
   const isSchedule = runType === RunTypeOption.SCHEDULED;
 
-  const isExperimentsAvailable = useIsAreaAvailable(SupportedArea.PIPELINE_EXPERIMENTS).status;
   const [defaultExperiment] = useDefaultExperiment();
 
   const jumpToSections = Object.values(CreateRunPageSections).filter(
@@ -104,21 +102,10 @@ const RunPage: React.FC<RunPageProps> = ({
     [setFormDataValue],
   );
 
-  const runPageSectionTitlesEdited = isExperimentsAvailable
-    ? runPageSectionTitles
-    : {
-        ...runPageSectionTitles,
-        [CreateRunPageSections.PROJECT_AND_EXPERIMENT]: 'Project',
-      };
-
   return (
     <div data-testid={testId}>
       <PageSection isFilled variant="light">
-        <GenericSidebar
-          sections={jumpToSections}
-          titles={runPageSectionTitlesEdited}
-          maxWidth={175}
-        >
+        <GenericSidebar sections={jumpToSections} titles={runPageSectionTitles} maxWidth={175}>
           <RunForm isCloned={!!cloneRun} data={formData} onValueChange={onValueChange} />
         </GenericSidebar>
       </PageSection>

diff --git a/frontend/src/concepts/pipelines/content/createRun/RunPageFooter.tsx b/frontend/src/concepts/pipelines/content/createRun/RunPageFooter.tsx
@@ -2,13 +2,9 @@ import * as React from 'react';
 import { Alert, Button, Split, SplitItem, Stack, StackItem } from '@patternfly/react-core';
 import { useNavigate } from 'react-router-dom';
 import { RunFormData, RunTypeOption } from '~/concepts/pipelines/content/createRun/types';
-import {
-  isFilledRunFormData,
-  isFilledRunFormDataExperiment,
-} from '~/concepts/pipelines/content/createRun/utils';
+import { isFilledRunFormData } from '~/concepts/pipelines/content/createRun/utils';
 import { handleSubmit } from '~/concepts/pipelines/content/createRun/submitUtils';
 import { usePipelinesAPI } from '~/concepts/pipelines/context';
-import { SupportedArea, useIsAreaAvailable } from '~/concepts/areas';
 import { isRunSchedule } from '~/concepts/pipelines/utils';
 
 type RunPageFooterProps = {
@@ -23,10 +19,7 @@ const RunPageFooter: React.FC<RunPageFooterProps> = ({ data, contextPath }) => {
   const [isSubmitting, setSubmitting] = React.useState(false);
   const [error, setError] = React.useState<Error | null>(null);
 
-  const isExperimentsAvailable = useIsAreaAvailable(SupportedArea.PIPELINE_EXPERIMENTS).status;
-  const canSubmit = isExperimentsAvailable
-    ? isFilledRunFormDataExperiment(data)
-    : isFilledRunFormData(data);
+  const canSubmit = isFilledRunFormData(data);
 
   return (
     <Stack hasGutter>

diff --git a/.../src/concepts/pipelines/content/createRun/contentSections/ProjectAndExperimentSection.tsx b/.../src/concepts/pipelines/content/createRun/contentSections/ProjectAndExperimentSection.tsx
@@ -8,7 +8,6 @@ import {
 } from '~/concepts/pipelines/content/createRun/const';
 import { ActiveExperimentSelector } from '~/concepts/pipelines/content/experiment/ExperimentSelector';
 import CreateExperimentButton from '~/concepts/pipelines/content/experiment/CreateExperimentButton';
-import { SupportedArea, useIsAreaAvailable } from '~/concepts/areas';
 
 type ProjectAndExperimentSectionProps = {
   projectName: string;
@@ -20,41 +19,31 @@ const ProjectAndExperimentSection: React.FC<ProjectAndExperimentSectionProps> =
   projectName,
   value,
   onChange,
-}) => {
-  const isExperimentsAvailable = useIsAreaAvailable(SupportedArea.PIPELINE_EXPERIMENTS).status;
-
-  return (
-    <FormSection
-      id={CreateRunPageSections.PROJECT_AND_EXPERIMENT}
-      title={
-        isExperimentsAvailable
-          ? runPageSectionTitles[CreateRunPageSections.PROJECT_AND_EXPERIMENT]
-          : 'Project'
-      }
-    >
-      <FormGroup label="Project">
-        <Text>{projectName}</Text>
-      </FormGroup>
-      {isExperimentsAvailable && (
-        <FormGroup label="Experiment" aria-label="Experiment" isRequired>
-          <Stack hasGutter>
-            <StackItem>
-              <ActiveExperimentSelector selection={value?.display_name} onSelect={onChange} />
-            </StackItem>
-            <StackItem>
-              <CreateExperimentButton
-                variant="link"
-                icon={<PlusCircleIcon />}
-                onCreate={(experiment) => onChange(experiment)}
-              >
-                Create new experiment
-              </CreateExperimentButton>
-            </StackItem>
-          </Stack>
-        </FormGroup>
-      )}
-    </FormSection>
-  );
-};
+}) => (
+  <FormSection
+    id={CreateRunPageSections.PROJECT_AND_EXPERIMENT}
+    title={runPageSectionTitles[CreateRunPageSections.PROJECT_AND_EXPERIMENT]}
+  >
+    <FormGroup label="Project">
+      <Text>{projectName}</Text>
+    </FormGroup>
+    <FormGroup label="Experiment" aria-label="Experiment" isRequired>
+      <Stack hasGutter>
+        <StackItem>
+          <ActiveExperimentSelector selection={value?.display_name} onSelect={onChange} />
+        </StackItem>
+        <StackItem>
+          <CreateExperimentButton
+            variant="link"
+            icon={<PlusCircleIcon />}
+            onCreate={(experiment) => onChange(experiment)}
+          >
+            Create new experiment
+          </CreateExperimentButton>
+        </StackItem>
+      </Stack>
+    </FormGroup>
+  </FormSection>
+);
 
 export default ProjectAndExperimentSection;
diff --git a/frontend/src/concepts/pipelines/content/createRun/contentSections/RunTypeSection.tsx b/frontend/src/concepts/pipelines/content/createRun/contentSections/RunTypeSection.tsx
@@ -9,7 +9,6 @@ import {
   runPageSectionTitles,
 } from '~/concepts/pipelines/content/createRun/const';
 import { createRecurringRunRoute, createRunRoute } from '~/routes';
-import { SupportedArea, useIsAreaAvailable } from '~/concepts/areas';
 import { RunFormData, RunTypeOption } from '~/concepts/pipelines/content/createRun/types';
 
 interface RunTypeSectionProps {
@@ -20,19 +19,13 @@ interface RunTypeSectionProps {
 export const RunTypeSection: React.FC<RunTypeSectionProps> = ({ data, isCloned }) => {
   const { namespace, experimentId, pipelineId, pipelineVersionId } = useParams();
   const [isAlertOpen, setIsAlertOpen] = React.useState(true);
-  const isExperimentsAvailable = useIsAreaAvailable(SupportedArea.PIPELINE_EXPERIMENTS).status;
 
   let runTypeValue = 'Run once immediately after creation';
   let alertTitle = (
     <>
       To create a schedule that executes recurring runs,{' '}
       <Link
-        to={createRecurringRunRoute(
-          namespace,
-          isExperimentsAvailable ? experimentId : undefined,
-          pipelineId,
-          pipelineVersionId,
-        )}
+        to={createRecurringRunRoute(namespace, experimentId, pipelineId, pipelineVersionId)}
         state={{ locationData: data }}
         data-testid="run-type-section-alert-link"
       >
@@ -48,12 +41,7 @@ export const RunTypeSection: React.FC<RunTypeSectionProps> = ({ data, isCloned }
       <>
         To create a non-recurring run,{' '}
         <Link
-          to={createRunRoute(
-            namespace,
-            isExperimentsAvailable ? experimentId : undefined,
-            pipelineId,
-            pipelineVersionId,
-          )}
+          to={createRunRoute(namespace, experimentId, pipelineId, pipelineVersionId)}
           state={{ locationData: data }}
           data-testid="run-type-section-alert-link"
         >

diff --git a/frontend/src/concepts/pipelines/content/createRun/utils.ts b/frontend/src/concepts/pipelines/content/createRun/utils.ts
@@ -48,15 +48,13 @@ export const isFilledRunFormData = (formData: RunFormData): formData is SafeRunF
     !!formData.nameDesc.name &&
     !!formData.pipeline &&
     !!formData.version &&
+    !!formData.experiment &&
     hasRequiredInputParams &&
     runTypeSafeData(formData.runType) &&
     runTypeSafeDates(formData.runType)
   );
 };
 
-export const isFilledRunFormDataExperiment = (formData: RunFormData): formData is SafeRunFormData =>
-  isFilledRunFormData(formData) && !!formData.experiment;
-
 export const getInputDefinitionParams = (
   version: PipelineVersionKFv2 | null | undefined,
 ): ParametersKF | undefined => {

diff --git a/...ines/content/pipelinesDetails/pipelineRecurringRun/PipelineRecurringRunDetailsActions.tsx b/...ines/content/pipelinesDetails/pipelineRecurringRun/PipelineRecurringRunDetailsActions.tsx
@@ -12,7 +12,6 @@ import {
 import { usePipelinesAPI } from '~/concepts/pipelines/context';
 import { PipelineRecurringRunKFv2, RecurringRunStatus } from '~/concepts/pipelines/kfTypes';
 import { cloneRecurringRunRoute } from '~/routes';
-import { useIsAreaAvailable, SupportedArea } from '~/concepts/areas';
 import { getDashboardMainContainer } from '~/utilities/utils';
 
 type PipelineRecurringRunDetailsActionsProps = {
@@ -29,7 +28,6 @@ const PipelineRecurringRunDetailsActions: React.FC<PipelineRecurringRunDetailsAc
   const navigate = useNavigate();
   const { experimentId, pipelineId, pipelineVersionId } = useParams();
   const { namespace, api, refreshAllAPI } = usePipelinesAPI();
-  const isExperimentsAvailable = useIsAreaAvailable(SupportedArea.PIPELINE_EXPERIMENTS).status;
   const [open, setOpen] = React.useState(false);
   const [isEnabled, setIsEnabled] = React.useState(
     recurringRun?.status === RecurringRunStatus.ENABLED,
@@ -112,7 +110,7 @@ const PipelineRecurringRunDetailsActions: React.FC<PipelineRecurringRunDetailsAc
                           cloneRecurringRunRoute(
                             namespace,
                             recurringRun.recurring_run_id,
-                            isExperimentsAvailable ? experimentId : undefined,
+                            experimentId,
                             pipelineId,
                             pipelineVersionId,
                           ),

diff --git a/...src/concepts/pipelines/content/pipelinesDetails/pipelineRun/PipelineRunDetailsActions.tsx b/...src/concepts/pipelines/content/pipelinesDetails/pipelineRun/PipelineRunDetailsActions.tsx
@@ -13,7 +13,6 @@ import { usePipelinesAPI } from '~/concepts/pipelines/context';
 import useNotification from '~/utilities/useNotification';
 import { PipelineRunKFv2, RuntimeStateKF, StorageStateKF } from '~/concepts/pipelines/kfTypes';
 import { cloneRunRoute, experimentsCompareRunsRoute } from '~/routes';
-import { SupportedArea, useIsAreaAvailable } from '~/concepts/areas';
 import useExperimentById from '~/concepts/pipelines/apiHooks/useExperimentById';
 import { getDashboardMainContainer } from '~/utilities/utils';
 
@@ -34,7 +33,6 @@ const PipelineRunDetailsActions: React.FC<PipelineRunDetailsActionsProps> = ({
   const { namespace, api, refreshAllAPI } = usePipelinesAPI();
   const notification = useNotification();
   const [open, setOpen] = React.useState(false);
-  const isExperimentsAvailable = useIsAreaAvailable(SupportedArea.PIPELINE_EXPERIMENTS).status;
   const isRunActive = run?.storage_state === StorageStateKF.AVAILABLE;
   const [experiment] = useExperimentById(run?.experiment_id);
   const isExperimentActive = experiment?.storage_state === StorageStateKF.AVAILABLE;
@@ -102,7 +100,7 @@ const PipelineRunDetailsActions: React.FC<PipelineRunDetailsActionsProps> = ({
                           cloneRunRoute(
                             namespace,
                             run.run_id,
-                            isExperimentsAvailable ? experimentId : undefined,
+                            experimentId,
                             pipelineId,
                             pipelineVersionId,
                           ),
@@ -124,7 +122,7 @@ const PipelineRunDetailsActions: React.FC<PipelineRunDetailsActionsProps> = ({
                     >
                       Stop
                     </DropdownItem>,
-                    isExperimentsAvailable && experimentId && isRunActive ? (
+                    experimentId && isRunActive ? (
                       <DropdownItem
                         key="compare-runs"
                         onClick={() =>