@sankhyalabs/sankhyablocks 8.1.0-dev.10 → 8.1.0-dev.12

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

@@ -23,6 +23,7 @@ export class SnkTaskbar {
     };
     this._permissions = undefined;
     this.configName = undefined;
+    this.resourceID = undefined;
     this.buttons = undefined;
     this.customButtons = undefined;
     this.actionsList = undefined;
@@ -164,7 +165,7 @@ export class SnkTaskbar {
   componentWillLoad() {
     this._application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
     if (this._application) {
-      this._application.getAllAccess().then(access => this._permissions = access);
+      this._application.getAllAccess(this.resourceID).then(access => this._permissions = access);
     }
     else {
       this._permissions = {};
@@ -232,6 +233,23 @@ export class SnkTaskbar {
         "attribute": "config-name",
         "reflect": false
       },
+      "resourceID": {
+        "type": "string",
+        "mutable": false,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": "Identificador de recursos como configura\u00E7\u00F5es e acesso."
+        },
+        "attribute": "resource-i-d",
+        "reflect": false
+      },
       "buttons": {
         "type": "string",
         "mutable": false,

package/dist/collection/lib/configs/ConfigStorage.js

@@ -1,4 +1,3 @@
-import { ApplicationContext } from "@sankhyalabs/core";
 import { FormConfigFetcher } from "../http/data-fetcher/fetchers/form-config-fetcher";
 import GridConfigFetcher from "../http/data-fetcher/fetchers/grid-config-fetcher";
 import FilterBarConfigFetcher from "../http/data-fetcher/fetchers/filter-bar-config-fetcher";
@@ -9,83 +8,73 @@ const CONFIG_SOURCE = {
   filterBar: "filterBar"
 };
 export class ConfigStorage {
-  static async get() {
-    if (!ConfigStorage.instance) {
-      const application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
-      if (application != undefined) {
-        const configName = application.configName;
-        const resourceID = await application.getResourceID();
-        ConfigStorage.instance = new ConfigStorage();
-        ConfigStorage.resourceID = resourceID;
-        ConfigStorage.instance.loadFormConfig(configName);
-        ConfigStorage.instance.loadGridConfig(configName);
-      }
-    }
-    return this.instance;
+  static preload(resourceID, configName) {
+    ConfigStorage.loadFormConfig(configName, resourceID);
+    ConfigStorage.loadGridConfig(configName, resourceID);
   }
-  async loadFilterBarConfig(name, urlParams) {
-    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.filterBar);
+  static async loadFilterBarConfig(name, resourceID, urlParams) {
+    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.filterBar, resourceID);
     if (!ConfigStorage.configById.has(cacheID)) {
-      ConfigStorage.configById.set(cacheID, ConfigStorage.filterBarConfigFetcher.getConfig(ConfigStorage.resourceID, name, urlParams));
+      ConfigStorage.configById.set(cacheID, ConfigStorage.filterBarConfigFetcher.getConfig(resourceID, name, urlParams));
     }
     return ConfigStorage.configById.get(cacheID);
   }
-  async loadFormConfig(name) {
-    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.form);
+  static async loadFormConfig(name, resourceID) {
+    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.form, resourceID);
     if (!ConfigStorage.configById.has(cacheID)) {
-      ConfigStorage.configById.set(cacheID, ConfigStorage.formConfigFetcher.loadFormConfig(name, ConfigStorage.resourceID));
+      ConfigStorage.configById.set(cacheID, ConfigStorage.formConfigFetcher.loadFormConfig(name, resourceID));
     }
     return ConfigStorage.configById.get(cacheID);
   }
-  async loadGridConfig(name) {
-    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.grid);
+  static async loadGridConfig(name, resourceID) {
+    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.grid, resourceID);
     if (!ConfigStorage.configById.has(cacheID)) {
-      ConfigStorage.configById.set(cacheID, ConfigStorage.gridConfigFetcher.getConfig(name, ConfigStorage.resourceID));
+      ConfigStorage.configById.set(cacheID, ConfigStorage.gridConfigFetcher.getConfig(name, resourceID));
     }
     return ConfigStorage.configById.get(cacheID);
   }
-  static async saveFilterBarConfig(config, name) {
-    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.filterBar);
+  static async saveFilterBarConfig(config, name, resourceID) {
+    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.filterBar, resourceID);
     this.configById.delete(cacheID);
-    return this.filterBarConfigFetcher.saveConfig(config, this.resourceID, name);
+    return this.filterBarConfigFetcher.saveConfig(config, resourceID, name);
   }
-  static async saveFormConfig(config, name) {
-    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.form);
+  static async saveFormConfig(config, name, resourceID) {
+    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.form, resourceID);
     this.configById.delete(cacheID);
-    return this.formConfigFetcher.saveConfig(config, name, this.resourceID);
+    return this.formConfigFetcher.saveConfig(config, name, resourceID);
   }
-  static async saveCardState(config, name) {
-    return this.formConfigFetcher.saveCardState(config, name, this.resourceID);
+  static async saveCardState(config, name, resourceID) {
+    return this.formConfigFetcher.saveCardState(config, name, resourceID);
   }
-  static async saveGridConfig(config, name) {
+  static async saveGridConfig(config, name, resourceID) {
     if (config == undefined) {
       return;
     }
-    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.grid);
+    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.grid, resourceID);
     this.configById.delete(cacheID);
-    return this.gridConfigFetcher.saveConfig(config, name, this.resourceID);
+    return this.gridConfigFetcher.saveConfig(config, name, resourceID);
   }
-  static async loadPersonalizedFilter(filterId, configName) {
-    return this.personalizedFilterFetcher.loadPersonalizedFilter(this.resourceID, filterId, configName);
+  static async loadPersonalizedFilter(filterId, resourceID, configName) {
+    return this.personalizedFilterFetcher.loadPersonalizedFilter(resourceID, filterId, configName);
   }
-  static async savePersonalizedFilter(personalizedFilter, configName) {
+  static async savePersonalizedFilter(personalizedFilter, resourceID, configName) {
     //Ao criar ou alterar um filtro personalizado, 
     //precisamos remover o cache do status da filterbar.
-    const cacheID = this.buildCacheID(configName, CONFIG_SOURCE.filterBar);
+    const cacheID = this.buildCacheID(configName, CONFIG_SOURCE.filterBar, resourceID);
     this.configById.delete(cacheID);
-    return this.personalizedFilterFetcher.savePersonalizedFilter(personalizedFilter, this.resourceID, configName);
+    return this.personalizedFilterFetcher.savePersonalizedFilter(personalizedFilter, resourceID, configName);
   }
-  static async removePersonalizedFilter(personalizedFilter, configName) {
-    return this.personalizedFilterFetcher.removePersonalizedFilter(personalizedFilter, this.resourceID, configName);
+  static async removePersonalizedFilter(personalizedFilter, resourceID, configName) {
+    return this.personalizedFilterFetcher.removePersonalizedFilter(personalizedFilter, resourceID, configName);
   }
   static async validatePersonalizedFilter(dataUnitName, expression) {
     return this.personalizedFilterFetcher.validatePersonalizedFilter(dataUnitName, expression);
   }
-  static buildCacheID(name, source) {
+  static buildCacheID(name, source, resourceID) {
     if (name == undefined) {
-      return `req_${source}_${this.resourceID}`;
+      return `req_${source}_${resourceID}`;
     }
-    return `req_${source}_${name}_${this.resourceID}`;
+    return `req_${source}_${name}_${resourceID}`;
   }
 }
 ConfigStorage.configById = new Map();

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

@@ -8,6 +8,7 @@ import { PrintUtils } from '../../utils/PrintUtils';
 export class DataFetcher {
   constructor() {
     this.GRAPHQL_PATH = "/mgefin-bff/graphql";
+    this.ready = true;
     this.watingRequestsById = new Map();
   }
   static get() {
@@ -18,6 +19,9 @@ export class DataFetcher {
         DataFetcher.instance.resume();
       }
       else {
+        if (ApplicationContext.getContextValue("__SNK__APPLICATION__LOADING__") === true) {
+          DataFetcher.instance.pause();
+        }
         application.addEventListener('applicationLoading', () => DataFetcher.instance.pause());
         application.addEventListener('applicationLoaded', () => DataFetcher.instance.resume());
       }
@@ -76,6 +80,10 @@ export class DataFetcher {
   }
   async callGraphQL(req) {
     var _a;
+    if (this.ready) {
+      this.pause();
+      window.requestAnimationFrame(() => this.resume());
+    }
     const reqKey = this.getReqKey(req);
     req.queryID = reqKey;
     req.values.queryID = reqKey;
@@ -105,7 +113,7 @@ export class DataFetcher {
       if (!this.watingRequestsById.has(reqKey)) {
         this.watingRequestsById.set(reqKey, new WaitingRequest(req));
       }
-      return (_a = this.getWatingRequest(reqKey)) === null || _a === void 0 ? void 0 : _a.promise;
+      return (_a = this.watingRequestsById.get(reqKey)) === null || _a === void 0 ? void 0 : _a.promise;
     }
   }
   resolveURL() {
@@ -253,42 +261,43 @@ export class DataFetcher {
   getQueryTemplate(re) {
     return (re.query || "").replaceAll("$queryAlias$", re.queryID);
   }
-  getWatingRequest(reqID) {
-    return this.watingRequestsById.get(reqID);
-  }
   pause() {
     this.ready = false;
   }
   async resume() {
     this.ready = true;
     if (this.watingRequestsById.size > 0) {
-      const requestsBatch = [];
-      this.watingRequestsById.forEach(async (waitingReq) => {
-        let query = this.getQueryTemplate(waitingReq.request);
-        requestsBatch.push({ document: query, variables: Object.assign({}, waitingReq.request.values) });
-      });
-      let res = undefined;
-      let dataResponse = [];
-      let errorsResponse = [];
-      res = await this.fecthGrapql(requestsBatch);
-      dataResponse = res.data;
-      errorsResponse = res.errors;
-      //Reject promises with errors from query
-      errorsResponse.forEach((errorResponse) => {
-        Object.entries(errorResponse).forEach(([_key, val]) => {
-          var _a;
-          (((_a = this.getWatingRequest(val.request.variables[val.index].queryID)) === null || _a === void 0 ? void 0 : _a.reject) || Promise.reject)(new ErrorException("Falha detectada", val.message));
-        });
+      const waitinRequests = this.watingRequestsById;
+      this.watingRequestsById = new Map();
+      this.executePendingRequest(waitinRequests);
+    }
+  }
+  async executePendingRequest(watingRequestsById) {
+    const requestsBatch = [];
+    watingRequestsById.forEach(async (waitingReq) => {
+      let query = this.getQueryTemplate(waitingReq.request);
+      requestsBatch.push({ document: query, variables: Object.assign({}, waitingReq.request.values) });
+    });
+    let res = undefined;
+    let dataResponse = [];
+    let errorsResponse = [];
+    res = await this.fecthGrapql(requestsBatch);
+    dataResponse = res.data;
+    errorsResponse = res.errors;
+    //Reject promises with errors from query
+    errorsResponse.forEach((errorResponse) => {
+      Object.entries(errorResponse).forEach(([_key, val]) => {
+        var _a;
+        (((_a = watingRequestsById.get(val.request.variables[val.index].queryID)) === null || _a === void 0 ? void 0 : _a.reject) || Promise.reject)(new ErrorException("Falha detectada", val.message));
       });
-      //Resolve promises with data from query
-      dataResponse.forEach((data) => {
-        Object.entries(data).forEach(([key, val]) => {
-          var _a;
-          (((_a = this.getWatingRequest(key)) === null || _a === void 0 ? void 0 : _a.resolve) || Promise.resolve)(val);
-        });
+    });
+    //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);
       });
-      this.watingRequestsById.clear();
-    }
+    });
   }
   async fecthGrapql(request) {
     let res = undefined;

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

@@ -91,30 +91,6 @@ export default class FilterBarConfigFetcher extends ResourceFetcher {
       });
     });
   }
-  saveEntityListConfig(item, resourceID, configName) {
-    return new Promise((accept, reject) => {
-      this.getConfig(resourceID, configName).then(config => {
-        const state = config.map(({ id, value, fixed, visible, type, groupedItems }) => {
-          return Object.assign(Object.assign(Object.assign(Object.assign({ id }, (value && { value: normalizeValue(value, type) })), (fixed && { fixed })), (visible && { visible: true })), { groupedItems });
-        });
-        const index = state.findIndex(({ id }) => id === item.id);
-        const newItem = { id: item.id, value: normalizeValue(item.value, item.type), fixed: item.fixed, visible: true };
-        if (index > -1) {
-          state[index] = newItem;
-        }
-        else {
-          state.push(newItem);
-        }
-        this.saveResource(state, this.getPath(resourceID, configName)).then(resp => {
-          accept(resp);
-        }).catch(exception => {
-          reject(exception);
-        });
-      }).catch(exception => {
-        reject(exception);
-      });
-    });
-  }
   buildFieldList(items) {
     return items.map(item => {
       var _a, _b;

package/dist/collection/lib/index.js

@@ -2,3 +2,13 @@ export { DataFetcher } from './http/data-fetcher/DataFetcher';
 export { PesquisaFetcher } from './http/data-fetcher/fetchers/pesquisa-fetcher';
 export { CrudUtils } from './utils/CrudUtils';
 export { PresentationMode } from "./@types";
+export { TotalsFetcher } from './http/data-fetcher/fetchers/totals-fetcher';
+export { default as ApplicationConfigFetcher } from './http/data-fetcher/fetchers/application-config-fetcher';
+export { AttachFetcher } from './http/data-fetcher/fetchers/attach-fetcher';
+export { default as DataUnitFetcher } from './http/data-fetcher/fetchers/dataunit-fetcher';
+export { default as FilterBarConfigFetcher } from './http/data-fetcher/fetchers/filter-bar-config-fetcher';
+export { FormConfigFetcher } from './http/data-fetcher/fetchers/form-config-fetcher';
+export { default as GridConfigFetcher } from './http/data-fetcher/fetchers/grid-config-fetcher';
+export { default as ParametersFetcher } from './http/data-fetcher/fetchers/parameters-fecher';
+export { default as PersonalizedFilterFetcher } from './http/data-fetcher/fetchers/personalized-filter-fetcher';
+export { ResourceFetcher } from './http/data-fetcher/fetchers/resource-fetcher';

package/dist/collection/lib/resourceid/ResourceIDUtils.js

@@ -0,0 +1,7 @@
+import { ApplicationContext } from "@sankhyalabs/core";
+export default class ResourceIDUtils {
+  static async getResourceID() {
+    const application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
+    return application.getResourceID();
+  }
+}

package/dist/components/ConfigStorage.js

@@ -1,9 +1,132 @@
-import { ApplicationContext } from '@sankhyalabs/core';
-import { F as FormConfigFetcher } from './form-config-fetcher.js';
-import { R as ResourceFetcher } from './resource-fetcher.js';
-import { F as FilterBarConfigFetcher } from './filter-bar-config-fetcher.js';
+import { R as ResourceFetcher, F as FormConfigFetcher } from './form-config-fetcher.js';
+import { F as FilterItemType } from './filter-item-type.enum.js';
 import { d as dist, D as DataFetcher } from './DataFetcher.js';
 
+var __rest = (undefined && undefined.__rest) || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+    t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function")
+    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+      if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+        t[p[i]] = s[p[i]];
+    }
+  return t;
+};
+function normalizeValue(value, type) {
+  if (value == undefined) {
+    return value;
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  if (typeof value === "object") {
+    if (value instanceof Array) {
+      return value.map(item => {
+        if (FilterItemType.MULTI_LIST === type) {
+          const values = __rest(item, ["label"]);
+          return normalizeValue(values);
+        }
+        return normalizeValue(item);
+      });
+    }
+    else {
+      const normalized = Object.assign({}, value);
+      Object.keys(value).forEach(prop => {
+        if (value[prop] !== undefined) {
+          normalized[prop] = normalizeValue(value[prop], type);
+        }
+        else {
+          delete normalized[prop];
+        }
+      });
+      return normalized;
+    }
+  }
+  return value;
+}
+class FilterBarConfigFetcher extends ResourceFetcher {
+  normalize(items) {
+    return items.map(item => {
+      const { id, value, fixed, visible, type, groupedItems } = item;
+      const stateItem = { id };
+      if (value) {
+        stateItem["value"] = normalizeValue(value, type);
+      }
+      if (fixed) {
+        stateItem["fixed"] = fixed;
+      }
+      if (groupedItems) {
+        if (groupedItems.length === 0) {
+          return;
+        }
+        if (groupedItems.filter(item => item.visible).length > 0) {
+          stateItem["visible"] = true;
+        }
+        stateItem["groupedItems"] = this.normalize(groupedItems);
+      }
+      else {
+        if (visible) {
+          stateItem["visible"] = true;
+        }
+      }
+      return stateItem;
+    }).filter(item => item != undefined);
+  }
+  saveConfig(items, resourceID, configName) {
+    return this.saveResource(this.normalize(items), this.getPath(resourceID, configName));
+  }
+  getConfig(resourceID, configName, urlParams) {
+    return new Promise((accept, reject) => {
+      this.loadResource(this.getPath(resourceID, configName, urlParams))
+        .then((configAsString) => {
+        let fieldsList;
+        if (configAsString) {
+          const filterBarConfig = JSON.parse(configAsString);
+          fieldsList = this.buildFieldList(filterBarConfig.items);
+        }
+        accept(fieldsList || []);
+      })
+        .catch((error) => {
+        reject(error);
+      });
+    });
+  }
+  buildFieldList(items) {
+    return items.map(item => {
+      var _a, _b;
+      if (item.type === FilterItemType.MULTI_LIST) {
+        const multiListValue = item.value;
+        item.value = (_b = (_a = multiListValue === null || multiListValue === void 0 ? void 0 : multiListValue.elements) !== null && _a !== void 0 ? _a : multiListValue === null || multiListValue === void 0 ? void 0 : multiListValue.members) !== null && _b !== void 0 ? _b : multiListValue;
+      }
+      return item;
+    });
+  }
+  getPath(resourceID, name, urlParams) {
+    let path = `cfg://filter/FilterBarState:${resourceID}`;
+    if (name) {
+      path += `.${name}`;
+    }
+    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;
+  }
+}
+
 class GridConfigFetcher extends ResourceFetcher {
   constructor() {
     super(...arguments);
@@ -218,83 +341,73 @@ const CONFIG_SOURCE = {
   filterBar: "filterBar"
 };
 class ConfigStorage {
-  static async get() {
-    if (!ConfigStorage.instance) {
-      const application = ApplicationContext.getContextValue("__SNK__APPLICATION__");
-      if (application != undefined) {
-        const configName = application.configName;
-        const resourceID = await application.getResourceID();
-        ConfigStorage.instance = new ConfigStorage();
-        ConfigStorage.resourceID = resourceID;
-        ConfigStorage.instance.loadFormConfig(configName);
-        ConfigStorage.instance.loadGridConfig(configName);
-      }
-    }
-    return this.instance;
+  static preload(resourceID, configName) {
+    ConfigStorage.loadFormConfig(configName, resourceID);
+    ConfigStorage.loadGridConfig(configName, resourceID);
   }
-  async loadFilterBarConfig(name, urlParams) {
-    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.filterBar);
+  static async loadFilterBarConfig(name, resourceID, urlParams) {
+    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.filterBar, resourceID);
     if (!ConfigStorage.configById.has(cacheID)) {
-      ConfigStorage.configById.set(cacheID, ConfigStorage.filterBarConfigFetcher.getConfig(ConfigStorage.resourceID, name, urlParams));
+      ConfigStorage.configById.set(cacheID, ConfigStorage.filterBarConfigFetcher.getConfig(resourceID, name, urlParams));
     }
     return ConfigStorage.configById.get(cacheID);
   }
-  async loadFormConfig(name) {
-    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.form);
+  static async loadFormConfig(name, resourceID) {
+    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.form, resourceID);
     if (!ConfigStorage.configById.has(cacheID)) {
-      ConfigStorage.configById.set(cacheID, ConfigStorage.formConfigFetcher.loadFormConfig(name, ConfigStorage.resourceID));
+      ConfigStorage.configById.set(cacheID, ConfigStorage.formConfigFetcher.loadFormConfig(name, resourceID));
     }
     return ConfigStorage.configById.get(cacheID);
   }
-  async loadGridConfig(name) {
-    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.grid);
+  static async loadGridConfig(name, resourceID) {
+    const cacheID = ConfigStorage.buildCacheID(name, CONFIG_SOURCE.grid, resourceID);
     if (!ConfigStorage.configById.has(cacheID)) {
-      ConfigStorage.configById.set(cacheID, ConfigStorage.gridConfigFetcher.getConfig(name, ConfigStorage.resourceID));
+      ConfigStorage.configById.set(cacheID, ConfigStorage.gridConfigFetcher.getConfig(name, resourceID));
     }
     return ConfigStorage.configById.get(cacheID);
   }
-  static async saveFilterBarConfig(config, name) {
-    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.filterBar);
+  static async saveFilterBarConfig(config, name, resourceID) {
+    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.filterBar, resourceID);
     this.configById.delete(cacheID);
-    return this.filterBarConfigFetcher.saveConfig(config, this.resourceID, name);
+    return this.filterBarConfigFetcher.saveConfig(config, resourceID, name);
   }
-  static async saveFormConfig(config, name) {
-    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.form);
+  static async saveFormConfig(config, name, resourceID) {
+    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.form, resourceID);
     this.configById.delete(cacheID);
-    return this.formConfigFetcher.saveConfig(config, name, this.resourceID);
+    return this.formConfigFetcher.saveConfig(config, name, resourceID);
   }
-  static async saveCardState(config, name) {
-    return this.formConfigFetcher.saveCardState(config, name, this.resourceID);
+  static async saveCardState(config, name, resourceID) {
+    return this.formConfigFetcher.saveCardState(config, name, resourceID);
   }
-  static async saveGridConfig(config, name) {
+  static async saveGridConfig(config, name, resourceID) {
     if (config == undefined) {
       return;
     }
-    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.grid);
+    const cacheID = this.buildCacheID(name, CONFIG_SOURCE.grid, resourceID);
     this.configById.delete(cacheID);
-    return this.gridConfigFetcher.saveConfig(config, name, this.resourceID);
+    return this.gridConfigFetcher.saveConfig(config, name, resourceID);
   }
-  static async loadPersonalizedFilter(filterId, configName) {
-    return this.personalizedFilterFetcher.loadPersonalizedFilter(this.resourceID, filterId, configName);
+  static async loadPersonalizedFilter(filterId, resourceID, configName) {
+    return this.personalizedFilterFetcher.loadPersonalizedFilter(resourceID, filterId, configName);
   }
-  static async savePersonalizedFilter(personalizedFilter, configName) {
+  static async savePersonalizedFilter(personalizedFilter, resourceID, configName) {
     //Ao criar ou alterar um filtro personalizado, 
     //precisamos remover o cache do status da filterbar.
-    const cacheID = this.buildCacheID(configName, CONFIG_SOURCE.filterBar);
+    const cacheID = this.buildCacheID(configName, CONFIG_SOURCE.filterBar, resourceID);
     this.configById.delete(cacheID);
-    return this.personalizedFilterFetcher.savePersonalizedFilter(personalizedFilter, this.resourceID, configName);
+    return this.personalizedFilterFetcher.savePersonalizedFilter(personalizedFilter, resourceID, configName);
   }
-  static async removePersonalizedFilter(personalizedFilter, configName) {
-    return this.personalizedFilterFetcher.removePersonalizedFilter(personalizedFilter, this.resourceID, configName);
+  static async removePersonalizedFilter(personalizedFilter, resourceID, configName) {
+    return this.personalizedFilterFetcher.removePersonalizedFilter(personalizedFilter, resourceID, configName);
   }
   static async validatePersonalizedFilter(dataUnitName, expression) {
     return this.personalizedFilterFetcher.validatePersonalizedFilter(dataUnitName, expression);
   }
-  static buildCacheID(name, source) {
+  static buildCacheID(name, source, resourceID) {
     if (name == undefined) {
-      return `req_${source}_${this.resourceID}`;
+      return `req_${source}_${resourceID}`;
     }
-    return `req_${source}_${name}_${this.resourceID}`;
+    return `req_${source}_${name}_${resourceID}`;
   }
 }
 ConfigStorage.configById = new Map();
@@ -303,4 +416,4 @@ ConfigStorage.formConfigFetcher = new FormConfigFetcher();
 ConfigStorage.gridConfigFetcher = new GridConfigFetcher();
 ConfigStorage.personalizedFilterFetcher = new PersonalizedFilterFetcher();
 
-export { ConfigStorage as C, GridConfigFetcher as G, PersonalizedFilterFetcher as P };
+export { ConfigStorage as C, PersonalizedFilterFetcher as P };