fix: status edit bug (#985)

* real fix * refactor
valtimo-platform · May 16, 2024 · 270caa0 · 270caa0
1 parent c5f5a02
commit 270caa0
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/...ent-statuses/dossier-management-status-modal/dossier-management-status-modal.component.ts b/...ent-statuses/dossier-management-status-modal/dossier-management-status-modal.component.ts
@@ -37,9 +37,9 @@ import {
 import {CARBON_CONSTANTS} from '@valtimo/components';
 import {
   AbstractControl,
+  AsyncValidatorFn,
   FormBuilder,
   ValidationErrors,
-  ValidatorFn,
   Validators,
 } from '@angular/forms';
 import {
@@ -90,20 +90,17 @@ export class DossierManagementStatusModalComponent implements OnInit, OnDestroy
     key: this.fb.control('', [
       Validators.required,
       Validators.minLength(3),
-      this.uniqueKeyValidator(),
+      this.uniqueKeyValidator,
     ]),
     visibleInCaseListByDefault: this.fb.control(true, Validators.required),
     color: this.fb.control('', Validators.required),
   });
 
-  private _isEdit!: boolean;
-
   public readonly isEdit$ = combineLatest([this._typeAnimationDelay$, this._prefillStatus]).pipe(
     tap(([type, prefillStatus]) => {
       if (type === 'edit' && prefillStatus) this.prefillForm(prefillStatus);
     }),
-    map(([type]) => type === 'edit'),
-    tap(isEdit => (this._isEdit = isEdit))
+    map(([type]) => type === 'edit')
   );
 
   public readonly isAdd$ = this._typeAnimationDelay$.pipe(
@@ -348,11 +345,15 @@ export class DossierManagementStatusModalComponent implements OnInit, OnDestroy
     this.statusFormGroup.patchValue({key: ''});
   }
 
-  private uniqueKeyValidator(): ValidatorFn {
-    return (control: AbstractControl): ValidationErrors | null =>
-      this.usedKeys?.every((key: string) => key !== control.value) || this._isEdit
-        ? null
-        : {uniqueKey: {value: control.value}};
+  private uniqueKeyValidator(): AsyncValidatorFn {
+    return (control: AbstractControl): Observable<ValidationErrors | null> =>
+      combineLatest([this.isEdit$, control.valueChanges]).pipe(
+        map(([isEdit, keyValue]) =>
+          this.usedKeys?.every((key: string) => key !== keyValue) || isEdit
+            ? null
+            : {uniqueKey: {value: control.value}}
+        )
+      );
   }
 
   private disable(): void {