fix: fixed some of the error handling and test

bcgov · Jul 25, 2024 · 061b8be · 061b8be
1 parent e65c080
commit 061b8be
Show file tree

Hide file tree

Showing 4 changed files with 592 additions and 20 deletions.
diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
@@ -52,7 +52,7 @@ const revalidateBus = useEventBus<void>("revalidate-bus");
  * @param errorMessage - the error message
  */
 const setError = (errorMessage: string | undefined) => {
-  error.value = errorMessage ?? "";
+  error.value = errorMessage || "";
 
   /*
   The error should be emitted whenever it is found, instead of watching and emitting only when it
@@ -94,17 +94,17 @@ watch([selectedValue], () => {
 });
 
 //We call all the validations
-const validateInput = (newValue: string) => {
+const validateInput = (newValue: string) => {  
   if (props.validations) {    
     setError(
       props.validations
-        .map((validation) => validation(newValue))        
+        .map((validation) => validation(newValue))
         .filter((errorMessage) => {
           if (errorMessage) return true;
           return false;
-        })        
+        })
         .reduce(
-          (acc, errorMessage) => acc ?? errorMessage,
+          (acc, errorMessage) => acc || errorMessage,
           props.errorMessage,
         )
     );

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -9,7 +9,7 @@ import { useFetchTo } from "@/composables/useFetch";
 import type { CodeNameType, BusinessSearchResult } from "@/dto/CommonTypesDto";
 import type { Address } from "@/dto/ApplyClientNumberDto";
 // Validators
-import { getValidations } from "@/helpers/validators/GlobalValidators";
+import { getValidations } from "@/helpers/validators/BCeIDFormValidations";
 import { submissionValidation } from "@/helpers/validators/SubmissionValidators";
 // @ts-ignore
 import Delete16 from "@carbon/icons-vue/es/trash-can/16";

diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -127,3 +127,6 @@ export const addValidation = (
   if (!formFieldValidations[key]) formFieldValidations[key] = [];
   formFieldValidations[key].push(validation);
 };
+
+export const getValidations = (key: string): ((value: any) => string)[] =>
+  key ? formFieldValidations[key] || [] : [];