@openshift-assisted/ui-lib 2.9.14-cim → 2.10.0-cim

package/lib/ocm/components/fetching/fetchEvents.ts

@@ -1,10 +1,22 @@
-import { AxiosError, AxiosResponseHeaders } from 'axios';
+import { AxiosError, AxiosHeaderValue, AxiosHeaders, AxiosResponseHeaders } from 'axios';
 import { EVENT_SEVERITIES, EventListFetchProps } from '../../../common';
-import { handleApiError } from '../../api';
+import { handleApiError } from '../../../common/api';
 import { EventsAPI } from '../../services/apis';
 import { SeverityCountsType } from '../../../common/components/ui/ClusterEventsToolbar';
 import { Event } from '@openshift-assisted/types/assisted-installer-service';
-const parseHeaders = (headers: AxiosResponseHeaders) => {
+const parseHeaders = (
+  headers:
+    | AxiosResponseHeaders
+    | Partial<
+        AxiosHeaders & {
+          Server: AxiosHeaderValue;
+          'Content-Type': AxiosHeaderValue;
+          'Content-Length': AxiosHeaderValue;
+          'Cache-Control': AxiosHeaderValue;
+          'Content-Encoding': AxiosHeaderValue;
+        }
+      >,
+) => {
   const severities: Record<Event['severity'], number> = {
     error: 0,
     info: 0,

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

@@ -14,6 +14,7 @@ import { wizardStepsValidationsMap } from '../clusterWizard/wizardTransition';
 import { AdditionalNTPSourcesDialogToggle } from './AdditionaNTPSourceDialogToggle';
 import { stringToJSON } from '../../../common/utils';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type HardwareStatusProps = {
   host: Host;
@@ -25,12 +26,13 @@ type HardwareStatusProps = {
 const DELETE_MODAL_STATUS_Z_INDEX = 500;
 
 const HardwareStatus = (props: HardwareStatusProps) => {
+  const { t } = useTranslation();
   const hardwareStatus = getWizardStepHostStatus(
     'host-discovery',
     wizardStepsValidationsMap,
     props.host,
   );
-  const status = hostStatus[hardwareStatus];
+  const status = hostStatus(t)[hardwareStatus];
   const validationsInfo = getWizardStepHostValidationsInfo(
     props.validationsInfo,
     'host-discovery',

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

@@ -35,7 +35,6 @@ const HostRowDetailExpand = ({ obj: host }: ExpandComponentProps<Host>) => (
     key={host.id}
     host={host}
     AdditionalNTPSourcesDialogToggleComponent={AdditionalNTPSourcesDialogToggle}
-    hideStorage
   />
 );
 

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ConnectedIcon } from '@patternfly/react-icons';
+import { ConnectedIcon } from '@patternfly/react-icons/dist/js/icons/connected-icon';
 import EmptyState from '../../../common/components/ui/uiState/EmptyState';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import HostsDiscoveryTroubleshootingInfoLinkWithModal from './HostsDiscoveryTroubleshootingInfoLinkWithModal';

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

@@ -9,14 +9,16 @@ import {
 } from '../../../common';
 import { wizardStepsValidationsMap } from '../clusterWizard/wizardTransition';
 import { AdditionalNTPSourcesDialogToggle } from './AdditionaNTPSourceDialogToggle';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 const NetworkingStatus: React.FC<HostNetworkingStatusComponentProps> = (props) => {
+  const { t } = useTranslation();
   const networkingStatus = getWizardStepHostStatus(
     'networking',
     wizardStepsValidationsMap,
     props.host,
   );
-  const status = hostStatus[networkingStatus];
+  const status = hostStatus(t)[networkingStatus];
   const validationsInfo = getWizardStepHostValidationsInfo(
     props.validationsInfo,
     'networking',

package/lib/ocm/components/hosts/use-hosts-table.tsx

@@ -14,7 +14,7 @@ import {
   AdditionalNTPSourcesDialog,
   AdditionalNTPSourcesFormProps,
 } from '../../../common/components/hosts/AdditionalNTPSourcesDialog';
-import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../api';
+import { getApiErrorMessage, handleApiError, isUnknownServerError } from '../../../common/api';
 import {
   forceReload,
   setServerUpdateError,

package/lib/ocm/components/hosts/utils.ts

@@ -1,7 +1,7 @@
 import { saveAs } from 'file-saver';
 import type { AlertsContextType } from '../../../common';
 
-import { isInOcm, handleApiError, getApiErrorMessage } from '../../api';
+import { isInOcm, handleApiError, getApiErrorMessage } from '../../../common/api';
 import { updateCluster } from '../../store/slices/current-cluster/slice';
 import { ClustersService } from '../../services';
 import ClustersAPI from '../../../common/api/assisted-service/ClustersAPI';

package/lib/ocm/components/ui/InfoLinkWithModal.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button, ButtonVariant, Modal, ModalProps } from '@patternfly/react-core';
-import { InfoCircleIcon } from '@patternfly/react-icons';
+import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import { SVGIconProps } from '@patternfly/react-icons/dist/js/createIcon';
 
 export interface InfoLinkWithModalProps {

package/lib/ocm/components/utils.ts

@@ -0,0 +1,19 @@
+import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
+
+export const isOciPlatformType = (cluster: Cluster): boolean => {
+  return (
+    cluster.platform?.type === 'external' && cluster.platform?.external?.platformName === 'oci'
+  );
+};
+
+export const getMajorMinorVersion = (version = '') => {
+  const match = /[0-9].[0-9][0-9]?/g.exec(version);
+  return match?.[0] || '';
+};
+
+export const isOCPVersionEqualsOrMajor = (
+  openshiftVersion: string,
+  ocpVersionToCompare: string,
+): boolean => {
+  return parseFloat(getMajorMinorVersion(openshiftVersion)) >= parseFloat(ocpVersionToCompare);
+};

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

@@ -4,13 +4,13 @@ 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 { featureFlagsActions } from '../store/slices/feature-flags/slice';
+import { 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';
+import { isFeatureEnabled } from '../store/slices/feature-flags/selectors';
 
 vi.spyOn(featureFlagsActions, 'setFeatureFlag');
 vi.spyOn(CurrentAccountApi, 'getCurrentAccount').mockImplementation(() => {
@@ -51,12 +51,7 @@ describe('use-feature-detection.ts', () => {
       ),
     );
 
-    expect(
-      isFeatureEnabled(
-        storeDay1.getState() as RootStateDay1 & FeatureFlagsState,
-        'ASSISTED_INSTALLER_PLATFORM_OCI',
-      ),
-    ).toBe(true);
+    expect(isFeatureEnabled('ASSISTED_INSTALLER_PLATFORM_OCI')(storeDay1.getState())).toBe(true);
   });
 
   it('Internal features override external features', async () => {
@@ -86,12 +81,9 @@ describe('use-feature-detection.ts', () => {
       ),
     );
 
-    expect(
-      isFeatureEnabled(
-        storeDay1.getState() as RootStateDay1 & FeatureFlagsState,
-        'ASSISTED_INSTALLER_PLATFORM_OCI',
-      ),
-    ).toBe(featuresOverride.ASSISTED_INSTALLER_PLATFORM_OCI);
+    expect(isFeatureEnabled('ASSISTED_INSTALLER_PLATFORM_OCI')(storeDay1.getState())).toBe(
+      featuresOverride.ASSISTED_INSTALLER_PLATFORM_OCI,
+    );
   });
 
   it('Processes only features prefixed with ASSISTED_INSTALLER', async () => {

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

@@ -0,0 +1,7 @@
+import { AssistedInstallerFeatureType } from '../../common';
+import { useSelectorDay1 } from '../store';
+import { isFeatureEnabled } from '../store/slices/feature-flags/selectors';
+
+export const useFeature = (feature: AssistedInstallerFeatureType): boolean => {
+  return useSelectorDay1(isFeatureEnabled(feature));
+};

package/lib/ocm/hooks/useClusterCustomManifests.ts

@@ -6,7 +6,7 @@ import {
   Manifest,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { ClustersAPI } from '../services/apis';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { getErrorMessage } from '../../common/utils';
 import { ListManifestsExtended } from '../components/clusterConfiguration/manifestsConfiguration/data/dataTypes';
 

package/lib/ocm/hooks/useClusterPreflightRequirements.ts

@@ -5,7 +5,7 @@ import {
   PreflightHardwareRequirements,
 } from '@openshift-assisted/types/assisted-installer-service';
 import { ClustersAPI } from '../services/apis';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { getErrorMessage } from '../../common/utils';
 
 const { addAlert } = alertsSlice.actions;

package/lib/ocm/hooks/useManagedDomains.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useAlerts } from '../../common';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { ManagedDomainsAPI } from '../services/apis';
 import { ManagedDomain } from '@openshift-assisted/types/assisted-installer-service';
 

package/lib/ocm/hooks/useOpenshiftVersions.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { CpuArchitecture, OpenshiftVersionOptionType } from '../../common';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { SupportedOpenshiftVersionsAPI } from '../services/apis';
 import { getKeys } from '../../common/utils';
 import { Cluster, OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service';

package/lib/ocm/hooks/usePullSecret.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { useAlerts } from '../../common';
 import { AccessTokenAPI } from '../../common/api/accounts-management-service/access-token-api';
 

package/lib/ocm/hooks/useSupportLevelsAPI.ts

@@ -4,7 +4,7 @@ import {
   ArchitectureSupportLevelMap,
   NewFeatureSupportLevelMap,
 } from '../../common/components/newFeatureSupportLevels';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import NewFeatureSupportLevelsAPI from '../../common/api/assisted-service/NewFeatureSupportLevelsAPI';
 import { PlatformType } from '@openshift-assisted/types/./assisted-installer-service';
 

package/lib/ocm/hooks/useUsedClusterNames.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { getApiErrorMessage, handleApiError } from '../api';
+import { getApiErrorMessage, handleApiError } from '../../common/api';
 import { ClustersAPI } from '../services/apis';
 import { useAlerts } from '../../common';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';

package/lib/ocm/index.ts

@@ -1,4 +1,4 @@
-export * as Api from './api';
+export * as Api from '../common/api';
 export * as Store from './store';
 export * as Config from './config';
 export * as Services from './services';
@@ -13,4 +13,3 @@ export * as Constants from '../common/config';
 export * as Reducers from '../common/reducers';
 
 export * from '../common/components';
-export * from '../common/api';

package/lib/ocm/services/ClusterDetailsService.ts

@@ -13,7 +13,7 @@ import {
   OcmClusterDetailsValues,
 } from './types';
 import { getDummyInfraEnvField } from '../components/clusterConfiguration/staticIp/data/dummyData';
-import { isInOcm } from '../api';
+import { isInOcm } from '../../common/api';
 import { getDefaultCpuArchitecture } from './CpuArchitectureService';
 import {
   Cluster,
@@ -44,9 +44,21 @@ const ClusterDetailsService = {
       diskEncryption: DiskEncryptionService.getDiskEncryptionParams(values),
       platform: {
         type: values.platform,
+        ...(values.platform === 'external'
+          ? {
+              external: {
+                platformName: 'oci',
+                cloudControllerManager: 'External',
+              },
+            }
+          : {}),
       },
     };
 
+    if (!values.isCMNSupported) {
+      params.userManagedNetworking = true;
+    }
+
     if (values.hostsNetworkConfigurationType === HostsNetworkConfigurationType.STATIC) {
       params.staticNetworkConfig = getDummyInfraEnvField();
     }
@@ -76,9 +88,13 @@ const ClusterDetailsService = {
     }
 
     if (platform) {
-      params.platform = {
-        type: platform,
-      };
+      params.platform =
+        platform === 'external'
+          ? {
+              type: platform,
+              external: { platformName: 'oci', cloudControllerManager: 'External' },
+            }
+          : { type: platform };
     }
 
     return params;

package/lib/ocm/services/ClustersService.ts

@@ -33,7 +33,7 @@ const ClustersService = {
       staticNetworkConfig: params.staticNetworkConfig,
     };
 
-    if (params.platform?.type === 'oci') {
+    if (params.platform?.type === 'external' && params.platform.external?.platformName === 'oci') {
       infraEnvCreateParams.imageType = 'minimal-iso';
     }
 
@@ -53,10 +53,16 @@ const ClustersService = {
     await ClustersAPI.deregister(clusterId);
   },
 
-  async downloadLogs(clusterId: Cluster['id'], hostId?: Host['id']) {
+  async downloadLogs(
+    clusterId: Cluster['id'],
+    hostId?: Host['id'],
+  ): Promise<{
+    data: Blob;
+    fileName: string | undefined;
+  }> {
     const { data, headers } = await ClustersAPI.downloadLogs(clusterId, hostId);
-    const contentHeader = headers['content-disposition'];
-    const fileName = contentHeader?.match(/filename="(.+)"/)?.[1];
+    const contentHeader: string | undefined = headers['content-disposition'] as string | undefined;
+    const fileName: string | undefined = contentHeader?.match(/filename="(.+)"/)?.[1];
     return { data, fileName };
   },
 

package/lib/ocm/services/Day2ClusterService.ts

@@ -1,6 +1,12 @@
 import { InfraEnvsService } from '.';
 import { ClustersAPI } from './apis';
-import { CpuArchitecture, SupportedCpuArchitecture } from '../../common';
+import {
+  CpuArchitecture,
+  NonPlatformIntegrations,
+  SupportedCpuArchitecture,
+  SupportedPlatformIntegrations,
+  SupportedPlatformType,
+} from '../../common';
 import { OcmClusterType } from '../components/AddHosts/types';
 import { mapOcmArchToCpuArchitecture } from './CpuArchitectureService';
 import {
@@ -35,10 +41,22 @@ export const getApiVipDnsName = (ocmCluster: OcmClusterType) => {
 };
 
 export const mapCloudProviderToPlatformType = (cloudProviderId?: string) => {
-  const platformType = cloudProviderId === 'external' ? 'oci' : cloudProviderId;
+  let platformType = cloudProviderId;
+  if (
+    !SupportedPlatformIntegrations.includes(platformType as SupportedPlatformType) &&
+    !NonPlatformIntegrations.includes(platformType as SupportedPlatformType)
+  ) {
+    platformType = 'baremetal';
+  }
   const platform: Platform = {
     type: (platformType as PlatformType) || 'baremetal',
   };
+  if (platformType === 'external') {
+    platform.external = {
+      platformName: 'oci',
+      cloudControllerManager: 'External',
+    };
+  }
   return platform;
 };
 

package/lib/ocm/store/slices/feature-flags/selectors.ts

@@ -4,9 +4,9 @@ import { createSelector } from '@reduxjs/toolkit';
 
 export const selectFeatureFlagsSlice = (state: RootStateDay1) => state.featureFlags;
 
-export const isFeatureEnabled = createSelector(
-  selectFeatureFlagsSlice,
-  (_featureFlags: ReturnType<typeof selectFeatureFlagsSlice>, featureId: keyof FeatureListType) =>
-    featureId,
-  (featureFlags, featureId) => featureFlags.data[featureId],
-);
+export const isFeatureEnabled = (featureId: keyof FeatureListType) =>
+  createSelector(
+    selectFeatureFlagsSlice,
+    (featureFlags: ReturnType<typeof selectFeatureFlagsSlice>) =>
+      featureFlags.data[featureId] ?? false,
+  );

package/package.json

@@ -1,7 +1,8 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.9.14-cim",
-    "@openshift-assisted/types": "2.9.14-cim",
+    "@openshift-assisted/locales": "2.10.0-cim",
+    "@openshift-assisted/types": "2.10.0-cim",
+    "@openshift-console/dynamic-plugin-sdk": "0.0.3",
     "@patternfly/patternfly": "^4.222.4",
     "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.168.8",
@@ -65,6 +66,11 @@
       "types": "./build/@types/cim/index.d.ts",
       "default": "./build/cjs/cim/index.js"
     },
+    "./common": {
+      "source": "./lib/common/index.ts",
+      "types": "./build/@types/common/index.d.ts",
+      "default": "./build/cjs/common/index.js"
+    },
     "./ocm": {
       "source": "./lib/ocm/index.ts",
       "types": "./build/@types/ocm/index.d.ts",
@@ -87,14 +93,13 @@
   "license": "Apache-2.0",
   "name": "@openshift-assisted/ui-lib",
   "peerDependencies": {
-    "@openshift-console/dynamic-plugin-sdk": "0.0.3",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/browser": "^5.9 || ^6",
     "axios": ">=0.22.0 <1.0.0",
     "i18next": "^20.4 || ^21",
     "monaco-editor": "^0.34.1",
-    "react": "^17",
-    "react-dom": "^17",
+    "react": "^17 || ^18",
+    "react-dom": "^17 || ^18",
     "react-i18next": ">11.7.3",
     "react-monaco-editor": "^0.51.0",
     "react-redux": "^8.0.5",
@@ -130,8 +135,11 @@
       ],
       "ocm": [
         "./build/@types/ocm/index.d.ts"
+      ],
+      "common": [
+        "./build/@types/common/index.d.ts"
       ]
     }
   },
-  "version": "2.9.14-cim"
+  "version": "2.10.0-cim"
 }

package/build/@types/ocm/api/index.d.ts

@@ -1,2 +0,0 @@
-export * from '../../common/api';
-//# sourceMappingURL=index.d.ts.map

package/build/@types/ocm/api/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../lib/ocm/api/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/build/cjs/ocm/api/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("../../common/api"), exports);
-//# sourceMappingURL=index.js.map

package/build/cjs/ocm/api/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/ocm/api/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC"}

package/lib/ocm/api/index.ts

@@ -1 +0,0 @@
-export * from '../../common/api';