@openshift-assisted/ui-lib 2.9.0-cim → 2.9.6-cim

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

@@ -1,2 +1,3 @@
-export { default as FeatureSupportLevelProvider } from './FeatureSupportLevelProvider';
+export { default as NewFeatureSupportLevelProvider } from './FeatureSupportLevelProvider';
 export { default as ClusterFeatureSupportLevelsDetailItem } from './ReviewClusterFeatureSupportLevels';
+export * from '../../../common/components/featureSupportLevels/types';

package/lib/ocm/components/fetching/fetchEvents.ts

@@ -1,17 +1,36 @@
-import { AxiosError } from 'axios';
-import { EventListFetchProps } from '../../../common';
+import { AxiosError, AxiosResponseHeaders } from 'axios';
+import { EVENT_SEVERITIES, EventListFetchProps } from '../../../common';
 import { handleApiError } from '../../api';
 import { EventsAPI } from '../../services/apis';
+import { SeverityCountsType } from '../../../common/components/ui/ClusterEventsToolbar';
+import { Event } from '@openshift-assisted/types/assisted-installer-service';
+const parseHeaders = (headers: AxiosResponseHeaders) => {
+  const severities: Record<Event['severity'], number> = {
+    error: 0,
+    info: 0,
+    warning: 0,
+    critical: 0,
+  };
+  EVENT_SEVERITIES.forEach((severity) => {
+    const count = Number(headers[`severity-count-${severity}`]);
+    severities[severity] = count;
+  });
+  return {
+    totalEvents: Number(headers['event-count']),
+    severities: severities as SeverityCountsType,
+  };
+};
+
+const fetchEventsAsync = async (...args: Parameters<typeof onFetchEvents>): Promise<void> => {
+  const [props, onSuccess, onError] = args;
 
-export const onFetchEvents: EventListFetchProps['onFetchEvents'] = async (
-  props,
-  onSuccess,
-  onError,
-) => {
   try {
     EventsAPI.abort();
     const response = await EventsAPI.list(props);
-    onSuccess(response);
+    onSuccess({
+      data: response.data,
+      ...parseHeaders(response.headers),
+    });
   } catch (error) {
     const { code } = error as AxiosError;
     if (!code || code !== 'ERR_CANCELED') {
@@ -21,3 +40,7 @@ export const onFetchEvents: EventListFetchProps['onFetchEvents'] = async (
     }
   }
 };
+
+export const onFetchEvents: EventListFetchProps['onFetchEvents'] = (props, onSuccess, onError) => {
+  void fetchEventsAsync(props, onSuccess, onError);
+};

package/lib/ocm/components/hosts/ClusterHostsTable.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Cluster, selectSchedulableMasters, Host, isSNO } from '../../../common';
+import { selectSchedulableMasters, isSNO } from '../../../common';
 import { AdditionalNTPSourcesDialogToggle } from './AdditionaNTPSourceDialogToggle';
 import {
   discoveredAtColumn,
@@ -23,6 +23,8 @@ import {
   useHostsTableDetailContext,
 } from '../../../common/components/hosts/HostsTableDetailContext';
 import { TableVariant } from '@patternfly/react-table';
+import { ClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
+import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
 
 export function ExpandComponent({ obj: host }: ExpandComponentProps<Host>) {
   const { onDiskRole, canEditDisks, updateDiskSkipFormatting } = useHostsTableDetailContext();
@@ -44,6 +46,7 @@ export interface ClusterHostsTableProps {
 }
 
 const ClusterHostsTable = ({ cluster, skipDisabled }: ClusterHostsTableProps) => {
+  const { wizardPerPage, setWizardPerPage } = React.useContext(ClusterWizardContext) || {};
   const {
     onEditHost,
     onEditRole,
@@ -71,16 +74,16 @@ const ClusterHostsTable = ({ cluster, skipDisabled }: ClusterHostsTableProps) =>
         onEditHost,
         UpdateDay2ApiVipDialogToggle,
       ),
-      discoveredAtColumn,
-      cpuCoresColumn,
-      memoryColumn,
-      disksColumn,
+      discoveredAtColumn(t),
+      cpuCoresColumn(t),
+      memoryColumn(t),
+      disksColumn(t),
     ],
     [t, onEditHost, actionChecks, onEditRole, cluster],
   );
 
   const hosts = cluster.hosts || [];
-  const paginationProps = usePagination(hosts.length);
+  const paginationProps = usePagination(hosts.length, wizardPerPage, setWizardPerPage);
 
   return (
     <>

package/lib/ocm/components/hosts/DeleteHostModal.tsx

@@ -10,7 +10,7 @@ type DeleteHostModalProps = {
 
 const DeleteHostModal = ({ isOpen, hostname, onClose, onDelete }: DeleteHostModalProps) => (
   <Modal
-    title="Delete Host"
+    title="Remove host?"
     isOpen={isOpen}
     onClose={onClose}
     variant={ModalVariant.small}
@@ -21,14 +21,14 @@ const DeleteHostModal = ({ isOpen, hostname, onClose, onDelete }: DeleteHostModa
         variant={ButtonVariant.danger}
         onClick={onDelete}
       >
-        Delete
+        Remove host
       </Button>,
       <Button key="cancel" variant={ButtonVariant.link} onClick={onClose}>
         Cancel
       </Button>,
     ]}
   >
-    Are you sure you want to delete host{` ${hostname || ''}`} ?
+    Host {hostname || ''} will be removed.
   </Modal>
 );
 

package/lib/ocm/components/hosts/HardwareStatus.tsx

@@ -4,16 +4,16 @@ import {
   areOnlySoftValidationsOfWizardStepFailing,
   getWizardStepHostStatus,
   getWizardStepHostValidationsInfo,
-  Host,
   HostsTableActions,
   hostStatus,
   HostStatus,
-  stringToJSON,
 } from '../../../common';
 import { TableRow } from '../../../common/components/hosts/AITable';
 import { ValidationsInfo } from '../../../common/types/hosts';
 import { wizardStepsValidationsMap } from '../clusterWizard/wizardTransition';
 import { AdditionalNTPSourcesDialogToggle } from './AdditionaNTPSourceDialogToggle';
+import { stringToJSON } from '../../../common/utils';
+import { Host } from '@openshift-assisted/types/assisted-installer-service';
 
 type HardwareStatusProps = {
   host: Host;

package/lib/ocm/components/hosts/HostRequirementsContent.tsx

@@ -1,7 +1,9 @@
 import React from 'react';
 import { List, ListItem, Text, TextContent } from '@patternfly/react-core';
-import { Cluster, ErrorState, ExternalLink, LoadingState, fileSize } from '../../../common';
+import { ErrorState, ExternalLink, LoadingState } from '../../../common';
 import { useClusterPreflightRequirements } from '../../hooks';
+import { fileSize } from '../../../common/utils';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 const DISK_WRITE_SPEED_LINK = 'https://access.redhat.com/solutions/4885641';
 

package/lib/ocm/components/hosts/HostsDiscoveryTable.tsx

@@ -3,8 +3,6 @@ import { Stack, StackItem } from '@patternfly/react-core';
 import {
   ChangeHostnameAction,
   selectSchedulableMasters,
-  Cluster,
-  Host,
   isSNO,
   DeleteHostAction,
   TableToolbar,
@@ -28,7 +26,9 @@ import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { hardwareStatusColumn } from './HardwareStatus';
 import HostsTableEmptyState from '../hosts/HostsTableEmptyState';
 import { useSelector } from 'react-redux';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
+import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
+import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
 
 const HostRowDetailExpand = ({ obj: host }: ExpandComponentProps<Host>) => (
   <HostDetail
@@ -55,6 +55,7 @@ const HostsDiscoveryTable = ({ cluster }: HostsDiscoveryTableProps) => {
     onMassDeleteHost,
     ...modalProps
   } = useHostsTable(cluster);
+  const { wizardPerPage, setWizardPerPage } = useClusterWizardContext();
 
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
   const isSNOCluster = isSNO(cluster);
@@ -70,17 +71,17 @@ const HostsDiscoveryTable = ({ cluster }: HostsDiscoveryTableProps) => {
         cluster.kind,
       ),
       hardwareStatusColumn({ onEditHostname: onEditHost }),
-      discoveredAtColumn,
-      cpuCoresColumn,
-      memoryColumn,
-      disksColumn,
+      discoveredAtColumn(t),
+      cpuCoresColumn(t),
+      memoryColumn(t),
+      disksColumn(t),
       countColumn(cluster),
     ],
     [t, onEditHost, actionChecks.canEditHostname, actionChecks.canEditRole, onEditRole, cluster],
   );
 
   const hosts = cluster.hosts || [];
-  const paginationProps = usePagination(hosts.length);
+  const paginationProps = usePagination(hosts.length, wizardPerPage, setWizardPerPage);
   const itemIDs = hosts.map((h) => h.id);
   const showBulkActions = !(isViewerMode || isSNOCluster);
 

package/lib/ocm/components/hosts/HostsDiscoveryTroubleshootingInfoLinkWithModal.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import InfoLinkWithModal from '../ui/InfoLinkWithModal';
-import { pluralize } from 'humanize-plus';
 import { DiscoveryTroubleshootingModalContent } from '../../../common';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 export interface HostsDiscoveryTroubleshootingInfoLinkWithModalProps {
   isInline?: boolean;
@@ -12,10 +12,12 @@ const HostsDiscoveryTroubleshootingInfoLinkWithModal = ({
   isInline = false,
   isSingleNode = false,
 }: HostsDiscoveryTroubleshootingInfoLinkWithModalProps) => {
+  const { t } = useTranslation();
+
   return (
     <InfoLinkWithModal
-      linkText={`${pluralize(+isSingleNode, 'Host')} not showing up?`}
-      modalTitle={'Hosts not showing up troubleshooter'}
+      linkText={t('ai:Host not showing up?', { count: isSingleNode ? 1 : 2 })}
+      modalTitle={t('ai:Hosts not showing up troubleshooter')}
       modalVariant={'large'}
       isInline={isInline}
       linkId="link-host-troubleshooting"

package/lib/ocm/components/hosts/HostsStorageTable.tsx

@@ -12,8 +12,6 @@ import {
 } from '../../../common/components/storage/StorageUtils';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import {
-  Cluster,
-  Host,
   hasEnabledOperators,
   isCompact,
   selectSchedulableMasters,
@@ -30,6 +28,8 @@ import {
   useHostsTableDetailContext,
 } from '../../../common/components/hosts/HostsTableDetailContext';
 import { hardwareStatusColumn } from './HardwareStatus';
+import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
+import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
 
 export function ExpandComponent({ obj: host }: ExpandComponentProps<Host>) {
   const { onDiskRole, canEditDisks, updateDiskSkipFormatting } = useHostsTableDetailContext();
@@ -54,13 +54,14 @@ const HostsStorageTable = ({ cluster }: { cluster: Cluster }) => {
     updateDiskSkipFormatting,
     ...modalProps
   } = useHostsTable(cluster);
+  const { wizardPerPage, setWizardPerPage } = useClusterWizardContext();
 
   const content = React.useMemo(() => {
     const columns = [
       hostnameColumn(t, onEditHost, undefined, actionChecks.canEditHostname),
       roleColumn(t, undefined, undefined, selectSchedulableMasters(cluster)),
       hardwareStatusColumn({}),
-      disksColumn,
+      disksColumn(t),
       numberOfDisksColumn,
     ];
     if (hasEnabledOperators(cluster.monitoredOperators, OPERATOR_NAME_ODF)) {
@@ -72,7 +73,7 @@ const HostsStorageTable = ({ cluster }: { cluster: Cluster }) => {
   }, [actionChecks.canEditHostname, cluster, onEditHost, t]);
 
   const hosts = cluster.hosts || [];
-  const paginationProps = usePagination(hosts.length);
+  const paginationProps = usePagination(hosts.length, wizardPerPage, setWizardPerPage);
 
   return (
     <>

package/lib/ocm/components/hosts/HostsTableEmptyState.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ConnectedIcon } from '@patternfly/react-icons';
-import { pluralize } from 'humanize-plus';
 import EmptyState from '../../../common/components/ui/uiState/EmptyState';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import HostsDiscoveryTroubleshootingInfoLinkWithModal from './HostsDiscoveryTroubleshootingInfoLinkWithModal';
 
 export interface HostsTableEmptyStateProps {
@@ -9,11 +9,13 @@ export interface HostsTableEmptyStateProps {
 }
 
 const HostsTableEmptyState = ({ isSingleNode = false }: HostsTableEmptyStateProps) => {
+  const { t } = useTranslation();
+
   return (
     <EmptyState
       icon={ConnectedIcon}
-      title={`Waiting for ${pluralize(+isSingleNode, 'host')}...`}
-      content="Hosts may take a few minutes to appear here after booting."
+      title={t('ai:Waiting for host...', { count: isSingleNode ? 1 : 2 })}
+      content={t('ai:Hosts may take a few minutes to appear here after booting.')}
       secondaryActions={[
         <HostsDiscoveryTroubleshootingInfoLinkWithModal key={'hosts-not-showing'} />,
       ]}

package/lib/ocm/components/hosts/ModalDialogsContext.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { Host, Inventory, Cluster } from '../../../common';
 import { dialogsSlice } from '../../../common';
+import { Cluster, Host, Inventory } from '@openshift-assisted/types/assisted-installer-service';
 
 const { openDialog: openDialogAction, closeDialog: closeDialogAction } = dialogsSlice.actions;
 const dialogsReducer = dialogsSlice.reducer;

package/lib/ocm/components/hosts/OdfDisksManualFormattingHint.tsx

@@ -1,15 +1,5 @@
 import React from 'react';
-import { Alert, AlertVariant, Text, TextContent, TextVariants } from '@patternfly/react-core';
-
-const Hint = () => (
-  <TextContent>
-    <Text component={TextVariants.p}>
-      All non-installation disks will be used for local storage and must be formatted before the
-      storage operator's installation. To view and format available disks, expand each host row in
-      the table.
-    </Text>
-  </TextContent>
-);
+import { Alert, AlertVariant } from '@patternfly/react-core';
 
 const OdfDisksManualFormattingHint = () => {
   return (
@@ -18,7 +8,8 @@ const OdfDisksManualFormattingHint = () => {
       isInline
       title="Make sure you format all non-installation disks"
     >
-      <Hint />
+      All non-installation disks will be used for local storage and must be formatted before the
+      storage operator's installation.
     </Alert>
   );
 };

package/lib/ocm/components/hosts/StorageAlerts.tsx

@@ -1,13 +1,15 @@
 import * as React from 'react';
-import { Stack, StackItem } from '@patternfly/react-core';
+import { Alert, AlertVariant, List, ListItem, Stack, StackItem } from '@patternfly/react-core';
 import {
-  Cluster,
   FormatDiskWarning,
+  getInventory,
   hasEnabledOperators,
   OPERATOR_NAME_ODF,
 } from '../../../common';
 import { isAddHostsCluster, isSomeDisksSkipFormatting } from '../clusters/utils';
 import OdfDisksManualFormattingHint from './OdfDisksManualFormattingHint';
+import { getDiskLimitation } from '../../../common/components/storage/DisksTable';
+import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
 
 const StorageAlerts = ({ cluster }: { cluster: Cluster }) => {
   const showFormattingHint =
@@ -15,8 +17,54 @@ const StorageAlerts = ({ cluster }: { cluster: Cluster }) => {
     !isAddHostsCluster(cluster);
   const someDisksAreSkipFormatting = isSomeDisksSkipFormatting(cluster);
 
+  const diskLimitations = [...(cluster.hosts as Host[])]
+    ?.sort(
+      (a, b) =>
+        (a.requestedHostname && a.requestedHostname.localeCompare(b.requestedHostname as string)) ||
+        0,
+    )
+    ?.map((host) => {
+      const disks = getInventory(host).disks || [];
+      const installationDisk = disks.find((disk) => disk.id === host.installationDiskId);
+      if (installationDisk) {
+        const holder = disks.find((d) =>
+          installationDisk.holders?.split(',').includes(d.name as string),
+        );
+
+        if (holder) {
+          return getDiskLimitation(installationDisk.name, host.requestedHostname, holder);
+        }
+      }
+    })
+    .filter(Boolean);
+
   return (
     <Stack hasGutter>
+      {!!diskLimitations.length && (
+        <StackItem>
+          {diskLimitations?.length === 1 ? (
+            <Alert
+              title={diskLimitations[0]}
+              isInline
+              variant={AlertVariant.warning}
+              data-testid="diskLimitationsAlert"
+            />
+          ) : (
+            <Alert
+              title="Installation disk limitations"
+              isInline
+              variant={AlertVariant.warning}
+              data-testid="diskLimitationsAlert"
+            >
+              <List>
+                {diskLimitations.map((warning, index) => (
+                  <ListItem key={`installationWarning-${index}`}>{warning}</ListItem>
+                ))}
+              </List>
+            </Alert>
+          )}
+        </StackItem>
+      )}
       {showFormattingHint && (
         <StackItem>
           <OdfDisksManualFormattingHint />

package/lib/ocm/components/hosts/use-hosts-table.tsx

@@ -2,12 +2,7 @@ import * as React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   useAlerts,
-  Cluster,
-  Disk,
-  DiskRole,
   EventsModal,
-  Host,
-  HostUpdateParams,
   AddHostsContext,
   MassChangeHostnameModal,
   getInventory,
@@ -25,7 +20,7 @@ import {
   setServerUpdateError,
   updateCluster,
   updateHost,
-} from '../../reducers/clusters';
+} from '../../store/slices/current-cluster/slice';
 import { useModalDialogsContext } from './ModalDialogsContext';
 import { downloadHostInstallationLogs, onAdditionalNtpSourceAction } from './utils';
 import {
@@ -52,8 +47,19 @@ import UpdateDay2ApiVipModal from './UpdateDay2ApiVipModal';
 import { UpdateDay2ApiVipFormProps } from './UpdateDay2ApiVipForm';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { selectCurrentClusterPermissionsState, selectCurrentClusterState } from '../../selectors';
 import { hardwareStatusColumn } from './HardwareStatus';
+import { ClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
+import {
+  Cluster,
+  Disk,
+  DiskRole,
+  Host,
+  HostUpdateParams,
+} from '@openshift-assisted/types/assisted-installer-service';
+import {
+  selectCurrentClusterPermissionsState,
+  selectCurrentClusterState,
+} from '../../store/slices/current-cluster/selectors';
 
 export const useHostsTable = (cluster: Cluster) => {
   const { addAlert } = useAlerts();
@@ -67,6 +73,7 @@ export const useHostsTable = (cluster: Cluster) => {
   } = useModalDialogsContext();
   const { resetCluster } = React.useContext(AddHostsContext);
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
+  const { t } = useTranslation();
 
   const dispatch = useDispatch();
 
@@ -329,6 +336,7 @@ export const useHostsTable = (cluster: Cluster) => {
   const actionResolver = React.useMemo(
     () =>
       hostActionResolver({
+        t,
         ...actionChecks,
         onEditRole,
         onDiskRole,
@@ -341,6 +349,7 @@ export const useHostsTable = (cluster: Cluster) => {
         ...hostActions,
       }),
     [
+      t,
       actionChecks,
       hostActions,
       onEditRole,
@@ -440,6 +449,7 @@ export const HostsTableModals = ({
   onAdditionalNtpSource,
   onUpdateDay2ApiVip,
 }: HostsTableModalsProps) => {
+  const { wizardPerPage, setWizardPerPage } = React.useContext(ClusterWizardContext) || {};
   const dispatch = useDispatch();
   const { resetCluster } = React.useContext(AddHostsContext);
   const { uiState } = useSelector(selectCurrentClusterState);
@@ -460,7 +470,11 @@ export const HostsTableModals = ({
     () => [hostnameColumn(t), hardwareStatusColumn({ isWithinModal: true })],
     [t],
   );
-  const paginationProps = usePagination(massDeleteHostDialog.data?.hosts?.length || 0);
+  const paginationProps = usePagination(
+    massDeleteHostDialog.data?.hosts?.length || 0,
+    wizardPerPage,
+    setWizardPerPage,
+  );
 
   if (uiState === ResourceUIState.UPDATE_ERROR) {
     // Do not show a modal beneath the ServerUpdateError

package/lib/ocm/components/hosts/utils.ts

@@ -1,17 +1,17 @@
 import { saveAs } from 'file-saver';
+import type { AlertsContextType } from '../../../common';
+
+import { isInOcm, handleApiError, getApiErrorMessage } from '../../api';
+import { updateCluster } from '../../store/slices/current-cluster/slice';
+import { ClustersService } from '../../services';
+import ClustersAPI from '../../../common/api/assisted-service/ClustersAPI';
+import { stringToJSON } from '../../../common/utils';
 import {
-  AlertsContextType,
   Cluster,
-  V2ClusterUpdateParams,
   Host,
-  stringToJSON,
   Inventory,
-} from '../../../common';
-
-import { ocmClient, handleApiError, getApiErrorMessage } from '../../api';
-import { updateCluster } from '../../reducers/clusters';
-import { ClustersService } from '../../services';
-import ClustersAPI from '../../services/apis/ClustersAPI';
+  V2ClusterUpdateParams,
+} from '@openshift-assisted/types/assisted-installer-service';
 
 export const downloadHostInstallationLogs = async (
   addAlert: AlertsContextType['addAlert'],
@@ -23,7 +23,7 @@ export const downloadHostInstallationLogs = async (
         `Cannot download logs for host ${host.id}. Missing clusterId field value in host.`,
       );
     }
-    if (ocmClient) {
+    if (isInOcm) {
       const { data } = await ClustersAPI.getPresignedForClusterFiles({
         clusterId: host.clusterId,
         fileName: 'logs',

package/lib/ocm/components/index.ts

@@ -1,7 +1,7 @@
 export * from './clusterDetail';
 export * from './clusters';
 export * from './ui';
-export * from './Router';
+export * from './Routes';
 export * from './AddHosts';
 export * from './clusterWizard';
 export * from './HostsClusterDetailTab';

package/lib/ocm/components/ui/OcmFormFields.tsx

@@ -1,21 +1,19 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { Checkbox, CheckboxProps, Radio, RadioProps } from '@patternfly/react-core';
-import { selectCurrentClusterPermissionsState } from '../../selectors';
+import { selectCurrentClusterPermissionsState } from '../../store/slices/current-cluster/selectors';
 import {
   CheckboxField,
   CodeField,
   InputField,
   RadioField,
   RichInputField,
-  SelectField,
   SwitchField,
 } from '../../../common';
 import {
   CheckboxFieldProps,
   CodeFieldProps,
   RadioFieldProps,
-  SelectFieldProps,
   SwitchFieldProps,
 } from '../../../common/components/ui/formik/types';
 import { RichInputFieldPropsProps } from '../../../common/components/ui/formik/RichInputField';
@@ -46,27 +44,41 @@ export function RefFormFieldDisabler<T extends DisableableField>(
 
 // Formik Fields
 const OcmInputField = FormFieldDisabler<React.ComponentProps<typeof InputField>>(InputField);
-const OcmSelectField = FormFieldDisabler<SelectFieldProps>(SelectField);
+type OcmInputFieldProps = Parameters<typeof OcmInputField>[0];
 const OcmCheckboxField = FormFieldDisabler<CheckboxFieldProps>(CheckboxField);
+type OcmCheckboxFieldProps = Parameters<typeof OcmCheckboxField>[0];
 const OcmSwitchField = FormFieldDisabler<SwitchFieldProps>(SwitchField);
+type OcmSwitchFieldProps = Parameters<typeof OcmSwitchField>[0];
 const OcmRadioField = FormFieldDisabler<RadioFieldProps>(RadioField);
+type OcmRadioFieldProps = Parameters<typeof OcmRadioField>[0];
 const OcmCodeField = FormFieldDisabler<CodeFieldProps>(CodeField);
+type OcmCodeFieldProps = Parameters<typeof OcmCodeField>[0];
 
 // Patternfly components
 const OcmCheckbox = FormFieldDisabler<CheckboxProps>(Checkbox);
+type OcmCheckboxProps = Parameters<typeof OcmCheckbox>[0];
 const OcmRadio = FormFieldDisabler<RadioProps>(Radio);
+type OcmRadioProps = Parameters<typeof OcmRadio>[0];
 
 // With forwardRef
 const OcmRichInputField = RefFormFieldDisabler<RichInputFieldPropsProps>(RichInputField);
+type OcmRichInputFieldProps = Parameters<typeof OcmRichInputField>[0];
 
 export {
   OcmInputField,
+  OcmInputFieldProps,
   OcmRichInputField,
-  OcmSelectField,
+  OcmRichInputFieldProps,
   OcmCheckbox,
+  OcmCheckboxProps,
   OcmCheckboxField,
+  OcmCheckboxFieldProps,
   OcmCodeField,
+  OcmCodeFieldProps,
   OcmSwitchField,
+  OcmSwitchFieldProps,
   OcmRadioField,
+  OcmRadioFieldProps,
   OcmRadio,
+  OcmRadioProps,
 };

package/lib/ocm/config/constants.ts

@@ -1,8 +1,8 @@
 import {
   AssistedInstallerOCMPermissionTypesListType,
   AssistedInstallerPermissionTypesListType,
-  Cluster,
 } from '../../common';
+import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 
 /* Used from Integration tests so we can mock the permissions */
 export type ExtendedCluster = Cluster & {

package/lib/ocm/hooks/useClusterCustomManifests.ts

@@ -1,6 +1,10 @@
 import React from 'react';
 import { alertsSlice } from '../../common/reducers';
-import { Cluster, ListManifests, Manifest } from '../../common/api/types';
+import {
+  Cluster,
+  ListManifests,
+  Manifest,
+} from '@openshift-assisted/types/assisted-installer-service';
 import { ClustersAPI } from '../services/apis';
 import { getApiErrorMessage, handleApiError } from '../api';
 import { getErrorMessage } from '../../common/utils';

package/lib/ocm/hooks/useClusterPreflightRequirements.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import { alertsSlice } from '../../common/reducers';
-import { Cluster, PreflightHardwareRequirements } from '../../common/api/types';
+import {
+  Cluster,
+  PreflightHardwareRequirements,
+} from '@openshift-assisted/types/assisted-installer-service';
 import { ClustersAPI } from '../services/apis';
 import { getApiErrorMessage, handleApiError } from '../api';
 import { getErrorMessage } from '../../common/utils';