@openshift-assisted/ui-lib 2.9.0-cim → 2.9.6-cim

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

@@ -11,7 +11,6 @@ import {
 } from '@patternfly/react-core';
 import { useFormikContext } from 'formik';
 import {
-  Cluster,
   HostDiscoveryValues,
   PopoverIcon,
   useFeature,
@@ -23,16 +22,13 @@ import HostsDiscoveryTable from '../hosts/HostsDiscoveryTable';
 import { DiscoveryImageModalButton } from './DiscoveryImageModal';
 import InformationAndAlerts from './InformationAndAlerts';
 import { OcmSwitchField } from '../ui/OcmFormFields';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
-import PlatformIntegration from './platformIntegration/PlatformIntegration';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 const schedulableMastersTooltip =
   'Workloads must be run on control plane nodes when less than 5 hosts are discovered';
 
 const HostInventory = ({ cluster }: { cluster: Cluster }) => {
-  const isPlatformIntegrationFeatureEnabled = useFeature(
-    'ASSISTED_INSTALLER_PLATFORM_INTEGRATION_FEATURE',
-  );
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
 
   const mastersMustRunWorkloads = selectMastersMustRunWorkloads(cluster);
@@ -61,13 +57,6 @@ const HostInventory = ({ cluster }: { cluster: Cluster }) => {
           </TextContent>
         )}
       </StackItem>
-      {isPlatformIntegrationFeatureEnabled && (
-        <StackItem>
-          <Split>
-            <PlatformIntegration clusterId={cluster.id} />
-          </Split>
-        </StackItem>
-      )}
       <StackItem>
         <Split>
           <SplitItem>

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

@@ -5,22 +5,27 @@ import { HostsNetworkConfigurationType } from '../../services/types';
 import { useField } from 'formik';
 import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 import RadioFieldWithTooltip from '../../../common/components/ui/formik/RadioFieldWithTooltip';
-import { clusterExistsReason } from '../featureSupportLevels/featureStateUtils';
+import {
+  clusterExistsReason,
+  hostsNetworkConfigurationDisabledReason,
+} from '../featureSupportLevels/featureStateUtils';
 
 export interface HostsNetworkConfigurationControlGroupProps {
   clusterExists: boolean;
+  isDisabled: boolean;
 }
 
 export const HostsNetworkConfigurationControlGroup = ({
   clusterExists,
+  isDisabled = false,
 }: HostsNetworkConfigurationControlGroupProps) => {
   const GROUP_NAME = 'hostsNetworkConfigurationType';
   const clusterWizardContext = useClusterWizardContext();
   const [{ value }] = useField<HostsNetworkConfigurationType>(GROUP_NAME);
-
+  const fieldId = getFieldId(GROUP_NAME, 'radio');
   const tooltipProps: TooltipProps = {
-    hidden: !clusterExists,
-    content: clusterExistsReason,
+    hidden: !clusterExists && !isDisabled,
+    content: !isDisabled ? clusterExistsReason : hostsNetworkConfigurationDisabledReason,
     position: 'top',
   };
 
@@ -31,22 +36,24 @@ export const HostsNetworkConfigurationControlGroup = ({
     clusterWizardContext.onUpdateHostNetworkConfigType(value);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value, clusterExists]);
+
   return (
     <FormGroup
+      id={`form-control__${fieldId}`}
       label="Hosts' network configuration"
-      fieldId={getFieldId(GROUP_NAME, 'radio')}
+      fieldId={fieldId}
       isInline
     >
       <RadioFieldWithTooltip
         name={GROUP_NAME}
-        isDisabled={clusterExists}
+        isDisabled={clusterExists || isDisabled}
         value={HostsNetworkConfigurationType.DHCP}
         label="DHCP only"
         tooltipProps={tooltipProps}
       />
       <RadioFieldWithTooltip
         name={GROUP_NAME}
-        isDisabled={clusterExists}
+        isDisabled={clusterExists || isDisabled}
         value={HostsNetworkConfigurationType.STATIC}
         label="Static IP, bridges, and bonds"
         tooltipProps={tooltipProps}

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

@@ -1,12 +1,13 @@
 import React from 'react';
 import { Alert, AlertVariant } from '@patternfly/react-core';
-import { Cluster, isSNO } from '../../../common';
+import { isSNO } from '../../../common';
 import { isAHostVM } from '../hosts/utils';
 import { isAddHostsCluster } from '../clusters/utils';
 import HostRequirementsContent from '../hosts/HostRequirementsContent';
 import HostsDiscoveryTroubleshootingInfoLinkWithModal from '../hosts/HostsDiscoveryTroubleshootingInfoLinkWithModal';
 import VMRebootConfigurationLinkWithModal from '../hosts/VMRebootConfigurationLinkWithModal';
 import InfoLinkWithModal from '../ui/InfoLinkWithModal';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 const InformationAndAlerts = ({ cluster }: { cluster: Cluster }) => {
   const isVM = React.useMemo(() => isAHostVM(cluster.hosts || []), [cluster.hosts]);

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

@@ -0,0 +1,109 @@
+import React from 'react';
+import { Dropdown, DropdownItem, DropdownToggle, FormGroup } from '@patternfly/react-core';
+import { useField, useFormikContext } from 'formik';
+import { ClusterDetailsValues, HelperText, getFieldId } from '../../../common';
+import { CaretDownIcon } from '@patternfly/react-icons';
+import { OcmCheckboxField, OcmInputField } from '../ui/OcmFormFields';
+import { ManagedDomain } from '@openshift-assisted/types/assisted-installer-service';
+
+const INPUT_NAME = 'baseDnsDomain';
+const INPUT_LABEL = 'Base domain';
+const fieldId = getFieldId(INPUT_NAME, 'input');
+
+const getManagedDomainLabel = (domain: ManagedDomain) =>
+  `${domain?.domain || ''} (${domain?.provider || ''})`;
+
+export const BaseDnsHelperText = ({
+  name,
+  baseDnsDomain,
+}: {
+  name?: string;
+  baseDnsDomain?: string;
+}) => (
+  <HelperText fieldId={fieldId}>
+    All DNS records must be subdomains of this base and include the cluster name. This cannot be
+    changed after cluster installation. The full cluster address will be: <br />
+    <strong>
+      {name || '[Cluster Name]'}.{baseDnsDomain || '[example.com]'}
+    </strong>
+  </HelperText>
+);
+
+export const OcmBaseDomainField = ({ managedDomains }: { managedDomains: ManagedDomain[] }) => {
+  const [, { value }, { setValue }] = useField<string>(INPUT_NAME);
+  const { values } = useFormikContext<ClusterDetailsValues>();
+  const { name, baseDnsDomain, useRedHatDnsService } = values;
+  const [isOpen, setOpen] = React.useState(false);
+
+  const dropdownItems = React.useMemo(() => {
+    return managedDomains?.map((d) => (
+      <DropdownItem key={d.domain} id={d.domain}>
+        {getManagedDomainLabel(d)}
+      </DropdownItem>
+    ));
+  }, [managedDomains]);
+
+  const dropdownToggle = React.useMemo(() => {
+    const selectedDomain = managedDomains.find((d) => d.domain === value);
+    return (
+      <DropdownToggle
+        onToggle={(val) => setOpen(val)}
+        toggleIndicator={CaretDownIcon}
+        isText
+        className="pf-u-w-100"
+      >
+        {selectedDomain ? getManagedDomainLabel(selectedDomain) : 'Base domain'}
+      </DropdownToggle>
+    );
+  }, [managedDomains, value]);
+
+  const toggleRedHatDnsService = (checked: boolean) =>
+    setValue((checked && managedDomains.map((d) => d.domain)[0]) || '');
+
+  const onSelect = React.useCallback(
+    (event?: React.SyntheticEvent<HTMLDivElement>) => {
+      const selectedDomain = event?.currentTarget.id || '';
+      setValue(selectedDomain);
+      setOpen(false);
+    },
+    [setValue],
+  );
+
+  return (
+    <>
+      {!!managedDomains.length && toggleRedHatDnsService && (
+        <OcmCheckboxField
+          name="useRedHatDnsService"
+          label="Use a temporary 60-day domain"
+          helperText="A base domain will be provided for temporary, non-production clusters."
+          onChange={toggleRedHatDnsService}
+        />
+      )}
+      <FormGroup
+        id={`form-control__${fieldId}`}
+        fieldId={fieldId}
+        name={INPUT_NAME}
+        label={INPUT_LABEL}
+        isRequired
+        helperText={<BaseDnsHelperText name={name} baseDnsDomain={baseDnsDomain} />}
+      >
+        {useRedHatDnsService ? (
+          <Dropdown
+            toggle={dropdownToggle}
+            dropdownItems={dropdownItems}
+            isOpen={isOpen}
+            onSelect={onSelect}
+            className="pf-u-w-100"
+          />
+        ) : (
+          <OcmInputField
+            name={INPUT_NAME}
+            placeholder="example.com"
+            isDisabled={useRedHatDnsService}
+            isRequired
+          />
+        )}
+      </FormGroup>
+    </>
+  );
+};

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

@@ -6,7 +6,6 @@ import { HostsNetworkConfigurationControlGroup } from './HostsNetworkConfigurati
 import {
   ClusterDetailsValues,
   isSNO,
-  ManagedDomain,
   OpenshiftVersionOptionType,
   PullSecret,
   ocmClusterNameValidationMessages,
@@ -14,17 +13,11 @@ import {
   CLUSTER_NAME_MAX_LENGTH,
   StaticTextField,
   useFeature,
-  ClusterCreateParams,
   getSupportedCpuArchitectures,
 } from '../../../common';
 import DiskEncryptionControlGroup from '../../../common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import {
-  OcmCheckboxField,
-  OcmInputField,
-  OcmRichInputField,
-  OcmSelectField,
-} from '../ui/OcmFormFields';
+import { OcmRichInputField } from '../ui/OcmFormFields';
 import OcmOpenShiftVersion from './OcmOpenShiftVersion';
 import OcmOpenShiftVersionSelect from './OcmOpenShiftVersionSelect';
 import CustomManifestCheckbox from './CustomManifestCheckbox';
@@ -32,38 +25,31 @@ import CpuArchitectureDropdown, {
   architectureData,
   CpuArchitectureItem,
 } from './CpuArchitectureDropdown';
+import { OcmBaseDomainField } from './OcmBaseDomainField';
 import OcmSNOControlGroup from './OcmSNOControlGroup';
 import useSupportLevelsAPI from '../../hooks/useSupportLevelsAPI';
 import { useOpenshiftVersions } from '../../hooks';
+import { ExternalPlatformDropdown } from './platformIntegration/ExternalPlatformDropdown';
+import { HostsNetworkConfigurationType } from '../../services/types';
+import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
+import { ExternalPlatformLabels } from './platformIntegration/constants';
+import { ManagedDomain, PlatformType } from '@openshift-assisted/types/assisted-installer-service';
+import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 
 export type OcmClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
-  isBaseDnsDomainDisabled?: boolean;
   defaultPullSecret?: string;
   isOcm: boolean;
   managedDomains?: ManagedDomain[];
   versions: OpenshiftVersionOptionType[];
-  toggleRedHatDnsService?: (checked: boolean) => void;
   isPullSecretSet: boolean;
   clusterExists: boolean;
   clusterCpuArchitecture?: string;
   clusterId?: string;
 };
 
-const BaseDnsHelperText = ({ name, baseDnsDomain }: { name?: string; baseDnsDomain?: string }) => (
-  <>
-    All DNS records must be subdomains of this base and include the cluster name. This cannot be
-    changed after cluster installation. The full cluster address will be: <br />
-    <strong>
-      {name || '[Cluster Name]'}.{baseDnsDomain || '[example.com]'}
-    </strong>
-  </>
-);
-
 export const OcmClusterDetailsFormFields = ({
   managedDomains = [],
-  toggleRedHatDnsService,
-  isBaseDnsDomainDisabled,
   versions,
   isPullSecretSet,
   defaultPullSecret,
@@ -73,22 +59,18 @@ export const OcmClusterDetailsFormFields = ({
   clusterCpuArchitecture,
   clusterId,
 }: OcmClusterDetailsFormFieldsProps) => {
-  const { values } = useFormikContext<ClusterDetailsValues>();
-  const { name, baseDnsDomain, highAvailabilityMode, useRedHatDnsService } = values;
+  const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
+  const { highAvailabilityMode, useRedHatDnsService } = values;
   const nameInputRef = React.useRef<HTMLInputElement>();
-  React.useEffect(() => {
-    nameInputRef.current?.focus();
-  }, []);
 
-  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const { t } = useTranslation();
-  const {
-    values: { openshiftVersion },
-  } = useFormikContext<ClusterCreateParams>();
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const isMultiArchSupported = useFeature('ASSISTED_INSTALLER_MULTIARCH_SUPPORTED');
+  const isOracleCloudPlatformIntegrationEnabled = useFeature('ASSISTED_INSTALLER_PLATFORM_OCI');
+  const { openshiftVersion, platform } = values;
   const { getCpuArchitectures } = useOpenshiftVersions();
   const cpuArchitecturesByVersionImage = getCpuArchitectures(openshiftVersion);
-
+  const clusterWizardContext = useClusterWizardContext();
   const featureSupportLevelData = useSupportLevelsAPI(
     'features',
     values.openshiftVersion,
@@ -98,11 +80,39 @@ export const OcmClusterDetailsFormFields = ({
     () => getSupportedCpuArchitectures(isMultiArchSupported, cpuArchitecturesByVersionImage),
     [cpuArchitecturesByVersionImage, isMultiArchSupported],
   );
-
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   const cpuArchitecture = (architectureData[values.cpuArchitecture] as CpuArchitectureItem).label;
 
+  const featureSupportLevelContext = useNewFeatureSupportLevel();
+
+  React.useEffect(() => {
+    nameInputRef.current?.focus();
+  }, []);
+
+  const handleExternalPartnerIntegrationsChange = React.useCallback(
+    (selectedPlatform: PlatformType) => {
+      const isOracleSelected = selectedPlatform === 'oci';
+      if (isOracleSelected) {
+        setFieldValue('addCustomManifest', isOracleSelected, false);
+        clusterWizardContext.setAddCustomManifests(isOracleSelected);
+        setFieldValue('hostsNetworkConfigurationType', HostsNetworkConfigurationType.DHCP);
+      }
+    },
+    [clusterWizardContext, setFieldValue],
+  );
+
+  React.useEffect(() => {
+    setFieldValue(
+      'isCMNSupported',
+      featureSupportLevelContext.isFeatureSupported(
+        'CLUSTER_MANAGED_NETWORKING',
+        featureSupportLevelData ?? undefined,
+      ),
+      false,
+    );
+  }, [setFieldValue, featureSupportLevelContext, featureSupportLevelData]);
+
   return (
     <Form id="wizard-cluster-details__form">
       <OcmRichInputField
@@ -118,35 +128,9 @@ export const OcmClusterDetailsFormFields = ({
         }
         maxLength={CLUSTER_NAME_MAX_LENGTH}
       />
-      {!!managedDomains.length && toggleRedHatDnsService && (
-        <OcmCheckboxField
-          name="useRedHatDnsService"
-          label="Use a temporary 60-day domain"
-          helperText="A base domain will be provided for temporary, non-production clusters."
-          onChange={toggleRedHatDnsService}
-        />
-      )}
-      {useRedHatDnsService ? (
-        <OcmSelectField
-          label="Base domain"
-          name="baseDnsDomain"
-          helperText={<BaseDnsHelperText name={name} baseDnsDomain={baseDnsDomain} />}
-          options={managedDomains.map((d) => ({
-            label: `${d.domain || ''} (${d.provider || ''})`,
-            value: d.domain,
-          }))}
-          isRequired
-        />
-      ) : (
-        <OcmInputField
-          label="Base domain"
-          name="baseDnsDomain"
-          helperText={<BaseDnsHelperText name={name} baseDnsDomain={baseDnsDomain} />}
-          placeholder="example.com"
-          isDisabled={isBaseDnsDomainDisabled || useRedHatDnsService}
-          isRequired
-        />
-      )}
+
+      <OcmBaseDomainField managedDomains={managedDomains} />
+
       {/* TODO(mlibra): For single-cluster: We will probably change this to just a static text */}
       {forceOpenshiftVersion ? (
         <OcmOpenShiftVersion
@@ -175,12 +159,34 @@ export const OcmClusterDetailsFormFields = ({
       />
 
       {!isPullSecretSet && <PullSecret isOcm={isOcm} defaultPullSecret={defaultPullSecret} />}
-      <CustomManifestCheckbox clusterId={clusterId || ''} />
+
+      {clusterExists ? (
+        <StaticTextField
+          name="platform"
+          label="Integrate with external partner platforms"
+          isRequired
+        >
+          {ExternalPlatformLabels[values.platform]}
+        </StaticTextField>
+      ) : (
+        <ExternalPlatformDropdown
+          onChange={handleExternalPartnerIntegrationsChange}
+          cpuArchitecture={values.cpuArchitecture}
+          showOciOption={isOracleCloudPlatformIntegrationEnabled}
+          featureSupportLevelData={featureSupportLevelData}
+          isSNO={isSNO({ highAvailabilityMode })}
+        />
+      )}
+
+      <CustomManifestCheckbox clusterId={clusterId || ''} isDisabled={platform === 'oci'} />
 
       {
         // Reason: In the single-cluster flow, the Host discovery phase is replaced by a single one-fits-all ISO download
         !isSingleClusterFeatureEnabled && (
-          <HostsNetworkConfigurationControlGroup clusterExists={clusterExists} />
+          <HostsNetworkConfigurationControlGroup
+            clusterExists={clusterExists}
+            isDisabled={platform === 'oci'}
+          />
         )
       }
 

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

@@ -1,7 +1,6 @@
 import { Grid, GridItem } from '@patternfly/react-core';
 import React from 'react';
 import {
-  Cluster,
   EventListFetchProps,
   getEnabledHosts,
   RenderIf,
@@ -10,6 +9,7 @@ import {
 import { FinalizingProgress } from '../../../common/components/clusterDetail/FinalizingProgress';
 import { ProgressBarTexts } from '../../../common/components/clusterDetail/ProgressBarTexts';
 import OcmOperatorsProgressItem from './OcmOperatorProgressItem';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 type OcmClusterProgressItemsProps = {
   cluster: Cluster;

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

@@ -11,7 +11,12 @@ import {
   StackItem,
 } from '@patternfly/react-core';
 import { Formik, FormikHelpers } from 'formik';
-import { HostStaticNetworkConfig, ImageType, InfraEnv, Proxy } from '../../../common/api';
+import {
+  HostStaticNetworkConfig,
+  ImageType,
+  InfraEnv,
+  Proxy,
+} from '@openshift-assisted/types/assisted-installer-service';
 import {
   AlertFormikError,
   httpProxyValidationSchema,
@@ -68,6 +73,7 @@ type OcmDiscoveryImageConfigFormProps = Proxy & {
   enableCertificate?: boolean;
   trustBundle?: InfraEnv['additionalTrustBundle'];
   selectedCpuArchitecture?: SupportedCpuArchitecture;
+  isOracleCloudInfrastructure?: boolean;
 };
 
 export const OcmDiscoveryImageConfigForm = ({
@@ -82,6 +88,7 @@ export const OcmDiscoveryImageConfigForm = ({
   enableCertificate,
   trustBundle,
   selectedCpuArchitecture,
+  isOracleCloudInfrastructure = false,
 }: OcmDiscoveryImageConfigFormProps) => {
   const imageTypeValue = isIpxeSelected
     ? 'discovery-image-ipxe'
@@ -147,6 +154,7 @@ export const OcmDiscoveryImageConfigForm = ({
                       defaultValue={discoveryImageTypes[imageTypeValue]}
                       onChange={updateDiscoveryButtonAndAlertText}
                       selectedCpuArchitecture={selectedCpuArchitecture}
+                      isDisabled={isOracleCloudInfrastructure}
                     />
                     <UploadSSH
                       labelText={t(

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

@@ -12,7 +12,7 @@ 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 { ocmClient } from '../../api';
+import { isInOcm } from '../../api';
 
 const OpenShiftLifeCycleDatesLink = () => {
   const { t } = useTranslation();
@@ -81,7 +81,7 @@ const OcmOpenShiftVersionSelect = ({ versions }: OcmOpenShiftVersionSelectProps)
       items={selectOptions}
       versions={versions}
       getHelperText={getOpenshiftVersionHelperText}
-      showReleasesLink={ocmClient !== undefined}
+      showReleasesLink={isInOcm}
     />
   );
 };

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

@@ -16,15 +16,14 @@ import { TFunction } from 'i18next';
 import './OcmOperatorsProgressItem.css';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import ClusterProgressItem from '../../../common/components/clusterDetail/ClusterProgressItem';
+import { operatorLabels, OperatorName } from '../../../common';
+import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import {
   Cluster,
   MonitoredOperator,
   MonitoredOperatorsList,
-  operatorLabels,
-  OperatorName,
   OperatorStatus,
-} from '../../../common';
-import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
+} from '@openshift-assisted/types/assisted-installer-service';
 
 export function getAggregatedStatus(operators: MonitoredOperatorsList) {
   const operatorStates: (OperatorStatus | 'pending')[] = operators.map(

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

@@ -6,7 +6,6 @@ import {
   useNewFeatureSupportLevel,
 } from '../../../common/components/newFeatureSupportLevels';
 import OcmSNODisclaimer from './OcmSNODisclaimer';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type OcmSNOControlGroupProps = {
   highAvailabilityMode: ClusterDetailsValues['highAvailabilityMode'];
@@ -17,7 +16,6 @@ const OcmSNOControlGroup = ({
   highAvailabilityMode,
   featureSupportLevelData,
 }: OcmSNOControlGroupProps) => {
-  const { t } = useTranslation();
   const newFeatureSupportLevelContext = useNewFeatureSupportLevel();
 
   const snoSupportLevel = newFeatureSupportLevelContext.getFeatureSupportLevel(
@@ -34,7 +32,6 @@ const OcmSNOControlGroup = ({
   );
   const disabledReason = newFeatureSupportLevelContext.getFeatureDisabledReason(
     'SNO',
-    t,
     featureSupportLevelData,
   );
 

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

@@ -1,7 +1,8 @@
 import React from 'react';
 import { Alert, AlertVariant, List, ListItem, Stack, StackItem } from '@patternfly/react-core';
-import { CheckboxField, SupportLevel } from '../../../common';
+import { CheckboxField } from '../../../common';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { SupportLevel } from '@openshift-assisted/types/assisted-installer-service';
 
 type OcmSNODisclaimerProps = {
   snoSupportLevel: SupportLevel;

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

@@ -1,17 +1,15 @@
 import * as React from 'react';
 import { useField, useFormikContext } from 'formik';
 import { Checkbox, FormGroup, Tooltip } from '@patternfly/react-core';
-import {
-  ClusterCreateParams,
-  getFieldId,
-  HelperText,
-  SupportLevel,
-  useFeature,
-} from '../../../common';
+import { getFieldId, HelperText } from '../../../common';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 import { CheckboxFieldProps } from '../../../common/components/ui/formik/types';
 import NewFeatureSupportLevelBadge from '../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import {
+  ClusterCreateParams,
+  SupportLevel,
+} from '@openshift-assisted/types/assisted-installer-service';
 
 export interface OcmCheckboxProps extends CheckboxFieldProps {
   disabledReason?: string;
@@ -30,7 +28,6 @@ const OcmSingleNodeCheckbox: React.FC<OcmCheckboxProps> = ({
   const {
     values: { openshiftVersion },
   } = useFormikContext<ClusterCreateParams>();
-  const isSingleNodeOpenshiftEnabled = useFeature('ASSISTED_INSTALLER_SNO_FEATURE');
   const [field, meta, helpers] = useField<'None' | 'Full'>({ name: props.name, validate });
   const featureSupportLevelContext = useNewFeatureSupportLevel();
   const prevVersionRef = React.useRef(openshiftVersion);
@@ -63,9 +60,9 @@ const OcmSingleNodeCheckbox: React.FC<OcmCheckboxProps> = ({
     prevIsDisabled.current = props.isDisabled;
   }, [props.isDisabled, setValue, onChanged]);
 
-  if (isSingleNodeOpenshiftEnabled && isSupportedVersionAvailable) {
+  if (isSupportedVersionAvailable) {
     return (
-      <FormGroup isInline fieldId={fieldId}>
+      <FormGroup id={`form-control__${fieldId}`} isInline fieldId={fieldId}>
         <Tooltip hidden={!disabledReason} content={disabledReason}>
           <Checkbox
             {...field}

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { Text, TextContent, TextVariants, Alert, Grid } from '@patternfly/react-core';
 
 import { CustomManifests } from './components/CustomManifests';
-import { Cluster } from '../../../../common';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { CustomManifestFormState } from './components/propTypes';
 
 export const CustomManifestsPage = ({

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

@@ -26,11 +26,12 @@ export const RemoveItemButton = ({
   dataTestId: string;
 }) => (
   <Button
+    data-testid={dataTestId}
     aria-label="remove manifest"
     style={{ visibility: showRemoveButton ? 'visible' : 'hidden' }}
     variant="plain"
   >
-    <MinusCircleIcon onClick={onRemove} data-testid={dataTestId} />
+    <MinusCircleIcon onClick={onRemove} />
   </Button>
 );
 

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

@@ -2,9 +2,9 @@ import React from 'react';
 import { ListManifestsExtended } from '../data/dataTypes';
 import { CustomManifestsFormProps, CustomManifestFormState } from './propTypes';
 import { getFormViewManifestsValidationSchema } from './customManifestsValidationSchema';
-import { Cluster } from '../../../../../common';
 import { CustomManifestsForm } from './CustomManifestsForm';
 import { getEmptyFormViewManifestsValues, getFormViewManifestValues } from './utils';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 export const CustomManifests = ({
   cluster,

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

@@ -6,12 +6,12 @@ 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 { selectCurrentClusterPermissionsState } from '../../../../selectors';
 import { ClustersAPI } from '../../../../services/apis';
 import { getApiErrorMessage, handleApiError } from '../../../../api';
 import { CustomManifest } from './CustomManifest';
 import { getEmptyFormViewManifest, getManifestName } from './utils';
 import { CustomManifestValues } from '../data/dataTypes';
+import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
 
 const fieldName = 'manifests';