@vendure/admin-ui 2.0.2 → 2.0.4

package/fesm2022/vendure-admin-ui-customer.mjs

@@ -5,7 +5,7 @@ import { map, startWith, distinctUntilChanged, debounceTime, tap, takeUntil, swi
 import * as i1 from '@vendure/admin-ui/core';
 import { SelectionManager, HistoryEntryType, CUSTOMER_FRAGMENT, TypedBaseDetailComponent, SortOrder, EditNoteDialogComponent, CustomerDetailQueryDocument, createBulkDeleteAction, Permission, CUSTOMER_GROUP_FRAGMENT, TypedBaseListComponent, GetCustomerGroupListDocument, ModalService, DataService, NotificationService, CustomerListQueryDocument, LogicalOperator, PageComponent, detailBreadcrumb, detailComponentWithResolver, GetCustomerGroupDetailDocument, SharedModule, PageService } from '@vendure/admin-ui/core';
 import * as i1$1 from '@angular/forms';
-import { FormControl, Validators, UntypedFormArray, UntypedFormControl } from '@angular/forms';
+import { FormControl, Validators, UntypedFormArray } from '@angular/forms';
 import * as i2 from '@angular/router';
 import { ROUTES, RouterModule } from '@angular/router';
 import * as i3 from '@clr/angular';
@@ -412,32 +412,32 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.3", ngImpor
                 type: Output
             }] } });
 
-const CUSTOMER_DETAIL_QUERY = gql `
-    query CustomerDetailQuery($id: ID!, $orderListOptions: OrderListOptions) {
-        customer(id: $id) {
-            ...Customer
-            groups {
-                id
-                name
-            }
-            orders(options: $orderListOptions) {
-                items {
-                    id
-                    code
-                    type
-                    state
-                    total
-                    totalWithTax
-                    currencyCode
-                    createdAt
-                    updatedAt
-                    orderPlacedAt
-                }
-                totalItems
-            }
-        }
-    }
-    ${CUSTOMER_FRAGMENT}
+const CUSTOMER_DETAIL_QUERY = gql `
+    query CustomerDetailQuery($id: ID!, $orderListOptions: OrderListOptions) {
+        customer(id: $id) {
+            ...Customer
+            groups {
+                id
+                name
+            }
+            orders(options: $orderListOptions) {
+                items {
+                    id
+                    code
+                    type
+                    state
+                    total
+                    totalWithTax
+                    currencyCode
+                    createdAt
+                    updatedAt
+                    orderPlacedAt
+                }
+                totalItems
+            }
+        }
+    }
+    ${CUSTOMER_FRAGMENT}
 `;
 class CustomerDetailComponent extends TypedBaseDetailComponent {
     constructor(changeDetector, formBuilder, dataService, modalService, notificationService) {
@@ -525,13 +525,6 @@ class CustomerDetailComponent extends TypedBaseDetailComponent {
             defaultBillingAddress: false,
             customFields: this.formBuilder.group(this.addressCustomFields.reduce((hash, field) => ({ ...hash, [field.name]: '' }), {})),
         });
-        // if (this.addressCustomFields.length) {
-        //     const customFieldsGroup = this.formBuilder.group({});
-        //     for (const fieldDef of this.addressCustomFields) {
-        //         customFieldsGroup.addControl(fieldDef.name, new UntypedFormControl(''));
-        //     }
-        //     newAddress.addControl('customFields', customFieldsGroup);
-        // }
         addressFormArray.push(newAddress);
     }
     setOrderItemsPerPage(itemsPerPage) {
@@ -791,7 +784,10 @@ class CustomerDetailComponent extends TypedBaseDetailComponent {
                 const addressGroup = this.formBuilder.group({
                     ...rest,
                     countryCode: address.country.code,
-                    customFields: this.formBuilder.group(this.addressCustomFields.reduce((hash, field) => ({ ...hash, [field.name]: '' }), {})),
+                    customFields: this.formBuilder.group(this.addressCustomFields.reduce((hash, field) => ({
+                        ...hash,
+                        [field.name]: address['customFields'][field.name],
+                    }), {})),
                 });
                 addressesArray.push(addressGroup);
                 if (address.defaultShippingAddress) {
@@ -800,16 +796,6 @@ class CustomerDetailComponent extends TypedBaseDetailComponent {
                 if (address.defaultBillingAddress) {
                     this.defaultBillingAddressId = address.id;
                 }
-                if (this.addressCustomFields.length) {
-                    const customFieldsGroup = this.formBuilder.group({});
-                    for (const fieldDef of this.addressCustomFields) {
-                        const key = fieldDef.name;
-                        const value = address.customFields?.[key];
-                        const control = new UntypedFormControl(value);
-                        customFieldsGroup.addControl(key, control);
-                    }
-                    addressGroup.addControl('customFields', customFieldsGroup);
-                }
             }
             this.detailForm.setControl('addresses', addressesArray);
         }
@@ -1138,29 +1124,29 @@ const deleteCustomersBulkAction = createBulkDeleteAction({
     bulkDelete: (dataService, ids) => dataService.customer.deleteCustomers(ids).pipe(map(res => res.deleteCustomers)),
 });
 
-const CUSTOMER_LIST_QUERY = gql `
-    query CustomerListQuery($options: CustomerListOptions) {
-        customers(options: $options) {
-            items {
-                ...CustomerListItem
-            }
-            totalItems
-        }
-    }
-
-    fragment CustomerListItem on Customer {
-        id
-        createdAt
-        updatedAt
-        title
-        firstName
-        lastName
-        emailAddress
-        user {
-            id
-            verified
-        }
-    }
+const CUSTOMER_LIST_QUERY = gql `
+    query CustomerListQuery($options: CustomerListOptions) {
+        customers(options: $options) {
+            items {
+                ...CustomerListItem
+            }
+            totalItems
+        }
+    }
+
+    fragment CustomerListItem on Customer {
+        id
+        createdAt
+        updatedAt
+        title
+        firstName
+        lastName
+        emailAddress
+        user {
+            id
+            verified
+        }
+    }
 `;
 class CustomerListComponent extends TypedBaseListComponent {
     constructor() {
@@ -1301,6 +1287,13 @@ class CustomerModule {
                 component: CustomerDetailComponent,
                 query: CustomerDetailQueryDocument,
                 entityKey: 'customer',
+                variables: {
+                    orderListOptions: {
+                        sort: {
+                            orderPlacedAt: SortOrder.DESC,
+                        },
+                    },
+                },
                 getBreadcrumbs: entity => [
                     {
                         label: entity