@sankhyalabs/sankhyablocks 6.10.0 → 7.0.1

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

@@ -49,24 +49,6 @@ export default class PersonalizedFilterFetcher {
         active
         expression
         warningMessage
-        parameters {
-          entityName
-          fieldName
-          dataType
-          description
-          userInterface
-          label
-          searchContext {
-            entity
-            entityDescription
-            searchOptions {
-              rootEntity
-              descriptionFieldName
-              codeFieldName
-              showInactives
-            }
-          }
-        }
         assistent
       }
     }`);
@@ -84,6 +66,13 @@ export default class PersonalizedFilterFetcher {
         name
       }
     }`);
+    this.templateByQuery.set("validateExpression", gql `
+    query($dataUnitName: String!, $expression: String!) {
+      $queryAlias$: validateExpression(dataUnitName: $dataUnitName, expression: $expression) {
+        valid
+        message
+      }
+    }`);
   }
   async loadPersonalizedFilter(resourceID, filterID, configName) {
     return new Promise((resolve, reject) => {
@@ -133,6 +122,21 @@ export default 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()

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

@@ -15,12 +15,16 @@ export 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",
@@ -34,6 +38,18 @@ export 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/components/ConfigStorage.js

@@ -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/components/PersonalizedFilterUtils.js

@@ -50,14 +50,12 @@ class PersonalizedFilterUtils {
    * @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) {
@@ -81,8 +79,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;
   }
@@ -106,7 +109,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) {
@@ -148,11 +151,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}))`;
@@ -239,7 +242,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) {
@@ -248,18 +250,7 @@ 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;

package/dist/components/SnkMessageBuilder.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/components/filter-bar-config-fetcher.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/components/index.d.ts

@@ -15,6 +15,8 @@ export { SnkExporterEmailSender as SnkExporterEmailSender } from '../types/compo
 export { SnkExpressionGroup as SnkExpressionGroup } from '../types/components/snk-personalized-filter/subcomponents/snk-expression-group/snk-expression-group';
 export { SnkExpressionItem as SnkExpressionItem } from '../types/components/snk-personalized-filter/subcomponents/snk-expression-item/snk-expression-item';
 export { SnkFieldConfig as SnkFieldConfig } from '../types/components/snk-form/subcomponents/snk-field-config/snk-field-config';
+export { SnkFilterAdvancedMode as SnkFilterAdvancedMode } from '../types/components/snk-personalized-filter/subcomponents/snk-filter-advanced-mode/snk-filter-advanced-mode';
+export { SnkFilterAssistentMode as SnkFilterAssistentMode } from '../types/components/snk-personalized-filter/subcomponents/snk-filter-assistent-mode/snk-filter-assistent-mode';
 export { SnkFilterBar as SnkFilterBar } from '../types/components/snk-filter-bar/snk-filter-bar';
 export { SnkFilterBinarySelect as SnkFilterBinarySelect } from '../types/components/snk-filter-bar/filter-item/editors/snk-filter-binary-select';
 export { SnkFilterDetail as SnkFilterDetail } from '../types/components/snk-filter-bar/filter-item/snk-filter-detail';

package/dist/components/index.js

@@ -15,6 +15,8 @@ export { SnkExporterEmailSender, defineCustomElement as defineCustomElementSnkEx
 export { SnkExpressionGroup, defineCustomElement as defineCustomElementSnkExpressionGroup } from './snk-expression-group.js';
 export { SnkExpressionItem, defineCustomElement as defineCustomElementSnkExpressionItem } from './snk-expression-item.js';
 export { SnkFieldConfig, defineCustomElement as defineCustomElementSnkFieldConfig } from './snk-field-config.js';
+export { SnkFilterAdvancedMode, defineCustomElement as defineCustomElementSnkFilterAdvancedMode } from './snk-filter-advanced-mode.js';
+export { SnkFilterAssistentMode, defineCustomElement as defineCustomElementSnkFilterAssistentMode } from './snk-filter-assistent-mode.js';
 export { SnkFilterBar, defineCustomElement as defineCustomElementSnkFilterBar } from './snk-filter-bar.js';
 export { SnkFilterBinarySelect, defineCustomElement as defineCustomElementSnkFilterBinarySelect } from './snk-filter-binary-select.js';
 export { SnkFilterDetail, defineCustomElement as defineCustomElementSnkFilterDetail } from './snk-filter-detail.js';

package/dist/components/snk-crud.js

@@ -5,17 +5,19 @@ import './DataFetcher.js';
 import './pesquisa-fetcher.js';
 import { P as PresentationMode } from './index2.js';
 import { V as VIEW_MODE } from './constants.js';
-import { d as defineCustomElement$t } from './snk-actions-button2.js';
-import { d as defineCustomElement$s } from './snk-attach2.js';
-import { d as defineCustomElement$r } from './snk-config-options2.js';
-import { d as defineCustomElement$q } from './snk-configurator2.js';
-import { d as defineCustomElement$p } from './snk-data-exporter2.js';
-import { d as defineCustomElement$o } from './snk-data-unit2.js';
-import { d as defineCustomElement$8, a as defineCustomElement$n } from './snk-detail-view2.js';
-import { d as defineCustomElement$m } from './snk-exporter-email-sender2.js';
-import { d as defineCustomElement$l } from './snk-expression-group2.js';
-import { d as defineCustomElement$k } from './snk-expression-item2.js';
-import { d as defineCustomElement$j } from './snk-field-config2.js';
+import { d as defineCustomElement$v } from './snk-actions-button2.js';
+import { d as defineCustomElement$u } from './snk-attach2.js';
+import { d as defineCustomElement$t } from './snk-config-options2.js';
+import { d as defineCustomElement$s } from './snk-configurator2.js';
+import { d as defineCustomElement$r } from './snk-data-exporter2.js';
+import { d as defineCustomElement$q } from './snk-data-unit2.js';
+import { d as defineCustomElement$8, a as defineCustomElement$p } from './snk-detail-view2.js';
+import { d as defineCustomElement$o } from './snk-exporter-email-sender2.js';
+import { d as defineCustomElement$n } from './snk-expression-group2.js';
+import { d as defineCustomElement$m } from './snk-expression-item2.js';
+import { d as defineCustomElement$l } from './snk-field-config2.js';
+import { d as defineCustomElement$k } from './snk-filter-advanced-mode2.js';
+import { d as defineCustomElement$j } from './snk-filter-assistent-mode2.js';
 import { d as defineCustomElement$i } from './snk-filter-bar2.js';
 import { d as defineCustomElement$h } from './snk-filter-detail2.js';
 import { d as defineCustomElement$g } from './snk-filter-field-search2.js';
@@ -216,7 +218,7 @@ function defineCustomElement$1() {
   if (typeof customElements === "undefined") {
     return;
   }
-  const components = ["snk-crud", "snk-actions-button", "snk-attach", "snk-config-options", "snk-configurator", "snk-data-exporter", "snk-data-unit", "snk-detail-view", "snk-exporter-email-sender", "snk-expression-group", "snk-expression-item", "snk-field-config", "snk-filter-bar", "snk-filter-detail", "snk-filter-field-search", "snk-filter-item", "snk-filter-param-config", "snk-form-config", "snk-form-summary", "snk-form-view", "snk-grid", "snk-grid-config", "snk-guides-viewer", "snk-personalized-filter", "snk-select-box", "snk-simple-bar", "snk-simple-crud", "snk-tab-config", "snk-taskbar"];
+  const components = ["snk-crud", "snk-actions-button", "snk-attach", "snk-config-options", "snk-configurator", "snk-data-exporter", "snk-data-unit", "snk-detail-view", "snk-exporter-email-sender", "snk-expression-group", "snk-expression-item", "snk-field-config", "snk-filter-advanced-mode", "snk-filter-assistent-mode", "snk-filter-bar", "snk-filter-detail", "snk-filter-field-search", "snk-filter-item", "snk-filter-param-config", "snk-form-config", "snk-form-summary", "snk-form-view", "snk-grid", "snk-grid-config", "snk-guides-viewer", "snk-personalized-filter", "snk-select-box", "snk-simple-bar", "snk-simple-crud", "snk-tab-config", "snk-taskbar"];
   components.forEach(tagName => { switch (tagName) {
     case "snk-crud":
       if (!customElements.get(tagName)) {
@@ -225,55 +227,65 @@ function defineCustomElement$1() {
       break;
     case "snk-actions-button":
       if (!customElements.get(tagName)) {
-        defineCustomElement$t();
+        defineCustomElement$v();
       }
       break;
     case "snk-attach":
       if (!customElements.get(tagName)) {
-        defineCustomElement$s();
+        defineCustomElement$u();
       }
       break;
     case "snk-config-options":
       if (!customElements.get(tagName)) {
-        defineCustomElement$r();
+        defineCustomElement$t();
       }
       break;
     case "snk-configurator":
       if (!customElements.get(tagName)) {
-        defineCustomElement$q();
+        defineCustomElement$s();
       }
       break;
     case "snk-data-exporter":
       if (!customElements.get(tagName)) {
-        defineCustomElement$p();
+        defineCustomElement$r();
       }
       break;
     case "snk-data-unit":
       if (!customElements.get(tagName)) {
-        defineCustomElement$o();
+        defineCustomElement$q();
       }
       break;
     case "snk-detail-view":
       if (!customElements.get(tagName)) {
-        defineCustomElement$n();
+        defineCustomElement$p();
       }
       break;
     case "snk-exporter-email-sender":
       if (!customElements.get(tagName)) {
-        defineCustomElement$m();
+        defineCustomElement$o();
       }
       break;
     case "snk-expression-group":
       if (!customElements.get(tagName)) {
-        defineCustomElement$l();
+        defineCustomElement$n();
       }
       break;
     case "snk-expression-item":
       if (!customElements.get(tagName)) {
-        defineCustomElement$k();
+        defineCustomElement$m();
       }
       break;
     case "snk-field-config":
+      if (!customElements.get(tagName)) {
+        defineCustomElement$l();
+      }
+      break;
+    case "snk-filter-advanced-mode":
+      if (!customElements.get(tagName)) {
+        defineCustomElement$k();
+      }
+      break;
+    case "snk-filter-assistent-mode":
       if (!customElements.get(tagName)) {
         defineCustomElement$j();
       }

package/dist/components/snk-data-unit2.js

@@ -291,7 +291,8 @@ const SnkDataUnit = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement {
       hasDirtyRecords: this.dataUnit.hasDirtyRecords(),
       selectedRecords: undefined,
       selectionInfo,
-      selectedRecord: this.dataUnit.getSelectedRecord()
+      selectedRecord: this.dataUnit.getSelectedRecord(),
+      recordsIsEmpty: this.dataUnit.records.length === 0
     });
   }
   /**
@@ -442,6 +443,7 @@ class DataStateImpl {
     this.hasPrevious = datastate.hasPrevious;
     this.selectionInfo = datastate.selectionInfo;
     this.selectedRecord = datastate.selectedRecord;
+    this.recordsIsEmpty = datastate.recordsIsEmpty;
   }
   get selectedRecords() {
     var _a;