Browse Source

fix(admin-ui): Refetch orders list on channel change

Michael Bromley 5 years ago
parent
commit
ffa5615407

+ 4 - 8
packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.ts

@@ -1,12 +1,11 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import { merge } from 'rxjs';
-import { debounceTime, takeUntil } from 'rxjs/operators';
-
 import { BaseListComponent } from '@vendure/admin-ui/core';
 import { GetOrderList, SortOrder } from '@vendure/admin-ui/core';
 import { DataService } from '@vendure/admin-ui/core';
+import { merge } from 'rxjs';
+import { debounceTime, takeUntil } from 'rxjs/operators';
 
 @Component({
     selector: 'vdr-order-list',
@@ -22,7 +21,7 @@ export class OrderListComponent extends BaseListComponent<GetOrderList.Query, Ge
     constructor(private dataService: DataService, router: Router, route: ActivatedRoute) {
         super(router, route);
         super.setQueryFn(
-            (...args: any[]) => this.dataService.order.getOrders(...args),
+            (...args: any[]) => this.dataService.order.getOrders(...args).refetchOnChannelChange(),
             data => data.orders,
             (skip, take) => {
                 const stateFilter = this.stateFilter.value;
@@ -49,10 +48,7 @@ export class OrderListComponent extends BaseListComponent<GetOrderList.Query, Ge
     ngOnInit() {
         super.ngOnInit();
         merge(this.searchTerm.valueChanges, this.stateFilter.valueChanges)
-            .pipe(
-                debounceTime(250),
-                takeUntil(this.destroy$),
-            )
+            .pipe(debounceTime(250), takeUntil(this.destroy$))
             .subscribe(() => this.refresh());
     }
 }