@infrab4a/connect-angular 6.0.0-beta.5 → 6.0.0-beta.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/services/catalog/category.service.mjs +4 -1
- package/esm2022/services/catalog/helpers/brand-manager.helper.mjs +9 -3
- package/fesm2022/infrab4a-connect-angular.mjs +10 -1
- package/fesm2022/infrab4a-connect-angular.mjs.map +1 -1
- package/package.json +2 -2
- package/services/catalog/category.service.d.ts +1 -0
|
@@ -22,6 +22,9 @@ export class CategoryService {
|
|
|
22
22
|
.find({ filters: { brandCategory: true, shop: options?.shop || this.shop }, orderBy: { name: 'asc' } }, optionsCache)
|
|
23
23
|
.then(({ data }) => data.filter((category) => brands.includes(category.conditions.brand)));
|
|
24
24
|
}
|
|
25
|
+
async getMenuBrands() {
|
|
26
|
+
return this.categoryFacade.categoryRepository.getBrandsWithProducts();
|
|
27
|
+
}
|
|
25
28
|
async fetchFilterOptions(category, optionsCache) {
|
|
26
29
|
return await this.categoryFacade.categoryFilterRepository
|
|
27
30
|
.find({ filters: { categoryId: +category.id } }, optionsCache)
|
|
@@ -36,4 +39,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
|
|
|
36
39
|
type: Inject,
|
|
37
40
|
args: [DEFAULT_SHOP]
|
|
38
41
|
}] }] });
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2F0ZWdvcnkuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Nvbm5lY3QtYW5ndWxhci9zcmMvc2VydmljZXMvY2F0YWxvZy9jYXRlZ29yeS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQ2xELE9BQU8sRUFBMkQsS0FBSyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFFbEcsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUUzQyxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxXQUFXLENBQUE7Ozs7QUFRMUUsTUFBTSxPQUFPLGVBQWU7SUFDMUIsWUFDbUIsY0FBd0MsRUFDeEMsY0FBb0MsRUFDZCxJQUFXO1FBRmpDLG1CQUFjLEdBQWQsY0FBYyxDQUEwQjtRQUN4QyxtQkFBYyxHQUFkLGNBQWMsQ0FBc0I7UUFDZCxTQUFJLEdBQUosSUFBSSxDQUFPO0lBQ2pELENBQUM7SUFFSixLQUFLLENBQUMsV0FBVyxDQUNmLFFBQWtCLEVBQ2xCLE9BQTRCLEVBQzVCLFlBQWlEO1FBRWpELE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxpQkFBaUI7YUFDdkQsV0FBVyxDQUNWO1lBQ0UsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyx3QkFBd0IsQ0FBQyw0QkFBNEIsQ0FBQyxRQUFRLENBQUM7WUFDbEcsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDO1NBQ2xCLEVBQ0QsSUFBSSxFQUNKLFlBQVksQ0FDYjthQUNBLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUNqQixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsR0FBRyxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQ2hILENBQUE7UUFFSCxPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsa0JBQWtCO2FBQzFDLElBQUksQ0FDSCxFQUFFLE9BQU8sRUFBRSxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxJQUFJLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUNoRyxZQUFZLENBQ2I7YUFDQSxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlGLENBQUM7SUFFRCxLQUFLLENBQUMsYUFBYTtRQUNqQixPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsa0JBQWtCLENBQUMscUJBQXFCLEVBQUUsQ0FBQTtJQUN2RSxDQUFDO0lBRUQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLFFBQWtCLEVBQUUsWUFBaUQ7UUFDNUYsT0FBTyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsd0JBQXdCO2FBQ3RELElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxFQUFFLFVBQVUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLFlBQVksQ0FBQzthQUM3RCxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUM1RSxDQUFDOzhHQXpDVSxlQUFlLDhGQUloQixZQUFZO2tIQUpYLGVBQWU7OzJGQUFmLGVBQWU7a0JBRDNCLFVBQVU7OzBCQUtOLE1BQU07MkJBQUMsWUFBWSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXHJcbmltcG9ydCB7IENhdGVnb3J5LCBGaWx0ZXIsIFByb2R1Y3RHZW5kZXIsIFJlcG9zaXRvcnlDYWNoZU9wdGlvbnMsIFNob3BzIH0gZnJvbSAnQGluZnJhYjRhL2Nvbm5lY3QnXHJcblxyXG5pbXBvcnQgeyBERUZBVUxUX1NIT1AgfSBmcm9tICcuLi8uLi9jb25zdHMnXHJcblxyXG5pbXBvcnQgeyBDYXRlZ29yeVJlcG9zaXRvcnlGYWNhZGUsIFByb2R1Y3RDYXRhbG9nRmFjYWRlIH0gZnJvbSAnLi9mYWNhZGVzJ1xyXG5cclxudHlwZSBGZXRjaEJyYW5kc09wdGlvbnMgPSB7XHJcbiAgbWFpbkdlbmRlcj86IFByb2R1Y3RHZW5kZXJcclxuICBzaG9wPzogU2hvcHNcclxufVxyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgQ2F0ZWdvcnlTZXJ2aWNlIHtcclxuICBjb25zdHJ1Y3RvcihcclxuICAgIHByaXZhdGUgcmVhZG9ubHkgY2F0ZWdvcnlGYWNhZGU6IENhdGVnb3J5UmVwb3NpdG9yeUZhY2FkZSxcclxuICAgIHByaXZhdGUgcmVhZG9ubHkgcHJvZHVjdENhdGFsb2c6IFByb2R1Y3RDYXRhbG9nRmFjYWRlLFxyXG4gICAgQEluamVjdChERUZBVUxUX1NIT1ApIHByaXZhdGUgcmVhZG9ubHkgc2hvcDogU2hvcHMsXHJcbiAgKSB7fVxyXG5cclxuICBhc3luYyBmZXRjaEJyYW5kcyhcclxuICAgIGNhdGVnb3J5OiBDYXRlZ29yeSxcclxuICAgIG9wdGlvbnM/OiBGZXRjaEJyYW5kc09wdGlvbnMsXHJcbiAgICBvcHRpb25zQ2FjaGU/OiB7IGNhY2hlPzogUmVwb3NpdG9yeUNhY2hlT3B0aW9ucyB9LFxyXG4gICk6IFByb21pc2U8Q2F0ZWdvcnlbXT4ge1xyXG4gICAgY29uc3QgYnJhbmRzID0gYXdhaXQgdGhpcy5wcm9kdWN0Q2F0YWxvZy5wcm9kdWN0UmVwb3NpdG9yeVxyXG4gICAgICAuZmluZENhdGFsb2coXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgZmlsdGVyczogYXdhaXQgdGhpcy5wcm9kdWN0Q2F0YWxvZy5jYXRlZ29yeVN0cnVjdHVyZUFkYXB0ZXIuYnVpbGRQcm9kdWN0RmlsdGVyQnlDYXRlZ29yeShjYXRlZ29yeSksXHJcbiAgICAgICAgICBmaWVsZHM6IFsnYnJhbmQnXSxcclxuICAgICAgICB9LFxyXG4gICAgICAgIG51bGwsXHJcbiAgICAgICAgb3B0aW9uc0NhY2hlLFxyXG4gICAgICApXHJcbiAgICAgIC50aGVuKCh7IGRhdGEgfSkgPT5cclxuICAgICAgICBPYmplY3Qua2V5cyhkYXRhLm1hcCgocHJvZHVjdCkgPT4gcHJvZHVjdC5icmFuZCkucmVkdWNlKChicmFuZHMsIGJyYW5kKSA9PiAoeyAuLi5icmFuZHMsIFticmFuZF06IHRydWUgfSksIHt9KSksXHJcbiAgICAgIClcclxuXHJcbiAgICByZXR1cm4gdGhpcy5jYXRlZ29yeUZhY2FkZS5jYXRlZ29yeVJlcG9zaXRvcnlcclxuICAgICAgLmZpbmQoXHJcbiAgICAgICAgeyBmaWx0ZXJzOiB7IGJyYW5kQ2F0ZWdvcnk6IHRydWUsIHNob3A6IG9wdGlvbnM/LnNob3AgfHwgdGhpcy5zaG9wIH0sIG9yZGVyQnk6IHsgbmFtZTogJ2FzYycgfSB9LFxyXG4gICAgICAgIG9wdGlvbnNDYWNoZSxcclxuICAgICAgKVxyXG4gICAgICAudGhlbigoeyBkYXRhIH0pID0+IGRhdGEuZmlsdGVyKChjYXRlZ29yeSkgPT4gYnJhbmRzLmluY2x1ZGVzKGNhdGVnb3J5LmNvbmRpdGlvbnMuYnJhbmQpKSlcclxuICB9XHJcblxyXG4gIGFzeW5jIGdldE1lbnVCcmFuZHMoKSB7XHJcbiAgICByZXR1cm4gdGhpcy5jYXRlZ29yeUZhY2FkZS5jYXRlZ29yeVJlcG9zaXRvcnkuZ2V0QnJhbmRzV2l0aFByb2R1Y3RzKClcclxuICB9XHJcblxyXG4gIGFzeW5jIGZldGNoRmlsdGVyT3B0aW9ucyhjYXRlZ29yeTogQ2F0ZWdvcnksIG9wdGlvbnNDYWNoZT86IHsgY2FjaGU/OiBSZXBvc2l0b3J5Q2FjaGVPcHRpb25zIH0pOiBQcm9taXNlPEZpbHRlcltdPiB7XHJcbiAgICByZXR1cm4gYXdhaXQgdGhpcy5jYXRlZ29yeUZhY2FkZS5jYXRlZ29yeUZpbHRlclJlcG9zaXRvcnlcclxuICAgICAgLmZpbmQoeyBmaWx0ZXJzOiB7IGNhdGVnb3J5SWQ6ICtjYXRlZ29yeS5pZCB9IH0sIG9wdGlvbnNDYWNoZSlcclxuICAgICAgLnRoZW4oKHsgZGF0YSB9KSA9PiBkYXRhLm1hcCgoY2F0ZWdvcnlGaWx0ZXIpID0+IGNhdGVnb3J5RmlsdGVyLmZpbHRlcikpXHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import {
|
|
2
|
+
import { isEmpty, Where } from '@infrab4a/connect';
|
|
3
3
|
import { ProductCatalogFacade } from '../facades';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../facades";
|
|
@@ -14,7 +14,13 @@ export class BrandManagerHelper {
|
|
|
14
14
|
if (isEmpty(brands) && options.filters) {
|
|
15
15
|
delete options.filters.brands;
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
if (!this.brandsList[indexKey] && !brands) {
|
|
18
|
+
this.brandsList[indexKey] = await this.fetchBrandsOnly(options);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
this.brandsList[indexKey] = this.brandsList[indexKey] || brands;
|
|
22
|
+
}
|
|
23
|
+
// this.brandsList[indexKey] = this.brandsList[indexKey] || brands || (await this.fetchBrandsOnly(options))
|
|
18
24
|
this.brandsList[indexKey] = this.brandsList[indexKey].filter(Boolean);
|
|
19
25
|
if (options.filters) {
|
|
20
26
|
options.filters = {
|
|
@@ -54,4 +60,4 @@ export class BrandManagerHelper {
|
|
|
54
60
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: BrandManagerHelper, decorators: [{
|
|
55
61
|
type: Injectable
|
|
56
62
|
}], ctorParameters: () => [{ type: i1.ProductCatalogFacade }] });
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJhbmQtbWFuYWdlci5oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL3NlcnZpY2VzL2NhdGFsb2cvaGVscGVycy9icmFuZC1tYW5hZ2VyLmhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQzFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFHbEQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sWUFBWSxDQUFBOzs7QUFHakQsTUFBTSxPQUFPLGtCQUFrQjtJQUc3QixZQUE2QixjQUFvQztRQUFwQyxtQkFBYyxHQUFkLGNBQWMsQ0FBc0I7UUFGekQsZUFBVSxHQUE2QixFQUFFLENBQUE7SUFFbUIsQ0FBQztJQUVyRSxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQTRCLEVBQUUsTUFBZ0I7UUFDaEUsTUFBTSxZQUFZLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUE7UUFDNUMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBRS9DLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLEVBQUU7WUFDdEMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQTtTQUM5QjtRQUVELElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ3pDLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1NBQ2hFO2FBQU07WUFDTCxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLElBQUksTUFBTSxDQUFBO1NBQ2hFO1FBRUQsMkdBQTJHO1FBQzNHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUE7UUFFckUsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFO1lBQ25CLE9BQU8sQ0FBQyxPQUFPLEdBQUc7Z0JBQ2hCLEdBQUcsT0FBTyxDQUFDLE9BQU87Z0JBQ2xCLE1BQU0sRUFBRSxZQUFZO2FBQ3JCLENBQUE7U0FDRjtJQUNILENBQUM7SUFFRCxhQUFhLENBQUMsUUFBZ0I7UUFDNUIsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ2xDLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxPQUE0QjtRQUMzQyxJQUFJLE9BQU8sQ0FBQyxRQUFRO1lBQUUsT0FBTyxZQUFZLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFLENBQUE7UUFFOUQsSUFBSSxPQUFPLENBQUMsSUFBSTtZQUFFLE9BQU8sUUFBUSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7UUFFL0MsSUFBSSxPQUFPLENBQUMsT0FBTztZQUFFLE9BQU8sV0FBVyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFBO1FBRWxFLE9BQU8sRUFBRSxDQUFBO0lBQ1gsQ0FBQztJQUVPLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBNEI7UUFDeEQsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLGlCQUFpQjthQUN6QyxXQUFXLENBQ1Y7WUFDRSxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDZCxPQUFPLEVBQUU7Z0JBQ1AsU0FBUyxFQUFFLEVBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRTthQUNuRDtZQUNELE9BQU8sRUFBRTtnQkFDUCxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUM7YUFDcEI7U0FDRixFQUNELE9BQU8sQ0FBQyxVQUFVLENBQ25CO2FBQ0EsSUFBSSxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzVDLENBQUM7OEdBM0RVLGtCQUFrQjtrSEFBbEIsa0JBQWtCOzsyRkFBbEIsa0JBQWtCO2tCQUQ5QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXHJcbmltcG9ydCB7IGlzRW1wdHksIFdoZXJlIH0gZnJvbSAnQGluZnJhYjRhL2Nvbm5lY3QnXHJcblxyXG5pbXBvcnQgeyBDYXRhbG9nU2VhcmNoUGFyYW1zIH0gZnJvbSAnLi4vLi4vLi4vaW50ZXJmYWNlcydcclxuaW1wb3J0IHsgUHJvZHVjdENhdGFsb2dGYWNhZGUgfSBmcm9tICcuLi9mYWNhZGVzJ1xyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgQnJhbmRNYW5hZ2VySGVscGVyIHtcclxuICBwcml2YXRlIGJyYW5kc0xpc3Q6IFJlY29yZDxzdHJpbmcsIHN0cmluZ1tdPiA9IHt9XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgcHJvZHVjdENhdGFsb2c6IFByb2R1Y3RDYXRhbG9nRmFjYWRlKSB7fVxyXG5cclxuICBhc3luYyBzZXRCcmFuZHNMaXN0KG9wdGlvbnM6IENhdGFsb2dTZWFyY2hQYXJhbXMsIGJyYW5kczogc3RyaW5nW10pOiBQcm9taXNlPHZvaWQ+IHtcclxuICAgIGNvbnN0IGZpbHRlckJyYW5kcyA9IG9wdGlvbnMuZmlsdGVycz8uYnJhbmRzXHJcbiAgICBjb25zdCBpbmRleEtleSA9IHRoaXMuYnVpbGRJbmRleEJyYW5kcyhvcHRpb25zKVxyXG5cclxuICAgIGlmIChpc0VtcHR5KGJyYW5kcykgJiYgb3B0aW9ucy5maWx0ZXJzKSB7XHJcbiAgICAgIGRlbGV0ZSBvcHRpb25zLmZpbHRlcnMuYnJhbmRzXHJcbiAgICB9XHJcblxyXG4gICAgaWYgKCF0aGlzLmJyYW5kc0xpc3RbaW5kZXhLZXldICYmICFicmFuZHMpIHtcclxuICAgICAgdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSA9IGF3YWl0IHRoaXMuZmV0Y2hCcmFuZHNPbmx5KG9wdGlvbnMpXHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICB0aGlzLmJyYW5kc0xpc3RbaW5kZXhLZXldID0gdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSB8fCBicmFuZHNcclxuICAgIH1cclxuXHJcbiAgICAvLyB0aGlzLmJyYW5kc0xpc3RbaW5kZXhLZXldID0gdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSB8fCBicmFuZHMgfHwgKGF3YWl0IHRoaXMuZmV0Y2hCcmFuZHNPbmx5KG9wdGlvbnMpKVxyXG4gICAgdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSA9IHRoaXMuYnJhbmRzTGlzdFtpbmRleEtleV0uZmlsdGVyKEJvb2xlYW4pXHJcblxyXG4gICAgaWYgKG9wdGlvbnMuZmlsdGVycykge1xyXG4gICAgICBvcHRpb25zLmZpbHRlcnMgPSB7XHJcbiAgICAgICAgLi4ub3B0aW9ucy5maWx0ZXJzLFxyXG4gICAgICAgIGJyYW5kczogZmlsdGVyQnJhbmRzLFxyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgfVxyXG5cclxuICBnZXRCcmFuZHNMaXN0KGluZGV4S2V5OiBzdHJpbmcpOiBzdHJpbmdbXSB7XHJcbiAgICByZXR1cm4gdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XVxyXG4gIH1cclxuXHJcbiAgYnVpbGRJbmRleEJyYW5kcyhvcHRpb25zOiBDYXRhbG9nU2VhcmNoUGFyYW1zKTogc3RyaW5nIHtcclxuICAgIGlmIChvcHRpb25zLmNhdGVnb3J5KSByZXR1cm4gYGNhdGVnb3J5LSR7b3B0aW9ucy5jYXRlZ29yeS5pZH1gXHJcblxyXG4gICAgaWYgKG9wdGlvbnMudGVybSkgcmV0dXJuIGB0ZXJtLSR7b3B0aW9ucy50ZXJtfWBcclxuXHJcbiAgICBpZiAob3B0aW9ucy5wcm9maWxlKSByZXR1cm4gYHByb2ZpbGUtJHtvcHRpb25zLnByb2ZpbGUuam9pbignLCcpfWBcclxuXHJcbiAgICByZXR1cm4gJydcclxuICB9XHJcblxyXG4gIHByaXZhdGUgYXN5bmMgZmV0Y2hCcmFuZHNPbmx5KG9wdGlvbnM6IENhdGFsb2dTZWFyY2hQYXJhbXMpOiBQcm9taXNlPHN0cmluZ1tdPiB7XHJcbiAgICByZXR1cm4gdGhpcy5wcm9kdWN0Q2F0YWxvZy5wcm9kdWN0UmVwb3NpdG9yeVxyXG4gICAgICAuZmluZENhdGFsb2coXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgZmllbGRzOiBbJ2lkJ10sXHJcbiAgICAgICAgICBmaWx0ZXJzOiB7XHJcbiAgICAgICAgICAgIHB1Ymxpc2hlZDogeyBvcGVyYXRvcjogV2hlcmUuRVFVQUxTLCB2YWx1ZTogdHJ1ZSB9LFxyXG4gICAgICAgICAgfSxcclxuICAgICAgICAgIG9wdGlvbnM6IHtcclxuICAgICAgICAgICAgZGlzdGluY3Q6IFsnYnJhbmQnXSxcclxuICAgICAgICAgIH0sXHJcbiAgICAgICAgfSxcclxuICAgICAgICBvcHRpb25zLm1haW5HZW5kZXIsXHJcbiAgICAgIClcclxuICAgICAgLnRoZW4oKHJlc3VsdCkgPT4gcmVzdWx0LmRpc3RpbmN0LmJyYW5kKVxyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -1831,6 +1831,9 @@ class CategoryService {
|
|
|
1831
1831
|
.find({ filters: { brandCategory: true, shop: options?.shop || this.shop }, orderBy: { name: 'asc' } }, optionsCache)
|
|
1832
1832
|
.then(({ data }) => data.filter((category) => brands.includes(category.conditions.brand)));
|
|
1833
1833
|
}
|
|
1834
|
+
async getMenuBrands() {
|
|
1835
|
+
return this.categoryFacade.categoryRepository.getBrandsWithProducts();
|
|
1836
|
+
}
|
|
1834
1837
|
async fetchFilterOptions(category, optionsCache) {
|
|
1835
1838
|
return await this.categoryFacade.categoryFilterRepository
|
|
1836
1839
|
.find({ filters: { categoryId: +category.id } }, optionsCache)
|
|
@@ -1895,7 +1898,13 @@ class BrandManagerHelper {
|
|
|
1895
1898
|
if (isEmpty(brands) && options.filters) {
|
|
1896
1899
|
delete options.filters.brands;
|
|
1897
1900
|
}
|
|
1898
|
-
|
|
1901
|
+
if (!this.brandsList[indexKey] && !brands) {
|
|
1902
|
+
this.brandsList[indexKey] = await this.fetchBrandsOnly(options);
|
|
1903
|
+
}
|
|
1904
|
+
else {
|
|
1905
|
+
this.brandsList[indexKey] = this.brandsList[indexKey] || brands;
|
|
1906
|
+
}
|
|
1907
|
+
// this.brandsList[indexKey] = this.brandsList[indexKey] || brands || (await this.fetchBrandsOnly(options))
|
|
1899
1908
|
this.brandsList[indexKey] = this.brandsList[indexKey].filter(Boolean);
|
|
1900
1909
|
if (options.filters) {
|
|
1901
1910
|
options.filters = {
|