@unbxd-ui/unbxd-react-components 0.2.122 → 0.2.123

package/core/dataLoader.js

@@ -34,8 +34,8 @@ var DataLoader = /*#__PURE__*/function () {
       return x;
     });
     _defineProperty(this, "_middlewares", {});
-    _defineProperty(this, "apiCallRef", false);
-    _defineProperty(this, "abortController", null);
+    _defineProperty(this, "apiCallRef", {});
+    _defineProperty(this, "abortController", {});
     _defineProperty(this, "previousUrlData", {});
   }
   _createClass(DataLoader, [{
@@ -105,10 +105,10 @@ var DataLoader = /*#__PURE__*/function () {
   }, {
     key: "setPreviousUrlData",
     value: function setPreviousUrlData(requestId, method) {
-      this.previousUrlData = {
+      this.previousUrlData = _objectSpread(_objectSpread({}, this.previousUrlData), {}, _defineProperty({}, requestId, {
         url: requestId,
         method: method
-      };
+      }));
     }
   }, {
     key: "abortPreviousCall",
@@ -119,22 +119,21 @@ var DataLoader = /*#__PURE__*/function () {
         method = _requestConfig$method === void 0 ? "GET" : _requestConfig$method;
       // console.log("apicallref ", this.apiCallRef);
       // console.log("abortController ", this.abortController);
-      if (this.apiCallRef && this.abortController) {
+      if (this.apiCallRef[requestId] && this.abortController[requestId] && this.previousUrlData[requestId]) {
         // console.log("previousdataurl ", this.previousUrlData.url);
         // console.log("requestid ", requestId);
         // console.log("previousdatamethod ", this.previousUrlData.method);
         // console.log("method ", method);
-        if (this.previousUrlData.url === requestId && this.previousUrlData.method === method) {
+        if (this.previousUrlData[requestId].url === requestId && this.previousUrlData[requestId].method === method) {
           // console.log("terminated");
-          this.abortController.abort();
+          this.abortController[requestId].abort();
         }
       }
     }
   }, {
     key: "getRequestDef",
     value: function getRequestDef(_ref) {
-      var _this$abortController,
-        _this = this;
+      var _this = this;
       var requestId = _ref.requestId,
         _ref$urlParams = _ref.urlParams,
         urlParams = _ref$urlParams === void 0 ? {} : _ref$urlParams,
@@ -146,16 +145,17 @@ var DataLoader = /*#__PURE__*/function () {
       var url = requestConfig.url,
         _requestConfig$method2 = requestConfig.method,
         method = _requestConfig$method2 === void 0 ? "GET" : _requestConfig$method2;
+      debugger;
       this.setPreviousUrlData(requestId, method);
-      this.apiCallRef = true;
-      this.abortController = new AbortController();
+      this.apiCallRef[requestId] = true;
+      this.abortController[requestId] = new AbortController();
       var finalRequestParams = this.getRequestParams(requestId, params);
       var requestUrl = typeof url === "function" ? url(urlParams) : url;
       var reqMethod = method.toLowerCase();
       var requestMetadata = {
         method: reqMethod === "form_post" || reqMethod === "upload" ? "post" : method,
         headers: _objectSpread(_objectSpread({}, this._commonHeaders), headers),
-        signal: (_this$abortController = this.abortController) === null || _this$abortController === void 0 ? void 0 : _this$abortController.signal
+        signal: this.abortController[requestId] ? this.abortController[requestId].signal : null
       };
       var requestHeaders = requestMetadata.headers;
       for (var header in requestHeaders) {
@@ -178,8 +178,8 @@ var DataLoader = /*#__PURE__*/function () {
       }
       return new _bluebird.Promise(function (resolve, reject) {
         return (0, _whatwgFetch.fetch)(requestUrl, requestMetadata).then(function (response) {
-          _this.apiCallRef = false;
-          _this.abortController = null;
+          _this.apiCallRef[requestId] = false;
+          _this.abortController[requestId] = null;
           var status = response.status,
             statusText = response.statusText,
             headers = response.headers;
@@ -206,8 +206,8 @@ var DataLoader = /*#__PURE__*/function () {
           var headers = _ref2.headers,
             json = _ref2.json,
             status = _ref2.status;
-          _this.apiCallRef = false;
-          _this.abortController = null;
+          _this.apiCallRef[requestId] = false;
+          _this.abortController[requestId] = null;
           var parsedResponse = _this.parseResponseData(requestId, json, headers, status);
           resolve(parsedResponse);
         })["catch"](function (exception) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unbxd-ui/unbxd-react-components",
-  "version": "0.2.122",
+  "version": "0.2.123",
   "description": "React components library",
   "keywords": [
     "react components",