@openshift-assisted/ui-lib 5.0.1-cim → 5.0.2-cim

package/lib/cim/components/Hypershift/HostedClusterWizard/DetailsStep/StorageClassDropdown.tsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import Fuse from 'fuse.js';
+import { StorageClassK8sResource } from '../../../../types';
+import { SelectFieldWithSearch, useTranslation } from '../../../../../common';
+import { useField } from 'formik';
+
+const NO_RESULTS = 'no_results';
+
+export const StorageClassDropdown = ({
+  storageClasses,
+}: {
+  storageClasses: StorageClassK8sResource[];
+}) => {
+  const { t } = useTranslation();
+  const [filter, setFilter] = React.useState('');
+  const [, , { setValue }] = useField('storageClass');
+
+  const storageClassItems = React.useMemo(
+    () =>
+      storageClasses.map((storageClass) => ({
+        value: storageClass.metadata?.name as string,
+        children: storageClass.metadata?.name as string,
+      })),
+    [storageClasses],
+  );
+
+  const fuse = React.useMemo(() => {
+    return new Fuse(storageClassItems, {
+      includeScore: true,
+      ignoreLocation: true,
+      threshold: 0.3,
+      keys: ['value'],
+    });
+  }, [storageClassItems]);
+
+  const selectOptions = React.useMemo(() => {
+    if (filter) {
+      const newSelectOptions = fuse
+        .search(filter)
+        .sort((a, b) => (a.score || 0) - (b.score || 0))
+        .map(({ item }) => item);
+
+      if (!newSelectOptions.length) {
+        return [
+          {
+            isAriaDisabled: true,
+            children: t('ai:No results found for {{filter}}', { filter }),
+            value: NO_RESULTS,
+            hasCheckbox: false,
+          },
+        ];
+      }
+      return newSelectOptions;
+    }
+    return storageClassItems;
+  }, [filter, fuse, storageClassItems, t]);
+
+  return (
+    <SelectFieldWithSearch
+      selectOptions={selectOptions}
+      filterValue={filter}
+      setFilterValue={setFilter}
+      name={'storageClass'}
+      label={t('ai:Storage class')}
+      placeholder={t('ai:No storage class selected')}
+      helperText={t('ai:Persistent volume storage class for etcd data volumes')}
+      onClear={() => setValue('')}
+    />
+  );
+};

package/lib/cim/components/Hypershift/HostedClusterWizard/DetailsStep/types.ts

@@ -1,7 +1,11 @@
 import { FormikProps } from 'formik';
 import { ObjectSchema } from 'yup';
 import { OpenshiftVersionOptionType } from '../../../../../common';
-import { ClusterImageSetK8sResource, ConfigMapK8sResource } from '../../../../types';
+import {
+  ClusterImageSetK8sResource,
+  ConfigMapK8sResource,
+  StorageClassK8sResource,
+} from '../../../../types';
 
 export type DetailsFormValues = {
   name: string;
@@ -9,6 +13,7 @@ export type DetailsFormValues = {
   pullSecret: string;
   baseDnsDomain: string;
   customOpenshiftSelect: string | null;
+  storageClass: string;
 };
 
 type UseDetailsFormikArgs = {
@@ -22,7 +27,9 @@ export type UseDetailsFormik = (
   args: UseDetailsFormikArgs,
 ) => [
   DetailsFormValues,
-  ObjectSchema<Omit<DetailsFormValues, 'openshiftVersion' | 'customOpenshiftSelect'>>,
+  ObjectSchema<
+    Omit<DetailsFormValues, 'openshiftVersion' | 'customOpenshiftSelect' | 'storageClass'>
+  >,
 ];
 
 export type DetailsStepProps = {
@@ -40,4 +47,5 @@ export type DetailsStepProps = {
 export type DetailsFormProps = Pick<DetailsStepProps, 'onValuesChanged' | 'extensionAfter'> & {
   ocpVersions: OpenshiftVersionOptionType[];
   allVersions: OpenshiftVersionOptionType[];
+  storageClasses: StorageClassK8sResource[];
 };

package/lib/cim/components/Hypershift/hooks/useSupportedOCPVersions.ts

@@ -2,6 +2,7 @@ import * as React from 'react';
 // import { getErrorMessage } from '../../../../common/utils';
 import { ClusterImageSetK8sResource, ConfigMapK8sResource } from '../../../types';
 import { getOCPVersions } from '../../helpers';
+import { TFunction } from 'i18next';
 
 export const getSupportedCM = (configMaps: ConfigMapK8sResource[]) =>
   configMaps.find(
@@ -10,11 +11,12 @@ export const getSupportedCM = (configMaps: ConfigMapK8sResource[]) =>
 
 export const useSupportedOCPVersions = (
   clusterImages: ClusterImageSetK8sResource[],
+  t: TFunction,
   supportedVersionsCM?: ConfigMapK8sResource,
   extended?: boolean,
 ) => {
   return React.useMemo(() => {
-    const ocpVersions = getOCPVersions(clusterImages, false, undefined, extended);
+    const ocpVersions = getOCPVersions(clusterImages, t, false, undefined, extended);
     const supportedVersionsString = supportedVersionsCM?.data?.['supported-versions'];
     if (supportedVersionsString) {
       try {
@@ -26,5 +28,5 @@ export const useSupportedOCPVersions = (
       }
     }
     return ocpVersions;
-  }, [clusterImages, extended, supportedVersionsCM?.data]);
+  }, [clusterImages, extended, supportedVersionsCM?.data, t]);
 };

package/lib/cim/components/InfraEnv/EnvironmentErrors.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
+import { Alert, AlertVariant, ModalBody } from '@patternfly/react-core';
 import { getFailingResourceConditions } from '../helpers';
 import { InfraEnvK8sResource } from '../../types';
 import { SingleResourceAlerts } from '../common/ResourceAlerts';
-import { Alert, AlertVariant } from '@patternfly/react-core';
 import { getInfraEnvDocs } from '../common/constants';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
@@ -25,8 +25,8 @@ export const EnvironmentErrors: React.FC<EnvironmentErrorsProps> = ({
   }
 
   return (
-    <>
-      {!infraEnv.status && (
+    <ModalBody>
+      {!infraEnv.status ? (
         <Alert
           title={t('ai:Central infrastructure management is not running')}
           variant={AlertVariant.warning}
@@ -42,11 +42,12 @@ export const EnvironmentErrors: React.FC<EnvironmentErrorsProps> = ({
             'ai:It seems the Central infrastructure management is not configured which will prevent its features to be used. Please refer to the documentation for the first time setup steps.',
           )}
         </Alert>
+      ) : (
+        <SingleResourceAlerts
+          title={t('ai:Failing infrastructure environment')}
+          conditions={infraEnvAlerts}
+        />
       )}
-      <SingleResourceAlerts
-        title={t('ai:Failing infrastructure environment')}
-        conditions={infraEnvAlerts}
-      />
-    </>
+    </ModalBody>
   );
 };

package/lib/cim/components/InfraEnv/InfraEnvAgentTable.tsx

@@ -66,7 +66,6 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
   getClusterDeploymentLink,
   bareMetalHosts,
   infraEnv,
-  nmStates,
   onChangeHostname,
   onChangeBMHHostname,
   onMassDeleteHost,
@@ -287,7 +286,6 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
           agents={selectedAgents}
           bmhs={selectedBMHs}
           infraEnv={infraEnv}
-          nmStates={nmStates}
           onDelete={onMassDeleteHost}
           onClose={() => setMassDeleteOpen(false)}
         />

package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx

@@ -213,7 +213,7 @@ const InfraEnvForm: React.FC<React.PropsWithChildren<InfraEnvFormProps>> = ({
                                   window.open(
                                     getOCPStaticIPDocLink(docVersion),
                                     '_blank',
-                                    'noopener',
+                                    'noopener,noreferrer',
                                   )
                                 }
                               >

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

@@ -1,22 +1,21 @@
-import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
+import { TFunction } from 'i18next';
 import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
-import { AgentK8sResource } from '../../types/k8s/agent';
-import { BareMetalHostK8sResource } from '../../types/k8s/bare-metal-host';
-import { StatusCondition } from '../../types/k8s/shared';
-import { ValidationsInfo } from '../../../common/types/hosts';
+import {
+  AgentClusterInstallK8sResource,
+  AgentK8sResource,
+  BareMetalHostK8sResource,
+  StatusCondition,
+} from '../../types';
+import { HostStatusDef } from '../../../common';
 import {
   areOnlySoftValidationsOfWizardStepFailing,
   getWizardStepHostStatus,
   getWizardStepHostValidationsInfo,
 } from '../../../common/components/clusterWizard/validationsInfoUtils';
-import {
-  ClusterWizardStepsType,
-  wizardStepsValidationsMap,
-} from '../ClusterDeployment/wizardTransition';
-import { HostStatusDef } from '../../../common';
-import { agentStatus } from './agentStatus';
-import { TFunction } from 'i18next';
+import { ValidationsInfo } from '../../../common/types/hosts';
 import { HostStatus } from '../../../common/components/hosts/types';
+import { wizardStepsValidationsMap, ClusterDeploymentWizardStepsType } from '../ClusterDeployment';
+import { agentStatus } from './agentStatus';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const conditionsByTypeReducer = <K>(
@@ -82,7 +81,7 @@ export const getAgentStatus = (
 
 export const getWizardStepAgentStatus = (
   agent: AgentK8sResource,
-  wizardStepId: ClusterWizardStepsType,
+  wizardStepId: ClusterDeploymentWizardStepsType,
   t: TFunction,
   excludeDiscovered = false,
 ): { status: HostStatusDef; validationsInfo: ValidationsInfo } => {

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

@@ -18,6 +18,7 @@ import {
 } from '../common/constants';
 import { getAgentProgress, getAgentRole, getInfraEnvNameOfAgent } from './agents';
 import { getClusterDeploymentCpuArchitecture } from './clusterDeployment';
+import { getVersionFromReleaseString } from './versions';
 
 export const getAIHosts = (
   agents: AgentK8sResource[],
@@ -118,18 +119,6 @@ export const getAIHosts = (
   return [...hosts, ...restBmhs];
 };
 
-const extractVersionFromImageSetRef = (imageSetRefName?: string): string | undefined => {
-  if (!imageSetRefName) {
-    return undefined;
-  }
-  // Match pattern like "4.19.18" or "4.19" in strings like "img4.19.18-multi-appsub"
-  const versionMatch = imageSetRefName.match(/(\d+\.\d+)(?:\.\d+)?/);
-  if (versionMatch && versionMatch[1]) {
-    return versionMatch[1];
-  }
-  return undefined;
-};
-
 export const getAICluster = ({
   clusterDeployment,
   agentClusterInstall,
@@ -142,12 +131,13 @@ export const getAICluster = ({
   infraEnv?: InfraEnvK8sResource;
 }): Cluster => {
   const imageSetRefName = agentClusterInstall?.spec?.imageSetRef?.name;
-  const extractedVersion = extractVersionFromImageSetRef(imageSetRefName);
+  const extractedVersion = getVersionFromReleaseString(imageSetRefName);
 
   const installVersion =
     clusterDeployment.status?.installVersion ||
     clusterDeployment.metadata?.labels?.[OCP_VERSION_MAJOR_MINOR] ||
     extractedVersion;
+
   const [status, statusInfo] = getClusterStatus(agentClusterInstall);
   const aiCluster: Cluster = {
     id: clusterDeployment.metadata?.uid || '',

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

@@ -1,4 +1,5 @@
 import { describe, expect, test } from 'vitest';
+import { TFunction } from 'react-i18next';
 import { CpuArchitecture } from '../../../common/types/cpuArchitecture';
 import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
 import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
@@ -13,6 +14,8 @@ import {
 } from './versions';
 import { OpenshiftVersionOptionType } from '../../../common/types/versions';
 
+const t: TFunction = (t: string) => t;
+
 const ClusterImageSetApiVersion = 'hive.openshift.io/v1';
 const ClusterImageSetKind = 'ClusterImageSet';
 
@@ -86,7 +89,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.16.1-x86_64' },
     });
-    expect(getOCPVersions([hidden])).toEqual([]);
+    expect(getOCPVersions([hidden], t)).toEqual([]);
   });
 
   test('includes image sets without visible true when extended is true', () => {
@@ -97,7 +100,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.16.2-x86_64' },
     });
-    const result = getOCPVersions([hidden], undefined, undefined, true);
+    const result = getOCPVersions([hidden], t, undefined, undefined, true);
     expect(result).toHaveLength(1);
     expect(result[0]?.version).toBe('4.16.2');
     expect(result[0]?.default).toBe(true);
@@ -118,7 +121,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.21.0-x86_64' },
     });
-    const result = getOCPVersions([a, b]);
+    const result = getOCPVersions([a, b], t);
     expect(result.map((v) => v.version)).toEqual(['4.21.0', '4.15.0']);
   });
 
@@ -137,7 +140,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.16.0-x86_64' },
     });
-    const result = getOCPVersions([first, second]);
+    const result = getOCPVersions([first, second], t);
     expect(result[0]?.default).toBe(true);
     expect(result[1]?.default).toBe(false);
   });
@@ -164,7 +167,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.16.0-x86_64' },
     });
-    const result = getOCPVersions([dupA, dupB, other]);
+    const result = getOCPVersions([dupA, dupB, other], t);
     expect(result.map((v) => v.value)).toEqual(['dup-a', 'other']);
     expect(result.map((v) => v.version)).toEqual(['4.17.0', '4.16.0']);
   });
@@ -184,7 +187,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.16.1-multi' },
     });
-    const result = getOCPVersions([x86, multi], true);
+    const result = getOCPVersions([x86, multi], t, true);
     expect(result.map((v) => v.value)).toEqual(['nut-x86']);
   });
 
@@ -196,7 +199,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.16.2-multi' },
     });
-    const result = getOCPVersions([cis], true);
+    const result = getOCPVersions([cis], t, true);
     expect(result).toHaveLength(1);
     expect(result[0]?.value).toBe('nut-label');
   });
@@ -217,7 +220,7 @@ describe('getOCPVersions', () => {
       spec: { releaseImage: 'quay.io/ocp/release:4.19.0-x86_64' },
     });
     const osImages = [makeOsImage({ openshiftVersion: '4.18' })];
-    const result = getOCPVersions([inRange, outRange], false, osImages);
+    const result = getOCPVersions([inRange, outRange], t, false, osImages);
     expect(result.map((v) => v.value)).toEqual(['in']);
   });
 
@@ -229,7 +232,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.17.0-multi' },
     });
-    const result = getOCPVersions([cis]);
+    const result = getOCPVersions([cis], t);
     expect(result[0]?.cpuArchitectures).toEqual([CpuArchitecture.x86]);
   });
 
@@ -241,7 +244,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.17.0-multi' },
     });
-    const result = getOCPVersions([cis]);
+    const result = getOCPVersions([cis], t);
     expect(result[0]?.cpuArchitectures).toEqual([CpuArchitecture.ARM]);
   });
 
@@ -253,7 +256,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.17.0-multi' },
     });
-    const result = getOCPVersions([cis]);
+    const result = getOCPVersions([cis], t);
     expect(result[0]?.cpuArchitectures).toEqual([CpuArchitecture.MULTI]);
   });
 
@@ -265,7 +268,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.17.0-multi' },
     });
-    const result = getOCPVersions([cis]);
+    const result = getOCPVersions([cis], t);
     expect(result[0]?.cpuArchitectures).toEqual([CpuArchitecture.s390x]);
   });
 
@@ -280,7 +283,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.17.1-x86-64' },
     });
-    const result = getOCPVersions([cis]);
+    const result = getOCPVersions([cis], t);
     expect(result[0]?.cpuArchitectures).toEqual([CpuArchitecture.x86]);
   });
 
@@ -296,7 +299,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.19.0-multi' },
     });
-    const result = getOCPVersions([cis]);
+    const result = getOCPVersions([cis], t);
     expect(result[0]?.cpuArchitectures).toEqual([CpuArchitecture.x86]);
   });
 
@@ -308,7 +311,7 @@ describe('getOCPVersions', () => {
       },
       spec: { releaseImage: 'quay.io/ocp/release:4.17.0' },
     });
-    const result = getOCPVersions([cis]);
+    const result = getOCPVersions([cis], t);
     expect(result[0]?.cpuArchitectures).toBeUndefined();
   });
 });
@@ -328,7 +331,7 @@ describe('getSelectedVersion', () => {
       metadata: { name: 'aci', namespace: 'ns' },
       spec: { imageSetRef: { name: 'my-imageset' } },
     } as AgentClusterInstallK8sResource;
-    expect(getSelectedVersion([cis], aci)).toBe('4.18.10');
+    expect(getSelectedVersion([cis], aci, t)).toBe('4.18.10');
   });
 
   test('returns imageSetRef name when no cluster image matches', () => {
@@ -338,7 +341,7 @@ describe('getSelectedVersion', () => {
       metadata: { name: 'aci', namespace: 'ns' },
       spec: { imageSetRef: { name: 'missing' } },
     } as AgentClusterInstallK8sResource;
-    expect(getSelectedVersion([], aci)).toBe('missing');
+    expect(getSelectedVersion([], aci, t)).toBe('missing');
   });
 
   test('returns undefined when imageSetRef is missing', () => {
@@ -348,7 +351,7 @@ describe('getSelectedVersion', () => {
       metadata: { name: 'aci', namespace: 'ns' },
       spec: {},
     } as AgentClusterInstallK8sResource;
-    expect(getSelectedVersion([], aci)).toBeUndefined();
+    expect(getSelectedVersion([], aci, t)).toBeUndefined();
   });
 });
 

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

@@ -8,6 +8,7 @@ import {
 } from '../../types';
 import { CpuArchitecture, OpenshiftVersionOptionType } from '../../../common';
 import { getComparableVersionInt } from '../../../common/utils';
+import { TFunction } from 'i18next';
 
 export const getVersionFromReleaseString = (value = '') => {
   const match = /(\d+\.\d+(?:\.\d+)?(?:-\w+)?)/gm.exec(value);
@@ -78,12 +79,13 @@ const extractMajorMinor = (version: string): string => {
 // Converts a ClusterImageSet to an OpenshiftVersionOptionType
 const toVersionOption = (
   clusterImageSet: ClusterImageSetK8sResource,
+  t: TFunction,
 ): OpenshiftVersionOptionType => {
   const version = getVersionFromClusterImageSet(clusterImageSet);
   const cpuArch = getCPUArchFromClusterImageSet(clusterImageSet);
 
   return {
-    label: `OpenShift ${version}`,
+    label: `${t('ai:OpenShift')} ${version}`,
     version,
     value: clusterImageSet.metadata?.name as string,
     default: false,
@@ -109,6 +111,7 @@ const supportedNutanixPlatforms = ['x86_64', 'x86-64'];
 
 export const getOCPVersions = (
   clusterImageSets: ClusterImageSetK8sResource[],
+  t: TFunction,
   isNutanix?: boolean,
   osImages?: OsImage[],
   extended?: boolean,
@@ -118,7 +121,7 @@ export const getOCPVersions = (
 
   const versions = clusterImageSets
     .filter((clusterImageSet) => isValidImageSet(clusterImageSet, architectures, extended))
-    .map(toVersionOption)
+    .map((clusterImageSet) => toVersionOption(clusterImageSet, t))
     .filter((v) => hasMatchingOsImage(v, osImageVersions))
     .sort((a, b) => b.label.localeCompare(a.label));
 
@@ -131,13 +134,14 @@ export const getOCPVersions = (
 export const getSelectedVersion = (
   clusterImages: ClusterImageSetK8sResource[],
   agentClusterInstall: AgentClusterInstallK8sResource,
+  t: TFunction,
 ) => {
   const selectedClusterImage = clusterImages.find(
     (ci) => ci.metadata?.name === agentClusterInstall?.spec?.imageSetRef?.name,
   );
 
   return selectedClusterImage
-    ? getOCPVersions([selectedClusterImage], undefined, undefined, true)?.[0]?.version
+    ? getOCPVersions([selectedClusterImage], t, undefined, undefined, true)?.[0]?.version
     : agentClusterInstall?.spec?.imageSetRef?.name;
 };
 

package/lib/cim/components/index.ts

@@ -4,5 +4,4 @@ export * from './InfraEnv';
 export * from './ClusterDeployment';
 export * from './modals';
 export * from './Agent';
-export * from './featureSupportLevels';
 export * from './Hypershift';

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

@@ -26,7 +26,10 @@ export const CimStorageMissingAlert: React.FC<{
     >
       {t('ai:Install storage operator')}
     </AlertActionLink>,
-    <AlertActionLink key="storage-class" onClick={() => window.open(docStorageUrl, '_blank')}>
+    <AlertActionLink
+      key="storage-class"
+      onClick={() => window.open(docStorageUrl, '_blank', 'noopener,noreferrer')}
+    >
       {contentWorkaround as unknown as string}
     </AlertActionLink>,
   ];

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

@@ -12,12 +12,7 @@ import {
 } from '../../../common';
 import { TableRow } from '../../../common/components/hosts/AITable';
 import HostsTable from '../../../common/components/hosts/HostsTable';
-import {
-  AgentK8sResource,
-  BareMetalHostK8sResource,
-  InfraEnvK8sResource,
-  NMStateK8sResource,
-} from '../../types';
+import { AgentK8sResource, BareMetalHostK8sResource, InfraEnvK8sResource } from '../../types';
 import { useAgentsTable } from '../Agent/tableUtils';
 import { AGENT_BMH_NAME_LABEL_KEY } from '../common/constants';
 import AgentStatus from '../Agent/AgentStatus';
@@ -142,13 +137,8 @@ type MassDeleteAgentModalProps = {
   onClose: VoidFunction;
   agents: AgentK8sResource[];
   bmhs: BareMetalHostK8sResource[];
-  nmStates: NMStateK8sResource[];
   // eslint-disable-next-line
-  onDelete: (
-    agent?: AgentK8sResource,
-    bmh?: BareMetalHostK8sResource,
-    nmStates?: NMStateK8sResource[],
-  ) => Promise<unknown>;
+  onDelete: (agent?: AgentK8sResource, bmh?: BareMetalHostK8sResource) => Promise<unknown>;
   infraEnv: InfraEnvK8sResource;
 };
 
@@ -159,7 +149,6 @@ const MassDeleteAgentModal: React.FC<MassDeleteAgentModalProps> = ({
   agents,
   bmhs,
   infraEnv,
-  nmStates,
 }) => {
   const [hosts] = useAgentsTable({ agents, bmhs, infraEnv });
   const onClick = async (host: Host) => {
@@ -175,7 +164,7 @@ const MassDeleteAgentModal: React.FC<MassDeleteAgentModalProps> = ({
       );
     }
     if (!agent?.spec?.clusterDeploymentName?.name) {
-      return onDelete(agent, bmh, nmStates);
+      return onDelete(agent, bmh);
     }
   };
   const { t } = useTranslation();

package/lib/cim/hooks/index.tsx

@@ -2,3 +2,4 @@ export * from './useConfigMaps';
 export * from './useAgentServiceConfig';
 export * from './useEvents';
 export * from './useAgents';
+export * from './useStorageClasses';

package/lib/cim/hooks/useStorageClasses.tsx

@@ -0,0 +1,15 @@
+import { useK8sWatchResource } from './useK8sWatchResource';
+import { StorageClassK8sResource } from '../types';
+import { K8sWatchHookProps } from './types';
+
+export const useStorageClasses = (props: K8sWatchHookProps) =>
+  useK8sWatchResource<StorageClassK8sResource[]>(
+    {
+      groupVersionKind: {
+        group: 'storage.k8s.io',
+        kind: 'StorageClass',
+        version: 'v1',
+      },
+    },
+    props,
+  );

package/lib/cim/index.ts

@@ -10,7 +10,6 @@ export * as Reducers from '../common/reducers';
 export * from '../common/api';
 export * from '../common/utils';
 export * from '../common/types';
-export * from '../common/features';
 
 export * from '../common/components/ui';
 export * from '../common/components/AlertsContextProvider';

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

@@ -3,6 +3,7 @@ import {
   Cluster,
   ClusterCreateParams,
   ClusterDefaultConfig,
+  DisconnectedClusterCreateParams,
   V2ClusterUpdateParams,
   Credentials,
   Host,
@@ -142,6 +143,13 @@ const ClustersAPI = {
     );
   },
 
+  registerDisconnected(params: DisconnectedClusterCreateParams) {
+    return client.post<Cluster, AxiosResponse<Cluster>, DisconnectedClusterCreateParams>(
+      `${ClustersAPI.makeBaseURI()}disconnected`,
+      params,
+    );
+  },
+
   update(clusterId: Cluster['id'], params: V2ClusterUpdateParams) {
     return client.patch<Cluster, AxiosResponse<Cluster>, V2ClusterUpdateParams>(
       `${ClustersAPI.makeBaseURI(clusterId)}`,

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

@@ -1,8 +1,13 @@
 import { clientWithoutCaseConverter } from '../../api/axiosClient';
-import {
-  ArchitecturesSupportsLevel,
-  FeaturesSupportsLevel,
-} from '../../components/featureSupportLevels/types';
+import { ArchitectureSupportLevelMap, NewFeatureSupportLevelMap } from '../../components';
+
+export interface ArchitecturesSupportsLevel {
+  architectures: ArchitectureSupportLevelMap;
+}
+
+export interface FeaturesSupportsLevel {
+  features: NewFeatureSupportLevelMap;
+}
 
 const NewFeatureSupportLevelsAPI = {
   makeBaseURI() {