@openshift-assisted/ui-lib 2.48.6 → 2.49.0

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentHostsDiscoveryStep.tsx → hostDiscovery/ClusterDeploymentHostsDiscoveryStep.tsx}

@@ -12,17 +12,17 @@ import {
   useWizardContext,
 } from '@patternfly/react-core';
 
-import { Alerts, ClusterWizardStepHeader } from '../../../common';
-import { ClusterDeploymentHostsDiscoveryStepProps } from './types';
+import { Alerts, ClusterWizardStepHeader } from '../../../../common';
+import { ClusterDeploymentHostsDiscoveryStepProps } from '../types';
 import ClusterDeploymentHostsDiscovery from './ClusterDeploymentHostsDiscovery';
-import { getAgentsHostsNames, isAgentOfInfraEnv } from './helpers';
-import { getIsSNOCluster, getWizardStepAgentStatus } from '../helpers';
-import { canNextFromHostDiscoveryStep } from './wizardTransition';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { ValidationSection } from './components/ValidationSection';
-import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
+import { getAgentsHostsNames, isAgentOfInfraEnv } from '../helpers';
+import { getIsSNOCluster, getWizardStepAgentStatus } from '../../helpers';
+import { canNextFromHostDiscoveryStep } from '../wizardTransition';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { ValidationSection } from '../components/ValidationSection';
+import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
 
-const ClusterDeploymentHostsDiscoveryStep = ({
+export const ClusterDeploymentHostsDiscoveryStep = ({
   agentClusterInstall,
   agents: allAgents,
   infraEnv,
@@ -174,7 +174,7 @@ const ClusterDeploymentHostsDiscoveryStep = ({
       {!!syncError && (
         <GridItem>
           <ValidationSection currentStepId={'hosts-selection'} hosts={[]}>
-            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
               {syncError}
             </Alert>
           </ValidationSection>
@@ -183,4 +183,3 @@ const ClusterDeploymentHostsDiscoveryStep = ({
     </Grid>
   );
 };
-export default ClusterDeploymentHostsDiscoveryStep;

package/lib/cim/components/ClusterDeployment/hostDiscovery/index.tsx

@@ -0,0 +1 @@
+export * from './ClusterDeploymentHostsDiscoveryStep';

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentHostSelectionStep.tsx → hostSelection/ClusterDeploymentHostSelectionStep.tsx}

@@ -10,28 +10,28 @@ import {
   useWizardFooter,
   WizardFooter,
 } from '@patternfly/react-core';
-import { Alerts, ClusterWizardStepHeader, useAlerts } from '../../../common';
+import { Alerts, ClusterWizardStepHeader, useAlerts } from '../../../../common';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
-} from '../../types';
+} from '../../../types';
 import ClusterDeploymentHostsSelection from './ClusterDeploymentHostsSelection';
 import {
   ClusterDeploymentHostSelectionStepProps,
   ClusterDeploymentHostsSelectionValues,
-} from './types';
-import { hostCountValidationSchema } from './validationSchemas';
+} from '../types';
+import { hostCountValidationSchema } from '../validationSchemas';
 import {
   getAgentSelectorFieldsFromAnnotations,
   getIsSNOCluster,
   getWizardStepAgentStatus,
-} from '../helpers';
-import { canNextFromHostSelectionStep } from './wizardTransition';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+} from '../../helpers';
+import { canNextFromHostSelectionStep } from '../wizardTransition';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { TFunction } from 'i18next';
-import { ValidationSection } from './components/ValidationSection';
-import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
+import { ValidationSection } from '../components/ValidationSection';
+import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
 
 const getInitialValues = ({
   agents,
@@ -45,9 +45,12 @@ const getInitialValues = ({
   const isSNOCluster = getIsSNOCluster(agentClusterInstall);
   const cdName = clusterDeployment?.metadata?.name;
   const cdNamespace = clusterDeployment?.metadata?.namespace;
+
   let hostCount =
     (agentClusterInstall?.spec?.provisionRequirements?.controlPlaneAgents || 0) +
+    (agentClusterInstall?.spec?.provisionRequirements?.arbiterAgents || 0) +
     (agentClusterInstall?.spec?.provisionRequirements?.workerAgents || 0);
+
   if (isSNOCluster) {
     hostCount = 1;
   } else if (hostCount === 2 || hostCount === 0) {
@@ -255,7 +258,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   const errorsSection = (
     <ValidationSection currentStepId={'cluster-details'} hosts={[]}>
       {syncError && (
-        <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+        <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
           {syncError}
         </Alert>
       )}
@@ -310,6 +313,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
           onAutoSelectChange={onAutoSelectChange}
           onHostSelect={onHostSelect}
           isNutanix={isNutanix}
+          hostsBinding={nextRequested && !showClusterErrors}
         />
       </GridItem>
       {(showClusterErrors || showFormErrors) && !!alerts.length && (
@@ -334,10 +338,9 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   );
 };
 
-const ClusterDeploymentHostSelectionStep: React.FC<ClusterDeploymentHostSelectionStepProps> = ({
-  onSaveHostsSelection,
-  ...rest
-}) => {
+export const ClusterDeploymentHostSelectionStep: React.FC<
+  ClusterDeploymentHostSelectionStepProps
+> = ({ onSaveHostsSelection, ...rest }) => {
   const { t } = useTranslation();
 
   const { addAlert } = useAlerts();
@@ -377,5 +380,3 @@ const ClusterDeploymentHostSelectionStep: React.FC<ClusterDeploymentHostSelectio
     </Formik>
   );
 };
-
-export default ClusterDeploymentHostSelectionStep;

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentHostsSelection.tsx → hostSelection/ClusterDeploymentHostsSelection.tsx}

@@ -1,21 +1,36 @@
 import React from 'react';
 import { useFormikContext } from 'formik';
 import { Grid, GridItem, Content, Form } from '@patternfly/react-core';
-import { SwitchField } from '../../../common';
+import { SwitchField } from '../../../../common';
 import {
   ClusterDeploymentHostsSelectionProps,
   ClusterDeploymentHostsSelectionValues,
-} from './types';
+} from '../types';
 import ClusterDeploymentHostsSelectionBasic from './ClusterDeploymentHostsSelectionBasic';
-import ClusterDeploymentHostsSelectionAdvanced from './ClusterDeploymentHostsSelectionAdvanced';
+import { ClusterDeploymentHostsSelectionAdvanced } from './ClusterDeploymentHostsSelectionAdvanced';
 import {
   getAgentsForSelection,
   getClusterDeploymentCpuArchitecture,
   getIsSNOCluster,
-} from '../helpers';
-import MinimalHWRequirements from '../Agent/MinimalHWRequirements';
-import NoAgentsAlert from '../Agent/NoAgentsAlert';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+  getIsTNACluster,
+} from '../../helpers';
+import MinimalHWRequirements from '../../Agent/MinimalHWRequirements';
+import NoAgentsAlert from '../../Agent/NoAgentsAlert';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { TFunction } from 'i18next';
+
+const getHostRequirementText = (isSNO: boolean, isTNA: boolean, t: TFunction) => {
+  if (isSNO) {
+    return t(
+      'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
+    );
+  } else if (isTNA) {
+    return t(
+      'ai:Exactly 2 hosts capable of functioning as control plane nodes, and one arbiter, are required.',
+    );
+  }
+  return t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.');
+};
 
 const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionProps> = ({
   agentClusterInstall,
@@ -27,17 +42,20 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
   onHostSelect,
   onSetInstallationDiskId,
   isNutanix,
+  hostsBinding,
 }) => {
+  const { t } = useTranslation();
   const { values } = useFormikContext<ClusterDeploymentHostsSelectionValues>();
   const { autoSelectHosts } = values;
   const isSNOCluster = getIsSNOCluster(agentClusterInstall);
+  const isTNA = getIsTNACluster(agentClusterInstall);
 
   const cdName = clusterDeployment?.metadata?.name;
   const cdNamespace = clusterDeployment?.metadata?.namespace;
   const cpuArchitecture = getClusterDeploymentCpuArchitecture(clusterDeployment);
 
   const availableAgents = React.useMemo(() => {
-    const filtered = getAgentsForSelection(agents).filter(
+    const filtered = getAgentsForSelection(agents, hostsBinding).filter(
       (agent) =>
         (agent.spec.clusterDeploymentName?.name === cdName &&
           agent.spec.clusterDeploymentName?.namespace === cdNamespace) ||
@@ -45,22 +63,20 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
           !agent.spec.clusterDeploymentName?.namespace &&
           agent.status?.inventory.cpu?.architecture === cpuArchitecture),
     );
+
     return isNutanix
       ? filtered.filter((a) => a.status?.inventory?.systemVendor?.manufacturer === 'Nutanix')
       : filtered;
-  }, [agents, cdNamespace, cdName, cpuArchitecture, isNutanix]);
-  const { t } = useTranslation();
+  }, [agents, hostsBinding, isNutanix, cdName, cdNamespace, cpuArchitecture]);
+
+  const hostRequirementText = getHostRequirementText(isSNOCluster, isTNA, t);
+
   return (
     <Grid hasGutter>
       <GridItem>
-        <Content>
-          {isSNOCluster
-            ? t(
-                'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
-              )
-            : t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.')}
-        </Content>
+        <Content>{hostRequirementText}</Content>
       </GridItem>
+
       {aiConfigMap && (
         <GridItem>
           <MinimalHWRequirements aiConfigMap={aiConfigMap} isSNOCluster={isSNOCluster} />

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentHostsSelectionAdvanced.tsx → hostSelection/ClusterDeploymentHostsSelectionAdvanced.tsx}

@@ -4,15 +4,15 @@ import React from 'react';
 import Measure from 'react-measure';
 import { Alert, AlertVariant, Grid, GridItem } from '@patternfly/react-core';
 
-import { AgentK8sResource } from '../../types';
-import { AGENT_LOCATION_LABEL_KEY, AGENT_NOLOCATION_VALUE } from '../common';
-import LocationsSelector from './LocationsSelector';
-import { ClusterDeploymentHostsSelectionValues, ScaleUpFormValues } from './types';
-import LabelsSelector, { infraEnvLabelKeys } from './LabelsSelector';
-import AgentsSelectionTable from '../Agent/AgentsSelectionTable';
-import { AgentTableActions } from './types';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { CpuArchitecture } from '../../../common';
+import { AgentK8sResource } from '../../../types';
+import { AGENT_LOCATION_LABEL_KEY, AGENT_NOLOCATION_VALUE } from '../../common';
+import LocationsSelector from '../LocationsSelector';
+import { ClusterDeploymentHostsSelectionValues, ScaleUpFormValues } from '../types';
+import LabelsSelector, { infraEnvLabelKeys } from '../LabelsSelector';
+import AgentsSelectionTable from '../../Agent/AgentsSelectionTable';
+import { AgentTableActions } from '../types';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { CpuArchitecture } from '../../../../common';
 
 type ClusterDeploymentHostsSelectionAdvancedProps = {
   availableAgents: AgentK8sResource[];
@@ -25,7 +25,7 @@ type ClusterDeploymentHostsSelectionAdvancedProps = {
 
 type FormValues = ClusterDeploymentHostsSelectionValues | ScaleUpFormValues;
 
-const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
+export const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
   availableAgents,
   onEditRole,
   onSetInstallationDiskId,
@@ -103,5 +103,3 @@ const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
     </>
   );
 };
-
-export default ClusterDeploymentHostsSelectionAdvanced;

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentHostsSelectionBasic.tsx → hostSelection/ClusterDeploymentHostsSelectionBasic.tsx}

@@ -1,15 +1,15 @@
 import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
-import { CheckboxField, NumberInputField } from '../../../common';
-import { HOSTS_MAX_COUNT, HOSTS_MIN_COUNT } from './constants';
+import { CheckboxField, NumberInputField } from '../../../../common';
+import { HOSTS_MAX_COUNT, HOSTS_MIN_COUNT } from '../constants';
 import { useFormikContext } from 'formik';
-import { ClusterDeploymentHostsSelectionValues } from './types';
-import LocationsSelector from './LocationsSelector';
-import { AgentK8sResource } from '../../types';
-import AgentsSelectionHostCountAlerts from '../Agent/AgentsSelectionHostCountAlerts';
-import AgentsSelectionHostCountLabelIcon from '../Agent/AgentsSelectionHostCountLabelIcon';
-import { useAgentsAutoSelection } from '../Agent/AgentsSelectionUtils';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ClusterDeploymentHostsSelectionValues } from '../types';
+import LocationsSelector from '../LocationsSelector';
+import { AgentK8sResource } from '../../../types';
+import AgentsSelectionHostCountAlerts from '../../Agent/AgentsSelectionHostCountAlerts';
+import AgentsSelectionHostCountLabelIcon from '../../Agent/AgentsSelectionHostCountLabelIcon';
+import { useAgentsAutoSelection } from '../../Agent/AgentsSelectionUtils';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 
 type ClusterDeploymentHostsSelectionBasicProps = {
   availableAgents: AgentK8sResource[];

package/lib/cim/components/ClusterDeployment/hostSelection/index.tsx

@@ -0,0 +1,2 @@
+export * from './ClusterDeploymentHostSelectionStep';
+export * from './ClusterDeploymentHostsSelectionAdvanced';

package/lib/cim/components/ClusterDeployment/index.ts

@@ -1,6 +1,6 @@
 export * from './types';
 export * from './helpers';
-export * from './AdditionalNTPSourcesDialogToggle';
+export * from './components';
 export * from './LogsDownloadButton';
 export * from './wizardTransition';
 export * from './networkConfigurationValidation';
@@ -13,6 +13,6 @@ export { default as ClusterDeploymentCredentials } from './ClusterDeploymentCred
 export { default as ClusterDeploymentKubeconfigDownload } from './ClusterDeploymentKubeconfigDownload';
 export { default as ClusterInstallationError } from './ClusterInstallationError';
 export { default as NetworkConfiguration } from './NetworkConfiguration';
-export { default as ACMClusterDeploymentDetailsStep } from './ACMClusterDeploymentDetailsStep';
 
 export { getTotalCompute } from './ShortCapacitySummary';
+export { ACMClusterDeploymentDetailsStep } from './clusterDetails';

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentHostsNetworkTable.tsx → networking/ClusterDeploymentHostsNetworkTable.tsx}

@@ -1,26 +1,26 @@
 import * as React from 'react';
 import { ConnectedIcon } from '@patternfly/react-icons/dist/js/icons/connected-icon';
-import { EmptyState } from '../../../common';
-import { AgentTableActions } from './types';
+import { EmptyState } from '../../../../common';
+import { AgentTableActions } from '../types';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
-} from '../../types';
-import { getAICluster, getIsSNOCluster } from '../helpers';
-import { AdditionalNTPSourcesDialogToggle } from './AdditionalNTPSourcesDialogToggle';
-import { agentStatusColumn, useAgentsTable } from '../Agent/tableUtils';
-import HostsTable from '../../../common/components/hosts/HostsTable';
-import { HostDetail } from '../../../common/components/hosts/HostRowDetail';
+} from '../../../types';
+import { getAICluster, getIsSNOCluster } from '../../helpers';
+import { AdditionalNTPSourcesDialogToggle } from '../components/AdditionalNTPSourcesDialogToggle';
+import { agentStatusColumn, useAgentsTable } from '../../Agent/tableUtils';
+import HostsTable from '../../../../common/components/hosts/HostsTable';
+import { HostDetail } from '../../../../common/components/hosts/HostRowDetail';
 import {
   activeNICColumn,
   hostnameColumn,
   roleColumn,
-} from '../../../common/components/hosts/tableUtils';
-import { usePagination } from '../../../common/components/hosts/usePagination';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+} from '../../../../common/components/hosts/tableUtils';
+import { usePagination } from '../../../../common/components/hosts/usePagination';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
-import { agentStatus } from '../helpers/agentStatus';
+import { agentStatus } from '../../helpers/agentStatus';
 
 type ExpandComponentContextType = {
   onSetInstallationDiskId?: ClusterDeploymentHostsNetworkTableProps['onSetInstallationDiskId'];

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentNetworkingForm.tsx → networking/ClusterDeploymentNetworkingForm.tsx}

@@ -19,25 +19,21 @@ import {
   SecurityFields,
   ProxyFields,
   ProxyInputFields,
-} from '../../../common';
-import NetworkConfiguration from './NetworkConfiguration';
+} from '../../../../common';
+import NetworkConfiguration from '../NetworkConfiguration';
 import ClusterDeploymentHostsNetworkTable from './ClusterDeploymentHostsNetworkTable';
-import { getAICluster, getIsSNOCluster } from '../helpers';
+import { getAICluster, getIsSNOCluster } from '../../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   InfraEnvK8sResource,
-} from '../../types';
-import { AgentTableActions, ClusterDeploymentNetworkingValues } from './types';
+} from '../../../types';
+import { AgentTableActions, ClusterDeploymentNetworkingValues } from '../types';
 import { useFormikContext } from 'formik';
-import { getGridSpans } from './helpers';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { getGridSpans } from '../helpers';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { Trans } from 'react-i18next';
-import { ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
-
-// TODO(mlibra): So far a constant. Should be queried from somewhere.
-export const defaultNetworkSettings: ClusterDefaultConfig = CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4;
 
 type ClusterDeploymentNetworkingFormProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -137,7 +133,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
                 cluster={cluster}
                 hostSubnets={hostSubnets}
                 isVipDhcpAllocationDisabled
-                defaultNetworkSettings={defaultNetworkSettings}
+                defaultNetworkSettings={CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4}
                 hideManagedNetworking={getIsSNOCluster(agentClusterInstall) || isNutanix}
               />
             </GridItem>
@@ -158,7 +154,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
           )}
         </StackItem>
         <StackItem>
-          <SecurityFields clusterSshKey={cluster.sshPublicKey} />
+          <SecurityFields clusterSshKey={cluster.sshPublicKey} allowMultipleKeys={true} />
         </StackItem>
         <StackItem>
           <Content component="h2">{t('ai:Host inventory')}</Content>

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentNetworkingStep.tsx → networking/ClusterDeploymentNetworkingStep.tsx}

@@ -17,21 +17,21 @@ import {
   getFormikErrorFields,
   clusterFieldLabels,
   Alerts,
-} from '../../../common';
+} from '../../../../common';
 
 import {
   ClusterDeploymentDetailsNetworkingProps,
   AgentTableActions,
   ClusterDeploymentNetworkingValues,
-} from './types';
+} from '../types';
 import ClusterDeploymentNetworkingForm from './ClusterDeploymentNetworkingForm';
-import { isAgentOfCluster } from './helpers';
-import { useInfraEnvProxies, useNetworkingFormik } from './use-networking-formik';
-import { canNextFromNetworkingStep } from './wizardTransition';
-import { AgentK8sResource } from '../../types';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { ValidationSection } from './components/ValidationSection';
-import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
+import { isAgentOfCluster } from '../helpers';
+import { useInfraEnvProxies, useNetworkingFormik } from '../use-networking-formik';
+import { canNextFromNetworkingStep } from '../wizardTransition';
+import { AgentK8sResource } from '../../../types';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { ValidationSection } from '../components/ValidationSection';
+import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
 
 type NetworkingFormProps = {
   clusterDeployment: ClusterDeploymentDetailsNetworkingProps['clusterDeployment'];
@@ -200,7 +200,7 @@ export const NetworkingForm = ({
         {syncError && (
           <GridItem>
             <ValidationSection currentStepId={'networking'} hosts={[]}>
-              <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+              <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
                 {syncError}
               </Alert>
             </ValidationSection>
@@ -212,7 +212,7 @@ export const NetworkingForm = ({
   );
 };
 
-const ClusterDeploymentNetworkingStep = ({
+export const ClusterDeploymentNetworkingStep = ({
   clusterDeployment,
   agentClusterInstall,
   agents,
@@ -261,5 +261,3 @@ const ClusterDeploymentNetworkingStep = ({
     </Formik>
   );
 };
-
-export default ClusterDeploymentNetworkingStep;

package/lib/cim/components/ClusterDeployment/networking/index.tsx

@@ -0,0 +1 @@
+export * from './ClusterDeploymentNetworkingStep';

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentReviewStep.tsx → review/ClusterDeploymentReviewStep.tsx}

@@ -8,14 +8,14 @@ import {
   WizardFooter,
 } from '@patternfly/react-core';
 import * as React from 'react';
-import { canNextFromReviewStep } from './wizardTransition';
+import { canNextFromReviewStep } from '../wizardTransition';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   ClusterImageSetK8sResource,
   InfraEnvK8sResource,
-} from '../../types';
+} from '../../../types';
 import {
   ClusterWizardStepHeader,
   DetailList,
@@ -24,18 +24,25 @@ import {
   ClusterValidations,
   HostsValidations,
   useAlerts,
-} from '../../../common';
-import { getSelectedVersion, getAICluster, getClusterDeploymentCpuArchitecture } from '../helpers';
-import { isAgentOfCluster } from './helpers';
-import { wizardStepNames } from './constants';
+  getPlatforms,
+} from '../../../../common';
+import {
+  getSelectedVersion,
+  getAICluster,
+  getClusterDeploymentCpuArchitecture,
+} from '../../helpers';
+import { isAgentOfCluster } from '../helpers';
+import { wizardStepNames } from '../constants';
 import {
   wizardStepsValidationsMap,
   ClusterWizardStepsType,
   allClusterWizardSoftValidationIds,
-} from './wizardTransition';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
-import { ValidationSection } from './components/ValidationSection';
+} from '../wizardTransition';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
+import { ReviewConfigMapsTable } from './ReviewConfigMapsTable';
+import { ValidationSection } from '../components/ValidationSection';
+import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 
 type ClusterDeploymentReviewStepProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -47,7 +54,7 @@ type ClusterDeploymentReviewStepProps = {
   infraEnv?: InfraEnvK8sResource;
 };
 
-const ClusterDeploymentReviewStep = ({
+export const ClusterDeploymentReviewStep = ({
   agentClusterInstall,
   agents,
   onFinish,
@@ -77,7 +84,7 @@ const ClusterDeploymentReviewStep = ({
       await onFinish();
     } catch (err) {
       const error = err as Error;
-      addAlert({ title: error.message || t('ai:An error occured while starting installation.') });
+      addAlert({ title: error.message || t('ai:An error occurred while starting installation.') });
     } finally {
       setSubmitting(false);
     }
@@ -97,6 +104,10 @@ const ClusterDeploymentReviewStep = ({
   useWizardFooter(footer);
 
   const openShiftVersion = getSelectedVersion(clusterImages, agentClusterInstall);
+  const platform =
+    getPlatforms(t)[
+      (agentClusterInstall?.spec?.platformType?.toLowerCase() || 'baremetal') as PlatformType
+    ];
 
   const cluster = React.useMemo(
     () => getAICluster({ clusterDeployment, agentClusterInstall, agents: clusterAgents }),
@@ -127,6 +138,11 @@ const ClusterDeploymentReviewStep = ({
             value={cpuArchitecture}
             testId="cpu-architecture"
           />
+          <DetailItem
+            title={t('ai:External partner platform')}
+            value={platform}
+            testId="platform-type"
+          />
           <DetailItem
             title={t('ai:API IP')}
             value={agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP}
@@ -143,6 +159,13 @@ const ClusterDeploymentReviewStep = ({
             value={<ReviewHostsInventory hosts={cluster.hosts} />}
           />
 
+          {!!agentClusterInstall.spec?.manifestsConfigMapRefs?.length ? (
+            <DetailItem
+              title={t('ai:Custom manifests')}
+              value={<ReviewConfigMapsTable agentClusterInstall={agentClusterInstall} />}
+            />
+          ) : undefined}
+
           <DetailItem
             title={t('ai:Cluster validations')}
             value={
@@ -173,7 +196,7 @@ const ClusterDeploymentReviewStep = ({
       {syncError && (
         <GridItem>
           <ValidationSection currentStepId={'review'} hosts={[]}>
-            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
               {syncError}
             </Alert>
           </ValidationSection>
@@ -182,5 +205,3 @@ const ClusterDeploymentReviewStep = ({
     </Grid>
   );
 };
-
-export default ClusterDeploymentReviewStep;

package/lib/cim/components/ClusterDeployment/review/ReviewConfigMapsTable.tsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import { useConfigMaps } from '../../../hooks';
+import { Table, TableVariant, Tbody, Td, Tr } from '@patternfly/react-table';
+import { genericTableRowKey, LoadingState } from '../../../../common';
+import { AgentClusterInstallK8sResource } from '../../../types';
+
+export const ReviewConfigMapsTable = ({
+  agentClusterInstall,
+}: {
+  agentClusterInstall: AgentClusterInstallK8sResource;
+}) => {
+  const [configMaps, loaded] = useConfigMaps({
+    namespace: agentClusterInstall.metadata?.namespace,
+    isList: true,
+  });
+
+  const customManifests = React.useMemo(() => {
+    const maps = configMaps.filter((configMap) =>
+      agentClusterInstall.spec?.manifestsConfigMapRefs
+        ?.flatMap((ref) => ref.name)
+        .includes(configMap.metadata?.name || ''),
+    );
+
+    return maps
+      .map((map, index) => [
+        {
+          rowId: `config-map-${index}`,
+          cells: [{ title: map.metadata?.name as string, isExpanded: true, level: 1, posInset: 1 }],
+        },
+        ...Object.keys(map.data || {}).map((key) => ({
+          rowId: `config-map-${index}-${key}`,
+          cells: [
+            {
+              title: (
+                <>
+                  <span style={{ width: '1rem', display: 'inline-block' }} />
+                  {key}
+                </>
+              ),
+              posInset: 2,
+              level: 2,
+            },
+          ],
+        })),
+      ])
+      .flat();
+  }, [agentClusterInstall.spec?.manifestsConfigMapRefs, configMaps]);
+
+  return loaded ? (
+    <Table
+      variant={TableVariant.compact}
+      borders={false}
+      data-testid="review-custom-manifests-table"
+    >
+      <Tbody>
+        {customManifests.map((row, i) => (
+          <Tr key={genericTableRowKey(row.rowId)}>
+            {row.cells.map(({ title, ...props }, j) => (
+              <Td key={`cell-${i}-${j}`} {...props}>
+                {title}
+              </Td>
+            ))}
+          </Tr>
+        ))}
+      </Tbody>
+    </Table>
+  ) : (
+    <LoadingState />
+  );
+};