@truedat/bg 7.12.6 → 7.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "7.12.6",
+  "version": "7.13.1",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,7 +48,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.12.6",
+    "@truedat/test": "7.13.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -81,5 +81,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "2bff250dd5ea89920a3ec641209716ad53a51062"
+  "gitHead": "17c040e6539b00eab7870d0d82ac91910e85b7ac"
 }

package/src/concepts/components/EventRow.js

@@ -7,6 +7,7 @@ import Moment from "react-moment";
 export const EventRow = ({ user, user_name, event, ts, payload }) => {
   const { formatMessage, locale } = useIntl();
   const userName = _.propOr(user_name, "user_name")(user);
+  const eventVia = payload.length > 0 ? payload[0].msg_via : null;
 
   return (
     <Feed.Event>
@@ -14,20 +15,23 @@ export const EventRow = ({ user, user_name, event, ts, payload }) => {
         <Feed.Summary>
           <Feed.User>{userName}</Feed.User>{" "}
           {formatMessage({ id: `concept.events.${event}` })}{" "}
+          {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(({ msg_key, msg_params }, i) => (
-          <Feed.Extra
-            key={i}
-            text
-            content={formatMessage(
-              { id: `concept.events.extra.${msg_key}` },
-              msg_params
-            )}
-          />
-        ))}
+        {payload.map(({ msg_key, msg_params }, i) =>
+          msg_key ? (
+            <Feed.Extra
+              key={i}
+              text
+              content={formatMessage(
+                { id: `concept.events.extra.${msg_key}` },
+                msg_params
+              )}
+            />
+          ) : null
+        )}
       </Feed.Content>
     </Feed.Event>
   );

package/src/concepts/components/__tests__/Events.spec.js

@@ -28,4 +28,30 @@ describe("<Events />", () => {
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
+  it("matches the latest snapshot using payload with msg_key, msg_params and msg_via", async () => {
+    const events = [
+      {
+        id: 1,
+        event: "new_concept_draft",
+        service: "My invented service 1",
+        resource_id: 2,
+        payload: [
+          { msg_key: "created_version", msg_params: ["1"], msg_via: "single_update" },
+        ],
+      },
+      {
+        id: 2,
+        event: "concept_published",
+        service: "My invented service 2",
+        resource_id: 2,
+        payload: [
+          { msg_via: "file" },
+        ],
+      },
+    ];
+    const props = { events };
+    const rendered = render(<Events {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
 });

package/src/concepts/components/__tests__/__snapshots__/Events.spec.js.snap

@@ -23,6 +23,7 @@ exports[`<Events /> matches the latest snapshot 1`] = `
              
             concept.events.undefined
              
+             
             <div
               class="date"
             >
@@ -33,18 +34,49 @@ exports[`<Events /> matches the latest snapshot 1`] = `
               </time>
             </div>
           </div>
+        </div>
+      </div>
+      <div
+        class="event"
+      >
+        <div
+          class="content"
+        >
           <div
-            class="text extra"
-          >
-            concept.events.extra.undefined
-          </div>
-          <div
-            class="text extra"
+            class="summary"
           >
-            concept.events.extra.undefined
+            <a
+              class="user"
+            />
+             
+            concept.events.undefined
+             
+             
+            <div
+              class="date"
+            >
+              <time
+                datetime="1735689600000"
+              >
+                2025-01-01 00:00
+              </time>
+            </div>
           </div>
         </div>
       </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`<Events /> matches the latest snapshot using payload with msg_key, msg_params and msg_via 1`] = `
+<div>
+  <div
+    class="ui bottom attached segment"
+  >
+    <div
+      class="ui small feed"
+    >
       <div
         class="event"
       >
@@ -58,7 +90,13 @@ exports[`<Events /> matches the latest snapshot 1`] = `
               class="user"
             />
              
-            concept.events.undefined
+            concept.events.new_concept_draft
+             
+            <span
+              class="audit-event-via"
+            >
+              audit.events.via.single_update
+            </span>
              
             <div
               class="date"
@@ -73,12 +111,40 @@ exports[`<Events /> matches the latest snapshot 1`] = `
           <div
             class="text extra"
           >
-            concept.events.extra.undefined
+            concept.events.extra.created_version
           </div>
+        </div>
+      </div>
+      <div
+        class="event"
+      >
+        <div
+          class="content"
+        >
           <div
-            class="text extra"
+            class="summary"
           >
-            concept.events.extra.undefined
+            <a
+              class="user"
+            />
+             
+            concept.events.concept_published
+             
+            <span
+              class="audit-event-via"
+            >
+              audit.events.via.file
+            </span>
+             
+            <div
+              class="date"
+            >
+              <time
+                datetime="1735689600000"
+              >
+                2025-01-01 00:00
+              </time>
+            </div>
           </div>
         </div>
       </div>

package/src/concepts/relations/components/ConceptLinkActions.js

@@ -5,11 +5,18 @@ import { connect } from "react-redux";
 import { Button, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { ConfirmModal } from "@truedat/core/components";
-import { conceptLinkAction } from "../routines";
+import { deleteRelation } from "@truedat/lm/routines";
 
-export const DeleteLink = ({ conceptLinkAction, action, loading }) => {
+export const DeleteLink = ({ deleteRelation, action: { href }, loading }) => {
   const [openModal, setOpenModal] = useState(false);
 
+  const handleDelete = () => {
+    const linkId = href ? parseInt(href.match(/\/links\/(\d+)$/)?.[1]) : null;
+    if (linkId) {
+      deleteRelation({ id: linkId });
+    }
+  };
+
   return loading ? (
     <Icon loading name="circle notch" color="red" />
   ) : (
@@ -33,7 +40,7 @@ export const DeleteLink = ({ conceptLinkAction, action, loading }) => {
         content={
           <FormattedMessage id="relations.actions.data_field.delete.confirmation.content" />
         }
-        onConfirm={() => conceptLinkAction(action)}
+        onConfirm={handleDelete}
         onOpen={() => {
           setOpenModal(true);
         }}
@@ -46,18 +53,16 @@ export const DeleteLink = ({ conceptLinkAction, action, loading }) => {
 };
 
 DeleteLink.propTypes = {
-  conceptLinkAction: PropTypes.func,
+  deleteRelation: PropTypes.func,
   action: PropTypes.object,
   loading: PropTypes.bool,
 };
 
-const mapStateToProps = ({ conceptLinkActionLoading }, ownProps) => ({
-  loading: _.pathEq("action.href")(conceptLinkActionLoading)(ownProps),
+const mapStateToProps = ({ deleteRelationLoading }, { action }) => ({
+  loading: _.pathEq("id")(deleteRelationLoading)(action),
 });
 
-export const DeleteLinkConnected = connect(mapStateToProps, {
-  conceptLinkAction,
-})(DeleteLink);
+export const DeleteLinkConnected = connect(mapStateToProps, { deleteRelation, })(DeleteLink);
 
 export const LinkActions = ({ delete: deleteAction }) =>
   deleteAction ? <DeleteLinkConnected action={deleteAction} /> : null;

package/src/concepts/relations/components/__tests__/ConceptLinkActions.spec.js

@@ -0,0 +1,116 @@
+import React from "react";
+import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
+import { DeleteLink } from "../ConceptLinkActions";
+
+describe("ConceptLinkActions", () => {
+  describe("DeleteLink", () => {
+    const deleteRelation = jest.fn();
+    const user = userEvent.setup({ delay: null });
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it("should render loading icon when loading is true", () => {
+      const action = { href: "/api/links/123" };
+      const rendered = render(
+        <DeleteLink deleteRelation={deleteRelation} action={action} loading={true} />
+      );
+
+      expect(rendered.container.querySelector(".icon.loading")).toBeInTheDocument();
+      expect(rendered.container).toMatchSnapshot();
+    });
+
+    it("should render delete button when loading is false", async () => {
+      const action = { href: "/api/links/123" };
+      const rendered = render(
+        <DeleteLink deleteRelation={deleteRelation} action={action} loading={false} />
+      );
+      await waitForLoad(rendered);
+
+      expect(rendered.getByRole("button")).toBeInTheDocument();
+      expect(rendered.container).toMatchSnapshot();
+    });
+
+    it("should extract link id from href and call deleteRelation on confirm", async () => {
+      const action = { href: "/api/links/456" };
+      const rendered = render(
+        <DeleteLink deleteRelation={deleteRelation} action={action} loading={false} />
+      );
+      await waitForLoad(rendered);
+
+      await user.click(rendered.getByRole("button"));
+
+      const confirmButton = rendered.getByLabelText("modal-affirmative-action");
+      await user.click(confirmButton);
+
+      expect(deleteRelation).toHaveBeenCalledWith({ id: 456 });
+    });
+
+    it("should handle href without link id", async () => {
+      const action = { href: "/api/other/endpoint" };
+      const rendered = render(
+        <DeleteLink deleteRelation={deleteRelation} action={action} loading={false} />
+      );
+      await waitForLoad(rendered);
+
+      await user.click(rendered.getByRole("button"));
+
+      const confirmButton = rendered.getByLabelText("modal-affirmative-action");
+      await user.click(confirmButton);
+
+      expect(deleteRelation).not.toHaveBeenCalled();
+    });
+
+    it("should handle null href", async () => {
+      const action = { href: null };
+      const rendered = render(
+        <DeleteLink deleteRelation={deleteRelation} action={action} loading={false} />
+      );
+      await waitForLoad(rendered);
+
+      await user.click(rendered.getByRole("button"));
+
+      const confirmButton = rendered.getByLabelText("modal-affirmative-action");
+      await user.click(confirmButton);
+
+      expect(deleteRelation).not.toHaveBeenCalled();
+    });
+
+    it("should handle undefined href", async () => {
+      const action = {};
+      const rendered = render(
+        <DeleteLink deleteRelation={deleteRelation} action={action} loading={false} />
+      );
+      await waitForLoad(rendered);
+
+      await user.click(rendered.getByRole("button"));
+
+      const confirmButton = rendered.getByLabelText("modal-affirmative-action");
+      await user.click(confirmButton);
+
+      expect(deleteRelation).not.toHaveBeenCalled();
+    });
+
+    it("should open and close modal correctly", async () => {
+      const action = { href: "/api/links/789" };
+      const rendered = render(
+        <DeleteLink deleteRelation={deleteRelation} action={action} loading={false} />
+      );
+      await waitForLoad(rendered);
+
+      await user.click(rendered.getByRole("button"));
+
+      const confirmButton = rendered.getByLabelText("modal-affirmative-action");
+      expect(confirmButton).toBeInTheDocument();
+
+      const cancelButton = rendered.getByLabelText("modal-negative-action");
+      await user.click(cancelButton);
+
+      expect(rendered.queryByLabelText("modal-affirmative-action")).not.toBeInTheDocument();
+      expect(deleteRelation).not.toHaveBeenCalled();
+    });
+  });
+});
+

package/src/concepts/relations/components/__tests__/__snapshots__/ConceptLinkActions.spec.js.snap

@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConceptLinkActions DeleteLink should render delete button when loading is false 1`] = `
+<div>
+  <button
+    class="ui red mini basic icon button"
+  >
+    <i
+      aria-hidden="true"
+      class="red trash alternate outline icon"
+    />
+  </button>
+</div>
+`;
+
+exports[`ConceptLinkActions DeleteLink should render loading icon when loading is true 1`] = `
+<div>
+  <i
+    aria-hidden="true"
+    class="red circle notch loading icon"
+  />
+</div>
+`;