@openshift-assisted/ui-lib 2.9.7-cim → 2.9.8-cim

package/build/cjs/ocm/hooks/useSupportLevelsAPI.js

@@ -5,7 +5,7 @@ const react_1 = tslib_1.__importDefault(require("react"));
 const common_1 = require("../../common");
 const api_1 = require("../api");
 const NewFeatureSupportLevelsAPI_1 = tslib_1.__importDefault(require("../../common/api/assisted-service/NewFeatureSupportLevelsAPI"));
-function useSupportLevelsAPI(resourceKind, openshiftVersion, cpuArchitecture) {
+function useSupportLevelsAPI(resourceKind, openshiftVersion, cpuArchitecture, platformType) {
     const [cpuArchitectures, setCpuArchitectures] = react_1.default.useState(null);
     const [features, setFeatures] = react_1.default.useState(null);
     const { addAlert } = (0, common_1.useAlerts)();
@@ -22,9 +22,9 @@ function useSupportLevelsAPI(resourceKind, openshiftVersion, cpuArchitecture) {
             setCpuArchitectures(null);
         }
     }), [addAlert]);
-    const fetchFeaturesSupportLevels = react_1.default.useCallback((openshiftVersion, cpuArchitecture) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    const fetchFeaturesSupportLevels = react_1.default.useCallback((openshiftVersion, cpuArchitecture, platformType) => tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
-            const { data: features } = yield NewFeatureSupportLevelsAPI_1.default.featuresSupportLevel(openshiftVersion, cpuArchitecture);
+            const { data: features } = yield NewFeatureSupportLevelsAPI_1.default.featuresSupportLevel(openshiftVersion, cpuArchitecture, platformType);
             setFeatures(features.features);
         }
         catch (e) {
@@ -41,7 +41,7 @@ function useSupportLevelsAPI(resourceKind, openshiftVersion, cpuArchitecture) {
                 void fetchArchitecturesSupportLevels(openshiftVersion);
             }
             else {
-                void fetchFeaturesSupportLevels(openshiftVersion, cpuArchitecture);
+                void fetchFeaturesSupportLevels(openshiftVersion, cpuArchitecture, platformType);
             }
         }
     }, [
@@ -50,6 +50,7 @@ function useSupportLevelsAPI(resourceKind, openshiftVersion, cpuArchitecture) {
         fetchArchitecturesSupportLevels,
         fetchFeaturesSupportLevels,
         resourceKind,
+        platformType,
     ]);
     if (resourceKind === 'architectures') {
         return cpuArchitectures;

package/build/cjs/ocm/hooks/useSupportLevelsAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSupportLevelsAPI.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useSupportLevelsAPI.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,yCAAyC;AAKzC,gCAA4D;AAC5D,sIAAsG;AAStG,SAAwB,mBAAmB,CACzC,YAAe,EACf,gBAAyB,EACzB,eAAwB;IAExB,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAC3C,eAAK,CAAC,QAAQ,CAAqC,IAAI,CAAC,CAAC;IAC3D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAmC,IAAI,CAAC,CAAC;IACvF,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAEjC,MAAM,+BAA+B,GAAG,eAAK,CAAC,WAAW,CACvD,CAAO,gBAAwB,EAAE,EAAE;QACjC,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,oCAA0B,CAAC,yBAAyB,CACxF,gBAAgB,CACjB,CAAC;YACF,mBAAmB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;SAClD;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,oBAAc,EAAC,CAAC,EAAE,GAAG,EAAE,CACrB,QAAQ,CAAC;gBACP,KAAK,EAAE,sCAAsC;gBAC7C,OAAO,EAAE,IAAA,wBAAkB,EAAC,CAAC,CAAC;aAC/B,CAAC,CACH,CAAC;YACF,mBAAmB,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC,CAAA,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,0BAA0B,GAAG,eAAK,CAAC,WAAW,CAClD,CAAO,gBAAwB,EAAE,eAAwB,EAAE,EAAE;QAC3D,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,oCAA0B,CAAC,oBAAoB,CAC9E,gBAAgB,EAChB,eAAe,CAChB,CAAC;YACF,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,oBAAc,EAAC,CAAC,EAAE,GAAG,EAAE,CACrB,QAAQ,CAAC;gBACP,KAAK,EAAE,2CAA2C;gBAClD,OAAO,EAAE,IAAA,wBAAkB,EAAC,CAAC,CAAC;aAC/B,CAAC,CACH,CAAC;YACF,WAAW,CAAC,IAAI,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,gBAAgB,EAAE;YACpB,IAAI,YAAY,KAAK,eAAe,EAAE;gBACpC,KAAK,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;aACxD;iBAAM;gBACL,KAAK,0BAA0B,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;aACpE;SACF;IACH,CAAC,EAAE;QACD,gBAAgB;QAChB,eAAe;QACf,+BAA+B;QAC/B,0BAA0B;QAC1B,YAAY;KACb,CAAC,CAAC;IAEH,IAAI,YAAY,KAAK,eAAe,EAAE;QACpC,OAAO,gBAAiD,CAAC;KAC1D;SAAM;QACL,OAAO,QAAyC,CAAC;KAClD;AACH,CAAC;AAxED,sCAwEC"}
+{"version":3,"file":"useSupportLevelsAPI.js","sourceRoot":"","sources":["../../../../lib/ocm/hooks/useSupportLevelsAPI.ts"],"names":[],"mappings":";;;AAAA,0DAA0B;AAC1B,yCAA0D;AAK1D,gCAA4D;AAC5D,sIAAsG;AAUtG,SAAwB,mBAAmB,CACzC,YAAe,EACf,gBAAyB,EACzB,eAAiC,EACjC,YAA2B;IAE3B,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAC3C,eAAK,CAAC,QAAQ,CAAqC,IAAI,CAAC,CAAC;IAC3D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAmC,IAAI,CAAC,CAAC;IACvF,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,kBAAS,GAAE,CAAC;IAEjC,MAAM,+BAA+B,GAAG,eAAK,CAAC,WAAW,CACvD,CAAO,gBAAwB,EAAE,EAAE;QACjC,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,oCAA0B,CAAC,yBAAyB,CACxF,gBAAgB,CACjB,CAAC;YACF,mBAAmB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;SAClD;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,oBAAc,EAAC,CAAC,EAAE,GAAG,EAAE,CACrB,QAAQ,CAAC;gBACP,KAAK,EAAE,sCAAsC;gBAC7C,OAAO,EAAE,IAAA,wBAAkB,EAAC,CAAC,CAAC;aAC/B,CAAC,CACH,CAAC;YACF,mBAAmB,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC,CAAA,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,0BAA0B,GAAG,eAAK,CAAC,WAAW,CAClD,CACE,gBAAwB,EACxB,eAAiC,EACjC,YAA2B,EAC3B,EAAE;QACF,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,oCAA0B,CAAC,oBAAoB,CAC9E,gBAAgB,EAChB,eAAe,EACf,YAAY,CACb,CAAC;YACF,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,oBAAc,EAAC,CAAC,EAAE,GAAG,EAAE,CACrB,QAAQ,CAAC;gBACP,KAAK,EAAE,2CAA2C;gBAClD,OAAO,EAAE,IAAA,wBAAkB,EAAC,CAAC,CAAC;aAC/B,CAAC,CACH,CAAC;YACF,WAAW,CAAC,IAAI,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,gBAAgB,EAAE;YACpB,IAAI,YAAY,KAAK,eAAe,EAAE;gBACpC,KAAK,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;aACxD;iBAAM;gBACL,KAAK,0BAA0B,CAAC,gBAAgB,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;aAClF;SACF;IACH,CAAC,EAAE;QACD,gBAAgB;QAChB,eAAe;QACf,+BAA+B;QAC/B,0BAA0B;QAC1B,YAAY;QACZ,YAAY;KACb,CAAC,CAAC;IAEH,IAAI,YAAY,KAAK,eAAe,EAAE;QACpC,OAAO,gBAAiD,CAAC;KAC1D;SAAM;QACL,OAAO,QAAyC,CAAC;KAClD;AACH,CAAC;AA/ED,sCA+EC"}

package/lib/cim/components/ClusterDeployment/ClusterDeploymentDetails.tsx

@@ -19,7 +19,7 @@ import {
 } from '../../types';
 import ClusterDeploymentCredentials from './ClusterDeploymentCredentials';
 import { shouldShowClusterCredentials, shouldShowClusterInstallationProgress } from './helpers';
-import { EventsModalButton } from '../../../common/components/ui/eventsModal';
+import { EventsModal } from '../../../common/components/ui/eventsModal';
 import ClusterDeploymentDetailsTable from './ClusterDeploymentDetailsTable';
 import { FetchSecret } from './types';
 import { getClusterProperties, getConsoleUrl } from '../helpers/clusterDeployment';
@@ -45,6 +45,7 @@ const ClusterDeploymentDetails: React.FC<ClusterDeploymentDetailsProps> = ({
   const [progressCardExpanded, setProgressCardExpanded] = React.useState(true);
   const [inventoryCardExpanded, setInventoryCardExpanded] = React.useState(true);
   const [detailsCardExpanded, setDetailsCardExpanded] = React.useState(true);
+  const [isEventsModalOpen, setIsEventsModalOpen] = React.useState(false);
 
   const clusterAgents = agents.filter(
     (a) =>
@@ -60,120 +61,129 @@ const ClusterDeploymentDetails: React.FC<ClusterDeploymentDetailsProps> = ({
   );
   const { t } = useTranslation();
   return (
-    <Stack hasGutter>
-      {shouldShowClusterInstallationProgress(agentClusterInstall) && (
+    <>
+      <Stack hasGutter>
+        {shouldShowClusterInstallationProgress(agentClusterInstall) && (
+          <StackItem>
+            <Card id="cluster-installation-progress-card" isExpanded={progressCardExpanded}>
+              <CardHeader
+                onExpand={() => setProgressCardExpanded(!progressCardExpanded)}
+                toggleButtonProps={{
+                  id: 'progress-card-toggle-button',
+                  'aria-label': 'Cluster installation process',
+                  'aria-labelledby': 'titleId progress-card-toggle-button',
+                  'aria-expanded': progressCardExpanded,
+                }}
+              >
+                <CardTitle id="titleId">{t('ai:Cluster installation process')}</CardTitle>
+              </CardHeader>
+              <CardExpandableContent>
+                <CardBody>
+                  <Stack hasGutter>
+                    {shouldShowClusterCredentials(agentClusterInstall) && (
+                      <StackItem>
+                        <ClusterDeploymentCredentials
+                          clusterDeployment={clusterDeployment}
+                          agentClusterInstall={agentClusterInstall}
+                          agents={clusterAgents}
+                          fetchSecret={fetchSecret}
+                          consoleUrl={getConsoleUrl(clusterDeployment)}
+                        />
+                      </StackItem>
+                    )}
+                    <StackItem>
+                      <ClusterDeploymentKubeconfigDownload
+                        clusterDeployment={clusterDeployment}
+                        agentClusterInstall={agentClusterInstall}
+                        fetchSecret={fetchSecret}
+                      />{' '}
+                      <Button
+                        id="cluster-events-button"
+                        variant={ButtonVariant.link}
+                        style={{ textAlign: 'right' }}
+                        onClick={() => setIsEventsModalOpen(true)}
+                      >
+                        {t('ai:View cluster events')}
+                      </Button>
+                    </StackItem>
+                  </Stack>
+                </CardBody>
+              </CardExpandableContent>
+            </Card>
+          </StackItem>
+        )}
         <StackItem>
-          <Card id="cluster-installation-progress-card" isExpanded={progressCardExpanded}>
+          <Card id="cluster-inventory-card" isExpanded={inventoryCardExpanded}>
             <CardHeader
-              onExpand={() => setProgressCardExpanded(!progressCardExpanded)}
+              onExpand={() => setInventoryCardExpanded(!inventoryCardExpanded)}
               toggleButtonProps={{
-                id: 'progress-card-toggle-button',
-                'aria-label': 'Cluster installation process',
-                'aria-labelledby': 'titleId progress-card-toggle-button',
-                'aria-expanded': progressCardExpanded,
+                id: 'inventory-card-toggle-button',
+                'aria-label': 'Hosts inventory',
+                'aria-labelledby': 'titleId inventory-card-toggle-button',
+                'aria-expanded': inventoryCardExpanded,
               }}
             >
-              <CardTitle id="titleId">{t('ai:Cluster installation process')}</CardTitle>
+              <CardTitle id="titleId">{t('ai:Hosts inventory')}</CardTitle>
             </CardHeader>
             <CardExpandableContent>
               <CardBody>
-                <Stack hasGutter>
-                  {shouldShowClusterCredentials(agentClusterInstall) && (
-                    <StackItem>
-                      <ClusterDeploymentCredentials
-                        clusterDeployment={clusterDeployment}
-                        agentClusterInstall={agentClusterInstall}
-                        agents={clusterAgents}
-                        fetchSecret={fetchSecret}
-                        consoleUrl={getConsoleUrl(clusterDeployment)}
-                      />
-                    </StackItem>
-                  )}
-                  <StackItem>
-                    <ClusterDeploymentKubeconfigDownload
-                      clusterDeployment={clusterDeployment}
-                      agentClusterInstall={agentClusterInstall}
-                      fetchSecret={fetchSecret}
-                    />{' '}
-                    <EventsModalButton
-                      id="cluster-events-button"
-                      entityKind="cluster"
-                      cluster={cluster}
-                      title={t('ai:Cluster Events')}
-                      variant={ButtonVariant.link}
-                      style={{ textAlign: 'right' }}
-                      onFetchEvents={onFetchEvents}
-                      ButtonComponent={Button}
-                      disablePagination
-                    >
-                      {t('ai:View cluster events')}
-                    </EventsModalButton>
-                  </StackItem>
-                </Stack>
+                <ClusterDeploymentDetailsTable
+                  agents={clusterAgents}
+                  agentClusterInstall={agentClusterInstall}
+                />
+              </CardBody>
+            </CardExpandableContent>
+          </Card>
+        </StackItem>
+        <StackItem>
+          <Card id="cluster-details-card" isExpanded={detailsCardExpanded}>
+            <CardHeader
+              onExpand={() => setDetailsCardExpanded(!detailsCardExpanded)}
+              toggleButtonProps={{
+                id: 'details-card-toggle-button',
+                'aria-label': 'Details',
+                'aria-labelledby': 'titleId details-card-toggle-button',
+                'aria-expanded': detailsCardExpanded,
+              }}
+            >
+              <CardTitle id="titleId">{t('ai:Details')}</CardTitle>
+            </CardHeader>
+            <CardExpandableContent>
+              <CardBody>
+                <ClusterPropertiesList
+                  leftItems={[
+                    clusterProperties.name,
+                    clusterProperties.openshiftVersion,
+                    clusterProperties.clusterId,
+                    clusterProperties.installedTimestamp,
+                    clusterProperties.baseDnsDomain,
+                  ]}
+                  rightItems={[
+                    clusterProperties.apiVip,
+                    clusterProperties.ingressVip,
+                    clusterProperties.clusterNetworkCidr,
+                    clusterProperties.clusterNetworkHostPrefix,
+                    clusterProperties.serviceNetworkCidr,
+                  ]}
+                />
               </CardBody>
             </CardExpandableContent>
           </Card>
         </StackItem>
+      </Stack>
+      {isEventsModalOpen && (
+        <EventsModal
+          entityKind="cluster"
+          cluster={cluster}
+          title={t('ai:Cluster Events')}
+          onFetchEvents={onFetchEvents}
+          hostId={undefined}
+          disablePagination
+          isOpen
+          onClose={() => setIsEventsModalOpen(false)}
+        />
       )}
-      <StackItem>
-        <Card id="cluster-inventory-card" isExpanded={inventoryCardExpanded}>
-          <CardHeader
-            onExpand={() => setInventoryCardExpanded(!inventoryCardExpanded)}
-            toggleButtonProps={{
-              id: 'inventory-card-toggle-button',
-              'aria-label': 'Hosts inventory',
-              'aria-labelledby': 'titleId inventory-card-toggle-button',
-              'aria-expanded': inventoryCardExpanded,
-            }}
-          >
-            <CardTitle id="titleId">{t('ai:Hosts inventory')}</CardTitle>
-          </CardHeader>
-          <CardExpandableContent>
-            <CardBody>
-              <ClusterDeploymentDetailsTable
-                agents={clusterAgents}
-                agentClusterInstall={agentClusterInstall}
-              />
-            </CardBody>
-          </CardExpandableContent>
-        </Card>
-      </StackItem>
-      <StackItem>
-        <Card id="cluster-details-card" isExpanded={detailsCardExpanded}>
-          <CardHeader
-            onExpand={() => setDetailsCardExpanded(!detailsCardExpanded)}
-            toggleButtonProps={{
-              id: 'details-card-toggle-button',
-              'aria-label': 'Details',
-              'aria-labelledby': 'titleId details-card-toggle-button',
-              'aria-expanded': detailsCardExpanded,
-            }}
-          >
-            <CardTitle id="titleId">{t('ai:Details')}</CardTitle>
-          </CardHeader>
-          <CardExpandableContent>
-            <CardBody>
-              <ClusterPropertiesList
-                leftItems={[
-                  clusterProperties.name,
-                  clusterProperties.openshiftVersion,
-                  clusterProperties.clusterId,
-                  clusterProperties.installedTimestamp,
-                  clusterProperties.baseDnsDomain,
-                ]}
-                rightItems={[
-                  clusterProperties.apiVip,
-                  clusterProperties.ingressVip,
-                  clusterProperties.clusterNetworkCidr,
-                  clusterProperties.clusterNetworkHostPrefix,
-                  clusterProperties.serviceNetworkCidr,
-                ]}
-              />
-            </CardBody>
-          </CardExpandableContent>
-        </Card>
-      </StackItem>
-    </Stack>
+    </>
   );
 };
 

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

@@ -38,16 +38,19 @@ export const shouldShowClusterInstallationProgress = (
   agentClusterInstall?: AgentClusterInstallK8sResource,
 ) => {
   const [clusterStatus] = getClusterStatus(agentClusterInstall);
-  return [
-    'preparing-for-installation',
-    'installing',
-    'installing-pending-user-action',
-    'finalizing',
-    'installed',
-    'error',
-    'cancelled',
-    'adding-hosts',
-  ].includes(clusterStatus);
+  return (
+    [
+      'preparing-for-installation',
+      'installing',
+      'installing-pending-user-action',
+      'finalizing',
+      'installed',
+      'error',
+      'cancelled',
+      'adding-hosts',
+      'ready',
+    ].includes(clusterStatus) && !agentClusterInstall?.spec?.holdInstallation
+  );
 };
 
 export const isInstallationInProgress = (agentClusterInstall: AgentClusterInstallK8sResource) => {

package/lib/cim/components/Hypershift/utils/nodepool.ts

@@ -2,7 +2,7 @@ import { AgentK8sResource } from '../../../types';
 import { AgentMachineK8sResource, HostedClusterK8sResource, NodePoolK8sResource } from '../types';
 
 const CLUSTER_NAME_LABEL = 'cluster.x-k8s.io/cluster-name';
-const NODEPOOL_NAME_ANNOTATION = 'cluster.x-k8s.io/cloned-from-name';
+const NODEPOOL_NAME_ANNOTATION = 'hypershift.openshift.io/nodePool';
 
 export const getNodepoolAgents = (
   nodePool: NodePoolK8sResource,
@@ -16,7 +16,8 @@ export const getNodepoolAgents = (
         am.metadata?.namespace ===
           `${hostedCluster.metadata?.namespace || ''}-${hostedCluster.metadata?.name || ''}` &&
         am.metadata?.labels?.[CLUSTER_NAME_LABEL] === hostedCluster.spec.infraID &&
-        am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] === nodePool.metadata?.name &&
+        am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] ===
+          `${nodePool.metadata?.namespace || ''}/${nodePool.metadata?.name || ''}` &&
         am.status?.agentRef?.name &&
         am.status?.agentRef?.namespace,
     )

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

@@ -31,7 +31,6 @@ import {
   RadioField,
   PopoverIcon,
   pullSecretValidationSchema,
-  OCP_STATIC_IP_DOC,
   CheckboxField,
   AdditionalNTPSourcesField,
   richNameValidationSchema,
@@ -42,6 +41,7 @@ import {
   locationValidationMessages,
   ntpSourceValidationSchema,
   CpuArchitecture,
+  getOCPStaticIPDocLink,
 } from '../../../common';
 
 import './infra-env.css';
@@ -118,6 +118,7 @@ type InfraEnvFormProps = {
   onValuesChanged?: (values: EnvironmentStepFormValues) => void;
   pullSecret?: string;
   sshPublicKey?: string;
+  docVersion: string;
 };
 
 const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
@@ -125,6 +126,7 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
   children,
   pullSecret,
   sshPublicKey,
+  docVersion,
 }) => {
   const { values, setFieldValue } = useFormikContext<EnvironmentStepFormValues>();
   const { t } = useTranslation();
@@ -194,7 +196,13 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
                                 icon={<ExternalLinkAltIcon />}
                                 iconPosition="right"
                                 isInline
-                                onClick={() => window.open(OCP_STATIC_IP_DOC, '_blank', 'noopener')}
+                                onClick={() =>
+                                  window.open(
+                                    getOCPStaticIPDocLink(docVersion),
+                                    '_blank',
+                                    'noopener',
+                                  )
+                                }
                               >
                                 {t('ai:View documentation')}
                               </Button>
@@ -282,6 +290,7 @@ type InfraEnvFormPageProps = InfraEnvFormProps & {
   formRef: React.Ref<FormikProps<EnvironmentStepFormValues>>;
   pullSecret?: string;
   sshPublicKey?: string;
+  docVersion: string;
 };
 
 export const InfraEnvFormPage: React.FC<InfraEnvFormPageProps> = ({

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

@@ -74,6 +74,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
             hasDHCP={hasDHCP}
             isIPXE={isIPXE}
             allowEmpty
+            docVersion={docVersion}
           />
         )}
         {dialogType === 'download' && (
@@ -90,6 +91,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
                 infraEnv={infraEnv}
                 onReset={agentClusterInstall ? () => setDialogType('config') : undefined}
                 hasDHCP={hasDHCP}
+                docVersion={docVersion}
               />
             )}
           </>
@@ -104,11 +106,13 @@ const GeneratingIsoDownload = ({
   onClose,
   onReset,
   hasDHCP,
+  docVersion,
 }: {
   infraEnv: InfraEnvK8sResource;
   onClose: VoidFunction;
   onReset?: VoidFunction;
   hasDHCP: boolean;
+  docVersion: string;
 }) => {
   const { t } = useTranslation();
   return infraEnv.status?.isoDownloadURL ? (
@@ -117,6 +121,7 @@ const GeneratingIsoDownload = ({
       downloadUrl={infraEnv.status.isoDownloadURL}
       onReset={onReset}
       hasDHCP={hasDHCP}
+      docVersion={docVersion}
     />
   ) : (
     <EmptyState>

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

@@ -9,12 +9,16 @@ const NewFeatureSupportLevelsAPI = {
     return `/v2/support-levels`;
   },
 
-  featuresSupportLevel(openshiftVersion: string, cpuArchitecture?: string) {
-    let queryParams = '?';
-    queryParams += openshiftVersion ? `openshift_version=${openshiftVersion}&` : '';
-    queryParams += cpuArchitecture ? `cpu_architecture=${cpuArchitecture}` : '';
+  featuresSupportLevel(openshiftVersion: string, cpuArchitecture?: string, platformType?: string) {
     return clientWithoutCaseConverter.get<FeaturesSupportsLevel>(
-      `${NewFeatureSupportLevelsAPI.makeBaseURI()}/features${queryParams}`,
+      `${NewFeatureSupportLevelsAPI.makeBaseURI()}/features`,
+      {
+        params: {
+          openshift_version: openshiftVersion,
+          cpu_architecture: cpuArchitecture,
+          platform_type: platformType,
+        },
+      },
     );
   },
 

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

@@ -27,10 +27,10 @@ import { ProxyFieldsType, StatusErrorType } from '../../types';
 import ProxyFields from './ProxyFields';
 import UploadSSH from './UploadSSH';
 import DiscoveryImageTypeControlGroup from './DiscoveryImageTypeControlGroup';
-import { OCP_STATIC_IP_DOC } from '../../config/constants';
+import { getOCPStaticIPDocLink } from '../../config/constants';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
-export const StaticIPInfo: React.FC = () => {
+export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
   const { t } = useTranslation();
   return (
     <Alert
@@ -45,7 +45,7 @@ export const StaticIPInfo: React.FC = () => {
         icon={<ExternalLinkAltIcon />}
         iconPosition="right"
         isInline
-        onClick={() => window.open(OCP_STATIC_IP_DOC, '_blank', 'noopener')}
+        onClick={() => window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener')}
       >
         {t('ai:View documentation')}
       </Button>
@@ -77,6 +77,7 @@ type DiscoveryImageConfigFormProps = Proxy & {
   imageType?: ImageType;
   isIPXE?: boolean;
   allowEmpty?: boolean;
+  docVersion: string;
 };
 
 export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> = ({
@@ -91,6 +92,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
   hasDHCP,
   isIPXE,
   allowEmpty,
+  docVersion,
 }) => {
   const initialValues: DiscoveryImageFormValues = {
     sshPublicKey: sshPublicKey || '',
@@ -127,7 +129,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
                 </StackItem>
                 {hasDHCP === false && (
                   <StackItem>
-                    <StaticIPInfo />
+                    <StaticIPInfo docVersion={docVersion} />
                   </StackItem>
                 )}
                 <StackItem>

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

@@ -23,6 +23,7 @@ export type DownloadISOProps = {
   downloadUrl?: string;
   onClose: () => void;
   onReset?: () => void;
+  docVersion?: string;
 };
 
 const DownloadIso = ({
@@ -32,6 +33,7 @@ const DownloadIso = ({
   onReset,
   hasDHCP,
   isSNO = false,
+  docVersion,
 }: DownloadISOProps) => {
   const wgetCommand = `wget -O ${fileName} '${downloadUrl || ''}'`;
   const { t } = useTranslation();
@@ -53,7 +55,7 @@ const DownloadIso = ({
           </StackItem>
           {hasDHCP === false && (
             <StackItem>
-              <StaticIPInfo />
+              <StaticIPInfo docVersion={docVersion} />
             </StackItem>
           )}
           <StackItem>

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

@@ -36,6 +36,7 @@ type HostDetailProps = {
     hostId: Host['id'],
     diskId: Disk['id'],
   ) => Promise<unknown>;
+  hideStorage?: boolean;
 };
 
 type SectionColumnProps = {
@@ -115,6 +116,7 @@ export const HostDetail = ({
   AdditionalNTPSourcesDialogToggleComponent,
   hideNTPStatus = false,
   updateDiskSkipFormatting,
+  hideStorage,
 }: HostDetailProps) => {
   const { t } = useTranslation();
   const { id, validationsInfo: hostValidationsInfo } = host;
@@ -205,7 +207,7 @@ export const HostDetail = ({
           value={ntpValidationStatus}
         />
       </SectionColumn>
-      {onDiskRole && canEditDisks && (
+      {!hideStorage && (
         <StorageDetail
           host={host}
           onDiskRole={onDiskRole}

package/lib/common/components/newFeatureSupportLevels/types.ts

@@ -1,9 +1,10 @@
 import {
   ArchitectureSupportLevelId,
   FeatureSupportLevelId,
+  PlatformType,
   SupportLevel,
 } from '@openshift-assisted/types/assisted-installer-service';
-import { CpuArchitecture, FeatureId } from '../../types';
+import { CpuArchitecture, FeatureId, SupportedCpuArchitecture } from '../../types';
 
 export type NewFeatureSupportLevelMap = Record<FeatureSupportLevelId, SupportLevel>;
 export type ArchitectureSupportLevelMap = Record<ArchitectureSupportLevelId, SupportLevel>;
@@ -23,7 +24,8 @@ export type NewFeatureSupportLevelData = {
   getFeatureDisabledReason(
     featureId: FeatureId,
     supportLevelData?: NewFeatureSupportLevelMap,
-    cpuArchitecture?: string,
+    cpuArchitecture?: SupportedCpuArchitecture,
+    platformType?: PlatformType,
   ): string | undefined;
   isFeatureSupported(featureId: FeatureId, supportLevelData?: NewFeatureSupportLevelMap): boolean;
   activeFeatureConfiguration?: ActiveFeatureConfiguration;

package/lib/common/components/ui/formik/validationSchemas.ts

@@ -226,15 +226,25 @@ export const vipRangeValidationSchema = (
     },
   );
 
-const vipUniqueValidationSchema = ({ ingressVips, apiVips }: NetworkConfigurationValues) =>
+const vipUniqueValidationSchema = (
+  { ingressVips, apiVips, apiVip, ingressVip }: NetworkConfigurationValues,
+  useIPArray: boolean,
+) =>
   Yup.string().test(
     'vip-uniqueness-validation',
     'The Ingress and API IP addresses cannot be the same.',
     (value) => {
-      if (!value || ingressVips?.length === 0 || apiVips?.length === 0) {
-        return true;
+      if (useIPArray) {
+        if (!value || ingressVips?.length === 0 || apiVips?.length === 0) {
+          return true;
+        }
+        return selectApiVip({ apiVips }) !== selectIngressVip({ ingressVips });
+      } else {
+        if (!value) {
+          return true;
+        }
+        return apiVip !== ingressVip;
       }
-      return selectApiVip({ apiVips }) !== selectIngressVip({ ingressVips });
     },
   );
 
@@ -276,7 +286,7 @@ export const vipValidationSchema = (
       !vipDhcpAllocation && managedNetworkingType !== 'userManaged',
     then: requiredOnceSet(initialValue, 'Required. Please provide an IP address')
       .concat(vipRangeValidationSchema(hostSubnets, values, true))
-      .concat(vipUniqueValidationSchema(values))
+      .concat(vipUniqueValidationSchema(values, false))
       .when('hostSubnet', {
         is: (hostSubnet) => hostSubnet !== NO_SUBNET_SET,
         then: Yup.string().required('Required. Please provide an IP address'),
@@ -295,7 +305,7 @@ export const vipNoSuffixValidationSchema = (
       .concat(ipNoSuffixValidationSchema)
       .concat(vipRangeValidationSchema(hostSubnets, values, false))
       .concat(vipBroadcastValidationSchema(values))
-      .concat(vipUniqueValidationSchema(values))
+      .concat(vipUniqueValidationSchema(values, true))
       .when('hostSubnet', {
         is: (hostSubnet) => hostSubnet !== NO_SUBNET_SET,
         then: Yup.string().required('Required. Please provide an IP address'),

package/lib/common/config/constants.ts

@@ -367,8 +367,8 @@ export const operatorLabels = (
   };
 };
 
-export const OCP_STATIC_IP_DOC =
-  'https://docs.openshift.com/container-platform/latest/scalability_and_performance/ztp-deploying-disconnected.html#ztp-configuring-a-static-ip_ztp-deploying-disconnected';
+export const getOCPStaticIPDocLink = (docVersion = '2.8') =>
+  `https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/${docVersion}/html-single/clusters/index#on-prem-creating-your-cluster-with-the-cli-nmstateconfig`;
 
 export const AI_UI_TAG = 'ui_ocm';