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

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

@@ -1,10 +1,9 @@
-import { saveAs } from 'file-saver';
 import get from 'lodash-es/get.js';
-import { isInOcm, handleApiError, getApiErrorMessage } from '../../api';
+import { isInOcm, handleApiError, getApiErrorMessage } from '../../../common/api';
 import { AlertsContextType, hostStatusOrder } from '../../../common';
 import { ClustersAPI } from '../../services/apis';
 import { ClustersService } from '../../services';
-import { stringToJSON } from '../../../common/utils';
+import { downloadFile, stringToJSON } from '../../../common/utils';
 import {
   Cluster,
   Host,
@@ -15,7 +14,9 @@ import {
 export const downloadClusterInstallationLogs = async (
   addAlert: AlertsContextType['addAlert'],
   clusterId: string,
+  clearAlerts: AlertsContextType['clearAlerts'],
 ) => {
+  clearAlerts();
   try {
     if (isInOcm) {
       const { data } = await ClustersAPI.getPresignedForClusterFiles({
@@ -24,10 +25,10 @@ export const downloadClusterInstallationLogs = async (
         hostId: undefined,
         logsType: 'all',
       });
-      saveAs(data.url);
+      downloadFile(data.url);
     } else {
       const { data, fileName } = await ClustersService.downloadLogs(clusterId);
-      saveAs(data, fileName);
+      downloadFile('', data, fileName);
     }
   } catch (e) {
     handleApiError(e, (e) => {

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

@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import { useAlerts, LoadingState, ClusterWizardStep, ErrorState } from '../../../common';
 import { usePullSecret } from '../../hooks';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { canNextClusterDetails, ClusterWizardFlowStateNew } from './wizardTransition';

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

@@ -15,7 +15,7 @@ import {
 import { canNextClusterDetails } from './wizardTransition';
 import { OpenshiftVersionOptionType, getFormikErrorFields } from '../../../common';
 import ClusterWizardFooter from './ClusterWizardFooter';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 import {
   ClusterDetailsService,
   ClusterDetailsUpdateParams,

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

@@ -12,15 +12,12 @@ 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,
-  useFeature,
-  useAlerts,
-} from '../../../common';
+import { AssistedInstallerOCMPermissionTypesListType, useAlerts } 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';
 
 const addStepToClusterWizard = (
   wizardStepIds: ClusterWizardStepsType[],

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

@@ -12,7 +12,7 @@ import {
 import HostInventory from '../clusterConfiguration/HostInventory';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import { canNextHostDiscovery } from './wizardTransition';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
 import ClusterWizardFooter from './ClusterWizardFooter';
 import ClusterWizardNavigation from './ClusterWizardNavigation';

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

@@ -20,7 +20,7 @@ import ClusterWizardNavigation from '../clusterWizard/ClusterWizardNavigation';
 import { OperatorsStep } from './OperatorsStep';
 import { ClustersService, OperatorsService } from '../../services';
 import { setServerUpdateError, updateCluster } from '../../store/slices/current-cluster/slice';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import { canNextOperators } from './wizardTransition';
 import { Cluster, MonitoredOperator } from '@openshift-assisted/types/assisted-installer-service';
 

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

@@ -7,10 +7,14 @@ import OdfCheckbox from '../clusterConfiguration/operators/OdfCheckbox';
 import LvmCheckbox from '../clusterConfiguration/operators/LvmCheckbox';
 import MceCheckbox from '../clusterConfiguration/operators/MceCheckbox';
 import { selectIsCurrentClusterSNO } from '../../store/slices/current-cluster/selectors';
+import { isOCPVersionEqualsOrMajor } from '../utils';
 
 export const OperatorsStep = (props: ClusterOperatorProps) => {
   const isSNO = useSelector(selectIsCurrentClusterSNO);
-
+  const isVersionEqualsOrMajorThan4_15 = isOCPVersionEqualsOrMajor(
+    props.openshiftVersion || '',
+    '4.15',
+  );
   return (
     <Stack hasGutter data-testid={'operators-form'}>
       <StackItem>
@@ -22,7 +26,18 @@ export const OperatorsStep = (props: ClusterOperatorProps) => {
       <StackItem>
         <MceCheckbox />
       </StackItem>
-      <StackItem>{isSNO ? <LvmCheckbox {...props} /> : <OdfCheckbox />}</StackItem>
+      {isVersionEqualsOrMajorThan4_15 ? (
+        <>
+          <StackItem>
+            <LvmCheckbox {...props} />
+          </StackItem>
+          <StackItem>
+            <OdfCheckbox />
+          </StackItem>
+        </>
+      ) : (
+        <StackItem>{isSNO ? <LvmCheckbox {...props} /> : <OdfCheckbox />}</StackItem>
+      )}
     </Stack>
   );
 };

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { TextContent, Text, Split, SplitItem } from '@patternfly/react-core';
-import { ASSISTED_INSTALLER_DOCUMENTATION_LINK, ExternalLink } from '../../../common';
+import { ASSISTED_INSTALLER_DOCUMENTATION_LINK, ExternalLink, isInOcm } from '../../../common';
 
 export const AssistedInstallerHeader = () => {
   return (
@@ -14,11 +14,13 @@ export const AssistedInstallerHeader = () => {
             Assisted Installer documentation
           </ExternalLink>
         </SplitItem>
-        <SplitItem>
-          <Text component="a" data-testid="whats-new-link">
-            What's new in Assisted Installer?
-          </Text>
-        </SplitItem>
+        {isInOcm && (
+          <SplitItem>
+            <Text component="a" data-testid="whats-new-link">
+              What's new in Assisted Installer?
+            </Text>
+          </SplitItem>
+        )}
       </Split>
     </TextContent>
   );

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

@@ -7,7 +7,7 @@ import {
 } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
 import { routeBasePath } from '../../config';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 
 const ClusterBreadcrumbs = ({ clusterName }: { clusterName?: string }) => (
   <PageSection variant={PageSectionVariants.light}>

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

@@ -1,17 +1,13 @@
 import React from 'react';
-import {
-  global_danger_color_100 as dangerColor,
-  global_success_color_100 as okColor,
-  global_warning_color_100 as warningColor,
-} from '@patternfly/react-tokens';
-import {
-  ExclamationCircleIcon,
-  ExclamationTriangleIcon,
-  FileAltIcon,
-  CheckCircleIcon,
-  InProgressIcon,
-  BanIcon,
-} from '@patternfly/react-icons';
+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 { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
+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, WithTestID } from '../../../common';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';

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

@@ -8,7 +8,7 @@ import {
   Text,
   PageSection,
 } from '@patternfly/react-core';
-import { AddCircleOIcon } from '@patternfly/react-icons';
+import { AddCircleOIcon } from '@patternfly/react-icons/dist/js/icons/add-circle-o-icon';
 import {
   ResourceUIState,
   Alerts,
@@ -20,7 +20,7 @@ import {
 } from '../../../common';
 import ClustersTable from './ClustersTable';
 import { fetchClustersAsync, deleteCluster } from '../../store/slices/clusters/slice';
-import { handleApiError, getApiErrorMessage } from '../../api';
+import { handleApiError, getApiErrorMessage } from '../../../common/api';
 import ClusterBreadcrumbs from './ClusterBreadcrumbs';
 import { routeBasePath } from '../../config';
 import { ClustersService } from '../../services';

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

@@ -18,7 +18,8 @@ import {
   ToolbarGroup,
   Tooltip,
 } from '@patternfly/react-core';
-import { FilterIcon, SyncIcon } from '@patternfly/react-icons';
+import { FilterIcon } from '@patternfly/react-icons/dist/js/icons/filter-icon';
+import { SyncIcon } from '@patternfly/react-icons/dist/js/icons/sync-icon';
 import { clusterStatusLabels, isSelectEventChecked, ToolbarButton } from '../../../common';
 import { ResourceUIState } from '../../../common';
 import { fetchClustersAsync } from '../../store/slices/clusters/slice';

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

@@ -1,6 +1,7 @@
-import { CheckCircleIcon, InfoCircleIcon } from '@patternfly/react-icons';
+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 { global_success_color_100 as okColor } from '@patternfly/react-tokens';
+import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
 import { Text, TextList, TextListItem, TextContent } from '@patternfly/react-core';
 import {
   FeatureId,

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

@@ -218,3 +218,19 @@ export const isFeatureSupportedAndAvailable = (supportLevel: SupportLevel | unde
 
 export const hostsNetworkConfigurationDisabledReason =
   "DHCP only is the supported hosts' network configuration when external partner integrations is selected";
+
+export const getOdfIncompatibleWithLvmsReason = (operatorValues: OperatorsValues) => {
+  const mustDisableOdf = operatorValues.useOdfLogicalVolumeManager;
+  // In versions >= 4.15, it's not possible to select ODF + LVMS
+  return mustDisableOdf
+    ? `Currently, you can not install ${ODF_OPERATOR_LABEL} operator at the same time as ${LVMS_OPERATOR_LABEL} operator.`
+    : undefined;
+};
+
+export const getLvmsIncompatibleWithOdfReason = (operatorValues: OperatorsValues) => {
+  const mustDisableLvms = operatorValues.useOpenShiftDataFoundation;
+  // In versions >= 4.15, it's not possible to select ODF + LVMS
+  return mustDisableLvms
+    ? `Currently, you can not install ${LVMS_OPERATOR_LABEL} operator at the same time as ${ODF_OPERATOR_LABEL} operator.`
+    : undefined;
+};

package/lib/ocm/components/fetching/fetchEvents.ts

@@ -1,10 +1,22 @@
-import { AxiosError, AxiosResponseHeaders } from 'axios';
+import { AxiosError, AxiosHeaderValue, AxiosHeaders, AxiosResponseHeaders } from 'axios';
 import { EVENT_SEVERITIES, EventListFetchProps } from '../../../common';
-import { handleApiError } from '../../api';
+import { handleApiError } from '../../../common/api';
 import { EventsAPI } from '../../services/apis';
 import { SeverityCountsType } from '../../../common/components/ui/ClusterEventsToolbar';
 import { Event } from '@openshift-assisted/types/assisted-installer-service';
-const parseHeaders = (headers: AxiosResponseHeaders) => {
+const parseHeaders = (
+  headers:
+    | AxiosResponseHeaders
+    | Partial<
+        AxiosHeaders & {
+          Server: AxiosHeaderValue;
+          'Content-Type': AxiosHeaderValue;
+          'Content-Length': AxiosHeaderValue;
+          'Cache-Control': AxiosHeaderValue;
+          'Content-Encoding': AxiosHeaderValue;
+        }
+      >,
+) => {
   const severities: Record<Event['severity'], number> = {
     error: 0,
     info: 0,

package/lib/ocm/components/hosts/HostsDiscoveryTable.tsx

@@ -35,7 +35,6 @@ const HostRowDetailExpand = ({ obj: host }: ExpandComponentProps<Host>) => (
     key={host.id}
     host={host}
     AdditionalNTPSourcesDialogToggleComponent={AdditionalNTPSourcesDialogToggle}
-    hideStorage
   />
 );
 

package/lib/ocm/components/hosts/HostsTableEmptyState.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ConnectedIcon } from '@patternfly/react-icons';
+import { ConnectedIcon } from '@patternfly/react-icons/dist/js/icons/connected-icon';
 import EmptyState from '../../../common/components/ui/uiState/EmptyState';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import HostsDiscoveryTroubleshootingInfoLinkWithModal from './HostsDiscoveryTroubleshootingInfoLinkWithModal';

package/lib/ocm/components/hosts/use-hosts-table.tsx

@@ -14,7 +14,7 @@ import {
   AdditionalNTPSourcesDialog,
   AdditionalNTPSourcesFormProps,
 } from '../../../common/components/hosts/AdditionalNTPSourcesDialog';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import {
   forceReload,
   setServerUpdateError,

package/lib/ocm/components/hosts/utils.ts

@@ -1,7 +1,7 @@
 import { saveAs } from 'file-saver';
 import type { AlertsContextType } from '../../../common';
 
-import { isInOcm, handleApiError, getApiErrorMessage } from '../../api';
+import { isInOcm, handleApiError, getApiErrorMessage } from '../../../common/api';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { ClustersService } from '../../services';
 import ClustersAPI from '../../../common/api/assisted-service/ClustersAPI';

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button, ButtonVariant, Modal, ModalProps } from '@patternfly/react-core';
-import { InfoCircleIcon } from '@patternfly/react-icons';
+import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import { SVGIconProps } from '@patternfly/react-icons/dist/js/createIcon';
 
 export interface InfoLinkWithModalProps {

package/lib/ocm/components/utils.ts

@@ -0,0 +1,19 @@
+import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
+
+export const isOciPlatformType = (cluster: Cluster): boolean => {
+  return (
+    cluster.platform?.type === 'external' && cluster.platform?.external?.platformName === 'oci'
+  );
+};
+
+export const getMajorMinorVersion = (version = '') => {
+  const match = /[0-9].[0-9][0-9]?/g.exec(version);
+  return match?.[0] || '';
+};
+
+export const isOCPVersionEqualsOrMajor = (
+  openshiftVersion: string,
+  ocpVersionToCompare: string,
+): boolean => {
+  return parseFloat(getMajorMinorVersion(openshiftVersion)) >= parseFloat(ocpVersionToCompare);
+};

package/lib/ocm/hooks/_use-feature-detection.test.tsx

@@ -4,13 +4,13 @@ import * as React from 'react';
 import { Provider } from 'react-redux';
 import { render } from 'react-dom';
 import { act } from 'react-dom/test-utils';
-import { featureFlagsActions, FeatureFlagsState } from '../store/slices/feature-flags/slice';
-import { isFeatureEnabled } from '../store/slices/feature-flags/selectors';
-import { RootStateDay1, storeDay1 } from '../store/store-day1';
+import { featureFlagsActions } from '../store/slices/feature-flags/slice';
+import { storeDay1 } from '../store/store-day1';
 import { useFeatureDetection } from './use-feature-detection';
 import { CurrentAccountApi } from '../../common/api/accounts-management-service/current-account-api';
 import { OrganizationsApi } from '../../common/api/accounts-management-service/organizations-api';
 import { getMockContainer } from '../../_test-helpers/mock-container';
+import { isFeatureEnabled } from '../store/slices/feature-flags/selectors';
 
 vi.spyOn(featureFlagsActions, 'setFeatureFlag');
 vi.spyOn(CurrentAccountApi, 'getCurrentAccount').mockImplementation(() => {
@@ -51,12 +51,7 @@ describe('use-feature-detection.ts', () => {
       ),
     );
 
-    expect(
-      isFeatureEnabled(
-        storeDay1.getState() as RootStateDay1 & FeatureFlagsState,
-        'ASSISTED_INSTALLER_PLATFORM_OCI',
-      ),
-    ).toBe(true);
+    expect(isFeatureEnabled('ASSISTED_INSTALLER_PLATFORM_OCI')(storeDay1.getState())).toBe(true);
   });
 
   it('Internal features override external features', async () => {
@@ -86,12 +81,9 @@ describe('use-feature-detection.ts', () => {
       ),
     );
 
-    expect(
-      isFeatureEnabled(
-        storeDay1.getState() as RootStateDay1 & FeatureFlagsState,
-        'ASSISTED_INSTALLER_PLATFORM_OCI',
-      ),
-    ).toBe(featuresOverride.ASSISTED_INSTALLER_PLATFORM_OCI);
+    expect(isFeatureEnabled('ASSISTED_INSTALLER_PLATFORM_OCI')(storeDay1.getState())).toBe(
+      featuresOverride.ASSISTED_INSTALLER_PLATFORM_OCI,
+    );
   });
 
   it('Processes only features prefixed with ASSISTED_INSTALLER', async () => {

package/lib/ocm/hooks/use-feature.ts

@@ -0,0 +1,7 @@
+import { AssistedInstallerFeatureType } from '../../common';
+import { useSelectorDay1 } from '../store';
+import { isFeatureEnabled } from '../store/slices/feature-flags/selectors';
+
+export const useFeature = (feature: AssistedInstallerFeatureType): boolean => {
+  return useSelectorDay1(isFeatureEnabled(feature));
+};

package/lib/ocm/hooks/useClusterCustomManifests.ts

@@ -6,7 +6,7 @@ import {
   Manifest,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { ClustersAPI } from '../services/apis';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { getErrorMessage } from '../../common/utils';
 import { ListManifestsExtended } from '../components/clusterConfiguration/manifestsConfiguration/data/dataTypes';
 

package/lib/ocm/hooks/useClusterPreflightRequirements.ts

@@ -5,7 +5,7 @@ import {
   PreflightHardwareRequirements,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { ClustersAPI } from '../services/apis';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { getErrorMessage } from '../../common/utils';
 
 const { addAlert } = alertsSlice.actions;

package/lib/ocm/hooks/useManagedDomains.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useAlerts } from '../../common';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { ManagedDomainsAPI } from '../services/apis';
 import { ManagedDomain } from '@openshift-assisted/types/assisted-installer-service';
 

package/lib/ocm/hooks/useOpenshiftVersions.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { CpuArchitecture, OpenshiftVersionOptionType } from '../../common';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { SupportedOpenshiftVersionsAPI } from '../services/apis';
 import { getKeys } from '../../common/utils';
 import { Cluster, OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';

package/lib/ocm/hooks/usePullSecret.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { useAlerts } from '../../common';
 import { AccessTokenAPI } from '../../common/api/accounts-management-service/access-token-api';
 

package/lib/ocm/hooks/useSupportLevelsAPI.ts

@@ -4,7 +4,7 @@ import {
   ArchitectureSupportLevelMap,
   NewFeatureSupportLevelMap,
 } from '../../common/components/newFeatureSupportLevels';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import NewFeatureSupportLevelsAPI from '../../common/api/assisted-service/NewFeatureSupportLevelsAPI';
 import { PlatformType } from '@openshift-assisted/types/./assisted-installer-service';
 

package/lib/ocm/hooks/useUsedClusterNames.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { ClustersAPI } from '../services/apis';
 import { useAlerts } from '../../common';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';

package/lib/ocm/index.ts

@@ -1,4 +1,4 @@
-export * as Api from './api';
+export * as Api from '../common/api';
 export * as Store from './store';
 export * as Config from './config';
 export * as Services from './services';
@@ -13,4 +13,3 @@ export * as Constants from '../common/config';
 export * as Reducers from '../common/reducers';
 
 export * from '../common/components';
-export * from '../common/api';

package/lib/ocm/services/ClusterDetailsService.ts

@@ -13,7 +13,7 @@ import {
   OcmClusterDetailsValues,
 } from './types';
 import { getDummyInfraEnvField } from '../components/clusterConfiguration/staticIp/data/dummyData';
-import { isInOcm } from '../api';
+import { isInOcm } from '../../common/api';
 import { getDefaultCpuArchitecture } from './CpuArchitectureService';
 import {
   Cluster,
@@ -44,9 +44,21 @@ const ClusterDetailsService = {
       diskEncryption: DiskEncryptionService.getDiskEncryptionParams(values),
       platform: {
         type: values.platform,
+        ...(values.platform === 'external'
+          ? {
+              external: {
+                platformName: 'oci',
+                cloudControllerManager: 'External',
+              },
+            }
+          : {}),
       },
     };
 
+    if (!values.isCMNSupported) {
+      params.userManagedNetworking = true;
+    }
+
     if (values.hostsNetworkConfigurationType === HostsNetworkConfigurationType.STATIC) {
       params.staticNetworkConfig = getDummyInfraEnvField();
     }
@@ -76,9 +88,13 @@ const ClusterDetailsService = {
     }
 
     if (platform) {
-      params.platform = {
-        type: platform,
-      };
+      params.platform =
+        platform === 'external'
+          ? {
+              type: platform,
+              external: { platformName: 'oci', cloudControllerManager: 'External' },
+            }
+          : { type: platform };
     }
 
     return params;

package/lib/ocm/services/ClustersService.ts

@@ -33,7 +33,7 @@ const ClustersService = {
       staticNetworkConfig: params.staticNetworkConfig,
     };
 
-    if (params.platform?.type === 'oci') {
+    if (params.platform?.type === 'external' && params.platform.external?.platformName === 'oci') {
       infraEnvCreateParams.imageType = 'minimal-iso';
     }
 
@@ -53,10 +53,16 @@ const ClustersService = {
     await ClustersAPI.deregister(clusterId);
   },
 
-  async downloadLogs(clusterId: Cluster['id'], hostId?: Host['id']) {
+  async downloadLogs(
+    clusterId: Cluster['id'],
+    hostId?: Host['id'],
+  ): Promise<{
+    data: Blob;
+    fileName: string | undefined;
+  }> {
     const { data, headers } = await ClustersAPI.downloadLogs(clusterId, hostId);
-    const contentHeader = headers['content-disposition'];
-    const fileName = contentHeader?.match(/filename="(.+)"/)?.[1];
+    const contentHeader: string | undefined = headers['content-disposition'] as string | undefined;
+    const fileName: string | undefined = contentHeader?.match(/filename="(.+)"/)?.[1];
     return { data, fileName };
   },
 

package/lib/ocm/services/Day2ClusterService.ts

@@ -1,6 +1,12 @@
 import { InfraEnvsService } from '.';
 import { ClustersAPI } from './apis';
-import { CpuArchitecture, SupportedCpuArchitecture } from '../../common';
+import {
+  CpuArchitecture,
+  NonPlatformIntegrations,
+  SupportedCpuArchitecture,
+  SupportedPlatformIntegrations,
+  SupportedPlatformType,
+} from '../../common';
 import { OcmClusterType } from '../components/AddHosts/types';
 import { mapOcmArchToCpuArchitecture } from './CpuArchitectureService';
 import {
@@ -35,10 +41,22 @@ export const getApiVipDnsName = (ocmCluster: OcmClusterType) => {
 };
 
 export const mapCloudProviderToPlatformType = (cloudProviderId?: string) => {
-  const platformType = cloudProviderId === 'external' ? 'oci' : cloudProviderId;
+  let platformType = cloudProviderId;
+  if (
+    !SupportedPlatformIntegrations.includes(platformType as SupportedPlatformType) &&
+    !NonPlatformIntegrations.includes(platformType as SupportedPlatformType)
+  ) {
+    platformType = 'baremetal';
+  }
   const platform: Platform = {
     type: (platformType as PlatformType) || 'baremetal',
   };
+  if (platformType === 'external') {
+    platform.external = {
+      platformName: 'oci',
+      cloudControllerManager: 'External',
+    };
+  }
   return platform;
 };
 

package/lib/ocm/store/slices/feature-flags/selectors.ts

@@ -4,9 +4,9 @@ import { createSelector } from '@reduxjs/toolkit';
 
 export const selectFeatureFlagsSlice = (state: RootStateDay1) => state.featureFlags;
 
-export const isFeatureEnabled = createSelector(
-  selectFeatureFlagsSlice,
-  (_featureFlags: ReturnType<typeof selectFeatureFlagsSlice>, featureId: keyof FeatureListType) =>
-    featureId,
-  (featureFlags, featureId) => featureFlags.data[featureId],
-);
+export const isFeatureEnabled = (featureId: keyof FeatureListType) =>
+  createSelector(
+    selectFeatureFlagsSlice,
+    (featureFlags: ReturnType<typeof selectFeatureFlagsSlice>) =>
+      featureFlags.data[featureId] ?? false,
+  );