@openshift-assisted/ui-lib 2.14.6-cim → 2.15.0-cim

package/lib/ocm/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx

@@ -0,0 +1,158 @@
+import React from 'react';
+import {
+  FormGroup,
+  Tooltip,
+  Dropdown,
+  DropdownItem,
+  MenuToggle,
+  MenuToggleElement,
+  DropdownList,
+} from '@patternfly/react-core';
+import { useField } from 'formik';
+import { getFieldId, PopoverIcon } from '../../../common';
+import {
+  NewFeatureSupportLevelMap,
+  useNewFeatureSupportLevel,
+} from '../../../common/components/newFeatureSupportLevels';
+import OcmSNODisclaimer from './OcmSNODisclaimer';
+import toNumber from 'lodash-es/toNumber';
+
+const INPUT_NAME = 'controlPlaneCount';
+const fieldId = getFieldId(INPUT_NAME, 'input');
+const DEFAULT_VALUE = 3;
+
+export const ControlPlaneNodesLabel = () => {
+  return (
+    <>
+      Number of control plane nodes{' '}
+      <PopoverIcon
+        bodyContent={
+          <>
+            Control plane nodes manage workloads, maintain cluster state, and ensure stability.
+            Using more than three nodes boosts fault tolerance and availability, reducing downtime
+            during failures.
+          </>
+        }
+      />
+    </>
+  );
+};
+
+interface ControlPlaneNodesOption {
+  value: number;
+  label: string;
+}
+
+interface ControlPlaneNodesDropdownProps {
+  featureSupportLevelData?: NewFeatureSupportLevelMap | null;
+}
+
+const isDropdownItemEnabled = (
+  controlPlaneNodeCount: number,
+  isNonStandardControlPlaneEnabled: boolean,
+): boolean => {
+  if (controlPlaneNodeCount === 4 || controlPlaneNodeCount === 5) {
+    return isNonStandardControlPlaneEnabled;
+  }
+  return true;
+};
+
+const ControlPlaneNodesDropdown: React.FC<ControlPlaneNodesDropdownProps> = ({
+  featureSupportLevelData,
+}) => {
+  const [field, , { setValue }] = useField<number>(INPUT_NAME);
+  const [isOpen, setOpen] = React.useState<boolean>(false);
+  const newFeatureSupportLevelContext = useNewFeatureSupportLevel();
+
+  const snoSupportLevel = newFeatureSupportLevelContext.getFeatureSupportLevel(
+    'SNO',
+    featureSupportLevelData ?? undefined,
+  );
+  const snoExpansion = newFeatureSupportLevelContext.isFeatureSupported(
+    'SINGLE_NODE_EXPANSION',
+    featureSupportLevelData ?? undefined,
+  );
+  const isDisabled = newFeatureSupportLevelContext.isFeatureDisabled(
+    'SNO',
+    featureSupportLevelData ?? undefined,
+  );
+
+  const disabledReason =
+    'This option is not available with the current configurations. Make sure that OpenShift version is 4.18 or newer, CPU architecture is x86_64 and no external platform integration is selected.';
+
+  const isNonStandardControlPlaneEnabled = newFeatureSupportLevelContext.isFeatureSupported(
+    'NON_STANDARD_HA_CONTROL_PLANE',
+    featureSupportLevelData ?? undefined,
+  );
+
+  const options: ControlPlaneNodesOption[] = [
+    { value: 1, label: '1 (Single Node OpenShift)' },
+    { value: 3, label: '3 (highly available cluster)' },
+    { value: 4, label: '4 (highly available cluster+)' },
+    { value: 5, label: '5 (highly available cluster++)' },
+  ];
+
+  React.useEffect(() => {
+    if (!field.value) {
+      setValue(DEFAULT_VALUE);
+    }
+  }, [field.value, setValue]);
+
+  const onSelect = (event?: React.MouseEvent<Element, MouseEvent>): void => {
+    const selectedValue = event?.currentTarget.id as string;
+    setValue(toNumber(selectedValue));
+    setOpen(false);
+  };
+
+  const dropdownItems = options.map(({ value, label }) => {
+    const isItemEnabled = isDropdownItemEnabled(value, isNonStandardControlPlaneEnabled);
+    return (
+      <DropdownItem key={value} id={value.toString()} isAriaDisabled={!isItemEnabled}>
+        <Tooltip hidden={isItemEnabled} content={disabledReason} position="top">
+          <div>{label}</div>
+        </Tooltip>
+      </DropdownItem>
+    );
+  });
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      id={fieldId}
+      ref={toggleRef}
+      onClick={() => setOpen(!isOpen)}
+      isExpanded={isOpen}
+      className="pf-v5-u-w-100"
+    >
+      {options.find((opt) => opt.value === field.value)?.label || 'Select'}
+    </MenuToggle>
+  );
+
+  return (
+    <>
+      <FormGroup
+        id={`form-control__${fieldId}`}
+        label={<ControlPlaneNodesLabel />}
+        fieldId={fieldId}
+      >
+        <Dropdown
+          id={`${fieldId}-dropdown`}
+          isOpen={isOpen}
+          toggle={toggle}
+          onOpenChange={() => setOpen(!isOpen)}
+          onSelect={onSelect}
+        >
+          <DropdownList>{dropdownItems}</DropdownList>
+        </Dropdown>
+      </FormGroup>
+      {field.value === 1 && (
+        <OcmSNODisclaimer
+          isDisabled={isDisabled}
+          snoSupportLevel={snoSupportLevel || 'supported'}
+          snoExpansionSupported={snoExpansion}
+        />
+      )}
+    </>
+  );
+};
+
+export default ControlPlaneNodesDropdown;

package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx

@@ -1,7 +1,14 @@
 import React from 'react';
-import { FormGroup, Split, SplitItem, Tooltip } from '@patternfly/react-core';
-import { Dropdown, DropdownItem, DropdownToggle } from '@patternfly/react-core/deprecated';
-import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
+import {
+  FormGroup,
+  Split,
+  SplitItem,
+  Tooltip,
+  Dropdown,
+  DropdownItem,
+  MenuToggle,
+  MenuToggleElement,
+} from '@patternfly/react-core';
 import { useField } from 'formik';
 import {
   architectureData,
@@ -119,7 +126,7 @@ const CpuArchitectureDropdown = ({
   ]);
 
   const onSelect = React.useCallback(
-    (event?: React.SyntheticEvent<HTMLDivElement>) => {
+    (event?: React.MouseEvent<Element, MouseEvent>): void => {
       const selectedCpuArch = event?.currentTarget.id as SupportedCpuArchitecture;
       setValue(selectedCpuArch);
       setOpen(false);
@@ -146,31 +153,30 @@ const CpuArchitectureDropdown = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [cpuArchitectures, openshiftVersion, selectedCpuArchitecture]);
 
-  const toggle = React.useMemo(
-    () => (
-      <DropdownToggle
-        onToggle={(_event, val: boolean) => setOpen(val)}
-        toggleIndicator={CaretDownIcon}
-        isText
-        className="pf-v5-u-w-100"
-      >
-        {currentCpuArch}
-      </DropdownToggle>
-    ),
-    [setOpen, currentCpuArch],
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      id={fieldId}
+      ref={toggleRef}
+      onClick={() => setOpen(!isOpen)}
+      isExpanded={isOpen}
+      className="pf-v5-u-w-100"
+    >
+      {currentCpuArch}
+    </MenuToggle>
   );
 
   return (
     <FormGroup id={`form-control__${fieldId}`} fieldId={fieldId} label={'CPU architecture'}>
       <Dropdown
         {...field}
-        id={fieldId}
-        dropdownItems={enabledItems}
+        id={`${fieldId}-dropdown`}
         toggle={toggle}
         isOpen={isOpen}
-        className="pf-v5-u-w-100"
         onSelect={onSelect}
-      />
+        onOpenChange={() => setOpen(!isOpen)}
+      >
+        {enabledItems}
+      </Dropdown>
     </FormGroup>
   );
 };

package/lib/ocm/components/clusterConfiguration/CustomManifestCheckbox.tsx

@@ -13,7 +13,6 @@ import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 import DeleteCustomManifestModal from './manifestsConfiguration/DeleteCustomManifestModal';
 import { ClustersService } from '../../services';
 import { ClustersAPI } from '../../services/apis';
-import { useLocation } from 'react-router-dom-v5-compat';
 
 const Label = () => {
   return (
@@ -38,18 +37,6 @@ const CustomManifestCheckbox = ({ clusterId, isDisabled }: CustomManifestCheckbo
   const fieldId = getFieldId(name, 'input');
   const clusterWizardContext = useClusterWizardContext();
   const [isDeleteCustomManifestsOpen, setDeleteCustomManifestsOpen] = React.useState(false);
-  const location = useLocation();
-
-  React.useEffect(() => {
-    const searchParams = new URLSearchParams(location.search);
-    const isAssistedMigration = searchParams.get('source') === 'assisted_migration';
-
-    if (isAssistedMigration) {
-      setValue(true);
-      clusterWizardContext.setCustomManifestsStep(true);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [location]);
 
   const cleanCustomManifests = React.useCallback(async () => {
     const { data: manifests } = await ClustersAPI.getManifests(clusterId);

package/lib/ocm/components/clusterConfiguration/DiscoveryImageModal.tsx

@@ -1,7 +1,14 @@
 import React from 'react';
 import { Button, ButtonVariant, Modal, ModalVariant } from '@patternfly/react-core';
 import { pluralize } from 'humanize-plus';
-import { CpuArchitecture, DownloadIso, ErrorState, isSNO, ToolbarButton } from '../../../common';
+import {
+  AI_CISCO_INTERSIGHT_TAG,
+  CpuArchitecture,
+  DownloadIso,
+  ErrorState,
+  isSNO,
+  ToolbarButton,
+} from '../../../common';
 import DiscoveryImageForm from './DiscoveryImageForm';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
 import useInfraEnvImageUrl from '../../hooks/useInfraEnvImageUrl';
@@ -9,6 +16,9 @@ import useInfraEnvIpxeImageUrl from '../../hooks/useInfraEnvIpxeImageUrl';
 import DownloadIpxeScript from '../../../common/components/clusterConfiguration/DownloadIpxeScript';
 import './DiscoveryImageModal.css';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { ClustersService } from '../../services';
+import { useDispatch } from 'react-redux';
+import { updateCluster } from '../../store/slices/current-cluster/slice';
 
 type DiscoveryImageModalButtonProps = {
   ButtonComponent?: typeof Button | typeof ToolbarButton;
@@ -49,6 +59,8 @@ export const DiscoveryImageModal = () => {
   const { getIsoImageUrl } = useInfraEnvImageUrl();
   const { getIpxeImageUrl } = useInfraEnvIpxeImageUrl();
 
+  const dispatch = useDispatch();
+
   const onImageReady = React.useCallback(async () => {
     // We need to retrieve the Iso for the only infraEnv on Day1, hence we don't specify the architecture
     const { url, error } = await getIsoImageUrl(cluster.id, CpuArchitecture.USE_DAY1_ARCHITECTURE);
@@ -73,6 +85,16 @@ export const DiscoveryImageModal = () => {
     setIpxeSelected(true);
   }, []);
 
+  const updateTagsForCiscoIntersight = async (cluster: Cluster) => {
+    try {
+      const { data: updatedCluster } = await ClustersService.update(cluster.id, cluster.tags, {
+        tags: AI_CISCO_INTERSIGHT_TAG,
+      });
+
+      dispatch(updateCluster(updatedCluster));
+    } catch (e) {}
+  };
+
   if (!cluster) {
     return null;
   }
@@ -98,6 +120,7 @@ export const DiscoveryImageModal = () => {
           isSNO={isSNOCluster}
           onReset={onReset}
           onClose={close}
+          updateTagsForCiscoIntersight={() => void updateTagsForCiscoIntersight(cluster)}
         />
       ) : ipxeDownloadUrl ? (
         <DownloadIpxeScript

package/lib/ocm/components/clusterConfiguration/DiscoveryImageTypeDropdown.tsx

@@ -1,12 +1,13 @@
 import React from 'react';
-import { FormGroup } from '@patternfly/react-core';
+import { FormGroup, Tooltip } from '@patternfly/react-core';
 import {
   DropdownItem,
-  DropdownToggle,
+  Divider,
   Dropdown,
-  DropdownSeparator,
-} from '@patternfly/react-core/deprecated';
-import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
+  MenuToggle,
+  MenuToggleElement,
+  DropdownList,
+} from '@patternfly/react-core';
 import { useField } from 'formik';
 import {
   CpuArchitecture,
@@ -47,74 +48,74 @@ export const DiscoveryImageTypeDropdown = ({
       key="full-iso"
       id="full-iso"
       description={'Use when configuring custom networking for easier debugging'}
+      value={discoveryImageTypes['full-iso']}
     >
       {discoveryImageTypes['full-iso']}
     </DropdownItem>,
-    <DropdownSeparator key="separator1" />,
-    <DropdownItem
-      key="minimal-iso"
-      id="minimal-iso"
-      description={'Use when provisioning with default networking options'}
-      tooltip={
+    <Divider component="li" key="separator1" />,
+    <Tooltip
+      key="minimal-iso-tooltip"
+      content={
         isMinimalISODisabled ? (
           <p>{'This provisioning type is not supported when using s390x architecture'}</p>
         ) : undefined
       }
-      isAriaDisabled={!!isMinimalISODisabled}
     >
-      {discoveryImageTypes['minimal-iso']}
-    </DropdownItem>,
-    <DropdownSeparator key="separator2" />,
+      <DropdownItem
+        key="minimal-iso"
+        id="minimal-iso"
+        description={'Use when provisioning with default networking options'}
+        isAriaDisabled={!!isMinimalISODisabled}
+        value={discoveryImageTypes['minimal-iso']}
+      >
+        {discoveryImageTypes['minimal-iso']}
+      </DropdownItem>
+    </Tooltip>,
+    <Divider component="li" key="separator2" />,
     <DropdownItem
       key="discovery-image-ipxe"
       id="discovery-image-ipxe"
       description={'Use when your platform does not support booting from ISO'}
+      value={discoveryImageTypes['discovery-image-ipxe']}
     >
       {discoveryImageTypes['discovery-image-ipxe']}
     </DropdownItem>,
   ];
 
-  const onSelect = React.useCallback(
-    (event?: React.SyntheticEvent<HTMLDivElement>) => {
-      const imageTypeSelection = event?.currentTarget.id as DiscoveryImageType;
-      const currentValue = imageTypeSelection
-        ? discoveryImageTypes[imageTypeSelection]
-        : defaultValue;
-      setCurrent(currentValue ? currentValue : '');
-      setValue(imageTypeSelection);
-      setOpen(false);
-      onChange(imageTypeSelection === 'discovery-image-ipxe');
-    },
-    [setCurrent, setOpen, defaultValue, setValue, onChange],
-  );
+  const onSelect = (event?: React.MouseEvent<Element, MouseEvent>, value?: string | number) => {
+    const imageTypeSelection = value as string;
+    setCurrent(imageTypeSelection ? imageTypeSelection : '');
+    setValue(event?.currentTarget.id as DiscoveryImageType);
+    setOpen(false);
+    onChange(imageTypeSelection === 'discovery-image-ipxe');
+  };
 
-  const toggle = React.useMemo(
-    () => (
-      <DropdownToggle
-        onToggle={(_event, val) => setOpen(val)}
-        toggleIndicator={CaretDownIcon}
-        isText
-        className="pf-v5-u-w-100"
-        isDisabled={isDisabled}
-      >
-        {current || value}
-      </DropdownToggle>
-    ),
-    [setOpen, current, value, isDisabled],
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      id={fieldId}
+      className="pf-v5-u-w-100"
+      ref={toggleRef}
+      isFullWidth
+      onClick={() => setOpen(!isOpen)}
+      isExpanded={isOpen}
+      isDisabled={isDisabled}
+    >
+      {current || value}
+    </MenuToggle>
   );
 
   return (
     <FormGroup fieldId={fieldId} label={'Provisioning type'}>
       <Dropdown
         {...field}
-        name={name}
-        id={fieldId}
-        dropdownItems={dropdownItems}
+        id={`${fieldId}-dropdown`}
         toggle={toggle}
         isOpen={isOpen}
-        className="pf-v5-u-w-100"
         onSelect={onSelect}
-      />
+        onOpenChange={() => setOpen(!isOpen)}
+      >
+        <DropdownList>{dropdownItems}</DropdownList>
+      </Dropdown>
     </FormGroup>
   );
 };

package/lib/ocm/components/clusterConfiguration/HostInventory.tsx

@@ -30,7 +30,6 @@ const schedulableMastersTooltip =
 
 const HostInventory = ({ cluster }: { cluster: Cluster }) => {
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-
   const mastersMustRunWorkloads = selectMastersMustRunWorkloads(cluster);
   const { setFieldValue } = useFormikContext<HostDiscoveryValues>();
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);

package/lib/ocm/components/clusterConfiguration/OcmBaseDomainField.tsx

@@ -5,11 +5,13 @@ import {
   HelperText,
   HelperTextItem,
   Tooltip,
+  Dropdown,
+  DropdownItem,
+  MenuToggle,
+  MenuToggleElement,
 } from '@patternfly/react-core';
-import { Dropdown, DropdownItem, DropdownToggle } from '@patternfly/react-core/deprecated';
 import { useField, useFormikContext } from 'formik';
 import { ClusterDetailsValues, getFieldId } from '../../../common';
-import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
 import { OcmCheckboxField, OcmInputField } from '../ui/OcmFormFields';
 import { ManagedDomain } from '@openshift-assisted/types/assisted-installer-service';
 import { clusterExistsReason } from '../featureSupportLevels/featureStateUtils';
@@ -62,25 +64,25 @@ export const OcmBaseDomainField = ({
     ));
   }, [managedDomains]);
 
-  const dropdownToggle = React.useMemo(() => {
+  const dropdownToggle = (toggleRef: React.Ref<MenuToggleElement>) => {
     const selectedDomain = managedDomains.find((d) => d.domain === value);
     return (
-      <DropdownToggle
-        onToggle={(_event, val) => setOpen(val)}
-        toggleIndicator={CaretDownIcon}
-        isText
+      <MenuToggle
+        ref={toggleRef}
+        onClick={() => setOpen(!isOpen)}
+        isExpanded={isOpen}
         className="pf-v5-u-w-100"
       >
         {selectedDomain ? getManagedDomainLabel(selectedDomain) : 'Base domain'}
-      </DropdownToggle>
+      </MenuToggle>
     );
-  }, [managedDomains, value]);
+  };
 
   const toggleRedHatDnsService = (checked: boolean) =>
     setValue((checked && managedDomains.map((d) => d.domain)[0]) || '');
 
   const onSelect = React.useCallback(
-    (event?: React.SyntheticEvent<HTMLDivElement>) => {
+    (event?: React.MouseEvent<Element, MouseEvent>): void => {
       const selectedDomain = event?.currentTarget.id || '';
       setValue(selectedDomain);
       setOpen(false);
@@ -111,11 +113,12 @@ export const OcmBaseDomainField = ({
         {useRedHatDnsService ? (
           <Dropdown
             toggle={dropdownToggle}
-            dropdownItems={dropdownItems}
             isOpen={isOpen}
             onSelect={onSelect}
-            className="pf-v5-u-w-100"
-          />
+            onOpenChange={() => setOpen(!isOpen)}
+          >
+            {dropdownItems}
+          </Dropdown>
         ) : (
           <OcmInputField
             name={INPUT_NAME}

package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx

@@ -5,7 +5,6 @@ import { useFormikContext } from 'formik';
 import { HostsNetworkConfigurationControlGroup } from './HostsNetworkConfigurationControlGroup';
 import {
   ClusterDetailsValues,
-  isSNO,
   OpenshiftVersionOptionType,
   PullSecret,
   ocmClusterNameValidationMessages,
@@ -24,7 +23,6 @@ import OcmOpenShiftVersionSelect from './OcmOpenShiftVersionSelect';
 import CustomManifestCheckbox from './CustomManifestCheckbox';
 import CpuArchitectureDropdown from './CpuArchitectureDropdown';
 import { OcmBaseDomainField } from './OcmBaseDomainField';
-import OcmSNOControlGroup from './OcmSNOControlGroup';
 import useSupportLevelsAPI from '../../hooks/useSupportLevelsAPI';
 import { useOpenShiftVersionsContext } from '../clusterWizard/OpenShiftVersionsContext';
 import { ExternalPlatformDropdown } from './platformIntegration/ExternalPlatformDropdown';
@@ -34,6 +32,7 @@ import { ExternalPlatformLabels } from './platformIntegration/constants';
 import { ManagedDomain, PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 import { useFeature } from '../../hooks/use-feature';
+import ControlPlaneNodesDropdown, { ControlPlaneNodesLabel } from './ControlPlaneNodesDropdown';
 
 export type OcmClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
@@ -59,7 +58,7 @@ export const OcmClusterDetailsFormFields = ({
   clusterId,
 }: OcmClusterDetailsFormFieldsProps) => {
   const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
-  const { highAvailabilityMode, useRedHatDnsService } = values;
+  const { useRedHatDnsService } = values;
   const nameInputRef = React.useRef<HTMLInputElement>();
 
   const { t } = useTranslation();
@@ -134,7 +133,6 @@ export const OcmClusterDetailsFormFields = ({
 
       <OcmBaseDomainField managedDomains={managedDomains} clusterExists={clusterExists} />
 
-      {/* TODO(mlibra): For single-cluster: We will probably change this to just a static text */}
       {forceOpenshiftVersion ? (
         <OcmOpenShiftVersion
           versions={versions}
@@ -146,7 +144,7 @@ export const OcmClusterDetailsFormFields = ({
       ) : (
         <OcmOpenShiftVersionSelect versions={versions} />
       )}
-      {clusterExists ? (
+      {clusterExists || isSingleClusterFeatureEnabled ? (
         <StaticTextField name="cpuArchitecture" label="CPU architecture" isRequired>
           {cpuArchitecture}
         </StaticTextField>
@@ -156,10 +154,6 @@ export const OcmClusterDetailsFormFields = ({
           cpuArchitectures={cpuArchitectures}
         />
       )}
-      <OcmSNOControlGroup
-        highAvailabilityMode={highAvailabilityMode}
-        featureSupportLevelData={featureSupportLevelData ?? undefined}
-      />
 
       {!isPullSecretSet && <PullSecret isOcm={isOcm} defaultPullSecret={defaultPullSecret} />}
 
@@ -176,26 +170,30 @@ export const OcmClusterDetailsFormFields = ({
           onChange={handleExternalPartnerIntegrationsChange}
           cpuArchitecture={values.cpuArchitecture as SupportedCpuArchitecture}
           featureSupportLevelData={featureSupportLevelData}
-          isSNO={isSNO({ highAvailabilityMode })}
+          isSNO={values.controlPlaneCount === 1}
         />
       )}
 
+      {clusterExists ? (
+        <StaticTextField name="controlPlaneCount" label={<ControlPlaneNodesLabel />}>
+          {values.controlPlaneCount}
+        </StaticTextField>
+      ) : (
+        <ControlPlaneNodesDropdown featureSupportLevelData={featureSupportLevelData} />
+      )}
       <CustomManifestCheckbox clusterId={clusterId || ''} isDisabled={platform === 'external'} />
 
-      {
-        // Reason: In the single-cluster flow, the Host discovery phase is replaced by a single one-fits-all ISO download
-        !isSingleClusterFeatureEnabled && (
-          <HostsNetworkConfigurationControlGroup
-            clusterExists={clusterExists}
-            isDisabled={platform === 'external'}
-          />
-        )
-      }
+      {!isSingleClusterFeatureEnabled && (
+        <HostsNetworkConfigurationControlGroup
+          clusterExists={clusterExists}
+          isDisabled={platform === 'external'}
+        />
+      )}
 
       <DiskEncryptionControlGroup
         values={values}
         isDisabled={isPullSecretSet}
-        isSNO={isSNO({ highAvailabilityMode })}
+        isSNO={values.controlPlaneCount === 1}
         docVersion={openshiftVersion}
       />
     </Form>

package/lib/ocm/components/clusterConfiguration/OcmClusterProgressItems.tsx

@@ -52,10 +52,7 @@ const OcmClusterProgressItems = ({
           </GridItem>
           <RenderIf condition={olmOperators.length > 0}>
             <GridItem span={3}>
-              <OcmOperatorsProgressItem
-                operators={olmOperators}
-                openshiftVersion={cluster.openshiftVersion}
-              />
+              <OcmOperatorsProgressItem operators={olmOperators} />
             </GridItem>
           </RenderIf>
         </Grid>