@griddo/ax 10.1.80 → 10.1.82

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.1.80",
+  "version": "10.1.82",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -230,5 +230,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c592b3ab12ac8d6a6ffe84a0d14d089c564f5adb"
+  "gitHead": "f9e49bfcdd3bb52ee6e07907c3d9358f6ae50e3f"
 }

package/src/components/Fields/ComponentArray/MixableComponentArray/index.tsx

@@ -90,15 +90,17 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
     }
   };
 
+  const getTimeSinceModuleCopy = (moduleCopy: { date: string; element: Record<string, any> }) =>
+    differenceInSeconds(new Date(), new Date(moduleCopy.date));
+
   const showAddItemButton = (!maxItems || fixedValue.length < maxItems) && !disabled;
-  const timeSinceModuleCopy = !!moduleCopy && differenceInSeconds(new Date(), new Date(moduleCopy.date));
   const eightHoursInSeconds = 8 * 60 * 60;
 
-  const showPasteModuleButton =
+  const showPasteModuleButton: boolean =
     showAddItemButton &&
     (isModuleArr || objKey === "componentModules") &&
     !!moduleCopy &&
-    timeSinceModuleCopy && timeSinceModuleCopy < eightHoursInSeconds &&
+    getTimeSinceModuleCopy(moduleCopy) < eightHoursInSeconds &&
     (whiteList.includes(moduleCopyComponent) || isModuleCopyUnavailable);
 
   const canReplace = maxItems === 1 && whiteList.length > 1;

package/src/components/Fields/RichText/index.tsx

@@ -11,7 +11,7 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css";
 import * as S from "./style";
 
 const RichText = (props: IRichTextProps): JSX.Element => {
-  const { value, error, placeholder, onChange, disabled, editorID, handleValidation, html = false, delayed } = props;
+  const { value, error, placeholder, onChange, disabled, editorID, handleValidation, validators, html = false, delayed } = props;
 
   const valueUnformatted = value ? formatIframe(value, true) : "";
 
@@ -68,7 +68,7 @@ const RichText = (props: IRichTextProps): JSX.Element => {
 
   const handleOnBlur = (event: React.FocusEvent<HTMLTextAreaElement>, editorState: EditorState) => {
     const plainContent = editorState.getCurrentContent().getPlainText();
-    handleValidation && handleValidation(plainContent);
+    handleValidation && handleValidation(plainContent, validators);
   };
 
   const toolbar = {
@@ -122,9 +122,10 @@ export interface IRichTextProps {
   placeholder?: string;
   disabled?: boolean;
   onChange: (value: string) => void;
-  handleValidation?: (value: string) => void;
+  handleValidation?: (value: string, validators?: Record<string, unknown>) => void;
   html: boolean;
   delayed?: boolean;
+  validators?: Record<string, unknown>;
 }
 
 export default memo(RichText);

package/src/containers/PageEditor/actions.tsx

@@ -334,9 +334,9 @@ function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getSta
         const { liveStatus, component } = getDefaultSchema(baseSchema);
 
         if (isNewTranslation) {
-           page["liveStatus"] = liveStatus;
-           page["canBeTranslated"] = true;
-           page["originalLanguage"] = page.language;
+          page["liveStatus"] = liveStatus;
+          page["canBeTranslated"] = true;
+          page["originalLanguage"] = page.language;
         }
 
         if (global) page["component"] = component;
@@ -912,7 +912,7 @@ function pasteModule(
         const response = await structuredData.getDataContentBulk(fixed, currentSiteInfo.id);
         if (isReqOk(response.status)) {
           const validDataIds: number[] = [];
-          response.data.forEach((data: IStructuredDataContent) => data.relatedSite && validDataIds.push(data.id));
+          response.data.items.forEach((data: IStructuredDataContent) => data.relatedSite && validDataIds.push(data.id));
           const hasInvalidData = validDataIds.length < fixed.length;
           validatedModuleCopy.data.fixed = validDataIds;
           if (hasInvalidData) {
@@ -1470,5 +1470,5 @@ export {
   restorePageNavigation,
   getPageSummary,
   getPageTranslation,
-  setIsTranslated
+  setIsTranslated,
 };

package/src/forms/validators.tsx

@@ -13,6 +13,7 @@ import {
   isValidDateRange,
   stringToDate,
   isEmptyObj,
+  stripHtml,
 } from "@ax/helpers";
 
 import { findByEditorID } from "@ax/forms";
@@ -25,13 +26,13 @@ const VALIDATORS = {
     return { isValid, errorCode: "ERR001" };
   },
   maxChar: (val: string | null, max: number): IError => {
-    const length = val ? val.length : 0;
-    const isValid = length <= max;
+    const noHtmlVal = stripHtml(val);
+    const isValid = noHtmlVal.length <= max;
     return { isValid, errorCode: "ERR003" };
   },
   minChar: (val: string | null, min: number): IError => {
-    const length = val ? val.length : 0;
-    const isValid = length >= min;
+    const noHtmlVal = stripHtml(val);
+    const isValid = noHtmlVal.length >= min;
     return { isValid, errorCode: "ERR002" };
   },
   maxValue: (val: string, len: number): IError => {

package/src/helpers/index.tsx

@@ -21,6 +21,7 @@ import {
   splitAndJoin,
   splitAndTrim,
   copyTextToClipboard,
+  stripHtml,
 } from "./strings";
 
 import {
@@ -185,4 +186,5 @@ export {
   isMultipleNavigationModules,
   areEqual,
   parseTheme,
+  stripHtml,
 };

package/src/helpers/strings.tsx

@@ -122,6 +122,13 @@ const copyTextToClipboard = (text: string): Promise<void> => {
   }
 };
 
+const stripHtml = (html: string | null) => {
+  if(!html || typeof html !== "string") return "";
+  const tmp = document.createElement("DIV");
+  tmp.innerHTML = html;
+  return tmp.textContent || tmp.innerText || "";
+};
+
 export {
   filterImageText,
   splitCamelCase,
@@ -137,4 +144,5 @@ export {
   splitAndJoin,
   splitAndTrim,
   copyTextToClipboard,
+  stripHtml,
 };