From 476c3750c137ae79c8e4bd296c2e58a7006330f1 Mon Sep 17 00:00:00 2001
From: varun789-mx <varunsh153@gmail.com>
Date: Tue, 11 Nov 2025 01:51:38 +0530
Subject: [PATCH] WEB-361 'Fund Mapping' search page doesn't send proper JSON
 to Fineract

---
 .../fund-mapping/fund-mapping.component.ts    | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/app/organization/fund-mapping/fund-mapping.component.ts b/src/app/organization/fund-mapping/fund-mapping.component.ts
index 1e1ad51ec..3db794242 100644
--- a/src/app/organization/fund-mapping/fund-mapping.component.ts
+++ b/src/app/organization/fund-mapping/fund-mapping.component.ts
@@ -20,7 +20,9 @@ import {
   UntypedFormBuilder,
   UntypedFormControl,
   Validators,
-  ReactiveFormsModule
+  ReactiveFormsModule,
+  AbstractControl,
+  ValidationErrors
 } from '@angular/forms';
 import { ActivatedRoute, RouterLink } from '@angular/router';
 
@@ -112,14 +114,36 @@ export class FundMappingComponent implements OnInit {
     this.buildDependencies();
   }
 
+  /**
+   * Custom validator to ensure array fields are not empty.
+   * @param {AbstractControl} control - the form control to validate.
+   * @returns {ValidationErrors | null} - validation errors or null if valid.
+   */
+  private nonEmptyArrayValidator(control: AbstractControl): ValidationErrors | null {
+    const value = control.value;
+    if (!value || !Array.isArray(value) || value.length === 0) {
+      return { required: true };
+    }
+    if (value.every((item: any) => item === '' || item === null || item === undefined)) {
+      return { required: true };
+    }
+    return null;
+  }
+
   /**
    * Creates the Fund Mapping Form
    */
   createFundMappingForm() {
     this.fundMappingForm = this.formBuilder.group({
-      loanStatus: [''],
-      loanProducts: [''],
-      offices: [''],
+      loanStatus: [
+        [],
+        this.nonEmptyArrayValidator.bind(this)],
+      loanProducts: [
+        [],
+        this.nonEmptyArrayValidator.bind(this)],
+      offices: [
+        [],
+        this.nonEmptyArrayValidator.bind(this)],
       loanDateOption: [
         '',
         Validators.required
@@ -224,6 +248,10 @@ export class FundMappingComponent implements OnInit {
     if (fundMappingFormData.loanFromDate instanceof Date) {
       fundMappingFormData.loanFromDate = this.dateUtils.formatDate(prevLoanFromDate, dateFormat);
     }
+    if (this.fundMappingForm.invalid) {
+      this.fundMappingForm.markAllAsTouched();
+      return;
+    }
     if (fundMappingFormData.loanToDate instanceof Date) {
       fundMappingFormData.loanToDate = this.dateUtils.formatDate(prevLoanToDate, dateFormat);
     }