@truedat/lm 7.7.0 → 7.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/lm",
-  "version": "7.7.0",
+  "version": "7.7.2",
   "description": "Truedat Link Manager",
   "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.7.0",
+    "@truedat/test": "7.7.2",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -82,5 +82,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "758c330b9a55bf81463dc4d97e4850d713ba8c76"
+  "gitHead": "bb159aad74d5bd5fada2d9b753e2c4b8d902a7da"
 }

package/src/components/ConceptLink.js

@@ -1,18 +1,25 @@
 import { Link } from "react-router";
 import PropTypes from "prop-types";
+import OriginLabel from "@truedat/core/components/OriginLabel";
 import { linkTo } from "@truedat/core/routes";
 
-export const ConceptLink = ({ resource_id: business_concept_id, name }) => (
+export const ConceptLink = ({
+  resource_id: business_concept_id,
+  name,
+  origin,
+}) => (
   <Link
     to={linkTo.CONCEPT_LINKS_STRUCTURES({ business_concept_id, id: "current" })}
   >
     {name}
+    <OriginLabel origin={origin} />
   </Link>
 );
 
 ConceptLink.propTypes = {
   resource_id: PropTypes.number,
   name: PropTypes.string,
+  origin: PropTypes.string,
 };
 
 export default ConceptLink;

package/src/components/ConceptSuggestionLinkForm.js

@@ -12,8 +12,8 @@ import { Button } from "semantic-ui-react";
 import { createRelation, clearSelectedRelationTags } from "../routines";
 import TagTypeDropdownSelector from "./TagTypeDropdownSelector";
 
-const StructureSuggestions = React.lazy(() =>
-  import("@truedat/dd/components/StructureSuggestions")
+const StructureSuggestions = React.lazy(
+  () => import("@truedat/dd/components/StructureSuggestions")
 );
 
 const selectTagOptions = makeTagOptionsSelector("data_field");
@@ -45,6 +45,7 @@ export const ConceptSuggestionLinkForm = () => {
       target_id: selectedStructure.id,
       target_type: "data_structure",
       tag_ids: selectedRelationTags ? selectedRelationTags : [],
+      origin: "suggested",
     };
     dispatch(createRelation.trigger(structureLink));
   };

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

@@ -5,111 +5,120 @@ import { useParams } from "react-router";
 import { createRelation, clearSelectedRelationTags } from "../../routines";
 
 jest.mock("react-redux", () => ({
-    useSelector: jest.fn(),
-    useDispatch: jest.fn(),
+  useSelector: jest.fn(),
+  useDispatch: jest.fn(),
 }));
 
 jest.mock("react-router", () => ({
-    useParams: jest.fn(),
+  useParams: jest.fn(),
 }));
 
 jest.mock("react-intl", () => ({
-    useIntl: () => ({
-        formatMessage: ({ id }) => id, // mock translated strings
-    }),
+  useIntl: () => ({
+    formatMessage: ({ id }) => id, // mock translated strings
+  }),
 }));
 
 // Mock selector factory
 jest.mock("@truedat/core/selectors", () => ({
-    makeTagOptionsSelector: jest.fn(() => jest.fn(() => [{ id: "tag1", name: "Tag 1" }])),
+  makeTagOptionsSelector: jest.fn(() =>
+    jest.fn(() => [{ id: "tag1", name: "Tag 1" }])
+  ),
 }));
 
 // Mock components
 jest.mock("@truedat/dd/components/StructureSuggestions", () =>
-    jest.fn((props) => {
-        // Include a button to simulate structure selection
-        return (
-            <div>
-                <div>MockStructureSuggestions</div>
-                <button onClick={() => props.handleSelectedStructure({ id: "structure123" })}>
-                    Select Structure
-                </button>
-            </div>
-        );
-    })
+  jest.fn((props) => {
+    // Include a button to simulate structure selection
+    return (
+      <div>
+        <div>MockStructureSuggestions</div>
+        <button
+          onClick={() => props.handleSelectedStructure({ id: "structure123" })}
+        >
+          Select Structure
+        </button>
+      </div>
+    );
+  })
 );
 
 jest.mock("../TagTypeDropdownSelector", () =>
-    jest.fn(() => <div>MockTagTypeDropdownSelector</div>)
+  jest.fn(() => <div>MockTagTypeDropdownSelector</div>)
 );
 
 jest.mock("@truedat/core/components", () => ({
-    HistoryBackButton: (props) => <button>{props.content}</button>,
+  HistoryBackButton: (props) => <button>{props.content}</button>,
 }));
 
 jest.mock("@truedat/core/routes", () => ({
-    linkTo: {
-        CONCEPT_LINKS_STRUCTURES: jest.fn(() => "/mocked/redirect/url"),
-    },
+  linkTo: {
+    CONCEPT_LINKS_STRUCTURES: jest.fn(() => "/mocked/redirect/url"),
+  },
 }));
 
 describe("ConceptSuggestionLinkForm", () => {
-    const mockDispatch = jest.fn();
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-
-        useParams.mockReturnValue({ business_concept_id: "bc1", id: "v1" });
-        useDispatch.mockReturnValue(mockDispatch);
-        useSelector.mockImplementation((selector) =>
-            selector({
-                selectedRelationTags: ["tag1"],
-            })
-        );
-
-        clearSelectedRelationTags.trigger = jest.fn(() => ({ type: "CLEAR_TAGS" }));
-        createRelation.trigger = jest.fn((payload) => ({ type: "CREATE_RELATION", payload }));
-    });
-
-    it("renders structure suggestions and tag dropdown", async () => {
-        render(<ConceptSuggestionLinkForm />);
-
-        await waitFor(() => {
-            expect(screen.getByText("MockStructureSuggestions")).toBeInTheDocument();
-            expect(screen.getByText("actions.create")).toBeDisabled();
-        });
-
+  const mockDispatch = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    useParams.mockReturnValue({ business_concept_id: "bc1", id: "v1" });
+    useDispatch.mockReturnValue(mockDispatch);
+    useSelector.mockImplementation((selector) =>
+      selector({
+        selectedRelationTags: ["tag1"],
+      })
+    );
+
+    clearSelectedRelationTags.trigger = jest.fn(() => ({ type: "CLEAR_TAGS" }));
+    createRelation.trigger = jest.fn((payload) => ({
+      type: "CREATE_RELATION",
+      payload,
+    }));
+  });
+
+  it("renders structure suggestions and tag dropdown", async () => {
+    render(<ConceptSuggestionLinkForm />);
+
+    await waitFor(() => {
+      expect(screen.getByText("MockStructureSuggestions")).toBeInTheDocument();
+      expect(screen.getByText("actions.create")).toBeDisabled();
     });
+  });
 
-    it("dispatches createRelation on submit", async () => {
-        render(<ConceptSuggestionLinkForm />);
-
-        // Simulate structure selection
-        fireEvent.click(screen.getByText("Select Structure"));
+  it("dispatches createRelation on submit", async () => {
+    render(<ConceptSuggestionLinkForm />);
 
-        // Now the submit button should be enabled
-        const createBtn = screen.getByText("actions.create");
-        expect(createBtn).not.toBeDisabled();
+    // Simulate structure selection
+    fireEvent.click(screen.getByText("Select Structure"));
 
-        fireEvent.click(createBtn);
+    // Now the submit button should be enabled
+    const createBtn = screen.getByText("actions.create");
+    expect(createBtn).not.toBeDisabled();
 
-        expect(createRelation.trigger).toHaveBeenCalledWith({
-            redirectUrl: "/mocked/redirect/url",
-            source_id: "bc1",
-            source_type: "business_concept",
-            target_id: "structure123",
-            target_type: "data_structure",
-            tag_ids: ["tag1"],
-        });
+    fireEvent.click(createBtn);
 
-        expect(mockDispatch).toHaveBeenCalledWith(expect.objectContaining({ type: "CREATE_RELATION" }));
+    expect(createRelation.trigger).toHaveBeenCalledWith({
+      redirectUrl: "/mocked/redirect/url",
+      source_id: "bc1",
+      source_type: "business_concept",
+      target_id: "structure123",
+      target_type: "data_structure",
+      tag_ids: ["tag1"],
+      origin: "suggested",
     });
 
-    it("dispatches clearSelectedRelationTags on unmount", () => {
-        const { unmount } = render(<ConceptSuggestionLinkForm />);
-        unmount();
+    expect(mockDispatch).toHaveBeenCalledWith(
+      expect.objectContaining({ type: "CREATE_RELATION" })
+    );
+  });
 
-        expect(clearSelectedRelationTags.trigger).toHaveBeenCalled();
-        expect(mockDispatch).toHaveBeenCalledWith({ type: "CLEAR_TAGS" });
-    });
+  it("dispatches clearSelectedRelationTags on unmount", () => {
+    const { unmount } = render(<ConceptSuggestionLinkForm />);
+    unmount();
+
+    expect(clearSelectedRelationTags.trigger).toHaveBeenCalled();
+    expect(mockDispatch).toHaveBeenCalledWith({ type: "CLEAR_TAGS" });
+  });
 });

package/src/reducers/relations.js

@@ -16,6 +16,7 @@ const pickFields = _.pick([
   "target_type",
   "context",
   "tags",
+  "origin",
 ]);
 
 const relations = (state = initialState, { type, payload, meta }) => {

package/src/sagas/__tests__/createRelation.spec.js

@@ -39,6 +39,7 @@ describe("sagas: createRelationSaga", () => {
     context: {},
     tag_ids: [],
     redirectUrl,
+    origin: "some origin",
   };
   const meta = { redirectUrl };
   const relation = _.pick([
@@ -48,6 +49,7 @@ describe("sagas: createRelationSaga", () => {
     "target_id",
     "target_type",
     "tag_ids",
+    "origin",
   ])(payload);
   const request_data = {
     relation,

package/src/sagas/createRelation.js

@@ -13,6 +13,7 @@ export function* createRelationSaga({ payload }) {
       "target_id",
       "target_type",
       "tag_ids",
+      "origin",
     ])(payload);
 
     const redirectUrl = _.prop("redirectUrl")(payload);