@truedat/df 8.5.3 → 8.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/df",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -51,14 +51,14 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.5.3",
+    "@truedat/test": "8.5.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
   },
   "dependencies": {
     "@apollo/client": "^3.13.8",
-    "@truedat/core": "8.5.3",
+    "@truedat/core": "8.5.4",
     "axios": "^1.15.0",
     "graphql": "^16.11.0",
     "is-hotkey": "^0.2.0",
@@ -87,5 +87,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "9d67766fe0910fe519b6f1f2042b4a5dcc28fad5"
+  "gitHead": "75272567eb3ec948a5cdeb8346ef9cacac58267f"
 }

package/src/components/FieldViewerValue.js

@@ -2,7 +2,7 @@ import _ from "lodash";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { Icon, Label, Table } from "semantic-ui-react";
-import { MarkdownReader, SafeLink, RichTextEditor } from "@truedat/core/components";
+import { MarkdownReader, SafeLink } from "@truedat/core/components";
 import ImagePreview from "./widgets/ImagePreview";
 import SystemPreview from "./widgets/SystemPreview";
 import "../styles/fieldGroupDetail.less";
@@ -28,7 +28,9 @@ const DynamicTableField = (field) => {
       {_.isNil(value) || _.isEmpty(value) ? null : _.isArray(value) ? (
         value
           .filter((v) => !_.isNil(v) && !_.isEmpty(v))
-          .map((v, i) => <FieldViewerValue {...field} value={v} key={i} multiple />)
+          .map((v, i) => (
+            <FieldViewerValue {...field} value={v} key={i} multiple />
+          ))
       ) : (
         <FieldViewerValue {...field} value={value} />
       )}
@@ -54,8 +56,6 @@ export const FieldViewerValue = ({
       ) : (
         <Icon name="minus" as="i" color="grey" />
       );
-    case "enriched_text":
-      return <RichTextEditor readOnly value={value} />;
     case "markdown":
       return <MarkdownReader content={value} />;
     case "table":

package/src/components/widgets/FieldByWidget.js

@@ -3,7 +3,6 @@ import DateTimeField from "./DateTimeField";
 import CheckboxField from "./CheckboxField";
 import ColorPickerField from "./ColorPickerField";
 import DropdownField from "./DropdownField";
-import EnrichedTextField from "./EnrichedTextField";
 import IdentifierField from "./IdentifierField";
 import ImageField from "./ImageField";
 import MarkdownField from "./MarkdownField";
@@ -18,49 +17,47 @@ import NumberField from "./NumberField";
 import DateField from "./DateField";
 
 const FieldByWidget = ({ scope, widget, onChange, field }) => {
-    switch (widget) {
-        case "identifier":
-            return <IdentifierField field={field} />;
-        case "dropdown":
-            return <DropdownField field={field} scope={scope} onChange={onChange} />;
-        case "radio":
-            return <RadioField field={field} onChange={onChange} />;
-        case "checkbox":
-            return <CheckboxField field={field} onChange={onChange} />;
-        case "textarea":
-            return <TextField field={field} onChange={onChange} />;
-        case "color_picker":
-            return <ColorPickerField field={field} onChange={onChange} />;
-        case "pair_list":
-            return <PairListField field={field} onChange={onChange} />;
-        case "enriched_text":
-            return <EnrichedTextField field={field} onChange={onChange} />;
-        case "markdown":
-            return <MarkdownField field={field} onChange={onChange} />;
-        case "table":
-            return <TableField field={field} onChange={onChange} />;
-        case "dynamic_table":
-            return <DynamicTableField field={field} onChange={onChange} />;
-        case "password":
-            return <PasswordField field={field} onChange={onChange} />;
-        case "image":
-            return <ImageField field={field} onChange={onChange} />;
-        case "number":
-            return <NumberField field={field} onChange={onChange} />;
-        case "date":
-            return <DateField field={field} onChange={onChange} />;
-        case "datetime":
-            return <DateTimeField field={field} onChange={onChange} />;
-        default:
-            return <StringField field={field} onChange={onChange} />;
-    }
+  switch (widget) {
+    case "identifier":
+      return <IdentifierField field={field} />;
+    case "dropdown":
+      return <DropdownField field={field} scope={scope} onChange={onChange} />;
+    case "radio":
+      return <RadioField field={field} onChange={onChange} />;
+    case "checkbox":
+      return <CheckboxField field={field} onChange={onChange} />;
+    case "textarea":
+      return <TextField field={field} onChange={onChange} />;
+    case "color_picker":
+      return <ColorPickerField field={field} onChange={onChange} />;
+    case "pair_list":
+      return <PairListField field={field} onChange={onChange} />;
+    case "markdown":
+      return <MarkdownField field={field} onChange={onChange} />;
+    case "table":
+      return <TableField field={field} onChange={onChange} />;
+    case "dynamic_table":
+      return <DynamicTableField field={field} onChange={onChange} />;
+    case "password":
+      return <PasswordField field={field} onChange={onChange} />;
+    case "image":
+      return <ImageField field={field} onChange={onChange} />;
+    case "number":
+      return <NumberField field={field} onChange={onChange} />;
+    case "date":
+      return <DateField field={field} onChange={onChange} />;
+    case "datetime":
+      return <DateTimeField field={field} onChange={onChange} />;
+    default:
+      return <StringField field={field} onChange={onChange} />;
+  }
 };
 
 FieldByWidget.propTypes = {
-    onChange: PropTypes.func.isRequired,
-    field: PropTypes.object.isRequired,
-    scope: PropTypes.string,
-    widget: PropTypes.string,
+  onChange: PropTypes.func.isRequired,
+  field: PropTypes.object.isRequired,
+  scope: PropTypes.string,
+  widget: PropTypes.string,
 };
 
-export default FieldByWidget;
+export default FieldByWidget;

package/src/messages/en.js

@@ -79,7 +79,6 @@ export default {
   "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",
   "template.field.type.hierarchy": "Hierarchy",
   "template.field.type.image": "Image",

package/src/messages/es.js

@@ -79,7 +79,6 @@ export default {
   "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",
   "template.field.type.hierarchy": "Jerarquía",
   "template.field.type.image": "Imagen",

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

@@ -417,23 +417,6 @@ exports[`<ActiveGroupForm /> matches the latest snapshot 1`] = `
                     Colorpicker
                   </span>
                 </div>
-                <div
-                  aria-checked="false"
-                  aria-selected="false"
-                  class="item"
-                  role="option"
-                  style="pointer-events: all;"
-                >
-                  <i
-                    aria-hidden="true"
-                    class="text cursor icon"
-                  />
-                  <span
-                    class="text"
-                  >
-                    Enrichedtext
-                  </span>
-                </div>
                 <div
                   aria-checked="false"
                   aria-selected="false"

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

@@ -170,23 +170,6 @@ exports[`FieldDefinition renders dropdowns with initial values 1`] = `
               Colorpicker
             </span>
           </div>
-          <div
-            aria-checked="false"
-            aria-selected="false"
-            class="item"
-            role="option"
-            style="pointer-events: all;"
-          >
-            <i
-              aria-hidden="true"
-              class="text cursor icon"
-            />
-            <span
-              class="text"
-            >
-              Enrichedtext
-            </span>
-          </div>
           <div
             aria-checked="false"
             aria-selected="false"

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

@@ -344,23 +344,6 @@ exports[`<FieldForm /> matches the latest snapshot 1`] = `
                 Colorpicker
               </span>
             </div>
-            <div
-              aria-checked="false"
-              aria-selected="false"
-              class="item"
-              role="option"
-              style="pointer-events: all;"
-            >
-              <i
-                aria-hidden="true"
-                class="text cursor icon"
-              />
-              <span
-                class="text"
-              >
-                Enrichedtext
-              </span>
-            </div>
             <div
               aria-checked="false"
               aria-selected="false"
@@ -1065,23 +1048,6 @@ exports[`<FieldForm /> renders MandatoryConditional 1`] = `
                 Colorpicker
               </span>
             </div>
-            <div
-              aria-checked="false"
-              aria-selected="false"
-              class="item"
-              role="option"
-              style="pointer-events: all;"
-            >
-              <i
-                aria-hidden="true"
-                class="text cursor icon"
-              />
-              <span
-                class="text"
-              >
-                Enrichedtext
-              </span>
-            </div>
             <div
               aria-checked="false"
               aria-selected="false"
@@ -1940,23 +1906,6 @@ exports[`<FieldForm /> renders ValuesField and manages onChange 1`] = `
                 Colorpicker
               </span>
             </div>
-            <div
-              aria-checked="false"
-              aria-selected="false"
-              class="item"
-              role="option"
-              style="pointer-events: all;"
-            >
-              <i
-                aria-hidden="true"
-                class="text cursor icon"
-              />
-              <span
-                class="text"
-              >
-                Enrichedtext
-              </span>
-            </div>
             <div
               aria-checked="false"
               aria-selected="false"

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

@@ -688,23 +688,6 @@ exports[`<TemplateForm /> matches snapshot when scope has no relations 1`] = `
                           Colorpicker
                         </span>
                       </div>
-                      <div
-                        aria-checked="false"
-                        aria-selected="false"
-                        class="item"
-                        role="option"
-                        style="pointer-events: all;"
-                      >
-                        <i
-                          aria-hidden="true"
-                          class="text cursor icon"
-                        />
-                        <span
-                          class="text"
-                        >
-                          Enrichedtext
-                        </span>
-                      </div>
                       <div
                         aria-checked="false"
                         aria-selected="false"
@@ -1808,23 +1791,6 @@ exports[`<TemplateForm /> matches snapshot when scope has relations 1`] = `
                           Colorpicker
                         </span>
                       </div>
-                      <div
-                        aria-checked="false"
-                        aria-selected="false"
-                        class="item"
-                        role="option"
-                        style="pointer-events: all;"
-                      >
-                        <i
-                          aria-hidden="true"
-                          class="text cursor icon"
-                        />
-                        <span
-                          class="text"
-                        >
-                          Enrichedtext
-                        </span>
-                      </div>
                       <div
                         aria-checked="false"
                         aria-selected="false"

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

@@ -27,7 +27,6 @@ const eligibleValues = {
   checkbox: selectableValues,
   pair_list: { url: [null] }, // Links
   color_picker: { string: [null] },
-  enriched_text: { enriched_text: [null] },
   markdown: { markdown: [null] },
   table: { table: ["table_columns"] },
   dynamic_table: { dynamic_table: ["table_columns"] },
@@ -40,7 +39,8 @@ export const getValues = (widget, fieldType) => {
   return _.filter(({ value }) => available.includes(value))(valueTypes);
 };
 
-export const listFormat = (type) => ["fixed", "fixed_tuple", "table_columns"].includes(type);
+export const listFormat = (type) =>
+  ["fixed", "fixed_tuple", "table_columns"].includes(type);
 
 export const defaultValue = (type, fieldType) =>
   (!type && _.negate(_.includes(fieldType))(["url", "system", "domain"])) ||
@@ -50,13 +50,14 @@ export const valuesSelector = (type) =>
   type &&
   (listFormat(type) ||
     ["domain", "switch", "role_users", "role_groups", "hierarchy"].includes(
-      type
+      type,
     ));
 
 export const valueSegment = (values, type, fieldType) =>
   _.size(values) > 1 || valuesSelector(type) || defaultValue(type, fieldType);
 
-export const hasAiSuggestions = (fieldType, keyType) => _.includes(fieldType)(["string", "enriched_text", "markdown"]) &&
+export const hasAiSuggestions = (fieldType, keyType) =>
+  _.includes(fieldType)(["string", "markdown"]) &&
   _.includes(keyType)(["fixed", "fixed_tuple", undefined]);
 
 const typeFromKey = (keys) =>
@@ -68,4 +69,5 @@ const typeFromKey = (keys) =>
         ? "hierarchy"
         : _.first(keys);
 
-export const getKeyType = (field) => _.flow([_.getOr({}, "values"), _.keys, typeFromKey])(field);
+export const getKeyType = (field) =>
+  _.flow([_.getOr({}, "values"), _.keys, typeFromKey])(field);

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

@@ -100,14 +100,6 @@ export const WIDGETS = [
     cardinalities: ["?", "1"],
     types: ["string"],
   },
-  {
-    key: "enriched_text",
-    value: "enriched_text",
-    text: "Enrichedtext",
-    icon: "text cursor",
-    cardinalities: ["?", "1"],
-    types: ["enriched_text"],
-  },
   {
     key: "markdown",
     value: "markdown",
@@ -185,4 +177,4 @@ export const defaultFieldDefinition = {
     origin: "default",
   },
   values: null,
-};
+};

package/src/templates/utils/applyDefaults.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import { toEnrichedTextFormat } from "@truedat/core/services/format";
 
 const meetsDependency = (defaults, content, on, to_be) => {
   const field_value = getDefaultValue(defaults, content, on);
@@ -33,13 +32,13 @@ const getDefaultSwitchValue = (defaults, content, onSwitch, value) =>
   (_.has(onSwitch)(defaults) || _.has(onSwitch)(content)) &&
   _.flow(
     (d) => getDefaultValue(d, content, onSwitch),
-    (v) => _.getOr(null)(v)(value)
+    (v) => _.getOr(null)(v)(value),
   )(defaults);
 
 const getFieldType = (field, templateContent) =>
   _.flow(
     _.find(({ name }) => field === name),
-    _.get("type")
+    _.get("type"),
   )(templateContent);
 
 export const applyDefaults = (templateContent) => (content, domainId) =>
@@ -49,19 +48,14 @@ export const applyDefaults = (templateContent) => (content, domainId) =>
     _.reduce(
       (
         acc,
-        { name, default: value, depends: { on, to_be: toBe } = {}, values }
+        { name, default: value, depends: { on, to_be: toBe } = {}, values },
       ) => {
         const onSwitch = values?.switch?.on;
         const onSwitchValues = values?.switch?.values;
         const onDomain = values?.domain;
 
         if (standardDefault(on, toBe, onSwitch, onDomain)) {
-          const fieldValue =
-            getFieldType(name, templateContent) === "enriched_text"
-              ? _.set("value", toEnrichedTextFormat(value.value))(value)
-              : value;
-
-          return _.assoc(name, fieldValue)(acc);
+          return _.assoc(name, value)(acc);
         }
         if (meetsDependency(acc, content, on, toBe)) {
           if (meetsSwitchCondition(acc, content, onSwitch, onSwitchValues)) {
@@ -69,7 +63,7 @@ export const applyDefaults = (templateContent) => (content, domainId) =>
               acc,
               content,
               onSwitch,
-              value.value
+              value.value,
             );
             return _.assoc(name, {
               ...value,
@@ -77,8 +71,12 @@ export const applyDefaults = (templateContent) => (content, domainId) =>
             })(acc);
           } else if (meetsDomain(onDomain, domainId)) {
             const domainIdsArray = _.isArray(domainId) ? domainId : [domainId];
-            const foundDomainId = domainIdsArray?.find((id) => id != null && _.prop(id)(value.value));
-            const defaultValue = foundDomainId ? _.prop(foundDomainId, value.value) : null;
+            const foundDomainId = domainIdsArray?.find(
+              (id) => id != null && _.prop(id)(value.value),
+            );
+            const defaultValue = foundDomainId
+              ? _.prop(foundDomainId, value.value)
+              : null;
             return defaultValue
               ? _.assoc(name, { ...value, value: defaultValue })(acc)
               : acc;
@@ -92,7 +90,7 @@ export const applyDefaults = (templateContent) => (content, domainId) =>
             acc,
             content,
             onSwitch,
-            value.value
+            value.value,
           );
           return _.assoc(name, {
             ...value,
@@ -100,22 +98,26 @@ export const applyDefaults = (templateContent) => (content, domainId) =>
           })(acc);
         } else if (meetsDomain(onDomain, domainId)) {
           const domainIdsArray = _.isArray(domainId) ? domainId : [domainId];
-          const foundDomainId = domainIdsArray?.find((id) => id != null && _.prop(id)(value.value));
-          const defaultValue = foundDomainId ? _.prop(foundDomainId, value.value) : null;
+          const foundDomainId = domainIdsArray?.find(
+            (id) => id != null && _.prop(id)(value.value),
+          );
+          const defaultValue = foundDomainId
+            ? _.prop(foundDomainId, value.value)
+            : null;
           return defaultValue
             ? _.assoc(name, { ...value, value: defaultValue })(acc)
             : acc;
         }
         return acc;
       },
-      {}
+      {},
     ),
-    _.merge(content)
+    _.merge(content),
   )(templateContent);
 
 export const getTemplateDefaults = _.flow(
   _.filter(_.has("default")),
-  _.map(_.pick(["name", "default", "depends", "values"]))
+  _.map(_.pick(["name", "default", "depends", "values"])),
 );
 
 export default applyDefaults;

package/src/components/widgets/EnrichedTextField.js

@@ -1,13 +0,0 @@
-import PropTypes from "prop-types";
-import { RichTextEditor } from "@truedat/core/components";
-
-export const EnrichedTextField = ({ field: { name, value }, onChange }) => (
-  <RichTextEditor name={name} value={value} onChange={onChange} />
-);
-
-EnrichedTextField.propTypes = {
-  field: PropTypes.object,
-  onChange: PropTypes.func,
-};
-
-export default EnrichedTextField;