@infrab4a/connect-angular 5.5.0-beta.12 → 5.5.0-beta.14

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.
@@ -14,13 +14,7 @@ export class BrandManagerHelper {
14
14
  if (isEmpty(brands) && options.filters) {
15
15
  delete options.filters.brands;
16
16
  }
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))
17
+ this.brandsList[indexKey] = this.brandsList[indexKey] || brands || (await this.fetchBrandsOnly(options));
24
18
  this.brandsList[indexKey] = this.brandsList[indexKey].filter(Boolean);
25
19
  if (options.filters) {
26
20
  options.filters = {
@@ -42,10 +36,15 @@ export class BrandManagerHelper {
42
36
  return '';
43
37
  }
44
38
  async fetchBrandsOnly(options) {
39
+ let filters = {};
40
+ if (options.category) {
41
+ filters = await this.productCatalog.categoryStructureAdapter.buildProductFilterByCategory(options.category);
42
+ }
45
43
  return this.productCatalog.productCatalogRepository
46
44
  .findCatalog({
47
45
  fields: ['id'],
48
46
  filters: {
47
+ ...filters,
49
48
  published: { operator: Where.EQUALS, value: true },
50
49
  },
51
50
  options: {
@@ -60,4 +59,4 @@ BrandManagerHelper.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", v
60
59
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: BrandManagerHelper, decorators: [{
61
60
  type: Injectable
62
61
  }], ctorParameters: function () { return [{ type: i1.ProductCatalogFacade }]; } });
63
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJhbmQtbWFuYWdlci5oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL3NlcnZpY2VzL2NhdGFsb2cvaGVscGVycy9icmFuZC1tYW5hZ2VyLmhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQzFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFHbEQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sWUFBWSxDQUFBOzs7QUFHakQsTUFBTSxPQUFPLGtCQUFrQjtJQUc3QixZQUE2QixjQUFvQztRQUFwQyxtQkFBYyxHQUFkLGNBQWMsQ0FBc0I7UUFGekQsZUFBVSxHQUE2QixFQUFFLENBQUE7SUFFbUIsQ0FBQztJQUVyRSxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQTRCLEVBQUUsTUFBZ0I7UUFDaEUsTUFBTSxZQUFZLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUE7UUFDNUMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBRS9DLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLEVBQUU7WUFDdEMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQTtTQUM5QjtRQUVELElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ3pDLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1NBQ2hFO2FBQU07WUFDTCxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLElBQUksTUFBTSxDQUFBO1NBQ2hFO1FBRUQsMkdBQTJHO1FBQzNHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUE7UUFFckUsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFO1lBQ25CLE9BQU8sQ0FBQyxPQUFPLEdBQUc7Z0JBQ2hCLEdBQUcsT0FBTyxDQUFDLE9BQU87Z0JBQ2xCLE1BQU0sRUFBRSxZQUFZO2FBQ3JCLENBQUE7U0FDRjtJQUNILENBQUM7SUFFRCxhQUFhLENBQUMsUUFBZ0I7UUFDNUIsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ2xDLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxPQUE0QjtRQUMzQyxJQUFJLE9BQU8sQ0FBQyxRQUFRO1lBQUUsT0FBTyxZQUFZLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFLENBQUE7UUFFOUQsSUFBSSxPQUFPLENBQUMsSUFBSTtZQUFFLE9BQU8sUUFBUSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7UUFFL0MsSUFBSSxPQUFPLENBQUMsT0FBTztZQUFFLE9BQU8sV0FBVyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFBO1FBRWxFLE9BQU8sRUFBRSxDQUFBO0lBQ1gsQ0FBQztJQUVPLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBNEI7UUFDeEQsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLHdCQUF3QjthQUNoRCxXQUFXLENBQ1Y7WUFDRSxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDZCxPQUFPLEVBQUU7Z0JBQ1AsU0FBUyxFQUFFLEVBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRTthQUNuRDtZQUNELE9BQU8sRUFBRTtnQkFDUCxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUM7YUFDcEI7U0FDRixFQUNELE9BQU8sQ0FBQyxVQUFVLENBQ25CO2FBQ0EsSUFBSSxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzVDLENBQUM7OytHQTNEVSxrQkFBa0I7bUhBQWxCLGtCQUFrQjsyRkFBbEIsa0JBQWtCO2tCQUQ5QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXHJcbmltcG9ydCB7IGlzRW1wdHksIFdoZXJlIH0gZnJvbSAnQGluZnJhYjRhL2Nvbm5lY3QnXHJcblxyXG5pbXBvcnQgeyBDYXRhbG9nU2VhcmNoUGFyYW1zIH0gZnJvbSAnLi4vLi4vLi4vaW50ZXJmYWNlcydcclxuaW1wb3J0IHsgUHJvZHVjdENhdGFsb2dGYWNhZGUgfSBmcm9tICcuLi9mYWNhZGVzJ1xyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgQnJhbmRNYW5hZ2VySGVscGVyIHtcclxuICBwcml2YXRlIGJyYW5kc0xpc3Q6IFJlY29yZDxzdHJpbmcsIHN0cmluZ1tdPiA9IHt9XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgcHJvZHVjdENhdGFsb2c6IFByb2R1Y3RDYXRhbG9nRmFjYWRlKSB7fVxyXG5cclxuICBhc3luYyBzZXRCcmFuZHNMaXN0KG9wdGlvbnM6IENhdGFsb2dTZWFyY2hQYXJhbXMsIGJyYW5kczogc3RyaW5nW10pOiBQcm9taXNlPHZvaWQ+IHtcclxuICAgIGNvbnN0IGZpbHRlckJyYW5kcyA9IG9wdGlvbnMuZmlsdGVycz8uYnJhbmRzXHJcbiAgICBjb25zdCBpbmRleEtleSA9IHRoaXMuYnVpbGRJbmRleEJyYW5kcyhvcHRpb25zKVxyXG5cclxuICAgIGlmIChpc0VtcHR5KGJyYW5kcykgJiYgb3B0aW9ucy5maWx0ZXJzKSB7XHJcbiAgICAgIGRlbGV0ZSBvcHRpb25zLmZpbHRlcnMuYnJhbmRzXHJcbiAgICB9XHJcblxyXG4gICAgaWYgKCF0aGlzLmJyYW5kc0xpc3RbaW5kZXhLZXldICYmICFicmFuZHMpIHtcclxuICAgICAgdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSA9IGF3YWl0IHRoaXMuZmV0Y2hCcmFuZHNPbmx5KG9wdGlvbnMpXHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICB0aGlzLmJyYW5kc0xpc3RbaW5kZXhLZXldID0gdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSB8fCBicmFuZHNcclxuICAgIH1cclxuXHJcbiAgICAvLyB0aGlzLmJyYW5kc0xpc3RbaW5kZXhLZXldID0gdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSB8fCBicmFuZHMgfHwgKGF3YWl0IHRoaXMuZmV0Y2hCcmFuZHNPbmx5KG9wdGlvbnMpKVxyXG4gICAgdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSA9IHRoaXMuYnJhbmRzTGlzdFtpbmRleEtleV0uZmlsdGVyKEJvb2xlYW4pXHJcblxyXG4gICAgaWYgKG9wdGlvbnMuZmlsdGVycykge1xyXG4gICAgICBvcHRpb25zLmZpbHRlcnMgPSB7XHJcbiAgICAgICAgLi4ub3B0aW9ucy5maWx0ZXJzLFxyXG4gICAgICAgIGJyYW5kczogZmlsdGVyQnJhbmRzLFxyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgfVxyXG5cclxuICBnZXRCcmFuZHNMaXN0KGluZGV4S2V5OiBzdHJpbmcpOiBzdHJpbmdbXSB7XHJcbiAgICByZXR1cm4gdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XVxyXG4gIH1cclxuXHJcbiAgYnVpbGRJbmRleEJyYW5kcyhvcHRpb25zOiBDYXRhbG9nU2VhcmNoUGFyYW1zKTogc3RyaW5nIHtcclxuICAgIGlmIChvcHRpb25zLmNhdGVnb3J5KSByZXR1cm4gYGNhdGVnb3J5LSR7b3B0aW9ucy5jYXRlZ29yeS5pZH1gXHJcblxyXG4gICAgaWYgKG9wdGlvbnMudGVybSkgcmV0dXJuIGB0ZXJtLSR7b3B0aW9ucy50ZXJtfWBcclxuXHJcbiAgICBpZiAob3B0aW9ucy5wcm9maWxlKSByZXR1cm4gYHByb2ZpbGUtJHtvcHRpb25zLnByb2ZpbGUuam9pbignLCcpfWBcclxuXHJcbiAgICByZXR1cm4gJydcclxuICB9XHJcblxyXG4gIHByaXZhdGUgYXN5bmMgZmV0Y2hCcmFuZHNPbmx5KG9wdGlvbnM6IENhdGFsb2dTZWFyY2hQYXJhbXMpOiBQcm9taXNlPHN0cmluZ1tdPiB7XHJcbiAgICByZXR1cm4gdGhpcy5wcm9kdWN0Q2F0YWxvZy5wcm9kdWN0Q2F0YWxvZ1JlcG9zaXRvcnlcclxuICAgICAgLmZpbmRDYXRhbG9nKFxyXG4gICAgICAgIHtcclxuICAgICAgICAgIGZpZWxkczogWydpZCddLFxyXG4gICAgICAgICAgZmlsdGVyczoge1xyXG4gICAgICAgICAgICBwdWJsaXNoZWQ6IHsgb3BlcmF0b3I6IFdoZXJlLkVRVUFMUywgdmFsdWU6IHRydWUgfSxcclxuICAgICAgICAgIH0sXHJcbiAgICAgICAgICBvcHRpb25zOiB7XHJcbiAgICAgICAgICAgIGRpc3RpbmN0OiBbJ2JyYW5kJ10sXHJcbiAgICAgICAgICB9LFxyXG4gICAgICAgIH0sXHJcbiAgICAgICAgb3B0aW9ucy5tYWluR2VuZGVyLFxyXG4gICAgICApXHJcbiAgICAgIC50aGVuKChyZXN1bHQpID0+IHJlc3VsdC5kaXN0aW5jdC5icmFuZClcclxuICB9XHJcbn1cclxuIl19
62
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJhbmQtbWFuYWdlci5oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL3NlcnZpY2VzL2NhdGFsb2cvaGVscGVycy9icmFuZC1tYW5hZ2VyLmhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQzFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFHbEQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sWUFBWSxDQUFBOzs7QUFHakQsTUFBTSxPQUFPLGtCQUFrQjtJQUc3QixZQUE2QixjQUFvQztRQUFwQyxtQkFBYyxHQUFkLGNBQWMsQ0FBc0I7UUFGekQsZUFBVSxHQUE2QixFQUFFLENBQUE7SUFFbUIsQ0FBQztJQUVyRSxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQTRCLEVBQUUsTUFBZ0I7UUFDaEUsTUFBTSxZQUFZLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUE7UUFDNUMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBRS9DLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLEVBQUU7WUFDdEMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQTtTQUM5QjtRQUVELElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsSUFBSSxNQUFNLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtRQUN4RyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBRXJFLElBQUksT0FBTyxDQUFDLE9BQU8sRUFBRTtZQUNuQixPQUFPLENBQUMsT0FBTyxHQUFHO2dCQUNoQixHQUFHLE9BQU8sQ0FBQyxPQUFPO2dCQUNsQixNQUFNLEVBQUUsWUFBWTthQUNyQixDQUFBO1NBQ0Y7SUFDSCxDQUFDO0lBRUQsYUFBYSxDQUFDLFFBQWdCO1FBQzVCLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUNsQyxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsT0FBNEI7UUFDM0MsSUFBSSxPQUFPLENBQUMsUUFBUTtZQUFFLE9BQU8sWUFBWSxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFBO1FBRTlELElBQUksT0FBTyxDQUFDLElBQUk7WUFBRSxPQUFPLFFBQVEsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFBO1FBRS9DLElBQUksT0FBTyxDQUFDLE9BQU87WUFBRSxPQUFPLFdBQVcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQTtRQUVsRSxPQUFPLEVBQUUsQ0FBQTtJQUNYLENBQUM7SUFFTyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQTRCO1FBQ3hELElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUVoQixJQUFJLE9BQU8sQ0FBQyxRQUFRLEVBQUU7WUFDcEIsT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyx3QkFBd0IsQ0FBQyw0QkFBNEIsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7U0FDNUc7UUFFRCxPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsd0JBQXdCO2FBQ2hELFdBQVcsQ0FDVjtZQUNFLE1BQU0sRUFBRSxDQUFDLElBQUksQ0FBQztZQUNkLE9BQU8sRUFBRTtnQkFDUCxHQUFHLE9BQU87Z0JBQ1YsU0FBUyxFQUFFLEVBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRTthQUNuRDtZQUNELE9BQU8sRUFBRTtnQkFDUCxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUM7YUFDcEI7U0FDRixFQUNELE9BQU8sQ0FBQyxVQUFVLENBQ25CO2FBQ0EsSUFBSSxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzVDLENBQUM7OytHQTVEVSxrQkFBa0I7bUhBQWxCLGtCQUFrQjsyRkFBbEIsa0JBQWtCO2tCQUQ5QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXHJcbmltcG9ydCB7IGlzRW1wdHksIFdoZXJlIH0gZnJvbSAnQGluZnJhYjRhL2Nvbm5lY3QnXHJcblxyXG5pbXBvcnQgeyBDYXRhbG9nU2VhcmNoUGFyYW1zIH0gZnJvbSAnLi4vLi4vLi4vaW50ZXJmYWNlcydcclxuaW1wb3J0IHsgUHJvZHVjdENhdGFsb2dGYWNhZGUgfSBmcm9tICcuLi9mYWNhZGVzJ1xyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgQnJhbmRNYW5hZ2VySGVscGVyIHtcclxuICBwcml2YXRlIGJyYW5kc0xpc3Q6IFJlY29yZDxzdHJpbmcsIHN0cmluZ1tdPiA9IHt9XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgcHJvZHVjdENhdGFsb2c6IFByb2R1Y3RDYXRhbG9nRmFjYWRlKSB7fVxyXG5cclxuICBhc3luYyBzZXRCcmFuZHNMaXN0KG9wdGlvbnM6IENhdGFsb2dTZWFyY2hQYXJhbXMsIGJyYW5kczogc3RyaW5nW10pOiBQcm9taXNlPHZvaWQ+IHtcclxuICAgIGNvbnN0IGZpbHRlckJyYW5kcyA9IG9wdGlvbnMuZmlsdGVycz8uYnJhbmRzXHJcbiAgICBjb25zdCBpbmRleEtleSA9IHRoaXMuYnVpbGRJbmRleEJyYW5kcyhvcHRpb25zKVxyXG5cclxuICAgIGlmIChpc0VtcHR5KGJyYW5kcykgJiYgb3B0aW9ucy5maWx0ZXJzKSB7XHJcbiAgICAgIGRlbGV0ZSBvcHRpb25zLmZpbHRlcnMuYnJhbmRzXHJcbiAgICB9XHJcblxyXG4gICAgdGhpcy5icmFuZHNMaXN0W2luZGV4S2V5XSA9IHRoaXMuYnJhbmRzTGlzdFtpbmRleEtleV0gfHwgYnJhbmRzIHx8IChhd2FpdCB0aGlzLmZldGNoQnJhbmRzT25seShvcHRpb25zKSlcclxuICAgIHRoaXMuYnJhbmRzTGlzdFtpbmRleEtleV0gPSB0aGlzLmJyYW5kc0xpc3RbaW5kZXhLZXldLmZpbHRlcihCb29sZWFuKVxyXG5cclxuICAgIGlmIChvcHRpb25zLmZpbHRlcnMpIHtcclxuICAgICAgb3B0aW9ucy5maWx0ZXJzID0ge1xyXG4gICAgICAgIC4uLm9wdGlvbnMuZmlsdGVycyxcclxuICAgICAgICBicmFuZHM6IGZpbHRlckJyYW5kcyxcclxuICAgICAgfVxyXG4gICAgfVxyXG4gIH1cclxuXHJcbiAgZ2V0QnJhbmRzTGlzdChpbmRleEtleTogc3RyaW5nKTogc3RyaW5nW10ge1xyXG4gICAgcmV0dXJuIHRoaXMuYnJhbmRzTGlzdFtpbmRleEtleV1cclxuICB9XHJcblxyXG4gIGJ1aWxkSW5kZXhCcmFuZHMob3B0aW9uczogQ2F0YWxvZ1NlYXJjaFBhcmFtcyk6IHN0cmluZyB7XHJcbiAgICBpZiAob3B0aW9ucy5jYXRlZ29yeSkgcmV0dXJuIGBjYXRlZ29yeS0ke29wdGlvbnMuY2F0ZWdvcnkuaWR9YFxyXG5cclxuICAgIGlmIChvcHRpb25zLnRlcm0pIHJldHVybiBgdGVybS0ke29wdGlvbnMudGVybX1gXHJcblxyXG4gICAgaWYgKG9wdGlvbnMucHJvZmlsZSkgcmV0dXJuIGBwcm9maWxlLSR7b3B0aW9ucy5wcm9maWxlLmpvaW4oJywnKX1gXHJcblxyXG4gICAgcmV0dXJuICcnXHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGFzeW5jIGZldGNoQnJhbmRzT25seShvcHRpb25zOiBDYXRhbG9nU2VhcmNoUGFyYW1zKTogUHJvbWlzZTxzdHJpbmdbXT4ge1xyXG4gICAgbGV0IGZpbHRlcnMgPSB7fVxyXG5cclxuICAgIGlmIChvcHRpb25zLmNhdGVnb3J5KSB7XHJcbiAgICAgIGZpbHRlcnMgPSBhd2FpdCB0aGlzLnByb2R1Y3RDYXRhbG9nLmNhdGVnb3J5U3RydWN0dXJlQWRhcHRlci5idWlsZFByb2R1Y3RGaWx0ZXJCeUNhdGVnb3J5KG9wdGlvbnMuY2F0ZWdvcnkpXHJcbiAgICB9XHJcblxyXG4gICAgcmV0dXJuIHRoaXMucHJvZHVjdENhdGFsb2cucHJvZHVjdENhdGFsb2dSZXBvc2l0b3J5XHJcbiAgICAgIC5maW5kQ2F0YWxvZyhcclxuICAgICAgICB7XHJcbiAgICAgICAgICBmaWVsZHM6IFsnaWQnXSxcclxuICAgICAgICAgIGZpbHRlcnM6IHtcclxuICAgICAgICAgICAgLi4uZmlsdGVycyxcclxuICAgICAgICAgICAgcHVibGlzaGVkOiB7IG9wZXJhdG9yOiBXaGVyZS5FUVVBTFMsIHZhbHVlOiB0cnVlIH0sXHJcbiAgICAgICAgICB9LFxyXG4gICAgICAgICAgb3B0aW9uczoge1xyXG4gICAgICAgICAgICBkaXN0aW5jdDogWydicmFuZCddLFxyXG4gICAgICAgICAgfSxcclxuICAgICAgICB9LFxyXG4gICAgICAgIG9wdGlvbnMubWFpbkdlbmRlcixcclxuICAgICAgKVxyXG4gICAgICAudGhlbigocmVzdWx0KSA9PiByZXN1bHQuZGlzdGluY3QuYnJhbmQpXHJcbiAgfVxyXG59XHJcbiJdfQ==
@@ -1941,13 +1941,7 @@ class BrandManagerHelper {
1941
1941
  if (isEmpty(brands) && options.filters) {
1942
1942
  delete options.filters.brands;
1943
1943
  }
1944
- if (!this.brandsList[indexKey] && !brands) {
1945
- this.brandsList[indexKey] = yield this.fetchBrandsOnly(options);
1946
- }
1947
- else {
1948
- this.brandsList[indexKey] = this.brandsList[indexKey] || brands;
1949
- }
1950
- // this.brandsList[indexKey] = this.brandsList[indexKey] || brands || (await this.fetchBrandsOnly(options))
1944
+ this.brandsList[indexKey] = this.brandsList[indexKey] || brands || (yield this.fetchBrandsOnly(options));
1951
1945
  this.brandsList[indexKey] = this.brandsList[indexKey].filter(Boolean);
1952
1946
  if (options.filters) {
1953
1947
  options.filters = Object.assign(Object.assign({}, options.filters), { brands: filterBrands });
@@ -1968,12 +1962,14 @@ class BrandManagerHelper {
1968
1962
  }
1969
1963
  fetchBrandsOnly(options) {
1970
1964
  return __awaiter(this, void 0, void 0, function* () {
1965
+ let filters = {};
1966
+ if (options.category) {
1967
+ filters = yield this.productCatalog.categoryStructureAdapter.buildProductFilterByCategory(options.category);
1968
+ }
1971
1969
  return this.productCatalog.productCatalogRepository
1972
1970
  .findCatalog({
1973
1971
  fields: ['id'],
1974
- filters: {
1975
- published: { operator: Where.EQUALS, value: true },
1976
- },
1972
+ filters: Object.assign(Object.assign({}, filters), { published: { operator: Where.EQUALS, value: true } }),
1977
1973
  options: {
1978
1974
  distinct: ['brand'],
1979
1975
  },