@truedat/dd 4.48.7 → 4.48.10

package/src/messages/es.js

@@ -234,18 +234,18 @@ export default {
   "structure.field.has_df_content": "Info adicional",
   "structure.field.links": "Términos",
   "structure.field.menu.link": "Vincular a concepto",
+  "structure.field.metadata.nullable": "Opcional",
+  "structure.field.metadata.nullable.false": "No",
+  "structure.field.metadata.nullable.true": "Sí",
+  "structure.field.metadata.optional": "Opcional",
+  "structure.field.metadata.precision": "Precisión",
+  "structure.field.metadata.type": "Tipo",
   "structure.field.name": "Campo",
-  "structure.field.nullable": "Opcional",
-  "structure.field.nullable.false": "No",
-  "structure.field.nullable.true": "Sí",
-  "structure.field.optional": "Opcional",
   "structure.field.patterns.count": "Conteo",
   "structure.field.patterns.frecuency": "Patrones más frecuentes",
   "structure.field.patterns.percentage": "Porcentaje",
   "structure.field.patterns.title": "Estás viendo los patrones del campo",
-  "structure.field.precision": "Precisión",
   "structure.field.required": "Requerido",
-  "structure.field.type": "Tipo",
   "structure.fields.empty":
     "No se dispone de información sobre los campos de esta estructura",
   "structure.filter.empty": "Vacío",
@@ -506,6 +506,7 @@ export default {
     "Rellenar únicamente los campos que se quieran actualizar",
   "structures.header.edit.bulk.structures_count":
     'Estructuras seleccionadas: "{structures_count}"',
+  "structures.loading.header": "Cargando estructuras...",
   "structures.not_found.body":
     "No existe ningún elemento para la búsqueda aplicada",
   "structures.not_found.header": "Ningún resultado encontrado",

package/src/reducers/structure.js

@@ -7,8 +7,8 @@ const structureFields = (fn) =>
   _.flow(
     fn,
     _.pick([
+      "alias",
       "confidential",
-      "latest_note",
       "domain_ids",
       "domains",
       "external_id",
@@ -25,17 +25,17 @@ const structureVersionFields = _.pick([
   "degree",
   "deleted_at",
   "description",
+  "grant",
+  "grants",
   "group",
   "implementations",
   "metadata",
   "name",
+  "note",
+  "siblings",
   "source",
   "system",
   "type",
-  "grant",
-  "grants",
-  "siblings",
-  "published_note",
 ]);
 
 const structure = (state = initialState, { type, payload }) => {

package/src/reducers/structures.js

@@ -19,8 +19,8 @@ const pickFields = _.pick([
   "domain",
   "metadata",
   "mutable_metadata",
-  "latest_note",
-  "published_note",
+  "note",
+  "original_name",
 ]);
 
 const structures = (state = initialState, { type, payload }) => {

package/src/reducers/structuresLoading.js

@@ -1,4 +1,4 @@
-import { fetchStructures, toggleStructureFilterValue } from "../routines";
+import { fetchStructures, fetchStructureFilters } from "../routines";
 
 const structuresLoading = (state = false, { type }) => {
   switch (type) {
@@ -6,8 +6,6 @@ const structuresLoading = (state = false, { type }) => {
       return true;
     case fetchStructures.FULFILL:
       return false;
-    case toggleStructureFilterValue.TRIGGER:
-      return true;
     default:
       return state;
   }

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

@@ -2,36 +2,36 @@ import { getSortedFields } from "..";
 
 const projects = [
   { name: "foo2", type: "project" },
-  { name: "foo1", type: "project" }
+  { name: "foo1", type: "project" },
 ];
 const schemas = [
-  { name: "bar2", type: "schema", order: 1 },
-  { name: "bar1", type: "schema", order: 1 }
+  { name: "bar2", type: "schema", metadata: { order: 1 } },
+  { name: "bar1", type: "schema", metadata: { order: 1 } },
 ];
 const documents = [
   { name: "baz1", type: "document" },
-  { name: "baz2", type: "document" }
+  { name: "baz2", type: "document" },
 ];
 const others = [
-  { name: "bay1", type: "other", order: "0" },
-  { name: "bay2", type: "other", order: "0" }
+  { name: "bay1", type: "other", metadata: { order: "0" } },
+  { name: "bay2", type: "other", metadata: { order: "0" } },
 ];
 
 describe("selectors: getSortedFields", () => {
   const state = {
-    structureFields: [...documents, ...projects, ...schemas, ...others]
+    structureFields: [...documents, ...projects, ...schemas, ...others],
   };
   const foo = [
     ...others,
     ...[
-      { name: "bar1", type: "schema", order: 1 },
-      { name: "bar2", type: "schema", order: 1 }
+      { name: "bar1", type: "schema", metadata: { order: 1 } },
+      { name: "bar2", type: "schema", metadata: { order: 1 } },
     ],
     ...[
       { name: "foo1", type: "project" },
-      { name: "foo2", type: "project" }
+      { name: "foo2", type: "project" },
     ],
-    ...documents
+    ...documents,
   ];
   it("get fields sorted by type criteria and name", () => {
     expect(getSortedFields(state)).toEqual(foo);

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

@@ -1,20 +1,20 @@
-import _ from "lodash/fp";
 import { getStructureParent } from "..";
 
 const structureParents = [
   {
+    alias: "alias",
     id: "1",
     name: "structure",
     type: "structure type",
-    published_note: { alias: "alias" },
   },
 ];
+
 const system = { id: "1", name: "system", type: "system" };
 
 const structure = {
   id: "1",
   name: "structure",
-  system: _.omit(["type"])(system),
+  system: { id: "1", name: "system" },
 };
 
 describe("selectors: getStructureParent", () => {
@@ -24,17 +24,17 @@ describe("selectors: getStructureParent", () => {
   };
 
   it("get structure parent from state when is not empty", () => {
-    const reply = _.flow(
-      _.head,
-      _.set("name", ".."),
-      _.omit("published_note")
-    )(structureParents);
-    expect(getStructureParent(state)).toEqual(reply);
+    expect(getStructureParent(state)).toEqual({
+      alias: "alias",
+      id: "1",
+      name: "..",
+      type: "structure type",
+    });
   });
 
   it("get system as parent when structureParents is empty", () => {
     const state = { structureParents: [], structure };
-    expect(getStructureParent(state)).toEqual(_.set("name", "..")(system));
+    expect(getStructureParent(state)).toEqual({ ...system, name: ".." });
   });
 
   it("get empty list when no parents nor structure", () => {

package/src/selectors/getStructureFieldColumns.js

@@ -16,27 +16,22 @@ const translateDecoratorWithDefault = (text, default_text) => (
 const typeDecorator = (field) =>
   translateDecoratorWithDefault(`structure.type.${field}`, field);
 
-const linkToStructureDecorator = ({
-  data_structure_id: id,
-  name,
-  published_note,
-}) => (
-  <Link to={linkTo.STRUCTURE({ id })}>
-    {_.isEmpty(published_note?.alias) ? name : published_note.alias}
-  </Link>
+const linkToStructureDecorator = ({ data_structure_id: id, alias, name }) => (
+  <Link to={linkTo.STRUCTURE({ id })}>{_.defaultTo(name)(alias)}</Link>
 );
 
 const nullableDecorator = (field) =>
   field
-    ? translateDecorator("structure.field.nullable.true")
-    : translateDecorator("structure.field.nullable.false");
+    ? translateDecorator("structure.field.metadata.nullable.true")
+    : translateDecorator("structure.field.metadata.nullable.false");
 
 const hasDfContentDecorator = (has_df_content) =>
-  has_df_content && translateDecorator("structure.field.nullable.true");
+  has_df_content
+    ? translateDecorator("structure.field.metadata.nullable.true")
+    : null;
 
 const lineageLinkDecorator = ({ degree, data_structure_id: id }) =>
-  id &&
-  degree && (
+  id && degree ? (
     <Link
       to={
         degree.in
@@ -46,44 +41,39 @@ const lineageLinkDecorator = ({ degree, data_structure_id: id }) =>
     >
       <Icon name="share alternate" />
     </Link>
-  );
+  ) : null;
 
 export const linksDecorator = (links) => {
   const sortedLinks = _.sortBy(accentInsensitivePathOrder("name"))(links);
-  return (
-    !_.isEmpty(sortedLinks) && (
-      <List>
-        {sortedLinks.map((resource, i) => (
-          <List.Item key={i}>
-            <Link
-              to={linkTo.CONCEPT_VERSION({
-                business_concept_id: resource.resource_id,
-                id: "current",
-              })}
-            >
-              {resource.name}
-            </Link>
-          </List.Item>
-        ))}
-      </List>
-    )
+  return _.isEmpty(sortedLinks) ? null : (
+    <List>
+      {sortedLinks.map((resource, i) => (
+        <List.Item key={i}>
+          <Link
+            to={linkTo.CONCEPT_VERSION({
+              business_concept_id: resource.resource_id,
+              id: "current",
+            })}
+          >
+            {resource.name}
+          </Link>
+        </List.Item>
+      ))}
+    </List>
   );
 };
 
 export const defaultStructureFieldColumns = [
   {
     name: "name",
-    fieldSelector: _.pick(["data_structure_id", "name", "published_note"]),
+    fieldSelector: _.pick(["data_structure_id", "name", "alias"]),
     fieldDecorator: linkToStructureDecorator,
   },
-  { name: "type", fieldDecorator: typeDecorator },
-  { name: "precision" },
-  { name: "nullable", fieldDecorator: nullableDecorator },
+  { name: "metadata.type", fieldDecorator: typeDecorator },
+  { name: "metadata.precision" },
+  { name: "metadata.nullable", fieldDecorator: nullableDecorator },
   { name: "description" },
-  {
-    name: "has_df_content",
-    fieldDecorator: hasDfContentDecorator,
-  },
+  { name: "has_df_content", fieldDecorator: hasDfContentDecorator },
   {
     name: "degree",
     fieldSelector: _.pick(["degree", "data_structure_id"]),

package/src/selectors/getStructureParent.js

@@ -8,16 +8,11 @@ const systemNavItem = (structure) =>
     _.propOr({}, "system"),
     _.pick(["id", "name"]),
     _.set("type", "system"),
-    _.set("name", defaultName),
-    _.omit(["published_note"])
+    _.set("name", defaultName)
   )(structure);
 
 const structureNavItem = (structures) =>
-  _.flow(
-    _.head,
-    _.set("name", defaultName),
-    _.omit(["published_note"])
-  )(structures);
+  _.flow(_.head, _.set("name", defaultName))(structures);
 
 export const getStructureParent = createSelector(
   [_.propOr({}, "structure"), _.propOr([], "structureParents")],

package/src/selectors/getStructureSortingCriteria.js

@@ -25,7 +25,7 @@ const typeList = [
   "attribute",
   "metric",
   "column",
-  "field"
+  "field",
 ];
 
 const toWeightedMap = () => {
@@ -34,9 +34,11 @@ const toWeightedMap = () => {
 };
 
 const mapWeights = toWeightedMap();
-const weightFromMap = type => _.prop(type)(mapWeights);
-const weightOrDefault = weight => (_.isNil(weight) ? _.size(typeList) : weight);
-const orderCriteria = ({ order }) => order && _.toInteger(order);
+const weightFromMap = (type) => _.prop(type)(mapWeights);
+const weightOrDefault = (weight) =>
+  _.isNil(weight) ? _.size(typeList) : weight;
+const orderCriteria = ({ metadata }) =>
+  metadata?.order && _.toInteger(metadata?.order);
 const typeCriteria = ({ type }) =>
   _.flow(lowerDeburr, weightFromMap, weightOrDefault)(type);
 const nameCriteria = ({ name }) => name && lowerDeburr(name).trim();
@@ -44,7 +46,7 @@ const nameCriteria = ({ name }) => name && lowerDeburr(name).trim();
 const defaultStructureSortingCriteria = [
   orderCriteria,
   typeCriteria,
-  nameCriteria
+  nameCriteria,
 ];
 
 export const getStructureSortingCriteria = createSelector(

package/src/selectors/structureColumnsSelector.js

@@ -14,12 +14,10 @@ const typeTranslateDecorator = ({ type, data_structure_type }) => (
 const dateDecorator = (date) => (
   <Moment locale="es" date={date} format="YYYY-MM-DD HH:mm" />
 );
-const nameFieldSelector = ({ name, published_note }) =>
-  _.isEmpty(published_note?.alias) ? name : published_note.alias;
+
 export const defaultStructureColumns = [
   {
     name: "name",
-    fieldSelector: nameFieldSelector,
     sort: { name: "name.sort" },
     width: 2,
   },
@@ -88,7 +86,5 @@ export const structureRowsSelector = createSelector(
   getStructures,
   getStructureColumnNames,
   (structures, columnNames) =>
-    _.map(_.pick([...columnNames, "id", "domain_id", "published_note"]))(
-      structures
-    )
+    _.map(_.pick([...columnNames, "id", "domain_id", "note"]))(structures)
 );