Finish cpuArchitecture dropdown changes

openshift-assisted · Sep 24, 2024 · b95f2b3 · b95f2b3
1 parent ad4e353
commit b95f2b3
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 9 deletions.
diff --git a/libs/ui-lib/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx b/libs/ui-lib/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx
@@ -52,6 +52,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
 }) => {
   const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain, highAvailabilityMode } = values;
+
   const nameInputRef = React.useRef<HTMLInputElement>();
   React.useEffect(() => {
     nameInputRef.current?.focus();
@@ -111,7 +112,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
       {!isNutanix && (
         <>
           <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
-          <CpuArchitectureDropdown />
+          <CpuArchitectureDropdown isDisabled={isEditFlow} />
         </>
       )}
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}

diff --git a/libs/ui-lib/lib/cim/components/common/CpuArchitectureDropdown.tsx b/libs/ui-lib/lib/cim/components/common/CpuArchitectureDropdown.tsx
@@ -1,11 +1,19 @@
 import * as React from 'react';
 import { Dropdown, DropdownItem, DropdownToggle, FormGroup } from '@patternfly/react-core';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { architectureData, getFieldId, SupportedCpuArchitecture } from '../../../common';
-import { useField } from 'formik';
+import {
+  architectureData,
+  ClusterDetailsValues,
+  CpuArchitecture,
+  getFieldId,
+  StaticField,
+  SupportedCpuArchitecture,
+} from '../../../common';
+import { useField, useFormikContext } from 'formik';
 
-const CpuArchitectureDropdown = () => {
+const CpuArchitectureDropdown = ({ isDisabled = false }: { isDisabled?: boolean }) => {
   const { t } = useTranslation();
+  const { setFieldValue } = useFormikContext<ClusterDetailsValues>();
   const [{ name, value }, , { setValue }] = useField<SupportedCpuArchitecture>('cpuArchitecture');
   const [cpuArchOpen, setCpuArchOpen] = React.useState(false);
   const fieldId = getFieldId(name, 'input');
@@ -20,14 +28,21 @@ const CpuArchitectureDropdown = () => {
 
   const onCpuArchSelect = React.useCallback(
     (e?: React.SyntheticEvent<HTMLDivElement>) => {
-      setValue(e?.currentTarget.id as SupportedCpuArchitecture);
+      const val = e?.currentTarget.id as SupportedCpuArchitecture;
+      setValue(val);
+
+      if (val === CpuArchitecture.s390x) {
+        setFieldValue('userManagedNetworking', true);
+      } else {
+        setFieldValue('userManagedNetworking', false);
+      }
       setCpuArchOpen(false);
     },
-    [setValue],
+    [setValue, setFieldValue],
   );
 
-  return (
-    <FormGroup isInline fieldId={fieldId} label={t('ai:CPU architecture')}>
+  return !isDisabled ? (
+    <FormGroup isInline fieldId={fieldId} label={t('ai:CPU architecture')} required>
       <Dropdown
         toggle={
           <DropdownToggle onToggle={onCpuArchToggle} className="pf-u-w-100">
@@ -63,6 +78,10 @@ const CpuArchitectureDropdown = () => {
         className="pf-u-w-100"
       />
     </FormGroup>
+  ) : (
+    <StaticField name={'cpuArchitecture'} label={t('ai:CPU architecture')} isRequired>
+      {architectureData[value].label}
+    </StaticField>
   );
 };
 

diff --git a/libs/ui-lib/lib/cim/components/helpers/clusterDeployment.ts b/libs/ui-lib/lib/cim/components/helpers/clusterDeployment.ts
@@ -234,5 +234,13 @@ export const getClusterDeploymentCpuArchitecture = (
     arch = clusterDeployment.metadata?.annotations?.[CPU_ARCHITECTURE_ANNOTATION_KEY];
   }
 
-  return arch === CpuArchitecture.ARM ? CpuArchitecture.ARM : CpuArchitecture.x86;
+  switch (arch) {
+    case CpuArchitecture.ARM:
+      return CpuArchitecture.ARM;
+    case CpuArchitecture.s390x:
+      return CpuArchitecture.s390x
+    default:
+      return CpuArchitecture.x86;
+  }
+
 };
diff --git a/libs/ui-lib/lib/common/components/clusterWizard/clusterDetailsValidation.ts b/libs/ui-lib/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,
   };
 };
 

diff --git a/libs/ui-lib/lib/common/components/clusterWizard/types.ts b/libs/ui-lib/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[]> = {