refactor: fix validation & use array.some for existence check

bcgov · Mar 29, 2021 · 5bef8e0 · 5bef8e0
1 parent 9a4e389
commit 5bef8e0
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/app/containers/Admin/NaicsCode/NaicsCodeTable.tsx b/app/containers/Admin/NaicsCode/NaicsCodeTable.tsx
@@ -26,24 +26,20 @@ export const NaicsCodeTableContainer: React.FunctionComponent<Props> = (
   };
 
   const naicsCodeIsActive = (naicsCode) => {
-    let codeExists = false;
-    query.allNaicsCodes.edges.forEach((edge) => {
-      if (edge.node.naicsCode === naicsCode) {
-        codeExists = true;
-      }
-    });
-    return codeExists;
+    return query.allNaicsCodes.edges.some(
+      (edge) => edge.node.naicsCode === naicsCode
+    );
   };
 
   const handleCreateNaicsCode = async (e: React.SyntheticEvent<any>) => {
     const form = e.currentTarget;
     e.stopPropagation();
     e.preventDefault();
     e.persist();
+    setValidated(true);
 
     if (naicsCodeIsActive(e.target[0].value)) setShowActiveCodeError(true);
     else if (form.checkValidity() === true) {
-      setValidated(true);
       const {environment} = props.relay;
       const variables = {
         input: {