@truedat/dd 7.0.3 → 7.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.0.3",
+  "version": "7.0.4",
   "description": "Truedat Web Data Dictionary",
   "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": "7.0.3",
+    "@truedat/test": "7.0.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "7.0.3",
-    "@truedat/core": "7.0.3",
-    "@truedat/df": "7.0.3",
+    "@truedat/auth": "7.0.4",
+    "@truedat/core": "7.0.4",
+    "@truedat/df": "7.0.4",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "871005135545e304fa6ba9a5d49fa31b46e28a7c"
+  "gitHead": "b2c0938fa6ea458e3009c82e4e91b7bc79c8ffed"
 }

package/src/components/GrantRequest.js

@@ -4,7 +4,7 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
-import { FormattedMessage, useIntl } from "react-intl";
+import { useIntl } from "react-intl";
 import { Grid, Segment, List, Label } from "semantic-ui-react";
 import GenericCrumbs from "@truedat/core/components/GenericCrumbs";
 import { getGrantRequestTemplate } from "../selectors";

package/src/components/StructureSelector.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
+import { connect, useSelector } from "react-redux";
 import { Segment } from "semantic-ui-react";
 import SearchWidget from "@truedat/core/search/SearchWidget";
 import {
@@ -13,6 +13,8 @@ import {
   useDataStructureFilters,
   useDataStructureSearch,
 } from "../hooks/useStructures";
+import { defaultColumnsForStructureSelector } from "../selectors";
+
 import StructuresSearchResults from "./StructuresSearchResults";
 
 function StructureSelectorContent({
@@ -70,6 +72,13 @@ export const StructureSelector = (props) => {
   const pageSize = _.prop("pageSize")(props);
   const withGrantRequests = _.prop("withGrantRequests")(props);
   const withDataFields = _.prop("withDataFields")(props);
+  const defaultOverwriteColumns = useSelector(
+    defaultColumnsForStructureSelector
+  );
+  const overwriteColumns = _.propOr(
+    defaultOverwriteColumns,
+    "overwriteColumns"
+  )(props);
 
   const enrichSearchPayload = {
     my_grant_requests: !!withGrantRequests,
@@ -90,10 +99,12 @@ export const StructureSelector = (props) => {
     enrichSearchPayload,
   };
 
+  const selectorProps = { ...props, overwriteColumns };
+
   return (
     <>
       <SearchContextProvider {...searchProps}>
-        <StructureSelectorContent {...props} />
+        <StructureSelectorContent {...selectorProps} />
       </SearchContextProvider>
     </>
   );

package/src/components/__tests__/__snapshots__/StructureSelector.spec.js.snap

@@ -142,12 +142,7 @@ exports[`<StructureSelector /> matches the latest snapshot 1`] = `
             <td
               class="structure-cell-overflow"
             >
-              <a
-                href="/structures/1"
-                title="1"
-              >
-                1
-              </a>
+              1
             </td>
             <td
               class=""
@@ -179,12 +174,7 @@ exports[`<StructureSelector /> matches the latest snapshot 1`] = `
             <td
               class="structure-cell-overflow"
             >
-              <a
-                href="/structures/2"
-                title="2"
-              >
-                2
-              </a>
+              2
             </td>
             <td
               class=""

package/src/selectors/__tests__/structureColumnsSelector.spec.js

@@ -1,4 +1,7 @@
-import { structureColumnsSelector } from "..";
+import {
+  defaultColumnsForStructureSelector,
+  structureColumnsSelector,
+} from "..";
 
 describe("selectors: structureColumnsSelector", () => {
   it("should return default structuresColumns when present", () => {
@@ -28,3 +31,28 @@ describe("selectors: structureColumnsSelector", () => {
     expect(res).toEqual([{ name: "foo" }, { name: "bar" }]);
   });
 });
+
+describe("selectors: defaultColumnsForStructureSelector", () => {
+  it("should replace name from object with decorator ", () => {
+    const structuresColumns = [
+      {
+        name: "name",
+        sort: { name: "name.sort" },
+        fieldDecorator: { foo: "bar" },
+        width: 2,
+      },
+      { name: "group", width: 1 },
+    ];
+    const res = defaultColumnsForStructureSelector({ structuresColumns }, {});
+
+    expect(res).toHaveLength(2);
+    expect(res).toEqual([
+      {
+        name: "name",
+        sort: { name: "name.sort" },
+        width: 2,
+      },
+      { name: "group", width: 1 },
+    ]);
+  });
+});

package/src/selectors/index.js

@@ -1,6 +1,7 @@
 export {
   defaultStructureColumns,
   structureColumnsSelector,
+  defaultColumnsForStructureSelector,
 } from "./structureColumnsSelector";
 export {
   defaultBusinessConceptsLinksToStructuresColumns,

package/src/selectors/structureColumnsSelector.js

@@ -81,3 +81,14 @@ export const structureColumnsSelector = (state, defaultFilters, ownColumns) =>
         )(columns);
     return res;
   })(state);
+
+const rawName = {
+  name: "name",
+  sort: { name: "name.sort" },
+  width: 2,
+};
+export const defaultColumnsForStructureSelector = (state) =>
+  createSelector(
+    (state) => structureColumnsSelector(state, null, null),
+    _.map((item) => (item?.name === "name" ? rawName : item))
+  )(state);