@truedat/df 5.7.7 → 5.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "5.7.7",
+  "version": "5.8.1",
   "description": "Truedat Web Data Quality Module",
   "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.7.5",
+    "@truedat/test": "5.8.1",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,8 +87,8 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.7.5",
-    "@truedat/core": "5.7.5",
+    "@truedat/auth": "5.8.1",
+    "@truedat/core": "5.8.1",
     "decode-uri-component": "^0.2.2",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -109,5 +109,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "83ed64e0a2c2c69601a924441e211a38e3b23a78"
+  "gitHead": "aacafb9e014ac8d1193a5dc2a37c92ea36c3d816"
 }

package/src/components/hierarchies/HierarchyView.js

@@ -27,6 +27,7 @@ const validateHierarchy = (hierarchy) => {
         const hasError =
           _.isEmpty(node.name) ||
           node.name === "" ||
+          node.name.includes("/") ||
           hasDuplicatedSiblings(node, hierarchy);
         return {
           ...node,

package/src/components/widgets/DynamicField.js

@@ -82,9 +82,24 @@ export const DynamicField = ({
 }) => (
   <Form.Field disabled={!editable && isModification} data-testid="form-field">
     <label>
-      {label ? (
+      {(label && fieldProps.type != "hierarchy") ||
+      (fieldProps.type == "hierarchy" &&
+        fieldProps.values.hierarchy.min_depth == 0) ? (
         <FormattedMessage id={`fields.${label}`} defaultMessage={label} />
       ) : null}
+      {label &&
+      fieldProps.type == "hierarchy" &&
+      fieldProps.values.hierarchy.min_depth > 0 ? (
+        <>
+          <FormattedMessage id={`fields.${label}`} defaultMessage={label} />
+          <Label pointing="left">
+            <FormattedMessage
+              id="hierarchy.selectable.mindepth"
+              values={{ depth: fieldProps.values.hierarchy.min_depth }}
+            />
+          </Label>
+        </>
+      ) : null}
       {fieldProps?.required && (
         <span
           style={{

package/src/components/widgets/HierarchyDropdown.js

@@ -32,7 +32,6 @@ export const HierarchyDropdown = ({
   };
 
   const multiple = _.includes(cardinality)(["+", "*"]);
-
   return (
     <>
       {loading ? <Form.Input loading /> : null}

package/src/components/widgets/__tests__/HierarchyDropdown.spec.js

@@ -8,7 +8,7 @@ describe("<HierarchyDropdown />", () => {
       name: "foo",
       cardinality: "*",
       value: "",
-      values: { hierarchy: 50 },
+      values: { hierarchy: { id: 50, min_depth: null } },
     },
     onChange: jest.fn(),
   };

package/src/messages/en.js

@@ -26,6 +26,7 @@ export default {
   "hierarchy.name": "Hierarchy name",
   "hierarchy.new_node": "New node",
   "hierarchy.node": "Node",
+  "hierarchy.selectable.mindepth": "Selectable minimum level: {depth}",
   "navigation.admin.templates": "Templates",
   "navigation.hierarchies": "Hierarchies",
   "navigation.templates": "Templates",
@@ -69,6 +70,8 @@ export default {
   "template.field.type.copy": "File Structure",
   "template.field.type.date": "Date",
   "template.field.type.datetime": "Date Time",
+  "template.field.type.depth":
+    "Selectable minimun level (to allow everything, set value: 0)",
   "template.field.type.domain": "Domain",
   "template.field.type.enriched_text": "Enriched text",
   "template.field.type.float": "Float",

package/src/messages/es.js

@@ -26,6 +26,7 @@ export default {
   "hierarchy.name": "Nombre de jerarquía",
   "hierarchy.new_node": "Nuevo nodo",
   "hierarchy.node": "Nodo",
+  "hierarchy.selectable.mindepth": "Nivel minimo seleccionable: {depth}",
   "navigation.admin.templates": "Plantillas",
   "navigation.hierarchies": "Jerarquías",
   "navigation.templates": "Plantillas",
@@ -69,6 +70,8 @@ export default {
   "template.field.type.copy": "Estructura de Fichero",
   "template.field.type.date": "Fecha",
   "template.field.type.datetime": "Fecha Hora",
+  "template.field.type.depth":
+    "Nivel mínimo seleccionable (para permitir todo, establecer valor: 0)",
   "template.field.type.domain": "Dominio",
   "template.field.type.enriched_text": "Texto enriquecido",
   "template.field.type.float": "Decimal",

package/src/templates/components/templateForm/DefaultValue.js

@@ -7,6 +7,14 @@ import DateTimeField from "../../../components/widgets/DateTimeField";
 import DateField from "../../../components/widgets/DateField";
 
 const defaultValueFormat = (d) => (_.isArray(d) ? _.first(d) : d);
+const multipleDefaultValueFormat = (d) => {
+  switch (d) {
+    case "":
+      return [];
+    default:
+      return !_.isArray(d) ? [d] : d;
+  }
+};
 
 export const DefaultValue = ({
   defaultField,
@@ -36,7 +44,24 @@ export const DefaultValue = ({
     });
   };
 
+  const onMultipleDefaultValueChange = (e, { value }) => {
+    onChange(null, {
+      name: defaultField,
+      value: value,
+    });
+  };
+
   const fixedValues = _.pathOr([], "values.fixed")(field) || [];
+
+  const multipleDefalultsAvaliableCardinality = ["*", "+"];
+  const multipleDefalultsAvaliableWidget = ["string", "dropdown", "checkbox"];
+  const multipleDefalultsDisableType = ["fixed_tuple", "switch", "domain"];
+  const multipleDefault =
+    fieldType === "string" &&
+    multipleDefalultsAvaliableCardinality.includes(field.cardinality) &&
+    multipleDefalultsAvaliableWidget.includes(field.widget) &&
+    !multipleDefalultsDisableType.includes(type);
+
   return (
     <>
       {!type && fieldType === "date" && (
@@ -69,24 +94,24 @@ export const DefaultValue = ({
           "datetime",
           "integer",
           "float",
-        ]) && (
+        ]) &&
+        !multipleDefault && (
           <Form.Input
             name="default_value"
-            placeholder={formatMessage({
+            label={formatMessage({
               id: "template.field.values.default_value",
             })}
             value={_.get("default")(field)}
             onChange={onDefaultValueChange}
           />
         )}
-      {type == "fixed" && (
+      {type == "fixed" && !multipleDefault && (
         <Form.Dropdown
           fluid
           selection
           label={formatMessage({ id: "template.field.values.default_value" })}
           onChange={onDefaultValueChange}
           value={defaultValueFormat(_.get("default")(field))}
-          required
           options={_.map((v) => ({
             key: v,
             value: v,
@@ -94,6 +119,39 @@ export const DefaultValue = ({
           }))(["", ...fixedValues])}
         />
       )}
+      {multipleDefault &&
+        (field.widget === "dropdown" || field.widget === "checkbox") && (
+          <Form.Dropdown
+            fluid
+            selection
+            multiple
+            label={formatMessage({ id: "template.field.values.default_value" })}
+            onChange={onMultipleDefaultValueChange}
+            value={multipleDefaultValueFormat(_.get("default")(field))}
+            options={_.map((v) => ({
+              key: v,
+              value: v,
+              text: v,
+            }))(["", ...fixedValues])}
+          />
+        )}
+      {multipleDefault && field.widget === "string" && (
+        <Form.Dropdown
+          fluid
+          selection
+          multiple
+          search
+          allowAdditions
+          label={formatMessage({ id: "template.field.values.default_value" })}
+          onChange={onMultipleDefaultValueChange}
+          value={multipleDefaultValueFormat(_.get("default")(field))}
+          options={_.map((v) => ({
+            key: v,
+            value: v,
+            text: v,
+          }))(["", ...multipleDefaultValueFormat(_.get("default")(field))])}
+        />
+      )}
     </>
   );
 };

package/src/templates/components/templateForm/HierarchiesList.js

@@ -1,19 +1,18 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import React from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Form } from "semantic-ui-react";
 import { useHierarchies } from "../../../hooks/useHierarchies";
 
-export const HierarchiesList = ({
-  hierarchies,
-  onChange,
-  values: value,
-  loading,
-}) => {
+export const HierarchiesList = ({ hierarchies, onChange, values, loading }) => {
   const { formatMessage } = useIntl();
 
-  const handleChange = (_e, { value }) => onChange(value);
+  const handleChange = (_e, { value, name }) =>
+    onChange({
+      ...values,
+      [name]: value,
+    });
 
   const options = _.flow(
     _.map(({ id, name }) => ({ text: name, value: id })),
@@ -24,9 +23,10 @@ export const HierarchiesList = ({
     <Form.Group size="small" widths="equal">
       <Form.Dropdown
         required
+        name="id"
         selection
         label={
-          value === ""
+          values?.id === ""
             ? ""
             : formatMessage({ id: "template.field.type.hierarchy" })
         }
@@ -36,7 +36,15 @@ export const HierarchiesList = ({
         })}
         onChange={handleChange}
         options={options}
-        value={value}
+        value={values?.id}
+      />
+      <Form.Input
+        type="number"
+        required
+        name="min_depth"
+        label={formatMessage({ id: "template.field.type.depth" })}
+        onChange={handleChange}
+        value={values.min_depth}
       />
     </Form.Group>
   );
@@ -45,7 +53,6 @@ export const HierarchiesList = ({
 HierarchiesList.propTypes = {
   hierarchies: PropTypes.array,
   onChange: PropTypes.func,
-  onDefaultValueChange: PropTypes.func,
   values: PropTypes.number,
   loading: PropTypes.bool,
 };

package/src/templates/components/templateForm/__tests__/DefaultValue.spec.js

@@ -15,7 +15,7 @@ describe("<DefaultValue />", () => {
     fieldType,
     formatMessage,
     onChange,
-    type
+    type,
   };
 
   it("matches the latest snapshot for null values", () => {
@@ -30,7 +30,7 @@ describe("<DefaultValue />", () => {
       fieldType: "date",
       formatMessage,
       onChange,
-      type: null
+      type: null,
     };
     const wrapper = shallow(<DefaultValue {...props} />);
     expect(wrapper.find("DateField").length).toBe(1);
@@ -45,7 +45,7 @@ describe("<DefaultValue />", () => {
       fieldType: "datetime",
       formatMessage,
       onChange,
-      type: null
+      type: null,
     };
     const wrapper = shallow(<DefaultValue {...props} />);
     expect(wrapper.find("DateTimeField").length).toBe(1);
@@ -60,7 +60,7 @@ describe("<DefaultValue />", () => {
       fieldType: "integer",
       formatMessage,
       onChange,
-      type: null
+      type: null,
     };
     const wrapper = shallow(<DefaultValue {...props} />);
     expect(wrapper.find("NumberField").length).toBe(1);
@@ -75,7 +75,7 @@ describe("<DefaultValue />", () => {
       fieldType: "float",
       formatMessage,
       onChange,
-      type: null
+      type: null,
     };
     const wrapper = shallow(<DefaultValue {...props} />);
     expect(wrapper.find("NumberField").length).toBe(1);
@@ -95,13 +95,164 @@ describe("<DefaultValue />", () => {
     expect(wrapper.find("FormDropdown").length).toBe(1);
   });
 
+  it("renders form dropdown when type is fixed, widget is dropdown, fieldType is string and cardinality ? or 1", () => {
+    const cardinalityes = ["?", "1"];
+
+    cardinalityes.forEach((cardinality) => {
+      const props = {
+        defaultField,
+        field: { cardinality: cardinality, widget: "dropdown" },
+        fieldType: "string",
+        formatMessage,
+        onChange,
+        type: "fixed",
+      };
+
+      const wrapper = shallow(<DefaultValue {...props} />);
+      expect(wrapper.find("DateTimeField").length).toBe(0);
+      expect(wrapper.find("FormInput").length).toBe(0);
+      expect(wrapper.find("FormDropdown").length).toBe(1);
+      expect(wrapper.find("FormDropdown").prop("multiple")).toBe(undefined);
+    });
+  });
+
+  it("renders form dropdown multiple when widget is dropdown, fieldType is string and cardinality * or +", () => {
+    const cardinalityes = ["*", "+"];
+
+    cardinalityes.forEach((cardinality) => {
+      const props = {
+        defaultField,
+        field: { cardinality: cardinality, widget: "dropdown" },
+        fieldType: "string",
+        formatMessage,
+        onChange,
+        type: null,
+      };
+
+      const wrapper = shallow(<DefaultValue {...props} />);
+      expect(wrapper.find("DateTimeField").length).toBe(0);
+      expect(wrapper.find("FormInput").length).toBe(0);
+      expect(wrapper.find("FormDropdown").length).toBe(1);
+      expect(wrapper.find("FormDropdown").prop("multiple")).toBe(true);
+    });
+  });
+
+  it("renders form dropdown when widget is checkbox, fieldType is string and cardinality ? or 1", () => {
+    const cardinalityes = ["?", "1"];
+
+    cardinalityes.forEach((cardinality) => {
+      const props = {
+        defaultField,
+        field: { cardinality: cardinality, widget: "checkbox" },
+        fieldType: "string",
+        formatMessage,
+        onChange,
+        type: "fixed",
+      };
+
+      const wrapper = shallow(<DefaultValue {...props} />);
+      expect(wrapper.find("DateTimeField").length).toBe(0);
+      expect(wrapper.find("FormInput").length).toBe(0);
+      expect(wrapper.find("FormDropdown").length).toBe(1);
+      expect(wrapper.find("FormDropdown").prop("multiple")).toBe(undefined);
+    });
+  });
+
+  it("renders form dropdown multiple when widget is checkbox, fieldType is string and cardinality * or +", () => {
+    const cardinalityes = ["*", "+"];
+
+    cardinalityes.forEach((cardinality) => {
+      const props = {
+        defaultField,
+        field: { cardinality: cardinality, widget: "checkbox" },
+        fieldType: "string",
+        formatMessage,
+        onChange,
+        type: null,
+      };
+
+      const wrapper = shallow(<DefaultValue {...props} />);
+      expect(wrapper.find("DateTimeField").length).toBe(0);
+      expect(wrapper.find("FormInput").length).toBe(0);
+      expect(wrapper.find("FormDropdown").length).toBe(1);
+      expect(wrapper.find("FormDropdown").prop("multiple")).toBe(true);
+      expect(wrapper.find("FormDropdown").prop("search")).toBe(undefined);
+      expect(wrapper.find("FormDropdown").prop("allowAdditions")).toBe(
+        undefined
+      );
+    });
+  });
+
+  it("renders form input when fieldType is string and cardinality ? or 1", () => {
+    const cardinalityes = ["?", "1"];
+
+    cardinalityes.forEach((cardinality) => {
+      const props = {
+        defaultField,
+        field: { cardinality: cardinality, widget: "string" },
+        fieldType: "string",
+        formatMessage,
+        onChange,
+        type: null,
+      };
+
+      const wrapper = shallow(<DefaultValue {...props} />);
+      expect(wrapper.find("DateTimeField").length).toBe(0);
+      expect(wrapper.find("FormInput").length).toBe(1);
+      expect(wrapper.find("FormDropdown").length).toBe(0);
+    });
+  });
+
+  it("renders form input when widget is string, fieldType is string and cardinality ? or 1", () => {
+    const cardinalityes = ["?", "1"];
+
+    cardinalityes.forEach((cardinality) => {
+      const props = {
+        defaultField,
+        field: { cardinality: cardinality, widget: "string" },
+        fieldType: "string",
+        formatMessage,
+        onChange,
+        type: null,
+      };
+
+      const wrapper = shallow(<DefaultValue {...props} />);
+      expect(wrapper.find("DateTimeField").length).toBe(0);
+      expect(wrapper.find("FormInput").length).toBe(1);
+      expect(wrapper.find("FormDropdown").length).toBe(0);
+    });
+  });
+
+  it("renders form dropdown multiple and allow additions when widget is string, fieldType is string and cardinality * or +", () => {
+    const cardinalityes = ["*", "+"];
+
+    cardinalityes.forEach((cardinality) => {
+      const props = {
+        defaultField,
+        field: { cardinality: cardinality, widget: "string" },
+        fieldType: "string",
+        formatMessage,
+        onChange,
+        type: null,
+      };
+
+      const wrapper = shallow(<DefaultValue {...props} />);
+      expect(wrapper.find("DateTimeField").length).toBe(0);
+      expect(wrapper.find("FormInput").length).toBe(0);
+      expect(wrapper.find("FormDropdown").length).toBe(1);
+      expect(wrapper.find("FormDropdown").prop("multiple")).toBe(true);
+      expect(wrapper.find("FormDropdown").prop("search")).toBe(true);
+      expect(wrapper.find("FormDropdown").prop("allowAdditions")).toBe(true);
+    });
+  });
+
   it("calls dropdown change", () => {
     const wrapper = shallow(<DefaultValue {...props} />);
     const input = wrapper.find("FormDropdown");
     input.simulate("change", null, { value: 3 });
     expect(onChange).toBeCalledWith(null, {
       name: defaultField,
-      value: [3]
+      value: [3],
     });
   });
 
@@ -113,7 +264,7 @@ describe("<DefaultValue />", () => {
     input.simulate("change", null, { value: 3 });
     expect(onChange).toBeCalledWith(null, {
       name: defaultField,
-      value: 3
+      value: 3,
     });
   });
 });

package/src/templates/components/templateForm/__tests__/__snapshots__/DefaultValue.spec.js.snap

@@ -21,7 +21,6 @@ exports[`<DefaultValue /> matches the latest snapshot for null values 1`] = `
         },
       ]
     }
-    required={true}
     selection={true}
   />
 </Fragment>