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

package/lib/ocm/hooks/useSupportLevelsAPI.ts

@@ -1,27 +1,34 @@
 import React from 'react';
-import { useAlerts } from '../../common';
+import { CpuArchitecture, SupportedCpuArchitecture, useAlerts } from '../../common';
 import {
   ArchitectureSupportLevelMap,
   NewFeatureSupportLevelMap,
 } from '../../common/components/newFeatureSupportLevels';
 import { getApiErrorMessage, handleApiError } from '../api';
 import NewFeatureSupportLevelsAPI from '../../common/api/assisted-service/NewFeatureSupportLevelsAPI';
+import { PlatformType } from '@openshift-assisted/types/./assisted-installer-service';
 
-type SupportLevelAPIResources = 'architectures' | 'features';
+type SupportLevelAPIResources = 'architectures' | 'features' | 'featureForAllCpus';
 type UseSupportLevelAPIResponse<T extends SupportLevelAPIResources> = T extends 'architectures'
   ? ArchitectureSupportLevelMap | null
   : T extends 'features'
   ? NewFeatureSupportLevelMap | null
+  : T extends 'featureForAllCpus'
+  ? Record<SupportedCpuArchitecture, NewFeatureSupportLevelMap | null> | null
   : null;
 
 export default function useSupportLevelsAPI<T extends SupportLevelAPIResources>(
   resourceKind: T,
   openshiftVersion?: string,
-  cpuArchitecture?: string,
+  cpuArchitecture?: CpuArchitecture,
+  platformType?: PlatformType,
+  supportedCpuArchitectures?: SupportedCpuArchitecture[],
 ): UseSupportLevelAPIResponse<T> | null {
   const [cpuArchitectures, setCpuArchitectures] =
     React.useState<ArchitectureSupportLevelMap | null>(null);
   const [features, setFeatures] = React.useState<NewFeatureSupportLevelMap | null>(null);
+  const [supportLevelData, setSupportLevelData] =
+    React.useState<Record<SupportedCpuArchitecture, NewFeatureSupportLevelMap | null>>();
   const { addAlert } = useAlerts();
 
   const fetchArchitecturesSupportLevels = React.useCallback(
@@ -45,11 +52,16 @@ export default function useSupportLevelsAPI<T extends SupportLevelAPIResources>(
   );
 
   const fetchFeaturesSupportLevels = React.useCallback(
-    async (openshiftVersion: string, cpuArchitecture?: string) => {
+    async (
+      openshiftVersion: string,
+      cpuArchitecture?: CpuArchitecture,
+      platformType?: PlatformType,
+    ) => {
       try {
         const { data: features } = await NewFeatureSupportLevelsAPI.featuresSupportLevel(
           openshiftVersion,
           cpuArchitecture,
+          platformType,
         );
         setFeatures(features.features);
       } catch (e) {
@@ -65,12 +77,55 @@ export default function useSupportLevelsAPI<T extends SupportLevelAPIResources>(
     [addAlert],
   );
 
+  const fetchFeaturesSupportLevelsForAllCpuArchs = React.useCallback(
+    async (
+      supportedCpuArchitectures: SupportedCpuArchitecture[],
+      openshiftVersion: string,
+      platformType?: PlatformType,
+    ) => {
+      try {
+        const data: Record<SupportedCpuArchitecture, NewFeatureSupportLevelMap | null> = {
+          x86_64: null,
+          arm64: null,
+          ppc64le: null,
+          s390x: null,
+        };
+        if (supportedCpuArchitectures) {
+          for (const cpuArch of supportedCpuArchitectures) {
+            const { data: features } = await NewFeatureSupportLevelsAPI.featuresSupportLevel(
+              openshiftVersion,
+              cpuArch,
+              platformType,
+            );
+            data[cpuArch] = features.features;
+          }
+          setSupportLevelData(data);
+        }
+      } catch (e) {
+        handleApiError(e, () =>
+          addAlert({
+            title: 'Failed to retrieve feature support levels',
+            message: getApiErrorMessage(e),
+          }),
+        );
+        setFeatures(null);
+      }
+    },
+    [addAlert],
+  );
+
   React.useEffect(() => {
     if (openshiftVersion) {
       if (resourceKind === 'architectures') {
         void fetchArchitecturesSupportLevels(openshiftVersion);
+      } else if (resourceKind === 'featureForAllCpus' && supportedCpuArchitectures) {
+        void fetchFeaturesSupportLevelsForAllCpuArchs(
+          supportedCpuArchitectures,
+          openshiftVersion,
+          platformType,
+        );
       } else {
-        void fetchFeaturesSupportLevels(openshiftVersion, cpuArchitecture);
+        void fetchFeaturesSupportLevels(openshiftVersion, cpuArchitecture, platformType);
       }
     }
   }, [
@@ -79,10 +134,15 @@ export default function useSupportLevelsAPI<T extends SupportLevelAPIResources>(
     fetchArchitecturesSupportLevels,
     fetchFeaturesSupportLevels,
     resourceKind,
+    platformType,
+    supportedCpuArchitectures,
+    fetchFeaturesSupportLevelsForAllCpuArchs,
   ]);
 
   if (resourceKind === 'architectures') {
     return cpuArchitectures as UseSupportLevelAPIResponse<T>;
+  } else if (resourceKind === 'featureForAllCpus') {
+    return supportLevelData as UseSupportLevelAPIResponse<T>;
   } else {
     return features as UseSupportLevelAPIResponse<T>;
   }

package/lib/ocm/hooks/useUISettings.ts

@@ -0,0 +1,71 @@
+import React from 'react';
+import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
+import { UISettingService, UISettingsValues } from '../services';
+import { ClustersAPI } from '../services/apis';
+
+const useUISettings = (clusterId?: Cluster['id']) => {
+  const [uiSettings, setUISettings] = React.useState<UISettingsValues>();
+  const [loading, setLoading] = React.useState(true);
+  const [error, setError] = React.useState<string>('');
+
+  const updateUISettings = React.useCallback(
+    async (newSettings: UISettingsValues) => {
+      if (clusterId) {
+        const updatedSettings = { ...uiSettings, ...newSettings };
+        try {
+          await UISettingService.update(clusterId, updatedSettings);
+          setUISettings(updatedSettings);
+        } catch (e) {
+          throw new Error();
+        }
+      }
+    },
+    [clusterId, uiSettings],
+  );
+
+  React.useEffect(() => {
+    const handleUISettingsError = async () => {
+      if (clusterId) {
+        try {
+          const { data: customManifests } = await ClustersAPI.getManifests(clusterId);
+
+          const mockUISettings: UISettingsValues = {
+            addCustomManifests: !!customManifests.length,
+            customManifestsAdded: !!customManifests.length,
+          };
+
+          setUISettings(mockUISettings);
+        } catch (error) {
+          setError('Failed to retrieve cluster custom manifests information');
+        }
+      }
+    };
+
+    const fetchUISettings = async () => {
+      if (clusterId) {
+        try {
+          const settings = await UISettingService.fetch(clusterId);
+          setUISettings(settings);
+        } catch (e) {
+          await handleUISettingsError();
+        }
+      } else {
+        setUISettings({});
+      }
+      setLoading(false);
+    };
+
+    if (!uiSettings) {
+      void fetchUISettings();
+    }
+  }, [clusterId, setUISettings, uiSettings]);
+
+  const returnValue = React.useMemo(
+    () => ({ uiSettings, loading, error, updateUISettings }),
+    [uiSettings, loading, error, updateUISettings],
+  );
+
+  return returnValue;
+};
+
+export default useUISettings;

package/lib/ocm/services/ClusterDetailsService.ts

@@ -92,6 +92,7 @@ const ClusterDetailsService = {
     cluster,
     infraEnv,
     urlSearchParams,
+    addCustomManifests,
     ...args
   }: {
     cluster?: Cluster;
@@ -100,6 +101,7 @@ const ClusterDetailsService = {
     managedDomains: ManagedDomain[];
     ocpVersions: OpenshiftVersionOptionType[];
     urlSearchParams: string;
+    addCustomManifests?: boolean;
   }): OcmClusterDetailsValues {
     const values = getClusterDetailsInitialValues({
       cluster,
@@ -118,7 +120,7 @@ const ClusterDetailsService = {
       ...values,
       cpuArchitecture,
       hostsNetworkConfigurationType,
-      addCustomManifest: false,
+      addCustomManifest: !!addCustomManifests,
       isCMNSupported: true,
     };
   },

package/lib/ocm/services/ClustersService.ts

@@ -11,7 +11,6 @@ import {
 } from '../components/clusterConfiguration/manifestsConfiguration/data/dataTypes';
 import {
   Cluster,
-  CreateManifestParams,
   Host,
   InfraEnvCreateParams,
   UpdateManifestParams,
@@ -138,15 +137,6 @@ const ClustersService = {
     return Promise.all(promises);
   },
 
-  createDummyManifest(clusterId: Cluster['id']) {
-    const dummyManifest: CreateManifestParams = {
-      folder: 'manifests' as 'manifests' | 'openshift',
-      fileName: 'manifest1.yaml',
-      content: '',
-    };
-    return ClustersAPI.createCustomManifest(clusterId, dummyManifest);
-  },
-
   updateCustomManifest(
     existingManifest: CustomManifestValues,
     updatedManifest: CustomManifestValues,

package/lib/ocm/services/Day2ClusterService.ts

@@ -3,7 +3,11 @@ import { ClustersAPI } from './apis';
 import { CpuArchitecture, SupportedCpuArchitecture } from '../../common';
 import { OcmClusterType } from '../components/AddHosts/types';
 import { mapOcmArchToCpuArchitecture } from './CpuArchitectureService';
-import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
+import {
+  Cluster,
+  Platform,
+  PlatformType,
+} from '@openshift-assisted/types/assisted-installer-service';
 
 export const getApiVipDnsName = (ocmCluster: OcmClusterType) => {
   let apiVipDnsname = '';
@@ -30,12 +34,20 @@ export const getApiVipDnsName = (ocmCluster: OcmClusterType) => {
   return { apiVipDnsname, errorType: apiVipDnsname ? '' : urlType };
 };
 
+export const mapCloudProviderToPlatformType = (cloudProviderId?: string) => {
+  const platformType = cloudProviderId === 'external' ? 'oci' : cloudProviderId;
+  const platform: Platform = {
+    type: (platformType as PlatformType) || 'baremetal',
+  };
+  return platform;
+};
+
 const Day2ClusterService = {
   getOpenshiftClusterId(ocmCluster?: OcmClusterType) {
     return ocmCluster && ocmCluster.external_id;
   },
 
-  async fetchCluster(ocmCluster: OcmClusterType, pullSecret: string, openshiftVersion: string) {
+  async fetchCluster(ocmCluster: OcmClusterType, pullSecret: string) {
     const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmCluster);
 
     if (!openshiftClusterId) {
@@ -53,7 +65,7 @@ const Day2ClusterService = {
       ocmCluster.display_name || ocmCluster.name || openshiftClusterId,
       getApiVipDnsName(ocmCluster).apiVipDnsname,
       pullSecret,
-      openshiftVersion,
+      ocmCluster.openshift_version,
       mapOcmArchToCpuArchitecture(ocmCluster.cpu_architecture) || CpuArchitecture.x86,
     );
   },
@@ -69,6 +81,7 @@ const Day2ClusterService = {
     if (day2Clusters.length > 0) {
       return day2Clusters[0].id;
     }
+
     return undefined;
   },
 
@@ -117,6 +130,7 @@ const Day2ClusterService = {
         // The field "cpu_architecture" is calculated based on the existing hosts' architecture
         // It can be a specific architecture, or "multi" if hosts from several architectures have been discovered
         cpuArchitecture: mapOcmArchToCpuArchitecture(ocmCluster.cpu_architecture),
+        platform: mapCloudProviderToPlatformType(ocmCluster.cloud_provider?.id),
       };
     }
     return treakedCluster;

package/lib/ocm/services/UISettingsService.ts

@@ -0,0 +1,17 @@
+import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
+import { UISettingsAPI } from '../../common/api/assisted-service';
+import { UISettingsValues } from './types';
+
+const PREFIX_LENGHT = 6;
+
+const UISettingService = {
+  async fetch(clusterId: Cluster['id']) {
+    const { data } = await UISettingsAPI.get(clusterId);
+    return (data.length ? JSON.parse(data.slice(PREFIX_LENGHT)) : {}) as UISettingsValues;
+  },
+  update(clusterId: Cluster['id'], data: UISettingsValues) {
+    return UISettingsAPI.put(clusterId, `AI_UI:${JSON.stringify(data)}`);
+  },
+};
+
+export default UISettingService;

package/lib/ocm/services/index.ts

@@ -7,5 +7,6 @@ export { default as DiscoveryImageFormService } from './DiscoveryImageFormServic
 export { default as DiskEncryptionService } from './DiskEncryptionService';
 export { default as OperatorsService } from './OperatorsService';
 export { default as NewFeatureSupportLevelsService } from './NewFeatureSupportLevelsService';
+export { default as UISettingService } from './UISettingsService';
 export * from './types';
 export * as APIs from './apis';

package/lib/ocm/services/types.ts

@@ -24,3 +24,8 @@ export type OcmClusterDetailsValues = ClusterDetailsValues & {
   addCustomManifest: boolean;
   isCMNSupported: boolean;
 };
+
+export type UISettingsValues = {
+  addCustomManifests?: boolean;
+  customManifestsAdded?: boolean;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.9.7-cim",
-    "@openshift-assisted/types": "2.9.7-cim",
+    "@openshift-assisted/locales": "2.9.9-cim",
+    "@openshift-assisted/types": "2.9.9-cim",
     "axios-case-converter": "^0.11.1",
     "camel-case": "^4.1.2",
     "cidr-tools": "^4.3.0",
@@ -127,5 +127,5 @@
       ]
     }
   },
-  "version": "2.9.7-cim"
+  "version": "2.9.9-cim"
 }

package/build/@types/common/sevices/DateAndTime.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DateAndTime.d.ts","sourceRoot":"","sources":["../../../../lib/common/sevices/DateAndTime.tsx"],"names":[],"mappings":"AAEA,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,UAIvD;AAED,wBAAgB,wBAAwB,CAAC,oBAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,UAM1F"}

package/build/cjs/common/sevices/DateAndTime.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DateAndTime.js","sourceRoot":"","sources":["../../../../lib/common/sevices/DateAndTime.tsx"],"names":[],"mappings":";;;AAAA,mDAA4D;AAE5D,SAAgB,sBAAsB,CAAC,SAAiB;IACtD,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,sBAAU,CAAC,CAAC;AACnF,CAAC;AAJD,wDAIC;AAED,SAAgB,wBAAwB,CAAC,oBAA4B,EAAE,WAAoB;IACzF,IAAI,WAAW,IAAI,WAAW,KAAK,qBAAS,EAAE;QAC5C,OAAO,oBAAoB,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;KACnE;SAAM;QACL,OAAO,oBAAoB,CAAC;KAC7B;AACH,CAAC;AAND,4DAMC"}