refactor: validation structure for checkbox

Author: NiclasNorin

source/js/conditions/condition/andCondition.ts

@@ -3,6 +3,19 @@ class AndCondition implements ConditionInterface {
     }
 
     public validate(): boolean {
+        let isValid: boolean[] = [];
+        this.conditions.forEach(condition => {
+            if (!condition.class) {
+                return;
+            }
+
+            isValid.push(condition.class.getConditionValidator().validate(condition));
+        });
+
+        if (isValid.includes(false)) {
+            return false;
+        }
+
         return true;
     }
 

source/js/conditions/condition/orCondition.ts

@@ -3,8 +3,7 @@ class OrCondition implements ConditionInterface {
     }
 
     public validate(): boolean {
-        // Implement validation logic
-        return true;
+        return this.condition.class?.getConditionValidator().validate(this.condition) ?? true;
     }
 
     public getConditions(): Condition[] {

source/js/conditions/conditionsInterface.d.ts

@@ -8,10 +8,6 @@ interface ConditionInterface {
     getConditionFieldNames(): string[];
 }
 
-interface ConditionValidatorInterface {
-    validate(condition: Condition): boolean;
-}
-
 type Condition = {
     field: string;
     class: FieldInterface|null;

source/js/conditions/validate/checkboxValidator.ts

@@ -0,0 +1,8 @@
+class CheckboxConditionValidator implements ConditionValidatorInterface {
+    public validate(condition: Condition): boolean {
+        
+        return false;
+    }
+}
+
+export default CheckboxConditionValidator;

source/js/fields/field/checkbox/checkboxConditionValidator.ts

@@ -12,11 +12,6 @@ class CheckboxConditionsHandler implements ConditionsHandlerInterface {
 		this.setValueChangeListener();
 	}
 
-	public validateCondition(conditions: Condition[]): boolean {
-		console.log(conditions);
-		return true;
-	}
-
 	public validate(): boolean {
 		this.getConditions().forEach((condition) => {
 			condition.validate();

source/js/fields/field/checkbox/checkboxConditionsHandler.ts

@@ -3,7 +3,9 @@ class NullField implements FieldInterface {
         private field: HTMLElement,
         type: string,
         private name: string,
-        private conditionsHandler: ConditionsHandlerInterface
+        private nullFieldConditionValidator: ConditionValidatorInterface,
+        private conditionsHandler: ConditionsHandlerInterface,
+
     ) {
         console.error(`Field type "${type}" is not implemented.`);
     }
@@ -23,6 +25,10 @@ class NullField implements FieldInterface {
     public getConditionsHandler(): ConditionsHandlerInterface {
         return this.conditionsHandler;
     }
+
+    public getConditionValidator(): ConditionValidatorInterface {
+        return this.nullFieldConditionValidator;
+    }
 }
 
 export default NullField;

source/js/fields/field/nullField/nullField.ts

@@ -0,0 +1,8 @@
+class NullFieldConditionValidator implements ConditionValidatorInterface {
+    public validate(condition: Condition): boolean {
+        
+        return false;
+    }
+}
+
+export default NullFieldConditionValidator;

source/js/fields/field/nullField/nullFieldConditionValidator.ts

@@ -1,8 +1,9 @@
 import Checkbox from "./field/checkbox/checkbox";
 import CheckboxConditionsHandler from "./field/checkbox/checkboxConditionsHandler";
+import CheckboxConditionValidator from "./field/checkbox/checkboxConditionValidator";
 import NullFieldConditionsHandler from "./field/nullField/nullFieldConditionsHandler";
 import NullField from "./field/nullField/nullField";
-import CheckboxValidator from "../conditions/validate/checkboxValidator";
+import NullFieldConditionValidator from "./field/nullField/nullFieldConditionValidator";
 
 class FieldBuilder implements FieldBuilderInterface {
     private name: string = 'data-js-field-name';
@@ -27,6 +28,7 @@ class FieldBuilder implements FieldBuilderInterface {
             field,
             type,
             this.getFieldName(field),
+            new NullFieldConditionValidator(),
             new NullFieldConditionsHandler(field, this.getFieldCondition(field))
         );
     }
@@ -38,7 +40,7 @@ class FieldBuilder implements FieldBuilderInterface {
             field,
             choices,
             this.getFieldName(field),
-            new CheckboxValidator(),
+            new CheckboxConditionValidator(),
             new CheckboxConditionsHandler(this.getFieldCondition(field))
         );
     }

source/js/fields/fieldBuilder.ts

@@ -6,6 +6,7 @@ interface FieldInterface {
     init(conditionBuilder: ConditionBuilderInterface): void;
     getName(): string;
     getConditionsHandler(): ConditionsHandlerInterface;
+    getConditionValidator(): ConditionValidatorInterface;
 }
 
 interface CheckboxInterface extends FieldInterface {
@@ -24,6 +25,10 @@ interface ConditionsHandlerInterface {
     addValueChangeListener(field: FieldInterface): void;
 }
 
+interface ConditionValidatorInterface {
+    validate(condition: Condition): boolean;
+}
+
 type FieldsObject = {
     [key: string]: FieldInterface;
 }