npm - @truedat/bg - Versions diffs - 6.16.4 → 7.0.1 - Mend

@truedat/bg 6.16.4 → 7.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.16.4",
+  "version": "7.0.1",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.15.2",
+    "@truedat/test": "7.0.1",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,9 +86,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "6.15.2",
-    "@truedat/df": "6.15.2",
-    "@truedat/lm": "6.16.4",
+    "@truedat/core": "7.0.1",
+    "@truedat/df": "7.0.1",
+    "@truedat/lm": "7.0.1",
     "decode-uri-component": "^0.2.2",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "ecf57a30185b9e353b6e2692702b5599e4425edb"
+  "gitHead": "fff3313b142abb69e4d4139e0b6fd85d1af1a898"
 }

package/src/concepts/components/ConceptRow.js CHANGED Viewed

@@ -1,19 +1,14 @@
 import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { useHistory } from "react-router-dom";
 import { Table } from "semantic-ui-react";
 import { columnDecorator } from "@truedat/core/services";
-import { linkTo } from "@truedat/core/routes";
 export const ConceptRow = ({ concept, columns }) => {
   const id = _.prop("id")(concept);
-  const history = useHistory();
   return _.isEmpty(columns) || _.isEmpty(concept) ? null : (
-    <Table.Row
-      key={id}
-      onClick={() => history.push(linkTo.CONCEPT_VERSION(concept))}
-    >
+    <Table.Row key={id}>
       {columns.map((column, i) => (
         <Table.Cell
           key={i}
@@ -27,7 +22,7 @@ export const ConceptRow = ({ concept, columns }) => {
 ConceptRow.propTypes = {
   concept: PropTypes.object.isRequired,
-  columns: PropTypes.array.isRequired
+  columns: PropTypes.array.isRequired,
 };
 export default ConceptRow;

package/src/concepts/components/ConceptsTable.js CHANGED Viewed

@@ -32,7 +32,7 @@ export const ConceptsTable = ({ columnsByScope }) => {
   return (
     <>
       {!_.isEmpty(concepts) && (
-        <Table selectable sortable>
+        <Table sortable>
           <Table.Header>
             <Table.Row>
               {conceptColumns &&

package/src/concepts/components/__tests__/ConceptRow.spec.js CHANGED Viewed

@@ -1,34 +1,58 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render } from "@truedat/test/render";
 import { ConceptRow } from "../ConceptRow";
+import { getConceptColumns } from "../../selectors";
-const mockHistory = {
-  push: jest.fn()
+const renderOpts = {
+  messages: {
+    en: {
+      "concepts.status.draft": "draft",
+    },
+  },
 };
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
-  useHistory: () => mockHistory
-}));
 describe("<ConceptRow />", () => {
   it("matches the latest snapshot", () => {
-    const columns = [{ name: "foo" }, { name: "bar" }];
-    const concept = { business_concept_id: 12, id: 42 };
+    const columns = getConceptColumns({ conceptColumns: null }).concepts;
+    const concept = {
+      business_concept_id: 12,
+      id: 42,
+      name: "foo",
+      status: "draft",
+      last_change_at: "2018-06-27T07:32:53.154377Z",
+    };
     const props = { columns, concept };
-    const wrapper = shallow(<ConceptRow {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    const { container } = render(
+      <table>
+        <tbody>
+          <ConceptRow {...props} />
+        </tbody>
+      </table>,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
   });
-  it("clicking the row will push to history", () => {
-    const columns = [{ name: "foo" }, { name: "bar" }];
-    const concept = { business_concept_id: 12, id: 42 };
+  it("renders concept name as link", () => {
+    const columns = getConceptColumns({ conceptColumns: null }).concepts;
+    const concept = {
+      business_concept_id: 12,
+      id: 42,
+      name: "foo",
+      status: "draft",
+      last_change_at: "2018-06-27T07:32:53.154377Z",
+    };
     const props = { columns, concept };
-    const wrapper = shallow(<ConceptRow {...props} />);
-    wrapper.find("TableRow").prop("onClick")();
-    expect(mockHistory.push.mock.calls.length).toBe(1);
-    expect(mockHistory.push.mock.calls[0][0]).toEqual(
-      "/concepts/12/versions/42"
+    const wrapper = render(
+      <table>
+        <tbody>
+          <ConceptRow {...props} />
+        </tbody>
+      </table>,
+      renderOpts
     );
+    const link = wrapper.getByText("foo");
+    expect(link).toHaveAttribute("href", "/concepts/12/versions/42");
   });
 });

package/src/concepts/components/__tests__/Concepts.spec.js CHANGED Viewed

@@ -8,6 +8,7 @@ const data = {
   data: [
     {
       id: 1,
+      business_concept_id: 1,
       name: "s1",
       description: "dd",
       version: "vs",

package/src/concepts/components/__tests__/ConceptsPanel.spec.js CHANGED Viewed

@@ -8,6 +8,7 @@ const data = {
   data: [
     {
       id: 1,
+      business_concept_id: 1,
       name: "concept",
       domain: { name: "domain" },
       status: "published",

package/src/concepts/components/__tests__/__snapshots__/ConceptRow.spec.js.snap CHANGED Viewed

@@ -1,19 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 exports[`<ConceptRow /> matches the latest snapshot 1`] = `
-<TableRow
-  as="tr"
-  cellAs="td"
-  key="42"
-  onClick={[Function]}
->
-  <TableCell
-    as="td"
-    key="0"
-  />
-  <TableCell
-    as="td"
-    key="1"
-  />
-</TableRow>
+<div>
+  <table>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class=""
+        >
+          <a
+            href="/concepts/12/versions/42"
+          >
+            foo
+          </a>
+        </td>
+        <td
+          class=""
+        />
+        <td
+          class=""
+        >
+          draft
+        </td>
+        <td
+          class="center aligned"
+        >
+        </td>
+        <td
+          class="center aligned"
+        >
+        </td>
+        <td
+          class="center aligned"
+        >
+          <time
+            datetime="1530084773154"
+          >
+            2018-06-27 07:32
+          </time>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 `;

package/src/concepts/components/__tests__/__snapshots__/Concepts.spec.js.snap CHANGED Viewed

@@ -96,7 +96,7 @@ exports[`<Concepts /> matches the latest snapshot 1`] = `
           123 concepts found
         </div>
         <table
-          class="ui selectable sortable table"
+          class="ui sortable table"
         >
           <thead
             class=""
@@ -140,7 +140,11 @@ exports[`<Concepts /> matches the latest snapshot 1`] = `
               <td
                 class=""
               >
-                s1
+                <a
+                  href="/concepts/1/versions/1"
+                >
+                  s1
+                </a>
               </td>
               <td
                 class=""

package/src/concepts/components/__tests__/__snapshots__/ConceptsPanel.spec.js.snap CHANGED Viewed

@@ -72,7 +72,7 @@ exports[`<ConceptsPanel /> matches latest snapshot 1`] = `
       123 concepts found
     </div>
     <table
-      class="ui selectable sortable table"
+      class="ui sortable table"
     >
       <thead
         class=""
@@ -116,7 +116,11 @@ exports[`<ConceptsPanel /> matches latest snapshot 1`] = `
           <td
             class=""
           >
-            concept
+            <a
+              href="/concepts/1/versions/1"
+            >
+              concept
+            </a>
           </td>
           <td
             class=""

package/src/concepts/components/__tests__/__snapshots__/ConceptsTable.spec.js.snap CHANGED Viewed

@@ -3,7 +3,7 @@
 exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
 <div>
   <table
-    class="ui selectable sortable table"
+    class="ui sortable table"
   >
     <thead
       class=""

package/src/concepts/selectors/getConceptColumns.js CHANGED Viewed

@@ -4,6 +4,13 @@ import { Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { createSelector } from "reselect";
 import Moment from "react-moment";
+import { Link } from "react-router-dom";
+import { linkTo } from "@truedat/core/routes";
+const ConceptLink = (concept) =>
+  concept?.id ? (
+    <Link to={linkTo.CONCEPT_VERSION(concept)}>{concept?.name}</Link>
+  ) : null;
 const iconDecorator = (field) =>
   field > 0 ? <Icon name="check circle" /> : "";
@@ -15,7 +22,13 @@ const dateDecorator = (date) => (
 );
 export const defaultConceptColumns = [
-  { name: "name", sort: { name: "name.raw" }, width: 7 },
+  {
+    name: "name",
+    sort: { name: "name.raw" },
+    width: 7,
+    fieldDecorator: ConceptLink,
+    fieldSelector: _.identity,
+  },
   {
     name: "domain",
     sort: { name: "domain.name.sort" },