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

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/CimConfigProgressAlert.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import {
   Alert,
   AlertVariant,
@@ -69,7 +69,7 @@ export const CimConfigProgressAlert: React.FC<CimConfigProgressAlertProps> = ({
       variant={ButtonVariant.link}
       isInline
       key="assisted-service-deployment"
-      onClick={() => navigate(assistedServiceDeploymentUrl)}
+      onClick={() => void navigate(assistedServiceDeploymentUrl)}
     >
       {t('ai:Troubleshoot in the assisted service deployment')}
     </Button>

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

@@ -161,7 +161,7 @@ export const CimConfigurationFormFields = ({
               <PopoverIcon
                 noVerticalAlign
                 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.',
+                  '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 100Gi or more. The value can not be updated later.',
                 )}
                 aria-label={t('ai:More info for image storage')}
               >

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

@@ -118,7 +118,7 @@ export const CimConfigurationModal: React.FC<CimConfigurationModalProps> = ({
       agentServiceConfig?.spec?.filesystemStorage?.resources?.requests?.storage,
     ),
     imgVolSize: getStorageSizeGiB(
-      50,
+      100,
       agentServiceConfig?.spec?.imageStorage?.resources?.requests?.storage,
     ),
     configureLoadBalancer: platform === 'AWS',
@@ -134,7 +134,7 @@ export const CimConfigurationModal: React.FC<CimConfigurationModalProps> = ({
       .min(MIN_FS_VOL_SIZE, t('ai:Minimal value is 1Gi'))
       .required(t('ai:Required field')),
     imgVolSize: Yup.number()
-      .min(MIN_IMG_VOL_SIZE, t('ai:Minimal value is 10Gi'))
+      .min(MIN_IMG_VOL_SIZE, t('ai:Minimal value is 50Gi'))
       .required(t('ai:Required field')),
     configureLoadBalancer: Yup.boolean(),
     addCiscoIntersightURL: Yup.boolean(),

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import { Alert, AlertActionLink, AlertVariant } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 
@@ -20,10 +20,16 @@ export const CimStorageMissingAlert: React.FC<{
   );
 
   const actionLinks: React.ReactNode[] = [
-    <AlertActionLink key="install-storage-operator" onClick={() => navigate(storageOperatorUrl)}>
+    <AlertActionLink
+      key="install-storage-operator"
+      onClick={() => void navigate(storageOperatorUrl)}
+    >
       {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/CimConfiguration/constants.ts

@@ -1,5 +1,5 @@
 export const MIN_DB_VOL_SIZE = 1; // In Gi
 export const MIN_FS_VOL_SIZE = 1;
-export const MIN_IMG_VOL_SIZE = 10;
+export const MIN_IMG_VOL_SIZE = 50;
 
 export const CIM_CONFIG_TIMEOUT = 5 * 60 * 1000; // in ms

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { TFunction } from 'i18next';
 import { Button, Flex, FlexItem, Icon, 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 { Link } from 'react-router';
 
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import {
@@ -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

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

package/lib/cim/hooks/useAgents.tsx

@@ -0,0 +1,15 @@
+import { useK8sWatchResource } from './useK8sWatchResource';
+import { AgentK8sResource } from '../types';
+import { K8sWatchHookProps } from './types';
+
+export const useAgents = (props: K8sWatchHookProps) =>
+  useK8sWatchResource<AgentK8sResource[]>(
+    {
+      groupVersionKind: {
+        group: 'agent-install.openshift.io',
+        kind: 'Agent',
+        version: 'v1beta1',
+      },
+    },
+    props,
+  );

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() {

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

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import {
   FormGroup,
-  Tooltip,
   Dropdown,
   DropdownItem,
   MenuToggle,
@@ -63,22 +62,21 @@ const ControlPlaneNodesDropdown = ({
     }
   }, [allowHighlyAvailable, selectedValue, setValue]);
 
+  const disabledReason = t('ai:This option is not available with the selected OpenShift version');
   const dropdownItems = options.map(({ value, label }) => {
     const isEnabled = isItemEnabled(value, allowHighlyAvailable, allowTNA);
 
-    const disabledReason = t('ai:This option is not available with the selected OpenShift version');
     return (
       <DropdownItem
         key={value}
         id={value.toString()}
-        isAriaDisabled={!isItemEnabled}
-        isDisabled={!isItemEnabled}
+        isAriaDisabled={!isEnabled}
+        disabled={!isEnabled}
         selected={selectedValue === value}
         value={value}
+        tooltipProps={{ hidden: isEnabled, content: disabledReason, position: 'top' }}
       >
-        <Tooltip hidden={isEnabled} content={disabledReason} position="top">
-          <div>{label}</div>
-        </Tooltip>
+        {label}
       </DropdownItem>
     );
   });

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

@@ -46,7 +46,9 @@ export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
         icon={<ExternalLinkAltIcon />}
         iconPosition="right"
         isInline
-        onClick={() => window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener')}
+        onClick={() =>
+          window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener,noreferrer')
+        }
       >
         {t('ai:View documentation')}
       </Button>

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.tsx

@@ -29,6 +29,7 @@ const hasFilledTangServers = (tangServers: TangServer[]): boolean => {
 export interface DiskEncryptionControlGroupProps {
   values: DiskEncryptionValues;
   isSNO: boolean;
+  isArbiterEncryptionAvailable?: boolean;
   isDisabled?: boolean;
   docVersion?: string;
 }
@@ -36,6 +37,7 @@ export interface DiskEncryptionControlGroupProps {
 const DiskEncryptionControlGroup = ({
   values,
   isSNO = false,
+  isArbiterEncryptionAvailable = true,
   isDisabled = false,
   docVersion,
 }: DiskEncryptionControlGroupProps) => {
@@ -77,6 +79,12 @@ const DiskEncryptionControlGroup = ({
       setFieldValue('enableDiskEncryptionOnWorkers', false);
     }
   }, [isSNO, setFieldValue]);
+
+  React.useEffect(() => {
+    if (!isArbiterEncryptionAvailable) {
+      setFieldValue('enableDiskEncryptionOnArbiters', false);
+    }
+  }, [isArbiterEncryptionAvailable, setFieldValue]);
   const { t } = useTranslation();
   const disableMessage = t('ai:This option is not editable after the draft cluster is created');
   const tooltipProps = {
@@ -105,14 +113,16 @@ const DiskEncryptionControlGroup = ({
             />
           </StackItem>
         </RenderIf>
-        <StackItem>
-          <SwitchField
-            tooltipProps={tooltipProps}
-            name="enableDiskEncryptionOnArbiters"
-            label={t('ai:Arbiter')}
-            isDisabled={isDisabled}
-          />
-        </StackItem>
+        <RenderIf condition={isArbiterEncryptionAvailable}>
+          <StackItem>
+            <SwitchField
+              tooltipProps={tooltipProps}
+              name="enableDiskEncryptionOnArbiters"
+              label={t('ai:Arbiter')}
+              isDisabled={isDisabled}
+            />
+          </StackItem>
+        </RenderIf>
         <RenderIf
           condition={
             enableDiskEncryptionOnMasters ||

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

@@ -45,7 +45,7 @@ const DownloadIso = ({
 
   const openCiscoIntersightHostsLink = (downloadUrl: string) => {
     updateTagsForCiscoIntersight ? updateTagsForCiscoIntersight() : '';
-    window.open(getCiscoIntersightLink(downloadUrl, ciscoUrl), '_blank', 'noopener');
+    window.open(getCiscoIntersightLink(downloadUrl, ciscoUrl), '_blank', 'noopener,noreferrer');
   };
 
   return (

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

@@ -75,11 +75,13 @@ export const ExternalPlatformsDropdown = ({ isDisabled }: { isDisabled: boolean
       <Dropdown
         isOpen={isOpen}
         toggle={(toggleRef) => (
-          <MenuToggle ref={toggleRef} className="pf-v5-u-w-100" onClick={() => setIsOpen(!isOpen)}>
+          <MenuToggle ref={toggleRef} onClick={() => setIsOpen(!isOpen)} isFullWidth>
             {value ? platforms[value] : t('ai:Integrate with external partner platforms')}
           </MenuToggle>
         )}
         onSelect={onSelect}
+        onOpenChange={() => setIsOpen(!isOpen)}
+        shouldFocusToggleOnSelect
       >
         {options}
       </Dropdown>