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

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

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { Directive, EventEmitter, ContentChild, Output, Input, ChangeDetectionStrategy, Component, ViewChild, Injectable, inject, NgModule } from '@angular/core';
 import * as i1 from '@deenruv/admin-ui/core';
-import { SelectionManager, GetZoneMembersDocument, GetCountryListDocument, ADMINISTRATOR_FRAGMENT, TypedBaseDetailComponent, getCustomFieldsDefaults, Permission, createBulkDeleteAction, TypedBaseListComponent, GetAdministratorListDocument, LogicalOperator, CHANNEL_FRAGMENT, GetChannelListDocument, COUNTRY_FRAGMENT, createUpdatedTranslatable, findTranslation, LanguageCode, PAYMENT_METHOD_FRAGMENT, configurableDefinitionToInstance, toConfigurableOperationInput, getConfigArgValue, createBulkAssignToChannelAction, AssignPaymentMethodsToChannelDocument, createBulkRemoveFromChannelAction, RemovePaymentMethodsFromChannelDocument, GetPaymentMethodListDocument, ROLE_FRAGMENT, GetRoleListDocument, GetSellerListDocument, SHIPPING_METHOD_FRAGMENT, AssignShippingMethodsToChannelDocument, RemoveShippingMethodsFromChannelDocument, GetShippingMethodListDocument, CreateStockLocationDocument, UpdateStockLocationDocument, DeletionResult, DeleteStockLocationsDocument, AssignStockLocationsToChannelDocument, RemoveStockLocationsFromChannelDocument, GetStockLocationListDocument, TAX_CATEGORY_FRAGMENT, GetTaxCategoryListDocument, TAX_RATE_FRAGMENT, GetTaxRateListDocument, GetZoneListDocument, DataService, NotificationService, BaseEntityResolver, PageComponent, GetProfileDetailDocument, GetGlobalSettingsDetailDocument, detailComponentWithResolver, GetSellerDetailDocument, GetChannelDetailDocument, GetAdministratorDetailDocument, GetRoleDetailDocument, GetShippingMethodDetailDocument, GetPaymentMethodDetailDocument, GetTaxCategoryDetailDocument, GetTaxRateDetailDocument, GetCountryDetailDocument, GetZoneDetailDocument, GetStockLocationDetailDocument, SharedModule, PageService } from '@deenruv/admin-ui/core';
+import { SelectionManager, GetZoneMembersDocument, matchesTokenizedSearch, GetCountryListDocument, ADMINISTRATOR_FRAGMENT, TypedBaseDetailComponent, getCustomFieldsDefaults, Permission, createBulkDeleteAction, TypedBaseListComponent, GetAdministratorListDocument, buildTokenizedSearchFilter, CHANNEL_FRAGMENT, GetChannelListDocument, COUNTRY_FRAGMENT, createUpdatedTranslatable, findTranslation, LanguageCode, PAYMENT_METHOD_FRAGMENT, configurableDefinitionToInstance, toConfigurableOperationInput, getConfigArgValue, createBulkAssignToChannelAction, AssignPaymentMethodsToChannelDocument, createBulkRemoveFromChannelAction, RemovePaymentMethodsFromChannelDocument, GetPaymentMethodListDocument, ROLE_FRAGMENT, GetRoleListDocument, GetSellerListDocument, SHIPPING_METHOD_FRAGMENT, AssignShippingMethodsToChannelDocument, RemoveShippingMethodsFromChannelDocument, GetShippingMethodListDocument, CreateStockLocationDocument, UpdateStockLocationDocument, DeletionResult, DeleteStockLocationsDocument, AssignStockLocationsToChannelDocument, RemoveStockLocationsFromChannelDocument, GetStockLocationListDocument, TAX_CATEGORY_FRAGMENT, GetTaxCategoryListDocument, TAX_RATE_FRAGMENT, GetTaxRateListDocument, GetZoneListDocument, DataService, NotificationService, BaseEntityResolver, PageComponent, GetProfileDetailDocument, GetGlobalSettingsDetailDocument, detailComponentWithResolver, GetSellerDetailDocument, GetChannelDetailDocument, GetAdministratorDetailDocument, GetRoleDetailDocument, GetShippingMethodDetailDocument, GetPaymentMethodDetailDocument, GetTaxCategoryDetailDocument, GetTaxRateDetailDocument, GetCountryDetailDocument, GetZoneDetailDocument, GetStockLocationDetailDocument, SharedModule, PageService } from '@deenruv/admin-ui/core';
 import { gql } from 'apollo-angular';
 import { take, takeUntil, startWith, map, withLatestFrom, mergeMap, tap, switchMap as switchMap$1, distinctUntilChanged, mapTo } from 'rxjs/operators';
 import * as i2$1 from '@angular/forms';
@@ -80,14 +80,7 @@ class ZoneMemberListComponent {
             this.selectionChange.emit(selection.map(s => s.id));
         });
         this.filteredMembers$ = combineLatest(this.members$, this.filterTermControl.valueChanges.pipe(startWith(''))).pipe(map(([members, filterTerm]) => {
-            if (filterTerm) {
-                const term = filterTerm?.toLocaleLowerCase() ?? '';
-                return members.filter(m => m.name.toLocaleLowerCase().includes(term) ||
-                    m.code.toLocaleLowerCase().includes(term));
-            }
-            else {
-                return members;
-            }
+            return members.filter(member => matchesTokenizedSearch(member, filterTerm, ['name', 'code']));
         }));
         this.totalItems$ = this.filteredMembers$.pipe(map(members => members.length));
     }
@@ -524,32 +517,12 @@ class AdministratorListComponent extends TypedBaseListComponent {
         });
     }
     createSearchQuery(skip, take, searchTerm) {
-        let _filter = {};
-        let filterOperator = LogicalOperator.AND;
-        if (searchTerm) {
-            _filter = {
-                emailAddress: {
-                    contains: searchTerm,
-                },
-                firstName: {
-                    contains: searchTerm,
-                },
-                lastName: {
-                    contains: searchTerm,
-                },
-            };
-            filterOperator = LogicalOperator.OR;
-        }
         return {
             options: {
                 skip,
                 take,
-                filter: {
-                    ...(_filter ?? {}),
-                    ...this.filters.createFilterInput(),
-                },
+                filter: buildTokenizedSearchFilter(searchTerm, ['emailAddress', 'firstName', 'lastName'], this.filters.createFilterInput()),
                 sort: this.sorts.createSortInput(),
-                filterOperator,
             },
         };
     }
@@ -811,12 +784,7 @@ class ChannelListComponent extends TypedBaseListComponent {
                 options: {
                     skip,
                     take,
-                    filter: {
-                        code: {
-                            contains: this.searchTermControl.value,
-                        },
-                        ...this.filters.createFilterInput(),
-                    },
+                    filter: buildTokenizedSearchFilter(this.searchTermControl.value, ['code'], this.filters.createFilterInput()),
                     sort: this.sorts.createSortInput(),
                 },
             }),
@@ -1016,12 +984,7 @@ class CountryListComponent 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(),
                 },
             }),
@@ -1440,12 +1403,7 @@ class PaymentMethodListComponent 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(),
                 },
             }),
@@ -1697,12 +1655,7 @@ class RoleListComponent extends TypedBaseListComponent {
                 options: {
                     skip,
                     take,
-                    filter: {
-                        code: {
-                            contains: this.searchTermControl.value,
-                        },
-                        ...this.filters.createFilterInput(),
-                    },
+                    filter: buildTokenizedSearchFilter(this.searchTermControl.value, ['code'], this.filters.createFilterInput()),
                     sort: this.sorts.createSortInput(),
                 },
             }),
@@ -1888,12 +1841,7 @@ class SellerListComponent 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(),
                 },
             }),
@@ -2420,12 +2368,7 @@ class ShippingMethodListComponent 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(),
                 },
             }),
@@ -2688,12 +2631,7 @@ class StockLocationListComponent 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(),
                 },
             }),
@@ -2857,12 +2795,7 @@ class TaxCategoryListComponent 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(),
                 },
             }),
@@ -3063,12 +2996,7 @@ class TaxRateListComponent 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(),
                 },
             }),
@@ -3289,13 +3217,7 @@ class ZoneListComponent extends TypedBaseListComponent {
                 options: {
                     skip,
                     take,
-                    filter: {
-                        name: {
-                            contains: this.searchTermControl.value,
-                        },
-                        ...this.filters.createFilterInput(),
-                    },
-                    filterOperator: this.searchTermControl.value ? LogicalOperator.OR : LogicalOperator.AND,
+                    filter: buildTokenizedSearchFilter(this.searchTermControl.value, ['name'], this.filters.createFilterInput()),
                     sort: this.sorts.createSortInput(),
                 },
             }),
@@ -3325,7 +3247,10 @@ class ZoneListComponent 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',
+        });
     }
     addToZone(zone) {
         this.modalService
@@ -3337,9 +3262,7 @@ class ZoneListComponent extends TypedBaseListComponent {
             size: 'md',
         })
             .pipe(switchMap$1(memberIds => memberIds
-            ? this.dataService.settings
-                .addMembersToZone(zone.id, memberIds)
-                .pipe(mapTo(memberIds))
+            ? this.dataService.settings.addMembersToZone(zone.id, memberIds).pipe(mapTo(memberIds))
             : EMPTY))
             .subscribe({
             next: result => {