@truedat/bg 7.10.3 → 7.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "7.10.3",
+  "version": "7.11.0",
   "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.10.3",
+    "@truedat/test": "7.11.0",
     "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": "1233e6ea0f6fa0c7d7483ae79df7e79a2733bc53"
+  "gitHead": "c8c0d3e62835df86440869c7b797bbe2fc12f3a6"
 }

package/src/concepts/api.js

@@ -20,8 +20,10 @@ const API_BUSINESS_CONCEPT_BULK_UPLOAD =
   "/api/business_concepts/bulk_upload_event";
 const API_BUSINESS_CONCEPT_SET_CONFIDENTIAL =
   "/api/business_concept_versions/:id/set_confidential";
+const API_CONCEPT_SUGGESTIONS = "/api/business_concept_versions/suggestions"
 
 export {
+  API_CONCEPT_SUGGESTIONS,
   API_BUSINESS_CONCEPT_VERSION,
   API_BUSINESS_CONCEPT_VERSIONS_ACTIONS,
   API_BUSINESS_CONCEPT_VERSIONS_CSV,

package/src/concepts/components/ConceptLinksUploadButton.js

@@ -38,18 +38,14 @@ export const ConceptLinksUploadButton = () => {
         triggerUpload(data)
           .then(({ status, data }) => {
             const alertMessage = getUploadAlertMessage({ status, data });
-            console.log("alertMessage --->", alertMessage);
             setAlertMessage(alertMessage);
           })
           .catch((error) => {
-            console.log("error --->", error);
             if (error.response) {
               const { status, data } = error.response;
               const alertMessage = getUploadAlertMessage({ status, data });
-              console.log("error response alertMessage --->", alertMessage);
               setAlertMessage(alertMessage);
             } else {
-              console.log("error.message --->", error.message);
               setAlertMessage(error.message);
             }
           });

package/src/concepts/components/ConceptRoutes.js

@@ -4,8 +4,7 @@ import PropTypes from "prop-types";
 import { Route, useParams, Routes } from "react-router";
 import { connect } from "react-redux";
 import { ProtectedRoute } from "@truedat/core/router";
-// import { Unauthorized } from "@truedat/core/components";
-// import { useAuthorized } from "@truedat/core/hooks";
+
 import {
   CONCEPT_EDIT,
   CONCEPT_LINKS_MANAGEMENT,
@@ -25,6 +24,8 @@ import {
 } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
 import { getSidemenuGlossarySubscopes } from "@truedat/core/selectors/getSidemenuGlossarySubscopes";
+import { SearchContextProvider } from "@truedat/core/search/SearchContext";
+import { useLinksSearch, useLinksFilters } from "../relations/hooks/useLinks";
 import Concept from "./Concept";
 import ConceptCrumbs from "./ConceptCrumbs";
 import ConceptEdit from "./ConceptEdit";
@@ -36,6 +37,8 @@ import ConceptsBulkUpdate from "./ConceptsBulkUpdate";
 
 import ConceptSubscriptionLoader from "./ConceptSubscriptionLoader";
 import ConceptsUploadEvents from "./ConceptsUploadEvents";
+import ConceptLinksApprovals from "../relations/components/ConceptLinksApprovals";
+import ConceptLinksApprovalResults from "../relations/components/ConceptLinksApprovalResults";
 
 const RelationTagsLoader = React.lazy(
   () => import("@truedat/lm/components/RelationTagsLoader")
@@ -85,13 +88,6 @@ const ConceptRoutes = ({
   sidemenuGlossarySubscopes,
 }) => {
   const { formatMessage } = useIntl();
-  // const authorized = useAuthorized([
-  //   "business_glossary_view",
-  //   "business_glossary_management",
-  // ]);
-  // if (!authorized) {
-  //   return <Unauthorized />;
-  // }
 
   return (
     <Routes>
@@ -181,6 +177,29 @@ const ConceptRoutes = ({
             element={<ConceptsUploadEvents />}
           />
 
+          <Route
+            path="approvals/results"
+            element={<ConceptLinksApprovalResults />}
+          />
+
+          <Route
+            path="approvals"
+            element={
+              <>
+                <SearchContextProvider
+                  initialSortColumn="updated_at"
+                  initialSortDirection="ascending"
+                  useSearch={useLinksSearch}
+                  useFilters={useLinksFilters}
+                  pageSize={20}
+                  defaultFilters={{ status: ["pending"] }}
+                >
+                  <ConceptLinksApprovals />
+                </SearchContextProvider>
+              </>
+            }
+          />
+
           <Route
             // CONCEPT_LINKS_MANAGEMENT = "/concepts/management/links";
             path="links"
@@ -251,43 +270,6 @@ const ConceptRoutes = ({
         />
       </Route>
 
-      {/* <Route
-        path={CONCEPTS_NEW}
-        element={
-          <>
-            <ConceptCrumbs conceptAction="concepts.actions.create" />
-            <ConceptCreate />
-          </>
-        }
-      /> */}
-
-      <Route path="glossaryManagement">
-        <Route
-          // CONCEPTS_SIDEMENU_MANAGEMENT_UPLOADS =  "/glossaryManagement/uploads";
-          path="uploads"
-          element={<ConceptsUploadEvents />}
-        />
-        <Route
-          // CONCEPTS_SIDEMENU_MANAGEMENT_LINKS = "/glossaryManagement/links";
-          path="links"
-          element={
-            <>
-              <RelationTagsLoader />
-              <ConceptsLinksManagement
-                header={formatMessage({ id: "concepts.header.linksManager" })}
-                subheader={formatMessage({
-                  id: "concepts.subheader.linksManager",
-                })}
-                icon={formatMessage({
-                  id: "concepts.header.linksManager.icon",
-                  defaultMessage: "linkify",
-                })}
-              />
-            </>
-          }
-        />
-      </Route>
-
       <Route path="glossarySubscope">
         <Route
           // CONCEPTS_SIDEMENU_SUBSCOPE = "/glossarySubscope/:subscope/published";

package/src/concepts/components/ConceptSuggestions.js

@@ -0,0 +1,71 @@
+import _ from "lodash/fp";
+import React, { useEffect } from "react";
+import { Popup } from "semantic-ui-react";
+import { useIntl } from "react-intl";
+import { useParams } from "react-router";
+import { useSelector } from "react-redux";
+import PropTypes from "prop-types";
+import { useConceptSuggestions } from "../hooks/useConcepts";
+import { ConceptSelectorTable } from "../relations/components/ConceptSelector";
+
+const SimilarityColumn = (similarity) => {
+    const { formatMessage } = useIntl();
+    return (
+        <Popup
+            content={formatMessage({ id: "suggestions.similarity.cosine.popup" })}
+            trigger={<span>{similarity.toFixed(3)}</span>}
+        />
+    );
+};
+
+const similarityColumnDefinition = {
+    name: "similarity",
+    fieldSelector: _.prop("similarity"),
+    fieldDecorator: SimilarityColumn,
+    width: 1,
+};
+
+export const ConceptSuggestions = ({
+    selectedConcept,
+    handleConceptSelected,
+}) => {
+    const { id } = useParams();
+    const structureLinks = useSelector((state) => state.structureLinks);
+
+    const {
+        trigger: fetchSuggestions,
+        data,
+    } = useConceptSuggestions();
+
+    useEffect(() => {
+        if (id && structureLinks) {
+            fetchSuggestions({
+                resource: {
+                    id,
+                    type: "structures",
+                    links: _.filter(
+                        ({ resource_type }) => resource_type == "concept"
+                    )(structureLinks),
+                },
+            });
+        }
+    }, [id, structureLinks]);
+
+    const concepts = data?.data?.data || [];
+
+    return (
+        <ConceptSelectorTable
+            concepts={concepts}
+            selectedConcept={selectedConcept}
+            handleConceptSelected={handleConceptSelected}
+            extraColumns={[similarityColumnDefinition]}
+        />
+    );
+};
+
+ConceptSuggestions.propTypes = {
+    handleSelectedStructure: PropTypes.func,
+    selectedStructure: PropTypes.object,
+};
+
+export default ConceptSuggestions;

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

@@ -0,0 +1,201 @@
+import React from "react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { useAuthorized } from "@truedat/core/hooks/useAuthorized";
+import {
+  CONCEPTS,
+  CONCEPTS_PENDING,
+  CONCEPTS_DEPRECATED,
+  CONCEPTS_NEW,
+  CONCEPTS_BULK_UPDATE,
+  CONCEPTS_BULK_UPLOAD_EVENTS,
+  CONCEPT_LINKS_MANAGEMENT,
+  CONCEPT_VERSION,
+  CONCEPT_EDIT,
+  CONCEPTS_SUBSCOPE,
+  CONCEPTS_SIDEMENU_SUBSCOPE,
+  CONCEPTS_SIDEMENU_SUBSCOPE_PENDING,
+  CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED,
+} from "@truedat/core/routes";
+import ConceptRoutes from "../ConceptRoutes";
+
+jest.mock("@truedat/core/hooks/useAuthorized", () => ({
+  useAuthorized: jest.fn(() => true),
+}));
+
+jest.mock("../Concept", () => () => <div>Concept</div>);
+jest.mock("../ConceptCrumbs", () => () => <div>ConceptCrumbs</div>);
+jest.mock("../ConceptEdit", () => () => <div>ConceptEdit</div>);
+jest.mock("../ConceptCreate", () => () => <div>ConceptCreate</div>);
+jest.mock("../ConceptsLinksManagement", () => () => (
+  <div>ConceptsLinksManagement</div>
+));
+jest.mock("../ConceptLoader", () => () => <div>ConceptLoader</div>);
+jest.mock("../Concepts", () => () => <div>Concepts</div>);
+jest.mock("../ConceptsBulkUpdate", () => () => <div>ConceptsBulkUpdate</div>);
+jest.mock("../ConceptSubscriptionLoader", () => () => (
+  <div>ConceptSubscriptionLoader</div>
+));
+jest.mock("../ConceptsUploadEvents", () => () => (
+  <div>ConceptsUploadEvents</div>
+));
+jest.mock("../../relations/components/ConceptLinksApprovals", () => () => (
+  <div>ConceptLinksApprovals</div>
+));
+jest.mock(
+  "../../relations/components/ConceptLinksApprovalResults",
+  () => () => <div>ConceptsLinksApprovalsResults</div>
+);
+jest.mock("@truedat/lm/components/RelationTagsLoader", () => () => (
+  <div>RelationTagsLoader</div>
+));
+jest.mock("@truedat/core/components/TemplatesLoader", () => () => (
+  <div>TemplatesLoader</div>
+));
+jest.mock("@truedat/lm/components/RelationsGraphLoader", () => () => (
+  <div>RelationsGraphLoader</div>
+));
+
+describe("<ConceptRoutes />", () => {
+  it("renders correctly with default route", async () => {
+    const rendered = render(<ConceptRoutes />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with concepts route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with pending concepts route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_PENDING],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with deprecated concepts route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_DEPRECATED],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with new concept route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_NEW],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with bulk update route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_BULK_UPDATE],
+      state: {
+        templatesLoading: false,
+        templates: { some: "template" },
+      },
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with bulk upload events route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_BULK_UPLOAD_EVENTS],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with links management route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPT_LINKS_MANAGEMENT],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with concept version route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [
+        CONCEPT_VERSION.replace(":business_concept_id", "123").replace(
+          ":id",
+          "456"
+        ),
+      ],
+      state: {
+        concept: { business_concept_id: "123" },
+      },
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with concept edit route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [
+        CONCEPT_EDIT.replace(":business_concept_id", "123").replace(
+          ":id",
+          "456"
+        ),
+      ],
+      state: {
+        concept: { business_concept_id: "123" },
+        templatesLoading: false,
+        templates: { some: "template" },
+      },
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with subscope route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_SUBSCOPE.replace(":subscope", "test")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with sidemenu subscope route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_SIDEMENU_SUBSCOPE.replace(":subscope", "test")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with sidemenu subscope pending route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS_SIDEMENU_SUBSCOPE_PENDING.replace(":subscope", "test")],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders correctly with sidemenu subscope deprecated route", async () => {
+    const rendered = render(<ConceptRoutes />, {
+      routes: [
+        CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED.replace(":subscope", "test"),
+      ],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders unauthorized component when not authorized", async () => {
+    useAuthorized.mockReturnValueOnce(false);
+    const rendered = render(<ConceptRoutes />, {
+      routes: [CONCEPTS],
+    });
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+});

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

@@ -0,0 +1,74 @@
+import React from "react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { useParams } from "react-router";
+import { ConceptSuggestions } from "../ConceptSuggestions";
+import { ConceptSelectorTable } from "../../relations/components/ConceptSelector";
+import { useConceptSuggestions } from "../../hooks/useConcepts";
+
+jest.mock("react-router", () => ({
+    ...jest.requireActual("react-router"),
+    useParams: jest.fn(),
+}));
+
+jest.mock("../../hooks/useConcepts", () => ({
+    useConceptSuggestions: jest.fn(),
+}));
+
+jest.mock("../../relations/components/ConceptSelector", () => {
+    return {
+        __esModule: true,
+        ConceptSelectorTable: jest.fn(() => <div>MockSearchResults</div>),
+    };
+});
+
+describe("ConceptSuggestions", () => {
+    const mockFetchSuggestions = jest.fn();
+
+    const structureLinks = [
+        { resource_type: "concept", id: "c1" },
+        { resource_type: "other", id: "not-c" }
+    ];
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        useParams.mockReturnValue({ id: "123" });
+
+        useConceptSuggestions.mockReturnValue({
+            trigger: mockFetchSuggestions,
+            data: {
+                data: {
+                    data: [
+                        { id: "concept1", similarity: 0.89 },
+                        { id: "concept2", similarity: 0.77 },
+                    ],
+                },
+            },
+            isMutating: false,
+        });
+    });
+
+    const state = { structureLinks };
+
+    it("calls fetchSuggestions on mount with correct parameters", async () => {
+        const rendered = render(<ConceptSuggestions selectedConcept={null} handleConceptSelected={jest.fn()} />, { state });
+        await waitForLoad(rendered);
+        expect(mockFetchSuggestions).toHaveBeenCalledWith({
+            resource: {
+                id: "123",
+                type: "structures",
+                links: [{ resource_type: "concept", id: "c1" }],
+            },
+        });
+    });
+
+    it("renders ConceptSelectorTable with props", async () => {
+        const rendered = render(<ConceptSuggestions selectedConcept={{}} handleConceptSelected={jest.fn()} />, { state });
+        await waitForLoad(rendered);
+        expect(rendered.getByText("MockSearchResults")).toBeInTheDocument();
+        const props = ConceptSelectorTable.mock.calls[0][0];
+        expect(props.concepts).toEqual([
+            { id: "concept1", similarity: 0.89 },
+            { id: "concept2", similarity: 0.77 },
+        ]);
+    });
+});

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

@@ -0,0 +1,165 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ConceptRoutes /> renders correctly with bulk update route 1`] = `
+<div>
+  <div>
+    ConceptCrumbs
+  </div>
+  <div>
+    TemplatesLoader
+  </div>
+  <div>
+    ConceptsBulkUpdate
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with bulk upload events route 1`] = `
+<div>
+  <div>
+    ConceptsUploadEvents
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with concept edit route 1`] = `
+<div>
+  <div>
+    ConceptCrumbs
+  </div>
+  <div>
+    TemplatesLoader
+  </div>
+  <div>
+    ConceptLoader
+  </div>
+  <div>
+    ConceptEdit
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with concept version route 1`] = `
+<div>
+  <div>
+    ConceptLoader
+  </div>
+  <div>
+    RelationTagsLoader
+  </div>
+  <div>
+    ConceptSubscriptionLoader
+  </div>
+  <div>
+    RelationsGraphLoader
+  </div>
+  <div>
+    Concept
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with concepts route 1`] = `
+<div>
+  <div>
+    Concepts
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with default route 1`] = `<div />`;
+
+exports[`<ConceptRoutes /> renders correctly with deprecated concepts route 1`] = `
+<div>
+  <div>
+    Concepts
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with links management route 1`] = `
+<div>
+  <div>
+    RelationTagsLoader
+  </div>
+  <div>
+    ConceptsLinksManagement
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with new concept route 1`] = `
+<div>
+  <div>
+    ConceptCrumbs
+  </div>
+  <div>
+    ConceptCreate
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with pending concepts route 1`] = `
+<div>
+  <div>
+    Concepts
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with sidemenu subscope deprecated route 1`] = `
+<div>
+  <div>
+    Concepts
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with sidemenu subscope pending route 1`] = `
+<div>
+  <div>
+    Concepts
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with sidemenu subscope route 1`] = `
+<div>
+  <div>
+    Concepts
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders correctly with subscope route 1`] = `
+<div>
+  <div>
+    Concepts
+  </div>
+</div>
+`;
+
+exports[`<ConceptRoutes /> renders unauthorized component when not authorized 1`] = `
+<div>
+  <div
+    class="ui icon visible bottom attached message center"
+  >
+    <i
+      aria-hidden="true"
+      class="warning sign icon"
+    />
+    <div
+      class="content"
+    >
+      <div
+        class="header"
+      >
+        view.unauthorized.head
+      </div>
+      <p>
+        view.unauthorized.content
+      </p>
+    </div>
+  </div>
+</div>
+`;