From 684626280ef0e8f69e314675d8cc3e685019c430 Mon Sep 17 00:00:00 2001
From: Sebastian Leidig <sebastian@aam-digital.com>
Date: Fri, 20 Dec 2024 16:04:42 +0100
Subject: [PATCH] refactor: small code cleanups

---
 .../entity-form/entity-form.service.ts           |  1 +
 .../entity-form/entity-form.component.ts         |  8 +++++++-
 .../entity-select/entity-select.component.ts     | 16 ++++++++++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/app/core/common-components/entity-form/entity-form.service.ts b/src/app/core/common-components/entity-form/entity-form.service.ts
index f7bac55635..841df4a3d4 100644
--- a/src/app/core/common-components/entity-form/entity-form.service.ts
+++ b/src/app/core/common-components/entity-form/entity-form.service.ts
@@ -267,6 +267,7 @@ export class EntityFormService {
       if (value !== null) {
         updatedEntity[key] = value;
       } else {
+        // formControls' value is null if it is empty (untouched or cleared by user) but we don't want entity docs to be full of null properties
         delete updatedEntity[key];
       }
     }
diff --git a/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts b/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
index 8ebeae981f..ef30fbec41 100644
--- a/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
+++ b/src/app/core/common-components/entity-form/entity-form/entity-form.component.ts
@@ -36,7 +36,13 @@ import { FormsModule } from "@angular/forms";
   // Use no encapsulation because we want to change the value of children (the mat-form-fields that are
   // dynamically created)
   encapsulation: ViewEncapsulation.None,
-  imports: [NgForOf, NgIf, NgClass, EntityFieldEditComponent, FormsModule],
+  imports: [
+    FormsModule, // importing FormsModule ensures that buttons anywhere inside do not trigger form submission / page reload
+    NgForOf,
+    NgIf,
+    NgClass,
+    EntityFieldEditComponent,
+  ],
   standalone: true,
 })
 export class EntityFormComponent<T extends Entity = Entity>
diff --git a/src/app/core/common-components/entity-select/entity-select.component.ts b/src/app/core/common-components/entity-select/entity-select.component.ts
index 0f80f39d77..a96d5cd045 100644
--- a/src/app/core/common-components/entity-select/entity-select.component.ts
+++ b/src/app/core/common-components/entity-select/entity-select.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from "@angular/core";
+import { Component, Input, OnChanges, SimpleChanges } from "@angular/core";
 import { Entity } from "../../entity/model/entity";
 import { BehaviorSubject, lastValueFrom } from "rxjs";
 import { FormControl, FormsModule, ReactiveFormsModule } from "@angular/forms";
@@ -7,7 +7,7 @@ import { MatAutocompleteModule } from "@angular/material/autocomplete";
 import { UntilDestroy } from "@ngneat/until-destroy";
 import { EntityMapperService } from "../../entity/entity-mapper/entity-mapper.service";
 import { MatFormFieldModule } from "@angular/material/form-field";
-import { AsyncPipe, NgForOf, NgIf } from "@angular/common";
+import { AsyncPipe, NgIf } from "@angular/common";
 import { EntityBlockComponent } from "../../basic-datatypes/entity/entity-block/entity-block.component";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
 import { MatTooltipModule } from "@angular/material/tooltip";
@@ -34,7 +34,6 @@ import { EntityRegistry } from "../../entity/database-entity.decorator";
     ReactiveFormsModule,
     MatAutocompleteModule,
     MatChipsModule,
-    NgForOf,
     EntityBlockComponent,
     FontAwesomeModule,
     MatTooltipModule,
@@ -52,7 +51,8 @@ import { EntityRegistry } from "../../entity/database-entity.decorator";
 export class EntitySelectComponent<
   E extends Entity,
   T extends string[] | string = string[],
-> {
+> implements OnChanges
+{
   readonly loadingPlaceholder = $localize`:A placeholder for the input element when select options are not loaded yet:loading...`;
 
   @Input() form: FormControl<T>;
@@ -135,6 +135,14 @@ export class EntitySelectComponent<
 
   @Input() additionalFilter: (e: E) => boolean = (_) => true;
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes["form"]) {
+      this.form.valueChanges.subscribe((value) => {
+        this.updateAvailableOptions().then((_) => {});
+      });
+    }
+  }
+
   private async loadAvailableEntities() {
     this.loading.next(true);