@truedat/dd 5.2.0 → 5.2.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.2.1] 2023-02-22
+
+### Changed
+
+- [TD-3541] fetchStructure saga uses GraphQL instead of REST API
+
 ## [5.1.0] 2023-02-09
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.2.0",
+  "version": "5.2.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.2.0",
+    "@truedat/test": "5.2.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.2.0",
-    "@truedat/core": "5.2.0",
-    "@truedat/df": "5.2.0",
+    "@truedat/auth": "5.2.1",
+    "@truedat/core": "5.2.1",
+    "@truedat/df": "5.2.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": "20710c8ea4c857547cdaeac20dfada1bdf64e9d2"
+  "gitHead": "1f9ce2ad2fb29d1d8dc5ccb8940a7f573e7127bc"
 }

package/src/api/queries.js

@@ -205,3 +205,244 @@ export const STRUCTURE_STRUCTURE_LINKS_QUERY = gql`
     }
   }
 `;
+
+export const DATA_STRUCTURE_VERSION_QUERY = gql`
+  query DataStructureVersion(
+    $dataStructureId: ID!
+    $version: String!
+    $note_fields: [String]
+  ) {
+    dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
+      id
+      version
+      class
+      description
+      name
+      type
+      group
+      deleted_at
+      metadata
+      data_structure {
+        alias
+        confidential
+        domain_ids
+        domains {
+          external_id
+          id
+          name
+          parent_id
+          parents {
+            external_id
+            id
+            name
+          }
+        }
+        external_id
+        id
+        inserted_at
+        latest_note
+        source {
+          external_id
+          id
+        }
+        source_id
+        system_id
+        updated_at
+        id
+        alias
+        confidential
+        domain_ids
+        domains {
+          id
+          name
+        }
+        external_id
+        inserted_at
+        updated_at
+      }
+      parents {
+        alias
+        classes
+        data_structure_id
+        deleted_at
+        id
+        metadata
+        name
+        type
+      }
+      children {
+        alias
+        classes
+        data_structure_id
+        deleted_at
+        id
+        metadata
+        name
+        type
+      }
+      siblings {
+        alias
+        classes
+        data_structure_id
+        deleted_at
+        id
+        metadata
+        name
+        type
+      }
+      versions {
+        deleted_at
+        inserted_at
+        updated_at
+        version
+      }
+      ancestry
+
+      grants {
+        data_structure {
+          external_id
+          id
+          system_id
+        }
+        data_structure_version {
+          ancestry
+          name
+        }
+        detail
+        end_date
+        external_ref
+        id
+        inserted_at
+        pending_removal
+        source_user_name
+        start_date
+        system {
+          external_id
+          id
+          name
+        }
+        updated_at
+        user {
+          email
+          full_name
+          user_name
+        }
+        user_id
+      }
+      grant {
+        data_structure {
+          external_id
+          id
+          system_id
+        }
+        data_structure_version {
+          ancestry
+          name
+        }
+        detail
+        end_date
+        external_ref
+        id
+        inserted_at
+        pending_removal
+        source_user_name
+        start_date
+        system {
+          external_id
+          id
+          name
+        }
+        updated_at
+        user {
+          email
+          full_name
+          user_name
+        }
+        user_id
+      }
+
+      classes
+      implementation_count
+      data_structure_link_count
+
+      note
+      profile {
+        max
+        min
+        null_count
+        most_frequent
+        value
+      }
+      source {
+        id
+        external_id
+      }
+      system {
+        id
+        name
+      }
+      structure_type {
+        metadata_views {
+          name
+          fields
+        }
+        template_id
+        translation
+      }
+      degree {
+        in
+        out
+      }
+
+      data_fields {
+        alias
+        classes
+        data_structure_id
+        deleted_at
+        id
+        metadata
+        name
+        type
+        note(select_fields: $note_fields)
+      }
+      relations {
+        parents {
+          id
+          structure {
+            id
+            data_structure_id
+            name
+            type
+            structure_type {
+              translation
+            }
+          }
+          relation_type {
+            name
+            description
+          }
+        }
+        children {
+          id
+          structure {
+            id
+            data_structure_id
+            name
+            type
+            structure_type {
+              translation
+            }
+          }
+          relation_type {
+            name
+            description
+          }
+        }
+      }
+
+      links
+      _actions
+      user_permissions
+    }
+  }
+`;

package/src/components/StructureLoader.js

@@ -1,51 +1,25 @@
-import React from "react";
-import { withRouter } from "react-router-dom";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
-import { compose } from "redux";
 import { connect } from "react-redux";
+import { useParams } from "react-router-dom";
 import { clearStructure, fetchStructure } from "../routines";
 
-export class StructureLoader extends React.Component {
-  static propTypes = {
-    fetchStructure: PropTypes.func,
-    clearStructure: PropTypes.func,
-    match: PropTypes.object,
-  };
+export const StructureLoader = ({ fetchStructure, clearStructure }) => {
+  const { id, version } = useParams();
 
-  componentDidMount() {
-    const { fetchStructure, match } = this.props;
-    const { id, version } = match.params;
+  useEffect(() => {
+    fetchStructure({ id, version });
+    return () => clearStructure();
+  }, [id, version]);
 
-    if (id) {
-      fetchStructure({ id, version });
-    }
-  }
+  return null;
+};
 
-  componentDidUpdate(prevProps) {
-    const { fetchStructure, match } = this.props;
-    const { id, version } = match.params;
-    const { id: prevId, version: prevVersion } = prevProps.match.params;
+StructureLoader.propTypes = {
+  fetchStructure: PropTypes.func,
+  clearStructure: PropTypes.func,
+};
 
-    if (id) {
-      if (id !== prevId || version !== prevVersion) {
-        fetchStructure({ id, version });
-      }
-    }
-  }
-
-  componentWillUnmount() {
-    const { clearStructure } = this.props;
-    clearStructure();
-  }
-
-  render() {
-    return null;
-  }
-}
-
-const mapStateToProps = ({ structureLoading }) => ({ structureLoading });
-
-export default compose(
-  withRouter,
-  connect(mapStateToProps, { clearStructure, fetchStructure })
-)(StructureLoader);
+export default connect(null, { fetchStructure, clearStructure })(
+  StructureLoader
+);

package/src/components/StructureNotes.js

@@ -171,7 +171,7 @@ const mapStateToProps = (state) => {
     structureNotes,
     structure,
     template: _.find(
-      _.propEq("id", _.path("data_structure_type.template_id")(structure))
+      _.propEq("id", _.path("structure_type.template_id")(structure))
     )(templates),
   };
 };

package/src/components/StructureNotesEdit.js

@@ -99,12 +99,10 @@ StructureNotesEdit.propTypes = {
   latestDfContent: PropTypes.object,
 };
 
-const findTemplate = ({ templates, structure: { data_structure_type } = {} }) =>
+const findTemplate = ({ templates, structure: { structure_type } = {} }) =>
   _.defaultTo(
     _.head(templates),
-    _.find(_.propEq("id", _.prop("template_id")(data_structure_type)))(
-      templates
-    )
+    _.find(_.propEq("id", _.prop("template_id")(structure_type)))(templates)
   );
 
 const mapStateToProps = (state) => {

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

@@ -64,7 +64,7 @@ describe("<StructureFieldRow />", () => {
       </table>
     );
 
-    expect(getAllByRole("cell")).toHaveLength(8);
+    expect(getAllByRole("cell")).toHaveLength(7);
     expect(getByText("f1")).toBeDefined();
     expect(getAllByRole("link")).toHaveLength(3);
   });

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

@@ -1,53 +1,22 @@
 import React from "react";
-import { shallow } from "enzyme";
+import { render } from "@truedat/test/render";
 import { StructureLoader } from "../StructureLoader";
 
-const getProps = () => ({
-  match: { params: { id: 1 } },
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useParams: () => ({ id: 1, version: 8 }),
+}));
+
+const props = {
   clearStructure: jest.fn(),
-  structureLoading: false,
   fetchStructure: jest.fn(),
-});
+};
 
 describe("<StructureLoader />", () => {
   it("matches the latest snapshot", () => {
-    const props = getProps();
-    const wrapper = shallow(<StructureLoader {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("calls fetchStructure when component mounts with an informed id", () => {
-    const props = getProps();
-    jest.spyOn(StructureLoader.prototype, "componentDidMount");
-    const wrapper = shallow(<StructureLoader {...props} />);
-    expect(StructureLoader.prototype.componentDidMount.mock.calls.length).toBe(
-      1
-    );
-    expect(props.fetchStructure).toHaveBeenCalledTimes(1);
-    wrapper.unmount();
-    expect(props.fetchStructure).toHaveBeenCalledTimes(1);
-  });
-
-  it("calls fetchStructure when id updates", () => {
-    const props = getProps();
-    jest.spyOn(StructureLoader.prototype, "componentDidUpdate");
-    const wrapper = shallow(<StructureLoader {...props} />);
-    wrapper.setProps({ match: { params: { id: 2 } } });
-    expect(StructureLoader.prototype.componentDidUpdate.mock.calls.length).toBe(
-      1
-    );
-    expect(props.fetchStructure).toHaveBeenCalledTimes(2);
-  });
+    const { container } = render(<StructureLoader {...props} />);
+    expect(container).toMatchSnapshot();
 
-  it("calls clearStructure when component unmounts but not when it mounts", () => {
-    const props = getProps();
-    jest.spyOn(StructureLoader.prototype, "componentWillUnmount");
-    const wrapper = shallow(<StructureLoader {...props} />);
-    expect(props.clearStructure).toHaveBeenCalledTimes(0);
-    wrapper.unmount();
-    expect(
-      StructureLoader.prototype.componentWillUnmount.mock.calls.length
-    ).toBe(1);
-    expect(props.clearStructure).toHaveBeenCalledTimes(1);
+    expect(props.fetchStructure).toHaveBeenCalledWith({ id: 1, version: 8 });
   });
 });

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

@@ -13,7 +13,7 @@ const metadataViews = [
 ];
 
 const structure = {
-  data_structure_type: {
+  structure_type: {
     name: "foo",
     metadata_views: metadataViews,
   },

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

@@ -36,9 +36,6 @@ exports[`<StructureFieldRow /> matches the latest snapshot 1`] = `
         >
           dd
         </td>
-        <td
-          class=""
-        />
         <td
           class="center aligned"
         />

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

@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<StructureLoader /> matches the latest snapshot 1`] = `""`;
+exports[`<StructureLoader /> matches the latest snapshot 1`] = `<div />`;

package/src/messages/en.js

@@ -286,7 +286,6 @@ export default {
   "structure.field.graph.percentage": "Percentage: ",
   "structure.field.graph.title": "Frequency chart",
   "structure.field.graph.value": "Value: ",
-  "structure.field.has_df_content": "Extra info",
   "structure.field.links": "Concepts",
   "structure.field.menu.link": "Link to Concept",
   "structure.field.name": "Field",

package/src/messages/es.js

@@ -294,7 +294,6 @@ export default {
   "structure.field.graph.percentage": "Porcentaje: ",
   "structure.field.graph.title": "Gráfico de frecuencias",
   "structure.field.graph.value": "Valor: ",
-  "structure.field.has_df_content": "Info adicional",
   "structure.field.links": "Términos",
   "structure.field.menu.link": "Vincular a concepto",
   "structure.field.metadata.nullable": "Opcional",

package/src/reducers/structure.js

@@ -22,7 +22,7 @@ const structureVersionFields = _.pick([
   "class",
   "classes",
   "data_structure_link_count",
-  "data_structure_type",
+  "structure_type",
   "degree",
   "deleted_at",
   "description",

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

@@ -1,12 +1,12 @@
-import { compile } from "path-to-regexp";
 import { testSaga } from "redux-saga-test-plan";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
 import {
   fetchStructureRequestSaga,
   fetchStructureSaga,
 } from "../fetchStructure";
+
 import { fetchStructure } from "../../routines";
-import { API_DATA_STRUCTURE_VERSION } from "../../api";
+import { DATA_STRUCTURE_VERSION_QUERY } from "../../api/queries";
+import { getStructureFieldColumns } from "../../selectors";
 
 describe("sagas: fetchStructureRequestSaga", () => {
   it("should invoke fetchStructureSaga on trigger", () => {
@@ -29,11 +29,34 @@ describe("sagas: fetchStructureRequestSaga", () => {
 });
 
 describe("sagas: fetchStructureSaga", () => {
+  const client = { query: jest.fn() };
   const id = 1;
   const version = "latest";
-  const url = compile(API_DATA_STRUCTURE_VERSION)({ id, version });
-  const payload = { id, version };
-  const data = { id: 1, name: "Structure 1", description: "desc1" };
+  const payload = { id };
+  const variables = {
+    dataStructureId: id,
+    version,
+    note_fields: ["note_field"],
+  };
+
+  const structureFieldColumns = [{ name: "id" }, { name: "note.note_field" }];
+
+  const _actions = { test: true };
+  const user_permissions = { permission1: true };
+
+  const dataStructureVersion = {
+    id,
+    name: "Structure 1",
+    description: "desc1",
+    _actions,
+    user_permissions,
+  };
+
+  const data = {
+    data: dataStructureVersion,
+    _actions,
+    user_permissions,
+  };
 
   it("should put a success action when a response is returned", () => {
     const meta = { version };
@@ -41,10 +64,19 @@ describe("sagas: fetchStructureSaga", () => {
     expect(() => {
       testSaga(fetchStructureSaga, { payload })
         .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
         .put(fetchStructure.request())
         .next()
-        .call(apiJson, url, JSON_OPTS)
-        .next({ data })
+
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
+        .next({ data: { dataStructureVersion } })
         .put({ meta, ...fetchStructure.success(data) })
         .next()
         .put(fetchStructure.fulfill())
@@ -57,17 +89,28 @@ describe("sagas: fetchStructureSaga", () => {
     const version = 23;
     const payload = { id, version };
     const meta = { version };
-    const url = compile(API_DATA_STRUCTURE_VERSION)({
-      id,
+
+    const variables = {
+      dataStructureId: id,
       version,
-    });
+      note_fields: ["note_field"],
+    };
+
     expect(() => {
       testSaga(fetchStructureSaga, { payload })
         .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
         .put(fetchStructure.request())
         .next()
-        .call(apiJson, url, JSON_OPTS)
-        .next({ data })
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
+        .next({ data: { dataStructureVersion } })
         .put({ meta, ...fetchStructure.success(data) })
         .next()
         .put(fetchStructure.fulfill())
@@ -83,9 +126,17 @@ describe("sagas: fetchStructureSaga", () => {
     expect(() => {
       testSaga(fetchStructureSaga, { payload })
         .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
         .put(fetchStructure.request())
         .next()
-        .call(apiJson, url, JSON_OPTS)
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
         .throw(error)
         .put(fetchStructure.failure(message))
         .next()

package/src/sagas/fetchStructure.js

@@ -1,21 +1,42 @@
 import _ from "lodash/fp";
-import { compile } from "path-to-regexp";
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
+import { call, put, takeLatest, select, getContext } from "redux-saga/effects";
 import { fetchStructure } from "../routines";
-import { API_DATA_STRUCTURE_VERSION } from "../api";
-
-const structureVersionPath = compile(API_DATA_STRUCTURE_VERSION);
+import { DATA_STRUCTURE_VERSION_QUERY } from "../api/queries";
+import { getStructureFieldColumns } from "../selectors";
 
 export function* fetchStructureSaga({ payload }) {
   try {
-    const { id, version } = payload;
-    const meta = { version };
-    const url = _.isNil(version)
-      ? structureVersionPath({ id, version: "latest" })
-      : structureVersionPath({ id, version });
+    const structureFieldColumns = yield select(getStructureFieldColumns);
+    const note_fields = _.flow(
+      _.filter(({ name }) => name.startsWith("note.")),
+      _.map(({ name }) => name.split(".")[1])
+    )(structureFieldColumns);
+
+    const client = yield getContext("client");
+
     yield put(fetchStructure.request());
-    const { data } = yield call(apiJson, url, JSON_OPTS);
+
+    const { id, version = "latest" } = payload;
+    const {
+      data: { dataStructureVersion },
+    } = yield call(client.query, {
+      fetchPolicy: "network-only",
+      query: DATA_STRUCTURE_VERSION_QUERY,
+      variables: {
+        dataStructureId: id,
+        version,
+        note_fields,
+      },
+    });
+
+    const data = {
+      data: dataStructureVersion,
+      _actions: dataStructureVersion._actions,
+      user_permissions: dataStructureVersion.user_permissions,
+    };
+
+    const meta = { version };
+
     yield put({ meta, ...fetchStructure.success(data) });
   } catch (error) {
     if (error.response) {

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

@@ -5,19 +5,19 @@ describe("selectors: getParsedEvents", () => {
     {
       id: 1,
       content: [
-        { fields: [{ type: "system", name: "field_1", label: "Label" }] }
-      ]
-    }
+        { fields: [{ type: "system", name: "field_1", label: "Label" }] },
+      ],
+    },
   ];
-  const structure = { data_structure_type: { template_id: 1 } };
+  const structure = { structure_type: { template_id: 1 } };
   const r1 = {
     id: 1,
     service: "My invented service 1",
     resource_id: 2,
     payload: [
       { field: "field", value: 5, action: "changed" },
-      { field: "id", value: 6, action: "changed" }
-    ]
+      { field: "id", value: 6, action: "changed" },
+    ],
   };
   const r2 = {
     id: 2,
@@ -25,8 +25,8 @@ describe("selectors: getParsedEvents", () => {
     resource_id: 2,
     payload: [
       { field: "field", value: 7, action: "changed" },
-      { field: "id", value: 3, action: "changed" }
-    ]
+      { field: "id", value: 3, action: "changed" },
+    ],
   };
 
   const r3 = {
@@ -34,7 +34,7 @@ describe("selectors: getParsedEvents", () => {
     id: 3,
     payload: [{ action: "changed", field: "Label", value: null }],
     resource_id: 3,
-    service: "My invented service 3"
+    service: "My invented service 3",
   };
 
   const r4 = {
@@ -42,7 +42,7 @@ describe("selectors: getParsedEvents", () => {
     id: 4,
     payload: [{ action: "tag_linked", field: "foo", value: "bar" }],
     resource_id: 4,
-    service: "My invented service 4"
+    service: "My invented service 4",
   };
 
   const r5 = {
@@ -50,7 +50,7 @@ describe("selectors: getParsedEvents", () => {
     id: 5,
     payload: [{ action: "tag_updated", field: "foo", value: "bar" }],
     resource_id: 5,
-    service: "My invented service 5"
+    service: "My invented service 5",
   };
 
   const r6 = {
@@ -58,7 +58,7 @@ describe("selectors: getParsedEvents", () => {
     id: 6,
     payload: [{ field: "foo", action: "tag_deleted" }],
     resource_id: 6,
-    service: "My invented service 6"
+    service: "My invented service 6",
   };
 
   const events = [
@@ -66,42 +66,42 @@ describe("selectors: getParsedEvents", () => {
       id: 1,
       service: "My invented service 1",
       resource_id: 2,
-      payload: { field: 5, id: 6 }
+      payload: { field: 5, id: 6 },
     },
     {
       id: 2,
       service: "My invented service 2",
       resource_id: 2,
-      payload: { field: 7, id: 3 }
+      payload: { field: 7, id: 3 },
     },
     {
       id: 3,
       service: "My invented service 3",
       event: "data_structure_updated",
       resource_id: 3,
-      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } }
+      payload: { content: { changed: { field_1: { id: 1, name: "foo" } } } },
     },
     {
       id: 4,
       service: "My invented service 4",
       event: "structure_tag_linked",
       resource_id: 4,
-      payload: { tag: "foo", description: "bar", xyz: "xyz" }
+      payload: { tag: "foo", description: "bar", xyz: "xyz" },
     },
     {
       id: 5,
       service: "My invented service 5",
       event: "structure_tag_link_updated",
       resource_id: 5,
-      payload: { tag: "foo", description: "bar", xyz: "xyz" }
+      payload: { tag: "foo", description: "bar", xyz: "xyz" },
     },
     {
       id: 6,
       service: "My invented service 6",
       event: "structure_tag_link_deleted",
       resource_id: 6,
-      payload: { tag: "foo", description: "bar" }
-    }
+      payload: { tag: "foo", description: "bar" },
+    },
   ];
 
   it("should return all the events with the new payload", () => {

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

@@ -10,63 +10,58 @@ describe("selectors: getStructuresFields", () => {
           deleted_at: null,
           description: "Código de Mes",
           external_id: null,
-          has_df_content: false,
           inserted_at: "2019-10-22T10:37:54Z",
           links: [],
           name: "CMESANO",
           nullable: true,
           precision: "8.0",
-          type: "num"
+          type: "num",
         },
         {
           data_structure_id: 5373,
           deleted_at: null,
           description: "Text Field",
           external_id: null,
-          has_df_content: false,
           inserted_at: "2019-10-22T10:37:55Z",
           links: [],
           name: "TEXT",
           nullable: false,
-          type: "char"
+          type: "char",
         },
         {
           data_structure_id: 5374,
           deleted_at: null,
           description: "Some Date",
           external_id: null,
-          has_df_content: false,
           inserted_at: "2019-10-22T10:37:55Z",
           links: [],
           name: "DATE",
           nullable: false,
-          type: "datetime"
+          type: "datetime",
         },
         {
           data_structure_id: 5375,
           deleted_at: null,
           description: "Some Timestamp",
           external_id: null,
-          has_df_content: false,
           inserted_at: "2019-10-22T10:37:55Z",
           links: [],
           name: "DATE_AND_HOUR",
           nullable: false,
-          type: "time"
+          type: "time",
         },
         {
           data_structure_id: 5376,
           deleted_at: null,
           description: "Default",
           external_id: null,
-          has_df_content: false,
           inserted_at: "2019-10-22T10:37:55Z",
           links: [],
           name: "default",
           nullable: false,
-          type: "foo"
-        }
-      ]
+          type: "foo",
+        },
+      ],
     };
     const res = getStructuresFields({ structuresFields, parentStructures });
     expect(res).toHaveLength(5);
@@ -76,7 +71,6 @@ describe("selectors: getStructuresFields", () => {
         deleted_at: null,
         description: "Código de Mes",
         external_id: null,
-        has_df_content: false,
         inserted_at: "2019-10-22T10:37:54Z",
         links: [],
         name: "CMESANO",
@@ -84,64 +78,60 @@ describe("selectors: getStructuresFields", () => {
         precision: "8.0",
         type: "num",
         field_type: "number",
-        label: "Parent Structure"
+        label: "Parent Structure",
       },
       {
         data_structure_id: 5373,
         deleted_at: null,
         description: "Text Field",
         external_id: null,
-        has_df_content: false,
         inserted_at: "2019-10-22T10:37:55Z",
         links: [],
         name: "TEXT",
         nullable: false,
         type: "char",
         field_type: "string",
-        label: "Parent Structure"
+        label: "Parent Structure",
       },
       {
         data_structure_id: 5374,
         deleted_at: null,
         description: "Some Date",
         external_id: null,
-        has_df_content: false,
         inserted_at: "2019-10-22T10:37:55Z",
         links: [],
         name: "DATE",
         nullable: false,
         type: "datetime",
         field_type: "date",
-        label: "Parent Structure"
+        label: "Parent Structure",
       },
       {
         data_structure_id: 5375,
         deleted_at: null,
         description: "Some Timestamp",
         external_id: null,
-        has_df_content: false,
         inserted_at: "2019-10-22T10:37:55Z",
         links: [],
         name: "DATE_AND_HOUR",
         nullable: false,
         type: "time",
         field_type: "timestamp",
-        label: "Parent Structure"
+        label: "Parent Structure",
       },
       {
         data_structure_id: 5376,
         deleted_at: null,
         description: "Default",
         external_id: null,
-        has_df_content: false,
         inserted_at: "2019-10-22T10:37:55Z",
         links: [],
         name: "default",
         nullable: false,
         type: "foo",
         field_type: "string",
-        label: "Parent Structure"
-      }
+        label: "Parent Structure",
+      },
     ]);
   });
 });

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

@@ -84,7 +84,7 @@ describe("selectors: getTabVisibility", () => {
   });
 
   it("should include notes if template_id is in structure_note", () => {
-    const structure = { type: "foo", data_structure_type: { template_id: 1 } };
+    const structure = { type: "foo", structure_type: { template_id: 1 } };
     const templates = [{ name: "foo", id: 1 }];
     expect(getTabVisibility({ templatesLoading: true })).toMatchObject({
       notes: false,

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

@@ -25,7 +25,7 @@ describe("selectors: metadataViewsSelector", () => {
     const selectedMetadata = "m1";
     const metadataViews = [{ name: "m1", fields: [] }];
     const structure = {
-      data_structure_type: { metadata_views: metadataViews },
+      structure_type: { metadata_views: metadataViews },
     };
     const res = metadataViewsSelector({
       structure,
@@ -41,7 +41,7 @@ describe("selectors: metadataViewsSelector", () => {
     const selectedMetadata = "m1";
     const metadataViews = [{ name: "m1", fields: ["foo", "xyzzy"] }];
     const structure = {
-      data_structure_type: { metadata_views: metadataViews },
+      structure_type: { metadata_views: metadataViews },
     };
     const res = metadataViewsSelector({
       structure,

package/src/selectors/getParsedEvents.js

@@ -5,10 +5,10 @@ const getEvents = ({ events }) => events;
 
 const getTemplate = ({ structure, templates }) =>
   _.find(
-    t => _.path("data_structure_type.template_id")(structure) == _.prop("id")(t)
+    (t) => _.path("structure_type.template_id")(structure) == _.prop("id")(t)
   )(templates);
 
-const transformFieldFormat = field =>
+const transformFieldFormat = (field) =>
   _.isBoolean(field) ? _.toString(field) : field;
 
 const transformContentField = (field, value, fieldsWithoutValue) =>
@@ -21,7 +21,7 @@ const transformContentField = (field, value, fieldsWithoutValue) =>
 
 const getFieldLabel = (field, fields) =>
   _.flow(
-    _.find(f => _.prop("name")(f) == field),
+    _.find((f) => _.prop("name")(f) == field),
     _.defaultTo({}),
     _.prop("label")
   )(fields) || field;
@@ -34,7 +34,7 @@ const payloadForAction = (action, content, fields, fieldsWithoutValue) =>
     _.map(([field, value]) => ({
       field: getFieldLabel(field, fields),
       value: transformContentField(field, value, fieldsWithoutValue),
-      action
+      action,
     }))
   )(content);
 
@@ -42,7 +42,7 @@ const buildUpdatePayload = (payload, template) => {
   const content = payload.content || {
     added: [],
     removed: [],
-    changed: []
+    changed: [],
   };
   const templateFields = _.flow(
     _.prop("content"),
@@ -51,13 +51,13 @@ const buildUpdatePayload = (payload, template) => {
   )(template);
 
   const fieldsWithoutValue = _.flow(
-    _.filter(f =>
+    _.filter((f) =>
       _.includes(_.prop("type")(f))([
         "enriched_text",
         "url",
         "table",
         "system",
-        "image"
+        "image",
       ])
     ),
     _.map(_.prop("name"))
@@ -92,7 +92,7 @@ const buildUpdatePayload = (payload, template) => {
     _.map(([k, v]) => ({
       field: k,
       action: "changed",
-      value: transformFieldFormat(v)
+      value: transformFieldFormat(v),
     }))
   )(payload);
 
@@ -102,24 +102,24 @@ const buildUpdatePayload = (payload, template) => {
 const getParsedEvents = createSelector(
   [getEvents, getTemplate],
   (events, template) => {
-    return _.map(d => {
+    return _.map((d) => {
       switch (d.event) {
         case "data_structure_updated":
           return {
             ...d,
-            payload: buildUpdatePayload(d.payload, template)
+            payload: buildUpdatePayload(d.payload, template),
           };
         case "update_data_structure":
           return {
             ...d,
-            payload: buildUpdatePayload(d.payload, template)
+            payload: buildUpdatePayload(d.payload, template),
           };
         case "structure_tag_link_deleted":
           return {
             ...d,
             payload: [
-              { field: _.path("payload.tag")(d), action: "tag_deleted" }
-            ]
+              { field: _.path("payload.tag")(d), action: "tag_deleted" },
+            ],
           };
         case "structure_tag_link_updated":
           return {
@@ -128,9 +128,9 @@ const getParsedEvents = createSelector(
               {
                 field: _.path("payload.tag")(d),
                 action: "tag_updated",
-                value: _.path("payload.description")(d)
-              }
-            ]
+                value: _.path("payload.description")(d),
+              },
+            ],
           };
         case "structure_tag_linked":
           return {
@@ -139,18 +139,18 @@ const getParsedEvents = createSelector(
               {
                 field: _.path("payload.tag")(d),
                 action: "tag_linked",
-                value: _.path("payload.description")(d)
-              }
-            ]
+                value: _.path("payload.description")(d),
+              },
+            ],
           };
         default:
           return {
             ...d,
-            payload: _.map(e => ({
+            payload: _.map((e) => ({
               field: e,
               action: "changed",
-              value: transformFieldFormat(d["payload"][e])
-            }))(_.keys(d["payload"]))
+              value: transformFieldFormat(d["payload"][e]),
+            }))(_.keys(d["payload"])),
           };
       }
     })(events);

package/src/selectors/getStructureFieldColumns.js

@@ -25,11 +25,6 @@ const nullableDecorator = (field) =>
     ? translateDecorator("structure.field.metadata.nullable.true")
     : translateDecorator("structure.field.metadata.nullable.false");
 
-const hasDfContentDecorator = (has_df_content) =>
-  has_df_content
-    ? translateDecorator("structure.field.metadata.nullable.true")
-    : null;
-
 const lineageLinkDecorator = ({ degree, data_structure_id: id }) =>
   id && degree ? (
     <Link
@@ -73,7 +68,6 @@ export const defaultStructureFieldColumns = [
   { name: "metadata.precision" },
   { name: "metadata.nullable", fieldDecorator: nullableDecorator },
   { name: "description" },
-  { name: "has_df_content", fieldDecorator: hasDfContentDecorator },
   {
     name: "degree",
     fieldSelector: _.pick(["degree", "data_structure_id"]),

package/src/selectors/getStructureProperties.js

@@ -23,10 +23,10 @@ const domainDecorator = (domains) => (
   </>
 );
 
-const typeDecorator = ({ type, data_structure_type }) => (
+const typeDecorator = ({ type, structure_type }) => (
   <FormattedMessage
     id={`structure.type.${type}.text`}
-    defaultMessage={_.get("translation")(data_structure_type) || type}
+    defaultMessage={_.get("translation")(structure_type) || type}
   />
 );
 export const defaultStructureProperties = [
@@ -38,7 +38,7 @@ export const defaultStructureProperties = [
   { name: "group" },
   {
     name: "type",
-    fieldSelector: _.pick(["type", "data_structure_type"]),
+    fieldSelector: _.pick(["type", "structure_type"]),
     fieldDecorator: typeDecorator,
   },
 ];

package/src/selectors/getStructureRelations.js

@@ -12,43 +12,43 @@ const translateDecoratorWithDefault = (text, default_text) => (
 const relationTypeDecorator = (field, direction) =>
   translateDecoratorWithDefault(`relation.type.${direction}.${field}`, field);
 
-const structureTypeDecorator = ({ structure: { type, data_structure_type } }) =>
+const structureTypeDecorator = ({ structure: { type, structure_type } }) =>
   translateDecoratorWithDefault(
     `structure.type.${type}.text`,
-    _.prop("translation")(data_structure_type) || type
+    _.prop("translation")(structure_type) || type
   );
 
 const linkToStructureDecorator = ({
-  structure: { data_structure_id: id, name }
+  structure: { data_structure_id: id, name },
 }) => <Link to={linkTo.STRUCTURE({ id })}>{name}</Link>;
 
-const directedMessageDecorator = direction => field =>
+const directedMessageDecorator = (direction) => (field) =>
   relationTypeDecorator(field, direction);
 
 export const defaultRelationColumns = [
   {
     name: "name",
     fieldSelector: _.pick(["structure.data_structure_id", "structure.name"]),
-    fieldDecorator: linkToStructureDecorator
+    fieldDecorator: linkToStructureDecorator,
   },
   {
     name: "type",
-    fieldSelector: _.pick(["structure.type", "structure.data_structure_type"]),
-    fieldDecorator: structureTypeDecorator
+    fieldSelector: _.pick(["structure.type", "structure.structure_type"]),
+    fieldDecorator: structureTypeDecorator,
   },
   {
     name: "relation_type_name",
     fieldSelector: _.path("relation_type.name"),
-    fieldDecorator: directedMessageDecorator
+    fieldDecorator: directedMessageDecorator,
   },
   {
     name: "relation_description",
-    fieldSelector: _.path("relation_type.description")
-  }
+    fieldSelector: _.path("relation_type.description"),
+  },
 ];
 
-const mapDirection = direction =>
-  _.map(c =>
+const mapDirection = (direction) =>
+  _.map((c) =>
     c.name === "relation_type_name" && _.isFunction(c.fieldDecorator)
       ? { ...c, fieldDecorator: c.fieldDecorator(direction) }
       : c

package/src/selectors/getTabVisibility.js

@@ -30,7 +30,7 @@ const notesTabVisible = ({ templatesLoading, templates, structure }) =>
   _.has("type")(structure) &&
   _.flow(
     _.find({
-      id: _.propOr(null, "data_structure_type.template_id")(structure),
+      id: _.propOr(null, "structure_type.template_id")(structure),
     }),
     _.negate(_.isNil)
   )(templates);

package/src/selectors/metadataViewsSelector.js

@@ -5,7 +5,7 @@ const pickFields = (fields) =>
   _.isEmpty(fields) ? _.identity : _.pick(fields);
 
 export const metadataViewsSelector = createSelector(
-  _.path(["structure", "data_structure_type", "metadata_views"]),
+  _.path(["structure", "structure_type", "metadata_views"]),
   _.prop("structureMetadata"),
   (metadataViews, structureMetadata) =>
     _.isEmpty(metadataViews) || _.isEmpty(structureMetadata)

package/src/selectors/structureColumnsSelector.js

@@ -4,10 +4,10 @@ import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";
 
-const typeTranslateDecorator = ({ type, data_structure_type }) => (
+const typeTranslateDecorator = ({ type, structure_type }) => (
   <FormattedMessage
     id={`structure.type.${type}.text`}
-    defaultMessage={_.prop("translation")(data_structure_type) || type}
+    defaultMessage={_.prop("translation")(structure_type) || type}
   />
 );
 
@@ -23,7 +23,7 @@ export const defaultStructureColumns = [
   },
   {
     name: "type",
-    fieldSelector: _.pick(["type", "data_structure_type"]),
+    fieldSelector: _.pick(["type", "structure_type"]),
     fieldDecorator: typeTranslateDecorator,
     width: 1,
   },
@@ -47,9 +47,7 @@ const getStructures = (state) => {
   const structureTypes = state.structureTypes;
   return _.map((structure) => {
     return {
-      data_structure_type: _.find(_.propEq("name")(structure.type))(
-        structureTypes
-      ),
+      structure_type: _.find(_.propEq("name")(structure.type))(structureTypes),
       ...structure,
     };
   })(structures);
@@ -79,7 +77,7 @@ export const structureColumnsSelector = createSelector(
 
 const getStructureColumnNames = createSelector(
   structureColumnsSelector,
-  (columns) => _.concat("data_structure_type")(_.map("name")(columns))
+  (columns) => _.concat("structure_type")(_.map("name")(columns))
 );
 
 export const structureRowsSelector = createSelector(