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

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
@@ -122,7 +124,7 @@ const CustomPropertiesSettings = ({
   const handeContextSubmit = (submitData) => {
     return {
       ...submitData,
-      ctx: submitData?.ctx?.[0]?.value
+      ctx: submitData?.ctx?.[0]?.value ?? ''
     };
   };
 

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;