@truedat/qx 8.5.3 → 8.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/qx",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "description": "Truedat Web Quality Experience package",
   "sideEffects": false,
   "module": "src/index.js",
@@ -56,7 +56,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.5.3",
+    "@truedat/test": "8.5.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -89,5 +89,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "9d67766fe0910fe519b6f1f2042b4a5dcc28fad5"
+  "gitHead": "75272567eb3ec948a5cdeb8346ef9cacac58267f"
 }

package/src/components/qualityControls/QualityControlEvents.js

@@ -1,6 +1,7 @@
 import _ from "lodash/fp";
 import { Segment, Feed } from "semantic-ui-react";
 import { useEvents } from "@truedat/audit/hooks/useEvents";
+import { useTemplate } from "@truedat/core/hooks";
 import PropTypes from "prop-types";
 import { use, useMemo } from "react";
 import QxContext from "../QxContext";
@@ -51,7 +52,7 @@ const EventRow = ({ user, ts, header, payload }) => {
           <Feed.User>{user?.user_name}</Feed.User>{" "}
           {formatMessage(
             header[MESSAGE_ID],
-            translateParams(header[MESSAGE_PARAMS])
+            translateParams(header[MESSAGE_PARAMS]),
           )}{" "}
           <Feed.Date>
             <Moment locale={locale} date={ts} format="YYYY-MM-DD HH:mm" />
@@ -63,7 +64,7 @@ const EventRow = ({ user, ts, header, payload }) => {
             text
             content={formatMessage(
               content[MESSAGE_ID],
-              translateParams(content[MESSAGE_PARAMS])
+              translateParams(content[MESSAGE_PARAMS]),
             )}
           />
         ))}
@@ -82,10 +83,19 @@ export default function QualityControlEvents() {
   const { qualityControl, loading: qualityControlLoading } = use(QxContext);
   const { data, error, loading } = useEvents(
     qualityControl.id,
-    "quality_control"
+    "quality_control",
   );
   const events = data?.data || [];
-  const parsedEvents = useMemo(() => getParsedEvents(events), [events]);
+  const { data: templateData } = useTemplate({
+    name: qualityControl?.df_type,
+    domainIds: qualityControl?.domain_ids,
+  });
+
+  const template = templateData?.template;
+  const parsedEvents = useMemo(
+    () => getParsedEvents(events, template),
+    [events, template],
+  );
   return (
     <Segment
       attached="bottom"

package/src/components/qualityControls/events/__tests__/getParsedEvents.spec.js

@@ -183,6 +183,58 @@ describe("getParsedEvents", () => {
     ]);
   });
 
+  it("emits a _without_target message id for dynamic content fields whose template type is url/table/system/image/markdown", () => {
+    const template = {
+      content: [
+        {
+          fields: [
+            { name: "notes", type: "markdown" },
+            { name: "doc_url", type: "url" },
+            { name: "threshold", type: "string" },
+          ],
+        },
+      ],
+    };
+
+    const events = [
+      {
+        event: "quality_control_updated",
+        ts: timestamp,
+        user,
+        payload: {
+          changes: {
+            dynamic_content: {
+              notes: { value: "## hi" },
+              doc_url: { value: "https://example.test" },
+              threshold: { value: 10 },
+            },
+          },
+        },
+      },
+    ];
+
+    const [parsed] = getParsedEvents(events, template);
+
+    expect(parsed.payload).toEqual([
+      [
+        {
+          id: "quality_controls.events.action_dynamic_field_changed_without_target",
+        },
+        { field: "notes", value: "## hi", b: bold },
+      ],
+      [
+        {
+          id: "quality_controls.events.action_dynamic_field_changed_without_target",
+        },
+        { field: "doc_url", value: "https://example.test", b: bold },
+      ],
+      [
+        { id: "quality_controls.events.action_dynamic_field_changed" },
+        { field: "threshold", value: 10, b: bold },
+      ],
+    ]);
+  });
+
   it("filters out unsupported events", () => {
     const events = [
       {

package/src/components/qualityControls/events/getParsedEvents.js

@@ -2,6 +2,23 @@ import _ from "lodash/fp";
 
 export const bold = (text) => <b>{text}</b>;
 
+const FIELDS_WITHOUT_VALUE_TYPES = [
+  "url",
+  "table",
+  "system",
+  "image",
+  "markdown",
+];
+
+const getFieldsWithoutValue = (template) =>
+  _.flow(
+    _.getOr([], "content"),
+    _.map(_.getOr([], "fields")),
+    _.flatten,
+    _.filter((f) => _.includes(_.prop("type")(f))(FIELDS_WITHOUT_VALUE_TYPES)),
+    _.map(_.prop("name")),
+  )(template);
+
 const normalizeValue = (value) => {
   if (_.isObject(value)) return JSON.stringify(value);
   if (_.isBoolean(value)) return String(value);
@@ -112,13 +129,17 @@ const getPayloadFromControlModeChange = (event) => {
   return [];
 };
 
-const getPayloadFromDynamicContentChange = (event) => {
+const getPayloadFromDynamicContentChange = (event, fieldsWithoutValue) => {
   const content = _.propOr({}, "payload.changes.dynamic_content")(event);
   if (!_.isEmpty(content)) {
     return _.flow(
       _.toPairs,
       _.map(([field, value]) => [
-        { id: "quality_controls.events.action_dynamic_field_changed" },
+        {
+          id: _.includes(field)(fieldsWithoutValue)
+            ? "quality_controls.events.action_dynamic_field_changed_without_target"
+            : "quality_controls.events.action_dynamic_field_changed",
+        },
         { field, value: normalizeValue(value?.value), b: bold },
       ]),
     )(content);
@@ -163,14 +184,16 @@ const getHeaderFromUpdateEvent = (event) => {
   return [...headerFromActiveChange, ...headerFromRegularFields];
 };
 
-const getPayloadFromUpdateEvent = (event) => {
+const getPayloadFromUpdateEvent = (event, fieldsWithoutValue) => {
   const payloadFromRegularFields = getPayloadFromRegularFields(event);
   const payloadFromDomainChange = getPayloadFromDomainChange(event);
   const payloadFromScoreCriteriaChange =
     getPayloadFromScoreCriteriaChange(event);
   const payloadFromControlModeChange = getPayloadFromControlModeChange(event);
-  const payloadFromDynamicContentChange =
-    getPayloadFromDynamicContentChange(event);
+  const payloadFromDynamicContentChange = getPayloadFromDynamicContentChange(
+    event,
+    fieldsWithoutValue,
+  );
   const playloadFromQualityControlVersionUpdate =
     getPayloadFromQualityControlVersionUpdate(event);
 
@@ -184,7 +207,7 @@ const getPayloadFromUpdateEvent = (event) => {
   ];
 };
 
-const payloadFromEvent = (event) => {
+const payloadFromEvent = (fieldsWithoutValue) => (event) => {
   const eventBase = _.pick(["ts", "user"])(event);
 
   switch (event.event) {
@@ -237,13 +260,13 @@ const payloadFromEvent = (event) => {
       return {
         ...eventBase,
         header: getHeaderFromUpdateEvent(event),
-        payload: getPayloadFromUpdateEvent(event),
+        payload: getPayloadFromUpdateEvent(event, fieldsWithoutValue),
       };
     case "quality_control_version_draft_updated":
       return {
         ...eventBase,
         header: getHeaderFromUpdateEvent(event),
-        payload: getPayloadFromUpdateEvent(event),
+        payload: getPayloadFromUpdateEvent(event, fieldsWithoutValue),
       };
 
     case "quality_control_version_deleted":
@@ -261,6 +284,7 @@ const payloadFromEvent = (event) => {
       return null;
   }
 };
-export const getParsedEvents = (events) => {
-  return events.map(payloadFromEvent).filter(Boolean);
+export const getParsedEvents = (events, template) => {
+  const fieldsWithoutValue = getFieldsWithoutValue(template);
+  return events.map(payloadFromEvent(fieldsWithoutValue)).filter(Boolean);
 };