feat(admin-ui): Support custom field controls in FulfillmentDetail

Relates to #887
vendure-ecommerce · Jun 28, 2021 · a8a7eac · a8a7eac
1 parent 02c2d4e
commit a8a7eac
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/...dmin-ui/src/lib/order/src/components/fulfillment-detail/fulfillment-detail.component.html b/...dmin-ui/src/lib/order/src/components/fulfillment-detail/fulfillment-detail.component.html
@@ -10,14 +10,12 @@
 <vdr-labeled-data [label]="'order.contents' | translate">
     <vdr-simple-item-list [items]="items"></vdr-simple-item-list>
 </vdr-labeled-data>
-<ng-container *ngFor="let customField of customFields">
-    <vdr-labeled-data [label]="customField.key">
-        <vdr-object-tree
-            *ngIf="customFieldIsObject(customField.value); else primitive"
-            [value]="{ object: customField.value }"
-        ></vdr-object-tree>
-        <ng-template #primitive>
-            {{ customField.value }}
-        </ng-template>
-    </vdr-labeled-data>
+<ng-container *ngFor="let customField of customFieldConfig">
+    <vdr-custom-field-control
+        *ngIf="customFieldFormGroup.get(customField.name)"
+        [readonly]="true"
+        [compact]="true"
+        [customField]="customField"
+        [customFieldsFormGroup]="customFieldFormGroup"
+    ></vdr-custom-field-control>
 </ng-container>
diff --git a/.../admin-ui/src/lib/order/src/components/fulfillment-detail/fulfillment-detail.component.ts b/.../admin-ui/src/lib/order/src/components/fulfillment-detail/fulfillment-detail.component.ts
@@ -1,5 +1,6 @@
-import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { OrderDetail } from '@vendure/admin-ui/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { FormControl, FormGroup } from '@angular/forms';
+import { CustomFieldConfig, OrderDetail, ServerConfigService } from '@vendure/admin-ui/core';
 import { isObject } from '@vendure/common/lib/shared-utils';
 
 @Component({
@@ -8,14 +9,21 @@ import { isObject } from '@vendure/common/lib/shared-utils';
     styleUrls: ['./fulfillment-detail.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class FulfillmentDetailComponent implements OnChanges {
+export class FulfillmentDetailComponent implements OnInit, OnChanges {
     @Input() fulfillmentId: string;
     @Input() order: OrderDetail.Fragment;
 
-    customFields: Array<{ key: string; value: any }> = [];
+    customFieldConfig: CustomFieldConfig[] = [];
+    customFieldFormGroup = new FormGroup({});
+
+    constructor(private serverConfigService: ServerConfigService) {}
+
+    ngOnInit() {
+        this.customFieldConfig = this.serverConfigService.getCustomFieldsFor('Fulfillment');
+    }
 
     ngOnChanges(changes: SimpleChanges) {
-        this.customFields = this.getCustomFields();
+        this.buildCustomFieldsFormGroup();
     }
 
     get fulfillment(): OrderDetail.Fulfillments | undefined | null {
@@ -40,17 +48,10 @@ export class FulfillmentDetailComponent implements OnChanges {
         return Array.from(itemMap.entries()).map(([name, quantity]) => ({ name, quantity }));
     }
 
-    getCustomFields(): Array<{ key: string; value: any }> {
+    buildCustomFieldsFormGroup() {
         const customFields = (this.fulfillment as any).customFields;
-        if (customFields) {
-            return Object.entries(customFields)
-                .filter(([key]) => key !== '__typename')
-                .map(([key, val]) => {
-                    const value = Array.isArray(val) || isObject(val) ? val : (val as any).toString();
-                    return { key, value };
-                });
-        } else {
-            return [];
+        for (const fieldDef of this.serverConfigService.getCustomFieldsFor('Fulfillment')) {
+            this.customFieldFormGroup.addControl(fieldDef.name, new FormControl(customFields[fieldDef.name]));
         }
     }