Decouple InfraEnv Details and Create Page

Author: rawagner

libs/locales/lib/en/translation.json

@@ -55,7 +55,7 @@ describe(`Assisted Installer Storage Step`, () => {
 
       storageForm.diskFormattingAlert.title.should(
         'contain.text',
-        'Warning alert:All bootable disks, except for read-only disks, will be formatted during installation. Make sure to back up any critical data before proceeding.',
+        'Warning alert:All bootable disks, except for read-only disks, will be formatted during installation. Make sure to back up any sensitive data before proceeding.',
       );
     });
 

libs/ui-lib-tests/cypress/integration/storage/storage-step-disk-holders.cy.ts

@@ -53,9 +53,13 @@ import {
   AGENT_BMH_NAME_LABEL_KEY,
   BMH_HOSTNAME_ANNOTATION,
   INFRAENV_AGENTINSTALL_LABEL_KEY,
-} from '../common';
+} from '../common/constants';
 import { getErrorMessage } from '../../../common/utils';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { getBareMetalHostCredentialsSecret } from '../modals/utils';
+import { k8sCreate, k8sPatch, Patch } from '@openshift-console/dynamic-plugin-sdk';
+import { appendPatch } from '../../utils';
+import { BMHModel, NMStateModel, SecretModel } from '../../types/models';
 
 type MacMappingFieldProps = { macAddress: string; name: string }[];
 
@@ -232,8 +236,100 @@ const getInitValues = (
   return values;
 };
 
+export const onCreateBMH = async ({
+  values,
+  infraEnv,
+  nmState,
+  secret,
+  bmh,
+}: {
+  values: AddBmcValues;
+  infraEnv: InfraEnvK8sResource;
+  nmState?: NMStateK8sResource;
+  secret?: SecretK8sResource;
+  bmh?: BareMetalHostK8sResource;
+}) => {
+  let newSecret: SecretK8sResource | undefined = undefined;
+  if (secret) {
+    const patches: Patch[] = [];
+    appendPatch(patches, '/data/username', btoa(values.username), secret.data?.username);
+    appendPatch(patches, '/data/password', btoa(values.password), secret.data?.password);
+    if (patches.length) {
+      await k8sPatch({
+        model: SecretModel,
+        resource: secret,
+        data: patches,
+      });
+    }
+  } else {
+    const secret = getBareMetalHostCredentialsSecret(values, bmh?.metadata?.namespace || '');
+    newSecret = await k8sCreate<SecretK8sResource>({
+      model: SecretModel,
+      data: secret,
+    });
+  }
+
+  const formNMState = values.nmState ? getNMState(values, infraEnv) : undefined;
+  if (nmState) {
+    const patches: Patch[] = [];
+    appendPatch(patches, '/spec/config', formNMState?.spec?.config, nmState.spec?.config);
+    appendPatch(
+      patches,
+      '/spec/interfaces',
+      nmState?.spec?.interfaces || [],
+      nmState.spec?.interfaces,
+    );
+    if (patches.length) {
+      await k8sPatch({
+        model: NMStateModel,
+        resource: nmState,
+        data: patches,
+      });
+    }
+  } else if (formNMState) {
+    await k8sCreate({
+      model: NMStateModel,
+      data: formNMState,
+    });
+  }
+
+  if (bmh) {
+    const patches: Patch[] = [];
+    appendPatch(
+      patches,
+      `/metadata/annotations/${BMH_HOSTNAME_ANNOTATION.replace('/', '~1')}`,
+      values.hostname,
+      bmh.metadata?.annotations?.[BMH_HOSTNAME_ANNOTATION],
+    );
+    appendPatch(patches, '/spec/bmc/address', values.bmcAddress, bmh.spec?.bmc?.address);
+    appendPatch(
+      patches,
+      '/spec/bmc/disableCertificateVerification',
+      values.disableCertificateVerification,
+      bmh.spec?.bmc?.disableCertificateVerification,
+    );
+    appendPatch(patches, '/spec/bootMACAddress', values.bootMACAddress, bmh.spec?.bootMACAddress);
+    appendPatch(patches, '/spec/online', values.online, bmh.spec?.online);
+
+    if (newSecret) {
+      appendPatch(
+        patches,
+        '/spec/bmc/credentialsName',
+        newSecret.metadata?.name,
+        bmh.spec?.bmc?.credentialsName,
+      );
+    }
+    if (patches.length) {
+      await k8sPatch({
+        model: BMHModel,
+        resource: bmh,
+        data: patches,
+      });
+    }
+  }
+};
+
 const BMCForm: React.FC<BMCFormProps> = ({
-  onCreateBMH,
   onClose,
   hasDHCP,
   infraEnv,
@@ -249,7 +345,13 @@ const BMCForm: React.FC<BMCFormProps> = ({
     try {
       setError(undefined);
       const nmState = values.nmState ? getNMState(values, infraEnv) : undefined;
-      await onCreateBMH(values, nmState);
+      await onCreateBMH({
+        values,
+        infraEnv,
+        nmState,
+        secret,
+        bmh,
+      });
       onClose();
     } catch (e) {
       setError(getErrorMessage(e));

libs/ui-lib/lib/cim/components/Agent/BMCForm.tsx

@@ -188,7 +188,6 @@ export const agentStatusColumn = ({
 export const clusterColumn = (
   agents: AgentK8sResource[],
   agentMachines: AgentMachineK8sResource[],
-  getClusterDeploymentLink: (cd: { name: string; namespace: string }) => string,
   t: TFunction,
 ): TableRow<Host> => {
   return {
@@ -215,10 +214,10 @@ export const clusterColumn = (
           if (nodePool) {
             const hcNamespace = nodePool.split('/')[0];
             const hcName = agent.spec.clusterDeploymentName.name;
-            cdLink = getClusterDeploymentLink({ name: hcName, namespace: hcNamespace });
+            cdLink = `/multicloud/infrastructure/clusters/details/${hcNamespace}/${hcName}`;
           }
         } else {
-          cdLink = getClusterDeploymentLink(agent.spec.clusterDeploymentName);
+          cdLink = `/multicloud/infrastructure/clusters/details/${agent.spec.clusterDeploymentName.namespace}/${agent.spec.clusterDeploymentName.name}`;
         }
       }
       return {
@@ -429,7 +428,7 @@ export const useAgentsTable = (
           ? (host: Host) => {
               const agent = agents.find((a) => a.metadata?.uid === host.id);
               const bmh = bmhs?.find((a) => a.metadata?.uid === host.id);
-              return onDeleteHost(agent, bmh);
+              return onDeleteHost({ agent, bmh });
             }
           : undefined,
         canDelete: (host: Host) => {

libs/ui-lib/lib/cim/components/Agent/tableUtils.tsx

@@ -17,8 +17,6 @@ export type AddBmcValues = {
 
 export type BMCFormProps = {
   onClose: VoidFunction;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  onCreateBMH: (values: AddBmcValues, nmState?: NMStateK8sResource) => Promise<any>;
   hasDHCP: boolean;
   infraEnv: InfraEnvK8sResource;
   usedHostnames: string[];

libs/ui-lib/lib/cim/components/Agent/types.ts

@@ -24,6 +24,7 @@ import {
   ChangeHostnameAction,
   MassChangeHostnameModal,
   TableToolbar,
+  LoadingState,
 } from '../../../common';
 import { ClusterDeploymentHostDiscoveryTableProps } from '../ClusterDeployment/types';
 import MassApproveAgentModal from '../modals/MassApproveAgentModal';
@@ -34,25 +35,47 @@ import { ExpandComponent } from '../Agent/AgentsSelectionTable';
 import { HostsTableDetailContextProvider } from '../../../common/components/hosts/HostsTableDetailContext';
 import { agentStatus, bmhStatus } from '../helpers/agentStatus';
 import { onAgentChangeHostname } from '../helpers';
+import {
+  AgentClusterInstallK8sResource,
+  AgentK8sResource,
+  BareMetalHostK8sResource,
+} from '../../types';
+import DeleteHostModal from '../modals/DeleteHostModal';
+import { useInfraEnvNMStates } from '../../hooks/useInfraEnvNMStates';
+import { AgentClusterInstallModel } from '../../types/models';
+import { useParams } from 'react-router-dom-v5-compat';
+import { useK8sWatchResource } from '../../hooks/useK8sWatchResource';
 
 const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscoveryTableProps> = ({
   agents,
   bareMetalHosts,
   infraEnv,
-  onApprove,
-  onChangeHostname,
-  onChangeBMHHostname,
   onEditRole,
   onSetInstallationDiskId,
   onEditHost,
   onEditBMH,
-  onDeleteHost,
   width,
 }) => {
+  const { name = '', namespace = '' } = useParams<{ name: string; namespace: string }>();
+  const [deleteHost, setDeleteHost] = React.useState<{
+    agent?: AgentK8sResource;
+    bmh?: BareMetalHostK8sResource;
+  }>();
   const [isDiscoveryHintModalOpen, setDiscoveryHintModalOpen] = React.useState(false);
   const [isMassChangeHostOpen, setMassChangeHostOpen] = React.useState(false);
   const [isMassApproveOpen, setMassApproveOpen] = React.useState(false);
   const [selectedHostIDs, setSelectedHostIDs] = React.useState<string[]>([]);
+  const [nmStates, nmLoaded] = useInfraEnvNMStates(infraEnv);
+  const [agentClusterInstall, aciLoaded] = useK8sWatchResource<AgentClusterInstallK8sResource>({
+    groupVersionKind: {
+      kind: AgentClusterInstallModel.kind,
+      version: AgentClusterInstallModel.apiVersion,
+      group: AgentClusterInstallModel.apiGroup,
+    },
+    name: name,
+    namespace: namespace,
+    isList: false,
+  });
 
   const { t } = useTranslation();
   const agentStatuses = agentStatus(t);
@@ -72,7 +95,7 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
       bmhs: bareMetalHosts,
       infraEnv,
     },
-    { onEditHost, onEditRole, onEditBMH, onDeleteHost, onSetInstallationDiskId },
+    { onEditHost, onEditRole, onEditBMH, onDeleteHost: setDeleteHost, onSetInstallationDiskId },
   );
 
   const addAll = width && width > 700;
@@ -87,7 +110,6 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
         bareMetalHosts,
         bmhStatuses,
         onEditHostname: onEditHost,
-        onApprove,
         wizardStepId: 'hosts-discovery',
         t,
       }),
@@ -107,7 +129,6 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
       agentStatuses,
       bmhStatuses,
       onEditHost,
-      onApprove,
     ],
   );
 
@@ -128,6 +149,10 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
   const paginationProps = usePagination(hosts.length);
   const itemIDs = hosts.map((h) => h.id);
 
+  if (!nmLoaded || aciLoaded) {
+    return <LoadingState />;
+  }
+
   return (
     <>
       <Stack hasGutter>
@@ -171,12 +196,7 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
           isOpen={isMassChangeHostOpen}
           hosts={hosts}
           selectedHostIDs={selectedHostIDs}
-          onChangeHostname={onAgentChangeHostname(
-            agents,
-            bareMetalHosts,
-            onChangeHostname,
-            onChangeBMHHostname,
-          )}
+          onChangeHostname={onAgentChangeHostname(agents, bareMetalHosts)}
           onClose={() => setMassChangeHostOpen(false)}
           canChangeHostname={canChangeHostname(agents, agentStatuses, bareMetalHosts, t)}
         />
@@ -185,10 +205,17 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
         <MassApproveAgentModal
           isOpen={isMassApproveOpen}
           agents={selectedAgents}
-          onApprove={onApprove}
           onClose={() => setMassApproveOpen(false)}
         />
       )}
+      {deleteHost && (
+        <DeleteHostModal
+          {...deleteHost}
+          onClose={() => setDeleteHost(undefined)}
+          nmStates={nmStates}
+          agentClusterInstall={agentClusterInstall}
+        />
+      )}
     </>
   );
 };

libs/ui-lib/lib/cim/components/ClusterDeployment/ClusterDeploymentHostDiscoveryTable.tsx

@@ -57,14 +57,8 @@ const ClusterDeploymentHostsDiscovery: React.FC<ClusterDeploymentHostsDiscoveryP
   infraEnv,
   infraNMStates,
   usedHostnames,
-  onChangeHostname,
   onEditRole,
   onSetInstallationDiskId,
-  onSaveBMH,
-  fetchSecret,
-  onChangeBMHHostname,
-  onApproveAgent,
-  onDeleteHost,
   ...rest
 }) => {
   const [isDiscoveryHintModalOpen, setDiscoveryHintModalOpen] = React.useState(false);
@@ -119,36 +113,26 @@ const ClusterDeploymentHostsDiscovery: React.FC<ClusterDeploymentHostsDiscoveryP
                 onEditRole={onEditRole}
                 onSetInstallationDiskId={onSetInstallationDiskId}
                 onEditBMH={setEditBMH}
-                onChangeHostname={onChangeHostname}
-                onChangeBMHHostname={onChangeBMHHostname}
-                onApprove={onApproveAgent}
                 width={contentRect.bounds?.width}
-                onDeleteHost={onDeleteHost}
               />
             </div>
           )}
         </Measure>
-        <EditBMHModal
-          infraEnv={infraEnv}
-          bmh={editBMH}
-          nmStates={infraNMStates}
-          isOpen={!!editBMH}
-          onClose={() => setEditBMH(undefined)}
-          onEdit={onSaveBMH}
-          fetchSecret={fetchSecret}
-          usedHostnames={usedHostnames || []}
-        />
+        {editBMH && (
+          <EditBMHModal
+            infraEnv={infraEnv}
+            bmh={editBMH}
+            nmStates={infraNMStates}
+            onClose={() => setEditBMH(undefined)}
+            usedHostnames={usedHostnames || []}
+          />
+        )}
         {editAgent && (
           <EditAgentModal
             onClose={() => setEditAgent(undefined)}
             usedHostnames={usedHostnames}
             agent={editAgent}
-            onSave={onAgentChangeHostname(
-              agents,
-              bareMetalHosts,
-              onChangeHostname,
-              onChangeBMHHostname,
-            )}
+            onSave={onAgentChangeHostname(agents, bareMetalHosts)}
           />
         )}
       </GridItem>