@truedat/dq 8.10.7 → 8.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "8.10.7",
+  "version": "8.11.0",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -59,7 +59,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.10.7",
+    "@truedat/test": "8.11.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -92,5 +92,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "9b9c72e7d3045158547a4ae9fbc4b73a62283ed8"
+  "gitHead": "89b12f5fa7ff2d0fb790d88830938ccff9cb3d91"
 }

package/src/components/ImplementationsRoutes.js

@@ -2,7 +2,7 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { Route, useParams, Routes } from "react-router";
-import { connect } from "react-redux";
+import { connect, useSelector } from "react-redux";
 import { Segment } from "semantic-ui-react";
 import { ProtectedRoute, Loader } from "@truedat/core/router";
 // This is only for information purposes
@@ -33,9 +33,11 @@ import RuleSubscriptionLoader from "./RuleSubscriptionLoader";
 const TemplatesLoader = React.lazy(
   () => import("@truedat/core/components/TemplatesLoader"),
 );
+
 const EventsLoader = React.lazy(
   () => import("@truedat/audit/components/EventsLoader"),
 );
+
 const ImplementationStructuresLoader = React.lazy(
   () => import("@truedat/dd/components/ImplementationStructuresLoader"),
 );
@@ -47,8 +49,16 @@ const ImplementationRelationForm = React.lazy(
 );
 
 const ImplementationEventsLoader = () => {
-  const { implementation_id: id } = useParams();
-  return <EventsLoader resource_id={id} resource_type="implementation" />;
+  const implementationRef = useSelector(
+    (state) => state.ruleImplementation?.implementation_ref,
+  );
+  if (!implementationRef) return null;
+  return (
+    <EventsLoader
+      resource_id={implementationRef}
+      resource_type="implementation_ref"
+    />
+  );
 };
 
 export const ImplementationsRoutes = ({

package/src/components/RuleEventRow.js

@@ -7,34 +7,49 @@ import Moment from "react-moment";
 export const RuleEventRow = ({ user, user_name, ts, payload }) => {
   const { formatMessage, locale } = useIntl();
   const userName = _.propOr(user_name, "user_name")(user);
-
+  const eventVia = payload.length > 0 ? payload[0].event_via : null;
+  const action = payload.length > 0 ? payload[0].action : null;
+  const formatValue = (field, value) => {
+    if (field === "active" && typeof value === "boolean") {
+      return formatMessage({
+        id: `rule.props.active.${value}`,
+      });
+    }
+    return _.isObject(value) ? _.get("value", value) : value;
+  };
   return _.isEmpty(payload) ? null : (
     <Feed.Event>
       <Feed.Content>
         <Feed.Summary>
           <Feed.User>{userName}</Feed.User>{" "}
+          {action && (
+            <span>
+              {formatMessage({ id: `rules.events.action_${action}` })}
+            </span>
+          )}{" "}
+          {eventVia ? (
+            <span className="audit-event-via">
+              {formatMessage({ id: `audit.events.via.${eventVia}` })}
+            </span>
+          ) : null}{" "}
           <Feed.Date>
             <Moment locale={locale} date={ts} format="YYYY-MM-DD HH:mm" />
           </Feed.Date>
         </Feed.Summary>
-        {payload.map(({ field, action, value }, i) => (
-          <Feed.Extra
-            key={i}
-            text
-            content={formatMessage(
-              {
-                id: `rules.events.action_${action}${
-                  action === "changed" &&
-                  typeof value !== "undefined" &&
-                  !_.isObject(value)
-                    ? "_to"
-                    : ""
-                }`,
-              },
-              [field, JSON.stringify(value)],
-            )}
-          />
-        ))}
+        {payload.map(({ field, action_extra, value }, i) =>
+          action_extra ? (
+            <Feed.Extra
+              key={i}
+              text
+              content={formatMessage(
+                {
+                  id: `rules.events.extra.${action_extra}`,
+                },
+                [field, formatValue(field, value)],
+              )}
+            />
+          ) : null,
+        )}
       </Feed.Content>
     </Feed.Event>
   );

package/src/components/RuleImplementationEventRow.js

@@ -3,7 +3,6 @@ import PropTypes from "prop-types";
 import { Feed } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import Moment from "react-moment";
-
 export const RuleImplementationEventRow = ({
   user,
   user_name,
@@ -12,26 +11,50 @@ export const RuleImplementationEventRow = ({
 }) => {
   const { formatMessage, locale } = useIntl();
   const userName = _.propOr(user_name, "user_name")(user);
+  const eventVia = payload.length > 0 ? payload[0].event_via : null;
+  const action = payload.length > 0 ? payload[0].action : null;
+  const formatValue = (field, value) => {
+    if (field === "executable" && typeof value === "boolean") {
+      return formatMessage({
+        id: `ruleImplementation.props.executable.${value}`,
+      });
+    }
+    return _.isPlainObject(value) ? _.get("value", value) : value;
+  };
 
   return _.isEmpty(payload) ? null : (
     <Feed.Event>
       <Feed.Content>
         <Feed.Summary>
           <Feed.User>{userName}</Feed.User>{" "}
+          {action && (
+            <span>
+              {formatMessage({
+                id: `ruleImplementations.events.action_${action}`,
+              })}
+            </span>
+          )}{" "}
+          {eventVia ? (
+            <span className="audit-event-via">
+              {formatMessage({ id: `audit.events.via.${eventVia}` })}
+            </span>
+          ) : null}{" "}
           <Feed.Date>
             <Moment locale={locale} date={ts} format="YYYY-MM-DD HH:mm" />
           </Feed.Date>
         </Feed.Summary>
-        {payload.map(({ field, action, value }, i) => (
-          <Feed.Extra
-            key={i}
-            text
-            content={formatMessage(
-              { id: "ruleImplementations.events.action_" + action },
-              [field, _.isObject(value) ? JSON.stringify(value) : value],
-            )}
-          />
-        ))}
+        {payload.map(({ field, action_extra, value }, i) =>
+          action_extra ? (
+            <Feed.Extra
+              key={i}
+              text
+              content={formatMessage(
+                { id: `ruleImplementations.events.extra.${action_extra}` },
+                [field, formatValue(field, value)],
+              )}
+            />
+          ) : null,
+        )}
       </Feed.Content>
     </Feed.Event>
   );

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

@@ -130,4 +130,132 @@ describe("<ImplementationsRoutes />", () => {
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
+
+  it("renders correctly with new basic implementation route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_NEW_BASIC],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with new raw implementation route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_NEW_RAW],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation events route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_EVENTS.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation executions route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_EXECUTIONS.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation results route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_RESULTS.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation history route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_HISTORY.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation clone route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_CLONE.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation edit route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_EDIT.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation edit as default route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [
+        IMPLEMENTATION_EDIT_AS_DEFAULT.replace(":implementation_id", "123"),
+      ],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation edit as raw route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_EDIT_AS_RAW.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation concept links route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [
+        IMPLEMENTATION_CONCEPT_LINKS.replace(":implementation_id", "123"),
+      ],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation concept links new route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [
+        IMPLEMENTATION_CONCEPT_LINKS_NEW.replace(":implementation_id", "123"),
+      ],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation structures route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [IMPLEMENTATION_STRUCTURES.replace(":implementation_id", "123")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation structures new route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: [
+        IMPLEMENTATION_STRUCTURES_NEW.replace(":implementation_id", "123"),
+      ],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with implementation result details route", async () => {
+    const rendered = render(<ImplementationsRoutes {...defaultProps} />, {
+      routes: ["/implementations/123/results/456/some-path"],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
 });

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

@@ -7,6 +7,8 @@ describe("<RuleEventsRow />", () => {
       {
         field: "field1",
         action: "changed",
+        action_extra: "changed",
+        event_via: "single_update",
         value: "new value",
       },
     ],
@@ -21,7 +23,12 @@ describe("<RuleEventsRow />", () => {
   };
   const renderOpts = {
     messages: {
-      en: { "rules.events.action_changed_to": "Field {0} changed to: {1}" },
+      en: {
+        "audit.events.via.single_update": "via web",
+        "rules.events.action_changed": "updated the rule",
+        "rules.events.extra.changed": "Field {0} changed to: {1}",
+        "rules.events.extra.changed_to": "Field {0} changed to: {1}",
+      },
     },
   };
 

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

@@ -46,10 +46,11 @@ describe("<RuleEvents />", () => {
   const renderOpts = {
     messages: {
       en: {
-        "rules.events.action_created": "Rule created",
-        "rules.events.action_changed": "Field {0} changed: {1}",
-        "rules.events.action_changed_to": "Field {0} changed to: {1}",
-        "rules.events.action_updated": "Rule updated",
+        "rules.events.action_changed": "updated the rule",
+        "rules.events.action_created": "created the rule",
+        "rules.events.action_updated": "updated the rule",
+        "rules.events.extra.domain_updated_with_id":
+          "Domain changed to domain id: {0}",
       },
     },
   };

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

@@ -0,0 +1,54 @@
+import { render } from "@truedat/test/render";
+import { RuleImplementationEventRow } from "../RuleImplementationEventRow";
+
+describe("<RuleImplementationEventRow />", () => {
+  const props = {
+    payload: [
+      {
+        field: "implementation_key",
+        action: "changed",
+        action_extra: "implementation_key_updated",
+        event_via: "single_update",
+        value: "new_key",
+      },
+      {
+        field: "executable",
+        action: "changed",
+        action_extra: "executable_updated",
+        event_via: "single_update",
+        value: true,
+      },
+    ],
+    user_name: "some.user@domain.tld",
+    user: {
+      email: "some.user@domain.tld",
+      full_name: "Some User",
+      id: 142,
+      user_name: "some.user@domain.tld",
+    },
+    ts: "2021-09-16T07:36:32.848603Z",
+  };
+  const renderOpts = {
+    messages: {
+      en: {
+        "audit.events.via.single_update": "via web",
+        "ruleImplementations.events.action_changed":
+          "updated the implementation",
+        "ruleImplementations.events.extra.implementation_key_updated":
+          "Implementation key updated to: {1}",
+        "ruleImplementations.events.extra.executable_updated":
+          "Executable switch value updated: {1}",
+        "ruleImplementation.props.executable.true": "Executable",
+        "ruleImplementation.props.executable.false": "Internal",
+      },
+    },
+  };
+
+  it("matches the latest snapshot", () => {
+    const { container } = render(
+      <RuleImplementationEventRow {...props} />,
+      renderOpts,
+    );
+    expect(container).toMatchSnapshot();
+  });
+});

package/src/components/__tests__/__snapshots__/ImplementationsRoutes.spec.js.snap

@@ -10,8 +10,34 @@ exports[`<ImplementationsRoutes /> renders correctly with default route 1`] = `
 
 exports[`<ImplementationsRoutes /> renders correctly with deprecated implementations route 1`] = `<div />`;
 
+exports[`<ImplementationsRoutes /> renders correctly with implementation clone route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation concept links new route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation concept links route 1`] = `<div />`;
+
 exports[`<ImplementationsRoutes /> renders correctly with implementation detail route 1`] = `<div />`;
 
+exports[`<ImplementationsRoutes /> renders correctly with implementation edit as default route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation edit as raw route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation edit route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation events route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation executions route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation history route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation result details route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation results route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation structures new route 1`] = `<div />`;
+
+exports[`<ImplementationsRoutes /> renders correctly with implementation structures route 1`] = `<div />`;
+
 exports[`<ImplementationsRoutes /> renders correctly with implementations route 1`] = `
 <div>
   <div>
@@ -30,8 +56,12 @@ exports[`<ImplementationsRoutes /> renders correctly with implementations route
 </div>
 `;
 
+exports[`<ImplementationsRoutes /> renders correctly with new basic implementation route 1`] = `<div />`;
+
 exports[`<ImplementationsRoutes /> renders correctly with new implementation route 1`] = `<div />`;
 
+exports[`<ImplementationsRoutes /> renders correctly with new raw implementation route 1`] = `<div />`;
+
 exports[`<ImplementationsRoutes /> renders correctly with pending implementations route 1`] = `<div />`;
 
 exports[`<ImplementationsRoutes /> renders unauthorized component when not authorized 1`] = `<div />`;

package/src/components/__tests__/__snapshots__/RuleEventRow.spec.js.snap

@@ -17,6 +17,16 @@ exports[`<RuleEventsRow /> matches the latest snapshot 1`] = `
           some.user@domain.tld
         </a>
          
+        <span>
+          updated the rule
+        </span>
+         
+        <span
+          class="audit-event-via"
+        >
+          via web
+        </span>
+         
         <div
           class="date"
         >
@@ -30,7 +40,7 @@ exports[`<RuleEventsRow /> matches the latest snapshot 1`] = `
       <div
         class="text extra"
       >
-        Field field1 changed to: "new value"
+        Field field1 changed to: new value
       </div>
     </div>
   </div>

package/src/components/__tests__/__snapshots__/RuleEvents.spec.js.snap

@@ -23,6 +23,11 @@ exports[`<RuleEvents /> matches the latest snapshot 1`] = `
               some.user@domain.tld
             </a>
              
+            <span>
+              updated the rule
+            </span>
+             
+             
             <div
               class="date"
             >
@@ -36,7 +41,7 @@ exports[`<RuleEvents /> matches the latest snapshot 1`] = `
           <div
             class="text extra"
           >
-            Field domain_id changed to: 140
+            Domain changed to domain id: 140
           </div>
         </div>
       </div>
@@ -55,6 +60,11 @@ exports[`<RuleEvents /> matches the latest snapshot 1`] = `
               some.user
             </a>
              
+            <span>
+              updated the rule
+            </span>
+             
+             
             <div
               class="date"
             >
@@ -68,7 +78,7 @@ exports[`<RuleEvents /> matches the latest snapshot 1`] = `
           <div
             class="text extra"
           >
-            Field domain_id changed to: 168
+            Domain changed to domain id: 168
           </div>
         </div>
       </div>

package/src/components/__tests__/__snapshots__/RuleImplementationEventRow.spec.js.snap

@@ -0,0 +1,53 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<RuleImplementationEventRow /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="event"
+  >
+    <div
+      class="content"
+    >
+      <div
+        class="summary"
+      >
+        <a
+          class="user"
+        >
+          some.user@domain.tld
+        </a>
+         
+        <span>
+          updated the implementation
+        </span>
+         
+        <span
+          class="audit-event-via"
+        >
+          via web
+        </span>
+         
+        <div
+          class="date"
+        >
+          <time
+            datetime="1631777792848"
+          >
+            2021-09-16 07:36
+          </time>
+        </div>
+      </div>
+      <div
+        class="text extra"
+      >
+        Implementation key updated to: new_key
+      </div>
+      <div
+        class="text extra"
+      >
+        Executable switch value updated: Executable
+      </div>
+    </div>
+  </div>
+</div>
+`;