Browse Source

fix(admin-ui): Fix error when toggling product list grouping

Fixes #1384
Michael Bromley 4 years ago
parent
commit
1427399eda

+ 16 - 6
packages/admin-ui/src/lib/catalog/src/components/product-list/product-list.component.html

@@ -8,10 +8,17 @@
                 (facetValueChange)="setFacetValueIds($event)"
             ></vdr-product-search-input>
             <vdr-dropdown class="search-settings-menu mr3">
-                <button type="button"
-                        class="icon-button search-index-button"
-                        [title]="(pendingSearchIndexUpdates ? 'catalog.pending-search-index-updates' : 'catalog.search-index-controls') | translate "
-                        vdrDropdownTrigger>
+                <button
+                    type="button"
+                    class="icon-button search-index-button"
+                    [title]="
+                        (pendingSearchIndexUpdates
+                            ? 'catalog.pending-search-index-updates'
+                            : 'catalog.search-index-controls'
+                        ) | translate
+                    "
+                    vdrDropdownTrigger
+                >
                     <clr-icon shape="cog"></clr-icon>
                     <vdr-status-badge *ngIf="pendingSearchIndexUpdates" type="warning"> </vdr-status-badge>
                 </button>
@@ -26,7 +33,10 @@
                             [disabled]="!(['UpdateCatalog', 'UpdateProduct'] | hasPermission)"
                         >
                             <vdr-status-badge type="warning"> </vdr-status-badge>
-                            {{ 'catalog.run-pending-search-index-updates' | translate: { count: pendingSearchIndexUpdates } }}
+                            {{
+                                'catalog.run-pending-search-index-updates'
+                                    | translate: { count: pendingSearchIndexUpdates }
+                            }}
                         </button>
                         <div class="dropdown-divider"></div>
                     </ng-container>
@@ -43,7 +53,7 @@
         </div>
         <div class="flex wrap">
             <clr-checkbox-wrapper class="mt2">
-                <input type="checkbox" clrCheckbox [(ngModel)]="groupByProduct" />
+                <input type="checkbox" clrCheckbox [(ngModel)]="groupByProduct" (ngModelChange)="refresh()" />
                 <label>{{ 'catalog.group-by-product' | translate }}</label>
             </clr-checkbox-wrapper>
             <vdr-language-selector

+ 1 - 1
packages/admin-ui/src/lib/core/src/shared/pipes/asset-preview.pipe.ts

@@ -24,7 +24,7 @@ export class AssetPreviewPipe implements PipeTransform {
         if (!asset) {
             return '';
         }
-        if (!asset.preview || typeof asset.preview !== 'string') {
+        if (asset.preview == null || typeof asset.preview !== 'string') {
             throw new Error(`Expected an Asset, got ${JSON.stringify(asset)}`);
         }
         const fp = asset.focalPoint ? `&fpx=${asset.focalPoint.x}&fpy=${asset.focalPoint.y}` : '';