@openshift-assisted/ui-lib 2.12.0-cim → 2.12.1-cim

package/lib/cim/types/k8s/infra-env-k8s-resource.ts

@@ -23,7 +23,7 @@ export type InfraEnvK8sResource = K8sResourceCommon & {
     };
     nmStateConfigLabelSelector?: Selector;
     additionalNTPSources?: string[];
-    cpuArchitecture?: 'x86_64' | 'arm64';
+    cpuArchitecture?: 'x86_64' | 'arm64' | 's390x';
   };
   status?: {
     agentLabelSelector?: Selector;

package/lib/common/components/clusterWizard/clusterDetailsValidation.ts

@@ -76,6 +76,7 @@ export const getClusterDetailsInitialValues = ({
     diskEncryption: cluster?.diskEncryption ?? {},
     cpuArchitecture: cluster?.cpuArchitecture || getDefaultCpuArchitecture(),
     platform: cluster?.platform?.type || 'none',
+    userManagedNetworking: cluster?.userManagedNetworking || false,
   };
 };
 

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

@@ -31,6 +31,7 @@ export type ClusterDetailsValues = {
   diskEncryption: DiskEncryption;
   cpuArchitecture: string;
   platform: PlatformType;
+  userManagedNetworking: boolean;
 };
 
 export type HostsValidationsProps<S extends string, V extends string[]> = {

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

@@ -211,8 +211,10 @@ export const filterByHostname = (hosts: Host[], hostnameFilter: string | undefin
 
   const fuse = new Fuse(hostsWithHostname, {
     ignoreLocation: true,
+    threshold: 0.3,
     keys: ['hostname'],
   });
+
   return fuse.search(hostnameFilter).map(({ item }) => item.host);
 };
 

package/lib/common/types/cpuArchitecture.ts

@@ -2,6 +2,12 @@ import { ArchitectureSupportLevelId } from '@openshift-assisted/types/assisted-i
 
 export type ClusterCpuArchitecture = 'x86_64' | 'aarch64' | 'arm64' | 'ppc64le' | 's390x' | 'multi';
 
+export type CpuArchitectureItem = {
+  description: string;
+  featureSupportLevelId?: ArchitectureSupportLevelId;
+  label: string;
+};
+
 export enum CpuArchitecture {
   x86 = 'x86_64',
   ARM = 'arm64',
@@ -43,6 +49,28 @@ export const getAllCpuArchitectures = (): SupportedCpuArchitecture[] => [
   CpuArchitecture.s390x,
 ];
 
+export const architectureData: Record<SupportedCpuArchitecture, CpuArchitectureItem> = {
+  [CpuArchitecture.x86]: {
+    description: '',
+    label: 'x86_64',
+  },
+  [CpuArchitecture.ARM]: {
+    description: 'Some features may not be available',
+    featureSupportLevelId: 'ARM64_ARCHITECTURE',
+    label: 'Arm64',
+  },
+  [CpuArchitecture.ppc64le]: {
+    description: 'Some features may not be available',
+    featureSupportLevelId: 'PPC64LE_ARCHITECTURE',
+    label: 'IBM Power (ppc64le)',
+  },
+  [CpuArchitecture.s390x]: {
+    description: 'Some features may not be available',
+    featureSupportLevelId: 'S390X_ARCHITECTURE',
+    label: 'IBM Z (s390x)',
+  },
+};
+
 export const getSupportedCpuArchitectures = (
   cpuArchitectures: CpuArchitecture[],
   day1CpuArchitecture?: SupportedCpuArchitecture,

package/lib/ocm/components/clusterConfiguration/CpuArchitectureDropdown.tsx

@@ -11,17 +11,14 @@ import {
 import { CaretDownIcon } from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
 import { useField } from 'formik';
 import {
+  architectureData,
   CpuArchitecture,
   FeatureId,
   getDefaultCpuArchitecture,
   getFieldId,
   SupportedCpuArchitecture,
 } from '../../../common';
-import {
-  ArchitectureSupportLevelId,
-  Cluster,
-  PlatformType,
-} from '@openshift-assisted/types/assisted-installer-service';
+import { Cluster, PlatformType } from '@openshift-assisted/types/assisted-installer-service';
 import {
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
@@ -29,34 +26,6 @@ import {
 import useSupportLevelsAPI from '../../hooks/useSupportLevelsAPI';
 import { ExternalPlaformIds, ExternalPlatformLabels } from './platformIntegration/constants';
 
-export type CpuArchitectureItem = {
-  description: string;
-  featureSupportLevelId?: ArchitectureSupportLevelId;
-  label: string;
-};
-
-export const architectureData: Record<SupportedCpuArchitecture, CpuArchitectureItem> = {
-  [CpuArchitecture.x86]: {
-    description: '',
-    label: 'x86_64',
-  },
-  [CpuArchitecture.ARM]: {
-    description: 'Some features may not be available',
-    featureSupportLevelId: 'ARM64_ARCHITECTURE',
-    label: 'Arm64',
-  },
-  [CpuArchitecture.ppc64le]: {
-    description: 'Some features may not be available',
-    featureSupportLevelId: 'PPC64LE_ARCHITECTURE',
-    label: 'IBM Power (ppc64le)',
-  },
-  [CpuArchitecture.s390x]: {
-    description: 'Some features may not be available',
-    featureSupportLevelId: 'S390X_ARCHITECTURE',
-    label: 'IBM Z (s390x)',
-  },
-};
-
 const INPUT_NAME = 'cpuArchitecture';
 const fieldId = getFieldId(INPUT_NAME, 'input');
 

package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx

@@ -14,6 +14,7 @@ import {
   StaticTextField,
   getSupportedCpuArchitectures,
   SupportedCpuArchitecture,
+  architectureData,
 } from '../../../common';
 import DiskEncryptionControlGroup from '../../../common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
@@ -21,10 +22,7 @@ import { OcmRichInputField } from '../ui/OcmFormFields';
 import OcmOpenShiftVersion from './OcmOpenShiftVersion';
 import OcmOpenShiftVersionSelect from './OcmOpenShiftVersionSelect';
 import CustomManifestCheckbox from './CustomManifestCheckbox';
-import CpuArchitectureDropdown, {
-  architectureData,
-  CpuArchitectureItem,
-} from './CpuArchitectureDropdown';
+import CpuArchitectureDropdown from './CpuArchitectureDropdown';
 import { OcmBaseDomainField } from './OcmBaseDomainField';
 import OcmSNOControlGroup from './OcmSNOControlGroup';
 import useSupportLevelsAPI from '../../hooks/useSupportLevelsAPI';
@@ -80,9 +78,8 @@ export const OcmClusterDetailsFormFields = ({
     () => getSupportedCpuArchitectures(cpuArchitecturesByVersionImage),
     [cpuArchitecturesByVersionImage],
   );
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  const cpuArchitecture = (architectureData[values.cpuArchitecture] as CpuArchitectureItem).label;
+  const cpuArchitecture =
+    architectureData[values.cpuArchitecture as SupportedCpuArchitecture].label;
 
   const featureSupportLevelContext = useNewFeatureSupportLevel();
 

package/lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx

@@ -16,6 +16,7 @@ import {
   CpuArchitecture,
   FeatureId,
   SupportedCpuArchitecture,
+  architectureData,
   getFieldId,
 } from '../../../../common';
 import { ExternalPlaformIds, ExternalPlatformLabels, ExternalPlatformLinks } from './constants';
@@ -25,7 +26,6 @@ import {
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
-import { architectureData } from '../CpuArchitectureDropdown';
 import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 
 const INPUT_NAME = 'platform';

package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts

@@ -1,12 +1,12 @@
 import {
   ActiveFeatureConfiguration,
+  architectureData,
   CpuArchitecture,
   FeatureId,
   isSNO,
   OperatorsValues,
   SupportedCpuArchitecture,
 } from '../../../common';
-import { architectureData } from '../clusterConfiguration/CpuArchitectureDropdown';
 import {
   Cluster,
   PlatformType,

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.12.0-cim",
-    "@openshift-assisted/types": "2.12.0-cim",
+    "@openshift-assisted/locales": "2.12.1-cim",
+    "@openshift-assisted/types": "2.12.1-cim",
     "@openshift-console/dynamic-plugin-sdk": "0.0.3",
     "@patternfly/patternfly": "^4.222.4",
     "@patternfly/react-code-editor": "^4.82.113",
@@ -141,5 +141,5 @@
       ]
     }
   },
-  "version": "2.12.0-cim"
+  "version": "2.12.1-cim"
 }

package/build/@types/cim/components/ClusterDeployment/ArmCheckbox.d.ts

@@ -1,8 +0,0 @@
-import * as React from 'react';
-import { OpenshiftVersionOptionType } from '../../../common';
-type ArmCheckboxProps = {
-    versions: OpenshiftVersionOptionType[];
-};
-declare const ArmCheckbox: React.FC<ArmCheckboxProps>;
-export default ArmCheckbox;
-//# sourceMappingURL=ArmCheckbox.d.ts.map

package/build/@types/cim/components/ClusterDeployment/ArmCheckbox.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ArmCheckbox.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ArmCheckbox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAIL,0BAA0B,EAE3B,MAAM,iBAAiB,CAAC;AA4BzB,KAAK,gBAAgB,GAAG;IAAE,QAAQ,EAAE,0BAA0B,EAAE,CAAA;CAAE,CAAC;AAEnE,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA2D3C,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/build/cjs/cim/components/ClusterDeployment/ArmCheckbox.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const react_core_1 = require("@patternfly/react-core");
-const formik_1 = require("formik");
-const common_1 = require("../../../common");
-const featureSupportLevels_1 = require("../../../common/components/featureSupportLevels");
-const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
-const Label = ({ version }) => {
-    const { t } = (0, use_translation_wrapper_1.useTranslation)();
-    return (React.createElement(React.Fragment, null,
-        t('ai:Use arm64 CPU architecture'),
-        ' ',
-        React.createElement(common_1.PopoverIcon, { noVerticalAlign: true, bodyContent: React.createElement("p", null, t('ai:Check this option if you want to use the arm64 CPU architecture instead of the default x86_64 CPU architecture. Please note that some features will not be available.')) }),
-        React.createElement(featureSupportLevels_1.FeatureSupportLevelBadge, { featureId: "ARM64_ARCHITECTURE", openshiftVersion: version })));
-};
-const ArmCheckbox = ({ versions }) => {
-    const { t } = (0, use_translation_wrapper_1.useTranslation)();
-    const { values: { openshiftVersion }, } = (0, formik_1.useFormikContext)();
-    const [{ name, value }, , { setValue }] = (0, formik_1.useField)('cpuArchitecture');
-    const fieldId = (0, common_1.getFieldId)(name, 'input');
-    const featureSupportLevelContext = (0, featureSupportLevels_1.useFeatureSupportLevel)();
-    const isSupportedVersionAvailable = !!versions.find((version) => featureSupportLevelContext.isFeatureSupported(version.value, 'ARM64_ARCHITECTURE'));
-    const prevVersionRef = React.useRef(openshiftVersion);
-    const handleChange = React.useCallback((checked) => setValue(checked ? common_1.CpuArchitecture.ARM : common_1.CpuArchitecture.x86), [setValue]);
-    React.useEffect(() => {
-        if (prevVersionRef.current !== openshiftVersion &&
-            !featureSupportLevelContext.isFeatureSupported(openshiftVersion, 'ARM64_ARCHITECTURE')) {
-            //invoke updating cpu architecture value only if the version changed to not be in danger of touching existing clusters
-            handleChange(false);
-        }
-        prevVersionRef.current = openshiftVersion;
-    }, [openshiftVersion, handleChange, featureSupportLevelContext]);
-    if (!isSupportedVersionAvailable) {
-        return null;
-    }
-    const disabledReason = featureSupportLevelContext.getFeatureDisabledReason(openshiftVersion, 'ARM64_ARCHITECTURE');
-    return (React.createElement(react_core_1.FormGroup, { isInline: true, fieldId: fieldId },
-        React.createElement(react_core_1.Tooltip, { hidden: !disabledReason, content: disabledReason },
-            React.createElement(react_core_1.Checkbox, { id: fieldId, name: name, isDisabled: featureSupportLevelContext.isFeatureDisabled(openshiftVersion, 'ARM64_ARCHITECTURE'), label: React.createElement(Label, { version: openshiftVersion }), "aria-describedby": `${fieldId}-helper`, description: React.createElement(common_1.HelperText, { fieldId: fieldId }, t('ai:Make sure all the hosts are using arm64 CPU architecture.')), isChecked: value === common_1.CpuArchitecture.ARM, onChange: handleChange }))));
-};
-exports.default = ArmCheckbox;
-//# sourceMappingURL=ArmCheckbox.js.map

package/build/cjs/cim/components/ClusterDeployment/ArmCheckbox.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ArmCheckbox.js","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ArmCheckbox.tsx"],"names":[],"mappings":"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"}

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

@@ -1,101 +0,0 @@
-import * as React from 'react';
-import { Checkbox, FormGroup, Tooltip } from '@patternfly/react-core';
-import { useField, useFormikContext } from 'formik';
-import {
-  CpuArchitecture,
-  getFieldId,
-  HelperText,
-  OpenshiftVersionOptionType,
-  PopoverIcon,
-} from '../../../common';
-import {
-  FeatureSupportLevelBadge,
-  useFeatureSupportLevel,
-} from '../../../common/components/featureSupportLevels';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { ClusterCreateParams } from '@openshift-assisted/types/assisted-installer-service';
-
-const Label = ({ version }: { version: string }) => {
-  const { t } = useTranslation();
-  return (
-    <>
-      {t('ai:Use arm64 CPU architecture')}{' '}
-      <PopoverIcon
-        noVerticalAlign
-        bodyContent={
-          <p>
-            {t(
-              'ai:Check this option if you want to use the arm64 CPU architecture instead of the default x86_64 CPU architecture. Please note that some features will not be available.',
-            )}
-          </p>
-        }
-      />
-      <FeatureSupportLevelBadge featureId="ARM64_ARCHITECTURE" openshiftVersion={version} />
-    </>
-  );
-};
-
-type ArmCheckboxProps = { versions: OpenshiftVersionOptionType[] };
-
-const ArmCheckbox: React.FC<ArmCheckboxProps> = ({ versions }) => {
-  const { t } = useTranslation();
-  const {
-    values: { openshiftVersion },
-  } = useFormikContext<ClusterCreateParams>();
-  const [{ name, value }, , { setValue }] = useField<CpuArchitecture>('cpuArchitecture');
-  const fieldId = getFieldId(name, 'input');
-
-  const featureSupportLevelContext = useFeatureSupportLevel();
-  const isSupportedVersionAvailable = !!versions.find((version) =>
-    featureSupportLevelContext.isFeatureSupported(version.value, 'ARM64_ARCHITECTURE'),
-  );
-
-  const prevVersionRef = React.useRef(openshiftVersion);
-  const handleChange = React.useCallback(
-    (checked: boolean) => setValue(checked ? CpuArchitecture.ARM : CpuArchitecture.x86),
-    [setValue],
-  );
-
-  React.useEffect(() => {
-    if (
-      prevVersionRef.current !== openshiftVersion &&
-      !featureSupportLevelContext.isFeatureSupported(openshiftVersion, 'ARM64_ARCHITECTURE')
-    ) {
-      //invoke updating cpu architecture value only if the version changed to not be in danger of touching existing clusters
-      handleChange(false);
-    }
-    prevVersionRef.current = openshiftVersion;
-  }, [openshiftVersion, handleChange, featureSupportLevelContext]);
-  if (!isSupportedVersionAvailable) {
-    return null;
-  }
-  const disabledReason = featureSupportLevelContext.getFeatureDisabledReason(
-    openshiftVersion,
-    'ARM64_ARCHITECTURE',
-  );
-  return (
-    <FormGroup isInline fieldId={fieldId}>
-      <Tooltip hidden={!disabledReason} content={disabledReason}>
-        <Checkbox
-          id={fieldId}
-          name={name}
-          isDisabled={featureSupportLevelContext.isFeatureDisabled(
-            openshiftVersion,
-            'ARM64_ARCHITECTURE',
-          )}
-          label={<Label version={openshiftVersion} />}
-          aria-describedby={`${fieldId}-helper`}
-          description={
-            <HelperText fieldId={fieldId}>
-              {t('ai:Make sure all the hosts are using arm64 CPU architecture.')}
-            </HelperText>
-          }
-          isChecked={value === CpuArchitecture.ARM}
-          onChange={handleChange}
-        />
-      </Tooltip>
-    </FormGroup>
-  );
-};
-
-export default ArmCheckbox;