@sankhyalabs/sankhyablocks 9.2.0-ms.9 → 9.2.0-rc.2

package/dist/collection/components/snk-filter-bar/snk-filter-bar.js

@@ -1,11 +1,10 @@
-import { ApplicationContext, ElementIDUtils, ObjectUtils, ErrorException, LockManager, LockManagerOperation } from '@sankhyalabs/core';
+import { ApplicationContext, ElementIDUtils, ErrorException, LockManager, LockManagerOperation, ObjectUtils } from '@sankhyalabs/core';
 import { EzScrollDirection } from '@sankhyalabs/ezui/dist/collection/components/ez-scroller/EzScrollDirection';
 import { h, Host } from '@stencil/core';
 import { ConfigStorage } from '../../lib/configs/ConfigStorage';
+import { PersonalizedFilterUtils } from '../snk-personalized-filter/subcomponents/snk-filter-param-config/utils/PersonalizedFilterUtils';
 import buildFilter from './filter-item/dataunitfilter/data-unit-filter-builder';
 import FilterItemType from './filter-item/filter-item-type.enum';
-import SnkFilterModalFactory from './utils/SnkFilterModalFactory';
-import { PersonalizedFilterUtils } from '../snk-personalized-filter/subcomponents/snk-filter-param-config/utils/PersonalizedFilterUtils';
 export class SnkFilterBar {
   constructor() {
     this._updateSequence = [];
@@ -42,10 +41,13 @@ export class SnkFilterBar {
     this.filterBarLegacyConfigName = undefined;
     this.autoLoad = undefined;
     this.afterApplyConfig = undefined;
+    this.filterCustomConfig = undefined;
+    this.filterCustomConfigInterceptor = undefined;
     this.allowDefault = undefined;
     this.scrollerLocked = false;
     this.showPersonalizedFilter = false;
     this.personalizedFilterId = undefined;
+    this.isFilterModalOpen = false;
   }
   hasValidValue(item) {
     if (item.value === undefined || item.value === null)
@@ -157,7 +159,6 @@ export class SnkFilterBar {
       return Promise.resolve(undefined);
     }
     const itemToRemove = this.filterConfig[itemIndex];
-    ;
     this.filterConfig = this.filterConfig.filter(item => item.id !== filterID);
     return Promise.resolve(itemToRemove);
   }
@@ -194,7 +195,7 @@ export class SnkFilterBar {
         return;
       }
       this._loadingPending = false;
-      this.doLoadData(this.dataUnit.getLastLoadRequest() != undefined);
+      this.doLoadData();
     }
     if (this._configUpdated) {
       this._configUpdated = false;
@@ -232,6 +233,9 @@ export class SnkFilterBar {
     }
     return ((_a = this.messagesBuilder) === null || _a === void 0 ? void 0 : _a.getMessage(key, params)) || defaultValue;
   }
+  async getFilters() {
+    return this.getFilter(null);
+  }
   getFilter(_dataUnit) {
     var _a;
     const filters = [];
@@ -290,11 +294,11 @@ export class SnkFilterBar {
     const unpinnedItems = [];
     this.filterConfig.sort((a, b) => this._filtersComparator(a, b))
       .filter(this.filterActiveFilter)
-      .forEach((item, index) => {
+      .forEach((item) => {
       item = ObjectUtils.copy(item);
       const itemId = `filter-${item.id}`;
-      const filterItem = (h("snk-filter-item", { onVisibleChanged: (evt) => this.scrollerLocked = evt.detail, onFilterChange: (event) => this.updateFilter(event.detail), onFocusin: () => this.itemFocused(itemId), id: itemId, config: item, class: index > 0 ? "ez-padding-left--medium" : "", getMessage: (key, props) => this.getMessage(key, props), key: item.id }));
-      if (item.fixed || item.hardFixed) {
+      const filterItem = (h("snk-filter-item", { onVisibleChanged: (evt) => this.scrollerLocked = evt.detail, onFilterChange: (event) => this.updateFilter(event.detail), onFocusin: () => this.itemFocused(itemId), id: itemId, config: item, class: "ez-margin-horizontal--extra-small", getMessage: (key, props) => this.getMessage(key, props), key: item.id }));
+      if (item.fixed || item.hardFixed || item.required) {
         pinnedItems.push(filterItem);
       }
       else {
@@ -303,9 +307,9 @@ export class SnkFilterBar {
       return filterItem;
     });
     const elements = [];
-    elements.push(...pinnedItems);
+    elements.push(...pinnedItems.reverse());
     if (pinnedItems.length > 0 && unpinnedItems.length > 0) {
-      elements.push(h("hr", { class: "ez-divider-vertical ez-divider--dark ez-margin-left--medium snk-filter-bar__divider" }));
+      elements.push(h("hr", { class: "ez-margin-horizontal--small ez-margin-vertical--auto ez-divider-vertical ez-divider--dark snk-filter-bar__divider" }));
     }
     elements.push(...unpinnedItems);
     return elements;
@@ -330,7 +334,7 @@ export class SnkFilterBar {
     return normalized;
   }
   updateFilter(newItem) {
-    this.filterConfig = this.filterConfig.map(item => {
+    let config = this.filterConfig.map(item => {
       newItem = this.normalizeItem(newItem);
       if (item.id === newItem.id) {
         if (ObjectUtils.objectToString(item) != ObjectUtils.objectToString(newItem)) {
@@ -340,6 +344,10 @@ export class SnkFilterBar {
       }
       return item;
     }).sort((a, b) => this._filtersComparator(a, b));
+    if (this.filterCustomConfigInterceptor) {
+      config = this.filterCustomConfigInterceptor(config);
+    }
+    this.filterConfig = config;
   }
   loadPermitions() {
     this._application.isUserSup().then(value => this.allowDefault = value);
@@ -361,6 +369,12 @@ export class SnkFilterBar {
       else {
         config = await ConfigStorage.loadFilterBarConfig(this.configName, this.resourceID, { contextURI: this.dataUnit.name });
       }
+      if (this.filterCustomConfig) {
+        config = [...this.filterCustomConfig, ...config];
+      }
+      if (this.filterCustomConfigInterceptor) {
+        config = this.filterCustomConfigInterceptor(config);
+      }
       this.filterConfig = config.map(item => this.normalizeItem(item));
       this.filterConfig.sort((a, b) => this._filtersComparator(a, b));
     }
@@ -404,30 +418,13 @@ export class SnkFilterBar {
    * @async
   */
   async showFilterModal() {
-    const callbackOnApplyFilter = (filters) => {
-      var _a;
-      this.filterConfig = filters.map(this.normalizeItem).sort((a, b) => this._filtersComparator(a, b));
-      (_a = this.afterApplyConfig) === null || _a === void 0 ? void 0 : _a.call(this);
-    };
-    let filtersConfigCopy = ObjectUtils.copy(this.filterConfig);
-    filtersConfigCopy = filtersConfigCopy.sort((itemA, itemB) => {
-      return itemA.originOrder - itemB.originOrder;
-    });
-    const factoryParams = {
-      filterConfig: filtersConfigCopy,
-      configName: this.configName,
-      onComplete: callbackOnApplyFilter,
-      disablePersonalizedFilter: this.disablePersonalizedFilter,
-      getMessage: (key, props) => this.getMessage(key, props),
-      onAddPersonalizedFilter: (isDefault) => this.addPersonalizedFilter(isDefault),
-      onEditPersonalizedFilter: (id, isDefault) => this.editPersonalizedFilter(id, isDefault),
-      onDeletePersonalizedFilter: (filter, configName, isDefault) => this.deletePersonalizedFilter(filter, FilterItemType.PERSONALIZED, configName, isDefault),
-    };
-    this._filterModalFactory = new SnkFilterModalFactory(factoryParams);
-    await this._filterModalFactory.showModal();
+    if (this.isFilterModalOpen) {
+      return; // Evita abrir múltiplos modais
+    }
+    this.isFilterModalOpen = true;
   }
   addPersonalizedFilter(isDefault = false) {
-    this._filterModalFactory.closeModal();
+    this.isFilterModalOpen = false;
     this._isDefaultFilter = isDefault;
     this.personalizedFilterId = undefined;
     this.showPersonalizedFilter = true;
@@ -436,7 +433,7 @@ export class SnkFilterBar {
     });
   }
   editPersonalizedFilter(id, isDefault = false) {
-    this._filterModalFactory.closeModal();
+    this.isFilterModalOpen = false;
     this._isDefaultFilter = isDefault;
     this.showPersonalizedFilter = true;
     this.personalizedFilterId = id;
@@ -451,6 +448,15 @@ export class SnkFilterBar {
       ConfigStorage.removePersonalizedFilter(filter, this.resourceID, configName);
     }
   }
+  closeFilterModal() {
+    this.isFilterModalOpen = false;
+  }
+  applyFiltersFromModal(filters) {
+    var _a;
+    this.filterConfig = filters.map(this.normalizeItem).sort((a, b) => this._filtersComparator(a, b));
+    (_a = this.afterApplyConfig) === null || _a === void 0 ? void 0 : _a.call(this);
+    this.isFilterModalOpen = false;
+  }
   handleHidePersonalizedFilter(reloadFilterBar) {
     if (reloadFilterBar) {
       this.loadConfigFromStorage().then(() => {
@@ -497,10 +503,14 @@ export class SnkFilterBar {
     if (this.showPersonalizedFilter) {
       return h("snk-personalized-filter", { class: "filter-bar__personalized-filter", filterId: this.personalizedFilterId, ref: (el) => this._elPersonalizedFilter = el, isDefaultFilter: this._isDefaultFilter, onEzCancel: () => this.handleHidePersonalizedFilter(false), onEzAfterSave: () => this.handleHidePersonalizedFilter(true), entityUri: this.dataUnit.name, configName: this.configName, resourceID: this.resourceID });
     }
+    let filtersConfigCopy = ObjectUtils.copy(this.filterConfig);
+    filtersConfigCopy = filtersConfigCopy.sort((itemA, itemB) => {
+      return itemA.originOrder - itemB.originOrder;
+    });
     if (this.mode !== "regular") {
-      return (h(Host, { "data-mode": this.mode }, this.getPersonalizedFilterVariableItems(), this.mode === 'button' && (h("ez-button", { class: "ez-margin-left--medium", size: "small", label: this.getMessage('snkFilterBar.filters', undefined, this.getMessage("snkFilterBar.filters")), onClick: this.showFilterModal.bind(this) }))));
+      return (h(Host, { "data-mode": this.mode }, this.getPersonalizedFilterVariableItems(), this.mode === 'button' && (h("ez-button", { class: "ez-margin-left--medium", size: "small", label: this.getMessage('snkFilterBar.filters', undefined, this.getMessage("snkFilterBar.filters")), onClick: this.showFilterModal.bind(this) })), h("snk-filter-modal", { opened: this.isFilterModalOpen, filterConfig: this.filterConfig, configName: this.configName, disablePersonalizedFilter: this.disablePersonalizedFilter, getMessage: (key, props) => this.getMessage(key, props), applyFilters: (filters) => this.applyFiltersFromModal(filters), closeModal: () => this.closeFilterModal(), addPersonalizedFilter: (isDefault) => this.addPersonalizedFilter(isDefault), editPersonalizedFilter: (id, isDefault) => this.editPersonalizedFilter(id, isDefault), deletePersonalizedFilter: (filter, configName, isDefault) => this.deletePersonalizedFilter(filter, FilterItemType.PERSONALIZED, configName, isDefault), filterCustomConfigInterceptor: this.filterCustomConfigInterceptor })));
     }
-    return (h(Host, null, h("div", null, h("span", { class: "snk-filter-bar__title", title: this.title, "data-tooltip": this.title, "data-flow": "bottom" }, this.title)), h("ez-scroller", { class: "snk-filter-bar__scroller", direction: EzScrollDirection.HORIZONTAL, activeShadow: true, locked: this.scrollerLocked }, h("section", { class: "snk-filter-bar__filter-item-container" }, this.getFilterItems())), h("ez-button", { class: "ez-padding-left--medium ez-margin-top--extra-small", size: "small", label: this.getMessage('snkFilterBar.filters', undefined, this.getMessage("snkFilterBar.filters")), onClick: this.showFilterModal.bind(this) }, h("ez-icon", { slot: "leftIcon", iconName: "plus", class: "ez-padding-right--small" }))));
+    return (h(Host, null, h("div", null, h("span", { class: "snk-filter-bar__title", title: this.title, "data-tooltip": this.title, "data-flow": "bottom" }, this.title)), h("ez-scroller", { class: "snk-filter-bar__scroller", direction: EzScrollDirection.HORIZONTAL, activeShadow: true, locked: this.scrollerLocked }, h("section", { class: "snk-filter-bar__filter-item-container" }, this.getFilterItems())), h("ez-button", { class: "ez-padding-left--medium ez-margin-top--extra-small", size: "small", label: this.getMessage('snkFilterBar.filters', undefined, this.getMessage("snkFilterBar.filters")), onClick: this.showFilterModal.bind(this) }, h("ez-icon", { slot: "leftIcon", iconName: "plus", class: "ez-padding-right--small" })), h("snk-filter-modal", { opened: this.isFilterModalOpen, filterConfig: this.filterConfig, configName: this.configName, disablePersonalizedFilter: this.disablePersonalizedFilter, getMessage: (key, props) => this.getMessage(key, props), applyFilters: (filters) => this.applyFiltersFromModal(filters), closeModal: () => this.closeFilterModal(), addPersonalizedFilter: (isDefault) => this.addPersonalizedFilter(isDefault), editPersonalizedFilter: (id, isDefault) => this.editPersonalizedFilter(id, isDefault), deletePersonalizedFilter: (filter, configName, isDefault) => this.deletePersonalizedFilter(filter, FilterItemType.PERSONALIZED, configName, isDefault), filterCustomConfigInterceptor: this.filterCustomConfigInterceptor })));
   }
   static get is() { return "snk-filter-bar"; }
   static get encapsulation() { return "scoped"; }
@@ -808,6 +818,67 @@ export class SnkFilterBar {
             }],
           "text": ""
         }
+      },
+      "filterCustomConfig": {
+        "type": "unknown",
+        "mutable": false,
+        "complexType": {
+          "original": "Array<SnkFilterItemConfig>",
+          "resolved": "SnkFilterItemConfig[]",
+          "references": {
+            "Array": {
+              "location": "global"
+            },
+            "SnkFilterItemConfig": {
+              "location": "import",
+              "path": "./filter-item/snk-filter-item"
+            }
+          }
+        },
+        "required": false,
+        "optional": true,
+        "docs": {
+          "tags": [{
+              "name": "description",
+              "text": "Configura\u00E7\u00E3o customizada dos filtros."
+            }, {
+              "name": "param",
+              "text": "config - Lista de configura\u00E7\u00F5es de filtros."
+            }],
+          "text": ""
+        }
+      },
+      "filterCustomConfigInterceptor": {
+        "type": "unknown",
+        "mutable": false,
+        "complexType": {
+          "original": "(config: Array<SnkFilterItemConfig>) => Array<SnkFilterItemConfig>",
+          "resolved": "(config: SnkFilterItemConfig[]) => SnkFilterItemConfig[]",
+          "references": {
+            "Array": {
+              "location": "global"
+            },
+            "SnkFilterItemConfig": {
+              "location": "import",
+              "path": "./filter-item/snk-filter-item"
+            }
+          }
+        },
+        "required": false,
+        "optional": true,
+        "docs": {
+          "tags": [{
+              "name": "description",
+              "text": "Intercepta a configura\u00E7\u00E3o dos filtros antes de serem aplicadas."
+            }, {
+              "name": "param",
+              "text": "config - Lista de configura\u00E7\u00F5es de filtros."
+            }, {
+              "name": "returns",
+              "text": "Retorna a lista de configura\u00E7\u00F5es de filtros."
+            }],
+          "text": ""
+        }
       }
     };
   }
@@ -816,7 +887,8 @@ export class SnkFilterBar {
       "allowDefault": {},
       "scrollerLocked": {},
       "showPersonalizedFilter": {},
-      "personalizedFilterId": {}
+      "personalizedFilterId": {},
+      "isFilterModalOpen": {}
     };
   }
   static get events() {
@@ -1030,28 +1102,33 @@ export class SnkFilterBar {
             }]
         }
       },
-      "showFilterModal": {
+      "getFilters": {
         "complexType": {
-          "signature": "() => Promise<void>",
+          "signature": "() => Promise<Filter[]>",
           "parameters": [],
           "references": {
             "Promise": {
               "location": "global"
             },
-            "SnkFilterItemConfig": {
+            "Filter": {
               "location": "import",
-              "path": "./filter-item/snk-filter-item"
-            },
-            "Array": {
+              "path": "@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata"
+            }
+          },
+          "return": "Promise<Filter[]>"
+        },
+        "docs": {
+          "text": "",
+          "tags": []
+        }
+      },
+      "showFilterModal": {
+        "complexType": {
+          "signature": "() => Promise<void>",
+          "parameters": [],
+          "references": {
+            "Promise": {
               "location": "global"
-            },
-            "SnkFilterModalFactoryParams": {
-              "location": "import",
-              "path": "./utils/SnkFilterModalFactory"
-            },
-            "IPersonalizedFilter": {
-              "location": "import",
-              "path": "../snk-personalized-filter/interfaces/IPersonalizedFilter"
             }
           },
           "return": "Promise<void>"

package/dist/collection/components/snk-filter-bar/utils/SnkFilterModalFactory.js

@@ -1,6 +1,6 @@
 import { ApplicationUtils } from "@sankhyalabs/ezui/dist/collection/utils";
 class SnkFilterModalFactory {
-  constructor({ filterConfig, configName, onComplete, getMessage, disablePersonalizedFilter, onAddPersonalizedFilter, onEditPersonalizedFilter, onDeletePersonalizedFilter }) {
+  constructor({ filterConfig, configName, onComplete, getMessage, disablePersonalizedFilter, onAddPersonalizedFilter, onEditPersonalizedFilter, onDeletePersonalizedFilter, filterCustomConfigInterceptor }) {
     this._filterConfig = filterConfig;
     this._configName = configName;
     this._onComplete = onComplete;
@@ -9,6 +9,7 @@ class SnkFilterModalFactory {
     this._addPersonalizedFilterFn = onAddPersonalizedFilter;
     this._editPersonalizedFilterFn = onEditPersonalizedFilter;
     this._onDeletePersonalizedFilter = onDeletePersonalizedFilter;
+    this._filterCustomConfigInterceptor = filterCustomConfigInterceptor;
   }
   applyFilters(newFilterConfig) {
     this._onComplete(newFilterConfig);
@@ -26,6 +27,7 @@ class SnkFilterModalFactory {
     filterModal.addPersonalizedFilter = (isDefault) => this._addPersonalizedFilterFn(isDefault);
     filterModal.editPersonalizedFilter = (id, isDefault) => this._editPersonalizedFilterFn(id, isDefault);
     filterModal.deletePersonalizedFilter = (filter, configName, isDefault) => this._onDeletePersonalizedFilter(filter, configName, isDefault);
+    filterModal.filterCustomConfigInterceptor = this._filterCustomConfigInterceptor;
     return filterModal;
   }
   async showModal() {

package/dist/collection/components/snk-filter-bar/utils/filter-validate.js

@@ -0,0 +1,24 @@
+import FilterItemType from "../filter-item/filter-item-type.enum";
+export function hasActiveElements(value) {
+  var _a;
+  const list = Array.isArray(value) ? value : value === null || value === void 0 ? void 0 : value.elements;
+  return ((_a = list === null || list === void 0 ? void 0 : list.filter((val) => val === null || val === void 0 ? void 0 : val.check)) === null || _a === void 0 ? void 0 : _a.length) > 0;
+}
+export function getInvalidFilters(filters) {
+  return filters.filter(item => {
+    if (!item.required) {
+      return false;
+    }
+    if (item.type === FilterItemType.MULTI_LIST) {
+      return !hasActiveElements(item.value);
+    }
+    return !item.value;
+  });
+}
+export function validateFilters(filters) {
+  const notValidFilters = getInvalidFilters(filters);
+  if (notValidFilters.length === 0) {
+    return true;
+  }
+  return false;
+}