Recommend trivial parity

allanrogerr · Feb 17, 2024 · dfff5a8 · dfff5a8
1 parent 302793d
commit dfff5a8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,3 @@ examples/**/obj/
 public.crt
 go_build_operator_
 operator.iml
-web-app/build/static/
diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSize.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSize.tsx
@@ -23,7 +23,7 @@ import {
   erasureCodeCalc,
   getBytes,
   k8sScalarUnitsExcluding,
-  niceBytes,
+  niceBytes, zeroEC,
 } from "../../../../../../common/utils";
 import { clearValidationError } from "../../../utils";
 import { ecListTransform } from "../../../ListTenants/utils";
@@ -268,13 +268,13 @@ const TenantSize = ({ formToRender }: ITenantSizeProps) => {
           !("nodes" in commonValidation) &&
           !("volume_size" in commonValidation) &&
           !("drivesps" in commonValidation) &&
-          resourcesMemoryRequestError == "" &&
-          resourcesCPURequestError == "" &&
-          resourcesMemoryLimitError == "" &&
-          resourcesCPULimitError == "" &&
           distribution.error === "" &&
           ecParityCalc.error === 0 &&
-          ecParity !== "",
+          ecParity !== "" &&
+          resourcesMemoryRequestError === "" &&
+          resourcesCPURequestError === "" &&
+          resourcesMemoryLimitError === "" &&
+          resourcesCPULimitError === "",
       }),
     );
 
@@ -298,14 +298,18 @@ const TenantSize = ({ formToRender }: ITenantSizeProps) => {
     resourcesCPURequest,
     maxCPUsUse,
     maxMemorySize,
+    resourcesMemoryRequestError,
+    resourcesCPURequestError,
+    resourcesMemoryLimitError,
+    resourcesCPULimitError,
   ]);
 
   useEffect(() => {
     // Trivial case
     if (nodes.trim() === "1") {
-      updateField("ecParity", "EC:0");
-      updateField("ecparityChoices", ecListTransform([ecParity]));
-      updateField("cleanECChoices", [ecParity]);
+      updateField("ecParity", zeroEC);
+      updateField("ecparityChoices", ecListTransform([zeroEC]));
+      updateField("cleanECChoices", [zeroEC]);
       return;
     }
     if (distribution.error === "") {
@@ -319,22 +323,19 @@ const TenantSize = ({ formToRender }: ITenantSizeProps) => {
             if (untouchedECField) {
               updateField("ecParity", "");
             }
-            return;
           })
           .catch((err: any) => {
+            updateField("ecparityChoices", []);
             dispatch(
               isPageValid({
                 pageName: "tenantSize",
                 valid: false,
               }),
             );
+            updateField("ecParity", "");
           });
       }
     }
-    // Reset values on error
-    updateField("ecparityChoices", ecListTransform([]));
-    updateField("cleanECChoices", []);
-    updateField("ecParity", "");
   }, [distribution, dispatch, updateField, nodes, untouchedECField]);
 
   /* End Validation of pages */
@@ -416,7 +417,6 @@ const TenantSize = ({ formToRender }: ITenantSizeProps) => {
         }}
         label="Erasure Code Parity"
         disabled={selectedStorageClass === "" || ecParity === ""}
-        required
         value={ecParity}
         options={ecParityChoices}
       />

diff --git a/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx b/web-app/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { Fragment, useCallback, useEffect, useState } from "react";
+import React, { Fragment, useCallback, useEffect } from "react";
 import { Box, InputBox, Switch } from "mds";
 import { useSelector } from "react-redux";
 import floor from "lodash/floor";
@@ -51,6 +51,7 @@ const TenantSizeResources = () => {
     (state: AppState) =>
       state.createTenant.fields.tenantSize.resourcesSpecifyLimit,
   );
+
   const resourcesCPURequestError = useSelector(
     (state: AppState) =>
       state.createTenant.fields.tenantSize.resourcesCPURequestError,
@@ -84,8 +85,6 @@ const TenantSizeResources = () => {
       state.createTenant.fields.tenantSize.resourcesMemoryLimit,
   );
 
-  const [validationErrors, setValidationErrors] = useState<any>({});
-
   // Common
   const updateField = useCallback(
     (field: string, value: any) => {
@@ -102,7 +101,6 @@ const TenantSizeResources = () => {
 
   /*Debounce functions*/
 
-  // Validation
   useEffect(() => {
     dispatch(
       isPageValid({