@crystaldesign/grid 24.7.0-beta.8 → 24.7.0-rc.0

package/build/esm/index.js

@@ -2482,6 +2482,8 @@ function _fetchData() {
               throw new Error(res.statusText);
             }
             return res.json();
+          })["catch"](function (e) {
+            throw e;
           });
         case 2:
           response = _context3.sent;
@@ -2694,10 +2696,11 @@ function useApiInterface(_ref) {
     _useDivaCore$state = _useDivaCore.state,
     jwt = _useDivaCore$state.jwt,
     organization = _useDivaCore$state.organization;
+  var abortControlerRef = useRef();
   var fetchData = useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(filter, force) {
       var _state$serverSideFilt, _state$serverSideFilt2;
-      var newServerSideFilterState, result;
+      var newServerSideFilterState, _abortControlerRef$cu, result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -2717,35 +2720,40 @@ function useApiInterface(_ref) {
               data: newServerSideFilterState
             });
             _context.prev = 5;
-            _context.next = 8;
+            //abort previous request
+            (_abortControlerRef$cu = abortControlerRef.current) === null || _abortControlerRef$cu === void 0 || _abortControlerRef$cu.abort('Request cancelled');
+            abortControlerRef.current = new AbortController();
+            _context.next = 10;
             return apiFetchData({
-              abortSignal: new AbortController().signal,
+              abortSignal: abortControlerRef.current.signal,
               apiInterface: apiInterface,
               serverSideFilteringState: newServerSideFilterState,
               columns: columns
             });
-          case 8:
+          case 10:
             result = _context.sent;
             dispatch({
               type: 'finishedLoading',
               data: result
             });
             onUpdate === null || onUpdate === void 0 || onUpdate(result.data, getUrlParams(apiInterface, columns, newServerSideFilterState.skip, newServerSideFilterState.limit, newServerSideFilterState.sortBy, newServerSideFilterState.filters, newServerSideFilterState.globalFilter, apiInterface.customSettings));
-            _context.next = 17;
+            _context.next = 18;
             break;
-          case 13:
-            _context.prev = 13;
+          case 15:
+            _context.prev = 15;
             _context.t0 = _context["catch"](5);
-            LOG.error(_context.t0.message, 'GRID_0001', _context.t0);
-            dispatch({
-              type: 'loadingFailed',
-              data: _context.t0.message
-            });
-          case 17:
+            if (_context.t0 !== 'Request cancelled') {
+              LOG.error(_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message, 'GRID_0001', _context.t0);
+              dispatch({
+                type: 'loadingFailed',
+                data: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message
+              });
+            }
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 13]]);
+      }, _callee, null, [[5, 15]]);
     }));
     return function (_x, _x2) {
       return _ref2.apply(this, arguments);

package/build/types/grid/src/hooks/useApiInterface/apiFetchData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiFetchData.d.ts","sourceRoot":"","sources":["../../../../../../src/hooks/useApiInterface/apiFetchData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAa,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,yBAA+B,CAAC,SAAS,MAAM,EAAE,EAC/C,YAAY,EACZ,OAAO,EACP,wBAAwB,EACxB,WAAW,GACZ,EAAE;IACD,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IACvB,wBAAwB,EAAE,uBAAuB,CAAC;IAClD,WAAW,EAAE,WAAW,CAAC;CAC1B;;;GAwDA;AA8BD,wBAAgB,YAAY,CAC1B,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,EAC/B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,EACxC,OAAO,CAAC,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACnD,YAAY,CAAC,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,aAAa,EAAE,mBA8CjC"}
+{"version":3,"file":"apiFetchData.d.ts","sourceRoot":"","sources":["../../../../../../src/hooks/useApiInterface/apiFetchData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAa,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,yBAA+B,CAAC,SAAS,MAAM,EAAE,EAC/C,YAAY,EACZ,OAAO,EACP,wBAAwB,EACxB,WAAW,GACZ,EAAE;IACD,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IACvB,wBAAwB,EAAE,uBAAuB,CAAC;IAClD,WAAW,EAAE,WAAW,CAAC;CAC1B;;;GAwDA;AAkCD,wBAAgB,YAAY,CAC1B,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,EAC/B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,EACxC,OAAO,CAAC,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACnD,YAAY,CAAC,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,aAAa,EAAE,mBA8CjC"}

package/build/types/grid/src/hooks/useApiInterface/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/hooks/useApiInterface/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIzD,UAAU,mBAAmB,CAAC,CAAC,SAAS,MAAM;IAC5C,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,kBAAkB,EAAE;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,OAAO,CAAA;SAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC;IACzD,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IACpD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC;IAC/C,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;CACjE;AAgBD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IACzC,OAAO,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,EACxD,YAAY,EACZ,kBAAkB,EAClB,OAAO,EACP,KAAK,EACL,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,mBAAmB,CAAC,CAAC,CAAC;;;;;;;;yBAaN,uBAAuB,UAAU,OAAO;uBAyCb,CAAC,UAAU,MAAM,WAAW,GAAG;wBAgEpC,MAAM;;2BASpC,CAAC,SAAS,MAAM;6BAOhB,CAAC,SAAS,MAAM;EAuD1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/hooks/useApiInterface/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIzD,UAAU,mBAAmB,CAAC,CAAC,SAAS,MAAM;IAC5C,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,kBAAkB,EAAE;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,OAAO,CAAA;SAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC;IACzD,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IACpD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC;IAC/C,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;CACjE;AAgBD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IACzC,OAAO,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,EACxD,YAAY,EACZ,kBAAkB,EAClB,OAAO,EACP,KAAK,EACL,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,mBAAmB,CAAC,CAAC,CAAC;;;;;;;;yBAcN,uBAAuB,UAAU,OAAO;uBA8Cb,CAAC,UAAU,MAAM,WAAW,GAAG;wBAgEpC,MAAM;;2BASpC,CAAC,SAAS,MAAM;6BAOhB,CAAC,SAAS,MAAM;EAuD1B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/grid",
-  "version": "24.7.0-beta.8",
+  "version": "24.7.0-rc.0",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@material-ui/pickers": "^3.2.10",
@@ -13,7 +13,7 @@
     "react-dom": "17.0.2"
   },
   "dependencies": {
-    "@crystaldesign/searchfield": "24.7.0-beta.8",
+    "@crystaldesign/searchfield": "24.7.0-rc.0",
     "@date-io/core": "^1.3.13",
     "@date-io/date-fns": "^1.3.13",
     "@tinymce/tinymce-react": "^3.13.0",
@@ -43,5 +43,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/grid/src/index.d.ts",
-  "gitHead": "ad9314527af6738f44096b0304a2729dac8c909c"
+  "gitHead": "7404d8d8c3ee254262bf3e2db821aea9b3009a2e"
 }