feat: add minWordsValidator for add rule component

Author: mjabascal10

frontend/src/app/rule-management/app-rule/components/add-rule/add-rule.component.html

@@ -79,6 +79,10 @@
                    class="invalid-feedback">
                 Name is required.
               </div>
+              <div *ngIf="ruleForm.get('name').errors && ruleForm.get('name').errors['minWords'] && ruleForm.get('name').touched" class="invalid-feedback">
+                Please enter at least {{ ruleForm.get('name').errors['minWords'].requiredWords }} words,
+                each with at least {{ ruleForm.get('name').errors['minWords'].minLengthPerWord }} characters.
+              </div>
             </div>
           </div>
           <div class="col-6">
@@ -91,6 +95,10 @@
                    class="invalid-feedback">
                 Category is required.
               </div>
+              <div *ngIf="ruleForm.get('category').errors && ruleForm.get('category').errors['minWords'] && ruleForm.get('category').touched" class="invalid-feedback">
+                Please enter at least {{ ruleForm.get('category').errors['minWords'].requiredWords }} words,
+                each with at least {{ ruleForm.get('category').errors['minWords'].minLengthPerWord }} characters.
+              </div>
             </div>
           </div>
         </div>
@@ -105,6 +113,10 @@
                    class="invalid-feedback">
                 Technique is required.
               </div>
+              <div *ngIf="ruleForm.get('technique').errors && ruleForm.get('technique').errors['minWords'] && ruleForm.get('technique').touched" class="invalid-feedback">
+                Please enter at least {{ ruleForm.get('technique').errors['minWords'].requiredWords }} words,
+                each with at least {{ ruleForm.get('technique').errors['minWords'].minLengthPerWord }} characters.
+              </div>
             </div>
           </div>
           <div class="col-6">
@@ -218,6 +230,10 @@
                    class="invalid-feedback">
                 Description is required.
               </div>
+              <div *ngIf="ruleForm.get('description').errors && ruleForm.get('description').errors['minWords'] && ruleForm.get('description').touched" class="invalid-feedback">
+                Please enter at least {{ ruleForm.get('description').errors['minWords'].requiredWords }} words,
+                each with at least {{ ruleForm.get('description').errors['minWords'].minLengthPerWord }} characters.
+              </div>
             </div>
           </div>
         </div>

frontend/src/app/rule-management/app-rule/components/add-rule/add-rule.component.ts

@@ -8,6 +8,7 @@ import {AddRuleStepEnum, DataType, Mode, Rule, SearchRequest} from '../../../mod
 import {AfterEventFormService} from '../../../services/after-event-form.service';
 import {DataTypeService} from '../../../services/data-type.service';
 import {RuleService} from '../../../services/rule.service';
+import {minWordsValidator} from "../../validators/customs.validators";
 
 @Component({
   selector: 'app-add-rule',
@@ -130,14 +131,14 @@ export class AddRuleComponent implements OnInit, OnDestroy {
     this.ruleForm = this.fb.group({
       id: [rule ? rule.id : ''],
       dataTypes: [rule ? rule.dataTypes : '', Validators.required],
-      name: [rule ? rule.name : '', Validators.required],
+      name: [rule ? rule.name : '', [Validators.required, minWordsValidator(2, 3)]],
       adversary: [rule ? rule.adversary : null, Validators.required],
       confidentiality: [rule ? rule.confidentiality : 0, [Validators.required, Validators.min(0), Validators.max(3)]],
       integrity: [rule ? rule.integrity : 0, [Validators.required, Validators.min(0), Validators.max(3)]],
       availability: [rule ? rule.availability : 0, [Validators.required, Validators.min(0), Validators.max(3)]],
-      category: [rule ? rule.category : '', Validators.required],
-      technique: [rule ? rule.technique : '', Validators.required],
-      description: [rule ? rule.description : '', Validators.required],
+      category: [rule ? rule.category : '', [Validators.required, minWordsValidator(2, 3)]],
+      technique: [rule ? rule.technique : '', [Validators.required, minWordsValidator(2, 3)]],
+      description: [rule ? rule.description : '', [Validators.required, minWordsValidator(2, 3)]],
       systemOwner: [rule ? rule.systemOwner : false],
       deduplicateBy: [rule ? rule.deduplicateBy || [] : []],
       afterEvents: this.fb.array(
@@ -192,7 +193,7 @@ export class AddRuleComponent implements OnInit, OnDestroy {
     }
   }
 
-  back(){
+  back() {
     this.stepCompleted.pop();
     switch (this.currentStep) {
       case 3: this.currentStep = AddRuleStepEnum.STEP2;

frontend/src/app/rule-management/app-rule/validators/customs.validators.ts

@@ -1,10 +1,27 @@
 import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
 
 export function containsVariable(variables: string[]): ValidatorFn {
-  console.log('contains variable', variables);
   return (control: AbstractControl): ValidationErrors | null => {
     const value = control.value || '';
     const hasVariable = variables.some(v => value.includes(v));
     return hasVariable ? null : { noVariableUsed: true };
   };
 }
+
+export function minWordsValidator(minWords: number, minLengthPerWord: number): ValidatorFn {
+  return (control: AbstractControl): ValidationErrors | null => {
+    const value = control.value.trim();
+
+    if (!value) { return { minWords: { requiredWords: minWords, minLengthPerWord } }; }
+
+    const words = value
+      .split(/\s+/)
+      .filter(word => word.length >= minLengthPerWord);
+
+    return words.length >= minWords ? null : {
+      minWords: { requiredWords: minWords, minLengthPerWord }
+    };
+  };
+}
+
+