Added (Default) label to EC Parity selector field & fixed automatic selection of EC Parity (#1716)

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>

portal-ui/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSize.tsx

@@ -63,6 +63,7 @@ interface ITenantSizeProps {
   ecParityCalc: IErasureCodeCalc;
   limitSize: any;
   selectedStorageClass: string;
+  untouchedECField: boolean;
 }
 
 const styles = (theme: Theme) =>
@@ -104,6 +105,7 @@ const TenantSize = ({
   ecParityCalc,
   limitSize,
   selectedStorageClass,
+  untouchedECField,
 }: ITenantSizeProps) => {
   const [validationErrors, setValidationErrors] = useState<any>({});
   const [errorFlag, setErrorFlag] = useState<boolean>(false);
@@ -124,6 +126,23 @@ const TenantSize = ({
   /*Debounce functions*/
 
   // Storage Quotas
+  useEffect(() => {
+    if (cleanECChoices.length > 0 && ecParityCalc.defaultEC !== "") {
+      updateField(
+        "ecParityChoices",
+        ecListTransform(cleanECChoices, ecParityCalc.defaultEC)
+      );
+    }
+  }, [ecParityCalc, cleanECChoices, updateField]);
+
+  useEffect(() => {
+    if (ecParity !== "" && ecParityCalc.defaultEC !== ecParity) {
+      updateField("untouchedECField", false);
+      return;
+    }
+
+    updateField("untouchedECField", true);
+  }, [ecParity, ecParityCalc, updateField]);
 
   useEffect(() => {
     if (ecParityChoices.length > 0 && distribution.error === "") {
@@ -135,6 +154,7 @@ const TenantSize = ({
       );
 
       updateField("ecParityCalc", ecCodeValidated);
+
       if (!cleanECChoices.includes(ecParity) || ecParity === "") {
         updateField("ecParity", ecCodeValidated.defaultEC);
       }
@@ -145,6 +165,7 @@ const TenantSize = ({
     distribution,
     cleanECChoices,
     updateField,
+    untouchedECField,
   ]);
   /*End debounce functions*/
 
@@ -245,6 +266,9 @@ const TenantSize = ({
           .then((ecList: string[]) => {
             updateField("ecParityChoices", ecListTransform(ecList));
             updateField("cleanECChoices", ecList);
+            if (untouchedECField) {
+              updateField("ecParity", "");
+            }
           })
           .catch((err: any) => {
             updateField("ecparityChoices", []);
@@ -253,7 +277,7 @@ const TenantSize = ({
           });
       }
     }
-  }, [distribution, isPageValid, updateField, nodes]);
+  }, [distribution, isPageValid, updateField, nodes, untouchedECField]);
 
   /* End Validation of pages */
 
@@ -364,23 +388,26 @@ const TenantSize = ({
   );
 };
 
-const mapState = (state: AppState) => ({
-  volumeSize: state.tenants.createTenant.fields.tenantSize.volumeSize,
-  sizeFactor: state.tenants.createTenant.fields.tenantSize.sizeFactor,
-  drivesPerServer: state.tenants.createTenant.fields.tenantSize.drivesPerServer,
-  nodes: state.tenants.createTenant.fields.tenantSize.nodes,
-  memoryNode: state.tenants.createTenant.fields.tenantSize.memoryNode,
-  ecParity: state.tenants.createTenant.fields.tenantSize.ecParity,
-  ecParityChoices: state.tenants.createTenant.fields.tenantSize.ecParityChoices,
-  cleanECChoices: state.tenants.createTenant.fields.tenantSize.cleanECChoices,
-
-  resourcesSize: state.tenants.createTenant.fields.tenantSize.resourcesSize,
-  distribution: state.tenants.createTenant.fields.tenantSize.distribution,
-  ecParityCalc: state.tenants.createTenant.fields.tenantSize.ecParityCalc,
-  limitSize: state.tenants.createTenant.limitSize,
-  selectedStorageClass:
-    state.tenants.createTenant.fields.nameTenant.selectedStorageClass,
-});
+const mapState = (state: AppState) => {
+  const tenantSize = state.tenants.createTenant.fields.tenantSize;
+  return {
+    volumeSize: tenantSize.volumeSize,
+    sizeFactor: tenantSize.sizeFactor,
+    drivesPerServer: tenantSize.drivesPerServer,
+    nodes: tenantSize.nodes,
+    memoryNode: tenantSize.memoryNode,
+    ecParity: tenantSize.ecParity,
+    ecParityChoices: tenantSize.ecParityChoices,
+    cleanECChoices: tenantSize.cleanECChoices,
+    resourcesSize: tenantSize.resourcesSize,
+    distribution: tenantSize.distribution,
+    ecParityCalc: tenantSize.ecParityCalc,
+    untouchedECField: tenantSize.untouchedECField,
+    limitSize: state.tenants.createTenant.limitSize,
+    selectedStorageClass:
+      state.tenants.createTenant.fields.nameTenant.selectedStorageClass,
+  };
+};
 
 const connector = connect(mapState, {
   updateAddField,

portal-ui/src/screens/Console/Tenants/ListTenants/utils.ts

@@ -42,9 +42,20 @@ export interface KeyPair {
   key: string;
 }
 
-export const ecListTransform = (ecList: string[]): Opts[] => {
+export const ecListTransform = (
+  ecList: string[],
+  defaultEC: string = ""
+): Opts[] => {
   return ecList.map((value) => {
-    return { label: value, value };
+    let defLabel = value;
+    if (defaultEC !== "" && value === defaultEC) {
+      defLabel = `${value} (Default)`;
+    }
+
+    return {
+      label: defLabel,
+      value,
+    };
   });
 };
 

portal-ui/src/screens/Console/Tenants/reducer.ts

@@ -197,6 +197,7 @@ const initialState: ITenantState = {
         ecParity: "",
         ecParityChoices: [],
         cleanECChoices: [],
+        untouchedECField: true,
         cpuToUse: "0",
         // resource request
         resourcesSpecifyLimit: false,
@@ -331,6 +332,7 @@ const initialState: ITenantState = {
       },
     },
     nodeSelectorPairs: [{ key: "", value: "" }],
+
   },
   tenantDetails: {
     currentTenant: "",
@@ -746,6 +748,7 @@ export function tenantsReducer(
               ecParity: "",
               ecParityChoices: [],
               cleanECChoices: [],
+              untouchedECField: true,
               distribution: {
                 error: "",
                 nodes: 0,

portal-ui/src/screens/Console/Tenants/types.ts

@@ -302,6 +302,7 @@ export interface ITenantSizeFields {
   ecParity: string;
   ecParityChoices: Opts[];
   cleanECChoices: string[];
+  untouchedECField: boolean;
   resourcesSize: IResourcesSize;
   distribution: any;
   ecParityCalc: IErasureCodeCalc;