@truedat/core 4.41.2 → 4.42.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.41.3] 2022-04-01
+
+### Changed
+
+- [TD-4670] `RouteListener` now dismisses alerts when any change of URL path
+  occurs
+
 ## [4.41.2] 2022-03-30
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.41.2",
+  "version": "4.42.0",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -32,7 +32,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@truedat/test": "4.41.2",
+    "@truedat/test": "4.42.0",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -106,5 +106,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "de1e8cd9c744c0dae85be4585fccc1c50fdf6a07"
+  "gitHead": "824b94750e130d145f856f6e16eac97e351f6be8"
 }

package/src/components/Alert.js

@@ -20,6 +20,8 @@ const formatErrorMessages = (error, formatMessage) => {
   if (_.has("name")(error))
     return formatMessage({ id: error.name, defaultMessage: error.name });
 
+  if (_.isString(error?.message)) return error.message;
+
   return formatMessage({
     id: "error.unknown",
     defaultMessage: "Unexpected error",

package/src/components/RouteListener.js

@@ -11,10 +11,7 @@ export class RouteListener extends React.Component {
   componentDidUpdate(prevProps) {
     const prevPath = prevProps.location.pathname;
     const currentPath = this.props.location.pathname;
-    if (
-      !_.isEmpty(this.props.message) &&
-      prevPath.split("/")[1] !== currentPath.split("/")[1]
-    ) {
+    if (!_.isEmpty(this.props.message) && prevPath !== currentPath) {
       this.props.dismissAlert();
     }
   }
@@ -27,10 +24,10 @@ export class RouteListener extends React.Component {
 RouteListener.propTypes = {
   location: PropTypes.object,
   message: PropTypes.object,
-  dismissAlert: PropTypes.func
+  dismissAlert: PropTypes.func,
 };
 
-const mapStateToProps = state => ({ message: getMessage(state) });
+const mapStateToProps = (state) => ({ message: getMessage(state) });
 
 const mapDispatchToProps = { dismissAlert };
 

package/src/components/__tests__/RouteListener.spec.js

@@ -5,7 +5,7 @@ import { RouteListener } from "../RouteListener";
 describe("<RouteListener />", () => {
   const props = {
     message: {},
-    location: { pathname: "/test" }
+    location: { pathname: "/test" },
   };
 
   it("matches the latest snapshot", () => {
@@ -20,7 +20,7 @@ describe("<RouteListener />", () => {
     );
     wrapper.setProps({
       message: { not: "empty" },
-      location: { pathname: "/different" }
+      location: { pathname: "/different" },
     });
     expect(dismissAlert.mock.calls.length).toBe(1);
   });
@@ -31,19 +31,7 @@ describe("<RouteListener />", () => {
       <RouteListener dismissAlert={dismissAlert} {...props} />
     );
     wrapper.setProps({
-      location: { pathname: "/different" }
-    });
-    expect(dismissAlert.mock.calls.length).toBe(0);
-  });
-
-  it("when changing subpath location with message will not call dismissAlert", () => {
-    const dismissAlert = jest.fn();
-    const wrapper = shallow(
-      <RouteListener dismissAlert={dismissAlert} {...props} />
-    );
-    wrapper.setProps({
-      message: { not: "empty" },
-      location: { pathname: "/test/different" }
+      location: { pathname: "/different" },
     });
     expect(dismissAlert.mock.calls.length).toBe(0);
   });

package/src/hooks/usePath.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import { useRouteMatch } from "react-router-dom";
 
-export const usePath = props => {
+export const usePath = (props) => {
   const match = useRouteMatch(props);
   return _.prop("path")(match);
 };

package/src/routes.js

@@ -124,12 +124,13 @@ export const SEARCH_CONCEPTS = "/search/concepts";
 export const SEARCH_INGESTS = "/search/ingests";
 export const SEARCH_RESULTS = "/search/results";
 export const SEARCH_STRUCTURES = "/search/structures";
-export const SOURCE = "/sources/:external_id";
+export const SOURCE = "/sources/:sourceId";
 export const SOURCES = "/sources";
 export const SOURCES_NEW = "/sources/new";
-export const SOURCE_EDIT = "/sources/:external_id/edit";
-export const SOURCE_JOBS = "/sources/:external_id/jobs";
-export const SOURCE_JOBS_NEW = "/sources/:external_id/jobs/new";
+export const SOURCE_EDIT = "/sources/:sourceId/edit";
+export const SOURCE_JOB = "/sources/:sourceId/jobs/:id";
+export const SOURCE_JOBS = "/sources/:sourceId/jobs";
+export const SOURCE_JOBS_NEW = "/sources/:sourceId/jobs/new";
 export const STRUCTURE = "/structures/:id";
 export const STRUCTURES = "/structures";
 export const STRUCTURES_BULK_UPDATE = "/structures/bulk_update";
@@ -276,6 +277,7 @@ const routes = {
   SEARCH,
   SOURCES_NEW,
   SOURCE_EDIT,
+  SOURCE_JOB,
   SOURCE_JOBS_NEW,
   SOURCE_JOBS,
   SOURCE,

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

@@ -1,4 +1,4 @@
-import { errorsFailure, toErrorList } from "../message";
+import { errorsFailure, graphQLErrors, toErrorList } from "../message";
 
 describe("services: message", () => {
   describe("toErrorList", () => {
@@ -9,7 +9,7 @@ describe("services: message", () => {
         expect.arrayContaining([
           { name: "foo.name.unique" },
           { name: "foo.name.missing" },
-          { name: "foo.bar.baz" }
+          { name: "foo.bar.baz" },
         ])
       );
     });
@@ -20,7 +20,21 @@ describe("services: message", () => {
 
     it("should transform the action name to a message key with camel case action name", () => {
       expect(failure).toMatchObject({
-        header: "alert.fooBarBaz.failed.header"
+        header: "alert.fooBarBaz.failed.header",
+      });
+    });
+  });
+
+  describe("graphQLErrors", () => {
+    it("should extract error messages from a GraphQL error response", () => {
+      const errors = [
+        { path: "foo", message: "foo1" },
+        { path: "bar", message: "bar1" },
+      ];
+      const response = { graphQLErrors: errors };
+      expect(graphQLErrors(response)).toMatchObject({
+        error: true,
+        errorList: expect.arrayContaining(errors),
       });
     });
   });

package/src/services/columnDecoratorComponent.js

@@ -4,9 +4,6 @@ import React from "react";
 export const columnDecoratorComponent = (column) => (obj) => {
   const { fieldSelector, fieldDecorator, name } = column || {};
 
-  if (_.isFunction(fieldSelector)) {
-    fieldSelector(obj);
-  }
   const field = _.isFunction(fieldSelector)
     ? fieldSelector(obj)
     : _.path(_.defaultTo(name)(fieldSelector))(obj);

package/src/services/message.js

@@ -6,11 +6,14 @@ const isErrorsFailure = (status, data) =>
 const isPhoenixFailure = (status, data) =>
   status === 422 && _.conformsTo({ errors: _.isObject })(data);
 
-const isDefaultFailure = status => {
+const isDefaultFailure = (status) => {
   return !!status;
 };
 
 export const defaultMessage = (state, type, payload) => {
+  if (type === "LOG_ERROR/TRIGGER" && _.has("graphQLErrors")(payload))
+    return graphQLErrors(payload);
+
   if (_.endsWith("/TRIGGER")(type)) return state;
 
   if (_.endsWith("/FAILURE")(type)) {
@@ -24,13 +27,24 @@ export const defaultMessage = (state, type, payload) => {
   return state;
 };
 
-export const toErrorList = prefix =>
+export const graphQLErrors = (payload) => {
+  const errorList = _.map(_.pick(["path", "message"]))(payload.graphQLErrors);
+  return {
+    error: true,
+    header: "Error",
+    icon: "attention",
+    errorList: errorList,
+    text: "List of errors",
+  };
+};
+
+export const toErrorList = (prefix) =>
   _.flow(
     _.toPairs,
     _.flatMap(([field, errors]) =>
-      _.map(v => `${prefix}.${field}.${v}`)(errors)
+      _.map((v) => `${prefix}.${field}.${v}`)(errors)
     ),
-    _.map(name => ({ name }))
+    _.map((name) => ({ name }))
   );
 
 export const phoenixFailure = (type, errors) => {
@@ -41,7 +55,7 @@ export const phoenixFailure = (type, errors) => {
     header: `alert.${action}.failed.header`,
     icon: "attention",
     errorList: errorList,
-    text: "List of errors"
+    text: "List of errors",
   };
 };
 
@@ -52,7 +66,7 @@ export const errorsFailure = (type, errors) => {
     header: `alert.${action}.failed.header`,
     icon: "attention",
     errorList: errors,
-    text: "List of errors"
+    text: "List of errors",
   };
 };
 
@@ -62,6 +76,6 @@ export const defaultFailure = (type, payload) => {
     header: `alert.status.${payload.status}.header`,
     content: `alert.status.${payload.status}.content`,
     icon: "attention",
-    text: type.replace("/FAILURE", "")
+    text: type.replace("/FAILURE", ""),
   };
 };