@truedat/dd 4.47.6 → 4.47.9

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

@@ -1,10 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<LinkStructureTagForm /> matches the latest snapshot create 1`] = `
+exports[`<LinkStructureTagForm /> create button enabled if there is only one tag available 1`] = `
 <div>
   <div
-    class="ui container"
-    style="width: 300px;"
+    class="ui container link-structure-tag-form"
   >
     <form
       class="ui form"
@@ -36,7 +35,7 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot create 1`] = `
             class="divider text"
             role="alert"
           >
-            bar
+            Tag2
           </div>
           <i
             aria-hidden="true"
@@ -53,10 +52,127 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot create 1`] = `
               role="option"
               style="pointer-events: all;"
             >
+              <span
+                class="description"
+              >
+                large desclarge desclarge desclarge desclarge desc
+              </span>
+              <span
+                class="text"
+              >
+                Tag2
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="field"
+      >
+        <label>
+          structure.tag.textArea.label
+        </label>
+        <textarea
+          data-testid="comment-id"
+          name="comment"
+          placeholder="structure.tag.textArea.placeholder"
+          rows="3"
+        />
+      </div>
+      <div
+        class="actions"
+      >
+        <button
+          class="ui primary button"
+          type="submit"
+        >
+          structure.tag.add
+        </button>
+      </div>
+    </form>
+  </div>
+</div>
+`;
+
+exports[`<LinkStructureTagForm /> matches the latest snapshot create 1`] = `
+<div>
+  <div
+    class="ui container link-structure-tag-form"
+  >
+    <form
+      class="ui form"
+    >
+      <div
+        class="field"
+      >
+        <label>
+          structure.tag.dropdown.label
+        </label>
+        <div
+          aria-disabled="false"
+          aria-expanded="false"
+          class="ui search selection dropdown"
+          name="tag"
+          role="combobox"
+        >
+          <input
+            aria-autocomplete="list"
+            autocomplete="off"
+            class="search"
+            tabindex="0"
+            type="text"
+            value=""
+          />
+          <div
+            aria-atomic="true"
+            aria-live="polite"
+            class="divider default text"
+            role="alert"
+          >
+            structure.tag.dropdown.placeholder
+          </div>
+          <i
+            aria-hidden="true"
+            class="dropdown icon"
+          />
+          <div
+            class="menu transition"
+            role="listbox"
+          >
+            <div
+              aria-checked="false"
+              aria-selected="true"
+              class="selected item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <span
+                class="description"
+              >
+                description test
+              </span>
+              <span
+                class="text"
+              >
+                Tag1
+              </span>
+            </div>
+            <div
+              aria-checked="false"
+              aria-selected="false"
+              class="item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <span
+                class="description"
+              >
+                large desclarge desclarge desclarge desclarge desc
+              </span>
               <span
                 class="text"
               >
-                bar
+                Tag2
               </span>
             </div>
           </div>
@@ -69,8 +185,8 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot create 1`] = `
           structure.tag.textArea.label
         </label>
         <textarea
-          data-testid="description-id"
-          name="description"
+          data-testid="comment-id"
+          name="comment"
           placeholder="structure.tag.textArea.placeholder"
           rows="3"
         />
@@ -92,11 +208,122 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot create 1`] = `
 </div>
 `;
 
+exports[`<LinkStructureTagForm /> matches the latest snapshot create without comment 1`] = `
+<div>
+  <div
+    class="ui container link-structure-tag-form"
+  >
+    <form
+      class="ui form"
+    >
+      <div
+        class="field"
+      >
+        <label>
+          structure.tag.dropdown.label
+        </label>
+        <div
+          aria-disabled="false"
+          aria-expanded="true"
+          class="ui active visible search selection dropdown"
+          name="tag"
+          role="combobox"
+        >
+          <input
+            aria-autocomplete="list"
+            autocomplete="off"
+            class="search"
+            tabindex="0"
+            type="text"
+            value=""
+          />
+          <div
+            aria-atomic="true"
+            aria-live="polite"
+            class="divider text"
+            role="alert"
+          >
+            Tag2
+          </div>
+          <i
+            aria-hidden="true"
+            class="dropdown icon clear"
+          />
+          <div
+            class="visible menu transition"
+            role="listbox"
+          >
+            <div
+              aria-checked="false"
+              aria-selected="false"
+              class="item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <span
+                class="description"
+              >
+                description test
+              </span>
+              <span
+                class="text"
+              >
+                Tag1
+              </span>
+            </div>
+            <div
+              aria-checked="true"
+              aria-selected="true"
+              class="active selected item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <span
+                class="description"
+              >
+                large desclarge desclarge desclarge desclarge desc
+              </span>
+              <span
+                class="text"
+              >
+                Tag2
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="field"
+      >
+        <label>
+          structure.tag.textArea.label
+        </label>
+        <textarea
+          data-testid="comment-id"
+          name="comment"
+          placeholder="structure.tag.textArea.placeholder"
+          rows="3"
+        />
+      </div>
+      <div
+        class="actions"
+      >
+        <button
+          class="ui primary button"
+          type="submit"
+        >
+          structure.tag.add
+        </button>
+      </div>
+    </form>
+  </div>
+</div>
+`;
+
 exports[`<LinkStructureTagForm /> matches the latest snapshot edit 1`] = `
 <div>
   <div
-    class="ui container"
-    style="width: 300px;"
+    class="ui container link-structure-tag-form"
   >
     <form
       class="ui form"
@@ -128,7 +355,7 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot edit 1`] = `
             class="divider text"
             role="alert"
           >
-            foo
+            Tag without description
           </div>
           <i
             aria-hidden="true"
@@ -138,6 +365,19 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot edit 1`] = `
             class="menu transition"
             role="listbox"
           >
+            <div
+              aria-checked="true"
+              aria-selected="true"
+              class="active selected item"
+              role="option"
+              style="pointer-events: all;"
+            >
+              <span
+                class="text"
+              >
+                Tag without description
+              </span>
+            </div>
             <div
               aria-checked="false"
               aria-selected="false"
@@ -145,23 +385,33 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot edit 1`] = `
               role="option"
               style="pointer-events: all;"
             >
+              <span
+                class="description"
+              >
+                description test
+              </span>
               <span
                 class="text"
               >
-                bar
+                Tag1
               </span>
             </div>
             <div
-              aria-checked="true"
-              aria-selected="true"
-              class="active selected item"
+              aria-checked="false"
+              aria-selected="false"
+              class="item"
               role="option"
               style="pointer-events: all;"
             >
+              <span
+                class="description"
+              >
+                large desclarge desclarge desclarge desclarge desc
+              </span>
               <span
                 class="text"
               >
-                foo
+                Tag2
               </span>
             </div>
           </div>
@@ -174,8 +424,8 @@ exports[`<LinkStructureTagForm /> matches the latest snapshot edit 1`] = `
           structure.tag.textArea.label
         </label>
         <textarea
-          data-testid="description-id"
-          name="description"
+          data-testid="comment-id"
+          name="comment"
           placeholder="structure.tag.textArea.placeholder"
           rows="3"
         >

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

@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<LinkedStructureTag /> matches the latest snapshot 1`] = `
+<div>
+  <div
+    class="ui tag label"
+    style="margin-left: 1.5em;"
+  >
+    <i
+      aria-hidden="true"
+      class="edit link icon"
+    />
+    Tag without description
+  </div>
+</div>
+`;

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

@@ -1,7 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snapshot 1`] = `
-<Grid>
+<Grid
+  style={
+    Object {
+      "alignItems": "center",
+      "display": "flex",
+    }
+  }
+>
   <GridColumn
     width={4}
   >
@@ -19,6 +26,12 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snaps
     />
   </GridColumn>
   <GridColumn
+    style={
+      Object {
+        "fontSize": "x-large",
+        "textAlign": "center",
+      }
+    }
     width={1}
   >
     =
@@ -74,7 +87,13 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest JoinClause snaps
 `;
 
 exports[`<StructureSelectorInputFieldJoin /> matches the latest snapshot 1`] = `
-<Fragment>
+<div
+  style={
+    Object {
+      "marginBottom": "1em",
+    }
+  }
+>
   <JoinClause
     createClause={[Function]}
     deleteClause={[Function]}
@@ -88,11 +107,17 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest snapshot 1`] = `
       }
     }
   />
-</Fragment>
+</div>
 `;
 
 exports[`<StructureSelectorInputFieldJoin /> matches the latest snapshot with various clauses 1`] = `
-<Fragment>
+<div
+  style={
+    Object {
+      "marginBottom": "1em",
+    }
+  }
+>
   <JoinClause
     createClause={[Function]}
     deleteClause={[Function]}
@@ -175,5 +200,5 @@ exports[`<StructureSelectorInputFieldJoin /> matches the latest snapshot with va
       }
     }
   />
-</Fragment>
+</div>
 `;

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

@@ -26,6 +26,26 @@ exports[`<StructureTagForm /> matches the latest snapshot 1`] = `
         />
       </div>
     </div>
+    <div
+      class="field"
+    >
+      <label
+        for="description"
+      >
+        Description
+      </label>
+      <div
+        class="ui input"
+      >
+        <input
+          autocomplete="off"
+          id="description"
+          placeholder="Description"
+          type="text"
+          value="bar"
+        />
+      </div>
+    </div>
     <div
       class="actions"
     >

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

@@ -17,6 +17,11 @@ exports[`<StructureTagsCards /> matches the latest snapshot, renders a link for
         >
           tag1
         </a>
+        <div
+          class="description"
+        >
+          tag_desc_1
+        </div>
       </div>
       <div
         class="extra content"
@@ -47,6 +52,11 @@ exports[`<StructureTagsCards /> matches the latest snapshot, renders a link for
         >
           tag2
         </a>
+        <div
+          class="description"
+        >
+          tag_desc_2
+        </div>
       </div>
       <div
         class="extra content"

package/src/index.js

@@ -2,6 +2,7 @@ import * as components from "./components";
 import * as reducers from "./reducers";
 import * as routines from "./routines";
 import * as sagas from "./sagas";
+import * as selectors from "./selectors";
 import * as messages from "./messages";
 
-export { components, reducers, routines, sagas, messages };
+export { components, reducers, routines, sagas, selectors, messages };

package/src/messages/en.js

@@ -308,8 +308,9 @@ export default {
   "structure.tag.dropdown.label": "Select tag",
   "structure.tag.dropdown.placeholder": "Tag name",
   "structure.tag.edit": "Edit",
-  "structure.tag.textArea.label": "Tag description",
-  "structure.tag.textArea.placeholder": "Introduce a description",
+  "structure.tag.textArea.label": "Tag comments",
+  "structure.tag.textArea.placeholder": "Introduce a comment",
+  "structure.tag.tooltip.commentTitle": "Comment",
   "structure.type": "Type",
   "structure.type.Attribute": "Attribute",
   "structure.type.File.icon": "file",
@@ -360,6 +361,7 @@ export default {
   "structureSelector.union.criteria": "Union criteria",
   "structureTagForm.props.domains": "Domains",
   "structureTagForm.props.name": "Name",
+  "structureTagForm.props.description": "Description",
   "structureTags.actions.create": "Create Structure Tag",
   "structureTags.actions.delete.confirmation.content":
     "This tag has {count} linked structures. Are you sure that you want to delete this Struture Tag?",

package/src/messages/es.js

@@ -317,8 +317,9 @@ export default {
   "structure.tag.dropdown.label": "Seleccionar etiqueta",
   "structure.tag.dropdown.placeholder": "Clave de etiqueta",
   "structure.tag.edit": "Editar",
-  "structure.tag.textArea.label": "Descripción de etiqueta",
-  "structure.tag.textArea.placeholder": "Introducir una descripción",
+  "structure.tag.textArea.label": "Comentarios de etiqueta",
+  "structure.tag.textArea.placeholder": "Introducir un comentario",
+  "structure.tag.tooltip.commentTitle": "Comentario",
   "structure.type": "Tipo",
   "structure.type.Attribute": "Atributo",
   "structure.type.File.icon": "file",
@@ -369,6 +370,7 @@ export default {
   "structureSelector.union.criteria": "Criterio de unión",
   "structureTagForm.props.domains": "Dominios",
   "structureTagForm.props.name": "Nombre",
+  "structureTagForm.props.description": "Descripción",
   "structureTags.actions.create": "Crear Etiqueta de Estructura",
   "structureTags.actions.delete.confirmation.content":
     "Esta etiqueta tiene {count} estructuras asociadas. ¿Desea eliminar la Etiqueta de Estructura {name}?",

package/src/reducers/__tests__/linkedStructureTags.spec.js

@@ -15,7 +15,7 @@ const tags = [
     updated_at: "foo",
     _embedded: {
       data_structure: { id: 1, external_id: "baz" },
-      data_structure_tag: { id: 1, name: "bar" },
+      data_structure_tag: { id: 1, name: "bar", description: "qux" },
     },
   },
 ];

package/src/sagas/requestGrantRemoval.js

@@ -14,7 +14,6 @@ export function* requestGrantRemovalSaga({ payload }) {
     yield put(requestGrantRemoval.success(data));
     yield put(fetchStructure.trigger({ id: data_structure_id, version }));
   } catch (error) {
-    console.error("error", error);
     if (error.response) {
       const { status, data } = error.response;
       yield put(requestGrantRemoval.failure({ status, data }));

package/src/selectors/getStructureFieldOptionValue.js

@@ -0,0 +1,8 @@
+import _ from "lodash/fp";
+
+export const getStructureFieldOptionValue = (structure) =>
+  _.isNil(_.prop("parent_index")(structure))
+    ? _.prop("id")(structure)
+    : structure?.type === "reference_dataset_field"
+    ? `${_.prop("name")(structure)}/${_.prop("parent_index")(structure)}`
+    : `${_.prop("id")(structure)}/${_.prop("parent_index")(structure)}`;

package/src/selectors/getStructuresFields.js

@@ -8,20 +8,34 @@ const withFieldType = (field) => ({
 });
 
 const getFields = (parent, structuresFields) =>
-  _.flow(
-    _.propOr([], _.path("id")(parent)),
-    _.map((sf) => ({
-      ...sf,
-      label: _.prop("alias.text")(parent) || _.prop("name")(parent),
-      parent_index: _.prop("alias.index")(parent),
-    }))
-  )(structuresFields);
-
+  parent?.type !== "reference_dataset"
+    ? _.flow(
+        _.propOr([], _.path("id")(parent)),
+        _.map((sf) => ({
+          ...sf,
+          label: _.prop("alias.text")(parent) || _.prop("name")(parent),
+          parent_index: _.prop("alias.index")(parent),
+        }))
+      )(structuresFields)
+    : _.flow(
+        _.get("headers"),
+        _.map((name) => ({
+          name,
+          type: "reference_dataset_field",
+          label: _.prop("name")(parent),
+          parent_index: _.prop("alias.index")(parent),
+          data_type_class: "string",
+        }))
+      )(parent);
 const getFieldsFromStructures = (structuresFields, parentStructures) =>
   _.flow(
     _.map((parent) => getFields(parent, structuresFields)),
     _.flatten,
-    _.uniqBy((s) => `${s.data_structure_id}/${s.parent_index}`),
+    _.uniqBy((s) =>
+      s?.type === "reference_dataset_field"
+        ? `${s.name}/${s.parent_index}`
+        : `${s.data_structure_id}/${s.parent_index}`
+    ),
     _.map(withFieldType)
   )(parentStructures);