@sankhyalabs/sankhyablocks 1.4.0-beta.1 → 1.4.0-beta.2

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

@@ -1,13 +1,17 @@
 import { h, Host } from '@stencil/core';
-import { ApplicationContext, DataType, ErrorException, ObjectUtils } from '@sankhyalabs/core';
+import { ApplicationContext, ErrorException, ObjectUtils, StringUtils } from '@sankhyalabs/core';
 import FilterItemType from './filter-item/filter-item-type.enum';
-import { toString } from '@sankhyalabs/core/dist/dataunit/metadata/DataType';
+import { ModalAction } from '@sankhyalabs/ezui/dist/collection/components/ez-modal-container';
+import buildFilter from './filter-item/dataunitfilter/data-unit-filter-builder';
 const PERSONALIZED_FILTER = "PERSONALIZED_FILTER";
 const DEFAULT_FILTER = "DEFAULT_FILTER";
 const CLEAR_ALL_FILTERS = "CLEAR_ALL_FILTERS";
 export class SnkFilterBar {
   constructor() {
     this._updateSequence = [];
+    this._loadingPending = false;
+    this._configUpdated = false;
+    this._pendingFilters = [];
     this._calculateSortIndex = (item) => {
       let index = item.hardFixed ? 1000000 : 0;
       //campos Hard Fixed não variam a ordem
@@ -22,6 +26,54 @@ export class SnkFilterBar {
       return this._calculateSortIndex(b) - this._calculateSortIndex(a);
     };
   }
+  observeFilterConfig(newValue, oldValue) {
+    if (oldValue != undefined && newValue == undefined) {
+      this._loadingPending = true;
+      this._configUpdated = true;
+    }
+    else {
+      const oldItems = new Map(oldValue ? oldValue.map(item => [item.id, item]) : undefined);
+      newValue.forEach(newItem => {
+        const oldItem = oldItems.get(newItem.id);
+        if (oldItem != undefined) {
+          this._configUpdated = this._configUpdated || ObjectUtils.objectToString(oldItem) != ObjectUtils.objectToString(newItem);
+          this._loadingPending = this._loadingPending || ObjectUtils.objectToString(oldItem.value) !== ObjectUtils.objectToString(newItem.value);
+        }
+        else {
+          this._configUpdated = true;
+          this._loadingPending = this._loadingPending || newItem.value != undefined;
+        }
+      });
+    }
+    this.processAfterUpdateConfig();
+  }
+  processPendingFilter() {
+    if (this._pendingFilters.length > 0 && this._currentPendingFilter == undefined) {
+      this._currentPendingFilter = this._element.querySelector("#filter-" + this._pendingFilters.pop());
+      if (this._currentPendingFilter) {
+        this._currentPendingFilter.showUp(true).then(() => {
+          this._currentPendingFilter = undefined;
+          this.processPendingFilter();
+        });
+      }
+    }
+    if (this._currentPendingFilter == undefined) {
+      this.processAfterUpdateConfig();
+    }
+  }
+  processAfterUpdateConfig() {
+    if (this._pendingFilters.length > 0) {
+      return;
+    }
+    if (this._loadingPending) {
+      this._loadingPending = false;
+      this.dataUnit.loadData();
+    }
+    if (this._configUpdated) {
+      this._configUpdated = false;
+      this._application.saveFilterBarConfig(this.filterConfig, this.configName);
+    }
+  }
   /**
    * Conforme mecanismo de mensagens, é possível customizar as mensagens dos blocos de construção
    * através de um pequeno modulo na estrutura da aplicação:
@@ -34,101 +86,21 @@ export class SnkFilterBar {
   getFilter(_dataUnit) {
     var _a;
     const filters = [];
-    (_a = this.filterConfig) === null || _a === void 0 ? void 0 : _a.filter(item => item.value).forEach(item => {
-      const filter = this.buildDUFilter(item);
+    (_a = this.filterConfig) === null || _a === void 0 ? void 0 : _a.filter(item => this.isActiveFilter(item)).forEach(item => {
+      const filter = buildFilter(item);
       if (filter) {
         filters.push(filter);
       }
     });
     return filters;
   }
-  buildDUFilter(item) {
-    const { id, value, type, props, visible } = item;
-    if (value && visible) {
-      if (type === FilterItemType.BINARY_SELECT) {
-        const options = props.options;
-        const selectedOption = options.find(opt => opt.name === value);
-        //FIXME: ajustar o backend para não exigir parametros
-        return { name: id, expression: selectedOption.expression, params: [] };
-      }
-      if (type === FilterItemType.MULTI_SELECT) {
-        return { name: id, expression: props.expression, params: [{ name: id, dataType: DataType.TEXT, value }] };
-      }
-      if (type === FilterItemType.PERIOD) {
-        let { end, start } = value;
-        if (typeof end === "string") {
-          end = new Date(end);
-        }
-        if (typeof start === "string") {
-          start = new Date(start);
-        }
-        const params = [];
-        let expression;
-        if (end && start) {
-          expression = props.expression.fullfill;
-          params.push({ name: `${id}.START`, dataType: DataType.DATE, value: toString(DataType.DATE, start) }, { name: `${id}.END`, dataType: DataType.DATE, value: toString(DataType.DATE, end) });
-        }
-        else {
-          if (start) {
-            expression = props.expression.onlystart;
-            params.push({ name: id, dataType: DataType.DATE, value: toString(DataType.DATE, start) });
-          }
-          else {
-            expression = props.expression.onlyend;
-            params.push({ name: id, dataType: DataType.DATE, value: toString(DataType.DATE, end) });
-          }
-        }
-        return { name: id, expression, params };
-      }
-      if (type === FilterItemType.SEARCH) {
-        const expression = props.expression;
-        return { name: id, expression, params: [{ name: id, dataType: DataType.TEXT, value: toString(DataType.TEXT, value.value) }] };
-      }
-      if (type === FilterItemType.TEXT) {
-        const expression = props.expression;
-        return { name: id, expression, params: [{ name: id, dataType: DataType.TEXT, value: toString(DataType.TEXT, value) }] };
-      }
-      if (type === FilterItemType.NUMBER) {
-        const expression = props.expression;
-        return { name: id, expression, params: [{ name: id, dataType: DataType.NUMBER, value: toString(DataType.NUMBER, value) }] };
-      }
-      //No mapeamento dos outros tipos precisamos saber o tipo de dado.
-    }
-    return undefined;
+  isActiveFilter(item) {
+    return (item.visible && item.value != undefined) || item.type === FilterItemType.DEFAULT_FILTER;
   }
-  componentWillLoad() {
-    this._application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
-    if (this._application) {
-      this._application.getFilterBarConfig(this.configName)
-        .then((filters) => {
-        this.filterConfig = filters;
-      })
-        .catch(reason => {
-        throw new ErrorException(this.getMessage("snkFilterBar.failToLoadConfig"), reason);
-      });
-    }
-    if (this.dataUnit == undefined) {
-      let parent = this._element.parentElement;
-      while (parent) {
-        if (parent.tagName.toUpperCase() === "SNK-DATA-UNIT") {
-          const snkDataUnit = parent;
-          this.dataUnit = snkDataUnit.dataUnit;
-          if (this.dataUnit) {
-            this.dataUnit.addFilterProvider(this);
-          }
-          else {
-            snkDataUnit.addEventListener("dataUnitReady", (evt) => {
-              this.dataUnit = evt.detail;
-              this.dataUnit.addFilterProvider(this);
-            });
-          }
-          break;
-        }
-      }
-      parent = parent.parentElement;
-    }
-    else {
-      this.dataUnit.addFilterProvider(this);
+  registryFilterProvider() {
+    this.dataUnit.addFilterProvider(this);
+    if (this.filterConfig) {
+      this.dataUnit.loadData();
     }
   }
   getFilterItems() {
@@ -136,9 +108,8 @@ export class SnkFilterBar {
     const unpinnedItems = [];
     this.filterConfig
       .filter(item => item.visible)
-      .sort((a, b) => this._filtersComparator(a, b))
       .forEach((item, index) => {
-      const filterItem = (h("snk-filter-item", { id: `filter-${item.id}`, config: this.normalizeItem(item), class: index > 0 ? "ez-padding-left--medium" : "", getMessage: (key, props) => this.getMessage(key, props), key: item.id }));
+      const filterItem = (h("snk-filter-item", { id: `filter-${item.id}`, config: item, class: index > 0 ? "ez-padding-left--medium" : "", getMessage: (key, props) => this.getMessage(key, props), key: item.id }));
       if (item.fixed || item.hardFixed) {
         pinnedItems.push(filterItem);
       }
@@ -161,9 +132,6 @@ export class SnkFilterBar {
       this._updateSequence.push(item.id);
     }
   }
-  filterChangeListener(evt) {
-    this.updateFilter(evt.detail);
-  }
   normalizeItem(item) {
     const normalized = Object.assign({}, item);
     const optionals = ["props", "value", "hardFixed", "fixed"];
@@ -177,87 +145,207 @@ export class SnkFilterBar {
     }
     return normalized;
   }
-  updateFilter(newItem, clear = false) {
-    let needLoad = false;
-    let updated = false;
+  updateFilter(newItem) {
     this.filterConfig = this.filterConfig.map(item => {
-      if (clear) {
-        if (item.value != undefined) {
-          updated = true;
-          needLoad = true;
-        }
-        return Object.assign(Object.assign({}, item), { value: undefined });
-      }
-      else {
-        if (item.id === newItem.id) {
-          const normalizedOne = this.normalizeItem(item);
-          const normalizedTwo = this.normalizeItem(newItem);
-          updated = ObjectUtils.objectToString(normalizedOne) != ObjectUtils.objectToString(normalizedTwo);
-          needLoad = ObjectUtils.objectToString(normalizedOne.value) !== ObjectUtils.objectToString(normalizedTwo.value);
-          return newItem;
+      newItem = this.normalizeItem(newItem);
+      if (item.id === newItem.id) {
+        if (ObjectUtils.objectToString(item) != ObjectUtils.objectToString(newItem)) {
+          this.calculateUpdateSequence(newItem);
         }
+        return newItem;
       }
       return item;
-    });
-    if (needLoad) {
-      this.dataUnit.loadData();
-    }
-    if (updated) {
-      this.calculateUpdateSequence(newItem);
-      this._application.saveFilterBarConfig(this.filterConfig, this.configName);
-    }
-    return needLoad;
+    }).sort((a, b) => this._filtersComparator(a, b));
   }
   getAddListItems() {
     const hiddenItems = this.filterConfig
-      .filter(item => !item.visible)
-      .sort(this._filtersComparator);
-    return hiddenItems.map(filter => {
-      return { name: filter.id, label: filter.label, kind: "FILTER", iconName: null };
-    }).concat([
-      { name: PERSONALIZED_FILTER, label: this.getMessage("snkFilterBar.customFilter"), iconName: "tune", kind: "FOOTER" },
-      { name: DEFAULT_FILTER, label: this.getMessage("snkFilterBar.defaultFilter"), iconName: "configuration", kind: "FOOTER" }
-    ]);
+      .filter(item => !item.visible && this.isListable(item));
+    const footerItems = [{ name: PERSONALIZED_FILTER, label: this.getMessage("snkFilterBar.customFilter"), iconName: "tune", kind: "FOOTER" }];
+    if (this.allowDefault) {
+      footerItems.push({ name: DEFAULT_FILTER, label: this.getMessage("snkFilterBar.defaultFilter"), iconName: "configuration", kind: "FOOTER" });
+    }
+    return hiddenItems.map(filter => { return { name: filter.id, label: filter.label, kind: "FILTER", iconName: null }; })
+      .concat(footerItems);
   }
   getActiveClass() {
     const filterApplied = this.filterConfig.filter(item => item.value != undefined).length > 0;
     return filterApplied ? "sc-snk-filter-bar snk-filter-bar__filter-list-items-button--active" : "";
   }
+  isListable(item, allowPersonalized = false) {
+    return item.type !== FilterItemType.DEFAULT_FILTER && (allowPersonalized || item.type !== FilterItemType.PERSONALIZED);
+  }
   getAppliedListItems() {
     const appliedItems = this.filterConfig
-      .filter(item => item.value != undefined)
-      .sort(this._filtersComparator);
+      .filter(item => this.isActiveFilter(item) && this.isListable(item, true));
     return appliedItems.map(filter => {
       return { name: filter.id, label: filter.label, kind: "FILTER", iconName: null };
     }).concat([
       { name: CLEAR_ALL_FILTERS, label: this.getMessage("snkFilterBar.clearAllFilters"), iconName: "cleaning", kind: "FOOTER" }
     ]);
   }
+  addPersonalizedFilters(personalizedItems) {
+    const activeFilters = {};
+    personalizedItems.forEach(item => {
+      if (item.active) {
+        activeFilters[item.id] = true;
+      }
+    });
+    this.filterConfig = this.filterConfig.map(item => {
+      var _a, _b;
+      if (item.type === FilterItemType.PERSONALIZED) {
+        const visible = activeFilters[item.id];
+        if (!item.visible && visible) {
+          this.calculateUpdateSequence(item);
+          if (((_b = (_a = item.props) === null || _a === void 0 ? void 0 : _a.personalizedFilter) === null || _b === void 0 ? void 0 : _b.parameters) != undefined) {
+            this._pendingFilters.push(item.id);
+          }
+        }
+        return this.normalizeItem(visible ? Object.assign(Object.assign({}, item), { visible }) : Object.assign(Object.assign({}, item), { visible, value: undefined, fixed: undefined }));
+      }
+      return item;
+    }).sort((a, b) => this._filtersComparator(a, b));
+  }
+  openDefaultFilterModal() {
+    const filterModal = document.createElement("snk-filter-modal");
+    const defaultFilter = this.filterConfig.filter(item => item.type === FilterItemType.DEFAULT_FILTER);
+    filterModal.getMessage = (key, props) => this.getMessage(key, props);
+    filterModal.modalTitle = this.getMessage("snkFilterBar.modalDefaultFilterTitle");
+    filterModal.infoText = this.getMessage(defaultFilter.length == 0 ? "snkFilterBar.modalInfoTextCreateDefault" : "snkFilterBar.modalInfoTextEditDefault");
+    filterModal.items = defaultFilter.map(item => {
+      return { id: item.id, active: true, enabled: false, label: item.label };
+    });
+    filterModal.processModalAction = (_action) => {
+      this._application.closeModal();
+    };
+    this._application.showModal(filterModal);
+  }
+  openPersonalizedModal() {
+    const filterModal = document.createElement("snk-filter-modal");
+    const personalizedFilter = this.filterConfig
+      .filter(item => item.type === FilterItemType.PERSONALIZED)
+      .sort((itemA, itemB) => StringUtils.compare(itemA.label, itemB.label));
+    filterModal.getMessage = (key, props) => this.getMessage(key, props);
+    filterModal.modalTitle = this.getMessage("snkFilterBar.modalPersonalizedFilterTitle");
+    filterModal.modalSubTitle = this.getMessage("snkFilterBar.modalPersonalizedFilterSubTitle");
+    filterModal.okButtonLabel = this.getMessage("snkFilterBar.modalOkButtonLabel");
+    filterModal.cancelButtonLabel = this.getMessage("snkFilterBar.modalCancelButtonLabel");
+    filterModal.infoText = this.getMessage("snkFilterBar.modalInfoTextCreateEditPersonalized");
+    filterModal.useSearch = true;
+    filterModal.items = personalizedFilter.map(item => {
+      return { id: item.id, active: item.visible, enabled: true, label: item.label };
+    });
+    filterModal.processModalAction = (action) => {
+      if (action === ModalAction.CANCEL) {
+        // O Botão de cancelar, tem efeito específico:
+        //  - Desmarcar todos os filtros personalizados.
+        filterModal.items = filterModal.items.map(item => {
+          return Object.assign(Object.assign({}, item), { active: false });
+        });
+      }
+      else {
+        if (action === ModalAction.OK) {
+          this.addPersonalizedFilters(filterModal.items);
+        }
+        this._application.closeModal();
+      }
+    };
+    this._application.showModal(filterModal);
+  }
+  clearFilters() {
+    let changed = false;
+    this.filterConfig = this.filterConfig.map(item => {
+      if (item.value != undefined) {
+        changed = true;
+      }
+      return Object.assign(Object.assign({}, item), { value: undefined });
+    }).sort((a, b) => this._filtersComparator(a, b));
+    return changed;
+  }
+  loadPermitions() {
+    this._application.isUserSup().then(value => this.allowDefault = value);
+  }
+  loadConfigFromApplication() {
+    this._application.getFilterBarConfig(this.configName)
+      .then((filters) => {
+      this.filterConfig = filters.map(item => this.normalizeItem(item));
+      if (this.dataUnit) {
+        this.dataUnit.loadData();
+      }
+    })
+      .catch(reason => {
+      throw new ErrorException(this.getMessage("snkFilterBar.failToLoadConfig"), reason);
+    });
+  }
+  attachDataUnit() {
+    if (this.dataUnit == undefined) {
+      let parent = this._element.parentElement;
+      while (parent) {
+        if (parent.tagName.toUpperCase() === "SNK-DATA-UNIT") {
+          const snkDataUnit = parent;
+          this.dataUnit = snkDataUnit.dataUnit;
+          if (this.dataUnit) {
+            this.registryFilterProvider();
+          }
+          else {
+            snkDataUnit.addEventListener("dataUnitReady", (evt) => {
+              this.dataUnit = evt.detail;
+              this.registryFilterProvider();
+            });
+          }
+          break;
+        }
+      }
+      parent = parent.parentElement;
+    }
+    else {
+      this.registryFilterProvider();
+    }
+  }
+  filterChangeListener(evt) {
+    this.updateFilter(evt.detail);
+  }
   addFilterHandler(itemName) {
     const filterItem = this.filterConfig.find(currentFilter => currentFilter.id === itemName);
-    if (filterItem) {
+    if (itemName === PERSONALIZED_FILTER) {
+      this.openPersonalizedModal();
+    }
+    else if (itemName === DEFAULT_FILTER) {
+      this.openDefaultFilterModal();
+    }
+    else if (filterItem) {
       this.updateFilter(Object.assign(Object.assign({}, filterItem), { visible: true }));
       window.requestAnimationFrame(() => {
-        const itemElement = this._element.querySelector("#filter-" + itemName);
-        if (itemElement) {
-          itemElement.showUp();
+        const filterItemElement = this._element.querySelector("#filter-" + itemName);
+        if (filterItemElement) {
+          filterItemElement.showUp();
         }
       });
     }
   }
   appliedFilterHandler(itemName) {
     if (itemName === CLEAR_ALL_FILTERS) {
-      if (this.updateFilter(null, true)) {
+      if (this.clearFilters()) {
         this._application.info(this.getMessage("snkFilterBar.successfullyCleaned"), { iconName: "check" });
       }
     }
     else {
-      const itemElement = this._element.querySelector("#filter-" + itemName);
-      if (itemElement) {
-        itemElement.showUp(true);
+      const filterItemElement = this._element.querySelector("#filter-" + itemName);
+      if (filterItemElement) {
+        filterItemElement.showUp(true);
       }
     }
   }
+  componentWillLoad() {
+    this._application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
+    if (this._application) {
+      this.loadPermitions();
+      this.loadConfigFromApplication();
+    }
+    this.attachDataUnit();
+  }
+  componentDidRender() {
+    this.processPendingFilter();
+  }
   render() {
     if (!this.dataUnit || !this.filterConfig || this.filterConfig.length === 0) {
       return undefined;
@@ -340,7 +428,18 @@ export class SnkFilterBar {
       }
     };
   }
+  static get states() {
+    return {
+      "allowDefault": {}
+    };
+  }
   static get elementRef() { return "_element"; }
+  static get watchers() {
+    return [{
+        "propName": "filterConfig",
+        "methodName": "observeFilterConfig"
+      }];
+  }
   static get listeners() {
     return [{
         "name": "filterChange",

package/dist/collection/components/snk-grid/snk-grid.js

@@ -137,7 +137,7 @@ export class SnkGrid {
         }
       },
       "statusResolver": {
-        "type": "any",
+        "type": "unknown",
         "mutable": false,
         "complexType": {
           "original": "IStatusResolver",
@@ -154,9 +154,7 @@ export class SnkGrid {
         "docs": {
           "tags": [],
           "text": "Configura\u00E7\u00E3o do valor da coluna de status.\nExemplo: { \"RECDESP\": { \"-1\" : \"#BD0025\", \"1\" : \"#157A00\" } }"
-        },
-        "attribute": "status-resolver",
-        "reflect": false
+        }
       }
     };
   }

package/dist/collection/lib/http/data-fetcher/fetchers/filter-bar-config-fetcher.js

@@ -1,19 +1,27 @@
 import { ResourceFetcher } from "./resource-fetcher";
 function normalizeValue(value) {
+  if (value == undefined) {
+    return value;
+  }
   if (value instanceof Date) {
     return value.toISOString();
   }
   if (typeof value === "object") {
-    const normalized = Object.assign({}, value);
-    Object.keys(value).forEach(prop => {
-      if (value[prop]) {
-        normalized[prop] = normalizeValue(value[prop]);
-      }
-      else {
-        delete normalized[prop];
-      }
-    });
-    return normalized;
+    if (value instanceof Array) {
+      return value.map(item => normalizeValue(item));
+    }
+    else {
+      const normalized = Object.assign({}, value);
+      Object.keys(value).forEach(prop => {
+        if (value[prop]) {
+          normalized[prop] = normalizeValue(value[prop]);
+        }
+        else {
+          delete normalized[prop];
+        }
+      });
+      return normalized;
+    }
   }
   return value;
 }

package/dist/collection/lib/message/resources/snk-filter-bar.msg.js

@@ -7,12 +7,24 @@ const snkFilterBarMessages = {
   "applyFilter": "Aplicar",
   "findFilter": "Buscar filtros...",
   "findField": "Buscar filtros...",
+  "modalFindFilter": "Buscar filtro",
   "emptyFiltersList": "Não há filtros disponíveis",
   "emptyAppliedFiltersList": "Não há filtros aplicados",
   "customFilter": "Filtro personalizado",
-  "defaultFilter": "Filtro padrao",
+  "defaultFilter": "Filtro padrão",
   "failToLoadConfig": "Falha ao buscar configuração de filtros",
   "clearAllFilters": "Limpar todos os filtros",
-  "successfullyCleaned": "Filtro limpo com sucesso!"
+  "successfullyCleaned": "Filtro limpo com sucesso!",
+  "activeFilter": "{{ACTIVE_FILTERS}} filtro aplicado",
+  "activeFilters": "{{ACTIVE_FILTERS}} filtros aplicados",
+  "noActiveFilters": "Nenhum filtro aplicado",
+  "modalDefaultFilterTitle": "Filtro padrão",
+  "modalInfoTextEditDefault": "Use o layout antigo para editar o seu filtro padrão, em breve traremos uma nova experiência.",
+  "modalInfoTextCreateDefault": "Use o layout antigo para criar o seu filtro padrão, em breve traremos uma nova experiência.",
+  "modalPersonalizedFilterTitle": "Filtro personalizado",
+  "modalPersonalizedFilterSubTitle": "Gerencie seus filtros",
+  "modalInfoTextCreateEditPersonalized": "Use o layout antigo para criar ou editar filtros, em breve traremos uma nova experiência",
+  "modalOkButtonLabel": "Aplicar",
+  "modalCancelButtonLabel": "Limpar"
 };
 export default snkFilterBarMessages;