@openshift-assisted/ui-lib 2.16.4-cim → 2.16.5-cim

package/lib/ocm/components/clusterWizard/ClusterWizard.tsx

@@ -57,7 +57,7 @@ const ClusterWizard = ({ cluster, infraEnv, updateInfraEnv }: ClusterWizardProps
   }
   return (
     <WithErrorBoundary>
-      <div className={classNames('pf-v6-c-wizard', 'cluster-wizard')}>{renderCurrentStep()}</div>
+      <div className={classNames('pf-v5-c-wizard', 'cluster-wizard')}>{renderCurrentStep()}</div>
     </WithErrorBoundary>
   );
 };

package/lib/ocm/components/clusterWizard/ClusterWizardContext.tsx

@@ -3,7 +3,6 @@ import { HostsNetworkConfigurationType } from '../../services';
 import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
 import { ClusterWizardStepsType } from './wizardTransition';
 import { UISettingsValues } from '../../../common';
-import { InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 
 export type ClusterWizardContextType = {
   currentStepId: ClusterWizardStepsType;
@@ -21,8 +20,6 @@ export type ClusterWizardContextType = {
   uiSettings?: UISettingsValues;
   installDisconnected: boolean;
   setInstallDisconnected: (enabled: boolean) => void;
-  disconnectedInfraEnv?: InfraEnv;
-  setDisconnectedInfraEnv: (infraEnv: InfraEnv | undefined) => void;
 };
 
 export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);

package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx

@@ -92,9 +92,6 @@ const ClusterWizardContextProvider = ({
   const [wizardPerPage, setWizardPerPage] = React.useState(10);
   const [customManifestsStep, setCustomManifestsStep] = React.useState<boolean>(false);
   const [installDisconnected, setInstallDisconnected] = React.useState(false);
-  const [disconnectedInfraEnv, setDisconnectedInfraEnv] = React.useState<InfraEnv | undefined>(
-    infraEnv,
-  );
   const location = useLocation();
   const locationState = location.state as ClusterWizardFlowStateType | undefined;
   const {
@@ -262,8 +259,6 @@ const ClusterWizardContextProvider = ({
           connectedWizardStepIds?.length && onSetCurrentStepId(connectedWizardStepIds[0]);
         }
       },
-      disconnectedInfraEnv,
-      setDisconnectedInfraEnv,
     };
   }, [
     wizardStepIds,
@@ -278,7 +273,6 @@ const ClusterWizardContextProvider = ({
     installDisconnected,
     setInstallDisconnected,
     connectedWizardStepIds,
-    disconnectedInfraEnv,
   ]);
 
   if (!contextValue) {

package/lib/ocm/components/clusterWizard/ClusterWizardFooter.tsx

@@ -17,8 +17,6 @@ import { onFetchEvents } from '../fetching/fetchEvents';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { useFeature } from '../../hooks/use-feature';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
-import ClustersService from '../../services/ClustersService';
-import { handleApiError, getApiErrorMessage } from '../../../common/api';
 
 type ClusterValidationSectionProps = {
   cluster?: Cluster;
@@ -73,7 +71,6 @@ type ClusterWizardFooterProps = WizardFooterGenericProps & {
   errorFields?: string[];
   alertTitle?: string;
   alertContent?: string | null;
-  disconnectedClusterId?: string;
 };
 
 const ClusterWizardFooter = ({
@@ -83,37 +80,19 @@ const ClusterWizardFooter = ({
   alertTitle,
   alertContent,
   onCancel,
-  disconnectedClusterId,
   ...rest
 }: ClusterWizardFooterProps) => {
-  const { alerts, addAlert } = useAlerts();
+  const { alerts } = useAlerts();
   const navigate = useNavigate();
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const { currentStepId } = useClusterWizardContext();
   const { resetSingleClusterDialog } = useModalDialogsContext();
-  const { setDisconnectedInfraEnv } = useClusterWizardContext();
 
-  const handleCancel = React.useCallback(async () => {
-    if (disconnectedClusterId) {
-      try {
-        await ClustersService.remove(disconnectedClusterId);
-      } catch (e) {
-        handleApiError(e, () =>
-          addAlert({
-            title: 'Failed to remove cluster',
-            message: getApiErrorMessage(e),
-          }),
-        );
-      }
-    }
-    setDisconnectedInfraEnv(undefined);
-    navigate('/cluster-list');
-  }, [navigate, setDisconnectedInfraEnv, addAlert, disconnectedClusterId]);
+  const handleCancel = React.useCallback(() => navigate('/cluster-list'), [navigate]);
 
-  const handleReset = React.useCallback(
-    () => resetSingleClusterDialog.open({ cluster }),
-    [resetSingleClusterDialog, cluster],
-  );
+  const handleReset = React.useCallback(() => {
+    resetSingleClusterDialog.open({ cluster });
+  }, [resetSingleClusterDialog, cluster]);
 
   const alertsSection = alerts.length ? <Alerts /> : undefined;
 
@@ -140,7 +119,6 @@ const ClusterWizardFooter = ({
       cluster={cluster}
       onFetchEvents={onFetchEvents}
       {...rest}
-      data-testid="cluster-wizard-footer"
     />
   );
 };

package/lib/ocm/components/clusterWizard/ClusterWizardNavigation.tsx

@@ -59,7 +59,6 @@ const ClusterWizardNavigation = ({ cluster }: { cluster?: Cluster }) => {
         isCurrent={clusterWizardContext.currentStepId === stepId}
         isDisabled={isStepDisabled(idx, stepId)}
         isValid={() => isStepValid(stepId, cluster)}
-        data-testid={`cluster-wizard-nav-item-${stepId}`}
       />
     );
   };
@@ -73,12 +72,8 @@ const ClusterWizardNavigation = ({ cluster }: { cluster?: Cluster }) => {
         key="static-network-configuration-form-view"
         isCurrent={isStaticIpStep(clusterWizardContext.currentStepId)}
         isDisabled={isStepIdxAfterCurrent(idx)}
-        data-testid={`cluster-wizard-nav-item-static-network-configuration-form-view`}
       >
-        <WizardNav
-          isInnerList
-          data-testid="cluster-wizard-nav-item-static-network-configuration-form-view-inner-list"
-        >
+        <WizardNav isInnerList>
           {staticIpFormViewSubSteps.map((stepId, subIdx) => {
             return getNavItem(idx + subIdx, stepId);
           })}
@@ -104,7 +99,7 @@ const ClusterWizardNavigation = ({ cluster }: { cluster?: Cluster }) => {
     return navItems;
   };
 
-  return <WizardNav data-testid="cluster-wizard-nav">{getWizardNavItems()}</WizardNav>;
+  return <WizardNav>{getWizardNavItems()}</WizardNav>;
 };
 
 export default ClusterWizardNavigation;

package/lib/ocm/components/clusterWizard/HostDiscovery.tsx

@@ -22,7 +22,6 @@ import {
   Cluster,
   V2ClusterUpdateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
-import useLateBinding from '../../hooks/useLateBinding';
 
 const HostDiscoveryForm = ({ cluster }: { cluster: Cluster }) => {
   const { alerts } = useAlerts();
@@ -30,14 +29,12 @@ const HostDiscoveryForm = ({ cluster }: { cluster: Cluster }) => {
   const clusterWizardContext = useClusterWizardContext();
   const isAutoSaveRunning = useFormikAutoSave();
   const errorFields = getFormikErrorFields(errors, touched);
-  const isBinding = useLateBinding(cluster);
 
   const isNextDisabled =
     !isValid ||
     !!alerts.length ||
     isAutoSaveRunning ||
     isSubmitting ||
-    isBinding ||
     !canNextHostDiscovery({ cluster });
 
   const footer = (

package/lib/ocm/components/clusterWizard/NewClusterWizard.tsx

@@ -4,7 +4,6 @@ import ClusterDetails from './ClusterDetails';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import ReviewStep from './disconnected/ReviewStep';
 import BasicStep from './disconnected/BasicStep';
-import OptionalConfigurationsStep from './disconnected/OptionalConfigurationsStep';
 import { ClusterWizardStepsType } from './wizardTransition';
 
 const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
@@ -13,8 +12,6 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
       return <ReviewStep />;
     case 'disconnected-basic':
       return <BasicStep />;
-    case 'disconnected-optional-configurations':
-      return <OptionalConfigurationsStep />;
     default:
       return <ClusterDetails />;
   }
@@ -23,7 +20,7 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
 const NewClusterWizard: React.FC = () => {
   const { currentStepId } = useClusterWizardContext();
   return (
-    <div className={classNames('pf-v6-c-wizard', 'cluster-wizard')}>
+    <div className={classNames('pf-v5-c-wizard', 'cluster-wizard')}>
       {getCurrentStep(currentStepId)}
     </div>
   );

package/lib/ocm/components/clusterWizard/OperatorsBundle.css

@@ -1,6 +1,6 @@
 .ai-bundle-card {
-  --pf-v6-c-card--m-selectable--m-selected--BackgroundColor: var(
-    --pf-v6-global--BackgroundColor--100
+  --pf-v5-c-card--m-selectable--m-selected--BackgroundColor: var(
+    --pf-v5-global--BackgroundColor--100
   );
-  --pf-v6-c-card--m-selectable--hover--BackgroundColor: var(--pf-v6-global--BackgroundColor--100);
+  --pf-v5-c-card--m-selectable--hover--BackgroundColor: var(--pf-v5-global--BackgroundColor--100);
 }

package/lib/ocm/components/clusterWizard/OperatorsBundle.tsx

@@ -8,6 +8,8 @@ import {
   GalleryItem,
   List,
   ListItem,
+  Split,
+  SplitItem,
   Stack,
   StackItem,
   Title,
@@ -17,14 +19,20 @@ import {
   Bundle,
   PreflightHardwareRequirements,
 } from '@openshift-assisted/types/assisted-installer-service';
+import NewFeatureSupportLevelBadge, {
+  NewSupportLevelBadgeProps,
+} from '../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 import { ExternalLink, OperatorsValues, PopoverIcon, singleClusterBundles } from '../../../common';
 import { useFormikContext } from 'formik';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import { useFeature } from '../../hooks/use-feature';
+import { useSelector } from 'react-redux';
+import { selectIsCurrentClusterSNO } from '../../store/slices/current-cluster/selectors';
 import { getNewBundleOperators } from '../clusterConfiguration/operators/utils';
 import { bundleSpecs } from '../clusterConfiguration/operators/bundleSpecs';
 import {
   highlightMatch,
+  OperatorSpec,
   useOperatorSpecs,
 } from '../../../common/components/operators/operatorSpecs';
 import { useClusterWizardContext } from './ClusterWizardContext';
@@ -70,6 +78,27 @@ const BundleLabel = ({ bundle, searchTerm }: { bundle: Bundle; searchTerm?: stri
   );
 };
 
+const getBundleSupportLevel = (
+  bundle: Bundle,
+  opSpecsByKey: Record<string, OperatorSpec>,
+): NewSupportLevelBadgeProps['supportLevel'] => {
+  let supportLevel: NewSupportLevelBadgeProps['supportLevel'] = undefined;
+  if (bundle.operators) {
+    for (const op of bundle.operators) {
+      const operatorSpec = opSpecsByKey[op];
+      if (operatorSpec) {
+        if (operatorSpec.supportLevel === 'dev-preview') {
+          supportLevel = 'dev-preview';
+          break;
+        } else if (operatorSpec.supportLevel === 'tech-preview') {
+          supportLevel = 'tech-preview';
+        }
+      }
+    }
+  }
+  return supportLevel;
+};
+
 const BundleCard = ({
   bundle,
   bundles,
@@ -82,10 +111,13 @@ const BundleCard = ({
   searchTerm?: string;
 }) => {
   const { values, setFieldValue } = useFormikContext<OperatorsValues>();
+  const isSNO = useSelector(selectIsCurrentClusterSNO);
   const { isFeatureSupported } = useNewFeatureSupportLevel();
   const { byKey: opSpecs } = useOperatorSpecs();
   const { uiSettings } = useClusterWizardContext();
 
+  const supportLevel = getBundleSupportLevel(bundle, opSpecs);
+
   const hasUnsupportedOperators = !!bundle.operators?.some((op) => {
     const operatorSpec = opSpecs[op];
     if (!operatorSpec) {
@@ -102,14 +134,14 @@ const BundleCard = ({
   const isAssistedMigration = uiSettings?.isAssistedMigration;
   const disabledReason = hasUnsupportedOperators
     ? 'Some operators in this bundle are not supported with the current configuration.'
+    : isSNO && bundleSpec?.noSNO
+    ? 'This bundle is not available when deploying a Single Node OpenShift.'
     : incompatibleBundle
     ? `Bundle cannot be installed together with ${
         bundles.find(({ id }) => id === incompatibleBundle)?.title || incompatibleBundle
       }`
     : isAssistedMigration
     ? 'This bundle needs to be selected for clusters created from Migration Assessment'
-    : !bundles.some((b) => b.id === bundle.id)
-    ? 'This bundle is not available for the current configuration, you might be able to use the standalone operators instead.'
     : undefined;
 
   const onSelect = (checked: boolean) => {
@@ -158,6 +190,17 @@ const BundleCard = ({
             <StackItem isFilled>
               <div>{highlightMatch(bundle.description || '', searchTerm)}</div>
             </StackItem>
+            <StackItem>
+              <Split>
+                <SplitItem isFilled />
+                <SplitItem>
+                  <NewFeatureSupportLevelBadge
+                    featureId={bundle.id || ''}
+                    supportLevel={supportLevel}
+                  />
+                </SplitItem>
+              </Split>
+            </StackItem>
           </Stack>
         </CardBody>
       </Card>
@@ -167,12 +210,10 @@ const BundleCard = ({
 
 const OperatorsBundle = ({
   bundles,
-  allBundles,
   preflightRequirements,
   searchTerm,
 }: {
   bundles: Bundle[];
-  allBundles: Bundle[];
   preflightRequirements: PreflightHardwareRequirements | undefined;
   searchTerm?: string;
 }) => {
@@ -188,8 +229,8 @@ const OperatorsBundle = ({
       <StackItem>
         <Gallery hasGutter minWidths={{ default: '350px' }}>
           {(isSingleClusterFeatureEnabled
-            ? allBundles.filter((b) => b.id && singleClusterBundles.includes(b.id))
-            : allBundles
+            ? bundles.filter((b) => b.id && singleClusterBundles.includes(b.id))
+            : bundles
           ).map((bundle) => (
             <GalleryItem key={bundle.id}>
               <BundleCard

package/lib/ocm/components/clusterWizard/OperatorsSelect.tsx

@@ -37,6 +37,7 @@ const OperatorsSelect = ({
   const [supportedOperators, setSupportedOperators] = useStateSafely<string[]>([]);
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const { values } = useFormikContext<OperatorsValues>();
+
   React.useEffect(() => {
     const fetchSupportedOperators = async () => {
       try {

package/lib/ocm/components/clusterWizard/OperatorsStep.tsx

@@ -18,26 +18,13 @@ export const OperatorsStep = ({ cluster }: ClusterOperatorProps) => {
   const { addAlert } = useAlerts();
   const [bundlesLoading, setBundlesLoading] = React.useState(true);
   const [bundles, setBundles] = React.useState<Bundle[]>([]);
-  const [allBundles, setAllBundles] = React.useState<Bundle[]>([]);
   const { preflightRequirements, isLoading } = useClusterPreflightRequirements(cluster.id);
   const [searchTerm, setSearchTerm] = React.useState('');
   React.useEffect(() => {
     const fetchBundles = async () => {
       try {
-        const fetchedBundles = await BundleService.listBundles(
-          cluster?.openshiftVersion || '',
-          cluster?.cpuArchitecture || '',
-          cluster?.platform?.type || '',
-          cluster?.controlPlaneCount === 1 ? 'SNO' : undefined,
-        );
-        const allBundles = await BundleService.listBundles(
-          cluster?.openshiftVersion || '',
-          cluster?.cpuArchitecture || '',
-          cluster?.platform?.type || '',
-          undefined,
-        );
+        const fetchedBundles = await BundleService.listBundles();
         setBundles(fetchedBundles);
-        setAllBundles(allBundles);
       } catch (error) {
         handleApiError(error, () =>
           addAlert({
@@ -51,13 +38,7 @@ export const OperatorsStep = ({ cluster }: ClusterOperatorProps) => {
     };
 
     void fetchBundles();
-  }, [
-    addAlert,
-    cluster.cpuArchitecture,
-    cluster.openshiftVersion,
-    cluster.platform?.type,
-    cluster.controlPlaneCount,
-  ]);
+  }, [addAlert]);
 
   const filteredBundles = bundles.filter(
     (bundle) =>
@@ -94,7 +75,6 @@ export const OperatorsStep = ({ cluster }: ClusterOperatorProps) => {
           bundles={filteredBundles}
           preflightRequirements={preflightRequirements}
           searchTerm={searchTerm}
-          allBundles={allBundles}
         />
       </StackItem>
       <StackItem>

package/lib/ocm/components/clusterWizard/constants.ts

@@ -14,7 +14,6 @@ export const wizardStepNames: { [key in ClusterWizardStepsType]: string } = {
   'credentials-download': 'Download credentials',
   'disconnected-review': 'Review and download ISO',
   'disconnected-basic': 'Basic information',
-  'disconnected-optional-configurations': 'Optional configurations',
 };
 
 export const defaultWizardSteps: ClusterWizardStepsType[] = [

package/lib/ocm/components/clusterWizard/disconnected/BasicStep.tsx

@@ -1,67 +1,33 @@
 import * as React from 'react';
 import {
   ClusterWizardStep,
-  TechnologyPreview,
+  DeveloperPreview,
   ExternalLink,
   OCP_RELEASES_PAGE,
   StaticTextField,
   useTranslation,
 } from '../../../../common';
-import { Flex, Grid, GridItem, Form, Content } from '@patternfly/react-core';
+import {
+  Split,
+  SplitItem,
+  TextContent,
+  Text,
+  TextVariants,
+  Grid,
+  GridItem,
+  Form,
+} from '@patternfly/react-core';
+import { Formik } from 'formik';
 import OcmOpenShiftVersion from '../../clusterConfiguration/OcmOpenShiftVersion';
 import { useClusterWizardContext } from '../ClusterWizardContext';
 import ClusterWizardFooter from '../ClusterWizardFooter';
 import ClusterWizardNavigation from '../ClusterWizardNavigation';
 import { WithErrorBoundary } from '../../../../common/components/ErrorHandling/WithErrorBoundary';
 import InstallDisconnectedSwitch from './InstallDisconnectedSwitch';
-import { Formik } from 'formik';
-import ClustersService from '../../../services/ClustersService';
-import { handleApiError, getApiErrorMessage } from '../../../../common/api';
-import { useAlerts } from '../../../../common/components/AlertsContextProvider';
-import { AlertVariant } from '@patternfly/react-core';
-import { ClusterWizardFlowStateNew } from '../wizardTransition';
-import { useLocation, useNavigate } from 'react-router-dom-v5-compat';
-import { AxiosResponse } from 'axios';
-import { Cluster } from '@openshift-assisted/types//assisted-installer-service';
 
 const BasicStep = () => {
   const { t } = useTranslation();
   const { moveNext } = useClusterWizardContext();
-  const { addAlert } = useAlerts();
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const navigate = useNavigate();
-  const location = useLocation();
-  const currentPath = location.pathname;
-  let disconnectedClusterId: string | undefined;
-
-  const onNext = async () => {
-    try {
-      setIsSubmitting(true);
-      // Create cluster only - infraEnv will be created in OptionalConfigurationsStep
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const { data: disconnectedCluster }: AxiosResponse<Cluster> =
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        await ClustersService.registerDisconnected({
-          name: 'disconnected-cluster',
-          openshiftVersion: '4.20',
-        });
-      disconnectedClusterId = disconnectedCluster.id;
-      navigate(`${currentPath}/${disconnectedClusterId}`, {
-        state: ClusterWizardFlowStateNew,
-      });
-      moveNext();
-    } catch (error: unknown) {
-      handleApiError(error, () => {
-        addAlert({
-          title: 'Failed to create disconnected cluster',
-          message: getApiErrorMessage(error),
-          variant: AlertVariant.danger,
-        });
-      });
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
 
   return (
     <Formik
@@ -72,33 +38,28 @@ const BasicStep = () => {
     >
       <ClusterWizardStep
         navigation={<ClusterWizardNavigation />}
-        footer={
-          <ClusterWizardFooter
-            onNext={() => {
-              void onNext();
-            }}
-            isSubmitting={isSubmitting}
-            disconnectedClusterId={disconnectedClusterId}
-          />
-        }
+        footer={<ClusterWizardFooter onNext={moveNext} />}
       >
         <WithErrorBoundary title="Failed to load Basic step">
           <Grid hasGutter>
             <GridItem>
-              <Content component="h2">Basic information</Content>
+              <Split>
+                <SplitItem>
+                  <TextContent>
+                    <Text component={TextVariants.h2}>Basic information</Text>
+                  </TextContent>
+                </SplitItem>
+                <SplitItem>
+                  <DeveloperPreview />
+                </SplitItem>
+              </Split>
             </GridItem>
             <GridItem>
-              <Flex alignItems={{ default: 'alignItemsCenter' }} gap={{ default: 'gapSm' }}>
-                <TechnologyPreview />
-                <InstallDisconnectedSwitch />
-                <span>
-                  {t("ai:I'm installing on a disconnected/air-gapped/secured environment")}
-                </span>
-              </Flex>
+              <InstallDisconnectedSwitch />
             </GridItem>
             <GridItem>
               <Form id="wizard-cluster-basic-info__form">
-                <OcmOpenShiftVersion openshiftVersion="4.20" withPreviewText withMultiText>
+                <OcmOpenShiftVersion openshiftVersion="4.19" withPreviewText withMultiText>
                   <ExternalLink href={`${window.location.origin}/${OCP_RELEASES_PAGE}`}>
                     <span data-ouia-id="openshift-releases-link">
                       {t('ai:Learn more about OpenShift releases')}

package/lib/ocm/components/clusterWizard/disconnected/InstallDisconnectedSwitch.tsx

@@ -10,6 +10,7 @@ const InstallDisconnectedSwitch = ({ isDisabled }: { isDisabled?: boolean }) =>
   const switchBtn = (
     <Switch
       id="disconnected-install-switch"
+      label={t("ai:I'm installing on a disconnected/air-gapped/secured environment")}
       isChecked={installDisconnected}
       onChange={(_, checked) => setInstallDisconnected(checked)}
       ouiaId="DisconnectedInstall"

package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx

@@ -3,7 +3,7 @@ import ClusterWizardFooter from '../ClusterWizardFooter';
 import { useClusterWizardContext } from '../ClusterWizardContext';
 import {
   ClusterWizardStep,
-  TechnologyPreview,
+  DeveloperPreview,
   PULL_SECRET_INFO_LINK,
   singleClusterOperators,
 } from '../../../../common';
@@ -14,6 +14,9 @@ import {
   SplitItem,
   Alert,
   Grid,
+  Text,
+  TextContent,
+  TextVariants,
   DescriptionList,
   DescriptionListGroup,
   DescriptionListTerm,
@@ -22,22 +25,18 @@ import {
   ListItem,
   ListComponent,
   OrderType,
-  Content,
 } from '@patternfly/react-core';
 import { Formik } from 'formik';
 import { saveAs } from 'file-saver';
-import { useNavigate, useParams } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router-dom-v5-compat';
 
 import { getOperatorSpecs } from '../../../../common/components/operators/operatorSpecs';
-import ClustersService from '../../../services/ClustersService';
-import { handleApiError, getApiErrorMessage } from '../../../../common/api';
-import { useAlerts } from '../../../../common/components/AlertsContextProvider';
-import { AlertVariant } from '@patternfly/react-core';
+
+const downloadUrl =
+  'https://mirror.openshift.com/pub/cgw/assisted-installer-disconnected/latest/agent-ove.x86_64.iso';
 
 const ReviewStep = () => {
-  const { moveBack, disconnectedInfraEnv, setDisconnectedInfraEnv } = useClusterWizardContext();
-  const { clusterId } = useParams<{ clusterId: string }>();
-  const { addAlert } = useAlerts();
+  const { moveBack } = useClusterWizardContext();
   const opSpecs = getOperatorSpecs(() => undefined);
   const navigate = useNavigate();
 
@@ -53,40 +52,11 @@ const ReviewStep = () => {
         footer={
           <ClusterWizardFooter
             onNext={() => {
-              void (async () => {
-                if (disconnectedInfraEnv?.downloadUrl) {
-                  saveAs(disconnectedInfraEnv.downloadUrl);
-                }
-                if (clusterId) {
-                  try {
-                    await ClustersService.remove(clusterId);
-                    // Remove infraEnv from wizard context after successful deregistration
-                    setDisconnectedInfraEnv(undefined);
-                    // Navigate to cluster-list only after successful deregistration
-                    navigate('/cluster-list');
-                  } catch (error) {
-                    handleApiError(error, () => {
-                      addAlert({
-                        title: 'Failed to deregister cluster',
-                        message: getApiErrorMessage(error),
-                        variant: AlertVariant.danger,
-                      });
-                    });
-                    // Error handling: continue with navigation even if deregistration fails
-                    // Still clear the context to avoid stale data
-                    setDisconnectedInfraEnv(undefined);
-                    // Navigate even on error to avoid getting stuck
-                    navigate('/cluster-list');
-                  }
-                } else {
-                  // If there's no cluster to deregister, navigate immediately
-                  navigate('/cluster-list');
-                }
-              })();
+              downloadUrl && saveAs(downloadUrl);
+              navigate('/cluster-list');
             }}
             onBack={moveBack}
             nextButtonText="Download ISO"
-            disconnectedClusterId={clusterId}
           />
         }
       >
@@ -94,10 +64,12 @@ const ReviewStep = () => {
           <Grid hasGutter>
             <Split>
               <SplitItem>
-                <Content component="h2">Review and download ISO</Content>
+                <TextContent>
+                  <Text component={TextVariants.h2}>Review and download ISO</Text>
+                </TextContent>
               </SplitItem>
               <SplitItem>
-                <TechnologyPreview />
+                <DeveloperPreview />
               </SplitItem>
             </Split>
             <Alert isInline variant="info" title="Discovery ISO boot instructions">
@@ -130,7 +102,7 @@ const ReviewStep = () => {
             <DescriptionList isHorizontal>
               <DescriptionListGroup>
                 <DescriptionListTerm>OpenShift version</DescriptionListTerm>
-                <DescriptionListDescription>4.20</DescriptionListDescription>
+                <DescriptionListDescription>4.19</DescriptionListDescription>
               </DescriptionListGroup>
               <DescriptionListGroup>
                 <DescriptionListTerm>CPU architecture</DescriptionListTerm>

package/lib/ocm/components/clusterWizard/index.ts

@@ -2,5 +2,4 @@ export { default as ClusterDetailsForm } from './ClusterDetailsForm';
 export { default as NewClusterWizard } from './NewClusterWizard';
 export { default as ClusterWizard } from './ClusterWizard';
 export { default as ClusterWizardContextProvider } from './ClusterWizardContextProvider';
-export { useClusterWizardContext } from './ClusterWizardContext';
 export { OpenShiftVersionsContextProvider } from './OpenShiftVersionsContext';