@truedat/dd 5.6.6 → 5.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.6.6",
+  "version": "5.7.1",
   "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": "5.6.6",
+    "@truedat/test": "5.7.1",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,9 +87,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.6.6",
-    "@truedat/core": "5.6.6",
-    "@truedat/df": "5.6.6",
+    "@truedat/auth": "5.7.1",
+    "@truedat/core": "5.7.1",
+    "@truedat/df": "5.7.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "2f9e356d743886f505c5e2406e2dd04569ad81f7"
+  "gitHead": "88ae546acbe935babaa0b583fb6eb6950c86fd55"
 }

package/src/components/StructuresDownloadOption.js

@@ -8,7 +8,9 @@ import { downloadStructures } from "../routines";
 
 const staticLabels = [
   "type",
-  "name",
+  "tech_name",
+  "alias_name",
+  "link_to_structure",
   "external_id",
   "group",
   "domain",
@@ -60,6 +62,8 @@ StructuresDownloadOption.propTypes = {
   structuresDownloading: PropTypes.bool,
   structuresLoading: PropTypes.bool,
   downloadStructures: PropTypes.func,
+  structures: PropTypes.array,
+  hasFilterApplied: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({

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

@@ -11,8 +11,8 @@ describe("<StructureEvents />", () => {
         resource_id: 2,
         payload: [
           { field: "Column", value: 5 },
-          { field: "id", value: 6 }
-        ]
+          { field: "id", value: 6 },
+        ],
       },
       {
         id: 2,
@@ -20,13 +20,13 @@ describe("<StructureEvents />", () => {
         resource_id: 2,
         payload: [
           { field: "Column", value: 7 },
-          { field: "id", value: 3 }
-        ]
-      }
+          { field: "id", value: 3 },
+        ],
+      },
     ];
     const structure = {
       id: 1,
-      name: "s1"
+      name: "s1",
     };
     const replace = jest.fn();
     const history = { replace };

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { render } from "@truedat/test/render";
 import { StructuresDownloadOption } from "../StructuresDownloadOption";
+import en from "../../messages/en";
 
 describe("<StructuresDownloadOption />", () => {
   const downloadStructures = jest.fn();
@@ -8,19 +9,9 @@ describe("<StructuresDownloadOption />", () => {
   const renderOpts = {
     messages: {
       en: {
+        ...en,
         "structures.actions.download.tooltip": "tooltip",
         "structures.actions.download.popup": "popup",
-        "structures.props.type": "type",
-        "structures.props.metadata": "metadata",
-        "structures.props.name": "name",
-        "structures.props.external_id": "external id",
-        "structures.props.group": "group",
-        "structures.props.domain": "domain",
-        "structures.props.system": "system",
-        "structures.props.path": "path",
-        "structures.props.description": "description",
-        "structures.props.inserted_at": "updated at",
-        "structures.props.deleted_at": "deleted at",
       },
     },
   };

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

@@ -133,6 +133,11 @@ exports[`<StructuresGrantRequestView /> Clicking a grant request button triggers
                   >
                     System
                   </th>
+                  <th
+                    class="one wide ascending sorted disabled"
+                  >
+                    Relation Type
+                  </th>
                   <th
                     class="one wide ascending sorted disabled"
                   >
@@ -172,6 +177,9 @@ exports[`<StructuresGrantRequestView /> Clicking a grant request button triggers
                   <td
                     class=""
                   />
+                  <td
+                    class=""
+                  />
                   <td
                     class=""
                   >
@@ -213,6 +221,9 @@ exports[`<StructuresGrantRequestView /> Clicking a grant request button triggers
                   <td
                     class=""
                   />
+                  <td
+                    class=""
+                  />
                   <td
                     class=""
                   >
@@ -254,6 +265,9 @@ exports[`<StructuresGrantRequestView /> Clicking a grant request button triggers
                   <td
                     class=""
                   />
+                  <td
+                    class=""
+                  />
                   <td
                     class=""
                   >

package/src/messages/en.js

@@ -568,16 +568,19 @@ export default {
   "structures.not_found.body":
     "No structures have been found matching these filters.",
   "structures.not_found.header": "Nothing found...",
+  "structures.props.alias_name": "Alias",
   "structures.props.deleted_at": "Deleted",
   "structures.props.description": "Description",
   "structures.props.domain": "Domain",
   "structures.props.external_id": "External Id",
   "structures.props.group": "Group",
   "structures.props.inserted_at": "Inserted",
+  "structures.props.link_to_structure": "Link to structure",
   "structures.props.metadata": "Metadata",
   "structures.props.name": "Name",
   "structures.props.path": "Path",
   "structures.props.system": "System",
+  "structures.props.tech_name": "Technical Name",
   "structures.props.type": "Type",
   "structures.relation.new.header": "Link to Concept",
   "structures.retrieved.results": "{count} structures found",

package/src/messages/es.js

@@ -584,16 +584,19 @@ export default {
   "structures.not_found.body":
     "No existe ningún elemento para la búsqueda aplicada",
   "structures.not_found.header": "Ningún resultado encontrado",
+  "structures.props.alias_name": "Alias",
   "structures.props.deleted_at": "Borrado",
   "structures.props.description": "Descripción",
   "structures.props.domain": "Dominio",
   "structures.props.external_id": "Id Externo",
   "structures.props.group": "Grupo",
   "structures.props.inserted_at": "Insertado",
+  "structures.props.link_to_structure": "Link a la estructura",
   "structures.props.metadata": "Metadata",
   "structures.props.name": "Nombre",
   "structures.props.path": "Ruta",
   "structures.props.system": "Sistema",
+  "structures.props.tech_name": "Nombre Técnico",
   "structures.props.type": "Tipo",
   "structures.relation.new.header":
     "Vas a vincular este campo a un término del glosario",

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

@@ -34,7 +34,10 @@ describe("sagas: downloadEditableStructuresRequestSaga", () => {
 
 describe("sagas: downloadEditableStructuresSaga", () => {
   const query = { filters: {} };
-  const body = query;
+  const body = {
+    structure_url_schema: "http:localhost:/structures/:id",
+    ...query,
+  };
   const data = "SOME CSV DATA";
 
   it("should put a success action when a response is returned", () => {

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

@@ -3,7 +3,7 @@ import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import {
   downloadStructuresRequestSaga,
   downloadStructuresSaga,
-  saveFile
+  saveFile,
 } from "../downloadStructures";
 import { downloadStructures } from "../../routines";
 import { API_DATA_STRUCTURES_CSV } from "../../api";
@@ -36,7 +36,11 @@ describe("sagas: downloadStructuresSaga", () => {
   const query = { filters: {} };
   const data = "SOME CSV DATA";
 
-  const body = { header_labels: headerLabels, ...query };
+  const body = {
+    header_labels: headerLabels,
+    structure_url_schema: "http:localhost:/structures/:id",
+    ...query,
+  };
 
   it("should put a success action when a response is returned", () => {
     expect(() => {

package/src/sagas/downloadEditableStructures.js

@@ -2,6 +2,7 @@ import _ from "lodash/fp";
 import FileSaver from "file-saver";
 import { call, put, select, takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { STRUCTURE } from "@truedat/core/routes";
 import { downloadEditableStructures } from "../routines";
 import { getPreviousStructureQuery } from "../selectors";
 import { API_DATA_STRUCTURES_EDITABLE_CSV } from "../api";
@@ -17,7 +18,11 @@ export function saveFile(data) {
 
 export function* downloadEditableStructuresSaga() {
   try {
-    const body = yield select(getPreviousStructureQuery);
+    const query = yield select(getPreviousStructureQuery);
+    const body = {
+      structure_url_schema: getStructureUrlSchema(),
+      ...query,
+    };
     const url = API_DATA_STRUCTURES_EDITABLE_CSV;
     yield put(downloadEditableStructures.request(body));
     const { data } = yield call(apiJsonPost, url, body, JSON_OPTS);
@@ -41,3 +46,15 @@ export function* downloadEditableStructuresRequestSaga() {
     downloadEditableStructuresSaga
   );
 }
+
+function getStructureUrlSchema() {
+  const defaultWebPorts = [80, 443];
+
+  return defaultWebPorts.includes(window.location.port)
+    ? window.location.protocol + window.location.hostname + STRUCTURE
+    : window.location.protocol +
+        window.location.hostname +
+        ":" +
+        window.location.port +
+        STRUCTURE;
+}

package/src/sagas/downloadStructures.js

@@ -2,6 +2,7 @@ import _ from "lodash/fp";
 import FileSaver from "file-saver";
 import { call, put, select, takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { STRUCTURE } from "@truedat/core/routes";
 import { downloadStructures } from "../routines";
 import { getPreviousStructureQuery } from "../selectors";
 import { API_DATA_STRUCTURES_CSV } from "../api";
@@ -9,7 +10,7 @@ import { API_DATA_STRUCTURES_CSV } from "../api";
 export function saveFile(data) {
   if (!_.isEmpty(data)) {
     const blob = new Blob([String.fromCharCode(0xfeff), data], {
-      type: "text/csv;charset=utf-8"
+      type: "text/csv;charset=utf-8",
     });
     FileSaver.saveAs(blob, "structures.csv");
   }
@@ -19,7 +20,11 @@ export function* downloadStructuresSaga({ payload }) {
   try {
     const headerLabels = _.propOr({}, "headerLabels")(payload);
     const query = yield select(getPreviousStructureQuery);
-    const body = { header_labels: headerLabels, ...query };
+    const body = {
+      header_labels: headerLabels,
+      structure_url_schema: getStructureUrlSchema(),
+      ...query,
+    };
     const url = API_DATA_STRUCTURES_CSV;
     yield put(downloadStructures.request(body));
     const { data } = yield call(apiJsonPost, url, body, JSON_OPTS);
@@ -40,3 +45,15 @@ export function* downloadStructuresSaga({ payload }) {
 export function* downloadStructuresRequestSaga() {
   yield takeLatest(downloadStructures.TRIGGER, downloadStructuresSaga);
 }
+
+function getStructureUrlSchema() {
+  const defaultWebPorts = [80, 443];
+
+  return defaultWebPorts.includes(window.location.port)
+    ? window.location.protocol + window.location.hostname + STRUCTURE
+    : window.location.protocol +
+        window.location.hostname +
+        ":" +
+        window.location.port +
+        STRUCTURE;
+}

package/src/selectors/structureColumnsSelector.js

@@ -15,6 +15,14 @@ const dateDecorator = (date) => (
   <Moment locale="es" date={date} format="YYYY-MM-DD HH:mm" />
 );
 
+const relationTypeDecorator = _.map((relationTag) => (
+  <FormattedMessage
+    key={relationTag}
+    id={`conceptRelations.relationType.${relationTag}`}
+    defaultMessage={relationTag}
+  />
+));
+
 export const defaultStructureColumns = [
   {
     name: "name",
@@ -33,6 +41,12 @@ export const defaultStructureColumns = [
     sort: { name: "system.name.sort" },
     width: 1,
   },
+  {
+    name: "relation.relation_type_name",
+    fieldSelector: _.path("tags"),
+    fieldDecorator: relationTypeDecorator,
+    width: 1,
+  },
   { name: "group", width: 1 },
   {
     name: "updated_at",