From 690dfa79ff89f984faf6ce298955bf07b7e0e518 Mon Sep 17 00:00:00 2001
From: Michael Bromley <michael@michaelbromley.co.uk>
Date: Fri, 9 Apr 2021 16:25:21 +0200
Subject: [PATCH] feat(admin-ui): Filter Order list by customer last name

Relates to #572
---
 .../order-list/order-list.component.html      |  9 ++++-
 .../order-list/order-list.component.ts        | 34 +++++++++++++++----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.html b/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.html
index 2ebd92d665..7f41f24636 100644
--- a/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.html
+++ b/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.html
@@ -23,10 +23,17 @@
             <input
                 type="text"
                 name="searchTerm"
-                [formControl]="searchTerm"
+                [formControl]="searchOrderCodeControl"
                 [placeholder]="'order.search-by-order-code' | translate"
                 class="search-input"
             />
+            <input
+                type="text"
+                name="searchTerm"
+                [formControl]="searchLastNameControl"
+                [placeholder]="'order.search-by-customer-last-name' | translate"
+                class="search-input"
+            />
         </div>
         <div class="custom-filters" [class.expanded]="(activePreset$ | async) === 'custom'">
             <form [formGroup]="customFilterForm">
diff --git a/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.ts b/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.ts
index b8a59ba102..4a37a4206c 100644
--- a/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.ts
+++ b/packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.ts
@@ -7,12 +7,13 @@ import {
     DataService,
     GetOrderList,
     LocalStorageService,
+    OrderListOptions,
     ServerConfigService,
     SortOrder,
 } from '@vendure/admin-ui/core';
 import { Order } from '@vendure/common/lib/generated-types';
 import { merge, Observable } from 'rxjs';
-import { debounceTime, distinctUntilChanged, map, skip, takeUntil, tap } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, filter, map, skip, takeUntil, tap } from 'rxjs/operators';
 
 interface OrderFilterConfig {
     active?: boolean;
@@ -34,7 +35,8 @@ interface FilterPreset {
 export class OrderListComponent
     extends BaseListComponent<GetOrderList.Query, GetOrderList.Items>
     implements OnInit {
-    searchTerm = new FormControl('');
+    searchOrderCodeControl = new FormControl('');
+    searchLastNameControl = new FormControl('');
     customFilterForm: FormGroup;
     orderStates = this.serverConfigService.getOrderProcessStates().map(item => item.name);
     filterPresets: FilterPreset[] = [
@@ -91,7 +93,8 @@ export class OrderListComponent
                 this.createQueryOptions(
                     skip,
                     take,
-                    this.searchTerm.value,
+                    this.searchOrderCodeControl.value,
+                    this.searchLastNameControl.value,
                     this.route.snapshot.queryParamMap.get('filter') || 'open',
                 ),
         );
@@ -107,7 +110,14 @@ export class OrderListComponent
             map(qpm => qpm.get('filter') || 'open'),
             distinctUntilChanged(),
         );
-        merge(this.searchTerm.valueChanges.pipe(debounceTime(250)), this.route.queryParamMap)
+        const searchTerms$ = merge(
+            this.searchOrderCodeControl.valueChanges,
+            this.searchLastNameControl.valueChanges,
+        ).pipe(
+            filter(value => 2 < value.length || value.length === 0),
+            debounceTime(250),
+        );
+        merge(searchTerms$, this.route.queryParamMap)
             .pipe(takeUntil(this.destroy$))
             .subscribe(val => {
                 this.refresh();
@@ -150,9 +160,16 @@ export class OrderListComponent
         this.localStorageService.set('orderListLastCustomFilters', customFilters);
     }
 
-    // tslint:disable-next-line:no-shadowed-variable
-    private createQueryOptions(skip: number, take: number, searchTerm: string, activeFilterPreset?: string) {
+    private createQueryOptions(
+        // tslint:disable-next-line:no-shadowed-variable
+        skip: number,
+        take: number,
+        orderCodeSearchTerm: string,
+        customerNameSearchTerm: string,
+        activeFilterPreset?: string,
+    ): { options: OrderListOptions } {
         const filterConfig = this.filterPresets.find(p => p.name === activeFilterPreset);
+        // tslint:disable-next-line:no-shadowed-variable
         const filter: any = {};
         if (filterConfig) {
             if (filterConfig.config.active != null) {
@@ -199,7 +216,10 @@ export class OrderListComponent
                 filter: {
                     ...(filter ?? {}),
                     code: {
-                        contains: searchTerm,
+                        contains: orderCodeSearchTerm,
+                    },
+                    customerLastName: {
+                        contains: customerNameSearchTerm,
                     },
                 },
                 sort: {