@openshift-assisted/ui-lib 2.50.1 → 2.51.1

package/lib/ocm/components/clusterDetail/ResetClusterModal.tsx

@@ -4,6 +4,7 @@ import {
   Button,
   ButtonVariant,
   Content,
+  Icon,
   Modal,
   ModalBody,
   ModalFooter,
@@ -16,7 +17,7 @@ import { getApiErrorMessage, handleApiError } from '../../../common/api';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { calculateCollectedLogsCount } from '../clusters/utils';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
-import { ErrorState, LoadingState, UiIcon } from '../../../common';
+import { ErrorState, LoadingState } from '../../../common';
 import { ClustersAPI } from '../../services/apis';
 
 const ResetClusterModal: React.FC = () => {
@@ -87,8 +88,10 @@ const ResetClusterModal: React.FC = () => {
         </Content>
 
         <Content component="p">
-          <UiIcon size="sm" status="warning" icon={<ExclamationTriangleIcon />} /> Logs won't be
-          available after the installation is reset.
+          <Icon size="sm" status="warning">
+            <ExclamationTriangleIcon />
+          </Icon>{' '}
+          Logs won't be available after the installation is reset.
         </Content>
 
         <Content component="p">Are you sure you want to reset the cluster?</Content>

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

@@ -49,11 +49,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
 
   const handleClusterUpdate = React.useCallback(
-    async (
-      clusterId: Cluster['id'],
-      params: ClusterDetailsUpdateParams,
-      addCustomManifests: boolean,
-    ) => {
+    async (clusterId: Cluster['id'], params: ClusterDetailsUpdateParams) => {
       clearAlerts();
 
       try {
@@ -62,7 +58,6 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
           cluster?.tags,
           params,
         );
-        await clusterWizardContext.updateUISettings({ addCustomManifests });
         dispatch(updateCluster(updatedCluster));
 
         canNextClusterDetails({ cluster: updatedCluster }) && clusterWizardContext.moveNext();
@@ -79,7 +74,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   );
 
   const handleClusterCreate = React.useCallback(
-    async (params: ClusterCreateParamsWithStaticNetworking, addCustomManifests: boolean) => {
+    async (params: ClusterCreateParamsWithStaticNetworking) => {
       clearAlerts();
       try {
         const searchParams = new URLSearchParams(location.search);
@@ -107,14 +102,23 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
         );
         navigate(`../${cluster.id}`, { state: ClusterWizardFlowStateNew });
 
-        const uiPatch: UISettingsValues = { addCustomManifests };
         if (isAssistedMigration) {
-          //For Assisted Migration we need to enable virtualization bundle
-          uiPatch.bundlesSelected = ['virtualization'];
-          uiPatch.isAssistedMigration = true;
+          try {
+            const uiPatch: UISettingsValues = {
+              bundlesSelected: ['virtualization'],
+              isAssistedMigration: true,
+            };
+            await UISettingService.update(cluster.id, uiPatch);
+            await clusterWizardContext.updateUISettings(uiPatch);
+          } catch (uiError) {
+            handleApiError(uiError, () =>
+              addAlert({
+                title: 'Failed to update UI settings',
+                message: getApiErrorMessage(uiError),
+              }),
+            );
+          }
         }
-        await UISettingService.update(cluster.id, uiPatch);
-        await clusterWizardContext.updateUISettings(uiPatch); // keeps local state current
       } catch (e) {
         handleApiError(e, () =>
           addAlert({ title: 'Failed to create new cluster', message: getApiErrorMessage(e) }),

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

@@ -11,9 +11,10 @@ import {
   getRichTextValidation,
   useAlerts,
   TechnologyPreview,
+  OpenshiftVersionOptionType,
+  getFormikErrorFields,
 } from '../../../common';
 import { canNextClusterDetails } from './wizardTransition';
-import { OpenshiftVersionOptionType, getFormikErrorFields } from '../../../common';
 import ClusterWizardFooter from './ClusterWizardFooter';
 import { isInOcm } from '../../../common/api';
 import {
@@ -42,11 +43,10 @@ type ClusterDetailsFormProps = {
   ocpVersions: OpenshiftVersionOptionType[];
   usedClusterNames: string[];
   navigation: React.ReactNode;
-  handleClusterCreate: (params: ClusterCreateParams, addCustomManifests: boolean) => Promise<void>;
+  handleClusterCreate: (params: ClusterCreateParams) => Promise<void>;
   handleClusterUpdate: (
     clusterId: Cluster['id'],
     params: ClusterDetailsUpdateParams,
-    addCustomManifests: boolean,
   ) => Promise<void>;
 };
 
@@ -63,7 +63,7 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
     navigation,
   } = props;
 
-  const { customManifestsStep, moveNext } = useClusterWizardContext();
+  const { moveNext } = useClusterWizardContext();
   const { search } = useLocation();
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const { clearAlerts } = useAlerts();
@@ -82,10 +82,10 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
           resetPlatform = 'baremetal';
         }
         const params = ClusterDetailsService.getClusterUpdateParams(values, resetPlatform);
-        await handleClusterUpdate(cluster.id, params, values.addCustomManifest);
+        await handleClusterUpdate(cluster.id, params);
       } else {
         const params = ClusterDetailsService.getClusterCreateParams(values);
-        await handleClusterCreate(params, values.addCustomManifest);
+        await handleClusterCreate(params);
       }
     },
     [cluster, handleClusterCreate, handleClusterUpdate],
@@ -118,9 +118,8 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
         managedDomains,
         ocpVersions,
         urlSearchParams: search,
-        addCustomManifests: customManifestsStep,
       }),
-    [infraEnv, cluster, pullSecret, managedDomains, ocpVersions, search, customManifestsStep],
+    [infraEnv, cluster, pullSecret, managedDomains, ocpVersions, search],
   );
 
   const { t } = useTranslation();

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

@@ -12,8 +12,6 @@ export type ClusterWizardContextType = {
   wizardStepIds: ClusterWizardStepsType[];
   onUpdateStaticIpView(view: StaticIpView): void;
   onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void;
-  setCustomManifestsStep(addCustomManifest: boolean): void;
-  customManifestsStep: boolean;
   wizardPerPage: number;
   setWizardPerPage: (perPage: number) => void;
   updateUISettings: (data: UISettingsValues) => Promise<void>;

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

@@ -13,12 +13,17 @@ import { HostsNetworkConfigurationType } from '../../services';
 import { defaultWizardSteps, staticIpFormViewSubSteps } from './constants';
 import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
 import { getStaticIpInfo } from '../clusterConfiguration/staticIp/data/fromInfraEnv';
-import { AssistedInstallerOCMPermissionTypesListType, useAlerts } from '../../../common';
+import {
+  AssistedInstallerOCMPermissionTypesListType,
+  useAlerts,
+  isThirdPartyCNI,
+} from '../../../common';
 import useSetClusterPermissions from '../../hooks/useSetClusterPermissions';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 import { useUISettings } from '../../hooks';
 import { AlertVariant } from '@patternfly/react-core';
 import { useFeature } from '../../hooks/use-feature';
+import { isOciPlatformType } from '../utils';
 
 const addStepToClusterWizard = (
   wizardStepIds: ClusterWizardStepsType[],
@@ -50,7 +55,7 @@ const removeStepFromClusterWizard = (
 const getWizardStepIds = (
   wizardStepIds: ClusterWizardStepsType[] | undefined,
   staticIpView?: StaticIpView | 'dhcp-selected',
-  customManifestsStep?: boolean,
+
   isSingleClusterFeatureEnabled?: boolean,
 ): ClusterWizardStepsType[] => {
   let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...defaultWizardSteps];
@@ -64,11 +69,6 @@ const getWizardStepIds = (
     stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
   }
 
-  if (customManifestsStep) {
-    stepsCopy = addStepToClusterWizard(stepsCopy, 'networking', ['custom-manifests']);
-  } else {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'custom-manifests', 1);
-  }
   if (isSingleClusterFeatureEnabled) {
     stepsCopy = addStepToClusterWizard(stepsCopy, 'networking', ['credentials-download']);
   }
@@ -90,7 +90,6 @@ const ClusterWizardContextProvider = ({
   const [currentStepId, setCurrentStepId] = React.useState<ClusterWizardStepsType>();
   const [connectedWizardStepIds, setWizardStepIds] = React.useState<ClusterWizardStepsType[]>();
   const [wizardPerPage, setWizardPerPage] = React.useState(10);
-  const [customManifestsStep, setCustomManifestsStep] = React.useState<boolean>(false);
   const [installDisconnected, setInstallDisconnected] = React.useState(false);
   const location = useLocation();
   const locationState = location.state as ClusterWizardFlowStateType | undefined;
@@ -108,10 +107,13 @@ const ClusterWizardContextProvider = ({
   React.useEffect(() => {
     if (!UISettingsLoading) {
       const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
-      const customManifestsStepEnabled = !!uiSettings?.addCustomManifests;
-      const customManifestsStepNeedsToBeFilled = !!(
-        uiSettings?.addCustomManifests && !uiSettings?.customManifestsAdded
-      );
+      let customManifestsRequired = false;
+      if (cluster) {
+        customManifestsRequired =
+          isThirdPartyCNI(cluster.networkType) || isOciPlatformType(cluster);
+      }
+      const customManifestsStepNeedsToBeFilled =
+        customManifestsRequired && !uiSettings?.customManifestsAdded;
 
       const requiredStepId = getClusterWizardFirstStep(
         locationState,
@@ -120,11 +122,10 @@ const ClusterWizardContextProvider = ({
         cluster?.hosts,
         customManifestsStepNeedsToBeFilled,
       );
-
       const firstStepIds = getWizardStepIds(
         wizardStepIds,
         staticIpInfo?.view,
-        customManifestsStepEnabled,
+
         isSingleClusterFeatureEnabled,
       );
 
@@ -138,7 +139,6 @@ const ClusterWizardContextProvider = ({
 
       setWizardStepIds(firstStepIds);
       setClusterPermissions(cluster, permissions);
-      setCustomManifestsStep(!!uiSettings?.addCustomManifests);
     }
 
     if (
@@ -166,10 +166,11 @@ const ClusterWizardContextProvider = ({
       if (!staticIpInfo) {
         throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
       }
+
       const newStepIds = getWizardStepIds(
         wizardStepIds,
         staticIpInfo.view,
-        customManifestsStep,
+
         isSingleClusterFeatureEnabled,
       );
       setWizardStepIds(newStepIds);
@@ -183,18 +184,6 @@ const ClusterWizardContextProvider = ({
       setCurrentStepId(stepId);
     };
 
-    const onSetAddCustomManifestsStep = (addCustomManifest: boolean) => {
-      setCustomManifestsStep(addCustomManifest);
-      setWizardStepIds(
-        getWizardStepIds(
-          wizardStepIds,
-          undefined,
-          addCustomManifest,
-          isSingleClusterFeatureEnabled,
-        ),
-      );
-    };
-
     return {
       moveBack(): void {
         clearAlerts();
@@ -216,9 +205,7 @@ const ClusterWizardContextProvider = ({
         } else {
           setCurrentStepId('static-ip-network-wide-configurations');
         }
-        setWizardStepIds(
-          getWizardStepIds(wizardStepIds, view, customManifestsStep, isSingleClusterFeatureEnabled),
-        );
+        setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
       },
       onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
         if (type === HostsNetworkConfigurationType.STATIC) {
@@ -226,26 +213,19 @@ const ClusterWizardContextProvider = ({
             getWizardStepIds(
               wizardStepIds,
               StaticIpView.FORM,
-              customManifestsStep,
+
               isSingleClusterFeatureEnabled,
             ),
           );
         } else {
           setWizardStepIds(
-            getWizardStepIds(
-              wizardStepIds,
-              'dhcp-selected',
-              customManifestsStep,
-              isSingleClusterFeatureEnabled,
-            ),
+            getWizardStepIds(wizardStepIds, 'dhcp-selected', isSingleClusterFeatureEnabled),
           );
         }
       },
       wizardStepIds: wizardStepIds,
       currentStepId,
       setCurrentStepId: onSetCurrentStepId,
-      customManifestsStep,
-      setCustomManifestsStep: onSetAddCustomManifestsStep,
       wizardPerPage,
       setWizardPerPage,
       uiSettings,
@@ -264,14 +244,12 @@ const ClusterWizardContextProvider = ({
     wizardStepIds,
     currentStepId,
     infraEnv,
-    customManifestsStep,
     wizardPerPage,
     isSingleClusterFeatureEnabled,
     clearAlerts,
     uiSettings,
     updateUISettings,
     installDisconnected,
-    setInstallDisconnected,
     connectedWizardStepIds,
   ]);
 

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

@@ -22,6 +22,7 @@ export const defaultWizardSteps: ClusterWizardStepsType[] = [
   'host-discovery',
   'storage',
   'networking',
+  'custom-manifests',
   'review',
 ];
 

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

@@ -1,13 +1,13 @@
 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, Grid, GridItem, Form, Content } from '@patternfly/react-core';
 import OcmOpenShiftVersion from '../../clusterConfiguration/OcmOpenShiftVersion';
 import { useClusterWizardContext } from '../ClusterWizardContext';
 import ClusterWizardFooter from '../ClusterWizardFooter';
@@ -34,20 +34,21 @@ const BasicStep = () => {
         <WithErrorBoundary title="Failed to load Basic step">
           <Grid hasGutter>
             <GridItem>
-              <Content component="h2">Basic information</Content>
+              <Split>
+                <SplitItem>
+                  <Content component="h2">Basic information</Content>
+                </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/wizardTransition.ts

@@ -100,6 +100,9 @@ export const getClusterWizardFirstStep = (
     case 'pending-for-input':
     case 'adding-hosts':
     case 'insufficient':
+      if (customManifestsStepNeedsToBeFilled) {
+        return 'custom-manifests';
+      }
       return getStepForFailingHostValidations(hosts);
     default:
       return 'cluster-details';
@@ -239,7 +242,12 @@ const networkingStepValidationsMap: WizardStepValidationMap = {
   // Alternatively we would have to whitelist network validations instead of using group
   // TODO(mlibra): remove that container-images-available from soft validations and let backend drive it via disabling it.
   //   Depends on: https://issues.redhat.com/browse/MGMT-5265
-  softValidationIds: ['ntp-synced', 'container-images-available', 'mtu-valid'],
+  softValidationIds: [
+    'ntp-synced',
+    'container-images-available',
+    'mtu-valid',
+    'custom-manifests-requirements-satisfied',
+  ],
 };
 
 const reviewStepValidationsMap: WizardStepValidationMap = {

package/lib/ocm/components/clusters/ClusterStatus.tsx

@@ -1,15 +1,15 @@
 import React from 'react';
-import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
 import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { FileAltIcon } from '@patternfly/react-icons/dist/js/icons/file-alt-icon';
 import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
 import { BanIcon } from '@patternfly/react-icons/dist/js/icons/ban-icon';
-import { clusterStatusLabels, UiIcon, WithTestID } from '../../../common';
+import { clusterStatusLabels, WithTestID } from '../../../common';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { Icon } from '@patternfly/react-core';
 
 type ClusterStatusProps = {
   status: Cluster['status'];
@@ -24,25 +24,47 @@ type ClusterStatusIconProps = {
 export const ClusterStatusIcon: React.FC<ClusterStatusIconProps> = ({ status, ...extraProps }) => {
   switch (status) {
     case 'cancelled':
-      return <UiIcon size="sm" icon={<BanIcon {...extraProps} />} />;
+      return (
+        <Icon size="sm">
+          <BanIcon {...extraProps} />
+        </Icon>
+      );
     case 'insufficient':
     case 'pending-for-input':
     case 'ready':
-      return <UiIcon size="sm" icon={<FileAltIcon {...extraProps} />} />;
+      return (
+        <Icon size="sm">
+          <FileAltIcon {...extraProps} />
+        </Icon>
+      );
     case 'error':
-      return <UiIcon size="sm" status="danger" icon={<ExclamationCircleIcon {...extraProps} />} />;
+      return (
+        <Icon size="sm" status="danger">
+          <ExclamationCircleIcon {...extraProps} />
+        </Icon>
+      );
     case 'installed':
-      return <UiIcon size="sm" icon={<CheckCircleIcon color={okColor.value} {...extraProps} />} />;
+      return (
+        <Icon status="success" size="sm">
+          <CheckCircleIcon {...extraProps} />
+        </Icon>
+      );
     case 'installing-pending-user-action':
       return (
-        <UiIcon size="sm" status="warning" icon={<ExclamationTriangleIcon {...extraProps} />} />
+        <Icon size="sm" status="warning">
+          <ExclamationTriangleIcon {...extraProps} />
+        </Icon>
       );
 
     case 'preparing-for-installation':
     case 'installing':
     case 'finalizing':
     case 'adding-hosts':
-      return <UiIcon size="sm" icon={<InProgressIcon {...extraProps} />} />;
+      return (
+        <Icon size="sm">
+          <InProgressIcon {...extraProps} />
+        </Icon>
+      );
     default:
       return <></>;
   }

package/lib/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.tsx

@@ -1,9 +1,7 @@
+import React from 'react';
 import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
-import React from 'react';
-import { t_global_color_status_success_default as okColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_success_default';
-import { t_global_color_status_info_100 as infoColor } from '@patternfly/react-tokens/dist/js/t_global_color_status_info_100';
-import { Content } from '@patternfly/react-core';
+import { Content, Icon } from '@patternfly/react-core';
 import {
   FeatureId,
   FeatureIdToSupportLevel,
@@ -13,7 +11,7 @@ import {
 import { TECH_SUPPORT_LEVEL_LINK } from '../../../common/config/docs_links';
 import ExternalLink from '../../../common/components/ui/ExternalLink';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
-import { DetailItem, UiIcon } from '../../../common';
+import { DetailItem } from '../../../common';
 import { getLimitedFeatureSupportLevels } from '../../../common/components/newFeatureSupportLevels/utils';
 import { WithErrorBoundary } from '../../../common/components/ErrorHandling/WithErrorBoundary';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
@@ -90,13 +88,17 @@ export const LimitedSupportedCluster = ({
   <>
     {showVersionWarning && (
       <Content component="p">
-        <UiIcon size="sm" icon={<InfoCircleIcon color={infoColor.var} />} />
+        <Icon status="info" size="sm">
+          <InfoCircleIcon />
+        </Icon>
         &nbsp;The installed OpenShift version is not production-ready
       </Content>
     )}
     {Object.keys(clusterFeatureSupportLevels).length > 0 && (
       <>
-        <UiIcon size="sm" icon={<InfoCircleIcon color={infoColor.var} />} />
+        <Icon status="info" size="sm">
+          <InfoCircleIcon />
+        </Icon>
         &nbsp;Your cluster will be subject to support limitations because it includes:
         <Content component="ul">{getPreviewFeatureList(clusterFeatureSupportLevels)}</Content>
       </>
@@ -106,7 +108,9 @@ export const LimitedSupportedCluster = ({
 
 export const FullySupportedCluster = () => (
   <>
-    <CheckCircleIcon color={okColor.value} />
+    <Icon status="success">
+      <CheckCircleIcon />
+    </Icon>
     &nbsp;Your installed cluster will be fully supported
   </>
 );

package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts

@@ -3,6 +3,7 @@ import {
   architectureData,
   CpuArchitecture,
   FeatureId,
+  isDualStack,
   isSNO,
   SupportedCpuArchitecture,
 } from '../../../common';
@@ -143,6 +144,19 @@ const getOciDisabledReason = (cpuArchitecture: string | undefined, isSupported:
   }
 };
 
+const getSDNDisabledReason = (cluster: Cluster | undefined, isSupported: boolean) => {
+  if (cluster && isSNO(cluster)) {
+    return 'SDN is not supported for single-node clusters.';
+  }
+  if (cluster && isDualStack(cluster)) {
+    return 'SDN is not supported for dual-stack clusters.';
+  }
+  if (!isSupported) {
+    return 'SDN is not supported for the selected configuration.';
+  }
+  return undefined;
+};
+
 export const getNewFeatureDisabledReason = (
   featureId: FeatureId,
   cluster: Cluster | undefined,
@@ -181,6 +195,9 @@ export const getNewFeatureDisabledReason = (
     case 'OSC': {
       return getOscDisabledReason(cluster, activeFeatureConfiguration, isSupported);
     }
+    case 'SDN_NETWORK_TYPE': {
+      return getSDNDisabledReason(cluster, isSupported);
+    }
     case 'NETWORK_TYPE_SELECTION': {
       return getNetworkTypeSelectionDisabledReason(cluster);
     }

package/lib/ocm/components/ui/InfoLinkWithModal.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import {
   Button,
   ButtonVariant,
+  Icon,
   IconComponentProps,
   Modal,
   ModalBody,
@@ -10,7 +11,6 @@ import {
   ModalProps,
 } from '@patternfly/react-core';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
-import { UiIcon } from '../../../common';
 
 export interface InfoLinkWithModalProps {
   linkText: string;
@@ -43,7 +43,9 @@ const InfoLinkWithModal = ({
       <Button id={linkId} variant={ButtonVariant.link} onClick={handleLinkClick} isInline>
         {!isInline && (
           <>
-            <UiIcon size={infoCircleSize} icon={<InfoCircleIcon />} />
+            <Icon size={infoCircleSize}>
+              <InfoCircleIcon />
+            </Icon>
             &nbsp;
           </>
         )}

package/lib/ocm/hooks/useUISettings.ts

@@ -31,7 +31,6 @@ const useUISettings = (clusterId?: Cluster['id']) => {
           const { data: customManifests } = await ClustersAPI.getManifests(clusterId);
 
           const mockUISettings: UISettingsValues = {
-            addCustomManifests: !!customManifests.length,
             customManifestsAdded: !!customManifests.length,
           };
 

package/lib/ocm/services/ClusterDetailsService.ts

@@ -105,7 +105,6 @@ const ClusterDetailsService = {
     cluster,
     infraEnv,
     urlSearchParams,
-    addCustomManifests,
     ...args
   }: {
     cluster?: Cluster;
@@ -114,7 +113,6 @@ const ClusterDetailsService = {
     managedDomains: ManagedDomain[];
     ocpVersions: OpenshiftVersionOptionType[];
     urlSearchParams: string;
-    addCustomManifests?: boolean;
   }): OcmClusterDetailsValues {
     const values = getClusterDetailsInitialValues({
       cluster,
@@ -133,7 +131,6 @@ const ClusterDetailsService = {
       ...values,
       cpuArchitecture,
       hostsNetworkConfigurationType,
-      addCustomManifest: !!addCustomManifests,
       isCMNSupported: true,
       isSNODevPreview: false,
     };

package/lib/ocm/services/types.ts

@@ -21,7 +21,6 @@ export enum HostsNetworkConfigurationType {
 
 export type OcmClusterDetailsValues = ClusterDetailsValues & {
   hostsNetworkConfigurationType: HostsNetworkConfigurationType;
-  addCustomManifest: boolean;
   isCMNSupported: boolean;
   isSNODevPreview: boolean;
 };

package/lib/ocm/store/slices/clusters/selectors.tsx

@@ -11,8 +11,9 @@ import {
   getTotalHostCount,
   HostsCount,
   ResourceUIState,
+  type ClusterTableRows,
+  type HumanizedSortable,
 } from '../../../../common';
-import type { ClusterTableRows, HumanizedSortable } from '../../../../common';
 import ClusterStatus, { getClusterStatusText } from '../../../components/clusters/ClusterStatus';
 import { RootStateDay1 } from '../../store-day1';
 import type { Cluster } from '@openshift-assisted/types/assisted-installer-service';