@truedat/core 5.18.3 → 5.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "5.18.3",
+  "version": "5.20.0",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -117,5 +117,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "ba00f358149f00dcdabb3e3edd883c54c0bbd43a"
+  "gitHead": "3981bdf2fff50f0d8c79643c6f423dfdc7f5a57f"
 }

package/src/services/__tests__/message.spec.js

@@ -1,4 +1,9 @@
-import { errorsFailure, graphQLErrors, toErrorList } from "../message";
+import {
+  errorsFailure,
+  graphQLErrors,
+  swrErrors,
+  toErrorList,
+} from "../message";
 
 describe("services: message", () => {
   describe("toErrorList", () => {
@@ -38,4 +43,34 @@ describe("services: message", () => {
       });
     });
   });
+
+  describe("swrErrors", () => {
+    it("should extract error messages from a SWR error response", () => {
+      const errors = {
+        fieldWithStringError: "simple string error",
+        requests: [
+          { changesetField: ["can't be blank"] },
+          {
+            someOtherChangesetField: ["changeset error 1", "changeset error 2"],
+          },
+        ],
+      };
+
+      const response = { swrErrors: errors, prefix: "grant_requests" };
+
+      expect(swrErrors(response)).toMatchObject({
+        error: true,
+        header: "Error",
+        icon: "attention",
+        errorList: [
+          { name: "grant_requests.fieldWithStringError.simple string error" },
+          { name: "grant_requests.changesetField.can't be blank" },
+          {
+            name: 'grant_requests.someOtherChangesetField.["changeset error 1","changeset error 2"]',
+          },
+        ],
+        text: "List of errors",
+      });
+    });
+  });
 });

package/src/services/message.js

@@ -30,11 +30,33 @@ export const defaultMessage = (state, type, payload) => {
   return state;
 };
 
-const swrErrors = ({ swrErrors, prefix }) => {
+const changesetErrorTranslation = (error) =>
+  // eslint-disable-next-line prettier/prettier
+  _.flow(
+    _.toPairs,
+    _.head,
+    ([field, errorList]) =>
+    errorList.length === 1
+      ? `${field}.${errorList[0]}`
+      : /* This is horrible, showing the raw errorList makes it untranslatable,
+         * but Alert does not currently support nested errors
+         */
+        `${field}.${JSON.stringify(errorList)}`
+  )(error);
+
+export const swrErrors = ({ swrErrors, prefix }) => {
   const errors = _.flow(
     _.toPairs,
-    _.flatMap(([field, errors]) =>
-      _.map((v) => `${prefix}.${field}.${v}`)(errors)
+    _.flatMap(([field, errorOrErrors]) =>
+      // errorOrErrors may be a simple string or an array
+      _.isArray(errorOrErrors)
+        ? _.map((error) =>
+            // if error is an object, it is (hopefully) a changeset error
+            _.isObject(error)
+              ? `${prefix}.${changesetErrorTranslation(error)}`
+              : `${prefix}.${field}.${error}`
+          )(errorOrErrors)
+        : `${prefix}.${field}.${errorOrErrors}`
     ),
     _.map((name) => ({ name }))
   )(swrErrors);