@openshift-assisted/ui-lib 2.52.2 → 5.0.0-cim

package/lib/common/components/clusterWizard/networkingSteps/ThirdPartyCNIBanner.tsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { useTranslation } from '../../../hooks';
+import { Alert, AlertVariant, Stack, StackItem } from '@patternfly/react-core';
+import { RED_HAT_CNI_SUPPORT_MATRIX_LINK } from '../../../config';
+import { ExternalLink } from '../../ui';
+
+export const ThirdPartyCNIBanner = () => {
+  const { t } = useTranslation();
+
+  return (
+    <StackItem>
+      <Alert variant={AlertVariant.warning} isInline title={t('ai:Third-party CNI')}>
+        <Stack hasGutter>
+          <StackItem>
+            {t(
+              'ai:Third-party CNIs require uploading CNI manifests. Please verify you have the required manifests and that the chosen CNI is compatible with your platform and OpenShift version.',
+            )}
+          </StackItem>
+          <StackItem>
+            <ExternalLink href={RED_HAT_CNI_SUPPORT_MATRIX_LINK}>
+              {t('ai:Red Hat CNI Support Matrix')}
+            </ExternalLink>
+          </StackItem>
+        </Stack>
+      </Alert>
+    </StackItem>
+  );
+};

package/lib/common/components/clusterWizard/networkingSteps/index.ts

@@ -14,3 +14,4 @@ export { VirtualIPControlGroup } from './VirtualIPControlGroup';
 export type { VirtualIPControlGroupProps } from './VirtualIPControlGroup';
 export { default as AdvancedNetworkFields } from './AdvancedNetworkFields';
 export type { AdvancedNetworkFieldsProps } from './AdvancedNetworkFields';
+export * from './ThirdPartyCNIBanner';

package/lib/common/components/ui/formik/utils.ts

@@ -126,6 +126,12 @@ export const allSubnetsIPv4 = (
   return !!networks?.every((network) => network.cidr && Address4.isValid(network.cidr));
 };
 
+export const allSubnetsIPv6 = (
+  networks: (MachineNetwork | ClusterNetwork | ServiceNetwork)[] | undefined,
+) => {
+  return !!networks?.every((network) => network.cidr && Address6.isValid(network.cidr));
+};
+
 export const labelsToArray = (labels: { [key in string]: string } = {}): string[] => {
   const result: string[] = [];
   for (const key in labels) {

package/lib/common/config/constants.ts

@@ -289,8 +289,10 @@ export const CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6 = {
 export const CLUSTER_DEFAULT_NETWORK_SETTINGS: Pick<
   ClusterDefaultConfig,
   | 'clusterNetworksIpv4'
+  | 'clusterNetworksIpv6'
   | 'clusterNetworksDualstack'
   | 'serviceNetworksIpv4'
+  | 'serviceNetworksIpv6'
   | 'serviceNetworksDualstack'
 > = {
   clusterNetworksIpv4: [
@@ -299,6 +301,12 @@ export const CLUSTER_DEFAULT_NETWORK_SETTINGS: Pick<
       hostPrefix: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.clusterNetworkHostPrefix,
     },
   ],
+  clusterNetworksIpv6: [
+    {
+      cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6.clusterNetworkCidr,
+      hostPrefix: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6.clusterNetworkHostPrefix,
+    },
+  ],
   clusterNetworksDualstack: [
     {
       cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.clusterNetworkCidr,
@@ -310,6 +318,7 @@ export const CLUSTER_DEFAULT_NETWORK_SETTINGS: Pick<
     },
   ],
   serviceNetworksIpv4: [{ cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.serviceNetworkCidr }],
+  serviceNetworksIpv6: [{ cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6.serviceNetworkCidr }],
   serviceNetworksDualstack: [
     { cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4.serviceNetworkCidr },
     { cidr: CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV6.serviceNetworkCidr },
@@ -333,7 +342,7 @@ export const MS_PER_DAY = 1000 * 60 * 60 * 24;
 
 export const NO_SUBNET_SET = 'NO_SUBNET_SET';
 
-export const IPV4_STACK = 'singleStack';
+export const SINGLE_STACK = 'singleStack';
 export const DUAL_STACK = 'dualStack';
 
 export const PREFIX_MAX_RESTRICTION = {
@@ -384,7 +393,11 @@ export const singleClusterOperators = [
   OPERATOR_NAME_NODE_MAINTENANCE,
   OPERATOR_NAME_FENCE_AGENTS_REMEDIATION,
   OPERATOR_NAME_KUBE_DESCHEDULER,
+  OPERATOR_NAME_METALLB,
   OPERATOR_NAME_CLUSTER_OBSERVABILITY,
+  OPERATOR_NAME_OADP,
+  OPERATOR_NAME_LSO,
+  OPERATOR_NAME_NUMA_RESOURCES,
   OPERATOR_NAME_LOKI,
   OPERATOR_NAME_OPENSHIFT_LOGGING,
 ];

package/lib/common/types/networkType.ts

@@ -1,4 +1,5 @@
 import type { FeatureSupportLevelId } from '@openshift-assisted/types/assisted-installer-service';
+import { TFunction } from 'i18next';
 
 export type NetworkTypeKey =
   | 'OVNKubernetes'
@@ -15,14 +16,14 @@ export const NETWORK_TYPE_CILIUM: NetworkTypeKey = 'Cilium';
 export const NETWORK_TYPE_CALICO: NetworkTypeKey = 'Calico';
 export const NETWORK_TYPE_NONE: NetworkTypeKey = 'None';
 
-export const NETWORK_TYPE_LABELS: Record<string, string> = {
-  [NETWORK_TYPE_OVN]: 'Open Virtual Networking (OVN)',
-  [NETWORK_TYPE_SDN]: 'Software-Defined Networking (SDN)',
-  [NETWORK_TYPE_CISCO_ACI]: 'Cisco ACI',
-  [NETWORK_TYPE_CILIUM]: 'Isovalent Cilium',
-  [NETWORK_TYPE_CALICO]: 'Tigera Calico',
-  [NETWORK_TYPE_NONE]: 'None (Custom CNI)',
-};
+export const NETWORK_TYPE_LABELS = (t: TFunction): Record<string, string> => ({
+  [NETWORK_TYPE_OVN]: t('ai:Open Virtual Networking (OVN)'),
+  [NETWORK_TYPE_SDN]: t('ai:Software-Defined Networking (SDN)'),
+  [NETWORK_TYPE_CISCO_ACI]: t('ai:Cisco ACI'),
+  [NETWORK_TYPE_CILIUM]: t('ai:Isovalent Cilium'),
+  [NETWORK_TYPE_CALICO]: t('ai:Tigera Calico'),
+  [NETWORK_TYPE_NONE]: t('ai:None (Custom CNI)'),
+});
 
 export const NETWORK_TYPE_FEATURE_IDS: Record<string, FeatureSupportLevelId> = {
   [NETWORK_TYPE_OVN]: 'OVN_NETWORK_TYPE',

package/lib/common/validationSchemas/networkingValidation.tsx

@@ -13,7 +13,8 @@ import {
   ipBlockValidationSchema,
 } from './addressValidation';
 import { isMajorMinorVersionEqualOrGreater } from '../utils';
-import { allSubnetsIPv4 } from '../components/ui/formik/utils';
+import { allSubnetsIPv4, allSubnetsIPv6 } from '../components/ui/formik/utils';
+import { SINGLE_STACK } from '../config';
 
 export const machineNetworksValidationSchema = Yup.array().of(
   Yup.object({ cidr: hostSubnetValidationSchema, clusterId: Yup.string() }),
@@ -111,3 +112,40 @@ export const IPv4ValidationSchema = Yup.array().test(
   `All network subnets must be IPv4.`,
   (values?: (MachineNetwork | ClusterNetwork | ServiceNetwork)[]) => allSubnetsIPv4(values),
 );
+
+export const IPv6ValidationSchema = Yup.array().test(
+  'single-stack-ipv6',
+  'All network subnets must be IPv6.',
+  (values?: (MachineNetwork | ClusterNetwork | ServiceNetwork)[]) => allSubnetsIPv6(values),
+);
+
+export const clusterNetworksSchema = (
+  t: TFunction,
+  stackType: string,
+  primaryCidr: string | undefined,
+  openshiftVersion?: string,
+) => {
+  const singleStackFamilySchema =
+    primaryCidr && isCIDR.v6(primaryCidr) ? IPv6ValidationSchema : IPv4ValidationSchema;
+
+  const stackFamilySchema =
+    stackType === SINGLE_STACK
+      ? singleStackFamilySchema
+      : dualStackValidationSchema(t('ai:cluster network'), t, openshiftVersion);
+  return clusterNetworksValidationSchema(t).concat(stackFamilySchema);
+};
+
+export const serviceNetworksSchema = (
+  t: TFunction,
+  stackType: string,
+  primaryCidr: string | undefined,
+  openshiftVersion?: string,
+) => {
+  const singleStackFamilySchema =
+    primaryCidr && isCIDR.v6(primaryCidr) ? IPv6ValidationSchema : IPv4ValidationSchema;
+  const stackFamilySchema =
+    stackType === SINGLE_STACK
+      ? singleStackFamilySchema
+      : dualStackValidationSchema(t('ai:service network'), t, openshiftVersion);
+  return serviceNetworkValidationSchema(t).concat(stackFamilySchema);
+};

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

@@ -11,7 +11,7 @@ import {
 import { useField } from 'formik';
 import toNumber from 'lodash-es/toNumber';
 import { getFieldId, PopoverIcon, PreviewBadgePosition, TechnologyPreview } from '../../../common';
-
+import { useFeature } from '../../hooks/use-feature';
 import {
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
@@ -45,6 +45,8 @@ interface ControlPlaneNodesOption {
   value: number;
   label: string;
   badge?: React.ReactNode;
+  /** When true, option is omitted from the list (e.g. product mode does not offer this topology). */
+  hidden?: boolean;
 }
 
 interface ControlPlaneNodesDropdownProps {
@@ -71,7 +73,7 @@ const ControlPlaneNodesDropdown: React.FC<ControlPlaneNodesDropdownProps> = ({
   const [field, , { setValue }] = useField<number>(INPUT_NAME);
   const [isOpen, setOpen] = React.useState<boolean>(false);
   const newFeatureSupportLevelContext = useNewFeatureSupportLevel();
-
+  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const snoExpansion = newFeatureSupportLevelContext.isFeatureSupported(
     'SINGLE_NODE_EXPANSION',
     featureSupportLevelData ?? undefined,
@@ -100,11 +102,12 @@ const ControlPlaneNodesDropdown: React.FC<ControlPlaneNodesDropdownProps> = ({
         tnaSupport === 'tech-preview' ? (
           <TechnologyPreview position={PreviewBadgePosition.default} />
         ) : undefined,
+      hidden: isSingleClusterFeatureEnabled,
     },
     { value: 3, label: '3 (highly available cluster)' },
     { value: 4, label: '4 (highly available cluster+)' },
     { value: 5, label: '5 (highly available cluster++)' },
-  ];
+  ].filter(({ hidden }) => !hidden);
 
   React.useEffect(() => {
     if (!field.value) {

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

@@ -3,19 +3,21 @@ import {
   Content,
   ContentVariants,
   Alert,
-  AlertVariant,
   Grid,
   FormGroup,
   Switch,
   Tooltip,
-  Stack,
-  StackItem,
 } from '@patternfly/react-core';
 
 import { CustomManifests } from './components/CustomManifests';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { CustomManifestFormState } from './components/propTypes';
-import { ClustersAPI, ClusterWizardStepHeader, isThirdPartyCNI } from '../../../../common';
+import {
+  ClustersAPI,
+  ClusterWizardStepHeader,
+  CustomManifestsAlert,
+  isThirdPartyCNI,
+} from '../../../../common';
 import { getFieldId } from '../../../../common/components/ui/formik';
 import { isOciPlatformType } from '../../utils';
 import DeleteCustomManifestModal from './DeleteCustomManifestModal';
@@ -90,46 +92,6 @@ export const CustomManifestsPage = ({
     ? 'Custom manifests are required when using a third-party CNI or Oracle Cloud Infrastructure.'
     : '';
 
-  const showExternalPlatformReminder = isOciPlatformType(cluster);
-  const showThirdPartyCnIReminder = isThirdPartyCNI(cluster.networkType);
-  const showCombinedReminder = showExternalPlatformReminder && showThirdPartyCnIReminder;
-  let reminderAlerts: React.ReactNode = null;
-  if (showCombinedReminder) {
-    reminderAlerts = (
-      <Stack>
-        <StackItem>
-          <Alert
-            variant={AlertVariant.info}
-            isInline
-            title="You're using an external platform and a third-party CNI"
-          >
-            Make sure to upload the required custom and CNI manifests in this step.
-          </Alert>
-        </StackItem>
-      </Stack>
-    );
-  } else if (showExternalPlatformReminder) {
-    reminderAlerts = (
-      <Stack>
-        <StackItem>
-          <Alert variant={AlertVariant.info} isInline title="You're using an external platform">
-            Make sure to upload the required custom manifests in this step.
-          </Alert>
-        </StackItem>
-      </Stack>
-    );
-  } else if (showThirdPartyCnIReminder) {
-    reminderAlerts = (
-      <Stack>
-        <StackItem>
-          <Alert variant={AlertVariant.info} isInline title="You're using a third-party CNI">
-            Make sure to upload the required CNI manifests in this step.
-          </Alert>
-        </StackItem>
-      </Stack>
-    );
-  }
-
   return (
     <Grid hasGutter>
       <Content>
@@ -157,7 +119,10 @@ export const CustomManifestsPage = ({
       {!useCustomManifests && <div style={{ minHeight: '250px' }} aria-hidden="true" />}
       {useCustomManifests && (
         <>
-          {reminderAlerts}
+          <CustomManifestsAlert
+            usesExternalPlatform={isOciPlatformType(cluster)}
+            usesThirdPartyCNI={isThirdPartyCNI(cluster.networkType)}
+          />
           <Alert
             isInline
             variant="warning"

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

@@ -9,7 +9,7 @@ import {
   getFormikErrorFields,
   getHostSubnets,
   HostSubnets,
-  IPV4_STACK,
+  SINGLE_STACK,
   isSNO,
   LoadingState,
   NetworkConfigurationValues,
@@ -262,7 +262,7 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
         if (values.vipDhcpAllocation) {
           delete params.apiVips;
           delete params.ingressVips;
-        } else if (values.stackType === IPV4_STACK) {
+        } else if (values.stackType === SINGLE_STACK) {
           // The API will rebuild the default machineNetwork
           params.machineNetworks = [];
         }

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

@@ -1,8 +1,6 @@
 import React from 'react';
 import { useField, useFormikContext } from 'formik';
 import {
-  Alert,
-  AlertVariant,
   Dropdown,
   DropdownItem,
   FormGroup,
@@ -12,7 +10,7 @@ import {
   StackItem,
   Tooltip,
 } from '@patternfly/react-core';
-import { getFieldId, ExternalLink } from '../../../../common/components/ui';
+import { getFieldId } from '../../../../common/components/ui';
 import {
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
@@ -25,7 +23,8 @@ import {
   NETWORK_TYPE_FEATURE_IDS,
   isThirdPartyCNI,
 } from '../../../../common/types/networkType';
-import { RED_HAT_CNI_SUPPORT_MATRIX_LINK } from '../../../../common/config/docs_links';
+import { useTranslation } from '../../../../common/hooks';
+import { ThirdPartyCNIBanner } from '../../../../common';
 
 export interface NetworkTypeDropDownProps {
   isDisabled?: boolean;
@@ -36,6 +35,7 @@ export const NetworkTypeDropDown = ({
   isDisabled = false,
   featureSupportLevelData,
 }: NetworkTypeDropDownProps) => {
+  const { t } = useTranslation();
   const [field, , { setValue }] = useField<string>('networkType');
   const [isOpen, setOpen] = React.useState(false);
   const { values } = useFormikContext<NetworkConfigurationValues>();
@@ -54,9 +54,9 @@ export const NetworkTypeDropDown = ({
     }
   }, [field.value, setValue, featureSupportLevelData, getFeatureDisabledReason]);
 
-  const currentDisplayValue = NETWORK_TYPE_LABELS[field.value];
+  const currentDisplayValue = NETWORK_TYPE_LABELS(t)[field.value];
 
-  const dropdownItems = Object.entries(NETWORK_TYPE_LABELS).map(([value, label]) => {
+  const dropdownItems = Object.entries(NETWORK_TYPE_LABELS(t)).map(([value, label]) => {
     const disabledReason = getFeatureDisabledReason(
       NETWORK_TYPE_FEATURE_IDS[value],
       featureSupportLevelData ?? undefined,
@@ -119,24 +119,7 @@ export const NetworkTypeDropDown = ({
           </Dropdown>
         </FormGroup>
       </StackItem>
-      {showThirdPartyBanner && (
-        <StackItem>
-          <Alert variant={AlertVariant.warning} isInline title="Third-party CNI">
-            <Stack hasGutter>
-              <StackItem>
-                Third-party CNIs require uploading CNI manifests. Please verify you have the
-                required manifests and that the chosen CNI is compatible with your platform and
-                OpenShift version.
-              </StackItem>
-              <StackItem>
-                <ExternalLink href={RED_HAT_CNI_SUPPORT_MATRIX_LINK}>
-                  Red Hat CNI Support Matrix
-                </ExternalLink>
-              </StackItem>
-            </Stack>
-          </Alert>
-        </StackItem>
-      )}
+      {showThirdPartyBanner && <ThirdPartyCNIBanner />}
     </Stack>
   );
 };

package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts

@@ -11,7 +11,7 @@ import {
   serviceNetworkValidationSchema,
   IPv4ValidationSchema,
   sshPublicKeyValidationSchema,
-  IPV4_STACK,
+  SINGLE_STACK,
   DUAL_STACK,
   vipArrayValidationSchema,
   NETWORK_TYPE_OVN,
@@ -50,7 +50,7 @@ export const getNetworkInitialValues = (
         : 'clusterManaged',
     networkType: cluster.networkType || NETWORK_TYPE_OVN,
     machineNetworks: cluster.machineNetworks || [],
-    stackType: isDualStackType ? DUAL_STACK : IPV4_STACK,
+    stackType: isDualStackType ? DUAL_STACK : SINGLE_STACK,
     clusterNetworks:
       cluster.clusterNetworks ||
       (isDualStackType
@@ -85,7 +85,8 @@ export const getNetworkConfigurationValidationSchema = (
         values.managedNetworkingType === 'userManaged'
           ? Yup.array()
           : machineNetworksValidationSchema.when('stackType', {
-              is: (stackType: NetworkConfigurationValues['stackType']) => stackType === IPV4_STACK,
+              is: (stackType: NetworkConfigurationValues['stackType']) =>
+                stackType === SINGLE_STACK,
               then: () => machineNetworksValidationSchema.concat(IPv4ValidationSchema),
               otherwise: () =>
                 values.machineNetworks && values.machineNetworks?.length >= 2
@@ -95,13 +96,13 @@ export const getNetworkConfigurationValidationSchema = (
                   : Yup.array(),
             }),
       clusterNetworks: clusterNetworksValidationSchema(t).when('stackType', {
-        is: (stackType: NetworkConfigurationValues['stackType']) => stackType === IPV4_STACK,
+        is: (stackType: NetworkConfigurationValues['stackType']) => stackType === SINGLE_STACK,
         then: (schema) => schema.concat(IPv4ValidationSchema),
         otherwise: (schema) =>
           schema.concat(dualStackValidationSchema('cluster network', t, openshiftVersion)),
       }),
       serviceNetworks: serviceNetworkValidationSchema(t).when('stackType', {
-        is: (stackType: NetworkConfigurationValues['stackType']) => stackType === IPV4_STACK,
+        is: (stackType: NetworkConfigurationValues['stackType']) => stackType === SINGLE_STACK,
         then: (schema) => schema.concat(IPv4ValidationSchema),
         otherwise: (schema) =>
           schema.concat(dualStackValidationSchema('service network', t, openshiftVersion)),

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Table, TableVariant, Tbody, Td, Tr } from '@patternfly/react-table';
 import { genericTableRowKey, getDefaultCpuArchitecture } from '../../../../common';
-import { getDiskEncryptionEnabledOnStatus } from '../../clusterDetail/ClusterProperties';
+import { getDiskEncryptionEnabledOnStatus } from './utils';
 import OpenShiftVersionDetail from '../../clusterDetail/OpenShiftVersionDetail';
 import { useNewFeatureSupportLevel } from '../../../../common/components/newFeatureSupportLevels';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';

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

@@ -1,8 +1,13 @@
 import { Title } from '@patternfly/react-core';
 import { Table, TableVariant, Tbody, Td, Tr } from '@patternfly/react-table';
 import React from 'react';
-import { genericTableRowKey, isDualStack, NETWORK_TYPE_LABELS } from '../../../../common';
-import { getManagementType, getStackTypeLabel } from '../../clusterDetail/ClusterProperties';
+import {
+  genericTableRowKey,
+  isDualStack,
+  NETWORK_TYPE_LABELS,
+  useTranslation,
+} from '../../../../common';
+import { getManagementType, getStackTypeLabel } from './utils';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 type ReviewTableRowsType = {
@@ -11,6 +16,7 @@ type ReviewTableRowsType = {
 }[];
 
 export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
+  const { t } = useTranslation();
   const rows = React.useMemo(() => {
     const networkRows = [
       {
@@ -197,13 +203,13 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
         cells: [
           { title: 'Networking type' },
           {
-            title: cluster.networkType ? NETWORK_TYPE_LABELS[cluster.networkType] : '-',
+            title: cluster.networkType ? NETWORK_TYPE_LABELS(t)[cluster.networkType] : '-',
             props: { 'data-testid': 'networking-type', colSpan: 2 },
           },
         ],
       },
     ] as ReviewTableRowsType;
-  }, [cluster]);
+  }, [cluster, t]);
 
   return (
     <>

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

@@ -19,9 +19,16 @@ import { ReviewCustomManifestsTable } from './ReviewCustomManifestsTable';
 import PlatformIntegrationNote from '../platformIntegration/PlatformIntegrationNote';
 import useClusterCustomManifests from '../../../hooks/useClusterCustomManifests';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { ListManifestsExtended } from '../manifestsConfiguration/data/dataTypes';
+
+const userProvidedManifests = (manifests: ListManifestsExtended | undefined) =>
+  (manifests ?? []).filter((m) => m.manifestSource !== 'system');
 
 export const ReviewSummaryContent = ({ cluster }: { cluster: Cluster }) => {
   const { customManifests } = useClusterCustomManifests(cluster.id, false);
+  const manifestsForReview = userProvidedManifests(customManifests);
+  const showCustomManifests = manifestsForReview.length > 0;
+
   return (
     <>
       <TableSummaryExpandable title={'Cluster details'} id={'cluster-details-expandable'}>
@@ -57,9 +64,9 @@ export const ReviewSummaryContent = ({ cluster }: { cluster: Cluster }) => {
         <ReviewNetworkingTable cluster={cluster} />
       </TableSummaryExpandable>
 
-      {customManifests && customManifests.length > 0 && (
+      {showCustomManifests && (
         <TableSummaryExpandable title={'Custom manifests'} id={'custom-manifests-expandable'}>
-          <ReviewCustomManifestsTable manifests={customManifests} />
+          <ReviewCustomManifestsTable manifests={manifestsForReview} />
         </TableSummaryExpandable>
       )}
     </>

package/lib/ocm/components/{clusterDetail/ClusterProperties.test.ts → clusterConfiguration/review/utils.test.ts}

@@ -1,5 +1,5 @@
 import { test, describe, expect } from 'vitest';
-import { getStackTypeLabel } from './ClusterProperties';
+import { getStackTypeLabel } from './utils';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 const createCluster = (overrides: Partial<Cluster> = {}): Cluster =>

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

@@ -0,0 +1,61 @@
+import React from 'react';
+import { isDualStack } from '../../../../common';
+import { Cluster, DiskEncryption } from '@openshift-assisted/types/assisted-installer-service';
+
+export const getManagementType = ({ userManagedNetworking }: Cluster): string =>
+  userManagedNetworking ? 'User-Managed networking' : 'Cluster-managed networking';
+
+export const getStackTypeLabel = (cluster: Cluster): string =>
+  isDualStack(cluster) ? 'Dual-stack' : 'IPv4';
+
+export const getDiskEncryptionEnabledOnStatus = (diskEncryption: DiskEncryption['enableOn']) => {
+  let diskEncryptionType = null;
+  switch (diskEncryption) {
+    case undefined:
+    case 'none':
+      break;
+    case 'all':
+      diskEncryptionType = (
+        <>
+          Enabled on control plane nodes
+          <br />
+          Enabled on workers
+        </>
+      );
+      break;
+    case 'masters':
+      diskEncryptionType = <>Enabled on control plane nodes</>;
+      break;
+    case 'workers':
+      diskEncryptionType = <>Enabled on workers</>;
+      break;
+    case 'arbiters':
+      diskEncryptionType = <>Enabled on arbiters</>;
+      break;
+    case 'masters,arbiters':
+      diskEncryptionType = <>Enabled on control plane nodes and arbiters</>;
+      break;
+    case 'masters,workers':
+      diskEncryptionType = <>Enabled on control plane nodes and workers</>;
+      break;
+    case 'arbiters,workers':
+      diskEncryptionType = <>Enabled on arbiters and workers</>;
+      break;
+    case 'masters,arbiters,workers':
+      diskEncryptionType = (
+        <>
+          Enabled on control plane nodes
+          <br />
+          Enabled on arbiters
+          <br />
+          Enabled on workers
+        </>
+      );
+      break;
+    default: {
+      const _exhaustive: never = diskEncryption;
+      return _exhaustive;
+    }
+  }
+  return diskEncryptionType;
+};

package/lib/ocm/components/clusterDetail/index.ts

@@ -2,4 +2,3 @@ export * from './utils';
 export { default as ClusterDetail } from './ClusterDetail';
 export { default as ClusterInstallationProgressCard } from './ClusterInstallationProgressCard';
 export { default as AssistedInstallerDetailCard } from './AssistedInstallerDetailCard';
-export { default as AssistedInstallerExtraDetailCard } from './AssistedInstallerExtraDetailCard';

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

@@ -123,8 +123,17 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
         managedDomains,
         ocpVersions,
         urlSearchParams: search,
+        isSingleClusterFeatureEnabled,
       }),
-    [infraEnv, cluster, pullSecret, managedDomains, ocpVersions, search],
+    [
+      infraEnv,
+      cluster,
+      pullSecret,
+      managedDomains,
+      ocpVersions,
+      search,
+      isSingleClusterFeatureEnabled,
+    ],
   );
 
   const { t } = useTranslation();

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

@@ -8,12 +8,16 @@ import {
 } from '../../../common';
 import { useFeature } from '../../hooks/use-feature';
 
-export const AssistedInstallerHeader = () => {
+type AssistedInstallerHeaderProps = {
+  clusterName?: string;
+};
+
+export const AssistedInstallerHeader = ({ clusterName }: AssistedInstallerHeaderProps) => {
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   return (
     <>
       <Content component="h1" className="pf-v6-u-display-inline">
-        Install OpenShift with the Assisted Installer
+        {clusterName || 'Install OpenShift with the Assisted Installer'}
       </Content>
       {isSingleClusterFeatureEnabled && <TechnologyPreview />}
       <Split hasGutter>

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

@@ -104,7 +104,7 @@ const ClusterPageGeneric = ({
           {showBreadcrumbs && <ClusterBreadcrumbs clusterName={cluster.name} />}
           {showBreadcrumbs && (
             <PageSection hasBodyWrapper={false}>
-              <AssistedInstallerHeader />
+              <AssistedInstallerHeader clusterName={cluster.name} />
             </PageSection>
           )}
 

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

@@ -229,7 +229,7 @@ export const getNewFeatureDisabledReason = (
     }
     case 'USER_MANAGED_NETWORKING': {
       if (!isSupported) {
-        return `User-Managed Networking is not supported when using ${
+        return `User-Managed networking is not supported when using ${
           platformType ? ExternalPlatformLabels[platformType] : ''
         }`;
       }