@k-int/stripes-kint-components 2.8.1 → 2.8.2

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.8.2 2022-07-25
+  * New util function `parseErrorResponse`, used in places where we catch http errors, allows for text only response bodies
+
 ## 2.8.1 2022-07-21
   * ActionList previously added actionListItems directly to cached object--sometimes this caused the react-query cache ITSELF to update, although I'm not sure why here and not anywhere else. Fixed by creating a clone internally in ActionListFieldArray and assigning actionListActions on that.
 

package/es/index.js

@@ -264,6 +264,12 @@ Object.defineProperty(exports, "matchString", {
     return _utils.matchString;
   }
 });
+Object.defineProperty(exports, "parseErrorResponse", {
+  enumerable: true,
+  get: function get() {
+    return _utils.parseErrorResponse;
+  }
+});
 Object.defineProperty(exports, "refdataOptions", {
   enumerable: true,
   get: function get() {

package/es/lib/CustomProperties/Config/CustomPropertiesSettings.js

@@ -31,6 +31,8 @@ var _CustomPropertyForm = _interopRequireDefault(require("./CustomPropertyForm")
 
 var _hooks = require("../../hooks");
 
+var _utils = require("../../utils");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -162,7 +164,7 @@ var CustomPropertiesSettings = function CustomPropertiesSettings(_ref) {
               switch (_context.prev = _context.next) {
                 case 0:
                   _context.next = 2;
-                  return err.response.json();
+                  return (0, _utils.parseErrorResponse)(err.response);
 
                 case 2:
                   errorResp = _context.sent;

package/es/lib/EditableRefdataCategoryList/EditableRefdataCategoryList.js

@@ -23,6 +23,8 @@ var _ActionList = _interopRequireDefault(require("../ActionList"));
 
 var _validators = require("../utils/validators");
 
+var _utils = require("../utils");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -136,7 +138,7 @@ var EditableRefdataCategoryList = function EditableRefdataCategoryList(_ref) {
               switch (_context.prev = _context.next) {
                 case 0:
                   _context.next = 2;
-                  return err.response.json();
+                  return (0, _utils.parseErrorResponse)(err.response);
 
                 case 2:
                   errorResp = _context.sent;

package/es/lib/EditableRefdataList/EditableRefdataList.js

@@ -23,6 +23,8 @@ var _ActionList = _interopRequireDefault(require("../ActionList"));
 
 var _validators = require("../utils/validators");
 
+var _utils = require("../utils");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -149,7 +151,7 @@ var EditableRefdataList = function EditableRefdataList(_ref) {
               switch (_context.prev = _context.next) {
                 case 0:
                   _context.next = 2;
-                  return err.response.json();
+                  return (0, _utils.parseErrorResponse)(err.response);
 
                 case 2:
                   errorResp = _context.sent;

package/es/lib/utils/index.js

@@ -45,6 +45,12 @@ Object.defineProperty(exports, "matchString", {
     return _matchString.default;
   }
 });
+Object.defineProperty(exports, "parseErrorResponse", {
+  enumerable: true,
+  get: function get() {
+    return _parseErrorResponse.default;
+  }
+});
 Object.defineProperty(exports, "refdataOptions", {
   enumerable: true,
   get: function get() {
@@ -114,4 +120,6 @@ var _matchString = _interopRequireDefault(require("./matchString"));
 
 var _highlightString = require("./highlightString");
 
+var _parseErrorResponse = _interopRequireDefault(require("./parseErrorResponse"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/es/lib/utils/parseErrorResponse.js

@@ -0,0 +1,91 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+var parseErrorResponse = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(responseObj) {
+    var _ref2, _ref2$find;
+
+    var errorResp, contentType;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            contentType = (_ref2 = _toConsumableArray(responseObj === null || responseObj === void 0 ? void 0 : responseObj.headers)) === null || _ref2 === void 0 ? void 0 : (_ref2$find = _ref2.find(function (header) {
+              return header[0] === 'content-type';
+            })) === null || _ref2$find === void 0 ? void 0 : _ref2$find[1];
+
+            if (!contentType.includes('json')) {
+              _context.next = 7;
+              break;
+            }
+
+            _context.next = 4;
+            return responseObj.json();
+
+          case 4:
+            errorResp = _context.sent;
+            _context.next = 17;
+            break;
+
+          case 7:
+            _context.prev = 7;
+            _context.next = 10;
+            return responseObj.text();
+
+          case 10:
+            _context.t0 = _context.sent;
+            errorResp = {
+              message: _context.t0
+            };
+            _context.next = 17;
+            break;
+
+          case 14:
+            _context.prev = 14;
+            _context.t1 = _context["catch"](7);
+            errorResp = {
+              message: "something went wrong"
+            };
+
+          case 17:
+            return _context.abrupt("return", errorResp);
+
+          case 18:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[7, 14]]);
+  }));
+
+  return function parseErrorResponse(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var _default = parseErrorResponse;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k-int/stripes-kint-components",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Stripes Component library for K-Int specific applications",
   "sideEffects": [
     "*.css"

package/src/index.js

@@ -29,6 +29,7 @@ export {
   refdataQueryKey,
   selectorSafe,
   typedownQueryKey,
+  parseErrorResponse,
 } from './lib/utils';
 
 // Validators (Some/all copied from stripes-erm-components but this gives another way to acquire them)

package/src/lib/CustomProperties/Config/CustomPropertiesSettings.js

@@ -15,6 +15,7 @@ import CustomPropertiesLookup from './CustomPropertiesLookup';
 import CustomPropertyView from './CustomPropertyView';
 import CustomPropertiesForm from './CustomPropertyForm';
 import { useMutateCustomProperties, useRefdata } from '../../hooks';
+import { parseErrorResponse } from '../../utils';
 
 const EDITING = 'edit';
 const CREATING = 'create';
@@ -99,7 +100,8 @@ const CustomPropertiesSettings = ({
       // Default delete behaviour is to fire a callout, either with kint-components default message
       // or one provided in labelOverrides, which is passed the error message and customProperty in question
       delete: async (err) => {
-        const errorResp = await err.response.json();
+        const errorResp = await parseErrorResponse(err.response);
+
         callout.sendCallout({
           message: labelOverrides?.deleteError ? labelOverrides.deleteError(errorResp?.message, customProperty) : (
             <FormattedMessage

package/src/lib/EditableRefdataCategoryList/EditableRefdataCategoryList.js

@@ -9,6 +9,7 @@ import { useMutateRefdataCategory, useRefdata } from '../hooks';
 
 import ActionList from '../ActionList';
 import { required } from '../utils/validators';
+import { parseErrorResponse } from '../utils';
 
 const propTypes = {
   afterQueryCalls: PropTypes.object,
@@ -70,7 +71,7 @@ const EditableRefdataCategoryList = ({
       // Default delete behaviour is to fire a callout, either with kint-components default message
       // or one provided in labelOverrides, which is passed the error message and refdata in question
       delete: async (err) => {
-        const errorResp = await err.response.json();
+        const errorResp = await parseErrorResponse(err.response);
         callout.sendCallout({
           message: labelOverrides?.deleteError ? labelOverrides.deleteError(errorResp?.message, deleteModal?.refdata) : (
             <FormattedMessage

package/src/lib/EditableRefdataList/EditableRefdataList.js

@@ -9,6 +9,7 @@ import { useMutateRefdataValue, useRefdata } from '../hooks';
 
 import ActionList from '../ActionList';
 import { required } from '../utils/validators';
+import { parseErrorResponse } from '../utils';
 
 const propTypes = {
   afterQueryCalls: PropTypes.object,
@@ -75,7 +76,7 @@ const EditableRefdataList = ({
       // Default delete behaviour is to fire a callout, either with kint-components default message
       // or one provided in labelOverrides, which is passed the error message and refdata in question
       delete: async (err) => {
-        const errorResp = await err.response.json();
+        const errorResp = await parseErrorResponse(err.response);
         callout.sendCallout({
           message: labelOverrides?.deleteError ? labelOverrides.deleteError(errorResp?.message, deleteModal?.refdata) : (
             <FormattedMessage

package/src/lib/utils/index.js

@@ -19,3 +19,6 @@ export { default as toCamelCase } from './toCamelCase'; // I hate that this exis
 
 export { default as matchString } from './matchString';
 export { boldString, highlightString } from './highlightString';
+
+// HTTP Utils
+export { default as parseErrorResponse } from './parseErrorResponse';

package/src/lib/utils/parseErrorResponse.js

@@ -0,0 +1,18 @@
+const parseErrorResponse = async (responseObj) => {
+  let errorResp;
+  const contentType = [...responseObj?.headers]?.find(header => header[0] === 'content-type')?.[1];
+
+  if (contentType.includes('json')) {
+    errorResp = await responseObj.json();
+  } else {
+    try {
+      errorResp = { message: await responseObj.text() };
+    } catch {
+      errorResp = { message: "something went wrong" };
+    }
+  }
+
+  return errorResp;
+};
+
+export default parseErrorResponse;