@deenruv/admin-ui 1.0.17-dev.20 → 1.0.17-dev.23

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

@@ -1,9 +1,9 @@
 import * as i0 from '@angular/core';
 import { Input, ChangeDetectionStrategy, Component, EventEmitter, Output, ViewContainerRef, ViewChild, NgModule } from '@angular/core';
+import * as i1 from '@deenruv/admin-ui/core';
+import { SelectionManager, GetCustomerListDocument, buildTokenizedSearchFilter, HistoryEntryType, CUSTOMER_FRAGMENT, TypedBaseDetailComponent, getCustomFieldsDefaults, SortOrder, EditNoteDialogComponent, CustomerDetailQueryDocument, createBulkDeleteAction, Permission, CUSTOMER_GROUP_FRAGMENT, TypedBaseListComponent, GetCustomerGroupListDocument, ModalService, DataService, NotificationService, CustomerListQueryDocument, PageComponent, detailBreadcrumb, detailComponentWithResolver, GetCustomerGroupDetailDocument, SharedModule, PageService } from '@deenruv/admin-ui/core';
 import { BehaviorSubject, Subject, combineLatest, forkJoin, EMPTY, from, of } from 'rxjs';
 import { map, startWith, distinctUntilChanged, debounceTime, tap, takeUntil, switchMap, filter, take, shareReplay, merge, mergeMap, concatMap, mapTo } from 'rxjs/operators';
-import * as i1 from '@deenruv/admin-ui/core';
-import { SelectionManager, HistoryEntryType, CUSTOMER_FRAGMENT, TypedBaseDetailComponent, getCustomFieldsDefaults, SortOrder, EditNoteDialogComponent, CustomerDetailQueryDocument, createBulkDeleteAction, Permission, CUSTOMER_GROUP_FRAGMENT, TypedBaseListComponent, GetCustomerGroupListDocument, ModalService, DataService, NotificationService, LogicalOperator, CustomerListQueryDocument, PageComponent, detailBreadcrumb, detailComponentWithResolver, GetCustomerGroupDetailDocument, SharedModule, PageService } from '@deenruv/admin-ui/core';
 import * as i1$1 from '@angular/forms';
 import { FormControl, UntypedFormArray, Validators } from '@angular/forms';
 import * as i2 from '@angular/router';
@@ -117,8 +117,14 @@ class AddCustomerToGroupDialogComponent {
         });
     }
     ngOnInit() {
-        const customerResult$ = this.fetchGroupMembers$.pipe(switchMap(({ skip, take, filterTerm }) => this.dataService.customer
-            .getCustomerList(take, skip, filterTerm)
+        const customerResult$ = this.fetchGroupMembers$.pipe(switchMap(({ skip, take, filterTerm }) => this.dataService
+            .query(GetCustomerListDocument, {
+            options: {
+                take,
+                skip,
+                filter: buildTokenizedSearchFilter(filterTerm, ['emailAddress', 'lastName']),
+            },
+        })
             .mapStream(res => res.customers)));
         this.customers$ = customerResult$.pipe(map(res => res.items));
         this.customersTotal$ = customerResult$.pipe(map(res => res.totalItems));
@@ -1005,10 +1011,7 @@ class CustomerGroupListComponent extends TypedBaseListComponent {
                 options: {
                     skip,
                     take,
-                    filter: {
-                        name: { contains: this.searchTermControl.value },
-                        ...this.filters.createFilterInput(),
-                    },
+                    filter: buildTokenizedSearchFilter(this.searchTermControl.value, ['name'], this.filters.createFilterInput()),
                     sort: this.sorts.createSortInput(),
                 },
             }),
@@ -1038,11 +1041,7 @@ class CustomerGroupListComponent extends TypedBaseListComponent {
                     .getCustomerGroupWithCustomers(activeGroup.id, {
                     skip,
                     take,
-                    filter: {
-                        emailAddress: {
-                            contains: filterTerm,
-                        },
-                    },
+                    filter: buildTokenizedSearchFilter(filterTerm, ['emailAddress']),
                 })
                     .mapStream(res => res.customerGroup?.customers);
             }
@@ -1056,7 +1055,10 @@ class CustomerGroupListComponent extends TypedBaseListComponent {
     closeMembers() {
         const params = { ...this.route.snapshot.params };
         delete params.contents;
-        this.router.navigate(['./', params], { relativeTo: this.route, queryParamsHandling: 'preserve' });
+        this.router.navigate(['./', params], {
+            relativeTo: this.route,
+            queryParamsHandling: 'preserve',
+        });
     }
     addToGroup(group) {
         this.modalService
@@ -1069,9 +1071,7 @@ class CustomerGroupListComponent extends TypedBaseListComponent {
             verticalAlign: 'top',
         })
             .pipe(switchMap(customerIds => customerIds
-            ? this.dataService.customer
-                .addCustomersToGroup(group.id, customerIds)
-                .pipe(mapTo(customerIds))
+            ? this.dataService.customer.addCustomersToGroup(group.id, customerIds).pipe(mapTo(customerIds))
             : EMPTY))
             .subscribe({
             next: result => {
@@ -1189,23 +1189,7 @@ class CustomerListComponent extends TypedBaseListComponent {
                 options: {
                     skip,
                     take,
-                    filter: {
-                        ...(this.searchTermControl.value
-                            ? {
-                                emailAddress: {
-                                    contains: this.searchTermControl.value,
-                                },
-                                lastName: {
-                                    contains: this.searchTermControl.value,
-                                },
-                                postalCode: {
-                                    contains: this.searchTermControl.value,
-                                },
-                            }
-                            : {}),
-                        ...this.filters.createFilterInput(),
-                    },
-                    filterOperator: this.searchTermControl.value ? LogicalOperator.OR : LogicalOperator.AND,
+                    filter: buildTokenizedSearchFilter(this.searchTermControl.value, ['emailAddress', 'lastName', 'postalCode'], this.filters.createFilterInput()),
                     sort: this.sorts.createSortInput(),
                 },
             }),