fix(forms): avoid errors with undefined enum options

Aam-Digital · Jul 2, 2024 · 9ff08e2 · 9ff08e2
1 parent fd50d3d
commit 9ff08e2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/app/core/basic-datatypes/configurable-enum/enum-dropdown/enum-dropdown.component.ts b/src/app/core/basic-datatypes/configurable-enum/enum-dropdown/enum-dropdown.component.ts
@@ -41,7 +41,7 @@ export class EnumDropdownComponent implements OnChanges {
 
   enumEntity: ConfigurableEnum;
   invalidOptions: ConfigurableEnumValue[] = [];
-  options: ConfigurableEnumValue[];
+  options: ConfigurableEnumValue[] = [];
   canEdit = false;
   enumValueToString = (v: ConfigurableEnumValue) => v?.label;
   createNewOption: (input: string) => Promise<ConfigurableEnumValue>;
@@ -65,7 +65,7 @@ export class EnumDropdownComponent implements OnChanges {
     if (changes.hasOwnProperty("enumId") || changes.hasOwnProperty("form")) {
       this.invalidOptions = this.prepareInvalidOptions();
     }
-    this.options = [...this.enumEntity?.values, ...this.invalidOptions];
+    this.options = [...(this.enumEntity?.values ?? []), ...this.invalidOptions];
   }
 
   private prepareInvalidOptions(): ConfigurableEnumValue[] {
@@ -114,6 +114,6 @@ export class EnumDropdownComponent implements OnChanges {
       this.form.setValue(undefined);
     }
 
-    this.options = [...this.enumEntity.values, ...this.invalidOptions];
+    this.options = [...(this.enumEntity?.values ?? []), ...this.invalidOptions];
   }
 }