@openshift-assisted/ui-lib 2.9.15-cim → 2.10.1-cim

package/lib/common/config/constants.ts

@@ -387,4 +387,4 @@ export const HOW_TO_KNOW_IF_CLUSTER_SUPPORTS_MULTIPLE_CPU_ARCHS =
   'https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2022/html-single/assisted_installer_for_openshift_container_platform/index#checking-for-multiple-architectures_expanding-the-cluster';
 
 export const MCE_LINK =
-  'https://docs.openshift.com/container-platform/4.13/architecture/mce-overview-ocp.html';
+  'https://docs.openshift.com/container-platform/4.14/architecture/mce-overview-ocp.html';

package/lib/common/types/clusters.ts

@@ -37,9 +37,7 @@ export type NetworkConfigurationValues = Pick<
   | 'clusterNetworkHostPrefix'
   | 'serviceNetworkCidr'
   | 'apiVips'
-  | 'apiVip'
   | 'ingressVips'
-  | 'ingressVip'
   | 'sshPublicKey'
   | 'vipDhcpAllocation'
   | 'networkType'
@@ -50,6 +48,8 @@ export type NetworkConfigurationValues = Pick<
   hostSubnet?: string;
   managedNetworkingType: 'userManaged' | 'clusterManaged';
   stackType?: 'singleStack' | 'dualStack';
+  apiVip?: string;
+  ingressVip?: string;
 };
 export type HostDiscoveryValues = V2ClusterUpdateParams & {
   usePlatformIntegration: boolean;
@@ -65,9 +65,13 @@ export type OperatorsValues = V2ClusterUpdateParams & {
   useMultiClusterEngine: boolean;
 };
 
-export type SupportedPlatformType = Extract<PlatformType, 'vsphere' | 'nutanix' | 'oci'>;
+export type SupportedPlatformType = Extract<PlatformType, 'vsphere' | 'nutanix' | 'external'>;
 
-export const SupportedPlatformIntegrations: SupportedPlatformType[] = ['vsphere', 'nutanix', 'oci'];
+export const SupportedPlatformIntegrations: SupportedPlatformType[] = [
+  'vsphere',
+  'nutanix',
+  'external',
+];
 export const NonPlatformIntegrations: PlatformType[] = ['baremetal', 'none'];
 
 export type DiscoveryImageType = ImageType | 'discovery-image-ipxe';

package/lib/common/utils.ts

@@ -87,3 +87,21 @@ export const stringToJSON = <T>(jsonString: string | undefined): T | undefined =
 
   return jsObject;
 };
+
+export const downloadFile = (fileUrl?: string, dataBlob?: Blob, fileName?: string) => {
+  const link = document.createElement('a');
+  if (fileUrl && fileUrl !== '') {
+    link.setAttribute('href', fileUrl);
+  }
+  if (dataBlob) {
+    const file = new Blob([dataBlob], { type: 'octet/stream' });
+    link.setAttribute('href', URL.createObjectURL(file));
+  }
+  if (fileName) {
+    link.setAttribute('download', fileName);
+  }
+  link.style.visibility = 'hidden';
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+};

package/lib/ocm/components/AddHosts/AddHosts.tsx

@@ -12,7 +12,7 @@ import {
   Toolbar,
   ToolbarContent,
 } from '@patternfly/react-core';
-import { getApiErrorMessage, handleApiError } from '../../api';
+import { getApiErrorMessage, handleApiError } from '../../../common/api';
 import { DiscoveryImageModal } from '../clusterConfiguration/DiscoveryImageModal';
 import { ModalDialogsContextProvider } from '../hosts/ModalDialogsContext';
 import {

package/lib/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.tsx

@@ -15,7 +15,7 @@ import {
 } from '../../../../common';
 import { HostsNetworkConfigurationType, InfraEnvsService } from '../../../services';
 import { useModalDialogsContext } from '../../hosts/ModalDialogsContext';
-import { handleApiError } from '../../../api';
+import { handleApiError } from '../../../../common/api';
 import { Day2ClusterDetailValues } from '../types';
 import { useDay2WizardContext } from './Day2WizardContext';
 import Day2WizardNav from './Day2WizardNav';
@@ -29,6 +29,7 @@ import {
   InfraEnv,
   InfraEnvCreateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
+import { isOciPlatformType } from '../../utils';
 
 const getDay2ClusterDetailInitialValues = async (
   clusterId: Cluster['id'],
@@ -241,9 +242,7 @@ const Day2ClusterDetails = () => {
                   </GridItem>
                 )}
                 <GridItem>
-                  <Day2HostStaticIpConfigurations
-                    isDisabled={day2Cluster.platform?.type === 'oci'}
-                  />
+                  <Day2HostStaticIpConfigurations isDisabled={isOciPlatformType(day2Cluster)} />
                 </GridItem>
               </Grid>
             </Form>

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTab.tsx

@@ -1,23 +1,21 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import { AssistedUILibVersion } from '../ui';
-import { AlertsContextProvider, FeatureGateContextProvider } from '../../../common';
+import { AlertsContextProvider } from '../../../common';
 import { HostsClusterDetailTabContent } from './HostsClusterDetailTabContent';
 import { HostsClusterDetailTabProps } from './types';
 import { storeDay1 } from '../../store';
 import { useFeatureDetection } from '../../hooks/use-feature-detection';
 
 const HostsClusterDetailTab = (props: HostsClusterDetailTabProps) => {
-  useFeatureDetection();
+  useFeatureDetection(props.allEnabledFeatures);
 
   return (
     <Provider store={storeDay1}>
       <AssistedUILibVersion />
-      <FeatureGateContextProvider features={props.allEnabledFeatures}>
-        <AlertsContextProvider>
-          <HostsClusterDetailTabContent {...props} />
-        </AlertsContextProvider>
-      </FeatureGateContextProvider>
+      <AlertsContextProvider>
+        <HostsClusterDetailTabContent {...props} />
+      </AlertsContextProvider>
     </Provider>
   );
 };

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx

@@ -10,7 +10,7 @@ import {
 import { usePullSecret } from '../../hooks';
 import { Button, EmptyStateVariant } from '@patternfly/react-core';
 import Day2ClusterService, { getApiVipDnsName } from '../../services/Day2ClusterService';
-import { handleApiError } from '../../api';
+import { handleApiError } from '../../../common/api';
 import { isApiError } from '../../../common/api/utils';
 import { AddHosts } from '../AddHosts';
 import { HostsClusterDetailTabProps } from './types';

package/lib/ocm/components/Routes.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { Switch, Route, Redirect } from 'react-router-dom';
 import { Clusters, ClusterPage, NewClusterPage } from './clusters';
-import { FeatureGateContextProvider } from '../../common';
 import type { FeatureListType } from '../../common/features/featureGate';
 import { routeBasePath } from '../config';
 import { AssistedUILibVersion } from './ui';
@@ -17,16 +16,14 @@ export const Routes: React.FC<{ allEnabledFeatures: FeatureListType }> = ({
 
   return (
     <Provider store={storeDay1}>
-      <FeatureGateContextProvider features={allEnabledFeatures}>
-        <AssistedUILibVersion />
-        <Switch>
-          <Route path={`${routeBasePath}/clusters/~new`} component={NewClusterPage} />
-          <Route path={`${routeBasePath}/clusters/:clusterId`} component={ClusterPage} />
-          <Route path={`${routeBasePath}/clusters`} component={Clusters} />
-          {children}
-          <Redirect to={`${routeBasePath}/clusters`} />
-        </Switch>
-      </FeatureGateContextProvider>
+      <AssistedUILibVersion />
+      <Switch>
+        <Route path={`${routeBasePath}/clusters/~new`} component={NewClusterPage} />
+        <Route path={`${routeBasePath}/clusters/:clusterId`} component={ClusterPage} />
+        <Route path={`${routeBasePath}/clusters`} component={Clusters} />
+        {children}
+        <Redirect to={`${routeBasePath}/clusters`} />
+      </Switch>
     </Provider>
   );
 };

package/lib/ocm/components/SentryErrorMonitorContextProvider.tsx

@@ -4,7 +4,7 @@ import {
   ErrorSeverity,
   ExceptionReporter,
 } from '../../common/components/ErrorHandling/ErrorMonitorContext';
-import { handleApiError } from '../api';
+import { handleApiError } from '../../common/api';
 import { isApiError } from '../../common/api/utils';
 import { captureException } from '../sentry';
 import * as Sentry from '@sentry/browser';

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

@@ -8,7 +8,7 @@ import {
   SplitItem,
   Tooltip,
 } from '@patternfly/react-core';
-import { CaretDownIcon } from '@patternfly/react-icons';
+import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
 import { useField } from 'formik';
 import {
   CpuArchitecture,
@@ -60,12 +60,17 @@ export const architectureData: Record<SupportedCpuArchitecture, CpuArchitectureI
 const INPUT_NAME = 'cpuArchitecture';
 const fieldId = getFieldId(INPUT_NAME, 'input');
 
-const isCpuArchitectureSupported = (
+const isCurrentDefaultCpuArchitecture = (
   cpuArchitectures: SupportedCpuArchitecture[],
   cpuArchitecture: SupportedCpuArchitecture,
+  day1CpuArchitecture?: SupportedCpuArchitecture,
 ): boolean => {
   const cpuArchFound = cpuArchitectures.find((cpuArch) => cpuArch === cpuArchitecture);
-  return cpuArchFound !== undefined;
+  return (
+    cpuArchFound === undefined &&
+    cpuArchitecture !== getDefaultCpuArchitecture() &&
+    day1CpuArchitecture !== CpuArchitecture.ARM
+  );
 };
 
 type CpuArchitectureDropdownProps = {
@@ -163,14 +168,13 @@ const CpuArchitectureDropdown = ({
   );
 
   React.useEffect(() => {
-    const isSelectedCpuArchitectureSupported = isCpuArchitectureSupported(
+    const isCurrentDefaultCpuArchitectureSelected = isCurrentDefaultCpuArchitecture(
       cpuArchitectures,
       selectedCpuArchitecture,
+      day1CpuArchitecture,
     );
-    if (
-      !isSelectedCpuArchitectureSupported &&
-      selectedCpuArchitecture !== getDefaultCpuArchitecture()
-    ) {
+    if (isCurrentDefaultCpuArchitectureSelected) {
+      setValue(getDefaultCpuArchitecture());
       setCurrentCpuArch(architectureData[getDefaultCpuArchitecture()].label);
       setOpen(false);
     }
@@ -178,7 +182,7 @@ const CpuArchitectureDropdown = ({
       prevVersionRef.current = openshiftVersion;
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [openshiftVersion, selectedCpuArchitecture]);
+  }, [cpuArchitectures, openshiftVersion, selectedCpuArchitecture]);
 
   const toggle = React.useMemo(
     () => (

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { useDispatch } from 'react-redux';
 import Axios, { CancelTokenSource } from 'axios';
 import { FormikHelpers } from 'formik';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import { CpuArchitecture, ErrorState, LoadingState } from '../../../common';
 import {
   forceReload,
@@ -18,6 +18,7 @@ import {
 import { mapClusterCpuArchToInfraEnvCpuArch } from '../../services/CpuArchitectureService';
 import { usePullSecret } from '../../hooks';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { isOciPlatformType } from '../utils';
 
 type DiscoveryImageFormProps = {
   cluster: Cluster;
@@ -114,7 +115,7 @@ const DiscoveryImageForm = ({
           ? mapClusterCpuArchToInfraEnvCpuArch(infraEnv.cpuArchitecture)
           : mapClusterCpuArchToInfraEnvCpuArch(cpuArchitecture)
       }
-      isOracleCloudInfrastructure={cluster.platform?.type === 'oci'}
+      isOracleCloudInfrastructure={isOciPlatformType(cluster)}
     />
   );
 };

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

@@ -6,7 +6,7 @@ import {
   FormGroup,
   DropdownSeparator,
 } from '@patternfly/react-core';
-import { CaretDownIcon } from '@patternfly/react-icons';
+import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
 import { useField } from 'formik';
 import {
   CpuArchitecture,

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

@@ -13,7 +13,6 @@ import { useFormikContext } from 'formik';
 import {
   HostDiscoveryValues,
   PopoverIcon,
-  useFeature,
   ClusterWizardStepHeader,
   selectMastersMustRunWorkloads,
   selectSchedulableMasters,
@@ -24,6 +23,7 @@ import InformationAndAlerts from './InformationAndAlerts';
 import { OcmSwitchField } from '../ui/OcmFormFields';
 import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useFeature } from '../../hooks/use-feature';
 
 const schedulableMastersTooltip =
   'Workloads must be run on control plane nodes when less than 5 hosts are discovered';

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { Dropdown, DropdownItem, DropdownToggle, FormGroup, Tooltip } from '@patternfly/react-core';
 import { useField, useFormikContext } from 'formik';
 import { ClusterDetailsValues, HelperText, getFieldId } from '../../../common';
-import { CaretDownIcon } from '@patternfly/react-icons';
+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';
@@ -22,11 +22,11 @@ export const BaseDnsHelperText = ({
   baseDnsDomain?: string;
 }) => (
   <HelperText fieldId={fieldId}>
-    Enter the name of your local host [localhost] or [localhost.com]. This cannot be changed after
-    creation. All DNS records must include the cluster name and be subdomains of the base you enter.
-    The full cluster address will be: <br />
+    Enter the name of your domain [domainname] or [domainname.com]. This cannot be changed after
+    cluster installed. All DNS records must include the cluster name and be subdomains of the base
+    you enter. The full cluster address will be: <br />
     <strong>
-      {name || '[Cluster Name]'}.{baseDnsDomain || '[localhost.com]'}
+      {name || '[Cluster Name]'}.{baseDnsDomain || '[domainname.com]'}
     </strong>
   </HelperText>
 );

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

@@ -12,7 +12,6 @@ import {
   uniqueOcmClusterNameValidationMessages,
   CLUSTER_NAME_MAX_LENGTH,
   StaticTextField,
-  useFeature,
   getSupportedCpuArchitectures,
   SupportedCpuArchitecture,
 } from '../../../common';
@@ -36,6 +35,7 @@ import { useNewFeatureSupportLevel } from '../../../common/components/newFeature
 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';
 
 export type OcmClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
@@ -92,7 +92,7 @@ export const OcmClusterDetailsFormFields = ({
 
   const handleExternalPartnerIntegrationsChange = React.useCallback(
     (selectedPlatform: PlatformType) => {
-      const isOracleSelected = selectedPlatform === 'oci';
+      const isOracleSelected = selectedPlatform === 'external';
       if (isOracleSelected) {
         setFieldValue('addCustomManifest', isOracleSelected, false);
         clusterWizardContext.setCustomManifestsStep(isOracleSelected);
@@ -178,14 +178,14 @@ export const OcmClusterDetailsFormFields = ({
         />
       )}
 
-      <CustomManifestCheckbox clusterId={clusterId || ''} isDisabled={platform === 'oci'} />
+      <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 === 'oci'}
+            isDisabled={platform === 'external'}
           />
         )
       }

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

@@ -158,7 +158,7 @@ export const OcmDiscoveryImageConfigForm = ({
                     />
                     <UploadSSH
                       labelText={t(
-                        'ai:Provide SSH keys separated by newlines to be able to connect to the hosts for debugging purposes during the discovery process',
+                        'ai:Provide an SSH key to be able to connect to the hosts for debugging purposes during the discovery process',
                       )}
                     />
                     <ProxyFields />

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

@@ -1,18 +1,14 @@
 import React from 'react';
-import {
-  ExclamationCircleIcon,
-  ExclamationTriangleIcon,
-  ExternalLinkAltIcon,
-} from '@patternfly/react-icons';
-import {
-  global_warning_color_100 as warningColor,
-  global_danger_color_100 as dangerColor,
-} from '@patternfly/react-tokens';
+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 { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
+import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
 import { TFunction } from 'i18next';
 import { OpenShiftVersionDropdown } from '../../../common/components/ui/OpenShiftVersionDropdown';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { OPENSHIFT_LIFE_CYCLE_DATES_LINK, OpenshiftVersionOptionType } from '../../../common';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 
 const OpenShiftLifeCycleDatesLink = () => {
   const { t } = useTranslation();

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

@@ -1,15 +1,11 @@
 import React from 'react';
 import { Button, ButtonVariant, List, ListItem, Popover } from '@patternfly/react-core';
-import {
-  CheckCircleIcon,
-  ExclamationCircleIcon,
-  InProgressIcon,
-  PendingIcon,
-} from '@patternfly/react-icons';
-import {
-  global_danger_color_100 as dangerColor,
-  global_success_color_100 as okColor,
-} from '@patternfly/react-tokens';
+import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
+import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
+import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
+import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
+import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
 import { pluralize } from 'humanize-plus';
 import { TFunction } from 'i18next';
 

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CollapsedManifest.tsx

@@ -1,5 +1,5 @@
 import { Flex, FlexItem, Label, StackItem } from '@patternfly/react-core';
-import { InfoCircleIcon } from '@patternfly/react-icons';
+import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import { useField } from 'formik';
 import React from 'react';
 import { CustomManifestValues } from '../data/dataTypes';

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifest.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Grid, Flex, FlexItem, ExpandableSectionToggle, Button } from '@patternfly/react-core';
-import { MinusCircleIcon } from '@patternfly/react-icons';
+import { MinusCircleIcon } from '@patternfly/react-icons/dist/js/icons/minus-circle-icon';
 import { getFormikArrayItemFieldName } from '../../../../../common';
 import { getManifestName } from './utils';
 import CollapsedManifest from './CollapsedManifest';

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsArray.tsx

@@ -1,13 +1,13 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { Button, ButtonVariant, Divider, Flex, FlexItem } from '@patternfly/react-core';
-import { PlusCircleIcon } from '@patternfly/react-icons';
+import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon';
 import { FieldArrayRenderProps, useField } from 'formik';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import { LoadingState, useAlerts } from '../../../../../common';
 import ConfirmationModal from '../../../../../common/components/ui/ConfirmationModal';
 import { ClustersAPI } from '../../../../services/apis';
-import { getApiErrorMessage, handleApiError } from '../../../../api';
+import { getApiErrorMessage, handleApiError } from '../../../../../common/api';
 import { CustomManifest } from './CustomManifest';
 import { getEmptyManifest, getManifestName } from './utils';
 import { CustomManifestValues } from '../data/dataTypes';

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/FolderDropdown.tsx

@@ -6,7 +6,7 @@ import {
   HelperText,
   FormGroup,
 } from '@patternfly/react-core';
-import { CaretDownIcon } from '@patternfly/react-icons';
+import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
 import { useField } from 'formik';
 import { getFieldId } from '../../../../../common/components/ui/formik';
 import { PopoverIcon } from '../../../../../common';
@@ -16,7 +16,12 @@ const FolderLabel = () => {
     <>
       Folder{' '}
       <PopoverIcon
-        bodyContent={<>To overwrite a manifest, select the folder the existing manifest is in.</>}
+        bodyContent={
+          <>
+            To overwrite an existing manifest, save the new manifest in the same folder with the
+            same name.
+          </>
+        }
       />
     </>
   );

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx

@@ -37,6 +37,7 @@ import {
   PlatformType,
 } from '@openshift-assisted/types/assisted-installer-service';
 import useSupportLevelsAPI from '../../../hooks/useSupportLevelsAPI';
+import { isOciPlatformType } from '../../utils';
 
 export type NetworkConfigurationProps = VirtualIPControlGroupProps & {
   hostSubnets: HostSubnets;
@@ -227,14 +228,18 @@ const NetworkConfiguration = ({
     () =>
       getManagedNetworkingState(
         isDualStack,
-        cluster.platform?.type === 'oci',
+        isOciPlatformType(cluster),
         featureSupportLevelContext,
         cluster.platform?.type,
         featureSupportLevelData,
       ),
-    [isDualStack, cluster.platform?.type, featureSupportLevelContext, featureSupportLevelData],
+    [isDualStack, cluster, featureSupportLevelContext, featureSupportLevelData],
   );
 
+  const isSDNSupported = React.useMemo(() => {
+    return featureSupportLevelContext.isFeatureSupported('SDN_NETWORK_TYPE');
+  }, [featureSupportLevelContext]);
+
   return (
     <Grid hasGutter>
       <ManagedNetworkingControlGroup
@@ -257,7 +262,9 @@ const NetworkConfiguration = ({
           hostSubnets={hostSubnets}
         />
       )}
-      <NetworkTypeControlGroup isDisabled={isViewerMode} isSDNSelectable={isSDNSelectable} />
+      {isSDNSupported && (
+        <NetworkTypeControlGroup isDisabled={isViewerMode} isSDNSelectable={isSDNSelectable} />
+      )}
 
       {!(isUserManagedNetworking && !isSNOCluster) && (
         <AvailableSubnetsControl

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx

@@ -14,8 +14,6 @@ import {
   LoadingState,
   NetworkConfigurationValues,
   SecurityFields,
-  selectApiVip,
-  selectIngressVip,
   useAlerts,
   useFormikAutoSave,
 } from '../../../../common';
@@ -38,7 +36,7 @@ import {
   setServerUpdateError,
   updateClusterBase,
 } from '../../../store/slices/current-cluster/slice';
-import { isUnknownServerError, getApiErrorMessage, handleApiError } from '../../../api';
+import { isUnknownServerError, getApiErrorMessage, handleApiError } from '../../../../common/api';
 import { usePullSecret } from '../../../hooks';
 import {
   Cluster,
@@ -201,9 +199,7 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
 
       const params: V2ClusterUpdateParams = {
         apiVips: values.apiVips,
-        apiVip: selectApiVip(values),
         ingressVips: values.ingressVips,
-        ingressVip: selectIngressVip(values),
         sshPublicKey: values.sshPublicKey,
         vipDhcpAllocation: values.vipDhcpAllocation,
         networkType: values.networkType,
@@ -215,9 +211,7 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
 
       if (params.userManagedNetworking) {
         params.apiVips = [];
-        params.apiVip = '';
         params.ingressVips = [];
-        params.ingressVip = '';
         if (isMultiNodeCluster) {
           delete params.machineNetworks;
         }
@@ -225,9 +219,7 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
         // cluster-managed can't be chosen in SNO, so this must be a multi-node cluster
         if (values.vipDhcpAllocation) {
           delete params.apiVips;
-          delete params.apiVip;
           delete params.ingressVips;
-          delete params.ingressVip;
         } else if (values.stackType === IPV4_STACK) {
           // The API will rebuild the default machineNetwork
           params.machineNetworks = [];

package/lib/ocm/components/clusterConfiguration/networkConfiguration/SubnetsDropdown.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { DropdownItem, DropdownToggle, Dropdown } from '@patternfly/react-core';
-import { CaretDownIcon } from '@patternfly/react-icons';
+import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
 import { useField } from 'formik';
 import { getFieldId, HostSubnet, NO_SUBNET_SET } from '../../../../common';
 

package/lib/ocm/components/clusterConfiguration/operators/CnvCheckbox.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { FormGroup, Tooltip } from '@patternfly/react-core';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { useFormikContext } from 'formik';
 import {
   ClusterOperatorProps,

package/lib/ocm/components/clusterConfiguration/operators/LvmCheckbox.tsx

@@ -16,7 +16,10 @@ import {
 import LvmHostRequirements from './LvmHostRequirements';
 import { OcmCheckboxField } from '../../ui/OcmFormFields';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { getLvmIncompatibleWithCnvReason } from '../../featureSupportLevels/featureStateUtils';
+import {
+  getLvmIncompatibleWithCnvReason,
+  getLvmsIncompatibleWithOdfReason,
+} from '../../featureSupportLevels/featureStateUtils';
 import { useNewFeatureSupportLevel } from '../../../../common/components/newFeatureSupportLevels';
 import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 import { SupportLevel } from '@openshift-assisted/types/assisted-installer-service';
@@ -79,6 +82,9 @@ const LvmCheckbox = ({ clusterId }: ClusterOperatorProps) => {
     let reason = featureSupportLevel.getFeatureDisabledReason('LVM');
     if (!reason) {
       reason = getLvmIncompatibleWithCnvReason(values, operatorInfo.lvmSupport);
+      if (!reason) {
+        reason = getLvmsIncompatibleWithOdfReason(values);
+      }
     }
     setDisabledReason(reason);
   }, [values, featureSupportLevel, operatorInfo.lvmSupport]);

package/lib/ocm/components/clusterConfiguration/operators/MceCheckbox.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { FormGroup, Tooltip } from '@patternfly/react-core';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { getFieldId, PopoverIcon, MCE_LINK } from '../../../../common';
 import { OcmCheckboxField } from '../../ui/OcmFormFields';
 import { useNewFeatureSupportLevel } from '../../../../common/components/newFeatureSupportLevels';