@sankhyalabs/sankhyablocks 6.5.0 → 6.6.0

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/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/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",

package/dist/components/PersonalizedFilterUtils.js

@@ -1,7 +1,49 @@
 import { DataType, NumberUtils, DateUtils, UserInterface } from '@sankhyalabs/core';
-import { F as FilterOperand } from './index2.js';
 import { F as FilterItemType } from './filter-item-type.enum.js';
 
+var FilterGroupCondition;
+(function (FilterGroupCondition) {
+  FilterGroupCondition["AND"] = "AND";
+  FilterGroupCondition["OR"] = "OR";
+})(FilterGroupCondition || (FilterGroupCondition = {}));
+
+var FilterConfigType;
+(function (FilterConfigType) {
+  FilterConfigType["SYSTEM_CONFIG"] = "S";
+  FilterConfigType["USER_CONFIG"] = "E";
+})(FilterConfigType || (FilterConfigType = {}));
+var FilterUserConfigTypes;
+(function (FilterUserConfigTypes) {
+  FilterUserConfigTypes["DATE"] = "D";
+  FilterUserConfigTypes["HORA"] = "H";
+  FilterUserConfigTypes["TEXT"] = "S";
+  FilterUserConfigTypes["INTEGER"] = "I";
+  FilterUserConfigTypes["DECIMAL"] = "F";
+  FilterUserConfigTypes["NUMBER"] = "NUMBER";
+})(FilterUserConfigTypes || (FilterUserConfigTypes = {}));
+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 = {}));
+var FilterEntities;
+(function (FilterEntities) {
+  FilterEntities["FIELD"] = "Campo";
+  FilterEntities["INSTANCE"] = "Instancia";
+})(FilterEntities || (FilterEntities = {}));
+
 class PersonalizedFilterUtils {
   /**
    * Cria uma expressão de filtro a partir de um IExpressionItem.
@@ -30,16 +72,16 @@ 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;
@@ -151,7 +193,7 @@ class PersonalizedFilterUtils {
       value: (value, byPassValue) => {
         if (byPassValue)
           return true;
-        return !!value;
+        return value != undefined;
       },
       operand: (value) => !!value
     };
@@ -224,4 +266,4 @@ class PersonalizedFilterUtils {
   }
 }
 
-export { PersonalizedFilterUtils as P };
+export { FilterGroupCondition as F, PersonalizedFilterUtils as P, FilterOperand as a, FilterConfigType as b, FilterEntities as c, FilterUserConfigTypes as d };

package/dist/components/SnkMessageBuilder.js

@@ -361,7 +361,10 @@ 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",

package/dist/components/index.d.ts

@@ -27,7 +27,6 @@ export { SnkFilterMultiSelect as SnkFilterMultiSelect } from '../types/component
 export { SnkFilterPeriod as SnkFilterNumber } from '../types/components/snk-filter-bar/filter-item/editors/snk-filter-number';
 export { SnkFilterParamConfig as SnkFilterParamConfig } from '../types/components/snk-personalized-filter/subcomponents/snk-filter-param-config/snk-filter-param-config';
 export { SnkFilterPeriod as SnkFilterPeriod } from '../types/components/snk-filter-bar/filter-item/editors/snk-filter-period';
-export { SnkFilterPersonalized as SnkFilterPersonalized } from '../types/components/snk-filter-bar/filter-item/editors/snk-filter-personalized/snk-filter-personalized';
 export { SnkFilterSearch as SnkFilterSearch } from '../types/components/snk-filter-bar/filter-item/editors/snk-filter-search';
 export { SnkFilterText as SnkFilterText } from '../types/components/snk-filter-bar/filter-item/editors/snk-filter-text';
 export { SnkForm as SnkForm } from '../types/components/snk-form/snk-form';
@@ -38,6 +37,7 @@ export { SnkGrid as SnkGrid } from '../types/components/snk-grid/snk-grid';
 export { SnkGridConfig as SnkGridConfig } from '../types/components/snk-grid/subcomponents/snk-grid-config/snk-grid-config';
 export { SnkGuidesViewer as SnkGuidesViewer } from '../types/components/snk-crud/subcomponents/snk-guides-viewer';
 export { SnkPersonalizedFilter as SnkPersonalizedFilter } from '../types/components/snk-personalized-filter/snk-personalized-filter';
+export { SnkFilterPersonalized as SnkPersonalizedFilterEditor } from '../types/components/snk-filter-bar/filter-item/editors/snk-personalized-filter-editor/snk-personalized-filter-editor';
 export { SnkPesquisa as SnkPesquisa } from '../types/components/snk-pesquisa/snk-pesquisa';
 export { SelectBox as SnkSelectBox } from '../types/components/snk-grid/subcomponents/snk-select-box/snk-select-box';
 export { SnkSimpleBar as SnkSimpleBar } from '../types/components/snk-simple-bar/snk-simple-bar';

package/dist/components/index.js

@@ -27,7 +27,6 @@ export { SnkFilterMultiSelect, defineCustomElement as defineCustomElementSnkFilt
 export { SnkFilterNumber, defineCustomElement as defineCustomElementSnkFilterNumber } from './snk-filter-number.js';
 export { SnkFilterParamConfig, defineCustomElement as defineCustomElementSnkFilterParamConfig } from './snk-filter-param-config.js';
 export { SnkFilterPeriod, defineCustomElement as defineCustomElementSnkFilterPeriod } from './snk-filter-period.js';
-export { SnkFilterPersonalized, defineCustomElement as defineCustomElementSnkFilterPersonalized } from './snk-filter-personalized.js';
 export { SnkFilterSearch, defineCustomElement as defineCustomElementSnkFilterSearch } from './snk-filter-search.js';
 export { SnkFilterText, defineCustomElement as defineCustomElementSnkFilterText } from './snk-filter-text.js';
 export { SnkForm, defineCustomElement as defineCustomElementSnkForm } from './snk-form.js';
@@ -38,6 +37,7 @@ export { SnkGrid, defineCustomElement as defineCustomElementSnkGrid } from './sn
 export { SnkGridConfig, defineCustomElement as defineCustomElementSnkGridConfig } from './snk-grid-config.js';
 export { SnkGuidesViewer, defineCustomElement as defineCustomElementSnkGuidesViewer } from './snk-guides-viewer.js';
 export { SnkPersonalizedFilter, defineCustomElement as defineCustomElementSnkPersonalizedFilter } from './snk-personalized-filter.js';
+export { SnkPersonalizedFilterEditor, defineCustomElement as defineCustomElementSnkPersonalizedFilterEditor } from './snk-personalized-filter-editor.js';
 export { SnkPesquisa, defineCustomElement as defineCustomElementSnkPesquisa } from './snk-pesquisa.js';
 export { SnkSelectBox, defineCustomElement as defineCustomElementSnkSelectBox } from './snk-select-box.js';
 export { SnkSimpleBar, defineCustomElement as defineCustomElementSnkSimpleBar } from './snk-simple-bar.js';

package/dist/components/index2.js

@@ -29,41 +29,5 @@ var DataExporterType;
   DataExporterType["EXPORT_PDF_TO_EMAIL"] = "PDF";
   DataExporterType["EXPORT_XLS_TO_EMAIL"] = "XLS";
 })(DataExporterType || (DataExporterType = {}));
-var FilterConfigType;
-(function (FilterConfigType) {
-  FilterConfigType["SYSTEM_CONFIG"] = "S";
-  FilterConfigType["USER_CONFIG"] = "E";
-})(FilterConfigType || (FilterConfigType = {}));
-var FilterUserConfigTypes;
-(function (FilterUserConfigTypes) {
-  FilterUserConfigTypes["DATE"] = "D";
-  FilterUserConfigTypes["HORA"] = "H";
-  FilterUserConfigTypes["TEXT"] = "S";
-  FilterUserConfigTypes["INTEGER"] = "I";
-  FilterUserConfigTypes["DECIMAL"] = "F";
-  FilterUserConfigTypes["NUMBER"] = "NUMBER";
-})(FilterUserConfigTypes || (FilterUserConfigTypes = {}));
-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 = {}));
-var FilterEntities;
-(function (FilterEntities) {
-  FilterEntities["FIELD"] = "Campo";
-  FilterEntities["INSTANCE"] = "Instancia";
-})(FilterEntities || (FilterEntities = {}));
 
-export { DataExporterOption as D, FilterOperand as F, PresentationMode as P, DataExporterFormat as a, DataExporterType as b, FilterConfigType as c, FilterEntities as d, FilterUserConfigTypes as e };
+export { DataExporterOption as D, PresentationMode as P, DataExporterFormat as a, DataExporterType as b };