fix(admin-ui): Fix rendering of custom field lists

vendure-ecommerce · Dec 2, 2021 · da9e2ce · da9e2ce
1 parent 6f71bf2
commit da9e2ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.ts b/...src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.ts
@@ -33,7 +33,7 @@ export class TabbedCustomFieldsComponent implements OnInit {
     private groupByTabs(customFieldConfigs: CustomFieldConfig[]): GroupedCustomFields {
         const tabMap = new Map<string, CustomFieldConfig[]>();
         for (const field of customFieldConfigs) {
-            const tabName = field.ui.tab ?? this.defaultTabName;
+            const tabName = field.ui?.tab ?? this.defaultTabName;
             if (tabMap.has(tabName)) {
                 tabMap.get(tabName)?.push(field);
             } else {

diff --git a/...ib/core/src/shared/dynamic-form-inputs/dynamic-form-input/dynamic-form-input.component.ts b/...ib/core/src/shared/dynamic-form-inputs/dynamic-form-input/dynamic-form-input.component.ts
@@ -55,7 +55,8 @@ type InputListItem = {
     ],
 })
 export class DynamicFormInputComponent
-    implements OnInit, OnChanges, AfterViewInit, OnDestroy, ControlValueAccessor {
+    implements OnInit, OnChanges, AfterViewInit, OnDestroy, ControlValueAccessor
+{
     @Input() def: ConfigArgDefinition | CustomFieldConfig;
     @Input() readonly: boolean;
     @Input() control: FormControl;
@@ -148,6 +149,7 @@ export class DynamicFormInputComponent
                                 this.onChange(val);
                                 this.control.patchValue(val, { emitEvent: false });
                             });
+                        setTimeout(() => this.changeDetectorRef.markForCheck());
                     }
                 };
 
@@ -278,9 +280,9 @@ export class DynamicFormInputComponent
         this.changeDetectorRef.markForCheck();
     }
 
-    private getInputComponentConfig(
-        argDef: ConfigArgDefinition | CustomFieldConfig,
-    ): { component: DefaultFormComponentId } {
+    private getInputComponentConfig(argDef: ConfigArgDefinition | CustomFieldConfig): {
+        component: DefaultFormComponentId;
+    } {
         if (this.hasUiConfig(argDef) && argDef.ui.component) {
             return argDef.ui;
         }