@sankhyalabs/sankhyablocks 6.5.0 → 6.6.1

package/dist/collection/components/snk-filter-bar/filter-modal/subcomponents/snk-filter-modal-item.js

@@ -31,19 +31,21 @@ export class SnkFilterModalItem {
       case FilterItemType.NUMBER:
         return { tag: "snk-filter-number" };
       case FilterItemType.PERSONALIZED:
-        const snkFilterPersonalizedProps = {
-          tag: "snk-filter-personalized", props: {
-            onDeleteFilter: (event) => this.handleDeleteFilter(event.detail, FilterItemType.PERSONALIZED),
-            onEditFilter: (event) => this.editPersonalizedFilter.emit(event.detail),
-            onAddFilter: () => this.addPersonalizedFilter.emit(),
-          }
-        };
-        return snkFilterPersonalizedProps;
+        return this.buildSnkFilterPersonalizedProps();
       case FilterItemType.MULTI_LIST:
         return { tag: "snk-entity-list", props: { maxHeightList: "640px", rightListSlotBuilder: item => this.buildRightSlot(item) } };
     }
     return { tag: "snk-filter-text" };
   }
+  buildSnkFilterPersonalizedProps() {
+    return {
+      tag: "snk-personalized-filter-editor", props: {
+        onDeleteFilter: (event) => this.handleDeleteFilter(event.detail, FilterItemType.PERSONALIZED),
+        onEditFilter: (event) => this.editPersonalizedFilter.emit(event.detail),
+        onAddFilter: () => this.addPersonalizedFilter.emit(),
+      }
+    };
+  }
   isVisible(newValue) {
     return !this.filterItem.visible ? newValue !== undefined : true;
   }

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

@@ -92,13 +92,12 @@ export class SnkFilterBar {
       this.processAfterUpdateConfig();
     }
   }
+  getPersonalizedFilterItem() {
+    return this.filterConfig.find(item => item.type === FilterItemType.PERSONALIZED);
+  }
   async processAfterUpdateConfig() {
     if (this._loadingPending) {
-      const personalizedFilter = this.filterConfig.find(item => {
-        if (item.type === FilterItemType.PERSONALIZED) {
-          return true;
-        }
-      });
+      const personalizedFilter = this.getPersonalizedFilterItem();
       this._pendingVariables = !PersonalizedFilterUtils.validateVariableValues(personalizedFilter);
       if (this._pendingVariables) {
         return;

package/dist/collection/components/snk-filter-field-search/snk-filter-field-search.js

@@ -6,7 +6,6 @@ const SNK_CONTEXT_KEY = "__SNK__APPLICATION__";
 const ENTITY_NAME_PATTERN = /\w+:\/\/(\w+)/;
 export class SnkFilterFieldSearch {
   constructor() {
-    this._filterMetadataStorage = new Map();
     this._currentMetadata = null;
     this._filterText = "";
     this._isLoading = false;
@@ -49,15 +48,8 @@ export class SnkFilterFieldSearch {
   async loadData() {
     var _a, _b;
     this._isLoading = true;
-    let metadata;
-    if (this._currentLink != undefined) {
-      metadata = this._filterMetadataStorage.get(this._currentLink.uri);
-    }
-    if (!metadata) {
-      metadata = await this.fieldsDataSource.fetchData(this._currentLink);
-      this._currentLink = metadata.currentLink;
-      this._filterMetadataStorage.set(this._currentLink.uri, metadata);
-    }
+    let metadata = await this.fieldsDataSource.fetchData(this._currentLink);
+    this._currentLink = metadata.currentLink;
     const { fields, links } = metadata || {};
     if (!Array.isArray(fields) || !Array.isArray(links))
       throw new Error('Invalid metadata');
@@ -110,7 +102,6 @@ export class SnkFilterFieldSearch {
     if (this._isLoading)
       return;
     const breadcrumbByIndex = this.breadcrumbItems.findIndex(breadcrumbItem => breadcrumbItem.id === item.id);
-    item.cache = this._filterMetadataStorage.has(item.uri);
     if (breadcrumbByIndex > -1) {
       this.breadcrumbItems = this.breadcrumbItems.slice(0, (breadcrumbByIndex + 1));
     }
@@ -162,7 +153,6 @@ export class SnkFilterFieldSearch {
   }
   disconnectedCallback() {
     var _a;
-    this._filterMetadataStorage.clear();
     (_a = this._ezPopover) === null || _a === void 0 ? void 0 : _a.hide();
   }
   render() {

package/dist/collection/components/snk-personalized-filter/interfaces/index.js

@@ -0,0 +1,39 @@
+export * from './IExpressionItem';
+export * from './ISystemFilterConfig';
+export * from './IUserFilterConfig';
+export var FilterConfigType;
+(function (FilterConfigType) {
+  FilterConfigType["SYSTEM_CONFIG"] = "S";
+  FilterConfigType["USER_CONFIG"] = "E";
+})(FilterConfigType || (FilterConfigType = {}));
+export var FilterUserConfigTypes;
+(function (FilterUserConfigTypes) {
+  FilterUserConfigTypes["DATE"] = "D";
+  FilterUserConfigTypes["HORA"] = "H";
+  FilterUserConfigTypes["TEXT"] = "S";
+  FilterUserConfigTypes["INTEGER"] = "I";
+  FilterUserConfigTypes["DECIMAL"] = "F";
+  FilterUserConfigTypes["NUMBER"] = "NUMBER";
+})(FilterUserConfigTypes || (FilterUserConfigTypes = {}));
+export var FilterOperand;
+(function (FilterOperand) {
+  FilterOperand["AND"] = "AND";
+  FilterOperand["OR"] = "OR";
+  FilterOperand["IN"] = "IN";
+  FilterOperand["DIFFERENT"] = "<>";
+  FilterOperand["LIKE"] = "LIKE";
+  FilterOperand["START_WITH"] = "LIKE_START";
+  FilterOperand["FINISHED_WITH"] = "LIKE_END";
+  FilterOperand["NULL"] = "NULL";
+  FilterOperand["NOT_NULL"] = "NOT NULL";
+  FilterOperand["EQUAL"] = "=";
+  FilterOperand["LARGER"] = ">";
+  FilterOperand["LARGER_EQUAL"] = ">=";
+  FilterOperand["SMALLER"] = "<";
+  FilterOperand["SMALLER_EQUAL"] = "<=";
+})(FilterOperand || (FilterOperand = {}));
+export var FilterEntities;
+(function (FilterEntities) {
+  FilterEntities["FIELD"] = "Campo";
+  FilterEntities["INSTANCE"] = "Instancia";
+})(FilterEntities || (FilterEntities = {}));

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

@@ -4,19 +4,24 @@ import { PersonalizedFilterUtils } from './subcomponents/snk-filter-param-config
 import { ConfigStorage } from "../../lib/configs/ConfigStorage";
 import { ApplicationUtils } from "@sankhyalabs/ezui/dist/collection/utils";
 import { ObjectUtils } from "@sankhyalabs/core";
-import { FilterGroupCondition } from './subcomponents/snk-filter-param-config/interfaces/IExpressionItem';
+import { FilterGroupCondition } from './interfaces/IExpressionItem';
 import store from '../../lib/store';
 import PersonalizedFilterFetcher from "../../lib/http/data-fetcher/fetchers/personalized-filter-fetcher";
 export class SnkPersonalizedFilter {
   constructor() {
     this._personalizedFilterFetcher = new PersonalizedFilterFetcher();
+    this._filterMetadataStorage = new Map();
     this._dataSourceFetcher = {
       fetchData: async (entity) => {
         let entityURI = entity === null || entity === void 0 ? void 0 : entity.uri;
         if (StringUtils.isEmpty(entityURI)) {
           entityURI = this.entityUri;
         }
-        return await this._personalizedFilterFetcher.loadFields(entityURI);
+        if (!this._filterMetadataStorage.has(entityURI)) {
+          const filterMetadata = await this._personalizedFilterFetcher.loadFields(entityURI);
+          this._filterMetadataStorage.set(entityURI, filterMetadata);
+        }
+        return this._filterMetadataStorage.get(entityURI);
       }
     };
     this._filterAssistentMode = true;
@@ -129,11 +134,11 @@ export class SnkPersonalizedFilter {
     ApplicationUtils.confirm(this.getMessage("snkPersonalizedFilter.confirmCancel.title"), this.getMessage("snkPersonalizedFilter.confirmCancel.description"))
       .then((canCancel) => {
       var _a;
-      if (canCancel) {
-        this._filterAssistent = ObjectUtils.copy((_a = this._originalFilterAssistent) !== null && _a !== void 0 ? _a : {});
-        this.ezCancel.emit();
-        this._elButtonSave.enabled = false;
-      }
+      if (!canCancel)
+        return;
+      this._filterAssistent = ObjectUtils.copy((_a = this._originalFilterAssistent) !== null && _a !== void 0 ? _a : {});
+      this.ezCancel.emit();
+      this._elButtonSave.enabled = false;
     });
   }
   handleTitleChange(name) {
@@ -166,14 +171,21 @@ export class SnkPersonalizedFilter {
     }
     return (h("div", { class: "ez-flex" }, h("ez-alert", { alertType: "warn" }, this._filterAssistent.warningMessage)));
   }
+  buildContainerPersonalizedFilter() {
+    var _a, _b, _c;
+    if (this._filterAssistentMode) {
+      return (h(Fragment, null, h("div", { class: "ez-padding-top--small snk-personalized-filter__group" }, h("snk-expression-group", { ref: (el) => this._mainExpressionGroup = el, group: (_a = this._filterAssistent) === null || _a === void 0 ? void 0 : _a.assistent, messagesBuilder: this.messagesBuilder, onEzFilterGroupChange: this.handleFilterGroupChange.bind(this), filterId: this.filterId, entityURI: this.entityUri })), h("div", null, h("div", { class: "snk-personalized-filter__expression-input--line" }), h("ez-collapsible-box", { label: this.getMessage("snkPersonalizedFilter.info.titleCollapsible"), headerSize: "medium", value: true }, h("div", { class: "ez-box" }, h("div", { class: "ez-box__container" }, h("ez-text-area", { ref: (el) => this._elTextAreaExpression = el, enabled: false, label: this.getMessage("snkPersonalizedFilter.info.labelExpression"), value: (_b = this._filterAssistent) === null || _b === void 0 ? void 0 : _b.expression })))))));
+    }
+    else {
+      return (h(Fragment, null, h("span", { class: "ez-text ez-text--small ez-text--bold ez-padding-bottom--medium" }, this.getMessage("snkPersonalizedFilter.info.applyExpression")), h("ez-text-area", { label: this.getMessage("snkPersonalizedFilter.info.labelExpression"), value: (_c = this._filterAssistent) === null || _c === void 0 ? void 0 : _c.expression, onEzChange: (evt) => this.handleExpressionChange(evt.detail) }), this.getWarningMessageComponent()));
+    }
+  }
   render() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     if (!((_a = this._filterAssistent) === null || _a === void 0 ? void 0 : _a.assistent) && this._filterAssistentMode) {
       return;
     }
-    return (h(Host, null, h("div", { class: "snk-personalized-filter" }, h("div", null, h("snk-simple-bar", { label: this.filterId ? this.getMessage("snkPersonalizedFilter.info.titleEdit") : this.getMessage("snkPersonalizedFilter.info.titleAdd"), onExit: () => this.handleCancel() }, h("div", { class: "snk-personalized-filter__header-actions", slot: "rightSlot" }, h("ez-button", { size: "small", label: this.getMessage("snkPersonalizedFilter.info.labelCancel"), onClick: () => this.handleCancel() }), h("ez-button", { size: "small", ref: (el) => this._elButtonSave = el, enabled: false, class: "ez-button--primary", label: this.getMessage("snkPersonalizedFilter.info.labelSave"), onClick: this.handleSave.bind(this) })))), h("div", { class: "ez-box ez-margin-bottom--medium ez-box__main" }, h("div", { class: "ez-box__container" }, h("div", { class: "ez-flex ez-flex--column ez-size-width--full" }, h("div", { class: "ez-flex" }, h("ez-text-input", { class: "ez-padding-right--medium", label: this.getMessage("snkPersonalizedFilter.info.labelNameFilter"), value: (_b = this._filterAssistent) === null || _b === void 0 ? void 0 : _b.name, onEzChange: (evt) => this.handleTitleChange(evt.detail) })), this._filterAssistentMode ?
-      h(Fragment, null, h("div", { class: "ez-padding-top--small snk-personalized-filter__group" }, h("snk-expression-group", { ref: (el) => this._mainExpressionGroup = el, group: (_c = this._filterAssistent) === null || _c === void 0 ? void 0 : _c.assistent, messagesBuilder: this.messagesBuilder, onEzFilterGroupChange: this.handleFilterGroupChange.bind(this), filterId: this.filterId, entityURI: this.entityUri })), h("div", null, h("div", { class: "snk-personalized-filter__expression-input--line" }), h("ez-collapsible-box", { label: this.getMessage("snkPersonalizedFilter.info.titleCollapsible"), headerSize: "medium", value: true }, h("div", { class: "ez-box" }, h("div", { class: "ez-box__container" }, h("ez-text-area", { ref: (el) => this._elTextAreaExpression = el, enabled: false, label: this.getMessage("snkPersonalizedFilter.info.labelExpression"), value: (_d = this._filterAssistent) === null || _d === void 0 ? void 0 : _d.expression })))))) :
-      h(Fragment, null, h("span", { class: "ez-text ez-text--small ez-text--bold ez-padding-bottom--medium" }, "Express\u00E3o a ser aplicada:"), h("ez-text-area", { label: this.getMessage("snkPersonalizedFilter.info.labelExpression"), value: (_e = this._filterAssistent) === null || _e === void 0 ? void 0 : _e.expression, onEzChange: (evt) => this.handleExpressionChange(evt.detail) }), this.getWarningMessageComponent())))))));
+    return (h(Host, null, h("div", { class: "snk-personalized-filter" }, h("div", null, h("snk-simple-bar", { label: this.filterId ? this.getMessage("snkPersonalizedFilter.info.titleEdit") : this.getMessage("snkPersonalizedFilter.info.titleAdd"), onExit: () => this.handleCancel() }, h("div", { class: "snk-personalized-filter__header-actions", slot: "rightSlot" }, h("ez-button", { size: "small", label: this.getMessage("snkPersonalizedFilter.info.labelCancel"), onClick: () => this.handleCancel() }), h("ez-button", { size: "small", ref: (el) => this._elButtonSave = el, enabled: false, class: "ez-button--primary", label: this.getMessage("snkPersonalizedFilter.info.labelSave"), onClick: this.handleSave.bind(this) })))), h("div", { class: "ez-box ez-margin-bottom--medium ez-box__main" }, h("div", { class: "ez-box__container" }, h("div", { class: "ez-flex ez-flex--column ez-size-width--full" }, h("div", { class: "ez-flex" }, h("ez-text-input", { class: "ez-padding-right--medium", label: this.getMessage("snkPersonalizedFilter.info.labelNameFilter"), value: (_b = this._filterAssistent) === null || _b === void 0 ? void 0 : _b.name, onEzChange: (evt) => this.handleTitleChange(evt.detail) })), this.buildContainerPersonalizedFilter()))))));
   }
   static get is() { return "snk-personalized-filter"; }
   static get encapsulation() { return "scoped"; }
@@ -313,7 +325,7 @@ export class SnkPersonalizedFilter {
             },
             "IPersonalizedFilter": {
               "location": "import",
-              "path": "./subcomponents/snk-filter-param-config/interfaces/IPersonalizedFilter"
+              "path": "./interfaces/IPersonalizedFilter"
             }
           },
           "return": "Promise<void>"

package/dist/collection/components/snk-personalized-filter/subcomponents/snk-expression-group/snk-expression-group.js

@@ -1,11 +1,11 @@
 import { h, Host, forceUpdate } from '@stencil/core';
-import { FilterGroupCondition } from '../../subcomponents/snk-filter-param-config/interfaces/IExpressionItem';
+import { FilterGroupCondition } from '../../interfaces/IExpressionItem';
 import { ApplicationUtils } from "@sankhyalabs/ezui/dist/collection/utils";
 import { ApplicationContext, ElementIDUtils, StringUtils } from '@sankhyalabs/core';
-const LIMIT_GROUP_LEVEL = 4;
 export class SnkExpressionGroup {
   constructor() {
     this.FIRST_LEVEL = "0";
+    this.LIMIT_GROUP_LEVEL = 4;
     this.application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
     this._conditionOperator = FilterGroupCondition.AND;
     this._group = undefined;
@@ -32,11 +32,11 @@ export class SnkExpressionGroup {
   }
   watchGroup(newValue) {
     this._group = newValue;
-    this._conditionOperator = !this._group.operand ? FilterGroupCondition.AND : this._group.operand;
+    this._conditionOperator = this.getOperand();
   }
   componentWillLoad() {
     this._group = this.group;
-    this._conditionOperator = !this._group.operand ? FilterGroupCondition.AND : this._group.operand;
+    this._conditionOperator = this.getOperand();
     if (!this.getDataGroupLevel()) {
       this._element.setAttribute('data-group-level', this.FIRST_LEVEL);
     }
@@ -62,6 +62,9 @@ export class SnkExpressionGroup {
   getDashedHeight() {
     return this._selfTop - this.parentTop;
   }
+  getOperand() {
+    return !this._group.operand ? FilterGroupCondition.AND : this._group.operand;
+  }
   getMessage(key, params) {
     return this.application.messagesBuilder.getMessage(key, params);
   }
@@ -95,18 +98,19 @@ export class SnkExpressionGroup {
     this.changeHandler();
     this.canAddExpression = true;
   }
+  isFilledItem(item) {
+    if (!item.fieldName || !item.operand)
+      return false;
+    if (item.operand === 'NULL' || item.operand === 'NOT_NULL') {
+      return true;
+    }
+    else {
+      return item.paramVariable || (item.userInterface === 'SWITCH') ? true : !!item.value;
+    }
+  }
   handleFilterItemChange() {
     this.ezFilterGroupChange.emit(this._group);
-    this.canAddExpression = this.group.items.every(item => {
-      if (!item.fieldName || !item.operand)
-        return false;
-      if (item.operand === 'NULL' || item.operand === 'NOT_NULL') {
-        return true;
-      }
-      else {
-        return item.paramVariable || (item.userInterface === 'SWITCH') ? true : !!item.value;
-      }
-    });
+    this.canAddExpression = this.group.items.every(this.isFilledItem);
   }
   handleAddExpression() {
     const newItem = {
@@ -195,7 +199,7 @@ export class SnkExpressionGroup {
   }
   canAddGroup() {
     const dataGroupLevel = Number(this.getDataGroupLevel() || this.FIRST_LEVEL);
-    return dataGroupLevel < LIMIT_GROUP_LEVEL;
+    return dataGroupLevel < this.LIMIT_GROUP_LEVEL;
   }
   isFirstLevel() {
     return Boolean(this.getDataGroupLevel() === this.FIRST_LEVEL);
@@ -204,7 +208,7 @@ export class SnkExpressionGroup {
     evt.preventDefault();
     evt.stopPropagation();
   }
-  handleMessageAddTooltip() {
+  getMessageAddTooltip() {
     if (this.isFirstLevel()) {
       const allValidItems = this.group.items.every(item => {
         if (!item.fieldName || !item.operand)
@@ -223,7 +227,7 @@ export class SnkExpressionGroup {
   }
   render() {
     const canAddGroup = this.canAddGroup();
-    return (h(Host, null, h("div", { class: !this.isFirstLevel() && this._showDashes ? 'dashes' : 'hidden', style: this.buildGroupStyle() }), h("div", { class: !this.isFirstLevel() && this._showDashes ? 'horizontal-dashes' : 'hidden' }), h("div", { class: 'ez-flex ez-flex--align-items-center' }, h("div", { class: 'snk-expression-group__container-condition ez-flex ez-flex-item--align-center ez-flex--align-items-center', "data-condition": this._conditionOperator, title: this.getTooltipMessageForOperator() }, h("label", { class: "ez-label ez-padding-right--medium ez-padding-left--medium ez-title--primary" }, "Condi\u00E7\u00E3o:"), h("div", null, h("ez-combo-box", Object.assign({ class: "snk-expression-group__container-option", canShowError: false, mode: "slim", suppressEmptyOption: true, enabled: this.canChangeGroupCondition(), value: this._conditionOperator, onEzChange: (evt) => this.handleConditionOperatorChange(evt.detail.value) }, { [ElementIDUtils.DATA_ELEMENT_ID_ATTRIBUTE_NAME]: `comboBoxConditions_level_${this.getDataGroupLevel()}` }), h("option", { value: FilterGroupCondition.AND }, "E"), h("option", { value: FilterGroupCondition.OR }, "OU")))), h("ez-button", { class: "ez-padding-right--medium ez-padding-left--medium", mode: "icon", iconName: "plus", size: "small", enabled: this.canAddExpression, title: this.handleMessageAddTooltip(), onClick: () => this.handleAddExpression() }), h("ez-button", { label: "Adicionar grupo", size: "small", enabled: canAddGroup, title: !canAddGroup ? this.getMessage('snkPersonalizedFilter.info.labelDisabledAddGroupButton', { LIMIT_GROUP_LEVEL: LIMIT_GROUP_LEVEL + 1 }) : '', onClick: () => this.handleAddGroup() }, h("ez-icon", { slot: "leftIcon", iconName: "plus" })), !this.isFirstLevel() && h("ez-button", { title: this.getMessage("snkPersonalizedFilter.info.labelDeleteExpression"), class: "ez-padding-left--medium", mode: "icon", iconName: "delete", size: "small", onClick: (evt) => this.confirmRemoveGroup(evt) })), h("div", { class: "ez-padding-top--small snk-expression-group__container-expression" }, h("div", { class: "ez-padding-top--small" }, this.renderExpressionItems())), h("div", { class: "ez-padding-top--small snk-expression-group__container-expression" }, h("div", { class: "ez-padding-top--small" }, this.renderGroups()))));
+    return (h(Host, null, h("div", { class: !this.isFirstLevel() && this._showDashes ? 'dashes' : 'hidden', style: this.buildGroupStyle() }), h("div", { class: !this.isFirstLevel() && this._showDashes ? 'horizontal-dashes' : 'hidden' }), h("div", { class: 'ez-flex ez-flex--align-items-center' }, h("div", { class: 'snk-expression-group__container-condition ez-flex ez-flex-item--align-center ez-flex--align-items-center', "data-condition": this._conditionOperator, title: this.getTooltipMessageForOperator() }, h("label", { class: "ez-label ez-padding-right--medium ez-padding-left--medium ez-title--primary" }, this.getMessage("snkPersonalizedFilter.info.condition")), h("div", null, h("ez-combo-box", Object.assign({ class: "snk-expression-group__container-option", canShowError: false, mode: "slim", suppressEmptyOption: true, enabled: this.canChangeGroupCondition(), value: this._conditionOperator, onEzChange: (evt) => this.handleConditionOperatorChange(evt.detail.value) }, { [ElementIDUtils.DATA_ELEMENT_ID_ATTRIBUTE_NAME]: `comboBoxConditions_level_${this.getDataGroupLevel()}` }), h("option", { value: FilterGroupCondition.AND }, "E"), h("option", { value: FilterGroupCondition.OR }, "OU")))), h("ez-button", { class: "ez-padding-right--medium ez-padding-left--medium", mode: "icon", iconName: "plus", size: "small", enabled: this.canAddExpression, title: this.getMessageAddTooltip(), onClick: () => this.handleAddExpression() }), h("ez-button", { label: this.getMessage("snkPersonalizedFilter.info.addGroup"), size: "small", enabled: canAddGroup, title: !canAddGroup ? this.getMessage('snkPersonalizedFilter.info.labelDisabledAddGroupButton', { LIMIT_GROUP_LEVEL: this.LIMIT_GROUP_LEVEL + 1 }) : '', onClick: () => this.handleAddGroup() }, h("ez-icon", { slot: "leftIcon", iconName: "plus" })), !this.isFirstLevel() && h("ez-button", { title: this.getMessage("snkPersonalizedFilter.info.labelDeleteExpression"), class: "ez-padding-left--medium", mode: "icon", iconName: "delete", size: "small", onClick: (evt) => this.confirmRemoveGroup(evt) })), h("div", { class: "ez-padding-top--small snk-expression-group__container-expression" }, h("div", { class: "ez-padding-top--small" }, this.renderExpressionItems())), h("div", { class: "ez-padding-top--small snk-expression-group__container-expression" }, h("div", { class: "ez-padding-top--small" }, this.renderGroups()))));
   }
   static get is() { return "snk-expression-group"; }
   static get encapsulation() { return "scoped"; }
@@ -266,7 +270,7 @@ export class SnkExpressionGroup {
           "references": {
             "IExpressionGroup": {
               "location": "import",
-              "path": "../../subcomponents/snk-filter-param-config/interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           }
         },
@@ -359,7 +363,7 @@ export class SnkExpressionGroup {
           "references": {
             "IExpressionGroup": {
               "location": "import",
-              "path": "../../subcomponents/snk-filter-param-config/interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           }
         }
@@ -379,7 +383,7 @@ export class SnkExpressionGroup {
           "references": {
             "IExpressionGroup": {
               "location": "import",
-              "path": "../../subcomponents/snk-filter-param-config/interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           }
         }
@@ -412,7 +416,7 @@ export class SnkExpressionGroup {
             },
             "IExpressionGroup": {
               "location": "import",
-              "path": "../../subcomponents/snk-filter-param-config/interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           },
           "return": "Promise<IExpressionGroup>"

package/dist/collection/components/snk-personalized-filter/subcomponents/snk-expression-item/snk-expression-item.js

@@ -3,16 +3,16 @@ import { ApplicationContext, ElementIDUtils, UserInterface } from '@sankhyalabs/
 import { SelectedItemType } from "../../../snk-filter-field-search/interfaces";
 import { CheckMode, ApplicationUtils } from "@sankhyalabs/ezui/dist/collection/utils";
 import { fieldBuilder } from "@sankhyalabs/ezui/dist/collection/components/ez-form-view/fieldbuilder/FieldBuilder";
-import { FilterOperand } from '../../../../lib/@types';
+import { FilterOperand } from '../../interfaces/index';
 import { FilterOperandDefault, FilterOperandTypeTextSearch, FIELD_TYPE_SEARCH_AND_TEXT } from "./filter-operands/filter-operands";
 import store from '../../../../lib/store';
 import { convertType } from '@sankhyalabs/core/dist/dataunit/metadata/DataType';
-const DEFAULT_FIELD_NAME = 'NOT_DEFINED';
 export class SnkExpressionItem {
   constructor() {
     this.application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
     this.filterOperandDefault = FilterOperandDefault;
     this.filterOperandTypeTextSearch = FilterOperandTypeTextSearch;
+    this.DEFAULT_FIELD_NAME = 'NOT_DEFINED';
     this._showValueVariable = false;
     this._fieldSelected = undefined;
     this._optionNotNull = false;
@@ -197,7 +197,7 @@ export class SnkExpressionItem {
     if (this._optionNotNull && inputFieldData || ((_b = this._elValueVariable) === null || _b === void 0 ? void 0 : _b.value) && inputFieldData || this.expression.paramVariable || this._showValueVariable || !((_c = this._fieldSelected) === null || _c === void 0 ? void 0 : _c.dataType)) {
       inputFieldData.$attrs$.enabled = false;
     }
-    if (this.expression.value) {
+    if (this.expression.value != undefined) {
       inputFieldData.$attrs$.value = this.getExpressiontValue(this.expression);
     }
     inputFieldData.$attrs$.onEzChange = (event) => {
@@ -254,7 +254,7 @@ export class SnkExpressionItem {
   }
   render() {
     var _a;
-    return (h(Host, null, h("div", { class: "dashes" }), h("div", { class: "box" }, h("div", { class: "box__container" }, h("div", { class: "box__container--input-filter" }, h("ez-filter-input", Object.assign({ ref: ref => this._elFilterInput = ref, value: (_a = this._fieldSelected) === null || _a === void 0 ? void 0 : _a.path, label: this.getMessage("snkPersonalizedFilter.info.labelSearchField"), canShowError: false, onEzChange: (evt) => this.handleChangeFilterInput(evt), onFocus: () => this.handleFocus() }, { [ElementIDUtils.DATA_ELEMENT_ID_ATTRIBUTE_NAME]: `expressionFilterInput_${this.expression.fieldName || DEFAULT_FIELD_NAME}` })), h("snk-filter-field-search", { ref: ref => this._elFilterFieldSearch = ref, searchable: false, onEzSelectFilterItem: (ev) => this.handleSelectItem(ev.detail), fieldsDataSource: this._dataSourceFetcher })), h("div", { class: "box__container--input-operator" }, h("ez-combo-box", Object.assign({ label: this.getMessage("snkPersonalizedFilter.info.labelOperator"), value: this.expression.operand, canShowError: false, options: this.buildOptionsOperator(), onEzChange: (evt) => { var _a; return this.handleChangeOperator((_a = evt.detail) === null || _a === void 0 ? void 0 : _a.value); }, suppressEmptyOption: true }, { [ElementIDUtils.DATA_ELEMENT_ID_ATTRIBUTE_NAME]: `comboBoxOperand_${this.expression.fieldName || DEFAULT_FIELD_NAME}` }))), h("div", { class: "box__container--input-value" }, !this._fieldSelected ?
+    return (h(Host, null, h("div", { class: "dashes" }), h("div", { class: "box" }, h("div", { class: "box__container" }, h("div", { class: "box__container--input-filter" }, h("ez-filter-input", Object.assign({ ref: ref => this._elFilterInput = ref, value: (_a = this._fieldSelected) === null || _a === void 0 ? void 0 : _a.path, label: this.getMessage("snkPersonalizedFilter.info.labelSearchField"), canShowError: false, onEzChange: (evt) => this.handleChangeFilterInput(evt), onFocus: () => this.handleFocus() }, { [ElementIDUtils.DATA_ELEMENT_ID_ATTRIBUTE_NAME]: `expressionFilterInput_${this.expression.fieldName || this.DEFAULT_FIELD_NAME}` })), h("snk-filter-field-search", { ref: ref => this._elFilterFieldSearch = ref, searchable: false, onEzSelectFilterItem: (ev) => this.handleSelectItem(ev.detail), fieldsDataSource: this._dataSourceFetcher })), h("div", { class: "box__container--input-operator" }, h("ez-combo-box", Object.assign({ label: this.getMessage("snkPersonalizedFilter.info.labelOperator"), value: this.expression.operand, canShowError: false, options: this.buildOptionsOperator(), onEzChange: (evt) => { var _a; return this.handleChangeOperator((_a = evt.detail) === null || _a === void 0 ? void 0 : _a.value); }, suppressEmptyOption: true }, { [ElementIDUtils.DATA_ELEMENT_ID_ATTRIBUTE_NAME]: `comboBoxOperand_${this.expression.fieldName || this.DEFAULT_FIELD_NAME}` }))), h("div", { class: "box__container--input-value" }, !this._fieldSelected ?
       h("ez-number-input", { label: "Valor", canShowError: false, enabled: (!this._showValueVariable && !this._optionNotNull) }) :
       this.buildFieldByType()), h("div", { class: "box__container--input-value-variable" }, !this._optionNotNull &&
       h("ez-check", { ref: ref => this._elValueVariable = ref, value: this.expression.paramVariable, label: this.getMessage("snkPersonalizedFilter.info.labelValueVarible"), mode: CheckMode.SWITCH, onEzChange: (evt) => this.handleChangeValueVariable(evt.detail) }), (this._showValueVariable && !this._optionNotNull) &&
@@ -283,7 +283,7 @@ export class SnkExpressionItem {
           "references": {
             "IExpressionItem": {
               "location": "import",
-              "path": "../../../snk-personalized-filter/subcomponents/snk-filter-param-config/interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           }
         },
@@ -376,7 +376,7 @@ export class SnkExpressionItem {
           "references": {
             "IExpressionItem": {
               "location": "import",
-              "path": "../../../snk-personalized-filter/subcomponents/snk-filter-param-config/interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           }
         }
@@ -396,7 +396,7 @@ export class SnkExpressionItem {
           "references": {
             "IExpressionItem": {
               "location": "import",
-              "path": "../../../snk-personalized-filter/subcomponents/snk-filter-param-config/interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           }
         }

package/dist/collection/components/snk-personalized-filter/subcomponents/snk-filter-param-config/snk-filter-param-config.js

@@ -1,7 +1,7 @@
 import { h } from "@stencil/core";
 import { ApplicationContext, DataType, ElementIDUtils, StringUtils } from "@sankhyalabs/core";
 import { ModalAction } from "@sankhyalabs/ezui/dist/collection/components/ez-modal-container";
-import { FilterConfigType, FilterEntities, FilterUserConfigTypes } from "../../../../lib/@types";
+import { FilterConfigType, FilterEntities, FilterUserConfigTypes } from "../../interfaces/index";
 import { PersonalizedFilterUtils } from "./utils/PersonalizedFilterUtils";
 export class SnkFilterParamConfig {
   constructor() {
@@ -249,7 +249,7 @@ export class SnkFilterParamConfig {
             },
             "IExpressionItem": {
               "location": "import",
-              "path": "./interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           },
           "return": "Promise<IExpressionItem>"
@@ -269,7 +269,7 @@ export class SnkFilterParamConfig {
             },
             "IExpressionItem": {
               "location": "import",
-              "path": "./interfaces/IExpressionItem"
+              "path": "../../interfaces/IExpressionItem"
             }
           },
           "return": "Promise<IExpressionItem>"

package/dist/collection/components/snk-personalized-filter/subcomponents/snk-filter-param-config/utils/PersonalizedFilterUtils.js

@@ -1,5 +1,5 @@
 import { DataType, DateUtils, NumberUtils, UserInterface } from "@sankhyalabs/core";
-import { FilterOperand } from "../../../../../lib/@types";
+import { FilterOperand } from "../../../interfaces/index";
 import FilterItemType from "../../../../snk-filter-bar/filter-item/filter-item-type.enum";
 export class PersonalizedFilterUtils {
   /**
@@ -29,16 +29,16 @@ export class PersonalizedFilterUtils {
         expression += ` IS ${FilterOperand[expressionItem.operand]}`;
         break;
       case "LIKE":
-        expression += ` LIKE ${commas}%${value}%${commas}`;
+        expression += ` LIKE '%${value}%'`;
         break;
       case "START_WITH":
-        expression += ` LIKE ${commas}${value}%${commas}`;
+        expression += ` LIKE '${value}%'`;
         break;
       case "FINISHED_WITH":
-        expression += ` LIKE ${commas}%${value}${commas}`;
+        expression += ` LIKE '%${value}'`;
         break;
       default:
-        value = isNaN(value) ? `${commas}${value}${commas}` : value;
+        value = typeof value === 'string' ? `${commas}${value}${commas}` : value;
         expression += ` ${FilterOperand[expressionItem.operand]} ${value}`;
     }
     return expression;
@@ -150,7 +150,7 @@ export class PersonalizedFilterUtils {
       value: (value, byPassValue) => {
         if (byPassValue)
           return true;
-        return !!value;
+        return value != undefined;
       },
       operand: (value) => !!value
     };

package/dist/collection/components/snk-simple-crud/snk-simple-crud.js

@@ -1,14 +1,16 @@
-import { DataType, ObjectUtils, UserInterface } from '@sankhyalabs/core';
+import { ApplicationContext, DataType, ObjectUtils, UserInterface } from '@sankhyalabs/core';
 import { h } from '@stencil/core';
 import { VIEW_MODE, SIMPLE_CRUD_MODE } from '../../lib/utils/constants';
 import { TaskbarElement } from '../snk-taskbar/elements/taskbar-elements';
 import { PresentationMode } from '../../lib';
 import TaskbarProcessor from '../snk-taskbar/processor/taskbar-processor';
 import InMemoryLoader from '../../lib/dataUnit/InMemoryLoader';
+import SnkMultiSelectionListDataSource from '../snk-grid/filtercolumn/SnkMultiSelectionListDataSource';
 export class SnkSimpleCrud {
   constructor() {
     this.REGULAR_DEFAULT_BTNS = ["INSERT", "REFRESH", "PREVIOUS", "NEXT", "DIVIDER"];
     this.REGULAR_SELECTED_BTNS = ["INSERT", "REFRESH", "PREVIOUS", "NEXT", "DIVIDER", "CLONE", "REMOVE", "DIVIDER"];
+    this._multiSelectionListDataSource = new SnkMultiSelectionListDataSource();
     this._taskbarProcessor = new TaskbarProcessor({
       "snkSimpleCrudTaskbar.form_regular": this.resolveInMemoryBtns(this.REGULAR_DEFAULT_BTNS).concat(TaskbarElement.GRID_MODE),
       "snkSimpleCrudTaskbar.grid_regular": this.resolveInMemoryBtns(this.REGULAR_DEFAULT_BTNS).concat(TaskbarElement.FORM_MODE),
@@ -70,6 +72,12 @@ export class SnkSimpleCrud {
   componentWillLoad() {
     this.processMetadata();
     this.onModeChange();
+    this.configDatasource();
+  }
+  configDatasource() {
+    const application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
+    this._multiSelectionListDataSource.setApplication(application);
+    this._multiSelectionListDataSource.setDataUnit(this.dataUnit);
   }
   getTaskBarId() {
     var _a, _b, _c;
@@ -155,7 +163,7 @@ export class SnkSimpleCrud {
   }
   render() {
     var _a;
-    return (h("snk-data-unit", { class: "simple-crud__container", dataUnit: this.dataUnit, useCancelConfirm: this.useCancelConfirm, onDataStateChange: evt => this.onDataStateChange(evt), onInsertionMode: () => this.goToView(VIEW_MODE.FORM), onDataUnitReady: (evt) => this.dataUnitReady.emit(evt.detail), onMessagesBuilderUpdated: evt => this.messagesBuilder = evt.detail }, h("header", null, h("slot", { name: "snkSimpleCrudHeader" })), h("section", { class: "ez-flex ez-box ez-box--shadow" }, h("snk-taskbar", { class: "ez-box ez-box--shadow ez-padding--medium ez-margin-bottom--large", dataUnit: this.dataUnit, primaryButton: ((_a = this.dataState) === null || _a === void 0 ? void 0 : _a.isDirty) ? "SAVE" : "INSERT", "data-element-id": "grid_left", messagesBuilder: this.messagesBuilder, buttons: this._taskbarProcessor.buttons, disabledButtons: this._taskbarProcessor.disabledButtons, customButtons: this._taskbarProcessor.customButtons, slot: "leftButtons", presentationMode: PresentationMode.SECONDARY }), h("ez-view-stack", { class: "ez-flex ez-flex--column", ref: (ref) => this._viewStack = ref, "data-element-id": "simple-crud" }, h("stack-item", null, h("ez-grid", { dataUnit: this.dataUnit, config: this.gridConfig, "no-header": true, multipleSelection: this.multipleSelection, onEzDoubleClick: () => this.goToView(VIEW_MODE.FORM) }, h("div", { slot: "footer" }, h("slot", { name: "snkSimpleCrudFooter" })))), h("stack-item", null, h("ez-form", { dataUnit: this.dataUnit, config: this.formConfig }))))));
+    return (h("snk-data-unit", { class: "simple-crud__container", dataUnit: this.dataUnit, useCancelConfirm: this.useCancelConfirm, onDataStateChange: evt => this.onDataStateChange(evt), onInsertionMode: () => this.goToView(VIEW_MODE.FORM), onDataUnitReady: (evt) => this.dataUnitReady.emit(evt.detail), onMessagesBuilderUpdated: evt => this.messagesBuilder = evt.detail }, h("header", null, h("slot", { name: "snkSimpleCrudHeader" })), h("section", { class: "ez-flex ez-box ez-box--shadow" }, h("snk-taskbar", { class: "ez-box ez-box--shadow ez-padding--medium ez-margin-bottom--large", dataUnit: this.dataUnit, primaryButton: ((_a = this.dataState) === null || _a === void 0 ? void 0 : _a.isDirty) ? "SAVE" : "INSERT", "data-element-id": "grid_left", messagesBuilder: this.messagesBuilder, buttons: this._taskbarProcessor.buttons, disabledButtons: this._taskbarProcessor.disabledButtons, customButtons: this._taskbarProcessor.customButtons, slot: "leftButtons", presentationMode: PresentationMode.SECONDARY }), h("ez-view-stack", { class: "ez-flex ez-flex--column", ref: (ref) => this._viewStack = ref, "data-element-id": "simple-crud" }, h("stack-item", null, h("ez-grid", { dataUnit: this.dataUnit, config: this.gridConfig, "no-header": true, multipleSelection: this.multipleSelection, onEzDoubleClick: () => this.goToView(VIEW_MODE.FORM), columnfilterDataSource: this._multiSelectionListDataSource }, h("div", { slot: "footer" }, h("slot", { name: "snkSimpleCrudFooter" })))), h("stack-item", null, h("ez-form", { dataUnit: this.dataUnit, config: this.formConfig }))))));
   }
   static get is() { return "snk-simple-crud"; }
   static get encapsulation() { return "scoped"; }

package/dist/collection/lib/@types/index.js

@@ -29,39 +29,3 @@ export var DataExporterType;
   DataExporterType["EXPORT_PDF_TO_EMAIL"] = "PDF";
   DataExporterType["EXPORT_XLS_TO_EMAIL"] = "XLS";
 })(DataExporterType || (DataExporterType = {}));
-export var FilterConfigType;
-(function (FilterConfigType) {
-  FilterConfigType["SYSTEM_CONFIG"] = "S";
-  FilterConfigType["USER_CONFIG"] = "E";
-})(FilterConfigType || (FilterConfigType = {}));
-export var FilterUserConfigTypes;
-(function (FilterUserConfigTypes) {
-  FilterUserConfigTypes["DATE"] = "D";
-  FilterUserConfigTypes["HORA"] = "H";
-  FilterUserConfigTypes["TEXT"] = "S";
-  FilterUserConfigTypes["INTEGER"] = "I";
-  FilterUserConfigTypes["DECIMAL"] = "F";
-  FilterUserConfigTypes["NUMBER"] = "NUMBER";
-})(FilterUserConfigTypes || (FilterUserConfigTypes = {}));
-export var FilterOperand;
-(function (FilterOperand) {
-  FilterOperand["AND"] = "AND";
-  FilterOperand["OR"] = "OR";
-  FilterOperand["IN"] = "IN";
-  FilterOperand["DIFFERENT"] = "<>";
-  FilterOperand["LIKE"] = "LIKE";
-  FilterOperand["START_WITH"] = "LIKE_START";
-  FilterOperand["FINISHED_WITH"] = "LIKE_END";
-  FilterOperand["NULL"] = "NULL";
-  FilterOperand["NOT_NULL"] = "NOT NULL";
-  FilterOperand["EQUAL"] = "=";
-  FilterOperand["LARGER"] = ">";
-  FilterOperand["LARGER_EQUAL"] = ">=";
-  FilterOperand["SMALLER"] = "<";
-  FilterOperand["SMALLER_EQUAL"] = "<=";
-})(FilterOperand || (FilterOperand = {}));
-export var FilterEntities;
-(function (FilterEntities) {
-  FilterEntities["FIELD"] = "Campo";
-  FilterEntities["INSTANCE"] = "Instancia";
-})(FilterEntities || (FilterEntities = {}));

package/dist/collection/lib/dataUnit/InMemoryLoader.js

@@ -1,11 +1,12 @@
-import { ChangeOperation, DataType, DataUnit, SortMode, StringUtils } from "@sankhyalabs/core";
+import { ChangeOperation, DataType, DataUnit, SortMode, StringUtils, } from '@sankhyalabs/core';
+import { DISTINCT_FILTER_NAME_PREFIX } from "@sankhyalabs/ezui/dist/collection/utils/constants";
 export default class InMemoryLoader {
   constructor(metadata, records) {
     this.records = records || [];
     this.metadata = metadata;
     this._dataUnit = new DataUnit("InMemoryDataUnit");
     this._dataUnit.metadataLoader = () => this.metadaLoader();
-    this._dataUnit.dataLoader = (_dataUnit, request) => this.dataLoader(_dataUnit, request);
+    this._dataUnit.dataLoader = (dataUnit, request) => this.dataLoader(dataUnit, request);
     this._dataUnit.saveLoader = (_dataUnit, changes) => this.saveLoader(_dataUnit, changes);
     this._dataUnit.removeLoader = (_dataUnit, recordIds) => this.removeLoader(_dataUnit, recordIds);
     this.dataUnit.loadMetadata().then(() => this.dataUnit.loadData());
@@ -42,8 +43,9 @@ export default class InMemoryLoader {
   metadaLoader() {
     return Promise.resolve(this._metadata);
   }
-  dataLoader(_dataUnit, request) {
-    let records = [...this._records];
+  dataLoader(dataUnit, request) {
+    const filters = this.getColumnFilters(dataUnit);
+    let records = this.applyFilters(filters);
     if (request.sort) {
       request.sort.forEach(sort => {
         records = records.sort((recordA, recordB) => {
@@ -56,6 +58,25 @@ export default class InMemoryLoader {
     }
     return Promise.resolve({ records: records });
   }
+  applyFilters(filters) {
+    let records = [...this._records];
+    filters.forEach(filter => {
+      records = records.filter(record => { var _a; return filter.values.includes((_a = record[filter.column]) === null || _a === void 0 ? void 0 : _a.toString()); });
+    });
+    return records;
+  }
+  getColumnFilters(dataUnit) {
+    var _a, _b;
+    const allFilters = (_a = dataUnit.getFilters()) !== null && _a !== void 0 ? _a : [];
+    const columnFilters = (_b = allFilters.filter(filter => { var _a; return (_a = filter.name) === null || _a === void 0 ? void 0 : _a.includes(DISTINCT_FILTER_NAME_PREFIX); })) !== null && _b !== void 0 ? _b : [];
+    return columnFilters.map(filter => {
+      var _a, _b;
+      return {
+        column: (_b = (_a = filter.name) === null || _a === void 0 ? void 0 : _a.replace(DISTINCT_FILTER_NAME_PREFIX, "")) !== null && _b !== void 0 ? _b : "",
+        values: filter.params.map(param => param.value),
+      };
+    });
+  }
   getSortFn(type) {
     switch (type) {
       case DataType.NUMBER:

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

@@ -17,7 +17,10 @@ export const snkPersonalizedFilterMessages = {
     labelNameFilter: "Nome do filtro",
     labelExpression: "Expressão SQL",
     badgeVariable: "variável",
-    noDataFound: "Nenhum filtro encontrado"
+    noDataFound: "Nenhum filtro encontrado",
+    condition: "Condição",
+    addGroup: "Adicionar grupo",
+    applyExpression: "Expressão a ser aplicada:"
   },
   confirmExpression: {
     title: "Aviso",