@vendure/admin-ui 1.9.0 → 1.9.1

package/fesm2015/vendure-admin-ui-catalog.js

@@ -1420,27 +1420,27 @@ class ProductDetailComponent extends BaseDetailComponent {
     ngOnInit() {
         this.init();
         this.product$ = this.entity$;
-        this.totalItems$ = this.product$.pipe(map(product => product.variantList.totalItems));
-        this.paginationConfig$ = combineLatest(this.totalItems$, this.itemsPerPage$, this.currentPage$).pipe(map(([totalItems, itemsPerPage, currentPage]) => ({
-            totalItems,
-            itemsPerPage,
-            currentPage,
-        })));
-        const variants$ = this.product$.pipe(map(product => product.variantList.items));
-        const filterTerm$ = this.filterInput.valueChanges.pipe(startWith(''), debounceTime(200), shareReplay());
+        const filterTerm$ = this.filterInput.valueChanges.pipe(startWith(''), debounceTime(200), shareReplay(), tap(() => this.currentPage$.next(1)));
         const initialVariants$ = this.product$.pipe(map(p => p.variantList.items));
-        const updatedVariants$ = combineLatest(filterTerm$, this.currentPage$, this.itemsPerPage$).pipe(skipUntil(initialVariants$), skip(1), switchMap(([term, currentPage, itemsPerPage]) => {
+        const variantsList$ = combineLatest(filterTerm$, this.currentPage$, this.itemsPerPage$).pipe(skipUntil(initialVariants$), skip(1), debounceTime(100), switchMap(([term, currentPage, itemsPerPage]) => {
             return this.dataService.product
                 .getProductVariants(Object.assign(Object.assign({ skip: (currentPage - 1) * itemsPerPage, take: itemsPerPage }, (term
                 ? { filter: { name: { contains: term }, sku: { contains: term } } }
                 : {})), { filterOperator: LogicalOperator.OR }), this.id)
-                .mapStream(({ productVariants }) => productVariants.items);
+                .mapStream(({ productVariants }) => productVariants);
         }), shareReplay({ bufferSize: 1, refCount: true }));
+        const updatedVariants$ = variantsList$.pipe(map(result => result.items));
         this.variants$ = merge(initialVariants$, updatedVariants$).pipe(tap(variants => {
             for (const variant of variants) {
                 this.productVariantMap.set(variant.id, variant);
             }
         }));
+        this.totalItems$ = merge(this.product$.pipe(map(product => product.variantList.totalItems)), variantsList$.pipe(map(result => result.totalItems)));
+        this.paginationConfig$ = combineLatest(this.totalItems$, this.itemsPerPage$, this.currentPage$).pipe(map(([totalItems, itemsPerPage, currentPage]) => ({
+            totalItems,
+            itemsPerPage,
+            currentPage,
+        })));
         this.taxCategories$ = this.productDetailService.getTaxCategories().pipe(takeUntil(this.destroy$));
         this.activeTab$ = this.route.paramMap.pipe(map(qpm => qpm.get('tab')));
         combineLatest(updatedVariants$, this.languageCode$)
@@ -4417,7 +4417,7 @@ class ProductVariantsListComponent {
     }
     onAssetChange(variantId, event) {
         this.assetChange.emit(Object.assign({ variantId }, event));
-        const index = this.variants.findIndex(v => v.id === variantId);
+        const index = this.formArray.controls.findIndex(c => c.value.id === variantId);
         this.formArray.at(index).markAsDirty();
     }
     toggleSelectAll() {