@openshift-assisted/ui-lib 2.45.1 → 2.46.1

package/lib/common/components/hosts/tableUtils.tsx

@@ -65,7 +65,6 @@ export const hostnameColumn = (
       title: t('ai:Hostname'),
       props: {
         id: 'col-header-hostname', // ACM jest tests require id over testId
-        modifier: 'breakWord',
       },
       sort: true,
     },

package/lib/common/components/storage/DisksTable.tsx

@@ -1,12 +1,5 @@
 import React from 'react';
-import {
-  TextContent,
-  Text,
-  TextVariants,
-  Popover,
-  Alert,
-  AlertVariant,
-} from '@patternfly/react-core';
+import { Content, ContentVariants, Popover, Alert, AlertVariant } from '@patternfly/react-core';
 import { TableVariant, Thead, Tbody, Table, Th, Tr, Td } from '@patternfly/react-table';
 import type { Disk, Host } from '@openshift-assisted/types/assisted-installer-service';
 import type { WithTestID } from '../../types/index';
@@ -53,9 +46,9 @@ const diskColumns = (t: TFunction, showFormat: boolean) =>
   ].filter(Boolean) as { title: string | React.ReactNode }[];
 
 const SkipFormattingDisk = () => (
-  <TextContent>
-    <Text component={TextVariants.p}>This bootable disk will skip formatting</Text>
-  </TextContent>
+  <Content>
+    <Content component={ContentVariants.p}>This bootable disk will skip formatting</Content>
+  </Content>
 );
 
 const getDiskLimitation = (

package/lib/common/components/storage/StorageUtils.tsx

@@ -2,14 +2,14 @@ import * as React from 'react';
 import { TFunction } from 'i18next';
 import { getHostRole, getInventory, RoleCell, UiIcon } from '../../index';
 import { TableRow } from '../hosts/AITable';
-import { Popover, Text, TextContent, TextVariants } from '@patternfly/react-core';
+import { Popover, Content, ContentVariants } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 
 const SkipFormattingDisks = () => (
-  <TextContent>
-    <Text component={TextVariants.p}>Some bootable disks will skip formatting</Text>
-  </TextContent>
+  <Content>
+    <Content component={ContentVariants.p}>Some bootable disks will skip formatting</Content>
+  </Content>
 );
 
 export const roleColumn = (t: TFunction, schedulableMasters: boolean): TableRow<Host> => {
@@ -76,7 +76,13 @@ export const odfUsageColumn = (excludeMasters: boolean): TableRow<Host> => {
       const isExcluded = excludeMasters && isMaster;
       return {
         title: isExcluded ? (
-          <div style={{ color: 'var(--pf-v5-global--disabled-color--100)' }}>Excluded for ODF</div>
+          <div
+            style={{
+              color: 'var(--pf-t--global--icon--color--disabled)',
+            }}
+          >
+            Excluded for ODF
+          </div>
         ) : (
           'Use ODF'
         ),

package/lib/common/components/ui/ClusterEventsToolbar.tsx

@@ -5,7 +5,7 @@ import {
   ToolbarItem,
   ToolbarContent,
   ToolbarFilter,
-  ToolbarChip,
+  ToolbarLabel,
   Button,
   ButtonVariant,
   InputGroup,
@@ -83,19 +83,19 @@ export const getInitialClusterEventsFilters = (
   deletedHosts: false,
 });
 
-const mapHostsChips = (
+const mapHostsLabels = (
   t: TFunction,
   filters: ClusterEventsFiltersType,
   hosts: { id: string; hostname?: string }[],
-): ToolbarChip[] => {
-  const chips = [
+): ToolbarLabel[] => {
+  const labels = [
     filters.deletedHosts && { key: DELETED_HOSTS, node: t('ai:Deleted hosts') },
     filters.clusterLevel && { key: CLUSTER_LEVEL, node: t('ai:Cluster-level events') },
     ...(hosts || [])
       .filter((host) => filters.hostIds?.includes(host.id))
-      .map((host): ToolbarChip => ({ key: host.id, node: host.hostname })),
+      .map((host): ToolbarLabel => ({ key: host.id, node: host.hostname })),
   ];
-  return chips.filter(Boolean) as ToolbarChip[];
+  return labels.filter(Boolean) as ToolbarLabel[];
 };
 
 const ClusterEventsToolbar = ({
@@ -178,7 +178,7 @@ const ClusterEventsToolbar = ({
     setTimer(newTimer);
   };
 
-  const onDeleteChipGroup: ToolbarFilterProps['deleteChipGroup'] = (type) => {
+  const onDeleteLabelGroup: ToolbarFilterProps['deleteLabelGroup'] = (type) => {
     if (type === 'Severity') {
       setFilters({
         ...filters,
@@ -209,7 +209,7 @@ const ClusterEventsToolbar = ({
     a.hostname && b.hostname && a.hostname < b.hostname ? -1 : 1,
   );
 
-  const hostChips = mapHostsChips(t, filters, sortedHosts);
+  const hostLabels = mapHostsLabels(t, filters, sortedHosts);
 
   return (
     <Toolbar
@@ -225,11 +225,11 @@ const ClusterEventsToolbar = ({
         {entityKind === 'cluster' && (
           <CustomToolbarFilter
             categoryName="Hosts"
-            chips={hostChips}
-            deleteChip={(_, chip) =>
-              onHostSelect(typeof chip === 'string' ? chip : chip.key, false)
+            labels={hostLabels}
+            deleteLabel={(_, label) =>
+              onHostSelect(typeof label === 'string' ? label : label.key, false)
             }
-            deleteChipGroup={onDeleteChipGroup}
+            deleteLabelGroup={onDeleteLabelGroup}
           >
             <Dropdown
               isOpen={isHostExpanded}
@@ -243,8 +243,8 @@ const ClusterEventsToolbar = ({
                   isFullWidth
                   onClick={onHostToggle}
                   isExpanded={isHostExpanded}
-                  badge={hostChips.length && <Badge isRead>{hostChips.length}</Badge>}
-                  data-testid="cluster-events-hosts-dropdown-button"
+                  badge={hostLabels.length && <Badge isRead>{hostLabels.length}</Badge>}
+                  data-testid="hosts-dropdown-toggle"
                 >
                   <Placeholder text="Hosts" />
                 </MenuToggle>
@@ -290,16 +290,16 @@ const ClusterEventsToolbar = ({
         )}
 
         <ToolbarFilter
-          chips={filters.severities?.map(
-            (severity): ToolbarChip => ({
+          labels={filters.severities?.map(
+            (severity): ToolbarLabel => ({
               key: severity,
               node: capitalize(severity),
             }),
           )}
-          deleteChip={(_, chip) =>
-            onSeveritySelect(typeof chip === 'string' ? chip : chip.key, false)
+          deleteLabel={(_, label) =>
+            onSeveritySelect(typeof label === 'string' ? label : label.key, false)
           }
-          deleteChipGroup={onDeleteChipGroup}
+          deleteLabelGroup={onDeleteLabelGroup}
           categoryName="Severity"
         >
           <Dropdown
@@ -318,7 +318,7 @@ const ClusterEventsToolbar = ({
                 badge={
                   filters.severities?.length && <Badge isRead>{filters.severities.length}</Badge>
                 }
-                data-testid="cluster-events-severity-dropdown-button"
+                data-testid="severity-dropdown-toggle"
               >
                 <Placeholder text="Severity" />
               </MenuToggle>
@@ -355,9 +355,11 @@ const ClusterEventsToolbar = ({
               />
             </InputGroupItem>
             <InputGroupItem>
-              <Button variant={ButtonVariant.control} aria-label="search text button">
-                <SearchIcon />
-              </Button>
+              <Button
+                icon={<SearchIcon />}
+                variant={ButtonVariant.control}
+                aria-label="search text button"
+              />
             </InputGroupItem>
           </InputGroup>
         </ToolbarItem>

package/lib/common/components/ui/ConfirmationModal.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { Modal, Button, ModalVariant, ButtonProps, ModalProps } from '@patternfly/react-core';
+import { Button, ButtonProps } from '@patternfly/react-core';
+import { Modal, ModalVariant, ModalProps } from '@patternfly/react-core/deprecated';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
 type ConfirmationModalProps = {

package/lib/common/components/ui/CustomToolbarFilter.tsx

@@ -2,15 +2,16 @@
 // Once this issues is addressed in PatternFly, this component should be removed.
 
 import {
-  Chip,
-  ChipGroup,
+  Label,
+  LabelGroup,
   PickOptional,
-  ToolbarChip,
+  ToolbarLabel,
   ToolbarContentContext,
   ToolbarContext,
   ToolbarFilterProps,
   ToolbarItem,
 } from '@patternfly/react-core';
+
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
@@ -23,7 +24,7 @@ class CustomToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFil
   static contextType = ToolbarContext;
   context!: React.ContextType<typeof ToolbarContext>;
   static defaultProps: PickOptional<ToolbarFilterProps> = {
-    chips: [] as (string | ToolbarChip)[],
+    labels: [] as (string | ToolbarLabel)[],
     showToolbarItem: true,
   };
 
@@ -35,70 +36,78 @@ class CustomToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFil
   }
 
   componentDidMount() {
-    const { categoryName, chips } = this.props;
+    const { categoryName, labels } = this.props;
     this.context.updateNumberFilters(
       typeof categoryName !== 'string' && categoryName.hasOwnProperty('key')
         ? categoryName.key
         : categoryName.toString(),
-      chips ? chips.length : 0,
+      labels ? labels.length : 0,
     );
     this.setState({ isMounted: true });
   }
 
   componentDidUpdate() {
-    const { categoryName, chips } = this.props;
+    const { categoryName, labels } = this.props;
     this.context.updateNumberFilters(
       typeof categoryName !== 'string' && categoryName.hasOwnProperty('key')
         ? categoryName.key
         : categoryName.toString(),
-      chips ? chips.length : 0,
+      labels ? labels.length : 0,
     );
   }
 
   render() {
     const {
       children,
-      chips,
-      deleteChipGroup,
-      deleteChip,
-      chipGroupExpandedText,
-      chipGroupCollapsedText,
+      labels,
+      deleteLabelGroup,
+      deleteLabel,
+      labelGroupExpandedText,
+      labelGroupCollapsedText,
       categoryName,
       showToolbarItem,
       isExpanded,
-      expandableChipContainerRef,
+      expandableLabelContainerRef,
       ...props
     } = this.props;
-    const { isExpanded: managedIsExpanded, chipGroupContentRef } = this.context;
+    const { isExpanded: managedIsExpanded, labelGroupContentRef } = this.context;
     const _isExpanded = isExpanded !== undefined ? isExpanded : managedIsExpanded;
     const categoryKey =
       typeof categoryName !== 'string' && categoryName.hasOwnProperty('key')
         ? categoryName.key
         : categoryName.toString();
 
-    const chipGroup =
-      chips !== undefined && chips.length ? (
-        <ToolbarItem variant="chip-group">
-          <ChipGroup
+    const labelGroup =
+      labels !== undefined && labels.length ? (
+        <ToolbarItem variant="label-group">
+          <LabelGroup
             key={categoryKey}
             categoryName={typeof categoryName === 'string' ? categoryName : categoryName.name}
-            isClosable={deleteChipGroup !== undefined}
-            onClick={() => deleteChipGroup && deleteChipGroup(categoryName)}
-            collapsedText={chipGroupCollapsedText}
-            expandedText={chipGroupExpandedText}
+            isClosable={deleteLabelGroup !== undefined}
+            onClick={() => deleteLabelGroup && deleteLabelGroup(categoryName)}
+            collapsedText={labelGroupCollapsedText}
+            expandedText={labelGroupExpandedText}
           >
-            {chips.map((chip) =>
-              typeof chip === 'string' ? (
-                <Chip key={chip} onClick={() => deleteChip && deleteChip(categoryKey, chip)}>
-                  {chip}
-                </Chip>
+            {labels.map((label) =>
+              typeof label === 'string' ? (
+                <Label
+                  variant="outline"
+                  key={label}
+                  onClose={() => deleteLabel && deleteLabel(categoryKey, label)}
+                >
+                  {label}
+                </Label>
               ) : (
-                <Chip key={chip.key} onClick={() => deleteChip && deleteChip(categoryKey, chip)}>
-                  {chip.node}
-                </Chip>
+                <Label
+                  variant="outline"
+                  key={label.key}
+                  onClose={() => deleteLabel && deleteLabel(categoryKey, label)}
+                >
+                  {label.node}
+                </Label>
               ),
             )}
-          </ChipGroup>
+          </LabelGroup>
         </ToolbarItem>
       ) : null;
 
@@ -106,24 +115,24 @@ class CustomToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFil
       return (
         <React.Fragment>
           {showToolbarItem && <ToolbarItem {...props}>{children}</ToolbarItem>}
-          {chipGroupContentRef &&
-            chipGroupContentRef.current !== null &&
-            chipGroupContentRef.current.firstElementChild !== null &&
-            ReactDOM.createPortal(chipGroup, chipGroupContentRef.current.firstElementChild)}
+          {labelGroupContentRef &&
+            labelGroupContentRef.current !== null &&
+            labelGroupContentRef.current.firstElementChild !== null &&
+            ReactDOM.createPortal(labelGroup, labelGroupContentRef.current.firstElementChild)}
         </React.Fragment>
       );
     }
 
     return (
       <ToolbarContentContext.Consumer>
-        {({ chipContainerRef }) => (
+        {({ labelContainerRef }) => (
           <React.Fragment>
             {showToolbarItem && <ToolbarItem {...props}>{children}</ToolbarItem>}
-            {chipContainerRef.current &&
-              ReactDOM.createPortal(chipGroup, chipContainerRef.current as Element)}
-            {expandableChipContainerRef &&
-              expandableChipContainerRef.current &&
-              ReactDOM.createPortal(chipGroup, expandableChipContainerRef.current)}
+            {labelContainerRef.current &&
+              ReactDOM.createPortal(labelGroup, labelContainerRef.current as Element)}
+            {expandableLabelContainerRef &&
+              expandableLabelContainerRef.current &&
+              ReactDOM.createPortal(labelGroup, expandableLabelContainerRef.current)}
           </React.Fragment>
         )}
       </ToolbarContentContext.Consumer>

package/lib/common/components/ui/DetailList.css

@@ -3,10 +3,10 @@
 }
 
 .detail-list dd {
-  margin-bottom: var(--pf-v5-global--spacer--sm);
+  margin-bottom: var(--pf-v6-global--spacer--sm);
 }
 
 .detail-list ul ul,
 .detail-list ul li {
-  margin-top: var(--pf-v5-c-content--dt--sm--MarginTop);
+  margin-top: var(--pf-v6-c-content--dt--sm--MarginTop);
 }

package/lib/common/components/ui/DetailList.tsx

@@ -1,13 +1,5 @@
 import React, { ReactChild, ReactNode } from 'react';
-import {
-  TextContent,
-  TextList,
-  TextListVariants,
-  TextListItem,
-  TextListItemVariants,
-  Text,
-  TextProps,
-} from '@patternfly/react-core';
+import { Content, ContentVariants, ContentProps } from '@patternfly/react-core';
 import { WithTestID } from '../../types';
 
 import './DetailList.css';
@@ -16,7 +8,7 @@ import { RenderIf } from './RenderIf';
 export type DetailListProps = {
   children: ReactChild | (ReactChild | undefined)[];
   title?: string;
-  titleComponent?: TextProps['component'];
+  titleComponent?: ContentProps['component'];
 };
 
 export type DetailItemList = {
@@ -37,12 +29,12 @@ export const DetailList: React.FC<DetailListProps> = ({
   title,
   titleComponent = 'h2',
 }) => (
-  <TextContent>
-    {title && <Text component={titleComponent}>{title}</Text>}
-    <TextList component={TextListVariants.dl} className="detail-list">
+  <Content>
+    {title && <Content component={titleComponent}>{title}</Content>}
+    <Content component={ContentVariants.dl} className="detail-list">
       {children}
-    </TextList>
-  </TextContent>
+    </Content>
+  </Content>
 );
 
 const hasDetailItemList = (data: DetailItemProps['value']): data is DetailItemList => {
@@ -60,42 +52,42 @@ export const DetailItem: React.FC<DetailItemProps & WithTestID> = ({
   isHidden ? null : (
     <>
       <RenderIf condition={title !== undefined}>
-        <TextListItem
-          component={TextListItemVariants.dt}
+        <Content
+          component={ContentVariants.dt}
           id={idPrefix ? `${idPrefix}-title` : undefined}
           data-testid={testId ? `${testId}-title` : undefined}
         >
           {title}
-        </TextListItem>
+        </Content>
       </RenderIf>
-      <TextListItem
-        component={TextListItemVariants.dd}
+      <Content
+        component={ContentVariants.dd}
         id={idPrefix ? `${idPrefix}-value` : undefined}
         data-testid={testId ? `${testId}-value` : undefined}
         className={classNameValue}
       >
         {hasDetailItemList(value) ? (
-          <TextList component={TextListVariants.dl}>
+          <Content component={ContentVariants.dl}>
             {value.map((item, idx) => [
-              <TextListItem
+              <Content
                 data-testid={testId ? `${testId}-title-${idx}` : undefined}
                 key={item.title}
-                component={TextListItemVariants.dt}
+                component={ContentVariants.dt}
               >
                 {item.title}
-              </TextListItem>,
-              <TextListItem
+              </Content>,
+              <Content
                 data-testid={testId ? `${testId}-value-${idx}` : undefined}
                 key={`dd-${item.title}`}
-                component={TextListItemVariants.dd}
+                component={ContentVariants.dd}
               >
                 {item.value}
-              </TextListItem>,
+              </Content>,
             ])}
-          </TextList>
+          </Content>
         ) : (
           value
         )}
-      </TextListItem>
+      </Content>
     </>
   );

package/lib/common/components/ui/ExternalLink.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode, MouseEvent } from 'react';
-import { Text } from '@patternfly/react-core';
+import { Content } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 
 interface ExternalLinkProps {
@@ -16,9 +16,15 @@ const ExternalLink: React.FC<ExternalLinkProps> = ({ href, onClick, children })
   };
 
   return (
-    <Text component="a" href={href} onClick={handleClick} target="_blank" rel="noopener noreferrer">
+    <Content
+      component="a"
+      href={href}
+      onClick={handleClick}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
       {children ? children : href} <ExternalLinkAltIcon color="rgb(0, 123, 186)" />
-    </Text>
+    </Content>
   );
 };
 export default ExternalLink;

package/lib/common/components/ui/GridGap.tsx

@@ -4,6 +4,6 @@ import React from 'react';
  * This component allows to maintain grid gap behaviour of PF Form by wrapping
  * FormGroup components which are inside of Grid
  */
-const GridGap: React.FC = (props) => <div {...props} className="pf-v5-c-form" />;
+const GridGap: React.FC = (props) => <div {...props} className="pf-v6-c-form" />;
 
 export default GridGap;

package/lib/common/components/ui/NoPermissionsError.tsx

@@ -1,12 +1,10 @@
 import React from 'react';
-import { EmptyState, EmptyStateBody, EmptyStateIcon, Title } from '@patternfly/react-core';
+import { EmptyState, EmptyStateBody, Title } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
-import { global_disabled_color_100 as iconColor } from '@patternfly/react-tokens/dist/js/global_disabled_color_100';
 
 const NoPermissionsError = () => (
-  <EmptyState id="not-found">
+  <EmptyState id="not-found" icon={ExclamationTriangleIcon}>
     <EmptyStateBody>
-      <EmptyStateIcon icon={ExclamationTriangleIcon} color={iconColor.value} />
       <Title headingLevel="h2">Access permissions needed</Title>
       <EmptyStateBody>
         To create a cluster using the Assisted Installer, ask your organization administrator to

package/lib/common/components/ui/OpenShiftSelectWithSearch.tsx

@@ -195,6 +195,7 @@ export const OpenShiftSelectWithSearch: React.FunctionComponent<OpenshiftSelectW
       onClick={onToggleClick}
       isExpanded={isOpen}
       isFullWidth
+      data-testid="openshift-version-dropdown-toggle"
     >
       <TextInputGroup isPlain>
         <TextInputGroupMain
@@ -215,6 +216,7 @@ export const OpenShiftSelectWithSearch: React.FunctionComponent<OpenshiftSelectW
         <TextInputGroupUtilities>
           {!!inputValue && (
             <Button
+              icon={<TimesIcon aria-hidden />}
               variant="plain"
               onClick={() => {
                 setSelected('');
@@ -223,9 +225,7 @@ export const OpenShiftSelectWithSearch: React.FunctionComponent<OpenshiftSelectW
                 textInputRef?.current?.focus();
               }}
               aria-label="Clear input value"
-            >
-              <TimesIcon aria-hidden />
-            </Button>
+            />
           )}
         </TextInputGroupUtilities>
       </TextInputGroup>
@@ -283,7 +283,7 @@ export const OpenShiftSelectWithSearch: React.FunctionComponent<OpenshiftSelectW
       </Select>
       <FormHelperText>
         <HelperText>
-          <HelperTextItem variant="default">
+          <HelperTextItem variant="default" data-testid="openshift-select-with-search-helper-text">
             {helperText ??
               'Select an OpenShift version from the list or use the type ahead to narrow down the list.'}
           </HelperTextItem>

package/lib/common/components/ui/OpenShiftVersionDropdown.tsx

@@ -116,7 +116,10 @@ export const OpenShiftVersionDropdown = ({
         <Button
           variant="link"
           isInline
-          onClick={() => showOpenshiftVersionModal()}
+          onClick={() => {
+            setOpen(false);
+            showOpenshiftVersionModal();
+          }}
           id="show-all-versions"
         >
           {t('ai:Show all available versions')}
@@ -141,11 +144,13 @@ export const OpenShiftVersionDropdown = ({
   const dropdownToggle = (toggleRef: React.Ref<MenuToggleElement>) => (
     <MenuToggle
       id={fieldId}
-      className="pf-v5-u-w-100"
+      className="pf-v6-u-w-100"
+      style={{ minWidth: '420px' }}
       ref={toggleRef}
       isFullWidth
       onClick={() => setOpen(!isOpen)}
       isExpanded={isOpen}
+      data-testid="openshift-version-dropdown-toggle"
     >
       {current || t('ai:OpenShift version')}
     </MenuToggle>
@@ -175,16 +180,20 @@ export const OpenShiftVersionDropdown = ({
       {helperText && (
         <FormHelperText>
           <HelperText>
-            <HelperTextItem variant="default">{helperText}</HelperTextItem>
+            <HelperTextItem variant="default" data-testid="openshift-version-dropdown-helper-text">
+              {helperText}
+            </HelperTextItem>
           </HelperText>
         </FormHelperText>
       )}
       {showReleasesLink && (
-        <ExternalLink href={`${window.location.origin}/${OCP_RELEASES_PAGE}`}>
-          <span data-ouia-id="openshift-releases-link">
-            {t('ai:Learn more about OpenShift releases')}
-          </span>
-        </ExternalLink>
+        <div className="pf-v6-u-mt-sm">
+          <ExternalLink href={`${window.location.origin}/${OCP_RELEASES_PAGE}`}>
+            <span data-ouia-id="openshift-releases-link">
+              {t('ai:Learn more about OpenShift releases')}
+            </span>
+          </ExternalLink>
+        </div>
       )}
     </FormGroup>
   );

package/lib/common/components/ui/OpenShiftVersionModal.css

@@ -2,6 +2,6 @@
   height: 44vh;
   display: flex;
 }
-#customOpenshiftSelect .pf-v5-c-menu__content {
+#customOpenshiftSelect .pf-v6-c-menu__content {
   max-height: 22vh;
 }

package/lib/common/components/ui/OpenShiftVersionModal.tsx

@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
-import { Button, ButtonVariant, FormGroup, Modal, ModalVariant } from '@patternfly/react-core';
+import { Button, ButtonVariant, FormGroup } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import { OpenShiftSelectWithSearch } from './OpenShiftSelectWithSearch';
 import { HelperTextType } from './OpenShiftVersionDropdown';
 import { useFormikContext } from 'formik';