@truedat/core 8.5.3 → 8.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "description": "Truedat Web Core",
   "sideEffects": [
     "**/*.css",
@@ -54,7 +54,7 @@
     "@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"
@@ -64,7 +64,6 @@
     "@tiptap/core": "^3.20.0",
     "@tiptap/extension-heading": "^3.20.0",
     "@tiptap/extension-link": "^3.20.0",
-    "@tiptap/extension-underline": "^3.22.4",
     "@tiptap/pm": "^3.20.0",
     "@tiptap/react": "^3.20.0",
     "@tiptap/starter-kit": "^3.20.0",
@@ -73,9 +72,6 @@
     "dompurify": "^3.3.3",
     "elkjs": "^0.10.0",
     "graphql": "^16.11.0",
-    "immutable": "^4.3.7",
-    "is-hotkey": "^0.2.0",
-    "is-url": "^1.2.4",
     "lodash": "^4.17.21",
     "marked": "^17.0.3",
     "moment": "^2.30.1",
@@ -96,10 +92,8 @@
     "redux-saga-routines": "^3.2.3",
     "reselect": "^5.1.1",
     "semantic-ui-react": "^3.0.0-beta.2",
-    "slate": "^0.47.9",
-    "slate-react": "^0.22.10",
     "swr": "^2.3.3",
     "turndown": "^7.2.2"
   },
-  "gitHead": "9d67766fe0910fe519b6f1f2042b4a5dcc28fad5"
+  "gitHead": "75272567eb3ec948a5cdeb8346ef9cacac58267f"
 }

package/src/components/Markdown.js

@@ -5,7 +5,6 @@ import { useEditor, EditorContent } from "@tiptap/react";
 import StarterKit from "@tiptap/starter-kit";
 import Link from "@tiptap/extension-link";
 import Heading from "@tiptap/extension-heading";
-import Underline from "@tiptap/extension-underline";
 import { Menu, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { marked } from "marked";
@@ -34,7 +33,6 @@ const extensions = [
       target: "_blank",
     },
   }),
-  Underline,
 ];
 
 const validateUrl = (value, allowEmpty = false) => {

package/src/components/TemplateSelector.js

@@ -13,7 +13,7 @@ const makeOptions = (formatMessage) =>
       value,
       text: formatMessage({ id: `templates.${label}`, defaultMessage: label }),
     })),
-    _.sortBy(accentInsensitivePathOrder("text"))
+    _.sortBy(accentInsensitivePathOrder("text")),
   );
 
 export const TemplateSelector = ({
@@ -65,8 +65,8 @@ export const TemplateSelector = ({
           placeholder
             ? placeholder
             : formatMessage({
-              id: loading ? "loading" : "template.selector.placeholder",
-            })
+                id: loading ? "loading" : "template.selector.placeholder",
+              })
         }
         search
         selection

package/src/components/UploadJobParser.js

@@ -2,8 +2,6 @@ import _ from "lodash/fp";
 import { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Label } from "semantic-ui-react";
-import { RichTextEditor } from "@truedat/core/components";
-
 import RuleImplementationLink from "@truedat/dq/components/RuleImplementationLink";
 import StructureNoteLink from "@truedat/dd/components/StructureNoteLink";
 
@@ -395,8 +393,6 @@ const formatValue = (value, key) => {
     )(value);
   }
   if (_.isObject(value)) {
-    if (_.has("document")(value))
-      return <RichTextEditor readOnly value={value} />;
     if (_.has("url_value")(value))
       return `[${value.url_name}] (${value.url_value})`;
     if (_.has("name")(value)) return value.name;

package/src/components/index.js

@@ -42,7 +42,6 @@ import OriginLabel from "./OriginLabel";
 import Pagination from "./Pagination";
 import QualityMenu from "./QualityMenu";
 import Redirector from "./Redirector";
-import RichTextEditor from "./RichTextEditor";
 import RouteListener from "./RouteListener";
 import SafeLink from "./SafeLink";
 import ScrollToTop from "./ScrollToTop";
@@ -107,7 +106,6 @@ export {
   Pagination,
   QualityMenu,
   Redirector,
-  RichTextEditor,
   RouteListener,
   SafeLink,
   ScrollToTop,

package/src/services/__tests__/i18nContent.spec.js

@@ -13,7 +13,7 @@ describe("services: i18nContent", () => {
           {
             fields: [
               { name: "title", widget: "string" },
-              { name: "description", widget: "enriched_text" },
+              { name: "description", widget: "markdown" },
               { name: "date", widget: "date" },
               { name: "notes", widget: "textarea" },
             ],
@@ -26,7 +26,7 @@ describe("services: i18nContent", () => {
       expect(result).toEqual({
         translatable: {
           title: { value: "", origin: "user" },
-          description: { value: {}, origin: "user" },
+          description: { value: "", origin: "user" },
           notes: { value: null, origin: "user" },
         },
         noTranslatable: {
@@ -151,7 +151,6 @@ describe("services: i18nContent", () => {
   describe("isTranslatableField", () => {
     it("should identify translatable fields", () => {
       expect(isTranslatableField({ widget: "string" })).toBe(true);
-      expect(isTranslatableField({ widget: "enriched_text" })).toBe(true);
       expect(isTranslatableField({ widget: "markdown" })).toBe(true);
       expect(isTranslatableField({ widget: "textarea" })).toBe(true);
     });

package/src/services/format.js

@@ -1,23 +1 @@
 export const formatNumber = (value) => value?.toLocaleString();
-
-export const toEnrichedTextFormat = (value) => ({
-  object: "value",
-  document: {
-    object: "document",
-    data: {},
-    nodes: [
-      {
-        object: "block",
-        type: "paragraph",
-        data: {},
-        nodes: [
-          {
-            object: "text",
-            text: value,
-            marks: [],
-          },
-        ],
-      },
-    ],
-  },
-});

package/src/services/i18nContent.js

@@ -1,6 +1,6 @@
 import _ from "lodash/fp";
 
-const translatableFieldWidgets = ["enriched_text", "markdown", "string", "textarea"];
+const translatableFieldWidgets = ["markdown", "string", "textarea"];
 
 export const splitTranslatableFields = (template) =>
   _.flow(
@@ -17,10 +17,6 @@ export const splitTranslatableFields = (template) =>
             [translatableKey]: {
               ...acc[translatableKey],
               [name]: _.cond([
-                [
-                  (w) => w == "enriched_text",
-                  _.constant({ value: {}, origin: "user" }),
-                ],
                 [
                   (w) => w == "markdown",
                   _.constant({ value: "", origin: "user" }),
@@ -34,8 +30,8 @@ export const splitTranslatableFields = (template) =>
             },
           };
         },
-        { translatable: {}, noTranslatable: {} }
-      )(group.fields)
+        { translatable: {}, noTranslatable: {} },
+      )(group.fields),
     ),
     _.reduce(
       (acc, { translatable, noTranslatable }) => {
@@ -44,8 +40,8 @@ export const splitTranslatableFields = (template) =>
           noTranslatable: { ...acc.noTranslatable, ...noTranslatable },
         };
       },
-      { translatable: {}, noTranslatable: {} }
-    )
+      { translatable: {}, noTranslatable: {} },
+    ),
   )(template);
 
 export const formatLocales = (locales) =>
@@ -69,7 +65,7 @@ export const formatLocales = (locales) =>
 
 export const hasTranslatableFields = (fields) => {
   return _.some((field) => translatableFieldWidgets.includes(field.widget))(
-    fields
+    fields,
   );
 };
 

package/src/components/RichTextEditor.js

@@ -1,365 +0,0 @@
-import _ from "lodash/fp";
-import { useState, useEffect } from "react";
-import PropTypes from "prop-types";
-import { isKeyHotkey } from "is-hotkey";
-import isUrl from "is-url";
-import { Editor, getEventTransfer } from "slate-react";
-import { Value } from "slate";
-import { Menu, Icon } from "semantic-ui-react";
-import { validUrl } from "../services/validation";
-import SafeLink from "./SafeLink";
-
-const DEFAULT_NODE = "paragraph";
-
-function wrapLink(change, value) {
-  const href = validUrl(value);
-  if (href) {
-    change.wrapInline({
-      type: "link",
-      data: { href },
-    });
-
-    change.moveToEnd();
-  }
-}
-
-function unwrapLink(change) {
-  change.unwrapInline("link");
-}
-
-function renderBlock(props, _editor, next) {
-  const { attributes, children, node } = props;
-
-  switch (node.type) {
-    // case 'block-quote':
-    //   return <blockquote {...attributes}>{children}</blockquote>
-    case "bulleted-list":
-      return <ul {...attributes}>{children}</ul>;
-    case "heading-one":
-      return (
-        <h1 style={{ fontSize: "18px" }} {...attributes}>
-          {children}
-        </h1>
-      );
-    case "heading-two":
-      return (
-        <h2 style={{ fontSize: "15px" }} {...attributes}>
-          {children}
-        </h2>
-      );
-    case "list-item":
-      return <li {...attributes}>{children}</li>;
-    case "numbered-list":
-      return <ol {...attributes}>{children}</ol>;
-    case "link":
-      return (
-        <SafeLink href={node.data?.get("href")} {...attributes}>
-          {children}
-        </SafeLink>
-      );
-    default:
-      return next();
-  }
-}
-
-function renderMark(props, _editor, next) {
-  const { children, mark, attributes } = props;
-
-  switch (mark.type) {
-    case "bold":
-      return <strong {...attributes}>{children}</strong>;
-    // case 'code':
-    //   return <code {...attributes}>{children}</code>
-    case "italic":
-      return <em {...attributes}>{children}</em>;
-    case "underlined":
-      return <u {...attributes}>{children}</u>;
-    default:
-      return next();
-  }
-}
-
-function renderInline(props, _editor, next) {
-  const { attributes, children, node } = props;
-
-  switch (node.type) {
-    case "link": {
-      const props = _.omit(["ref"])(attributes);
-      return (
-        <SafeLink href={node.data?.get("href")} {...props}>
-          {children}
-        </SafeLink>
-      );
-    }
-
-    default:
-      return next();
-  }
-}
-
-function onKeyDown(event, editor, next) {
-  const isBoldHotkey = isKeyHotkey("mod+b");
-  const isItalicHotkey = isKeyHotkey("mod+i");
-  const isUnderlinedHotkey = isKeyHotkey("mod+u");
-  const mark = isBoldHotkey(event)
-    ? "bold"
-    : isItalicHotkey(event)
-      ? "italic"
-      : isUnderlinedHotkey(event)
-        ? "underlined"
-        : undefined;
-  if (!_.isNil(mark)) {
-    event.preventDefault();
-    editor.toggleMark(mark);
-    return true;
-  } else {
-    next();
-  }
-}
-
-const EMPTY_VALUE = {
-  document: {
-    nodes: [
-      {
-        object: "block",
-        type: "paragraph",
-        nodes: [],
-      },
-    ],
-  },
-};
-
-export const RichTextEditor = ({
-  readOnly,
-  value: propValue,
-  label,
-  required,
-  onChange,
-  name,
-}) => {
-  const [jsonValue, setJsonValue] = useState(
-    _.isEmpty(propValue) ? EMPTY_VALUE : propValue
-  );
-  const [value, setValue] = useState(Value.fromJSON(jsonValue));
-  const [editor, setEditor] = useState();
-
-  useEffect(() => {
-    if (
-      (!_.isEmpty(propValue) && !_.equals(propValue)(jsonValue)) ||
-      (readOnly && !_.equals(value)(Value.fromJSON(propValue)))
-    ) {
-      setValue(Value.fromJSON(propValue));
-    }
-  }, [propValue]);
-
-  const renderMarkButton = (type, icon) => {
-    const isActive = value?.activeMarks.some((mark) => mark.type == type);
-
-    return (
-      <Menu.Item
-        icon
-        active={isActive}
-        onMouseDown={(e) => {
-          e.preventDefault();
-          editor?.toggleMark(type);
-        }}
-        onClick={() => {}}
-      >
-        <Icon name={icon} />
-      </Menu.Item>
-    );
-  };
-
-  const hasBlock = (type) => value?.blocks.some((node) => node.type == type);
-
-  const onClickBlock = (type) => {
-    const { value } = editor || {};
-    const { document } = value || {};
-
-    if (type != "bulleted-list" && type != "numbered-list") {
-      const isActive = hasBlock(type);
-      const isList = hasBlock("list-item");
-
-      if (isList) {
-        editor
-          .setBlocks(isActive ? DEFAULT_NODE : type)
-          .unwrapBlock("bulleted-list")
-          .unwrapBlock("numbered-list");
-      } else {
-        editor.setBlocks(isActive ? DEFAULT_NODE : type);
-      }
-    } else {
-      const isList = hasBlock("list-item");
-      const isType = value?.blocks.some((block) => {
-        return !!document?.getClosest(
-          block.key,
-          (parent) => parent.type == type
-        );
-      });
-
-      if (isList && isType) {
-        editor
-          .setBlocks(DEFAULT_NODE)
-          .unwrapBlock("bulleted-list")
-          .unwrapBlock("numbered-list");
-      } else if (isList) {
-        editor
-          .unwrapBlock(
-            type == "bulleted-list" ? "numbered-list" : "bulleted-list"
-          )
-          .wrapBlock(type);
-      } else {
-        editor.setBlocks("list-item").wrapBlock(type);
-      }
-    }
-  };
-
-  const renderBlockButton = (type, icon) => {
-    const { document, blocks } = value || {};
-    const parent =
-      blocks?.size != 0 ? document?.getParent(blocks?.first().key) : null;
-    const isActive = _.includes(type)(["numbered-list", "bulleted-list"])
-      ? hasBlock("list-item") && parent && parent?.type === type
-      : hasBlock(type);
-
-    return (
-      <Menu.Item
-        icon
-        active={isActive}
-        onMouseDown={(e) => {
-          e.preventDefault();
-          onClickBlock(type);
-        }}
-        onClick={() => {}}
-      >
-        <Icon name={icon} />
-      </Menu.Item>
-    );
-  };
-
-  const hasLinks = () => value?.inlines.some((inline) => inline.type == "link");
-
-  const onClickLink = () => {
-    const { value } = editor || {};
-
-    if (hasLinks()) {
-      editor.command(unwrapLink);
-    } else if (value?.selection.isExpanded) {
-      const href = window.prompt("Introduzca la URL del Link:");
-      editor.command(wrapLink, href);
-    } else {
-      const href = window.prompt("Introduzca la URL del Link:");
-      const text = window.prompt("Introduzca el Texto del Link:");
-      editor
-        .insertText(text)
-        .moveFocusForward(0 - text.length)
-        .command(wrapLink, href);
-    }
-  };
-
-  const renderLinkButton = (icon) => {
-    const isActive = hasLinks();
-
-    return (
-      <Menu.Item
-        icon
-        active={isActive}
-        onMouseDown={(e) => {
-          e.preventDefault();
-          onClickLink();
-        }}
-        onClick={() => {}}
-      >
-        <Icon name={icon} />
-      </Menu.Item>
-    );
-  };
-
-  const handleChange = ({ value }) => {
-    const { text } = value?.document || {};
-    const json = text ? value?.toJSON() : {};
-    setJsonValue(json);
-    setValue(value);
-    if (onChange) {
-      onChange(undefined, { name, value: json });
-    }
-  };
-
-  const onPaste = (event, editor, next) => {
-    if (editor?.value?.selection?.isCollapsed) return next();
-
-    const transfer = getEventTransfer(event);
-    const { type, text } = transfer;
-    if (type !== "text" && type !== "html") return next();
-    if (!isUrl(text)) return next();
-
-    if (hasLinks()) {
-      editor.command(unwrapLink);
-    }
-
-    editor.command(wrapLink, text);
-  };
-
-  return readOnly ? (
-    <Editor
-      readOnly
-      value={value}
-      renderBlock={renderBlock}
-      renderMark={renderMark}
-      renderInline={renderInline}
-    />
-  ) : (
-    <div>
-      {label ? (
-        <div className={required ? "required field" : "field"}>
-          <label>{label}</label>
-        </div>
-      ) : null}
-      <div
-        style={{
-          border: "1px solid rgba(34, 36, 38, 0.15)",
-          borderRadius: "0.28571429rem",
-        }}
-      >
-        <Menu>
-          {renderMarkButton("bold", "bold")}
-          {renderMarkButton("italic", "italic")}
-          {renderMarkButton("underlined", "underline")}
-          {/* {renderMarkButton('code', 'file code')} */}
-          {renderBlockButton("heading-one", "header")}
-          {renderBlockButton("heading-two", "h")}
-          {/* {renderBlockButton('block-quote', 'quote right')} */}
-          {renderBlockButton("numbered-list", "list ol")}
-          {renderBlockButton("bulleted-list", "list ul")}
-          {renderLinkButton("linkify")}
-        </Menu>
-        <div style={{ padding: "10px" }}>
-          <Editor
-            style={{ WebkitUserModify: "read-write !important" }}
-            spellCheck
-            autoFocus
-            value={value}
-            onChange={handleChange}
-            onPaste={onPaste}
-            onKeyDown={onKeyDown}
-            renderBlock={renderBlock}
-            renderMark={renderMark}
-            renderInline={renderInline}
-            ref={setEditor}
-          />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-RichTextEditor.propTypes = {
-  label: PropTypes.string,
-  name: PropTypes.string,
-  onChange: PropTypes.func,
-  readOnly: PropTypes.bool,
-  required: PropTypes.bool,
-  value: PropTypes.object,
-};
-
-export default RichTextEditor;