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

package/dist/collection/components/snk-grid/snk-grid.js

@@ -95,6 +95,7 @@ export class SnkGrid {
     if (this._gridConfig && this._dataUnit) {
       this._dataUnit.defaultSorting = this._gridConfig
         .columns
+        .filter(col => col.ascending != undefined)
         .sort((colA, colB) => colA.orderIndex - colB.orderIndex)
         .map(({ name: field, ascending }) => {
         const { dataType } = this._dataUnit.getField(field);

package/dist/collection/lib/http/data-fetcher/DataFetcher.js

@@ -6,10 +6,9 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
   function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
   function settle(resolve, reject, d, v) { Promise.resolve(v).then(function (v) { resolve({ value: v, done: d }); }, reject); }
 };
-import { ApplicationContext, ErrorException, ObjectUtils, WarningException } from '@sankhyalabs/core';
+import { ApplicationContext, ErrorException, ObjectUtils, WarningException, StringUtils } from '@sankhyalabs/core';
 import { batchRequests } from 'graphql-request';
 import UrlUtils from "../../../lib/utils/urlutils";
-import { StringUtils } from '@sankhyalabs/core';
 import { ServiceBrokerRecaller } from './recaller/ServiceBrokerRecaller';
 import { GraphQLRecaller } from './recaller/GraphQLRecaller';
 import { PrintUtils } from '../../utils/PrintUtils';
@@ -109,16 +108,16 @@ export class DataFetcher {
     if (this.ready) {
       return new Promise(async (resolve, reject) => {
         let query = this.getQueryTemplate(req);
-        const res = await this.fecthGrapql([{ document: query, variables: req.values }], quietMode);
+        const res = await this.fecthGraphQL([{ document: query, variables: req.values }], quietMode);
         if (res.errors.length > 0) {
-          if (!this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject)) {
+          if (!(await this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject))) {
             const error = this.processGraphQlErrorInfo(res.errors);
             reject(error);
           }
         }
         else {
           resolve(res.data[0][reqKey]);
-          this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject);
+          await this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject);
         }
       });
     }
@@ -132,7 +131,7 @@ export class DataFetcher {
   resolveURL() {
     return UrlUtils.getUrlBase();
   }
-  proccesGraphQLClientEvents(extensions, originalRequest, resolve, reject) {
+  async proccesGraphQLClientEvents(extensions, originalRequest, resolve, reject) {
     if (extensions == undefined) {
       return false;
     }
@@ -147,8 +146,8 @@ export class DataFetcher {
           throw new WarningException("ClientEvent não registrado", `Ocorreu o client event ${id} porém não há client event registrado na aplicação.`);
         }
         const handlers = DataFetcher.clientEventsByID.get(id);
-        handlers.forEach(handler => {
-          handler({ id, content: JSON.parse(clientEvents[id]) }, new GraphQLRecaller(originalRequest, resolve, reject));
+        handlers.forEach(async (handler) => {
+          await handler({ id, content: JSON.parse(clientEvents[id]) }, new GraphQLRecaller(originalRequest, resolve, reject));
         });
       }
       return Object.keys(clientEvents).length > 0;
@@ -234,9 +233,9 @@ export class DataFetcher {
     const urlParams = UrlUtils.getQueryParams(location.search);
     return {
       baseUrl: `${this.resolveURL()}/${module}/service.sbr`,
-      appName: "SankhyaBlocks",
+      appName: window['APPLICATION_NAME'] || "SankhyaBlocks",
       mgeSession: `${window['mgeSession'] || urlParams.get("mgeSession")}`,
-      globalID: "85C0093DFA240EAB699B4E47A10215BD",
+      globalID: window['GLOBALID'] || StringUtils.generateUUID(),
       resourceID: (window["resourceID"] || ((_a = window["workspace"]) === null || _a === void 0 ? void 0 : _a.resourceID))
     };
   }
@@ -353,17 +352,13 @@ export class DataFetcher {
   async executePendingRequest(watingRequestsById) {
     const requestsBatch = [];
     let quietMode = true;
-    watingRequestsById.forEach(async (waitingReq) => {
-      let query = this.getQueryTemplate(waitingReq.request);
+    watingRequestsById.forEach((waitingReq) => {
+      const query = this.getQueryTemplate(waitingReq.request);
       requestsBatch.push({ document: query, variables: Object.assign({}, waitingReq.request.values) });
       quietMode = quietMode && waitingReq.quietMode;
     });
-    let res = undefined;
-    let dataResponse = [];
-    let errorsResponse = [];
-    res = await this.fecthGrapql(requestsBatch, quietMode);
-    dataResponse = res.data;
-    errorsResponse = res.errors;
+    const response = await this.fecthGraphQL(requestsBatch, quietMode);
+    const { data: dataResponse, errors: errorsResponse, extensions } = response;
     //Reject promises with errors from query
     errorsResponse.forEach((errorResponse) => {
       Object.entries(errorResponse).forEach(([_key, val]) => {
@@ -373,29 +368,33 @@ export class DataFetcher {
     });
     //Resolve promises with data from query
     dataResponse.forEach((data) => {
-      Object.entries(data).forEach(([key, val]) => {
-        var _a;
-        (((_a = watingRequestsById.get(key)) === null || _a === void 0 ? void 0 : _a.resolve) || Promise.resolve)(val);
+      Object.entries(data).forEach(async ([key, val]) => {
+        const waitingRequest = watingRequestsById.get(key);
+        await this.proccesGraphQLClientEvents(extensions, waitingRequest.request, waitingRequest.resolve, waitingRequest.reject);
+        ((waitingRequest === null || waitingRequest === void 0 ? void 0 : waitingRequest.resolve) || Promise.resolve)(val);
       });
     });
   }
-  async fecthGrapql(request, quietMode) {
-    let res = undefined;
-    let dataResponse = [];
-    let errorsResponse = [];
-    let url = `${this.resolveURL() + DataFetcher.getGraphQLPath()}`;
-    const responseExtensions = [];
+  buildGraphQlURL(quietMode) {
     const mgeSession = window["mgeSession"];
-    if (mgeSession != undefined) {
+    let url = `${this.resolveURL() + DataFetcher.getGraphQLPath()}`;
+    if (mgeSession) {
       url += `?mgeSession=${mgeSession}`;
     }
     if (quietMode) {
       url += `${url.indexOf("?") > -1 ? "&" : "?"}quietMode=true`;
     }
-    DataFetcher.requestListener.forEach(listener => listener.onRequestStart({ url: url, requestBody: request }));
+    return url;
+  }
+  async fecthGraphQL(request, quietMode) {
+    const dataResponse = [];
+    const errorsResponse = [];
+    const responseExtensions = [];
+    const url = this.buildGraphQlURL(quietMode);
+    DataFetcher.requestListener.forEach(listener => listener.onRequestStart({ url, requestBody: request }));
     try {
-      res = await batchRequests(url, request, { 'Content-Type': `application/json; charset=${window['SERVER_ENCODING'] || 'UTF-8'}` });
-      res.forEach((resItem, index) => {
+      const response = await batchRequests(url, request, { 'Content-Type': `application/json; charset=${window['SERVER_ENCODING'] || 'UTF-8'}` });
+      response.forEach((resItem, index) => {
         var _a;
         if (((_a = resItem === null || resItem === void 0 ? void 0 : resItem.errors) === null || _a === void 0 ? void 0 : _a.length) > 0) {
           errorsResponse.push(resItem.errors.map((item) => this.normalizeErrorResponse(item, request, index)));
@@ -410,7 +409,7 @@ export class DataFetcher {
     }
     catch (err) {
       if (!this.isHttpError(err)) {
-        res = err.response;
+        const res = err.response;
         const req = err.request;
         Object.entries(res).forEach(([key, val]) => {
           if (val.errors) {
@@ -426,11 +425,11 @@ export class DataFetcher {
         });
       }
       else {
-        DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url: url, requestBody: request }));
+        DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url, requestBody: request }));
         throw new ErrorException("Falha de comunicação", err.message);
       }
     }
-    DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url: url, requestBody: request }));
+    DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url, requestBody: request }));
     return { data: dataResponse, errors: errorsResponse, extensions: responseExtensions };
   }
   isHttpError(err) {

package/dist/collection/lib/http/data-fetcher/fetchers/data-unit/DataUnitDataLoader.js

@@ -55,7 +55,7 @@ export default 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));
@@ -73,6 +73,11 @@ export default 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) {
@@ -97,7 +102,7 @@ export default 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,

package/dist/collection/lib/http/data-fetcher/fetchers/data-unit/cache/ArrayRepository.js

@@ -20,9 +20,23 @@ export 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);
@@ -31,7 +45,14 @@ export 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 => {

package/dist/collection/lib/http/data-fetcher/fetchers/data-unit/cache/PreloadManager.js

@@ -1,21 +1,12 @@
 import { DataUnit, FieldComparator, SortMode } from "@sankhyalabs/core";
-import DataUnitFetcher from "../dataunit-fetcher";
 import { ArrayRepository } from "./ArrayRepository";
-const COLUMN_FILTER_PATTERN = /FILTRO_COLUNA_(.+)/;
+import { ColumnFilterManager } from "@sankhyalabs/ezui/dist/collection/components/ez-grid/utils";
 export default 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);
@@ -43,18 +34,33 @@ export default 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));
     });
   }
@@ -68,7 +74,7 @@ export default 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);
@@ -106,39 +112,16 @@ export default 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 = {
@@ -151,19 +134,6 @@ export default 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();

package/dist/collection/lib/http/data-fetcher/fetchers/data-unit/dataunit-fetcher.js

@@ -33,6 +33,7 @@ export default class DataUnitFetcher {
                   defaultValue
                   label
                   visible
+                  standAlone
                   readOnly
                   required
                   dataType

package/dist/collection/lib/http/data-fetcher/fetchers/data-unit/loadstrategy/DatasetStrategy.js

@@ -11,17 +11,36 @@ export 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) {
@@ -31,7 +50,10 @@ export 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;
@@ -43,7 +65,7 @@ export 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;
@@ -64,13 +86,13 @@ export 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
     };
@@ -78,7 +100,6 @@ export 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);
     }

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

@@ -91,6 +91,9 @@ export default class PersonalizedFilterFetcher {
     });
   }
   async savePersonalizedFilter(personalizedFilter, resourceID, configName) {
+    if (!personalizedFilter || Object.keys(personalizedFilter).length == 0) {
+      return Promise.reject(new Error("personalizedFilter não pode ser vazio"));
+    }
     let personalizedFilterParsed = JSON.parse(JSON.stringify(personalizedFilter));
     personalizedFilterParsed.assistent = JSON.stringify(personalizedFilterParsed.assistent);
     return new Promise((resolve, reject) => {

package/dist/collection/lib/workspace/workspace.js

@@ -23,5 +23,12 @@ export default 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;

package/dist/components/ConfigStorage.js

@@ -271,6 +271,9 @@ class PersonalizedFilterFetcher {
     });
   }
   async savePersonalizedFilter(personalizedFilter, resourceID, configName) {
+    if (!personalizedFilter || Object.keys(personalizedFilter).length == 0) {
+      return Promise.reject(new Error("personalizedFilter não pode ser vazio"));
+    }
     let personalizedFilterParsed = JSON.parse(JSON.stringify(personalizedFilter));
     personalizedFilterParsed.assistent = JSON.stringify(personalizedFilterParsed.assistent);
     return new Promise((resolve, reject) => {

package/dist/components/DataFetcher.js

@@ -6616,16 +6616,16 @@ class DataFetcher {
     if (this.ready) {
       return new Promise(async (resolve, reject) => {
         let query = this.getQueryTemplate(req);
-        const res = await this.fecthGrapql([{ document: query, variables: req.values }], quietMode);
+        const res = await this.fecthGraphQL([{ document: query, variables: req.values }], quietMode);
         if (res.errors.length > 0) {
-          if (!this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject)) {
+          if (!(await this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject))) {
             const error = this.processGraphQlErrorInfo(res.errors);
             reject(error);
           }
         }
         else {
           resolve(res.data[0][reqKey]);
-          this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject);
+          await this.proccesGraphQLClientEvents(res === null || res === void 0 ? void 0 : res.extensions, req, resolve, reject);
         }
       });
     }
@@ -6639,7 +6639,7 @@ class DataFetcher {
   resolveURL() {
     return UrlUtils.getUrlBase();
   }
-  proccesGraphQLClientEvents(extensions, originalRequest, resolve, reject) {
+  async proccesGraphQLClientEvents(extensions, originalRequest, resolve, reject) {
     if (extensions == undefined) {
       return false;
     }
@@ -6654,8 +6654,8 @@ class DataFetcher {
           throw new WarningException("ClientEvent não registrado", `Ocorreu o client event ${id} porém não há client event registrado na aplicação.`);
         }
         const handlers = DataFetcher.clientEventsByID.get(id);
-        handlers.forEach(handler => {
-          handler({ id, content: JSON.parse(clientEvents[id]) }, new GraphQLRecaller(originalRequest, resolve, reject));
+        handlers.forEach(async (handler) => {
+          await handler({ id, content: JSON.parse(clientEvents[id]) }, new GraphQLRecaller(originalRequest, resolve, reject));
         });
       }
       return Object.keys(clientEvents).length > 0;
@@ -6729,9 +6729,9 @@ class DataFetcher {
     const urlParams = UrlUtils.getQueryParams(location.search);
     return {
       baseUrl: `${this.resolveURL()}/${module}/service.sbr`,
-      appName: "SankhyaBlocks",
+      appName: window['APPLICATION_NAME'] || "SankhyaBlocks",
       mgeSession: `${window['mgeSession'] || urlParams.get("mgeSession")}`,
-      globalID: "85C0093DFA240EAB699B4E47A10215BD",
+      globalID: window['GLOBALID'] || StringUtils.generateUUID(),
       resourceID: (window["resourceID"] || ((_a = window["workspace"]) === null || _a === void 0 ? void 0 : _a.resourceID))
     };
   }
@@ -6848,17 +6848,13 @@ class DataFetcher {
   async executePendingRequest(watingRequestsById) {
     const requestsBatch = [];
     let quietMode = true;
-    watingRequestsById.forEach(async (waitingReq) => {
-      let query = this.getQueryTemplate(waitingReq.request);
+    watingRequestsById.forEach((waitingReq) => {
+      const query = this.getQueryTemplate(waitingReq.request);
       requestsBatch.push({ document: query, variables: Object.assign({}, waitingReq.request.values) });
       quietMode = quietMode && waitingReq.quietMode;
     });
-    let res = undefined;
-    let dataResponse = [];
-    let errorsResponse = [];
-    res = await this.fecthGrapql(requestsBatch, quietMode);
-    dataResponse = res.data;
-    errorsResponse = res.errors;
+    const response = await this.fecthGraphQL(requestsBatch, quietMode);
+    const { data: dataResponse, errors: errorsResponse, extensions } = response;
     //Reject promises with errors from query
     errorsResponse.forEach((errorResponse) => {
       Object.entries(errorResponse).forEach(([_key, val]) => {
@@ -6868,29 +6864,33 @@ class DataFetcher {
     });
     //Resolve promises with data from query
     dataResponse.forEach((data) => {
-      Object.entries(data).forEach(([key, val]) => {
-        var _a;
-        (((_a = watingRequestsById.get(key)) === null || _a === void 0 ? void 0 : _a.resolve) || Promise.resolve)(val);
+      Object.entries(data).forEach(async ([key, val]) => {
+        const waitingRequest = watingRequestsById.get(key);
+        await this.proccesGraphQLClientEvents(extensions, waitingRequest.request, waitingRequest.resolve, waitingRequest.reject);
+        ((waitingRequest === null || waitingRequest === void 0 ? void 0 : waitingRequest.resolve) || Promise.resolve)(val);
       });
     });
   }
-  async fecthGrapql(request, quietMode) {
-    let res = undefined;
-    let dataResponse = [];
-    let errorsResponse = [];
-    let url = `${this.resolveURL() + DataFetcher.getGraphQLPath()}`;
-    const responseExtensions = [];
+  buildGraphQlURL(quietMode) {
     const mgeSession = window["mgeSession"];
-    if (mgeSession != undefined) {
+    let url = `${this.resolveURL() + DataFetcher.getGraphQLPath()}`;
+    if (mgeSession) {
       url += `?mgeSession=${mgeSession}`;
     }
     if (quietMode) {
       url += `${url.indexOf("?") > -1 ? "&" : "?"}quietMode=true`;
     }
-    DataFetcher.requestListener.forEach(listener => listener.onRequestStart({ url: url, requestBody: request }));
+    return url;
+  }
+  async fecthGraphQL(request, quietMode) {
+    const dataResponse = [];
+    const errorsResponse = [];
+    const responseExtensions = [];
+    const url = this.buildGraphQlURL(quietMode);
+    DataFetcher.requestListener.forEach(listener => listener.onRequestStart({ url, requestBody: request }));
     try {
-      res = await dist.batchRequests(url, request, { 'Content-Type': `application/json; charset=${window['SERVER_ENCODING'] || 'UTF-8'}` });
-      res.forEach((resItem, index) => {
+      const response = await dist.batchRequests(url, request, { 'Content-Type': `application/json; charset=${window['SERVER_ENCODING'] || 'UTF-8'}` });
+      response.forEach((resItem, index) => {
         var _a;
         if (((_a = resItem === null || resItem === void 0 ? void 0 : resItem.errors) === null || _a === void 0 ? void 0 : _a.length) > 0) {
           errorsResponse.push(resItem.errors.map((item) => this.normalizeErrorResponse(item, request, index)));
@@ -6905,7 +6905,7 @@ class DataFetcher {
     }
     catch (err) {
       if (!this.isHttpError(err)) {
-        res = err.response;
+        const res = err.response;
         const req = err.request;
         Object.entries(res).forEach(([key, val]) => {
           if (val.errors) {
@@ -6921,11 +6921,11 @@ class DataFetcher {
         });
       }
       else {
-        DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url: url, requestBody: request }));
+        DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url, requestBody: request }));
         throw new ErrorException("Falha de comunicação", err.message);
       }
     }
-    DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url: url, requestBody: request }));
+    DataFetcher.requestListener.forEach(listener => listener.onRequestEnd({ url, requestBody: request }));
     return { data: dataResponse, errors: errorsResponse, extensions: responseExtensions };
   }
   isHttpError(err) {