@sankhyalabs/sankhyablocks 6.10.0 → 7.0.1

package/dist/components/snk-personalized-filter2.js

@@ -1,16 +1,18 @@
 import { proxyCustomElement, HTMLElement, createEvent, h, Fragment, Host } from '@stencil/core/internal/client';
-import { StringUtils, ObjectUtils, ApplicationContext } from '@sankhyalabs/core';
+import { StringUtils, ObjectUtils, ApplicationContext, ElementIDUtils } from '@sankhyalabs/core';
 import { F as FilterGroupCondition, P as PersonalizedFilterUtils } from './PersonalizedFilterUtils.js';
 import { P as PersonalizedFilterFetcher, C as ConfigStorage } from './ConfigStorage.js';
 import { ApplicationUtils } from '@sankhyalabs/ezui/dist/collection/utils';
 import { s as store } from './index3.js';
-import { d as defineCustomElement$5 } from './snk-expression-group2.js';
-import { d as defineCustomElement$4 } from './snk-expression-item2.js';
+import { d as defineCustomElement$7 } from './snk-expression-group2.js';
+import { d as defineCustomElement$6 } from './snk-expression-item2.js';
+import { d as defineCustomElement$5 } from './snk-filter-advanced-mode2.js';
+import { d as defineCustomElement$4 } from './snk-filter-assistent-mode2.js';
 import { d as defineCustomElement$3 } from './snk-filter-field-search2.js';
 import { d as defineCustomElement$2 } from './snk-filter-param-config2.js';
 import { d as defineCustomElement$1 } from './snk-simple-bar2.js';
 
-const snkPersonalizedFilterCss = ".sc-snk-personalized-filter-h{display:flex;height:100%;padding:var(--space--large, 24px);--snk-personalized-filter--width:100%;--snk-personalized-filter--height:100%;--snk-personalized-filter--background-color-line:var(--color--disable-secondary);--snk-personalized-filter--margin-line:var(--border--radius-medium, 12px)}.snk-personalized-filter.sc-snk-personalized-filter{height:var(--snk-personalized-filter--width);width:var(--snk-personalized-filter--height)}.snk-personalized-filter__header-actions.sc-snk-personalized-filter{display:flex;gap:var(--space--medium)}.snk-personalized-filter__group.sc-snk-personalized-filter{flex:1}.snk-personalized-filter__expression-input--line.sc-snk-personalized-filter{width:100%;height:2px;background-color:var(--snk-personalized-filter--background-color-line);margin-top:var(--snk-personalized-filter--margin-line);margin-bottom:var(--snk-personalized-filter--margin-line)}.ez-box__main.sc-snk-personalized-filter{height:90%}";
+const snkPersonalizedFilterCss = ".sc-snk-personalized-filter-h{display:flex;height:100%;padding:var(--space--large, 24px);--snk-personalized-filter--width:100%;--snk-personalized-filter--height:100%;--snk-personalized-filter--background-color-line:var(--color--disable-secondary);--snk-personalized-filter--margin-line:var(--border--radius-medium, 12px)}.snk-personalized-filter.sc-snk-personalized-filter{height:var(--snk-personalized-filter--width);width:var(--snk-personalized-filter--height)}.snk-personalized-filter__header-actions.sc-snk-personalized-filter{display:flex;gap:var(--space--medium)}.snk-personalized-filter__group.sc-snk-personalized-filter{flex:1}.snk-personalized-filter__expression-input--line.sc-snk-personalized-filter{width:100%;height:2px;background-color:var(--snk-personalized-filter--background-color-line);margin-top:var(--snk-personalized-filter--margin-line);margin-bottom:var(--snk-personalized-filter--margin-line)}.ez-box__main.sc-snk-personalized-filter{height:90%}.snk-personalized-filter__button-mode.sc-snk-personalized-filter{height:35px}";
 
 const SnkPersonalizedFilter = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement {
   constructor() {
@@ -99,6 +101,13 @@ const SnkPersonalizedFilter = /*@__PURE__*/ proxyCustomElement(class extends HTM
     }
     this.loadFilter(this.filterId, undefined);
   }
+  componentDidRender() {
+    var _a;
+    (_a = this._viewStackRef) === null || _a === void 0 ? void 0 : _a.show(this._filterAssistentMode ? 0 : 1);
+    if (this._elButtonMode) {
+      this._elButtonMode.setAttribute(ElementIDUtils.DATA_ELEMENT_ID_ATTRIBUTE_NAME, ElementIDUtils.getInternalIDInfo(`${this._filterAssistentMode ? "advancedMode_ezButton" : "assistentMode_ezButton"}`));
+    }
+  }
   getMessage(key, params) {
     return this._application.messagesBuilder.getMessage(key, params);
   }
@@ -116,26 +125,55 @@ const SnkPersonalizedFilter = /*@__PURE__*/ proxyCustomElement(class extends HTM
   removeFilter() {
     ConfigStorage.removePersonalizedFilter(this._filterAssistent, this.configName);
   }
-  async handleFilterGroupChange() {
-    const assistent = await this._mainExpressionGroup.getExpressionGroup();
-    this._filterAssistent = Object.assign(Object.assign({}, this._filterAssistent), { assistent });
-    this._filterAssistent.parameters = PersonalizedFilterUtils.buildVariableParameters(this._filterAssistent.assistent);
-    this._elTextAreaExpression.value = PersonalizedFilterUtils.buildGroupExpression(this._filterAssistent.assistent, true);
-    this._elButtonSave.enabled = !this.hasChangesToSave();
-  }
   hasChangesToSave() {
     return JSON.stringify(this._filterAssistent) === JSON.stringify(this._originalFilterAssistent);
   }
-  handleSave() {
+  async handleSave() {
+    if (this._filterAssistentMode) {
+      const isValid = PersonalizedFilterUtils.validateFields(this._filterAssistent.assistent);
+      if (!isValid || !this._filterAssistent.name)
+        return this._application.error(this.getMessage("snkPersonalizedFilter.error.title"), this.getMessage("snkPersonalizedFilter.error.description"));
+      this.saveAssistentMode();
+    }
+    else {
+      if (!this._filterAssistent.expression || !this._filterAssistent.name)
+        return this._application.error(this.getMessage("snkPersonalizedFilter.error.title"), this.getMessage("snkPersonalizedFilter.error.description"));
+      const isValidExpressionForAdvancedMode = await this.validateExpressionBeforeSaving();
+      if (!isValidExpressionForAdvancedMode)
+        return;
+      this.saveAdvancedMode();
+    }
+  }
+  saveAssistentMode() {
     const { assistent, expression } = this._filterAssistent;
-    const isValid = PersonalizedFilterUtils.validateFields(assistent);
-    if (!isValid || !this._filterAssistent.name)
-      return this._application.error(this.getMessage("snkPersonalizedFilter.error.title"), this.getMessage("snkPersonalizedFilter.error.description"));
     const expressionQuery = !!assistent ? PersonalizedFilterUtils.buildGroupExpression(assistent) : expression;
     this._filterAssistent.expression = expressionQuery;
     this.ezSave.emit(expressionQuery);
     this.saveFilter();
   }
+  saveAdvancedMode() {
+    if (this._filterAssistent.assistent) {
+      ApplicationUtils.confirm(this.getMessage("snkPersonalizedFilter.confirmSaveModeAdvanced.title"), this.getMessage("snkPersonalizedFilter.confirmSaveModeAdvanced.description"))
+        .then((confirm) => {
+        if (!confirm)
+          return;
+        this.saveAndTransformToAdvancedMode();
+      });
+    }
+    else {
+      this.saveAndTransformToAdvancedMode();
+    }
+  }
+  saveAndTransformToAdvancedMode() {
+    this._filterAssistent.assistent = undefined;
+    this.ezSave.emit(this._filterAssistent.expression);
+    this.saveFilter();
+  }
+  async validateExpressionBeforeSaving() {
+    const { valid, message } = await this._personalizedFilterFetcher.validatePersonalizedFilter(this.entityUri, this._filterAssistent.expression);
+    valid || this._application.error(this.getMessage("snkPersonalizedFilter.error.title"), message);
+    return valid;
+  }
   handleCancel() {
     if (this.hasChangesToSave()) {
       return this.ezCancel.emit();
@@ -169,32 +207,87 @@ const SnkPersonalizedFilter = /*@__PURE__*/ proxyCustomElement(class extends HTM
     }
     return resp;
   }
-  handleExpressionChange(expression) {
+  handleExpressionChangeAdvancedMode(expression) {
     this._filterAssistent = Object.assign(Object.assign({}, this._filterAssistent), { expression });
     this._elButtonSave.enabled = !this.hasChangesToSave();
   }
-  getWarningMessageComponent() {
-    var _a;
-    if (StringUtils.isEmpty((_a = this._filterAssistent) === null || _a === void 0 ? void 0 : _a.warningMessage)) {
-      return undefined;
+  handleChangeFilterAssistentMode(filterAssistent) {
+    this._elButtonSave.enabled = !this.hasChangesToSave();
+    this._filterAssistent = Object.assign({}, filterAssistent);
+  }
+  selectField(fieldName) {
+    if (!('name' in fieldName))
+      return;
+    const fieldExpression = this.buildExpression(fieldName.entityName, fieldName.name, fieldName.entityPath);
+    const textAreaElement = this._elAdvancedMode.querySelector('ez-text-area');
+    textAreaElement.appendTextToSelection(fieldExpression);
+  }
+  buildExpression(entityName, fieldName, entityPath) {
+    if (entityPath.length > 0) {
+      entityPath.shift();
     }
-    return (h("div", { class: "ez-flex" }, h("ez-alert", { alertType: "warn" }, this._filterAssistent.warningMessage)));
+    return entityPath.length > 0 ? `${entityPath.join("->")}->${fieldName}` : `${entityName}.${fieldName}`;
+  }
+  onAddField(target) {
+    const textAreaElement = this._elAdvancedMode.querySelector('ez-text-area');
+    const options = { horizontalGap: 0, verticalGap: 12, fromRight: true };
+    textAreaElement.setFocus();
+    target.setBlur();
+    if (this._elFilterFieldSearch)
+      this._elFilterFieldSearch.show(target, options);
+  }
+  renderButtonAddField() {
+    if (this._filterAssistentMode)
+      return;
+    return (h(Fragment, null, h("ez-button", { class: "snk-personalized-filter__button-mode", label: this.getMessage("snkPersonalizedFilter.info.addField"), enabled: true, onClick: (evt) => this.onAddField(evt.target) }, h("ez-icon", { class: "ez-padding-right--small", slot: "leftIcon", iconName: "plus" })), h("snk-filter-field-search", { class: "ez-padding-left--medium", ref: ref => this._elFilterFieldSearch = ref, onEzSelectFilterItem: (evt) => this.selectField(evt.detail), fieldsDataSource: this._dataSourceFetcher })));
   }
   buildContainerPersonalizedFilter() {
-    var _a, _b, _c;
+    return (h("ez-view-stack", { ref: (ref) => this._viewStackRef = ref }, h("stack-item", null, this._filterAssistentMode &&
+      h("snk-filter-assistent-mode", { filterAssistent: this._filterAssistent, messagesBuilder: this.messagesBuilder, filterId: this.filterId, entityUri: this.entityUri, application: this._application, onEzChangeFilter: (ev) => this.handleChangeFilterAssistentMode(ev.detail) })), h("stack-item", null, h("snk-filter-advanced-mode", { ref: (ref) => this._elAdvancedMode = ref, filterAssistent: this._filterAssistent, application: this._application, onEzExpressionChange: (ev) => this.handleExpressionChangeAdvancedMode(ev.detail) }))));
+  }
+  handleModeChange() {
+    var _a, _b;
     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 })))))));
+      ApplicationUtils.confirm(this.getMessage("snkPersonalizedFilter.confirmChangeModeAssistent.title"), this.getMessage("snkPersonalizedFilter.confirmChangeModeAssistent.description"))
+        .then((canCancel) => {
+        if (!canCancel)
+          return;
+        this._filterAssistentMode = !this._filterAssistentMode;
+        if (!this.hasChangesToSave()) {
+          const expression = PersonalizedFilterUtils.buildGroupExpression(this._filterAssistent.assistent);
+          this._filterAssistent.expression = expression;
+          this._elButtonSave.enabled = !this.hasChangesToSave();
+        }
+      });
     }
     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()));
+      if (((_a = this._filterAssistent) === null || _a === void 0 ? void 0 : _a.expression) === ((_b = this._originalFilterAssistent) === null || _b === void 0 ? void 0 : _b.expression)) {
+        this._filterAssistentMode = !this._filterAssistentMode;
+      }
+      else {
+        const expressionBefore = this._filterAssistent.expression;
+        const expression = PersonalizedFilterUtils.buildGroupExpression(this._filterAssistent.assistent);
+        if (expressionBefore !== expression) {
+          ApplicationUtils.confirm(this.getMessage("snkPersonalizedFilter.confirmChangeModeAdvanced.title"), this.getMessage("snkPersonalizedFilter.confirmChangeModeAdvanced.description"))
+            .then((canCancel) => {
+            if (!canCancel)
+              return;
+            this._filterAssistent = Object.assign(Object.assign({}, this._filterAssistent), { expression });
+            this._filterAssistentMode = !this._filterAssistentMode;
+          });
+        }
+        else {
+          this._filterAssistentMode = !this._filterAssistentMode;
+        }
+      }
     }
   }
   render() {
-    var _a, _b;
+    var _a, _b, _c, _d;
     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.buildContainerPersonalizedFilter()))))));
+    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.renderButtonAddField(), h("ez-button", { ref: (el) => this._elButtonMode = el, class: "snk-personalized-filter__button-mode", label: this._filterAssistentMode ? this.getMessage("snkPersonalizedFilter.info.activeModeAdvanced") : this.getMessage("snkPersonalizedFilter.info.activeModeAssistent"), onClick: () => this.handleModeChange(), "data-tooltip": !(this._filterAssistentMode || ((_c = this._filterAssistent) === null || _c === void 0 ? void 0 : _c.assistent)) ? this.getMessage("snkPersonalizedFilter.info.tooltipDisabledAssistentMode") : undefined, "data-flow": "bottom", enabled: (!this._filterAssistent.name || Boolean(this._filterAssistentMode || ((_d = this._filterAssistent) === null || _d === void 0 ? void 0 : _d.assistent))) })), this.buildContainerPersonalizedFilter()))))));
   }
   static get watchers() { return {
     "filterId": ["loadFilter"]
@@ -213,7 +306,7 @@ function defineCustomElement() {
   if (typeof customElements === "undefined") {
     return;
   }
-  const components = ["snk-personalized-filter", "snk-expression-group", "snk-expression-item", "snk-filter-field-search", "snk-filter-param-config", "snk-simple-bar"];
+  const components = ["snk-personalized-filter", "snk-expression-group", "snk-expression-item", "snk-filter-advanced-mode", "snk-filter-assistent-mode", "snk-filter-field-search", "snk-filter-param-config", "snk-simple-bar"];
   components.forEach(tagName => { switch (tagName) {
     case "snk-personalized-filter":
       if (!customElements.get(tagName)) {
@@ -222,10 +315,20 @@ function defineCustomElement() {
       break;
     case "snk-expression-group":
       if (!customElements.get(tagName)) {
-        defineCustomElement$5();
+        defineCustomElement$7();
       }
       break;
     case "snk-expression-item":
+      if (!customElements.get(tagName)) {
+        defineCustomElement$6();
+      }
+      break;
+    case "snk-filter-advanced-mode":
+      if (!customElements.get(tagName)) {
+        defineCustomElement$5();
+      }
+      break;
+    case "snk-filter-assistent-mode":
       if (!customElements.get(tagName)) {
         defineCustomElement$4();
       }

package/dist/components/snk-simple-crud2.js

@@ -296,7 +296,7 @@ const SnkSimpleCrud = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement
     this.dataState = Object.assign({}, evt.detail);
   }
   getTaskBarDisabledButtons() {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const disabledButtons = [];
     if (!((_a = this.dataState) === null || _a === void 0 ? void 0 : _a.hasNext)) {
       disabledButtons.push(TaskbarElement.NEXT);
@@ -304,11 +304,21 @@ const SnkSimpleCrud = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement
     if (!((_b = this.dataState) === null || _b === void 0 ? void 0 : _b.hasPrevious)) {
       disabledButtons.push(TaskbarElement.PREVIOUS);
     }
+    if ((_d = (_c = this.dataState) === null || _c === void 0 ? void 0 : _c.selectionInfo) === null || _d === void 0 ? void 0 : _d.isEmpty()) {
+      disabledButtons.push(TaskbarElement.FORM_MODE);
+    }
     return disabledButtons;
   }
+  handleCancelEdit() {
+    var _a;
+    if ((_a = this.dataState) === null || _a === void 0 ? void 0 : _a.recordsIsEmpty) {
+      this.goToView(VIEW_MODE.GRID);
+      this.dataUnit.clearSelection();
+    }
+  }
   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), columnfilterDataSource: this._multiSelectionListDataSource }, 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), onCancelEdition: this.handleCancelEdit.bind(this), 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 }))))));
   }
   get _element() { return this; }
   static get watchers() { return {

package/dist/esm/{ConfigStorage-f1e805a0.js → ConfigStorage-02f17a26.js}

@@ -1,7 +1,7 @@
 import { ApplicationContext } from '@sankhyalabs/core';
 import { F as FormConfigFetcher } from './form-config-fetcher-533b895e.js';
 import { R as ResourceFetcher } from './resource-fetcher-0f20a072.js';
-import { F as FilterBarConfigFetcher } from './filter-bar-config-fetcher-a358b8e0.js';
+import { F as FilterBarConfigFetcher } from './filter-bar-config-fetcher-790283d8.js';
 import { d as dist, D as DataFetcher } from './DataFetcher-fddeb917.js';
 
 class GridConfigFetcher extends ResourceFetcher {
@@ -93,24 +93,6 @@ class PersonalizedFilterFetcher {
         active
         expression
         warningMessage
-        parameters {
-          entityName
-          fieldName
-          dataType
-          description
-          userInterface
-          label
-          searchContext {
-            entity
-            entityDescription
-            searchOptions {
-              rootEntity
-              descriptionFieldName
-              codeFieldName
-              showInactives
-            }
-          }
-        }
         assistent
       }
     }`);
@@ -128,6 +110,13 @@ class PersonalizedFilterFetcher {
         name
       }
     }`);
+    this.templateByQuery.set("validateExpression", dist.gql `
+    query($dataUnitName: String!, $expression: String!) {
+      $queryAlias$: validateExpression(dataUnitName: $dataUnitName, expression: $expression) {
+        valid
+        message
+      }
+    }`);
   }
   async loadPersonalizedFilter(resourceID, filterID, configName) {
     return new Promise((resolve, reject) => {
@@ -177,6 +166,21 @@ class PersonalizedFilterFetcher {
       });
     });
   }
+  async validatePersonalizedFilter(dataUnitName, expression) {
+    return new Promise((resolve, reject) => {
+      DataFetcher.get()
+        .callGraphQL({
+        values: { dataUnitName: dataUnitName, expression: expression },
+        query: this.templateByQuery.get("validateExpression"),
+      })
+        .then((resp) => {
+        resolve(resp);
+      })
+        .catch((error) => {
+        reject(error);
+      });
+    });
+  }
   loadFields(uri) {
     return new Promise((resolve, reject) => {
       DataFetcher.get()
@@ -222,17 +226,16 @@ class ConfigStorage {
         const resourceID = await application.getResourceID();
         ConfigStorage.instance = new ConfigStorage();
         ConfigStorage.resourceID = resourceID;
-        ConfigStorage.instance.loadFilterBarConfig(configName);
         ConfigStorage.instance.loadFormConfig(configName);
         ConfigStorage.instance.loadGridConfig(configName);
       }
     }
     return this.instance;
   }
-  async loadFilterBarConfig(name) {
+  async loadFilterBarConfig(name, urlParams) {
     const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.filterBar);
     if (!ConfigStorage.configById.has(cacheID)) {
-      ConfigStorage.configById.set(cacheID, ConfigStorage.filterBarConfigFetcher.getConfig(ConfigStorage.resourceID, name));
+      ConfigStorage.configById.set(cacheID, ConfigStorage.filterBarConfigFetcher.getConfig(ConfigStorage.resourceID, name, urlParams));
     }
     return ConfigStorage.configById.get(cacheID);
   }
@@ -284,6 +287,9 @@ class ConfigStorage {
   static async removePersonalizedFilter(personalizedFilter, configName) {
     return this.personalizedFilterFetcher.removePersonalizedFilter(personalizedFilter, this.resourceID, configName);
   }
+  static async validatePersonalizedFilter(dataUnitName, expression) {
+    return this.personalizedFilterFetcher.validatePersonalizedFilter(dataUnitName, expression);
+  }
   static buildCacheID(name, source) {
     if (name == undefined) {
       return `req_${source}_${this.resourceID}`;

package/dist/esm/{PersonalizedFilterUtils-1a167d89.js → PersonalizedFilterUtils-731cae01.js}

@@ -1,58 +1,19 @@
 import { DataType, NumberUtils, DateUtils, UserInterface } from '@sankhyalabs/core';
-import './IExpressionItem-21f225bf.js';
+import { F as FilterOperand } from './index-ae591a44.js';
 import { F as FilterItemType } from './filter-item-type.enum-5028ed3f.js';
 
-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.
    * @param expressionItem - Objeto com os parâmetros necessários para montar a expressão.
    * @returns Retorna a expressão de filtro.
    */
-  static buildFilterExpression(expressionItem, ignoreInvalidExpressions = false) {
+  static buildFilterExpression(expressionItem) {
+    var _a;
     if (expressionItem == undefined) {
       return;
     }
-    if (!this.validateExpressionItem(expressionItem) && ignoreInvalidExpressions) {
-      return "";
-    }
-    let value = this.buildVariableParameterValue(expressionItem);
+    let value = (_a = this.buildVariableParameterValue(expressionItem)) !== null && _a !== void 0 ? _a : undefined;
     let expression = expressionItem.expression || "";
     let commas = "'";
     if (expressionItem.paramVariable) {
@@ -76,8 +37,13 @@ class PersonalizedFilterUtils {
         expression += ` LIKE '%${value}'`;
         break;
       default:
-        value = typeof value === 'string' ? `${commas}${value}${commas}` : value;
-        expression += ` ${FilterOperand[expressionItem.operand]} ${value}`;
+        if (expressionItem.operand) {
+          expression += ` ${FilterOperand[expressionItem.operand]}`;
+        }
+        if (value) {
+          value = isNaN(value) ? `${commas}${value}${commas}` : value;
+          expression += ` ${value}`;
+        }
     }
     return expression;
   }
@@ -101,7 +67,7 @@ class PersonalizedFilterUtils {
        pois para filtros herdados do HTML5 não temos o tipo OBJECT, fazendo com que a expressão
        fique inválida para campos do tipo pesquisa.
       */
-      if (UserInterface.SEARCH === expressionItem.userInterface || DataType.OBJECT == type) {
+      if (UserInterface.SEARCH === expressionItem.userInterface || expressionItem.userInterface === UserInterface.OPTIONSELECTOR || DataType.OBJECT == type) {
         value = (_a = value === null || value === void 0 ? void 0 : value.value) !== null && _a !== void 0 ? _a : value;
       }
       if (DataType.NUMBER == type && value != undefined) {
@@ -143,11 +109,11 @@ class PersonalizedFilterUtils {
   /*
   * Cria uma expressão de filtro para um grupo de itens.
   */
-  static buildGroupExpression(expressionGroup, ignoreInvalidExpressions = false) {
+  static buildGroupExpression(expressionGroup) {
     var _a, _b;
     if (!((_a = expressionGroup === null || expressionGroup === void 0 ? void 0 : expressionGroup.items) === null || _a === void 0 ? void 0 : _a.length))
       return "";
-    const itemExpressions = expressionGroup.items.map((item) => this.buildFilterExpression(item, ignoreInvalidExpressions)).join(` ${expressionGroup.operand} `);
+    const itemExpressions = expressionGroup.items.map((item) => this.buildFilterExpression(item)).join(` ${expressionGroup.operand} `);
     if (((_b = expressionGroup === null || expressionGroup === void 0 ? void 0 : expressionGroup.childrenGroups) === null || _b === void 0 ? void 0 : _b.length) > 0) {
       const childGroupExpressions = expressionGroup.childrenGroups.map((children) => this.buildGroupExpression(children)).join(` ${expressionGroup.operand} `);
       return `(${itemExpressions} ${expressionGroup.operand} (${childGroupExpressions}))`;
@@ -234,7 +200,6 @@ class PersonalizedFilterUtils {
   * do tipo variavel;
   */
   static buildVariableParameters(expressionGroup) {
-    var _a, _b, _c, _d;
     const allItems = this.buildPlainExpressionItems(expressionGroup);
     const allParams = [];
     for (const item of allItems) {
@@ -243,22 +208,11 @@ class PersonalizedFilterUtils {
       }
       allParams.push({
         entityName: item.entityName,
-        fieldName: item.fieldName,
-        dataType: item.type,
-        description: item.description,
-        userInterface: item.userInterface,
-        label: item.fieldLabel,
-        searchContext: {
-          entity: (_b = (_a = item.props) === null || _a === void 0 ? void 0 : _a.find(prop => prop.name == "ENTITYNAME")) === null || _b === void 0 ? void 0 : _b.value,
-          entityDescription: (_d = (_c = item.props) === null || _c === void 0 ? void 0 : _c.find(prop => prop.name == "DESCRIPTIONENTITY")) === null || _d === void 0 ? void 0 : _d.value,
-          searchOptions: {
-            showInactives: false
-          }
-        }
+        fieldName: item.fieldName
       });
     }
     return allParams;
   }
 }
 
-export { FilterOperand as F, PersonalizedFilterUtils as P, FilterConfigType as a, FilterEntities as b, FilterUserConfigTypes as c };
+export { PersonalizedFilterUtils as P };

package/dist/esm/{SnkFormConfigManager-324f6dc7.js → SnkFormConfigManager-cd9e6cab.js}

@@ -1,4 +1,4 @@
-import { C as ConfigStorage } from './ConfigStorage-f1e805a0.js';
+import { C as ConfigStorage } from './ConfigStorage-02f17a26.js';
 import { ObjectUtils } from '@sankhyalabs/core';
 import { F as FormConfigFetcher } from './form-config-fetcher-533b895e.js';
 

package/dist/esm/{SnkMessageBuilder-76f62087.js → SnkMessageBuilder-5be56185.js}

@@ -359,12 +359,16 @@ const snkPersonalizedFilterMessages = {
     labelCancel: "Cancelar",
     labelSave: "Salvar",
     labelNameFilter: "Nome do filtro",
-    labelExpression: "Expressão SQL",
+    labelExpression: "Expressão",
     badgeVariable: "variável",
     noDataFound: "Nenhum filtro encontrado",
     condition: "Condição",
     addGroup: "Adicionar grupo",
-    applyExpression: "Expressão a ser aplicada:"
+    addField: "Adicionar campo",
+    applyExpression: "Expressão a ser aplicada:",
+    tooltipDisabledAssistentMode: "Expressão não suportada pelo assistente.",
+    activeModeAdvanced: "Ativar modo avançado",
+    activeModeAssistent: "Ativar modo assistente"
   },
   confirmExpression: {
     title: "Aviso",
@@ -378,6 +382,18 @@ const snkPersonalizedFilterMessages = {
     title: "Aviso",
     description: `As alterações realizadas serão descartadas.</br></br><b>Gostaria de continuar?</b>`
   },
+  confirmChangeModeAssistent: {
+    title: "Aviso",
+    description: `Ao modificar a expressão, o modo assistente será desabilitado.</br></br><b>Gostaria de continuar?</b>`
+  },
+  confirmChangeModeAdvanced: {
+    title: "Aviso",
+    description: `Ao retornar ao modo assistente suas alterações serão perdidas.</br></br><b>Gostaria de continuar?</b>`
+  },
+  confirmSaveModeAdvanced: {
+    title: "Aviso",
+    description: `Ao modificar a expressão, o modo assistente será desabilitado.</br></br><b>Gostaria de continuar?</b>`
+  },
   operador: {
     firstLevel: "A seleção será habilitada a partir da adição da segunda linha de regras.",
     and: "Será verdadeiro se todas as condições forem obedecidas.",

package/dist/esm/{filter-bar-config-fetcher-a358b8e0.js → filter-bar-config-fetcher-790283d8.js}

@@ -75,9 +75,9 @@ class FilterBarConfigFetcher extends ResourceFetcher {
   saveConfig(items, resourceID, configName) {
     return this.saveResource(this.normalize(items), this.getPath(resourceID, configName));
   }
-  getConfig(resourceID, configName) {
+  getConfig(resourceID, configName, urlParams) {
     return new Promise((accept, reject) => {
-      this.loadResource(this.getPath(resourceID, configName))
+      this.loadResource(this.getPath(resourceID, configName, urlParams))
         .then((configAsString) => {
         let fieldsList;
         if (configAsString) {
@@ -125,11 +125,28 @@ class FilterBarConfigFetcher extends ResourceFetcher {
       return item;
     });
   }
-  getPath(resourceID, name) {
+  getPath(resourceID, name, urlParams) {
+    let path = `cfg://filter/FilterBarState:${resourceID}`;
     if (name) {
-      return `cfg://filter/FilterBarState:${resourceID}.${name}`;
+      path += `.${name}`;
     }
-    return `cfg://filter/FilterBarState:${resourceID}`;
+    if (urlParams) {
+      path += this.buildQueryString(urlParams);
+    }
+    return path;
+  }
+  buildQueryString(urlParams) {
+    let queryString = '?';
+    for (let key in urlParams) {
+      if (!urlParams.hasOwnProperty(key)) {
+        continue;
+      }
+      if (queryString.length > 1) {
+        queryString += '&';
+      }
+      queryString += key + '=' + urlParams[key];
+    }
+    return queryString;
   }
 }
 

package/dist/esm/index-620ac460.js

@@ -0,0 +1,7 @@
+var SelectedItemType;
+(function (SelectedItemType) {
+  SelectedItemType["LINK"] = "LINK";
+  SelectedItemType["FIELD"] = "FIELD";
+})(SelectedItemType || (SelectedItemType = {}));
+
+export { SelectedItemType as S };