@truedat/dd 4.48.7 → 4.48.8

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)
 );