feat: add KYC document renewal alerts, Aadhaar/PAN exceptions, and AML recurring alerts UI; remove old journal AML marking

src/app/clients/edit-client/edit-client.component.html

@@ -220,6 +220,8 @@
             [isNonIndividual]="legalFormType === 2"
             [isMinor]="clientGeneralStep?.isMinor || false"
             [clientId]="clientId"
+            [verificationName]="clientGeneralStep?.verificationName || ''"
+            [verificationDateOfBirth]="clientGeneralStep?.verificationDateOfBirth || null"
             [readOnly]="isTabReadOnly(1)"
             [calculatedRisk]="clientGeneralStep?.calculatedRisk"
           ></mifosx-client-kyc-step>
@@ -342,7 +344,6 @@
           [degreeQualificationOptions]="clientGeneralStep?.degreeQualificationOptions || []"
           [religionOptions]="clientGeneralStep?.religionOptions || []"
           [socialCategoryOptions]="clientGeneralStep?.socialCategoryOptions || []"
-          (submitEvent)="submit()"
         ></mifosx-client-preview-step>
       </div>
     </mat-tab>
@@ -350,9 +351,11 @@
 
   <!-- Bottom Action Bar -->
   <div class="action-bar">
-    <button mat-raised-button [routerLink]="['../']" class="cancel-btn">
-      {{ 'labels.buttons.Cancel' | translate }}
-    </button>
+    @if (selectedTabIndex < totalTabs - 1) {
+      <button mat-raised-button [routerLink]="['../']" class="cancel-btn">
+        {{ 'labels.buttons.Cancel' | translate }}
+      </button>
+    }
     <div class="action-bar-right">
       @if (selectedTabIndex > 0) {
         <button mat-raised-button (click)="selectedTabIndex = selectedTabIndex - 1">
@@ -361,15 +364,7 @@
         </button>
       }
       @if (selectedTabIndex < totalTabs - 1) {
-        <button
-          mat-raised-button
-          color="primary"
-          (click)="onNext()"
-          [disabled]="!currentStepValid"
-          [matTooltip]="currentStepBlockerMessage"
-          [matTooltipDisabled]="currentStepValid"
-          matTooltipPosition="above"
-        >
+        <button mat-raised-button color="primary" (click)="onNext()" [disabled]="savingClient || !currentStepValid">
           @if (savingClient) {
             <mat-progress-spinner diameter="18" mode="indeterminate" class="m-r-10"></mat-progress-spinner>
             Saving...
@@ -383,15 +378,10 @@
           }
         </button>
       }
-      @if (selectedTabIndex === totalTabs - 1 && areFormvalids()) {
-        <button mat-raised-button color="primary" (click)="submit()" [disabled]="savingClient">
-          @if (savingClient) {
-            <mat-progress-spinner diameter="18" mode="indeterminate" class="m-r-10"></mat-progress-spinner>
-            Saving...
-          } @else {
-            <fa-icon icon="check" class="m-r-10"></fa-icon>
-            {{ 'labels.buttons.Submit' | translate }}
-          }
+      @if (selectedTabIndex === totalTabs - 1) {
+        <button mat-raised-button color="primary" [routerLink]="['../']">
+          <fa-icon icon="check" class="m-r-10"></fa-icon>
+          Finish
         </button>
       }
     </div>

src/app/clients/edit-client/edit-client.component.ts

@@ -1021,6 +1021,9 @@ export class EditClientComponent {
    * Mirrors identities-tab.createIdentifierWithDocs.
    */
   private saveAddressProof(clientId: string) {
+    if (this.clientIndiaAddressStep?.existingAddressProofIdentifierId) {
+      return;
+    }
     const payload = this.clientIndiaAddressStep?.addressProofPayload;
     if (!payload?.proofId) return;
 
@@ -1036,6 +1039,9 @@ export class EditClientComponent {
       next: (res: any) => {
         const identifierId = res?.resourceId;
         if (!identifierId) return;
+        if (this.clientIndiaAddressStep) {
+          this.clientIndiaAddressStep.existingAddressProofIdentifierId = identifierId.toString();
+        }
         for (const entry of payload.files) {
           const formData = new FormData();
           formData.append('name', `${proofName} — ${entry.slot}`);
@@ -1056,6 +1062,21 @@ export class EditClientComponent {
     if (!payload?.proofId || !payload?.files?.length) return;
 
     const proofName = payload.proof?.name || 'KYC Document';
+
+    const uploadFiles = (identifierId: string) => {
+      for (const entry of payload.files) {
+        const formData = new FormData();
+        formData.append('name', `${proofName} — ${entry.slot}`);
+        formData.append('file', entry.file);
+        this.clientsService.uploadClientIdentifierDocument(identifierId, formData).subscribe({ error: () => {} });
+      }
+    };
+
+    if (this.clientKycStep?.existingKycIdentifierId) {
+      uploadFiles(this.clientKycStep.existingKycIdentifierId);
+      return;
+    }
+
     // The KYC step's chip-picker carries `id` as a doc-type CODE string (e.g. "AADHAAR").
     // The backend ClientIdentifierRequest.documentTypeId is a Long, so a string proofId
     // trips Jackson → HttpMessageNotReadableException → 400. Resolve to numeric CodeValue
@@ -1075,12 +1096,10 @@ export class EditClientComponent {
         next: (res: any) => {
           const identifierId = res?.resourceId;
           if (!identifierId) return;
-          for (const entry of payload.files) {
-            const formData = new FormData();
-            formData.append('name', `${proofName} — ${entry.slot}`);
-            formData.append('file', entry.file);
-            this.clientsService.uploadClientIdentifierDocument(identifierId, formData).subscribe({ error: () => {} });
+          if (this.clientKycStep) {
+            this.clientKycStep.existingKycIdentifierId = identifierId.toString();
           }
+          uploadFiles(identifierId.toString());
         },
         error: () => {}
       });
@@ -1098,8 +1117,45 @@ export class EditClientComponent {
     return this.clientsService.getKycProofTypes('id').pipe(
       map((res: any) => {
         const list: any[] = res?.idProofs || [];
-        const targetName = (proofName || '').trim().toLowerCase();
-        const match = list.find((p: any) => (p?.name || '').trim().toLowerCase() === targetName);
+        const cleanStr = (s: string) => (s || '').toLowerCase().replace(/[^a-z0-9]/g, '');
+        const target = cleanStr(proofName || proofId);
+
+        // 1. Try exact code/name match
+        let match = list.find((p: any) => {
+          const pcode = cleanStr(p.code);
+          const pname = cleanStr(p.name);
+          return pcode === target || pname === target;
+        });
+
+        // 2. Try loose contains/includes match
+        if (!match) {
+          match = list.find((p: any) => {
+            const pcode = cleanStr(p.code);
+            const pname = cleanStr(p.name);
+            return pcode.includes(target) || pname.includes(target) || target.includes(pcode) || target.includes(pname);
+          });
+        }
+
+        // 3. Specific fallbacks for common keywords
+        if (!match && target.includes('voter')) {
+          match = list.find((p: any) => {
+            const name = cleanStr(p.name);
+            return name.includes('voter') || name.includes('epic');
+          });
+        }
+        if (!match && target.includes('aadhaar')) {
+          match = list.find((p: any) => cleanStr(p.name).includes('aadhaar'));
+        }
+        if (!match && target.includes('passport')) {
+          match = list.find((p: any) => cleanStr(p.name).includes('passport'));
+        }
+        if (!match && target.includes('driving')) {
+          match = list.find((p: any) => cleanStr(p.name).includes('drive') || cleanStr(p.name).includes('licen'));
+        }
+        if (!match && target.includes('pan')) {
+          match = list.find((p: any) => cleanStr(p.name).includes('pan'));
+        }
+
         return (match?.id ?? null) as number | null;
       })
     );