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

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

@@ -1,9 +1,17 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { FormGroup, Tooltip } from '@patternfly/react-core';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
-import { getFieldId, PopoverIcon, ODF_REQUIREMENTS_LINK, ODF_LINK } from '../../../../common';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
+import {
+  getFieldId,
+  PopoverIcon,
+  ODF_REQUIREMENTS_LINK,
+  ODF_LINK,
+  OperatorsValues,
+} from '../../../../common';
 import { OcmCheckboxField } from '../../ui/OcmFormFields';
 import { useNewFeatureSupportLevel } from '../../../../common/components/newFeatureSupportLevels';
+import { useFormikContext } from 'formik';
+import { getOdfIncompatibleWithLvmsReason } from '../../featureSupportLevels/featureStateUtils';
 
 const ODF_FIELD_NAME = 'useOpenShiftDataFoundation';
 
@@ -37,8 +45,18 @@ const OdfHelperText = () => {
 
 const OdfCheckbox = () => {
   const featureSupportLevelContext = useNewFeatureSupportLevel();
+  const { values } = useFormikContext<OperatorsValues>();
   const fieldId = getFieldId(ODF_FIELD_NAME, 'input');
-  const disabledReason = featureSupportLevelContext.getFeatureDisabledReason('ODF');
+  const [disabledReason, setDisabledReason] = useState<string | undefined>();
+
+  React.useEffect(() => {
+    let disabledReason = featureSupportLevelContext.getFeatureDisabledReason('ODF');
+    if (!disabledReason) {
+      disabledReason = getOdfIncompatibleWithLvmsReason(values);
+    }
+    setDisabledReason(disabledReason);
+  }, [values, featureSupportLevelContext]);
+
   return (
     <FormGroup isInline fieldId={fieldId}>
       <OcmCheckboxField

package/lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx

@@ -10,23 +10,23 @@ 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,
-  DeveloperPreview,
   FeatureId,
   SupportedCpuArchitecture,
   getFieldId,
 } from '../../../../common';
 import { ExternalPlaformIds, ExternalPlatformLabels, ExternalPlatformLinks } from './constants';
-import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
+import { PlatformType, SupportLevel } from '@openshift-assisted/types/assisted-installer-service';
 import {
   NewFeatureSupportLevelData,
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
 import { architectureData } from '../CpuArchitectureDropdown';
+import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 
 const INPUT_NAME = 'platform';
 const fieldId = getFieldId(INPUT_NAME, 'input');
@@ -43,6 +43,7 @@ export type ExternalPlatformInfo = {
   label: string;
   href?: string;
   disabledReason?: string;
+  supportLevel?: SupportLevel;
 };
 
 const getDisabledReasonForExternalPlatform = (
@@ -52,19 +53,19 @@ const getDisabledReasonForExternalPlatform = (
   featureSupportLevelData?: NewFeatureSupportLevelMap | null,
   cpuArchitecture?: SupportedCpuArchitecture,
 ): string | undefined => {
-  if (!isSNO) {
+  if (isSNO && (platform === 'nutanix' || platform === 'vsphere')) {
+    return `${ExternalPlatformLabels[platform]} integration is not supported for Single-Node OpenShift.`;
+  } else if (
+    isSNO &&
+    (cpuArchitecture === CpuArchitecture.ppc64le || cpuArchitecture === CpuArchitecture.s390x)
+  ) {
+    return `Plaform integration is not supported for Single-Node OpenShift with the selected CPU architecture.`;
+  } else {
     return newFeatureSupportLevelContext.getFeatureDisabledReason(
       ExternalPlaformIds[platform] as FeatureId,
       featureSupportLevelData ?? undefined,
       cpuArchitecture,
     );
-  } else if (platform === 'nutanix' || platform === 'vsphere') {
-    return `${ExternalPlatformLabels[platform]} integration is not supported for Single-Node OpenShift.`;
-  } else if (
-    cpuArchitecture === CpuArchitecture.ppc64le ||
-    cpuArchitecture === CpuArchitecture.s390x
-  ) {
-    return `Plaform integration is not supported for Single-Node OpenShift with the selected CPU architecture.`;
   }
 };
 
@@ -75,7 +76,7 @@ const getExternalPlatformTypes = (
   featureSupportLevelData?: NewFeatureSupportLevelMap | null,
   cpuArchitecture?: SupportedCpuArchitecture,
 ): Partial<{ [key in PlatformType]: ExternalPlatformInfo }> => {
-  const platforms = ['none', 'nutanix', showOciOption && 'oci', 'vsphere'] as PlatformType[];
+  const platforms = ['none', 'nutanix', showOciOption && 'external', 'vsphere'] as PlatformType[];
 
   return platforms.filter(Boolean).reduce(
     (a, platform) => ({
@@ -90,6 +91,10 @@ const getExternalPlatformTypes = (
           featureSupportLevelData ?? undefined,
           cpuArchitecture,
         ),
+        supportLevel: newFeatureSupportLevelContext.getFeatureSupportLevel(
+          ExternalPlaformIds[platform] as FeatureId,
+          featureSupportLevelData ?? undefined,
+        ),
       },
     }),
     {},
@@ -104,6 +109,14 @@ export const areAllExternalPlatformIntegrationDisabled = (
     .every((info) => info.disabledReason !== undefined);
 };
 
+const getReasonForDropdownDisabled = (isSNO: boolean, labelCpuArch: string): string => {
+  if (!isSNO) {
+    return `Platform integration is not supported when ${labelCpuArch} is selected`;
+  } else {
+    return `Platform integration is not supported for SNO clusters`;
+  }
+};
+
 export const ExternalPlatformDropdown = ({
   showOciOption,
   onChange,
@@ -117,9 +130,10 @@ export const ExternalPlatformDropdown = ({
     Partial<{ [key in PlatformType]: ExternalPlatformInfo }>
   >({});
 
-  const tooltipDropdownDisabled = `Platform integration is not supported when ${
-    cpuArchitecture ? architectureData[cpuArchitecture].label : ''
-  } is selected`;
+  const tooltipDropdownDisabled = getReasonForDropdownDisabled(
+    isSNO,
+    cpuArchitecture ? architectureData[cpuArchitecture].label : '',
+  );
 
   const handleClick = (event: MouseEvent<HTMLButtonElement>, href: string) => {
     event.stopPropagation(); // Stop event propagation here
@@ -161,9 +175,10 @@ export const ExternalPlatformDropdown = ({
   }, [dropdownIsDisabled, externalPlatformTypes]);
 
   const enabledItems = Object.keys(externalPlatformTypes).map((platform) => {
-    const { label, href, disabledReason } = externalPlatformTypes[
+    const { label, href, disabledReason, supportLevel } = externalPlatformTypes[
       platform as PlatformType
     ] as ExternalPlatformInfo;
+
     return (
       <DropdownItem key={platform} id={platform} isAriaDisabled={disabledReason !== undefined}>
         <Split>
@@ -171,7 +186,12 @@ export const ExternalPlatformDropdown = ({
             <Tooltip hidden={!disabledReason} content={disabledReason} position="top">
               <div>
                 {label}
-                {platform === 'oci' && <DeveloperPreview testId={'oci-support-level`'} />}
+                <span onClick={(event) => event.stopPropagation()}>
+                  <NewFeatureSupportLevelBadge
+                    featureId={ExternalPlaformIds[platform as PlatformType] as FeatureId}
+                    supportLevel={supportLevel}
+                  />
+                </span>
               </div>
             </Tooltip>
           </SplitItem>
@@ -208,7 +228,7 @@ export const ExternalPlatformDropdown = ({
   const toggle = React.useMemo(
     () => (
       <DropdownToggle
-        onToggle={(val) => setOpen(val)}
+        onToggle={(val: boolean) => setOpen(val)}
         toggleIndicator={CaretDownIcon}
         isText
         className="pf-u-w-100"

package/lib/ocm/components/clusterConfiguration/platformIntegration/PlatformIntegrationNote.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons';
-import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
+import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
 import { SupportedPlatformType } from '../../../../common';
 import { ExternalPlatformLinks } from './constants';
 

package/lib/ocm/components/clusterConfiguration/platformIntegration/constants.tsx

@@ -5,7 +5,7 @@ export const ExternalPlatformLabels: { [key in PlatformType]: string } = {
   baremetal: 'No platform integration',
   none: 'No platform integration',
   nutanix: 'Nutanix',
-  oci: 'Oracle Cloud Infrastructure (Requires a custom manifest)',
+  external: 'Oracle Cloud Infrastructure (Requires a custom manifest)',
   vsphere: 'vSphere',
 };
 
@@ -18,6 +18,6 @@ export const ExternalPlaformIds: { [key in PlatformType]: string } = {
   baremetal: '',
   none: '',
   nutanix: 'NUTANIX_INTEGRATION',
-  oci: 'EXTERNAL_PLATFORM_OCI',
+  external: 'EXTERNAL_PLATFORM_OCI',
   vsphere: 'VSPHERE_INTEGRATION',
 };

package/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx

@@ -59,7 +59,8 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
         ],
       });
 
-    cluster.apiVip &&
+    cluster.apiVips &&
+      cluster.apiVips.length > 0 &&
       networkRows.push({
         rowId: 'api-ip',
         cells: [
@@ -71,7 +72,8 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
         ],
       });
 
-    cluster.ingressVip &&
+    cluster.ingressVips &&
+      cluster.ingressVips.length &&
       networkRows.push({
         rowId: 'ingress-ip',
         cells: [

package/lib/ocm/components/clusterConfiguration/review/ReviewPreflightChecks.tsx

@@ -8,18 +8,14 @@ import {
   Split,
   SplitItem,
 } from '@patternfly/react-core';
-import {
-  CheckCircleIcon,
-  ExclamationCircleIcon,
-  ExclamationTriangleIcon,
-  InfoCircleIcon,
-} from '@patternfly/react-icons';
-import {
-  global_success_color_100 as okColor,
-  global_info_color_100 as infoColor,
-  global_danger_color_100 as dangerColor,
-  global_warning_color_100 as warningColor,
-} 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 { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
+import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
+import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
+import { global_info_color_100 as infoColor } from '@patternfly/react-tokens/dist/js/global_info_color_100';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
+import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
 
 import { ClusterValidations, DetailItem, DetailList, HostsValidations } from '../../../../common';
 import { useClusterWizardContext } from '../../clusterWizard/ClusterWizardContext';

package/lib/ocm/components/clusterConfiguration/review/ReviewStep.tsx

@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { ActionListItem, Button, ButtonVariant, Grid, GridItem } from '@patternfly/react-core';
 import { ClusterWizardStepHeader, useAlerts, ClusterWizardStep } from '../../../../common';
 import { useClusterWizardContext } from '../../clusterWizard/ClusterWizardContext';
-import { getApiErrorMessage, handleApiError } from '../../../api';
+import { getApiErrorMessage, handleApiError } from '../../../../common/api';
 import { updateCluster } from '../../../store/slices/current-cluster/slice';
 import ClusterWizardFooter from '../../clusterWizard/ClusterWizardFooter';
 import ClusterWizardNavigation from '../../clusterWizard/ClusterWizardNavigation';

package/lib/ocm/components/clusterConfiguration/staticIp/components/CollapsedHost.tsx

@@ -7,7 +7,7 @@ import {
   TextVariants,
   Text,
 } from '@patternfly/react-core';
-import { InfoCircleIcon } from '@patternfly/react-icons';
+import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import React from 'react';
 
 export type HostSummaryProps = {

package/lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpForm.tsx

@@ -5,7 +5,7 @@ import { Formik, FormikConfig, useFormikContext, yupToFormErrors } from 'formik'
 import isEqual from 'lodash-es/isEqual.js';
 import { useAlerts, useFormikAutoSave } from '../../../../../common';
 import { useErrorMonitor } from '../../../../../common/components/ErrorHandling/ErrorMonitorContext';
-import { getApiErrorMessage } from '../../../../api';
+import { getApiErrorMessage } from '../../../../../common/api';
 import { StaticIpFormProps } from './propTypes';
 import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
 

package/lib/ocm/components/clusterConfiguration/staticIp/components/StaticIpHostsArray.tsx

@@ -11,7 +11,7 @@ import {
   FlexItem,
   Grid,
 } from '@patternfly/react-core';
-import { MinusCircleIcon } from '@patternfly/react-icons';
+import { MinusCircleIcon } from '@patternfly/react-icons/dist/js/icons/minus-circle-icon';
 import { FieldArray, FieldArrayRenderProps, useField } from 'formik';
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import { getFormikArrayItemFieldName, LoadingState } from '../../../../../common';

package/lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/MacIpMapping.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { GridItem, Grid, Button } from '@patternfly/react-core';
 import { ArrayHelpers, FieldArray } from 'formik';
-import { PlusCircleIcon } from '@patternfly/react-icons';
+import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon';
 import { getFormikArrayItemFieldName, RemovableField } from '../../../../../../common';
 import { OcmInputField } from '../../../../ui/OcmFormFields';
 import { useSelector } from 'react-redux';

package/lib/ocm/components/clusterConfiguration/staticIp/components/YamlView/YamlViewFields.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { TextVariants, TextContent, Text, FormGroup, Grid } from '@patternfly/react-core';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { Language } from '@patternfly/react-code-editor';
 import { useField } from 'formik';
 import { getFieldId, NMSTATE_EXAMPLES_LINK, PopoverIcon } from '../../../../../../common';

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

@@ -8,7 +8,6 @@ import {
   AssistedInstallerOCMPermissionTypesListType,
   CpuArchitecture,
   ErrorState,
-  FeatureGateContextProvider,
   FeatureListType,
   LoadingState,
   ResourceUIState,
@@ -29,6 +28,7 @@ import { BackButton } from '../ui/Buttons/BackButton';
 import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { usePullSecret } from '../../hooks';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { useFeatureDetection } from '../../hooks/use-feature-detection';
 
 type AssistedInstallerDetailCardProps = {
   aiClusterId: string;
@@ -91,6 +91,7 @@ const AssistedInstallerDetailCard = ({
   allEnabledFeatures,
   permissions,
 }: AssistedInstallerDetailCardProps) => {
+  useFeatureDetection(allEnabledFeatures);
   const { cluster, uiState } = useClusterPolling(aiClusterId);
   const pullSecret = usePullSecret();
   const {
@@ -131,32 +132,30 @@ const AssistedInstallerDetailCard = ({
 
   const isOutdatedClusterData = uiState === ResourceUIState.POLLING_ERROR;
   return (
-    <FeatureGateContextProvider features={allEnabledFeatures}>
-      <AlertsContextProvider>
-        <SentryErrorMonitorContextProvider>
-          <ModalDialogsContextProvider>
-            <ClusterDefaultConfigurationProvider
-              loadingUI={<LoadingCard />}
-              errorUI={<LoadingDefaultConfigFailedCard />}
+    <AlertsContextProvider>
+      <SentryErrorMonitorContextProvider>
+        <ModalDialogsContextProvider>
+          <ClusterDefaultConfigurationProvider
+            loadingUI={<LoadingCard />}
+            errorUI={<LoadingDefaultConfigFailedCard />}
+          >
+            <NewFeatureSupportLevelProvider
+              loadingUi={<LoadingCard />}
+              cluster={cluster}
+              cpuArchitecture={infraEnv.cpuArchitecture as CpuArchitecture}
+              openshiftVersion={cluster.openshiftVersion}
+              platformType={cluster.platform?.type}
             >
-              <NewFeatureSupportLevelProvider
-                loadingUi={<LoadingCard />}
-                cluster={cluster}
-                cpuArchitecture={infraEnv.cpuArchitecture as CpuArchitecture}
-                openshiftVersion={cluster.openshiftVersion}
-                platformType={cluster.platform?.type}
-              >
-                {content}
-              </NewFeatureSupportLevelProvider>
-              {isOutdatedClusterData && <ClusterPollingErrorModal />}
-              <CancelInstallationModal />
-              <ResetClusterModal />
-              <DiscoveryImageModal />
-            </ClusterDefaultConfigurationProvider>
-          </ModalDialogsContextProvider>
-        </SentryErrorMonitorContextProvider>
-      </AlertsContextProvider>
-    </FeatureGateContextProvider>
+              {content}
+            </NewFeatureSupportLevelProvider>
+            {isOutdatedClusterData && <ClusterPollingErrorModal />}
+            <CancelInstallationModal />
+            <ResetClusterModal />
+            <DiscoveryImageModal />
+          </ClusterDefaultConfigurationProvider>
+        </ModalDialogsContextProvider>
+      </SentryErrorMonitorContextProvider>
+    </AlertsContextProvider>
   );
 };
 

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

@@ -3,18 +3,14 @@ import { Provider } from 'react-redux';
 import { storeDay1 } from '../../store';
 import { useSelector } from 'react-redux';
 
-import {
-  AlertsContextProvider,
-  CpuArchitecture,
-  FeatureGateContextProvider,
-  FeatureListType,
-} from '../../../common';
+import { AlertsContextProvider, CpuArchitecture, FeatureListType } from '../../../common';
 import ClusterProperties from './ClusterProperties';
 import { Grid } from '@patternfly/react-core';
 import { NewFeatureSupportLevelProvider } from '../featureSupportLevels';
 import useInfraEnv from '../../hooks/useInfraEnv';
 import { usePullSecret } from '../../hooks';
 import { selectCurrentClusterState } from '../../store/slices/current-cluster/selectors';
+import { useFeatureDetection } from '../../hooks/use-feature-detection';
 
 type AssistedInstallerExtraDetailCardProps = {
   allEnabledFeatures: FeatureListType;
@@ -23,6 +19,7 @@ type AssistedInstallerExtraDetailCardProps = {
 const AssistedInstallerExtraDetailCard: React.FC<AssistedInstallerExtraDetailCardProps> = ({
   allEnabledFeatures,
 }) => {
+  useFeatureDetection(allEnabledFeatures);
   const { data: cluster } = useSelector(selectCurrentClusterState);
   const pullSecret = usePullSecret();
   const { infraEnv } = useInfraEnv(
@@ -40,21 +37,19 @@ const AssistedInstallerExtraDetailCard: React.FC<AssistedInstallerExtraDetailCar
   }
 
   return (
-    <FeatureGateContextProvider features={allEnabledFeatures}>
-      <AlertsContextProvider>
-        <NewFeatureSupportLevelProvider
-          loadingUi={<div />}
-          cluster={cluster}
-          cpuArchitecture={infraEnv?.cpuArchitecture as CpuArchitecture}
-          openshiftVersion={cluster.openshiftVersion}
-          platformType={cluster.platform?.type}
-        >
-          <Grid className="pf-u-mt-md">
-            <ClusterProperties cluster={cluster} externalMode />
-          </Grid>
-        </NewFeatureSupportLevelProvider>
-      </AlertsContextProvider>
-    </FeatureGateContextProvider>
+    <AlertsContextProvider>
+      <NewFeatureSupportLevelProvider
+        loadingUi={<div />}
+        cluster={cluster}
+        cpuArchitecture={infraEnv?.cpuArchitecture as CpuArchitecture}
+        openshiftVersion={cluster.openshiftVersion}
+        platformType={cluster.platform?.type}
+      >
+        <Grid className="pf-u-mt-md">
+          <ClusterProperties cluster={cluster} externalMode />
+        </Grid>
+      </NewFeatureSupportLevelProvider>
+    </AlertsContextProvider>
   );
 };
 

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

@@ -8,7 +8,7 @@ import {
   Text,
   TextContent,
 } from '@patternfly/react-core';
-import { getApiErrorMessage, handleApiError } from '../../api';
+import { getApiErrorMessage, handleApiError } from '../../../common/api';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
 import { ErrorState, LoadingState } from '../../../common';

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

@@ -9,14 +9,7 @@ import {
   GridItem,
   Grid,
 } from '@patternfly/react-core';
-import {
-  ToolbarButton,
-  Alerts,
-  getEnabledHosts,
-  selectOlmOperators,
-  isSNO,
-  useFeature,
-} from '../../../common';
+import { ToolbarButton, Alerts, getEnabledHosts, selectOlmOperators, isSNO } from '../../../common';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import ClusterToolbar from '../clusters/ClusterToolbar';
 import { getClusterDetailId } from './utils';
@@ -29,12 +22,13 @@ import { onFetchEvents } from '../fetching/fetchEvents';
 import { getClusterProgressAlerts } from './getProgressBarAlerts';
 import { ClustersAPI } from '../../services/apis';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
-import { handleApiError, isInOcm } from '../../api';
+import { handleApiError, isInOcm } from '../../../common/api';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import OcmClusterProgressItems from '../clusterConfiguration/OcmClusterProgressItems';
 import ClusterDetailsButtonGroup from './ClusterDetailsButtonGroup';
 import ClusterSummaryExpandable from './ClusterSummaryExpandable';
 import HostInventoryExpandable from './HostInventoryExpandable';
+import { useFeature } from '../../hooks/use-feature';
 
 type ClusterDetailProps = {
   cluster: Cluster;

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

@@ -9,9 +9,9 @@ import {
 } from '../../../common';
 
 import { useDefaultConfiguration } from '../clusterConfiguration/ClusterDefaultConfigurationContext';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { calculateClusterDateDiff } from '../../../common/services/DateAndTime';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 import { ExternalPlatformLinks } from '../clusterConfiguration/platformIntegration/constants';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import { Cluster, PlatformType } from '@openshift-assisted/types/assisted-installer-service';

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

@@ -30,7 +30,7 @@ const ClusterDetailsButtonGroup: React.FC<ClusterDetailsButtonGroupProps> = ({
   credentialsError,
   showKubeConfig = true,
 }) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { cancelInstallationDialog, resetClusterDialog } = useModalDialogsContext();
   const hasConsoleUrlAndNoError = credentials?.consoleUrl !== undefined && !credentialsError;
 
@@ -88,7 +88,7 @@ const ClusterDetailsButtonGroup: React.FC<ClusterDetailsButtonGroupProps> = ({
           data-testid="cluster-installation-logs-button"
           variant={ButtonVariant.link}
           onClick={() => {
-            void downloadClusterInstallationLogs(addAlert, cluster.id);
+            void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
           }}
           isDisabled={!canDownloadClusterLogs(cluster)}
         >

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

@@ -23,7 +23,7 @@ const ClusterInstallationError: React.FC<ClusterInstallationErrorProps> = ({
   cluster,
   title = 'Cluster installation failed',
 }) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { resetClusterDialog } = useModalDialogsContext();
 
   return (
@@ -41,7 +41,7 @@ const ClusterInstallationError: React.FC<ClusterInstallationErrorProps> = ({
             </AlertActionLink>
             <AlertActionLink
               onClick={() => {
-                void downloadClusterInstallationLogs(addAlert, cluster.id);
+                void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
               }}
               isDisabled={!canDownloadClusterLogs(cluster)}
               id={getID('button-download-installation-logs')}

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { getOpenshiftVersionText } from '../../../common';
 import { useOpenshiftVersions } from '../../hooks';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
 import { Popover, Text, TextContent, TextVariants } from '@patternfly/react-core';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';

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

@@ -14,7 +14,7 @@ import {
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { downloadClusterInstallationLogs } from './utils';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
-import { isInOcm } from '../../api';
+import { isInOcm } from '../../../common/api';
 import {
   NewFeatureSupportLevelData,
   useNewFeatureSupportLevel,
@@ -92,7 +92,7 @@ export const HostInstallationWarning = ({
   failedOperators = [],
   message,
 }: InstallationProgressWarningProps) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { t } = useTranslation();
   const featureSupportLevel = useNewFeatureSupportLevel();
 
@@ -107,7 +107,7 @@ export const HostInstallationWarning = ({
             <AlertActionLink
               id="cluster-installation-logs-button"
               onClick={() => {
-                void downloadClusterInstallationLogs(addAlert, cluster.id);
+                void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
               }}
               isDisabled={!canDownloadClusterLogs(cluster)}
             >
@@ -143,7 +143,7 @@ export const HostsInstallationFailed = ({
   totalHosts,
   isCriticalNumberOfWorkersFailed,
 }: InstallationProgressWarningProps) => {
-  const { addAlert } = useAlerts();
+  const { addAlert, clearAlerts } = useAlerts();
   const { resetClusterDialog } = useModalDialogsContext();
   const getID = (suffix: string) => `cluster-install-error-${suffix}`;
   let title, message;
@@ -185,7 +185,7 @@ export const HostsInstallationFailed = ({
             <AlertActionLink
               id="cluster-installation-logs-button"
               onClick={() => {
-                void downloadClusterInstallationLogs(addAlert, cluster.id);
+                void downloadClusterInstallationLogs(addAlert, cluster.id, clearAlerts);
               }}
               isDisabled={!canDownloadClusterLogs(cluster)}
             >

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

@@ -8,10 +8,10 @@ import {
   Text,
   TextContent,
 } from '@patternfly/react-core';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons';
-import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
+import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
 
-import { getApiErrorMessage, handleApiError } from '../../api';
+import { getApiErrorMessage, handleApiError } from '../../../common/api';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { calculateCollectedLogsCount } from '../clusters/utils';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';