@openshift-assisted/ui-lib 2.9.9-cim → 2.9.11-cim

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

@@ -15,24 +15,30 @@ type ScaleUpFormProps = {
   agents: AgentK8sResource[];
   onEditHost: AgentTableActions['onEditHost'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
+  isNutanix: boolean;
 };
 
 const ScaleUpForm: React.FC<ScaleUpFormProps> = ({
   agents,
   onEditHost,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const { values } = useFormikContext<ScaleUpFormValues>();
   const { autoSelectHosts } = values;
   const availableAgents = React.useMemo(
     () =>
-      getAgentsForSelection(agents).filter(
-        (agent) =>
+      getAgentsForSelection(agents).filter((agent) => {
+        if (isNutanix && agent.status?.inventory?.systemVendor?.manufacturer !== 'Nutanix') {
+          return false;
+        }
+        return (
           !(
             agent.spec?.clusterDeploymentName?.name || agent.spec?.clusterDeploymentName?.namespace
-          ) && agent.status?.inventory.cpu?.architecture === values.cpuArchitecture,
-      ),
-    [agents, values.cpuArchitecture],
+          ) && agent.status?.inventory.cpu?.architecture === values.cpuArchitecture
+        );
+      }),
+    [agents, values.cpuArchitecture, isNutanix],
   );
   const { t } = useTranslation();
   return (

package/lib/cim/components/InfraEnv/utils.ts

@@ -51,12 +51,6 @@ export const getAgentClusterInstall = ({
     // @ts-ignore
     spec: {
       holdInstallation: true,
-      clusterDeploymentRef: clusterDeploymentName
-        ? {
-            name: clusterDeploymentName,
-            namespace,
-          }
-        : {},
       networking: {
         clusterNetwork: [
           {
@@ -75,6 +69,13 @@ export const getAgentClusterInstall = ({
     },
   };
 
+  if (obj.spec && clusterDeploymentName) {
+    obj.spec.clusterDeploymentRef = {
+      name: clusterDeploymentName,
+      namespace,
+    };
+  }
+
   if (obj.spec && values.sshPublicKey) {
     obj.spec.sshPublicKey = values.sshPublicKey;
   }

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

@@ -58,6 +58,7 @@ type ScaleUpModalProps = {
   agents: AgentK8sResource[];
   onChangeHostname: (agent: AgentK8sResource, hostname: string) => Promise<AgentK8sResource>;
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
+  isNutanix: boolean;
 };
 
 const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
@@ -68,6 +69,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
   agents,
   onChangeHostname,
   onSetInstallationDiskId,
+  isNutanix,
 }) => {
   const [editAgent, setEditAgent] = React.useState<AgentK8sResource | undefined>();
   const [error, setError] = React.useState<string | undefined>();
@@ -138,6 +140,7 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
                         agents={agents}
                         onEditHost={setEditAgent}
                         onSetInstallationDiskId={onSetInstallationDiskId}
+                        isNutanix={isNutanix}
                       />
                     </StackItem>
                     {error && (

package/lib/cim/index.ts

@@ -15,3 +15,4 @@ export * from '../common/components/clusterWizard/types';
 export * from '../common/components/clusterDetail';
 export * from '../common/components/clusterConfiguration';
 export * from '../common/types/clusters';
+export { ResourceUIState } from '../common';

package/lib/cim/types/k8s/agent-cluster-install.ts

@@ -16,13 +16,10 @@ export type AgentClusterInstallStatusCondition =
 
 export type AgentClusterInstallK8sResource = K8sResourceCommon & {
   spec?: {
-    clusterDeploymentRef?:
-      | {
-          name: string;
-          namespace: string;
-        }
-      // eslint-disable-next-line @typescript-eslint/ban-types
-      | {};
+    clusterDeploymentRef?: {
+      name: string;
+      namespace: string;
+    };
     clusterMetadata?: {
       adminKubeconfigSecretRef?: {
         name: string;

package/lib/common/api/utils.ts

@@ -1,7 +1,7 @@
 import Axios, { AxiosError } from 'axios';
 import * as Sentry from '@sentry/browser';
 import pick from 'lodash-es/pick.js';
-import {
+import type {
   Error as APIError,
   InfraError,
 } from '@openshift-assisted/types/assisted-installer-service';

package/lib/common/index.ts

@@ -9,3 +9,4 @@ export * from './config';
 export * from './features';
 export * from './reducers';
 export * from './selectors';
+export { ResourceUIState } from './types/resource-ui-state';

package/lib/common/types/index.ts

@@ -1,12 +1,3 @@
-export enum ResourceUIState {
-  LOADING = 'LOADING',
-  RELOADING = 'RELOADING',
-  EMPTY = 'EMPTY',
-  LOADED = 'LOADED',
-  POLLING_ERROR = 'POLLING_ERROR',
-  UPDATE_ERROR = 'UPDATE_ERROR',
-}
-
 export type WithTestID = {
   testId?: string;
 };

package/lib/common/types/resource-ui-state.ts

@@ -0,0 +1,8 @@
+export enum ResourceUIState {
+  LOADING = 'LOADING',
+  RELOADING = 'RELOADING',
+  EMPTY = 'EMPTY',
+  LOADED = 'LOADED',
+  POLLING_ERROR = 'POLLING_ERROR',
+  UPDATE_ERROR = 'UPDATE_ERROR',
+}

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTab.tsx

@@ -5,10 +5,10 @@ import { AlertsContextProvider, FeatureGateContextProvider } from '../../../comm
 import { HostsClusterDetailTabContent } from './HostsClusterDetailTabContent';
 import { HostsClusterDetailTabProps } from './types';
 import { storeDay1 } from '../../store';
-import { featureFlagsActions } from '../../store/slices/feature-flags/slice';
+import { useFeatureDetection } from '../../hooks/use-feature-detection';
 
 const HostsClusterDetailTab = (props: HostsClusterDetailTabProps) => {
-  storeDay1.dispatch(featureFlagsActions.setFeatureFlags(props.allEnabledFeatures));
+  useFeatureDetection();
 
   return (
     <Provider store={storeDay1}>

package/lib/ocm/components/Routes.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { Provider } from 'react-redux';
 import { Switch, Route, Redirect } from 'react-router-dom';
 import { Clusters, ClusterPage, NewClusterPage } from './clusters';
@@ -7,15 +7,13 @@ import type { FeatureListType } from '../../common/features/featureGate';
 import { routeBasePath } from '../config';
 import { AssistedUILibVersion } from './ui';
 import { storeDay1 } from '../store';
-import { featureFlagsActions } from '../store/slices/feature-flags/slice';
+import { useFeatureDetection } from '../hooks/use-feature-detection';
 
 export const Routes: React.FC<{ allEnabledFeatures: FeatureListType }> = ({
   allEnabledFeatures,
   children,
 }) => {
-  useEffect(() => {
-    storeDay1.dispatch(featureFlagsActions.setFeatureFlags(allEnabledFeatures));
-  }, [allEnabledFeatures]);
+  useFeatureDetection(allEnabledFeatures);
 
   return (
     <Provider store={storeDay1}>

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfigurationForm.tsx

@@ -46,6 +46,7 @@ import {
   InfraEnv,
   V2ClusterUpdateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
+import { useNewFeatureSupportLevel } from '../../../../common/components/newFeatureSupportLevels';
 
 const NetworkConfigurationForm: React.FC<{
   cluster: Cluster;
@@ -157,10 +158,14 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
   const { addAlert, clearAlerts, alerts } = useAlerts();
   const dispatch = useDispatch();
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
-
   const hostSubnets = React.useMemo(() => getHostSubnets(cluster, true), [cluster]);
+  const featureSupportLevelData = useNewFeatureSupportLevel();
+  const isClusterManagedNetworkingUnsupported = !featureSupportLevelData.isFeatureSupported(
+    'CLUSTER_MANAGED_NETWORKING',
+  );
   const initialValues = React.useMemo(
-    () => getNetworkInitialValues(cluster, defaultNetworkValues),
+    () =>
+      getNetworkInitialValues(cluster, defaultNetworkValues, isClusterManagedNetworkingUnsupported),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [], // just once, Formik does not reinitialize
   );

package/lib/ocm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts

@@ -31,6 +31,7 @@ export const getNetworkInitialValues = (
     | 'serviceNetworksIpv4'
     | 'serviceNetworksDualstack'
   >,
+  isClusterManagedNetworkingUnsupported: boolean,
 ): NetworkConfigurationValues => {
   const isSNOCluster = isSNO(cluster);
   const isDualStackType = isDualStack(cluster);
@@ -40,7 +41,11 @@ export const getNetworkInitialValues = (
     ingressVips: cluster.ingressVips,
     sshPublicKey: cluster.sshPublicKey || '',
     vipDhcpAllocation: cluster.vipDhcpAllocation,
-    managedNetworkingType: cluster.userManagedNetworking ? 'userManaged' : 'clusterManaged',
+    managedNetworkingType:
+      (cluster.apiVips && cluster.apiVips.length === 0 && isClusterManagedNetworkingUnsupported) ||
+      isSNOCluster
+        ? 'userManaged'
+        : 'clusterManaged',
     networkType: cluster.networkType || getDefaultNetworkType(isSNOCluster, isDualStackType),
     machineNetworks: cluster.machineNetworks || [],
     stackType: isDualStackType ? DUAL_STACK : IPV4_STACK,

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Modal, ModalVariant, Button, ButtonVariant } from '@patternfly/react-core';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type DeleteHostModalProps = {
   hostname?: string;
@@ -8,28 +9,32 @@ type DeleteHostModalProps = {
   onDelete: () => void;
 };
 
-const DeleteHostModal = ({ isOpen, hostname, onClose, onDelete }: DeleteHostModalProps) => (
-  <Modal
-    title="Remove host?"
-    isOpen={isOpen}
-    onClose={onClose}
-    variant={ModalVariant.small}
-    actions={[
-      <Button
-        data-testid="delete-host-submit"
-        key="confirm"
-        variant={ButtonVariant.danger}
-        onClick={onDelete}
-      >
-        Remove host
-      </Button>,
-      <Button key="cancel" variant={ButtonVariant.link} onClick={onClose}>
-        Cancel
-      </Button>,
-    ]}
-  >
-    Host {hostname || ''} will be removed.
-  </Modal>
-);
+const DeleteHostModal = ({ isOpen, hostname, onClose, onDelete }: DeleteHostModalProps) => {
+  const { t } = useTranslation();
+  return (
+    <Modal
+      title={t('ai:Remove host?')}
+      isOpen={isOpen}
+      onClose={onClose}
+      variant={ModalVariant.small}
+      titleIconVariant="warning"
+      actions={[
+        <Button
+          data-testid="delete-host-submit"
+          key="confirm"
+          variant={ButtonVariant.danger}
+          onClick={onDelete}
+        >
+          {t('ai:Remove host')}
+        </Button>,
+        <Button key="cancel" variant={ButtonVariant.link} onClick={onClose}>
+          {t('ai:Cancel')}
+        </Button>,
+      ]}
+    >
+      {t('ai:Host {{hostname}} will be removed', { hostname: hostname || '' })}
+    </Modal>
+  );
+};
 
 export default DeleteHostModal;

package/lib/ocm/config/external-features.ts

@@ -0,0 +1,12 @@
+import type { FeatureListType } from '../../common/features/featureGate';
+
+type FeatureMapping = {
+  featureId: keyof FeatureListType;
+  capabilityId: string;
+};
+export const externalFeaturesMappings: Array<FeatureMapping> = [
+  {
+    featureId: 'ASSISTED_INSTALLER_PLATFORM_OCI',
+    capabilityId: 'capability.organization.bare_metal_installer_platform_oci',
+  },
+];

package/lib/ocm/config/index.ts

@@ -1,2 +1,2 @@
-export * from './routeBaseBath';
+export * from './routeBasePath';
 export * from './constants';

package/lib/ocm/hooks/_use-feature-detection.test.tsx

@@ -0,0 +1,125 @@
+import type { Account, Organization } from '@openshift-assisted/types/accounts-management-service';
+import { describe, it, vi, expect } from 'vitest';
+import * as React from 'react';
+import { Provider } from 'react-redux';
+import { render } from 'react-dom';
+import { act } from 'react-dom/test-utils';
+import { featureFlagsActions, FeatureFlagsState } from '../store/slices/feature-flags/slice';
+import { isFeatureEnabled } from '../store/slices/feature-flags/selectors';
+import { RootStateDay1, storeDay1 } from '../store/store-day1';
+import { useFeatureDetection } from './use-feature-detection';
+import { CurrentAccountApi } from '../../common/api/accounts-management-service/current-account-api';
+import { OrganizationsApi } from '../../common/api/accounts-management-service/organizations-api';
+import { getMockContainer } from '../../_test-helpers/mock-container';
+
+vi.spyOn(featureFlagsActions, 'setFeatureFlag');
+vi.spyOn(CurrentAccountApi, 'getCurrentAccount').mockImplementation(() => {
+  return Promise.resolve({
+    username: 'jdoe',
+  } as Account);
+});
+
+const makeSpyOn$OrganizationsApi$getOrganization = (mockResponse: Organization) =>
+  vi.spyOn(OrganizationsApi, 'getOrganization').mockImplementation(() => {
+    return Promise.resolve(mockResponse);
+  });
+
+describe('use-feature-detection.ts', () => {
+  it('Sets only external features when no overrides are provided', async () => {
+    const DummyComponent: React.FC = () => {
+      useFeatureDetection();
+      return null;
+    };
+    makeSpyOn$OrganizationsApi$getOrganization({
+      capabilities: [
+        {
+          name: 'capability.organization.bare_metal_installer_platform_oci',
+          value: 'true',
+          inherited: true,
+        },
+      ],
+    });
+
+    await act(() =>
+      Promise.resolve(
+        render(
+          <Provider store={storeDay1}>
+            <DummyComponent />
+          </Provider>,
+          getMockContainer(),
+        ),
+      ),
+    );
+
+    expect(
+      isFeatureEnabled(
+        storeDay1.getState() as RootStateDay1 & FeatureFlagsState,
+        'ASSISTED_INSTALLER_PLATFORM_OCI',
+      ),
+    ).toBe(true);
+  });
+
+  it('Internal features override external features', async () => {
+    const featuresOverride = { ASSISTED_INSTALLER_PLATFORM_OCI: true };
+    const DummyComponent: React.FC = () => {
+      useFeatureDetection(featuresOverride);
+      return null;
+    };
+    makeSpyOn$OrganizationsApi$getOrganization({
+      capabilities: [
+        {
+          name: 'capability.organization.bare_metal_installer_platform_oci',
+          value: 'false',
+          inherited: true,
+        },
+      ],
+    });
+
+    await act(() =>
+      Promise.resolve(
+        render(
+          <Provider store={storeDay1}>
+            <DummyComponent />
+          </Provider>,
+          getMockContainer(),
+        ),
+      ),
+    );
+
+    expect(
+      isFeatureEnabled(
+        storeDay1.getState() as RootStateDay1 & FeatureFlagsState,
+        'ASSISTED_INSTALLER_PLATFORM_OCI',
+      ),
+    ).toBe(featuresOverride.ASSISTED_INSTALLER_PLATFORM_OCI);
+  });
+
+  it('Processes only features prefixed with ASSISTED_INSTALLER', async () => {
+    const featuresOverride = { NON_ASSISTED_INSTALLER_FEATURE: true };
+    const DummyComponent: React.FC = () => {
+      useFeatureDetection(featuresOverride);
+      return null;
+    };
+
+    await act(() =>
+      Promise.resolve(
+        render(
+          <Provider store={storeDay1}>
+            <DummyComponent />
+          </Provider>,
+          getMockContainer(),
+        ),
+      ),
+    );
+
+    /* Here we don't mock the call to the user organization API, therefore the
+     * capabilities in the currentUser slice should remain undefined, since the list
+     * of featuresOverride should get filtered out of features not prefixed with
+     * "ASSISTED_INSTALLER" there should be no call to setFeatureFlag.
+     */
+    expect(featureFlagsActions.setFeatureFlag).not.toHaveBeenCalled();
+    expect(
+      storeDay1.getState().featureFlags.data['NON_ASSISTED_INSTALLER_FEATURE'],
+    ).not.toBeDefined();
+  });
+});

package/lib/ocm/hooks/use-feature-detection.ts

@@ -0,0 +1,17 @@
+import type { FeatureListType } from '../../common/features/featureGate';
+import { featureFlagsAsyncActions } from '../store/slices/feature-flags/slice';
+import { storeDay1 } from '../store/store-day1';
+import { useEffect } from 'react';
+
+export function useFeatureDetection<T extends Partial<Record<string, boolean> & FeatureListType>>(
+  overrides: T | null = null,
+) {
+  useEffect(() => {
+    const onlyAssistedInstallerFeatures = Object.fromEntries(
+      Object.entries(overrides ?? {}).filter(([k, _v]) => k.startsWith('ASSISTED_INSTALLER')),
+    );
+    void storeDay1.dispatch(
+      featureFlagsAsyncActions.detectFeaturesAsync(onlyAssistedInstallerFeatures),
+    );
+  }, [overrides]);
+}

package/lib/ocm/services/ClusterDetailsService.ts

@@ -47,10 +47,6 @@ const ClusterDetailsService = {
       },
     };
 
-    if (!values.isCMNSupported) {
-      params.userManagedNetworking = true;
-    }
-
     if (values.hostsNetworkConfigurationType === HostsNetworkConfigurationType.STATIC) {
       params.staticNetworkConfig = getDummyInfraEnvField();
     }

package/lib/ocm/services/ClustersService.ts

@@ -1,21 +1,21 @@
-import { ClustersAPI } from '../services/apis';
-import HostsService from './HostsService';
-import InfraEnvsService from './InfraEnvsService';
-import { AI_UI_TAG } from '../../common';
-import { isInOcm } from '../api';
-import { ClusterCreateParamsWithStaticNetworking } from './types';
-import omit from 'lodash-es/omit.js';
-import {
+import type { ClusterCreateParamsWithStaticNetworking } from './types';
+import type {
   CustomManifestValues,
   ListManifestsExtended,
 } from '../components/clusterConfiguration/manifestsConfiguration/data/dataTypes';
-import {
+import type {
   Cluster,
   Host,
   InfraEnvCreateParams,
   UpdateManifestParams,
   V2ClusterUpdateParams,
 } from '@openshift-assisted/types/assisted-installer-service';
+import omit from 'lodash-es/omit.js';
+import ClustersAPI from '../../common/api/assisted-service/ClustersAPI';
+import HostsService from './HostsService';
+import InfraEnvsService from './InfraEnvsService';
+import { AI_UI_TAG } from '../../common/config/constants';
+import { isInOcm } from '../../common/api/axiosClient';
 
 const ClustersService = {
   findHost(hosts: Cluster['hosts'] = [], hostId: Host['id']) {

package/lib/ocm/services/InfraEnvIdsCacheService.ts

@@ -1,5 +1,5 @@
-import { CpuArchitecture, getAllCpuArchitectures } from '../../common';
-import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
+import type { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
+import { CpuArchitecture, getAllCpuArchitectures } from '../../common//types/cpuArchitecture';
 
 const CACHE_KEY = 'infra-env-ids-cache-v2';
 

package/lib/ocm/store/hooks.ts

@@ -1,9 +1,6 @@
 import { useDispatch, useSelector } from 'react-redux';
 import type { TypedUseSelectorHook } from 'react-redux';
 import type { DispatchDay1, RootStateDay1 } from './store-day1';
-import type { DispatchDay2, RootStateDay2 } from './store-day2';
 
-export const useDispatchDay1: () => DispatchDay1 = useDispatch;
+export const useDispatchDay1 = useDispatch<DispatchDay1>;
 export const useSelectorDay1: TypedUseSelectorHook<RootStateDay1> = useSelector;
-export const useDispatchDay2: () => DispatchDay2 = useDispatch;
-export const useSelectorDay2: TypedUseSelectorHook<RootStateDay2> = useSelector;

package/lib/ocm/store/index.ts

@@ -1,5 +1,3 @@
 export { storeDay1 } from './store-day1';
-export { storeDay2 } from './store-day2';
 export type { RootStateDay1, DispatchDay1 } from './store-day1';
-export type { RootStateDay2, DispatchDay2 } from './store-day2';
-export { useSelectorDay1, useSelectorDay2, useDispatchDay1, useDispatchDay2 } from './hooks';
+export { useSelectorDay1, useDispatchDay1 } from './hooks';

package/lib/ocm/store/slices/clusters/slice.ts

@@ -6,10 +6,11 @@ import {
   AnyAction,
   Dispatch,
 } from '@reduxjs/toolkit';
-import { ResourceUIState } from '../../../../common';
-import { ClustersAPI } from '../../../services/apis';
-import { handleApiError, isInOcm } from '../../../api';
-import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { ResourceUIState } from '../../../../common/types/resource-ui-state';
+import ClustersAPI from '../../../../common/api/assisted-service/ClustersAPI';
+import { isInOcm } from '../../../../common/api/axiosClient';
+import type { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import { handleApiError } from '../../../../common/api/utils';
 
 export const fetchClustersAsync = createAsyncThunk<Cluster[] | void>(
   'clusters/fetchClustersAsync',

package/lib/ocm/store/slices/current-cluster/slice.ts

@@ -1,23 +1,17 @@
 import findIndex from 'lodash-es/findIndex.js';
 import set from 'lodash-es/set.js';
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { AxiosError } from 'axios';
+import type { AnyAction, Dispatch, PayloadAction, ThunkDispatch } from '@reduxjs/toolkit';
+import type { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
+import type { AssistedInstallerPermissionTypesListType } from '../../../../common/features/featureGate';
 import {
-  AnyAction,
-  createAsyncThunk,
-  createSlice,
-  Dispatch,
-  PayloadAction,
-  ThunkDispatch,
-} from '@reduxjs/toolkit';
-import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
-import {
-  AssistedInstallerPermissionTypesListType,
-  FETCH_ABORTED_ERROR_CODE,
-  getApiErrorCode,
-  getApiErrorMessage,
   handleApiError,
-  ResourceUIState,
-} from '../../../../common';
+  getApiErrorMessage,
+  getApiErrorCode,
+  FETCH_ABORTED_ERROR_CODE,
+} from '../../../../common/api/utils';
+import { ResourceUIState } from '../../../../common/types/resource-ui-state';
 import ClustersService from '../../../services/ClustersService';
 
 export type FetchErrorType = {