@truedat/bg 6.4.2 → 6.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.4.2",
+  "version": "6.5.0",
   "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.4.2",
+    "@truedat/test": "6.5.0",
     "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.4.2",
-    "@truedat/df": "6.4.2",
-    "@truedat/lm": "6.4.2",
+    "@truedat/core": "6.5.0",
+    "@truedat/df": "6.5.0",
+    "@truedat/lm": "6.5.0",
     "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": "f87c5e68213975f46a32aa9dc085aeac66f75d9c"
+  "gitHead": "28aa11eed2113e0aa15b3510dc79b3c43f41ffe2"
 }

package/src/concepts/components/ConceptsTable.js

@@ -11,7 +11,7 @@ import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { getConceptColumns } from "../selectors";
 import ConceptRow from "./ConceptRow";
 
-export const ConceptsTable = ({ columns }) => {
+export const ConceptsTable = ({ columnsByScope }) => {
   const {
     searchData,
     loading,
@@ -23,6 +23,10 @@ export const ConceptsTable = ({ columns }) => {
 
   const concepts = searchData?.data;
   const { pathname } = useLocation();
+
+  const scope = _.last(pathname.split("/"));
+  const columns = columnsByScope[scope] || columnsByScope.concepts;
+
   const conceptColumns = columns.filter(
     (column) => pathname === CONCEPTS_PENDING || column.name != "status"
   );
@@ -84,11 +88,11 @@ export const ConceptsTable = ({ columns }) => {
 };
 
 ConceptsTable.propTypes = {
-  columns: PropTypes.array,
+  columnsByScope: PropTypes.object,
 };
 
 const mapStateToProps = (state) => ({
-  columns: getConceptColumns(state),
+  columnsByScope: getConceptColumns(state),
 });
 
 export default connect(mapStateToProps)(ConceptsTable);

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { render } from "@truedat/test/render";
 import { Concepts } from "../Concepts";
+import { defaultConceptColumns } from "../../selectors";
 
 const data = {
   data: [
@@ -57,10 +58,17 @@ const messages = {
   },
 };
 
+const state = {
+  conceptsColumns: {
+    concepts: [...defaultConceptColumns],
+  },
+};
+
 describe("<Concepts />", () => {
   it("matches the latest snapshot", () => {
     const renderOpts = {
       messages,
+      state,
     };
 
     const header = "concepts.header.manage";

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { render } from "@truedat/test/render";
 import ConceptsPanel from "../ConceptsPanel";
+import { defaultConceptColumns } from "../../selectors";
 
 const data = {
   data: [
@@ -56,8 +57,15 @@ const messages = {
   },
 };
 
+const state = {
+  conceptsColumns: {
+    concepts: [...defaultConceptColumns],
+  },
+};
+
 const renderOpts = {
   messages,
+  state,
 };
 
 describe("<ConceptsPanel />", () => {

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

@@ -3,6 +3,11 @@ import { render } from "@truedat/test/render";
 import { SearchContextProvider } from "@truedat/core/search/SearchContext";
 import { ConceptsTable } from "../ConceptsTable";
 
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useLocation: () => ({ pathname: "/concept/test" }),
+}));
+
 const data = {
   data: [
     {
@@ -47,9 +52,13 @@ const searchProps = {
 
 describe("<ConceptsTable />", () => {
   it("matches the latest snapshot", () => {
-    const columns = ["name", "status"].map((name) => ({ name }));
+    const defaultColumns = ["name", "status"].map((name) => ({ name }));
+    const columnsByScope = {
+      concepts: [...defaultColumns],
+      test: [...defaultColumns, { name: "type" }],
+    };
 
-    const props = { columns };
+    const props = { columnsByScope };
     const { container } = render(
       <SearchContextProvider {...searchProps} defaultFilters={defaultFilters}>
         <ConceptsTable {...props} />

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

@@ -16,6 +16,11 @@ exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
         >
           Term
         </th>
+        <th
+          class="disabled"
+        >
+          concepts.props.type
+        </th>
       </tr>
     </thead>
     <tbody
@@ -29,6 +34,9 @@ exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
         >
           concept
         </td>
+        <td
+          class=""
+        />
       </tr>
     </tbody>
   </table>

package/src/concepts/selectors/getConceptColumns.js

@@ -14,7 +14,7 @@ const dateDecorator = (date) => (
   <Moment locale="es" date={date} format="YYYY-MM-DD HH:mm" />
 );
 
-const defaultConceptColumns = [
+export const defaultConceptColumns = [
   { name: "name", sort: { name: "name.raw" }, width: 7 },
   {
     name: "domain",
@@ -55,5 +55,5 @@ const getColumns = (state) => state.conceptsColumns;
 
 export const getConceptColumns = createSelector(
   getColumns,
-  _.defaultTo(defaultConceptColumns)
+  _.defaultTo({ concepts: defaultConceptColumns })
 );

package/src/concepts/selectors/index.js

@@ -1,4 +1,4 @@
-export { getConceptColumns } from "./getConceptColumns";
+export { defaultConceptColumns, getConceptColumns } from "./getConceptColumns";
 export { getConceptDomainPath } from "./getConceptDomainPath";
 export {
   getConceptUploadEventColumns,