Client-stepper: pre-fill existing KYC/address proofs in edit, fix identifier saves

Edit-mode now shows the previously selected KYC document type + uploaded file thumbnail
(loads from /clients/{id}/identifiers + /client_identifiers/{id}/documents). Same for
address proof on the India address step. Closes the gap where editing a client showed
an empty file picker even when proof had been uploaded on create.

Identifier-save hardened across all three callsites (create-client, edit-client,
identities-tab.createIdentifierWithDocs) - the KYC chip picker proofId is a CODE
string ('AADHAAR'), but backend ClientIdentifierRequest.documentTypeId is Long, which
Spring rejects with HttpMessageNotReadableException -> 400. resolveDocumentTypeId
helper looks up the code against /kyc/proof-types?type=id and substitutes the numeric
CodeValue id before posting. Skips silently for constitution-specific non-individual
docs that have no CodeValue mapping.

KYC payload normalises panNumber / enterprisePan / gstinNumber / cinNumber via
toUpperCase + whitespace strip so user-typed lowercase or trailing spaces don't trip
the backend regex (validation.msg.CLIENTKYC.panNumber.does.not.match.regexp).

State name match in client-address save now normalises both sides (lowercase, collapse
underscores + spaces) so legacy MADHYA_PRADESH resolves to 'Madhya Pradesh' returned
by api.postalpincode.in. Backed by tenant migration 0297.

Identities-tab resolver flattened - was returning identifiers before the per-row
forkJoin(getClientIdentificationDocuments) completed, so the view rendered empty
documents arrays. Now uses switchMap + forkJoin so the resolver awaits completion.

Also bundles concurrent work-in-progress on letter-mgmt, organization, users,
bank-calendar, shell, nominee/notes/identifier dialogs, and theming.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

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

@@ -10,6 +10,8 @@
 import { Component, QueryList, ViewChild, ViewChildren, inject } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
+import { Observable, of } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 /** Custom Services */
 import { ClientsService } from '../clients.service';
@@ -145,6 +147,57 @@ export class EditClientComponent {
     return areValids;
   }
 
+  /**
+   * Per-tab form-validity gate for the Save & Next button. Mirrors the create
+   * flow — blocks navigation when the current tab has unfilled / invalid
+   * required fields. Tab order:
+   *   0  General
+   *   1  KYC & Documents
+   *   2  (non-individual) Scheme & Sector  |  (individual) Address
+   *   3  (non-individual) Address          |  (individual) Family
+   *   4  (non-individual) Family           |  Preview / Submit
+   */
+  get currentStepValid(): boolean {
+    if (this.savingClient) return false;
+    const idx = this.selectedTabIndex;
+
+    if (idx === 0) {
+      if (!this.clientGeneralStep || !this.clientGeneralForm) return false;
+      if (this.clientGeneralStep.sanctionsBlocked) return false;
+      return this.clientGeneralForm.valid;
+    }
+    if (idx === 1) {
+      const kf = this.clientKycStep?.kycForm;
+      return !kf || kf.valid;
+    }
+    if (this.legalFormType === 2) {
+      if (idx === 2) return true; // Scheme & Sector — opt-in
+      if (idx === 3) return this.isAddressStepValid();
+      if (idx === 4) return true; // Family — optional
+    } else {
+      if (idx === 2) return this.isAddressStepValid();
+      if (idx === 3) return true; // Family — optional
+    }
+    return true;
+  }
+
+  private isAddressStepValid(): boolean {
+    const step = this.clientIndiaAddressStep;
+    if (!step) return true;
+    const perm = step.permanentForm;
+    return !perm || perm.valid;
+  }
+
+  /** Human-readable explanation surfaced via matTooltip on the disabled button. */
+  get currentStepBlockerMessage(): string {
+    if (this.savingClient) return 'Saving — please wait…';
+    if (this.currentStepValid) return '';
+    if (this.selectedTabIndex === 0 && this.clientGeneralStep?.sanctionsBlocked) {
+      return 'Client failed sanctions screening — cannot proceed.';
+    }
+    return 'Please fill all mandatory fields on this tab to continue.';
+  }
+
   /** Whether the current tab has unsaved edits */
   isCurrentTabEdited(): boolean {
     return this.tabEditMode[this.selectedTabIndex] === true;
@@ -637,10 +690,17 @@ export class EditClientComponent {
             isActive: tab === 'permanent'
           };
 
+          // Resolve state name to stateProvinceId. Normalise both sides (lowercase,
+          // collapse underscores + whitespace) so legacy UPPER_SNAKE rows still match
+          // the postal-PIN API's "Madhya Pradesh" form and vice versa. See migration 0297.
           if ((addr as any).state && template?.stateProvinceIdOptions?.length) {
-            const stateMatch = template.stateProvinceIdOptions.find(
-              (s: any) => s.name?.toLowerCase() === (addr as any).state?.toLowerCase()
-            );
+            const norm = (s: string) =>
+              (s || '')
+                .toLowerCase()
+                .replace(/[_\s]+/g, ' ')
+                .trim();
+            const target = norm((addr as any).state);
+            const stateMatch = template.stateProvinceIdOptions.find((s: any) => norm(s.name) === target);
             if (stateMatch) payload.stateProvinceId = stateMatch.id;
           }
 
@@ -695,28 +755,55 @@ export class EditClientComponent {
     if (!payload?.proofId || !payload?.files?.length) return;
 
     const proofName = payload.proof?.name || 'KYC Document';
-    const identifierData: any = {
-      documentTypeId: payload.proofId,
-      status: 'Active',
-      documentKey: payload.documentKey || `${proofName} - ${clientId}`,
-      description: 'KYC document'
-    };
+    // 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
+    // id by matching on name against /kyc/proof-types?type=id before posting.
+    this.resolveDocumentTypeId(payload.proofId, proofName).subscribe((documentTypeId: number | null) => {
+      if (documentTypeId == null) {
+        return;
+      }
+      const identifierData: any = {
+        documentTypeId,
+        status: 'Active',
+        documentKey: payload.documentKey || `${proofName} - ${clientId}`,
+        description: 'KYC document'
+      };
 
-    this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
-      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: () => {} });
-        }
-      },
-      error: () => {}
+      this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
+        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: () => {} });
+          }
+        },
+        error: () => {}
+      });
     });
   }
 
+  /**
+   * Pass-through when proofId is already numeric (address proof). Otherwise resolve the
+   * string code/name against the ID-proof CodeValues so the backend gets a proper Long.
+   */
+  private resolveDocumentTypeId(proofId: any, proofName: string): Observable<number | null> {
+    if (typeof proofId === 'number' && Number.isFinite(proofId)) {
+      return of(proofId);
+    }
+    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);
+        return (match?.id ?? null) as number | null;
+      })
+    );
+  }
+
   private saveClientFamilyMembers(clientId: string) {
     const members = this.clientFamilyMembersStep.clientFamilyMembers;
     for (const member of members) {