@openshift-assisted/ui-lib 2.16.2-cim → 2.16.4-cim

package/lib/cim/components/helpers/versions.ts

@@ -8,7 +8,7 @@ import {
 } from '../../types';
 import { CpuArchitecture, OpenshiftVersionOptionType } from '../../../common';
 import { OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';
-import { getComparableVersionInt } from '../../../common/utils';
+import { isMajorMinorVersionEqualOrGreater } from '../../../common/utils';
 
 export const getVersionFromReleaseImage = (releaseImage = '') => {
   const match = /.+:(\d+\.\d+(?:\.\d+)?(?:-\w+)?)/gm.exec(releaseImage);
@@ -123,9 +123,5 @@ export const getCurrentClusterVersion = (cv?: ClusterVersionK8sResource): string
 
 export const getNetworkType = (
   ocpVersion: OpenshiftVersionOptionType | undefined,
-): 'OVNKubernetes' | 'OpenShiftSDN' => {
-  const checkVersionNum = getComparableVersionInt(ocpVersion?.version || '');
-  const toVersionNum = getComparableVersionInt('4.12');
-
-  return !checkVersionNum || checkVersionNum >= toVersionNum ? 'OVNKubernetes' : 'OpenShiftSDN';
-};
+): 'OVNKubernetes' | 'OpenShiftSDN' =>
+  isMajorMinorVersionEqualOrGreater(ocpVersion?.version, '4.12') ? 'OVNKubernetes' : 'OpenShiftSDN';

package/lib/cim/components/modals/AddBmcHostModal.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Modal, ModalVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import BMCForm from '../Agent/BMCForm';
 import { AddBmcHostModalProps } from './types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';

package/lib/cim/components/modals/AddBmcHostYamlForm.css

@@ -1,5 +1,5 @@
 .ai-bmc-yaml__error {
   display: block;
-  font-size: var(--pf-v5-global--FontSize--md);
+  font-size: var(--pf-v6-global--FontSize--md);
   color: red;
 }

package/lib/cim/components/modals/AddBmcHostYamlForm.tsx

@@ -7,15 +7,12 @@ import {
   ButtonVariant,
   EmptyState,
   EmptyStateBody,
-  EmptyStateHeader,
-  EmptyStateIcon,
   EmptyStateVariant,
-  ModalBoxBody,
-  ModalBoxFooter,
   Spinner,
   Stack,
   StackItem,
 } from '@patternfly/react-core';
+import { ModalBoxBody, ModalBoxFooter } from '@patternfly/react-core/deprecated';
 import { ErrorCircleOIcon } from '@patternfly/react-icons/dist/js/icons/error-circle-o-icon';
 import { UploadIcon } from '@patternfly/react-icons/dist/js/icons/upload-icon';
 import jsYaml from 'js-yaml';
@@ -132,12 +129,12 @@ const AddBmcHostYamlForm: React.FC<
       <ModalBoxBody>
         <Stack hasGutter>
           <StackItem>
-            <EmptyState variant={EmptyStateVariant.lg}>
-              <EmptyStateHeader
-                titleText={<>{t('ai:Upload a YAML file')}</>}
-                icon={<EmptyStateIcon icon={UploadIcon} />}
-                headingLevel="h4"
-              />
+            <EmptyState
+              headingLevel="h4"
+              icon={UploadIcon}
+              titleText={<>{t('ai:Upload a YAML file')}</>}
+              variant={EmptyStateVariant.lg}
+            >
               <EmptyStateBody>
                 <p>
                   {t(

package/lib/cim/components/modals/AddBmcHostYamlModal.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Modal, ModalVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import { UploadActionModalProps } from './types';
 import AddBmcHostYamlForm from './AddBmcHostYamlForm';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';

package/lib/cim/components/modals/AddHostModal.tsx

@@ -1,14 +1,7 @@
 import * as React from 'react';
 import { FormikHelpers } from 'formik';
-import {
-  EmptyState,
-  EmptyStateBody,
-  EmptyStateHeader,
-  EmptyStateIcon,
-  Modal,
-  ModalVariant,
-  Spinner,
-} from '@patternfly/react-core';
+import { EmptyState, EmptyStateBody, Spinner } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import { DownloadIso, DiscoveryImageConfigForm, DiscoveryImageFormValues } from '../../../common';
 import { AddHostModalProps } from './types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
@@ -124,8 +117,7 @@ const GeneratingIsoDownload = ({
       docVersion={docVersion}
     />
   ) : (
-    <EmptyState>
-      <EmptyStateHeader icon={<EmptyStateIcon icon={Spinner} />} />
+    <EmptyState icon={Spinner}>
       <EmptyStateBody>{t('ai:Generating discovery ISO')}</EmptyStateBody>
     </EmptyState>
   );
@@ -148,8 +140,7 @@ const GeneratingIPXEDownload = ({
       onReset={onReset}
     />
   ) : (
-    <EmptyState>
-      <EmptyStateHeader icon={<EmptyStateIcon icon={Spinner} />} />
+    <EmptyState icon={Spinner}>
       <EmptyStateBody>{t('ai:Generating iPXE script')}</EmptyStateBody>
     </EmptyState>
   );

package/lib/cim/components/modals/CimConfiguration/CimConfigProgressAlert.tsx

@@ -65,12 +65,13 @@ export const CimConfigProgressAlert: React.FC<CimConfigProgressAlertProps> = ({
 
   const assistedServiceDeploymentLink = (
     <Button
+      icon={<ExternalLinkAltIcon />}
       variant={ButtonVariant.link}
       isInline
       key="assisted-service-deployment"
       onClick={() => navigate(assistedServiceDeploymentUrl)}
     >
-      {t('ai:Troubleshoot in the assisted service deployment')} <ExternalLinkAltIcon />
+      {t('ai:Troubleshoot in the assisted service deployment')}
     </Button>
   );
 

package/lib/cim/components/modals/CimConfiguration/CimConfigurationForm.css

@@ -1,4 +1,4 @@
-.cim-config-form-title .pf-v5-c-form__label-text {
+.cim-config-form-title .pf-v6-c-form__label-text {
   font-size: larger;
 }
 
@@ -11,13 +11,13 @@
 }
 
 .cim-config-form-aws {
-  margin-bottom: var(--pf-v5-global--spacer--md);
+  margin-bottom: var(--pf-v6-global--spacer--md);
 }
 
 .cim-config-form-volume input {
   width: 10rem;
 }
 
-.cim-config-modal .pf-v5-c-modal-box__body {
+.cim-config-modal .pf-v6-c-modal-box__body {
   overflow: hidden;
 }

package/lib/cim/components/modals/CimConfiguration/CimConfigurationForm.tsx

@@ -69,7 +69,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
         aria-label={t('ai:More info for load balancer on Amazon web services')}
         aria-describedby="cim-config-form-aws-title"
         onClick={(e) => e.preventDefault()}
-        className="pf-v5-c-form__group-label-help"
+        className="pf-v6-c-form__group-label-help"
       >
         <Icon>
           <HelpIcon />
@@ -84,7 +84,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
         fieldId="cim-config-form-storage-title"
         label={t('ai:Storage sizes')}
         className="cim-config-form-title"
-        labelIcon={
+        labelHelp={
           <Popover
             bodyContent={t(
               'ai:The storage sizes will be used to store different files and data for cluster creation.',
@@ -102,7 +102,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
               aria-label={t('ai:More info for configure storage sizes')}
               aria-describedby="cim-config-form-storage-title"
               onClick={(e) => e.preventDefault()}
-              className="pf-v5-c-form__group-label-help"
+              className="pf-v6-c-form__group-label-help"
             >
               <Icon>
                 <HelpIcon />
@@ -118,7 +118,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
           <FormGroup
             label={t('ai:Database storage')}
             fieldId="cim-config-form-storage-db"
-            labelIcon={
+            labelHelp={
               <Popover
                 bodyContent={t(
                   'ai:Specify how much storage is allocated for storing files such as database tables and database views for the clusters. Recommended is 10Gi or more. The value can not be updated later.',
@@ -129,7 +129,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
                   aria-label={t('ai:More info for database storage')}
                   aria-describedby="cim-config-form-storage-db"
                   onClick={(e) => e.preventDefault()}
-                  className="pf-v5-c-form__group-label-help"
+                  className="pf-v6-c-form__group-label-help"
                 >
                   <Icon>
                     <HelpIcon />
@@ -168,7 +168,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
           <FormGroup
             label={t('ai:System storage')}
             fieldId="cim-config-form-storage-sys"
-            labelIcon={
+            labelHelp={
               <Popover
                 bodyContent={t(
                   'ai:Specify how much storage is allocated for storing logs, manifests and "kubeconfig" files for the clusters. Recommended is 100Gi or more. The value can not be updated later.',
@@ -179,7 +179,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
                   aria-label={t('ai:More info for system storage')}
                   aria-describedby="cim-config-form-storage-sys"
                   onClick={(e) => e.preventDefault()}
-                  className="pf-v5-c-form__group-label-help"
+                  className="pf-v6-c-form__group-label-help"
                 >
                   <Icon>
                     <HelpIcon />
@@ -218,7 +218,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
           <FormGroup
             label={t('ai:Image storage')}
             fieldId="cim-config-form-storage-img"
-            labelIcon={
+            labelHelp={
               <Popover
                 bodyContent={t(
                   'ai:Specify how much storage to allocate for the images of the clusters. There must be 1G of image storage for each instance of Red Hat Enterprise Linux CoreOS that is running. Recommended is 50Gi or more. The value can not be updated later.',
@@ -229,7 +229,7 @@ export const CimConfigurationForm: React.FC<CimConfigurationFormProps> = ({
                   aria-label={t('ai:More info for image storage')}
                   aria-describedby="cim-config-form-storage-img"
                   onClick={(e) => e.preventDefault()}
-                  className="pf-v5-c-form__group-label-help"
+                  className="pf-v6-c-form__group-label-help"
                 >
                   <Icon>
                     <HelpIcon />

package/lib/cim/components/modals/CimConfiguration/CimConfigurationModal.css

@@ -1,3 +1,3 @@
-.cim-config-modal .pf-v5-c-alert {
-  margin-bottom: var(--pf-v5-global--spacer--md);
+.cim-config-modal .pf-v6-c-alert {
+  margin-bottom: var(--pf-v6-global--spacer--md);
 }

package/lib/cim/components/modals/CimConfiguration/CimConfigurationModal.tsx

@@ -1,12 +1,6 @@
 import * as React from 'react';
-import {
-  Alert,
-  AlertVariant,
-  Button,
-  ButtonVariant,
-  Modal,
-  ModalVariant,
-} from '@patternfly/react-core';
+import { Alert, AlertVariant, Button, ButtonVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import { getStorageSizeGiB } from '../../helpers';

package/lib/cim/components/modals/EditBMHModal.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Modal, ModalVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import BMCForm from '../Agent/BMCForm';
 import { SecretK8sResource } from '../../types';
 import { LoadingState } from '../../../common';

package/lib/cim/components/modals/EditNtpSourcesModal.tsx

@@ -1,16 +1,11 @@
 import * as React from 'react';
+import { Alert, Button, ButtonVariant, Form, Stack, StackItem } from '@patternfly/react-core';
 import {
-  Alert,
-  Button,
-  ButtonVariant,
-  Form,
   Modal,
   ModalBoxBody,
   ModalBoxFooter,
   ModalVariant,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import { Formik, FormikProps } from 'formik';
 import { InfraEnvK8sResource } from '../../types';
 import { RadioField, AdditionalNTPSourcesField } from '../../../common';

package/lib/cim/components/modals/EditProxyModal.tsx

@@ -1,17 +1,12 @@
 import * as React from 'react';
 import * as Yup from 'yup';
+import { Alert, Button, ButtonVariant, Form, Stack, StackItem } from '@patternfly/react-core';
 import {
-  Alert,
-  Button,
-  ButtonVariant,
-  Form,
   Modal,
   ModalBoxBody,
   ModalBoxFooter,
   ModalVariant,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import { EditProxyModalProps } from './types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { ProxyInputFields } from '../../../common/components/clusterConfiguration/ProxyFields';
@@ -111,7 +106,7 @@ const EditProxyModal: React.FC<EditProxyModalProps> = ({
                 <Form>
                   <ProxyInputFields />
                   {error && (
-                    <Alert variant="danger" title={t('ai:An error occurred')} isInline>
+                    <Alert variant="danger" title={t('ai:An error occured')} isInline>
                       {error}
                     </Alert>
                   )}

package/lib/cim/components/modals/EditPullSecretModal.tsx

@@ -1,17 +1,13 @@
 import * as React from 'react';
 import * as Yup from 'yup';
 import { TFunction } from 'i18next';
+import { Alert, Button, ButtonVariant, Stack, StackItem } from '@patternfly/react-core';
 import {
-  Alert,
-  Button,
-  ButtonVariant,
   Modal,
   ModalBoxBody,
   ModalBoxFooter,
   ModalVariant,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import { Formik, useFormikContext } from 'formik';
 import { InfraEnvK8sResource, SecretK8sResource } from '../../types';
 import { LoadingState, PullSecretField, pullSecretValidationSchema } from '../../../common';

package/lib/cim/components/modals/EditSSHKeyModal.tsx

@@ -1,16 +1,12 @@
 import * as React from 'react';
 import * as Yup from 'yup';
+import { Alert, Button, ButtonVariant, Stack, StackItem } from '@patternfly/react-core';
 import {
-  Alert,
-  Button,
-  ButtonVariant,
   Modal,
   ModalBoxBody,
   ModalBoxFooter,
   ModalVariant,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import { Formik, FormikProps } from 'formik';
 
 import { InfraEnvK8sResource } from '../../types';
@@ -68,7 +64,7 @@ const EditSSHKeyModal: React.FC<EditSSHKeyModalProps> = ({
             onClose();
           } catch (err) {
             const error = err as Error;
-            setError(error?.message || t('ai:An error occurred'));
+            setError(error?.message || t('ai:An error occured'));
           }
         }}
         validateOnMount

package/lib/cim/components/modals/MassApproveAgentModal.tsx

@@ -1,14 +1,6 @@
 import * as React from 'react';
-import {
-  Alert,
-  Button,
-  ButtonVariant,
-  Modal,
-  ModalBoxBody,
-  ModalBoxFooter,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
+import { Alert, Button, ButtonVariant, Stack, StackItem } from '@patternfly/react-core';
+import { Modal, ModalBoxBody, ModalBoxFooter } from '@patternfly/react-core/deprecated';
 import { getAIHosts } from '../helpers';
 import { AgentK8sResource } from '../../types';
 import HostsTable from '../../../common/components/hosts/HostsTable';
@@ -27,7 +19,7 @@ type ApproveTableRowProps = {
 };
 
 const ApproveTableRow: React.FC<ApproveTableRowProps> = ({ agent, children }) => (
-  <div className={agent?.spec.approved ? 'pf-v5-u-color-200' : undefined}>{children}</div>
+  <div className={agent?.spec.approved ? 'pf-v6-u-color-200' : undefined}>{children}</div>
 );
 
 const hostnameColumn = (agents: AgentK8sResource[], t: TFunction): TableRow<Host> => {
@@ -121,7 +113,7 @@ const MassApproveAgentModal: React.FC<MassApproveAgentModalProps> = ({
       onClose();
     } catch (err) {
       setError({
-        title: t('ai:An error occurred while approving agents'),
+        title: t('ai:An error occured while approving agents'),
         message: getErrorMessage(err),
       });
       setProgress(null);

package/lib/cim/components/modals/MassDeleteAgentModal.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Button, Flex, FlexItem, Popover } from '@patternfly/react-core';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import { Link } from 'react-router-dom-v5-compat';
-import { global_palette_blue_300 as blueInfoColor } from '@patternfly/react-tokens/dist/js/global_palette_blue_300';
+import { t_global_icon_color_status_info_default as blueInfoColor } from '@patternfly/react-tokens/dist/js/t_global_icon_color_status_info_default';
 import {
   getHostname,
   getInventory,
@@ -43,7 +43,7 @@ const hostnameColumn = (agents: AgentK8sResource[], t: TFunction): TableRow<Host
         ?.clusterDeploymentName?.name;
       return {
         title: (
-          <div className={assignedToCluster ? 'pf-v5-u-color-200' : undefined}>
+          <div className={assignedToCluster ? 'pf-v6-u-color-200' : undefined}>
             {computedHostname}
           </div>
         ),

package/lib/cim/components/modals/ScaleUpModal.tsx

@@ -1,9 +1,6 @@
 import React from 'react';
 import * as Yup from 'yup';
 import {
-  Modal,
-  ModalBoxBody,
-  ModalBoxFooter,
   Button,
   ButtonVariant,
   Alert,
@@ -12,6 +9,7 @@ import {
   Stack,
   StackItem,
 } from '@patternfly/react-core';
+import { Modal, ModalBoxBody, ModalBoxFooter } from '@patternfly/react-core/deprecated';
 import { Formik, FormikConfig, FormikProps } from 'formik';
 import { AgentK8sResource } from '../../types/k8s/agent';
 import { ClusterDeploymentK8sResource } from '../../types/k8s/cluster-deployment';

package/lib/cim/types/index.ts

@@ -2,4 +2,3 @@ export * from './fromOCP';
 export * from './k8s';
 export * from './metal3';
 export * from './resources';
-export * from './models';

package/lib/cim/types/k8s/agent-cluster-install.ts

@@ -58,7 +58,6 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
     };
     holdInstallation?: boolean;
     platformType: string;
-    manifestsConfigMapRefs?: { name: string }[];
   };
   status?: {
     apiVIP?: string;

package/lib/cim/utils.ts

@@ -1,5 +1,3 @@
-import { Patch } from '@openshift-console/dynamic-plugin-sdk';
-import { isEqual } from 'lodash-es';
 import { StatusCondition } from './types';
 
 export function getConditionByType<ConditionType>(
@@ -8,13 +6,3 @@ export function getConditionByType<ConditionType>(
 ): StatusCondition<ConditionType> | undefined {
   return conditions.find((c) => c.type === type);
 }
-
-export const appendPatch = <V>(patches: Patch[], path: string, newVal?: V, existingVal?: V) => {
-  if (!isEqual(newVal, existingVal)) {
-    patches.push({
-      op: existingVal === undefined ? 'add' : 'replace',
-      path,
-      value: newVal,
-    });
-  }
-};

package/lib/common/api/assisted-service/BundleAPI.ts

@@ -6,8 +6,21 @@ const BundleAPI = {
     return `/v2/operators/bundles`;
   },
 
-  list() {
-    return client.get<Bundle[]>(`${BundleAPI.makeBaseURI()}`);
+  list(
+    openshiftVersion?: string,
+    cpuArchitecture?: string,
+    platformType?: string,
+    featureIds?: string,
+  ) {
+    return client.get<Bundle[]>(`${BundleAPI.makeBaseURI()}`, {
+      params: {
+        openshift_version: openshiftVersion,
+        cpu_architecture: cpuArchitecture,
+        platform_type: platformType,
+        feature_ids: featureIds,
+        ...(platformType === 'external' ? { external_platform_name: 'oci' } : {}),
+      },
+    });
   },
 
   listOperatorsForBundle(bundleName: string) {

package/lib/common/api/assisted-service/ClustersAPI.ts

@@ -245,6 +245,12 @@ const ClustersAPI = {
       headers: { 'Content-Type': 'application/json' },
     });
   },
+  registerDisconnected(params: { name: string; openshiftVersion: string }) {
+    return client.post<Cluster, AxiosResponse<Cluster>, { name: string; openshiftVersion: string }>(
+      `${ClustersAPI.makeBaseURI()}disconnected`,
+      params,
+    );
+  },
 };
 
 export default ClustersAPI;

package/lib/common/api/assisted-service/HostsAPI.ts

@@ -1,4 +1,5 @@
 import {
+  Cluster,
   Host,
   HostUpdateParams,
   InfraEnv,
@@ -62,6 +63,18 @@ const HostsAPI = {
       `${HostsAPI.makeActionsBaseURI(infraEnvId, hostId)}/install`,
     );
   },
+  bindHost(infraEnvId: InfraEnv['id'], hostId: Host['id'], clusterId: Cluster['id']) {
+    return client.post<Host, AxiosResponse<Host>, { cluster_id: string }>(
+      `${HostsAPI.makeActionsBaseURI(infraEnvId, hostId)}/bind`,
+      { cluster_id: clusterId },
+      {
+        headers: {
+          accept: 'application/json',
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+  },
 };
 
 export default HostsAPI;

package/lib/common/api/assisted-service/InfraEnvsAPI.ts

@@ -4,6 +4,7 @@ import {
   InfraEnvCreateParams,
   PresignedUrl,
   InfraEnvUpdateParams,
+  Host,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { AxiosResponse } from 'axios';
 
@@ -67,6 +68,11 @@ const InfraEnvsAPI = {
       `${InfraEnvsAPI.makeBaseURI(infraEnvId)}/downloads/files-presigned?file_name=ipxe-script`,
     );
   },
+  getHosts(infraEnvId: InfraEnv['id']) {
+    return client.get<Host[]>(`${InfraEnvsAPI.makeBaseURI(infraEnvId)}/hosts`, {
+      signal: _getRequestAbortController.signal,
+    });
+  },
 };
 
 export default InfraEnvsAPI;

package/lib/common/components/clusterConfiguration/CertificateFields.css

@@ -1,3 +1,3 @@
-.ai-certificate-fields .pf-v5-c-check__body {
+.ai-certificate-fields .pf-v6-c-check__body {
   width: 100%;
 }

package/lib/common/components/clusterConfiguration/CertificateFields.tsx

@@ -22,7 +22,7 @@ export const CertificateFieldsHelperText = ({ fieldId = FIELD_NAME }) => {
     <FormGroup>
       <FormHelperText>
         <HelperText id={fieldId}>
-          <HelperTextItem>
+          <HelperTextItem data-testid="certificate-fields-helper-text">
             {t(
               'ai:Paste in 1 or more PEM formatted certificates that you want the cluster to trust.',
             )}

package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx

@@ -3,12 +3,12 @@ import * as Yup from 'yup';
 import {
   Button,
   Form,
-  ModalBoxBody,
-  ModalBoxFooter,
   AlertVariant,
   Alert,
   Stack,
   StackItem,
+  ModalBody,
+  ModalFooter,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 import { Formik, FormikHelpers } from 'formik';
@@ -114,7 +114,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
       {({ submitForm, isSubmitting, status }) => {
         return (
           <>
-            <ModalBoxBody>
+            <ModalBody>
               <Stack hasGutter>
                 {hasDHCP === false && (
                   <StackItem>
@@ -139,8 +139,8 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
                   </Form>
                 </StackItem>
               </Stack>
-            </ModalBoxBody>
-            <ModalBoxFooter>
+            </ModalBody>
+            <ModalFooter>
               <Button
                 // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 onClick={submitForm}
@@ -156,7 +156,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
               <Button key="cancel" variant="link" onClick={onCancel}>
                 {t('ai:Cancel')}
               </Button>
-            </ModalBoxFooter>
+            </ModalFooter>
           </>
         );
       }}