@sankhyalabs/sankhyablocks 1.3.31-beta.6 → 1.3.32

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

@@ -1,10 +1,9 @@
-import { ChangeOperation, DataType, DataUnit, StringUtils } from "@sankhyalabs/core";
-import { gql } from "graphql-request";
+import { DataUnit, ChangeOperation, StringUtils, DataType, } from "@sankhyalabs/core";
 import { DataFetcher } from "../DataFetcher";
+import { gql } from "graphql-request";
 export default class DataUnitFetcher {
   constructor() {
     this.templateByQuery = new Map();
-    this._loadDataTimeout = {};
     this.buldTemplates();
   }
   buldTemplates() {
@@ -33,9 +32,9 @@ export default class DataUnitFetcher {
                 }
               }
             }`);
-    this.templateByQuery.set("fetchData", gql `query($dataunit: String! $limit: Int $offset:Int $filters: [InputFilter!] $sort: [InputSort!]) {
+    this.templateByQuery.set("fetchData", gql `query($dataunit: String! $limit: Int $offset:Int $filter: [InputFilter!] $sort: [InputSort!]) {
             $queryAlias$: fetchDataUnit(name: $dataunit){
-              data(limit: $limit offset: $offset filters: $filters sort: $sort){
+              data(limit: $limit offset: $offset filters: $filter sort: $sort){
                 limit
                 offset
                 total
@@ -64,7 +63,7 @@ export default class DataUnitFetcher {
   getDataUnit(entityName, resourceID) {
     const dataUnit = new DataUnit(`dd://${entityName}/${resourceID}`);
     dataUnit.metadataLoader = (dataUnit) => this.loadMetadata(dataUnit);
-    dataUnit.dataLoader = (dataUnit, request) => this.loadData(dataUnit, request);
+    dataUnit.dataLoader = (dataUnit, page, sort, filters) => this.loadData(dataUnit, page, sort, filters);
     dataUnit.saveLoader = (dataUnit, changes) => this.saveData(dataUnit, changes);
     dataUnit.removeLoader = (dataUnit, recordIds) => this.removeRecords(dataUnit, recordIds);
     return dataUnit;
@@ -101,39 +100,25 @@ export default class DataUnitFetcher {
       });
     });
   }
-  loadData(dataUnit, request) {
-    const duName = dataUnit.name;
-    if (this._loadDataTimeout[duName]) {
-      clearTimeout(this._loadDataTimeout[duName]);
-      delete this._loadDataTimeout[duName];
-    }
-    return new Promise((resolve, reject) => {
-      this._loadDataTimeout[duName] = setTimeout(() => {
-        delete this._loadDataTimeout[duName];
-        this.doLoadData(dataUnit, request)
-          .then(result => resolve(result))
-          .catch(reason => reject(reason));
-      }, 200);
-    });
-  }
-  doLoadData(dataUnit, request) {
+  loadData(dataUnit, page, sort, filter) {
     return new Promise((resolve, reject) => {
-      var _a;
-      const { sort, filters, limit, offset, quickFilter } = request;
-      const variables = { dataunit: dataUnit.name, sort, filters };
-      variables.limit = limit;
-      variables.offset = offset;
-      if (!StringUtils.isEmpty(quickFilter === null || quickFilter === void 0 ? void 0 : quickFilter.term)) {
+      var _a, _b, _c;
+      const variables = { dataunit: dataUnit.name, sort, filter };
+      if (page) {
+        variables.limit = page.limit;
+        variables.offset = page.offset;
+      }
+      if (!StringUtils.isEmpty((_a = page === null || page === void 0 ? void 0 : page.quickFilter) === null || _a === void 0 ? void 0 : _a.term)) {
         if (variables.filter === undefined) {
           variables.filter = [];
         }
         const quickFilterCriteria = {
           name: "__QUICK_FILTER__",
           expression: "__QUICK_FILTER__",
-          params: [{ name: "term", dataType: DataType.TEXT, value: quickFilter.term }]
+          params: [{ name: "term", dataType: DataType.TEXT, value: page.quickFilter.term }]
         };
-        if (((_a = quickFilter === null || quickFilter === void 0 ? void 0 : quickFilter.fields) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-          quickFilterCriteria.params.push({ name: "fields", dataType: DataType.OBJECT, value: quickFilter.fields });
+        if (((_c = (_b = page.quickFilter) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+          quickFilterCriteria.params.push({ name: "fields", dataType: DataType.OBJECT, value: page.quickFilter.fields });
         }
         variables.filter.push(quickFilterCriteria);
       }
@@ -143,32 +128,16 @@ export default class DataUnitFetcher {
         query: this.templateByQuery.get("fetchData"),
       })
         .then((resp) => {
-        const { limit, offset, total, hasMore, records } = resp.data;
-        let paginationInfo;
-        if (limit) {
-          const firstRecord = offset + 1;
-          const lastRecord = offset + Math.min(records.length, limit);
-          const currentPage = offset / limit;
-          paginationInfo = {
-            firstRecord,
-            lastRecord,
-            total,
-            currentPage,
-            hasMore
-          };
-        }
-        const processedRecords = [];
-        records.forEach((responseRecord) => {
+        const pageResult = resp.data;
+        const records = [];
+        pageResult.records.forEach((responseRecord) => {
           const duRecord = { __record__id__: responseRecord.id };
           responseRecord.fields.forEach(({ name, value }) => {
             duRecord[name] = dataUnit.valueFromString(name, value);
           });
-          processedRecords.push(duRecord);
-        });
-        resolve({
-          paginationInfo,
-          records: processedRecords
+          records.push(duRecord);
         });
+        resolve(Object.assign(Object.assign({}, pageResult), { records }));
       })
         .catch((error) => {
         reject(error);

package/dist/collection/lib/http/data-fetcher/fetchers/grid-config-fetcher.js

@@ -4,16 +4,15 @@ export default class GridConfigFetcher extends ResourceFetcher {
     super(...arguments);
     this.GRID_CONFIG_VERSION = "V3:";
   }
-  getConfig(_gridName, resourceID) {
+  getConfig(resourceID) {
     const completePath = `cfg://grid/${this.GRID_CONFIG_VERSION}${resourceID}`;
     return new Promise((resolve, reject) => {
       this.loadResource(completePath)
         .then(loadedResource => {
-        let config = undefined;
         if (loadedResource) {
-          config = JSON.parse(loadedResource);
+          let config = JSON.parse(loadedResource);
+          resolve(config);
         }
-        resolve(config);
       }).catch((error) => {
         reject(error);
       });

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

@@ -16,6 +16,8 @@ export class PesquisaFetcher {
             }`);
   }
   loadSearchOptions(entityName, argument, criteria, options) {
+    const cleanText = (argument === null || argument === void 0 ? void 0 : argument.trim()) || undefined;
+    argument = isNaN(Number(cleanText)) && cleanText ? `%${cleanText}` : cleanText;
     return new Promise((resolve, reject) => {
       DataFetcher.get()
         .callGraphQL({