@sankhyalabs/sankhyablocks 8.8.0-rc.1 → 8.8.0-rc.11

package/dist/components/SnkMultiSelectionListDataSource.js

@@ -1,4 +1,5 @@
 import { UserInterface, DateUtils } from '@sankhyalabs/core';
+import InMemoryFilterColumnDataSource from '@sankhyalabs/ezui/dist/collection/components/ez-grid/utils/InMemoryFilterColumnDataSource';
 import { a as PreloadManager } from './dataunit-fetcher.js';
 
 class TaskbarProcessor {
@@ -65,11 +66,7 @@ class SnkMultiSelectionListDataSource {
     if (fieldName == undefined) {
       return Promise.resolve(undefined);
     }
-    const result = await PreloadManager.getDistinct(this._dataUnit, fieldName);
-    if (result == undefined) {
-      return Promise.resolve(undefined);
-    }
-    return Promise.resolve(Array.from(result.entries()).map(([label, value]) => ({ label: String(label), value, check: true })));
+    return Promise.resolve(await PreloadManager.getDistinct(this._dataUnit, fieldName));
   }
   fetchData(filterTerm, fieldName) {
     return new Promise(resolve => {
@@ -84,6 +81,9 @@ class SnkMultiSelectionListDataSource {
       });
     });
   }
+  sortItems(fieldName, items) {
+    return InMemoryFilterColumnDataSource.defaultSorterMultSelectionOption(this._dataUnit, fieldName, items);
+  }
 }
 
 export { SnkMultiSelectionListDataSource as S, TaskbarProcessor as T };

package/dist/components/dataunit-fetcher.js

@@ -2,6 +2,7 @@ import { DataType, FieldComparator, SortMode, DataUnit, defaultDataLoader, DateU
 import { d as dist, D as DataFetcher } from './DataFetcher.js';
 import { DISTINCT_FILTER_NAME_PREFIX } from '@sankhyalabs/ezui/dist/collection/utils/constants';
 import { DataUnitTransient } from '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
+import { ColumnFilterManager } from '@sankhyalabs/ezui/dist/collection/components/ez-grid/utils';
 import { R as ResourceIDUtils } from './ResourceIDUtils.js';
 
 class PesquisaFetcher {
@@ -187,9 +188,23 @@ class ArrayRepository {
     return Promise.resolve({ result, count });
   }
   async distict(itemProcessor) {
-    const processedItems = this._list.map(item => itemProcessor(item));
-    return Promise.resolve(new Map(processedItems.filter(item => item != undefined)
-      .map(item => [item.key, item.value])));
+    const processedItems = [];
+    let hasEmpty = false;
+    for (const item of this._list) {
+      const processedItem = itemProcessor(item);
+      if (processedItem == undefined) {
+        continue;
+      }
+      if (processedItem.value == undefined) {
+        hasEmpty = true;
+        continue;
+      }
+      processedItems.push(processedItem);
+    }
+    if (hasEmpty) {
+      processedItems.push({ key: "", value: null });
+    }
+    return Promise.resolve(new Map(processedItems.map(item => [item.key, item.value])));
   }
   async push(items) {
     this._list.push(...items);
@@ -198,7 +213,14 @@ class ArrayRepository {
     this._list = [];
   }
   async delete(items) {
-    this._list = this._list.filter(item => !items.includes(item));
+    this._list = this._list.filter(item => {
+      for (const removed of items) {
+        if (this._equalsFunction(item, removed)) {
+          return false;
+        }
+      }
+      return true;
+    });
   }
   async update(items) {
     this._list = this._list.map(existingItem => {
@@ -225,21 +247,12 @@ class ArrayRepository {
   }
 }
 
-const COLUMN_FILTER_PATTERN = /FILTRO_COLUNA_(.+)/;
 class PreloadManager {
   static setLoadingStatus(dataUnit, loadingInProgress) {
     this._loadingStatus.set(dataUnit.name, loadingInProgress);
   }
-  static isCacheEnabled(dataUnit) {
-    const dataUnitResourceId = PreloadManager.getResourceId(dataUnit.name);
-    if (dataUnitResourceId !== this.applicationResourceID) {
-      return false;
-    }
-    return this.getRepository(dataUnit).isOperating();
-  }
-  static getResourceId(dataUnitName) {
-    const dataUnitNameInfo = DataUnitFetcher.parseDataUnitName(dataUnitName);
-    return dataUnitNameInfo == undefined ? undefined : dataUnitNameInfo.resourceID;
+  static isCacheEnabled(_dataUnit) {
+    return true;
   }
   static cacheRecords(dataUnit, records, resetDatabase, loadingInProgress) {
     PreloadManager.setLoadingStatus(dataUnit, loadingInProgress);
@@ -267,18 +280,33 @@ class PreloadManager {
   }
   static async getDistinct(dataUnit, fieldName) {
     if (!PreloadManager.isCacheEnabled(dataUnit)) {
-      return Promise.resolve(undefined);
+      return Promise.resolve(ColumnFilterManager.compileDistinct(fieldName, dataUnit));
+    }
+    let filterFunction;
+    const request = dataUnit.getLastLoadRequest();
+    if (request != undefined) {
+      const columnFilters = ColumnFilterManager.getColumnFilters(request.filters);
+      filterFunction = ColumnFilterManager.getFilterFunction(dataUnit, Array.from(columnFilters.values()));
     }
     return new Promise((accept, reject) => {
       PreloadManager.getRepository(dataUnit).distict(record => {
+        if (filterFunction != undefined && !filterFunction(record)) {
+          return undefined;
+        }
         const fieldValue = record[fieldName];
         if (fieldValue == undefined) {
-          return undefined;
+          return { key: null, value: null };
         }
         const value = fieldValue.value != undefined ? fieldValue.value : fieldValue;
         return { key: dataUnit.getFormattedValue(fieldName, fieldValue), value };
       })
-        .then(values => accept(values))
+        .then(result => {
+        if (result == undefined) {
+          accept(undefined);
+          return;
+        }
+        accept(Array.from(result.entries()).map(([label, value]) => ({ label, value, check: true })));
+      })
         .catch(reason => reject(reason));
     });
   }
@@ -292,7 +320,7 @@ class PreloadManager {
             return PreloadManager.loadFromCache(dataUnit, request);
           }
         }
-        //Como não vamos aproveitar o cache, ele precisa ser limpado.
+        //Como não vamos aproveitar o cache, ele precisa ser limpo.
         PreloadManager.getRepository(dataUnit).clear().catch(() => { });
       }
       return loadFromServer(dataUnit, request);
@@ -330,39 +358,16 @@ class PreloadManager {
     }
     return PreloadManager._repositories.get(name);
   }
-  static getFilterFunction(dataUnit, filters) {
-    if (filters != undefined && filters.length > 0) {
-      return record => {
-        for (const filter of filters) {
-          if (!PreloadManager.recordMatchesFilter(dataUnit, record, filter)) {
-            return false;
-          }
-        }
-        return true;
-      };
-    }
-    return undefined;
-  }
-  static recordMatchesFilter(dataUnit, record, columnFilter) {
-    const fieldValue = record[columnFilter.columnName];
-    for (let param of columnFilter.params) {
-      const paramValue = dataUnit.valueFromString(columnFilter.columnName, param.value);
-      if (FieldComparator.compareValues(dataUnit.getField(columnFilter.columnName), fieldValue, paramValue) === 0) {
-        return true;
-      }
-    }
-    return false;
-  }
   static async loadFromCache(dataUnit, request) {
     return new Promise((accept, reject) => {
-      const columnFilters = PreloadManager.getColumnFilters(request.filters);
+      const columnFilters = ColumnFilterManager.getColumnFilters(request.filters);
       const { limit, offset, sort } = request;
       PreloadManager.getRepository(dataUnit)
-        .load(PreloadManager.getFilterFunction(dataUnit, Array.from(columnFilters.values())), PreloadManager.getSortingFunction(dataUnit, sort), offset, limit)
+        .load(ColumnFilterManager.getFilterFunction(dataUnit, Array.from(columnFilters.values())), PreloadManager.getSortingFunction(dataUnit, sort), offset, limit)
         .then(loadResult => {
         const stillLoading = PreloadManager._loadingStatus.get(dataUnit.name);
         const { count, result: records } = loadResult;
-        const firstRecord = count == 0 ? 1 : offset + 1;
+        const firstRecord = count == 0 ? 0 : offset + 1;
         const lastRecord = offset + Math.min(records.length, limit);
         const currentPage = offset / limit;
         const paginationInfo = {
@@ -375,19 +380,6 @@ class PreloadManager {
         .catch(reason => reject(reason));
     });
   }
-  static getColumnFilters(filters) {
-    const columnFilters = new Map();
-    if (filters == undefined || filters.length == 0) {
-      return columnFilters;
-    }
-    filters.forEach(filter => {
-      const match = COLUMN_FILTER_PATTERN.exec(filter.name);
-      if (match) {
-        columnFilters.set(filter.name, Object.assign({ columnName: match[1] }, filter));
-      }
-    });
-    return columnFilters;
-  }
 }
 PreloadManager._repositories = new Map();
 PreloadManager._loadingStatus = new Map();
@@ -508,17 +500,36 @@ class DatasetStrategy {
       return Promise.resolve({ records: [], loadingInfo });
     }
     try {
+      const localSorting = [];
+      const serverSorting = [];
+      if (request.sort != undefined) {
+        for (const sort of request.sort) {
+          const descriptor = dataUnit.getField(sort.field);
+          const local = descriptor != undefined
+            && descriptor.properties != undefined
+            && descriptor.properties.calculated === "true";
+          if (local) {
+            localSorting.push(sort);
+          }
+          else {
+            serverSorting.push(sort);
+          }
+        }
+      }
       const fields = this.getFieldsList(dataUnit);
       const serviceName = "DatasetSP.loadRecords";
-      const requestBody = this.buildRequestBody(serviceName, fields, dataUnit, request, loadingInfo);
-      const { result: responseRecords, pagerID: pagerId } = await DataFetcher.get().callServiceBroker(serviceName, requestBody);
+      const requestBody = this.buildRequestBody(serviceName, fields, dataUnit, request, loadingInfo, serverSorting);
+      const params = loadingInfo.quiet ? { urlParams: { quietMode: "true" } } : undefined;
+      const { result: responseRecords, pagerID: pagerId } = await DataFetcher.get().callServiceBroker(serviceName, requestBody, params);
       const records = this.processRecords(dataUnit, fields, responseRecords);
       const loadingInProgress = pagerId != undefined;
       const count = loadingInfo.count + records.length;
+      const needReload = !loadingInProgress && localSorting.length > 0;
       return Promise.resolve({
         records,
         loadingInfo: Object.assign(Object.assign({}, loadingInfo), { pagerId,
-          loadingInProgress, total: loadingInProgress ? undefined : count, count })
+          loadingInProgress, total: loadingInProgress ? undefined : count, count,
+          needReload })
       });
     }
     catch (error) {
@@ -528,7 +539,10 @@ class DatasetStrategy {
   }
   getFieldsList(dataUnit) {
     let fields = ["__record__id__", "__record__label__"];
-    dataUnit.metadata.fields.forEach(descriptor => {
+    dataUnit.metadata.fields.forEach((descriptor) => {
+      if (descriptor.standAlone) {
+        return;
+      }
       fields = fields.concat(this.getFieldNames(descriptor));
     });
     return fields;
@@ -540,7 +554,7 @@ class DatasetStrategy {
     }
     return [descriptor.name, descriptionField];
   }
-  buildRequestBody(serviceName, fields, dataUnit, request, loadingInfo) {
+  buildRequestBody(serviceName, fields, dataUnit, request, loadingInfo, sorting) {
     const dataSetID = dataUnit.dataUnitId;
     const dataUnitName = dataUnit.name;
     const entityName = DataUnitFetcher.parseDataUnitName(dataUnitName).entityName;
@@ -561,13 +575,13 @@ class DatasetStrategy {
         tryJoinedFields: true,
         parallelLoader: true,
         crudListener: "br.com.sankhya.modelcore.dataset.DataUnitDatasetAdapter",
-        txProperties: this.getTxProperties(dataUnitName, request),
+        txProperties: this.getTxProperties(dataUnitName, request, sorting),
         useDefaultRowsLimit: false
       }
     };
     return JSON.stringify(requestBody);
   }
-  getTxProperties(dataUnitName, request) {
+  getTxProperties(dataUnitName, request, sorting) {
     const txProperties = {
       "__DATA_UNIT_ADAPTER__[dataUnitName]": dataUnitName
     };
@@ -575,7 +589,6 @@ class DatasetStrategy {
     if (serverSideFilters.length !== 0) {
       txProperties["__DATA_UNIT_ADAPTER__[criteria]"] = JSON.stringify(serverSideFilters);
     }
-    const sorting = request.sort;
     if (sorting != undefined && sorting.length !== 0) {
       txProperties["__DATA_UNIT_ADAPTER__[sorting]"] = JSON.stringify(sorting);
     }
@@ -682,7 +695,7 @@ class DataUnitDataLoader {
     PreloadManager.cacheRecords(dataUnit, records, recreateCache, responseLoadingInfo.loadingInProgress);
     if (PreloadManager.isCacheEnabled(dataUnit) && responseLoadingInfo.loadingInProgress) {
       const newRequest = Object.assign(Object.assign({}, request), { offset: responseLoadingInfo.count });
-      const newLoadingInfo = Object.assign(Object.assign({}, responseLoadingInfo), { pageNumber: (responseLoadingInfo.pageNumber || 0) + 1 });
+      const newLoadingInfo = Object.assign(Object.assign({}, responseLoadingInfo), { pageNumber: (responseLoadingInfo.pageNumber || 0) + 1, quiet: true });
       this.callLoader(dataUnit, newRequest, newLoadingInfo, dataLoader)
         .then(result => DataUnitDataLoader.afterLoadingPage(dataUnit, result.loadingInfo))
         .catch(reason => console.error(reason));
@@ -700,6 +713,11 @@ class DataUnitDataLoader {
       dataUnit.updatePagination(Object.assign(Object.assign({}, dataUnitPagination), { count }));
       return;
     }
+    if (loadingInfo.needReload) {
+      //Ir para a primeira página, faz com que o loadData seja chamado novamente
+      dataUnit.gotoPage(0);
+      return;
+    }
     dataUnit.updatePagination(Object.assign(Object.assign({}, dataUnitPagination), { total: count, count }));
   }
   static registryLoading(dataUnit, loadingInfo) {
@@ -724,7 +742,7 @@ class DataUnitDataLoader {
       offset = 0;
     }
     const { total, count, loadingInProgress } = loadingInfo;
-    const firstRecord = count === 0 ? 0 : offset + 1;
+    const firstRecord = (count === 0 || pageSize === 0) ? 0 : offset + 1;
     const lastRecord = offset + Math.min(pageSize, limit);
     return {
       total,
@@ -765,6 +783,7 @@ class DataUnitFetcher {
                   defaultValue
                   label
                   visible
+                  standAlone
                   readOnly
                   required
                   dataType

package/dist/components/snk-actions-button2.js

@@ -22,13 +22,13 @@ class JavaExecutor {
       resolve({ execSource, callback: this.callExecJava });
     });
   }
-  callExecJava(execSource) {
+  async callExecJava(execSource) {
     const request = {
       requestBody: {
         javaCall: execSource
       }
     };
-    DataFetcher.get().callServiceBroker(SERVICE_ACTION_EXECUTE_JAVA, JSON.stringify(request));
+    await DataFetcher.get().callServiceBroker(SERVICE_ACTION_EXECUTE_JAVA, JSON.stringify(request));
   }
 }
 
@@ -44,11 +44,11 @@ class JavascriptExecutor {
       resolve({ execSource, callback: this.callExecScript });
     });
   }
-  callExecScript(execSource) {
+  async callExecScript(execSource) {
     const request = {
       runScript: execSource
     };
-    DataFetcher.get().callServiceBroker(SERVICE_ACTION_EXECUTE_SCRIPT, request);
+    await DataFetcher.get().callServiceBroker(SERVICE_ACTION_EXECUTE_SCRIPT, request);
   }
 }
 
@@ -110,13 +110,13 @@ class ProcedureExecutor {
       resolve({ execSource, callback: this.callExecProcedure });
     });
   }
-  callExecProcedure(execSource) {
+  async callExecProcedure(execSource) {
     const request = {
       requestBody: {
         stpCall: execSource
       }
     };
-    DataFetcher.get().callServiceBroker(SERVICE_ACTION_EXECUTE_STP, JSON.stringify(request));
+    await DataFetcher.get().callServiceBroker(SERVICE_ACTION_EXECUTE_STP, JSON.stringify(request));
   }
 }
 
@@ -506,86 +506,91 @@ class Actions {
 const CONFIRMACAO = "__CONFIRMACAO__";
 const ESCOLHA_SIM_NAO = "__ESCOLHA_SIMNAO__";
 class ClientEventConfirm {
-  clientConfirm(clientEvent, recaller) {
-    const application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
-    let actionType = "";
-    if (clientEvent.content.event.hasOwnProperty('stpCall')) {
-      recaller.requestBody = clientEvent.content.event.stpCall;
-      actionType = ActionsType.PROCEDURE;
-    }
-    else if (clientEvent.content.event.hasOwnProperty('runScript')) {
-      recaller.requestBody = clientEvent.content.event.runScript;
-      actionType = ActionsType.JAVASCRIPT;
-    }
-    else if (clientEvent.content.event.hasOwnProperty('javaCall')) {
-      recaller.requestBody = clientEvent.content.event.javaCall;
-      actionType = ActionsType.JAVA;
-    }
-    let param = {
-      type: 'S',
-      sequence: clientEvent.content.event.sequence
-    };
-    if (!recaller.requestBody.params) {
-      recaller.requestBody.params = {
-        param: []
+  async clientConfirm(clientEvent, recaller) {
+    return new Promise((resolve) => {
+      const application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
+      let actionType = "";
+      if (clientEvent.content.event.hasOwnProperty('stpCall')) {
+        recaller.requestBody = clientEvent.content.event.stpCall;
+        actionType = ActionsType.PROCEDURE;
+      }
+      else if (clientEvent.content.event.hasOwnProperty('runScript')) {
+        recaller.requestBody = clientEvent.content.event.runScript;
+        actionType = ActionsType.JAVASCRIPT;
+      }
+      else if (clientEvent.content.event.hasOwnProperty('javaCall')) {
+        recaller.requestBody = clientEvent.content.event.javaCall;
+        actionType = ActionsType.JAVA;
+      }
+      let param = {
+        type: 'S',
+        sequence: clientEvent.content.event.sequence
       };
-    }
-    else {
-      if (!Array.isArray(recaller.requestBody.params.param)) {
-        recaller.requestBody.params.param = [recaller.requestBody.params.param];
+      if (!recaller.requestBody.params) {
+        recaller.requestBody.params = {
+          param: []
+        };
       }
-    }
-    recaller.requestBody.params.param.push(param);
-    const title = clientEvent.content.event.title.$;
-    const message = clientEvent.content.event.message.$;
-    let requestBody;
-    switch (actionType) {
-      case ActionsType.JAVASCRIPT:
-        requestBody = { runScript: recaller.requestBody };
-        break;
-      case ActionsType.PROCEDURE:
-        requestBody = {
-          requestBody: {
-            stpCall: recaller.requestBody
-          }
+      else {
+        if (!Array.isArray(recaller.requestBody.params.param)) {
+          recaller.requestBody.params.param = [recaller.requestBody.params.param];
+        }
+      }
+      recaller.requestBody.params.param.push(param);
+      const title = clientEvent.content.event.title.$;
+      const message = clientEvent.content.event.message.$;
+      let requestBody;
+      switch (actionType) {
+        case ActionsType.JAVASCRIPT:
+          requestBody = { runScript: recaller.requestBody };
+          break;
+        case ActionsType.PROCEDURE:
+          requestBody = {
+            requestBody: {
+              stpCall: recaller.requestBody
+            }
+          };
+          break;
+        case ActionsType.JAVA:
+          requestBody = {
+            requestBody: {
+              javaCall: recaller.requestBody
+            }
+          };
+          break;
+      }
+      if (clientEvent.content.event.showNoOption == 'S') {
+        param.paramName = ESCOLHA_SIM_NAO;
+        const form = document.createElement("snk-client-confirm");
+        window.document.body.appendChild(form);
+        form.titleMessage = title;
+        form.message = message;
+        form.accept = async () => {
+          param.$ = 'S';
+          await recaller.reCall(requestBody);
+          resolve();
         };
-        break;
-      case ActionsType.JAVA:
-        requestBody = {
-          requestBody: {
-            javaCall: recaller.requestBody
-          }
+        form.cancel = async () => {
+          param.$ = 'N';
+          await recaller.reCall(requestBody);
+          resolve();
         };
-        break;
-    }
-    if (clientEvent.content.event.showNoOption == 'S') {
-      param.paramName = ESCOLHA_SIM_NAO;
-      const form = document.createElement("snk-client-confirm");
-      window.document.body.appendChild(form);
-      form.titleMessage = title;
-      form.message = message;
-      form.accept = () => {
-        param.$ = 'S';
-        recaller.reCall(requestBody);
-      };
-      form.cancel = () => {
-        param.$ = 'N';
-        recaller.reCall(requestBody);
-      };
-      form.openPopup();
-    }
-    else {
-      application.confirm(title, message, null, 'warn', {
-        labelCancel: "Cancelar",
-        labelConfirm: "Sim"
-      }).then((confirmResult) => {
-        if (confirmResult) {
-          param.paramName = CONFIRMACAO;
-          param.$ = 'S';
-          recaller.reCall(requestBody);
-        }
-      });
-    }
+        form.openPopup();
+      }
+      else {
+        application.confirm(title, message, null, 'warn', {
+          labelCancel: "Cancelar",
+          labelConfirm: "Sim"
+        }).then(async (confirmResult) => {
+          if (confirmResult) {
+            param.paramName = CONFIRMACAO;
+            param.$ = 'S';
+            await recaller.reCall(requestBody);
+            resolve();
+          }
+        });
+      }
+    });
   }
 }
 

package/dist/components/snk-application2.js

@@ -170,6 +170,13 @@ class Workspace {
     var _a;
     (_a = window["workspace"]) === null || _a === void 0 ? void 0 : _a.setScreenToUseOldLayout();
   }
+  static applicationClick() {
+    var _a, _b;
+    if (!((_a = window["workspace"]) === null || _a === void 0 ? void 0 : _a.applicationClick)) {
+      return;
+    }
+    (_b = window["workspace"]) === null || _b === void 0 ? void 0 : _b.applicationClick();
+  }
 }
 Workspace.resourceID = (_a = window["workspace"]) === null || _a === void 0 ? void 0 : _a.resourceID;
 
@@ -1047,6 +1054,7 @@ const SnkApplication = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
     }, 100);
     ErrorTracking.init();
     ConfigStorage.preload(this.applicationResourceID, this.configName);
+    document.addEventListener("click", () => Workspace.applicationClick());
   }
   connectedCallback() {
     ApplicationContext.setContextValue("__SNK__APPLICATION__", this);