@griddo/ax 1.64.9 → 1.65.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.64.9",
+  "version": "1.65.1",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -220,5 +220,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "89612d5233cf272c1535b62aacb4ec5cd5f2fdbd"
+  "gitHead": "6939563dc1aebe3986c9fe4e9739236cd2c41e05"
 }

package/src/components/CategoryCell/style.tsx

@@ -1,11 +1,12 @@
+import React from "react";
 import styled from "styled-components";
 
 import { Cell } from "@ax/components/TableList/TableItem/style";
 
-const CategoryCell = styled(Cell)`
+const CategoryCell = styled((props) => <Cell {...props} />)`
   flex: 0 0 150px;
   align-items: center;
   position: relative;
 `;
 
-export { CategoryCell }
+export { CategoryCell };

package/src/components/Fields/FieldGroup/index.test.tsx

@@ -0,0 +1,61 @@
+import React from "react";
+import FieldGroup from "./index";
+import { ThemeProvider } from "styled-components";
+import "@testing-library/jest-dom";
+import { parseTheme } from "@griddo/core";
+import globalTheme from "../../../themes/theme.json";
+import { render, screen, cleanup, fireEvent } from "@testing-library/react";
+
+afterEach(cleanup);
+
+const defaultProps = {
+  title: "title",
+  children: "",
+  collapsed: true,
+};
+
+describe("FieldGroup component rendering", () => {
+  it("should render the component", () => {
+    render(
+      <ThemeProvider theme={parseTheme(globalTheme)}>
+        <FieldGroup {...defaultProps} />
+      </ThemeProvider>
+    );
+
+    const fieldGroupWrapper = screen.getByTestId("fieldGroupWrapper");
+    const fieldGroupLabel = screen.getByTestId("fieldGroupLabel");
+    const fieldGroupContent = screen.getByTestId("fieldGroupContent");
+
+    expect(fieldGroupWrapper).toBeTruthy();
+    expect(fieldGroupLabel).toBeTruthy();
+    expect(fieldGroupLabel).toHaveTextContent("title");
+    expect(fieldGroupContent).toBeTruthy();
+    expect(fieldGroupContent).toHaveTextContent("");
+  });
+
+  it("should trigger the onClick", () => {
+    const props = {
+      title: "title",
+      children: "blablabla",
+      collapsed: false,
+    };
+
+    const setStateMock = jest.fn();
+    const useStateMock: any = (useState: string) => [useState, setStateMock];
+    jest.spyOn(React, "useState").mockImplementation(useStateMock);
+
+    render(
+      <ThemeProvider theme={parseTheme(globalTheme)}>
+        <FieldGroup {...props} />
+      </ThemeProvider>
+    );
+
+    const fieldGroupLabel = screen.getByTestId("fieldGroupLabel");
+    const fieldGroupContent = screen.getByTestId("fieldGroupContent");
+    expect(fieldGroupLabel).toBeTruthy();
+    expect(fieldGroupContent).toBeTruthy();
+    expect(fieldGroupContent).toHaveTextContent("blablabla");
+    fireEvent.click(fieldGroupLabel);
+    expect(setStateMock).toHaveBeenCalled();
+  });
+});

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

@@ -1,21 +1,23 @@
-import React, { useState } from "react";
+import React from "react";
 
 import * as S from "./style";
 
 const FieldGroup = (props: IFieldsGroupProps): React.ReactElement => {
   const { title, children, collapsed } = props;
-  const [isOpen, setIsOpen] = useState(!collapsed);
+  const [isOpen, setIsOpen] = React.useState(!collapsed);
 
   const handleClick = () => {
     setIsOpen(!isOpen);
   };
 
   return (
-    <S.Wrapper>
-      <S.Label onClick={handleClick} isOpen={isOpen}>
+    <S.Wrapper data-testid="fieldGroupWrapper">
+      <S.Label data-testid="fieldGroupLabel" onClick={handleClick} isOpen={isOpen}>
         {title}
       </S.Label>
-      <S.Content isOpen={isOpen}>{children}</S.Content>
+      <S.Content data-testid="fieldGroupContent" isOpen={isOpen}>
+        {children}
+      </S.Content>
     </S.Wrapper>
   );
 };

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

@@ -8,7 +8,8 @@ import { useModal } from "@ax/hooks";
 import * as S from "./style";
 
 const ImageField = (props: IImageFieldProps) => {
-  const { value, error, onChange, selectedContent, disabled, handleValidation, validators, site } = props;
+  const { value, error, onChange, selectedContent, disabled, handleValidation, validators, site, setIsGalleryOpened } =
+    props;
 
   const isLinkableImage = selectedContent && selectedContent.component === "LinkableImage";
   const hasImage = value && Object.prototype.hasOwnProperty.call(value, "url");
@@ -34,18 +35,21 @@ const ImageField = (props: IImageFieldProps) => {
       const url = typeof img === "string" ? img : img.url;
       setPreviewSrc(url);
       onChange(img);
+      setIsGalleryOpened && setIsGalleryOpened();
       error && handleValidation && handleValidation(url, validators);
     }
   };
 
   const handleClick = () => {
     if (!disabled) {
+      setIsGalleryOpened && setIsGalleryOpened();
       toggleModal();
     }
   };
 
   const handleChange = () => {
     if (!disabled) {
+      setIsGalleryOpened && setIsGalleryOpened();
       toggleModal();
     }
   };
@@ -88,9 +92,10 @@ interface IImageFieldProps {
   onChange: (value: any) => void;
   selectedContent: any;
   disabled?: boolean;
+  setIsGalleryOpened?: () => void;
   handleValidation?: (value: string, validators?: Record<string, unknown>) => void;
   validators?: Record<string, unknown>;
   site: ISite;
 }
 
-export default memo(ImageField);
+export default memo(ImageField);

package/src/components/FloatingPanel/index.tsx

@@ -7,12 +7,21 @@ import { IconAction } from "@ax/components";
 import * as S from "./style";
 
 const FloatingPanel = (props: IProps): JSX.Element | null => {
-  const { children, title, isOpen, toggleModal, isOpenedSecond, handlePanel, secondary } = props;
+  const {
+    children,
+    title,
+    isOpen,
+    toggleModal,
+    isOpenedSecond,
+    handlePanel,
+    secondary,
+    closeOnOutsideClick = true,
+  } = props;
 
   const node = useRef<HTMLElement>(null);
 
   const handleClickOutside = (e: any) => {
-    if ((node.current && node.current.contains(e.target)) || isOpenedSecond) {
+    if ((node.current && node.current.contains(e.target)) || isOpenedSecond || !closeOnOutsideClick) {
       return;
     }
     toggleModal();
@@ -54,6 +63,7 @@ interface IProps {
   toggleModal: () => void;
   handlePanel?: (value: boolean) => void;
   secondary?: boolean;
+  closeOnOutsideClick?: boolean;
 }
 
 export default memo(FloatingPanel);

package/src/components/Modal/style.tsx

@@ -30,7 +30,7 @@ export const ModalOverlay = styled.div`
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 1040;
+  z-index: 1240;
   width: 100vw;
   height: 100vh;
   background: ${(p) => p.theme.color.overlay};
@@ -43,7 +43,7 @@ export const ModalWrapper = styled.div`
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 1050;
+  z-index: 1250;
   width: 100%;
   height: 100%;
   overflow-x: hidden;
@@ -98,4 +98,4 @@ export const ModalFooter = styled.div`
     margin-left: ${(p) => p.theme.spacing.s};
   }
   border-radius: 0 0 4px 4px;
-`;
+`;

package/src/components/SideModal/index.tsx

@@ -4,7 +4,7 @@ import { createPortal } from "react-dom";
 import { useHandleClickOutside } from "@ax/hooks";
 import { getDisplayName, filterByCategory } from "@ax/helpers";
 import SideModalOption from "@ax/components/SideModal/SideModalOption";
-import { CheckField, MenuItem, SearchField } from "@ax/components";
+import { CheckField, MenuItem, SearchField, IconAction } from "@ax/components";
 import { ModuleCategoryInfo } from "@ax/types";
 
 import * as S from "./style";
@@ -145,6 +145,11 @@ const SideModal = (props: ISideModalProps): JSX.Element | null => {
                 <SearchField onChange={setSearchQuery} closeOnInactive />
               </S.SearchWrapper>
             )}
+            {!showSearch && (
+              <S.ButtonWrapper>
+                <IconAction icon="close" onClick={toggleModal} />
+              </S.ButtonWrapper>
+            )}
           </S.Header>
           {setDefault && !setDefault.checked && (
             <S.CheckFieldWrapper>

package/src/components/SideModal/style.tsx

@@ -6,8 +6,8 @@ const Wrapper = styled.div<{ optionsType?: string }>`
   position: fixed;
   left: ${(p) => (p.optionsType && placeRight.includes(p.optionsType) ? "unset" : 0)};
   right: ${(p) => (p.optionsType && placeRight.includes(p.optionsType) ? 0 : "unset")};
-  top: ${(p) => p.theme.spacing.xl};
-  z-index: 10;
+  top: 0;
+  z-index: 1000;
 
   height: 100vh;
   background: ${(p) => p.theme.colors.uiBackground01};
@@ -71,6 +71,10 @@ const Link = styled.div<{ active: boolean }>`
   color: ${p => p.active ? p.theme.color.textHighEmphasis : p.theme.color.textMediumEmphasis};
 `;
 
+const ButtonWrapper = styled.div`
+  margin: 0 0 0 auto;
+`;
+
 export {
   Wrapper,
   Content,
@@ -82,4 +86,5 @@ export {
   FeaturedWrapper,
   SearchWrapper,
   Link,
+  ButtonWrapper,
 };

package/src/components/TableFilters/CategoryFilter/index.tsx

@@ -68,7 +68,7 @@ const CategoryFilter = (props: ICategoryFilterProps): JSX.Element => {
     <S.HeaderWrapper isActive={isActive}>
       {structuredData.title}
       <S.IconsWrapper>
-        <Icon name="Filter" size="16" />
+        {isActive ? <Icon name="Filter" size="16" /> : <Icon name="DownArrow" size="16" />}
       </S.IconsWrapper>
     </S.HeaderWrapper>
   );

package/src/components/TableFilters/DateFilter/index.tsx

@@ -19,10 +19,13 @@ const DateFilter = (props: IStatusFilterProps): JSX.Element => {
     <S.Date isActive={sortedByDate}>
       Date
       <S.IconsWrapper>
-        {sortedByDate && <SortedStateArrow />}
-        <S.InteractiveArrow>
-          <Icon name="DownArrow" size="16" />
-        </S.InteractiveArrow>
+        {sortedByDate ? (
+          <SortedStateArrow />
+        ) : (
+          <S.InteractiveArrow>
+            <Icon name="DownArrow" size="16" />
+          </S.InteractiveArrow>
+        )}
       </S.IconsWrapper>
     </S.Date>
   );

package/src/components/TableFilters/LiveFilter/index.tsx

@@ -80,7 +80,7 @@ const LiveFilter = (props: ILiveFilterProps): JSX.Element => {
       <S.LiveOptions isActive={isActive}>
         Live
         <S.IconsWrapper>
-          <Icon name="Filter" size="16" />
+          {isActive ? <Icon name="Filter" size="16" /> : <Icon name="DownArrow" size="16" />}
         </S.IconsWrapper>
       </S.LiveOptions>
     </S.MenuWrapper>

package/src/components/TableFilters/NameFilter/index.tsx

@@ -23,10 +23,13 @@ const NameFilter = (props: INameFilterProps): JSX.Element => {
     <S.NameHeader isActive={isActive}>
       {title}
       <S.IconsWrapper>
-        {(sortedByTitle || sortedByURL) && <SortedStateArrow />}
-        <S.InteractiveArrow>
-          <Icon name="DownArrow" size="16" />
-        </S.InteractiveArrow>
+        {isActive ? (
+          <SortedStateArrow />
+        ) : (
+          <S.InteractiveArrow>
+            <Icon name="DownArrow" size="16" />
+          </S.InteractiveArrow>
+        )}
       </S.IconsWrapper>
     </S.NameHeader>
   );

package/src/components/TableFilters/SiteFilter/index.tsx

@@ -78,7 +78,7 @@ const SiteFilter = (props: ISiteFilterProps): JSX.Element => {
     <S.Site isActive={isActive} center={center}>
       {label}
       <S.IconsWrapper>
-        <Icon name="Filter" size="16" />
+        {isActive ? <Icon name="Filter" size="16" /> : <Icon name="DownArrow" size="16" />}
       </S.IconsWrapper>
     </S.Site>
   );

package/src/components/TableFilters/StatusFilter/index.tsx

@@ -20,10 +20,13 @@ const StatusFilter = (props: IStatusFilterProps) => {
     <S.Status isActive={sortedByDate}>
       Status
       <S.IconsWrapper>
-        {sortedByDate && <SortedStateArrow />}
-        <S.InteractiveArrow>
-          <Icon name="DownArrow" size="16" />
-        </S.InteractiveArrow>
+        {sortedByDate ? (
+          <SortedStateArrow />
+        ) : (
+          <S.InteractiveArrow>
+            <Icon name="DownArrow" size="16" />
+          </S.InteractiveArrow>
+        )}
       </S.IconsWrapper>
     </S.Status>
   );

package/src/components/TableFilters/TranslationsFilter/index.tsx

@@ -43,7 +43,7 @@ const TranslationsFilter = (props: ITranslationsFilterProps): JSX.Element => {
     <S.Translations isActive={isActive}>
       Trans.
       <S.IconsWrapper>
-        <Icon name="Filter" size="16" />
+        {isActive ? <Icon name="Filter" size="16" /> : <Icon name="DownArrow" size="16" />}
       </S.IconsWrapper>
     </S.Translations>
   );

package/src/components/TableFilters/TypeFilter/index.tsx

@@ -12,7 +12,7 @@ const TypeFilter = (props: ITypeFilterProps): JSX.Element => {
   const [selectedValue, setSelectedValue] = useState(initialState);
 
   useEffect(() => {
-    setSelectedValue([value]);
+    value && setSelectedValue([value]);
   }, [value]);
 
   const setFilterQuery = (selection: any) => {
@@ -30,7 +30,7 @@ const TypeFilter = (props: ITypeFilterProps): JSX.Element => {
     <S.Types isActive={isActive}>
       Types
       <S.IconsWrapper>
-        <Icon name="Filter" size="16" />
+        {isActive ? <Icon name="Filter" size="16" /> : <Icon name="DownArrow" size="16" />}
       </S.IconsWrapper>
     </S.Types>
   );

package/src/containers/Navigation/Menu/reducer.tsx

@@ -34,6 +34,7 @@ const initialState = {
   item: null,
   form: {
     itemLink: null,
+    itemImage: null,
     itemLabel: "",
     itemAuxText: "",
     type: "link",
@@ -59,4 +60,4 @@ function reducer(state = initialState, action: MenuActionsCreators): IMenuState
   }
 }
 
-export { initialState as menuInitialState, reducer as menuReducer };
+export { initialState as menuInitialState, reducer as menuReducer };

package/src/containers/PageEditor/actions.tsx

@@ -24,7 +24,7 @@ import {
   getLastModuleEditorID,
   getLastComponentEditorID,
   replaceElements,
-  findMandatoryFieldsErrors,
+  findFieldsErrors,
   getParentKey,
 } from "@ax/forms";
 import { appActions } from "@ax/containers/App";
@@ -292,8 +292,8 @@ function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getSta
         const pageLiveStatus = page.draftFromPage
           ? pageStatus.MODIFIED
           : isNewTranslation
-            ? pageStatus.OFFLINE
-            : page.liveStatus.status;
+          ? pageStatus.OFFLINE
+          : page.liveStatus.status;
 
         if (isReqOk(response.status)) {
           addTemplate(page.templateId)(dispatch);
@@ -741,7 +741,7 @@ function generatePageContent(editorContent: IPage, dispatch: Dispatch, getState:
     dataPacks: { configFormData },
   } = getState();
   const { header, footer, isGlobal } = editorContent;
-  const { defaultHeader, defaultFooter } = configFormData.templates && configFormData.templates[template] || {};
+  const { defaultHeader, defaultFooter } = (configFormData.templates && configFormData.templates[template]) || {};
   const { header: pageHeader, footer: pageFooter } = getPageNavigation(
     header || defaultHeader,
     footer || defaultFooter,
@@ -928,19 +928,20 @@ function getTemplateConfig(template: string): (dispatch: Dispatch, getState: any
   };
 }
 
-function validatePage(): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function validatePage(publish: boolean): (dispatch: Dispatch, getState: any) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const { editorContent } = getStateValues(getState);
 
-      const errors = findMandatoryFieldsErrors(editorContent);
+      const errors = findFieldsErrors(editorContent);
       dispatch(setErrors(errors));
       if (errors.length === 0) {
-        dispatch(setValidated(true));
+        !publish && dispatch(setValidated(true));
+        return true;
       } else {
         dispatch(setValidated(false));
+        return false;
       }
-      return true;
     } catch (e) {
       console.log(e);
       return false;

package/src/containers/StructuredData/actions.tsx

@@ -483,7 +483,7 @@ function setStatusStructuredDataContent(
   };
 }
 
-function validateForm(): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function validateForm(publish?: boolean): (dispatch: Dispatch, getState: any) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -496,11 +496,12 @@ function validateForm(): (dispatch: Dispatch, getState: any) => Promise<boolean>
       const errors = findMandatoryStructuredDataErrors(content, schema);
       dispatch(setErrors(errors));
       if (errors.length === 0) {
-        dispatch(setValidated(true));
+        !publish && dispatch(setValidated(true));
+        return true;
       } else {
         dispatch(setValidated(false));
+        return false;
       }
-      return true;
     } catch (e) {
       console.log(e);
       return false;

package/src/forms/errors.tsx

@@ -39,6 +39,7 @@ const ERRORS: Record<string, string> = {
   ERR038: "Sorry, the content you are trying to link is broken or unpublished.",
   ERR039: "Sorry, this color doesn't exist. Please add new one.",
   ERR040: "Sorry, the file is not in a valid format.",
+  ERR041: "Sorry, the password doesn’t match.",
 };
 
 export { ERRORS };

package/src/forms/index.tsx

@@ -23,7 +23,7 @@ import {
   replaceElements,
 } from "./elements";
 import { getInnerFields, getStructuredDataInnerFields } from "./fields";
-import { getValidity, findMandatoryFieldsErrors, findMandatoryStructuredDataErrors } from "./validators";
+import { getValidity, findFieldsErrors, findMandatoryStructuredDataErrors } from "./validators";
 
 export {
   parseData,
@@ -49,6 +49,6 @@ export {
   getLastComponentEditorID,
   getParentKey,
   getValidity,
-  findMandatoryFieldsErrors,
+  findFieldsErrors,
   findMandatoryStructuredDataErrors,
 };

package/src/forms/validators.tsx

@@ -7,12 +7,14 @@ const VALIDATORS = {
     const isValid = flag && val !== undefined && val !== null && val.length > 0;
     return { isValid, errorCode: "ERR001" };
   },
-  maxChar: (val: string, len: number): IError => {
-    const isValid = val.length <= len;
+  maxChar: (val: string | null, max: number): IError => {
+    const length = val ? val.length : 0;
+    const isValid = length <= max;
     return { isValid, errorCode: "ERR003" };
   },
-  minChar: (val: string, len: number): IError => {
-    const isValid = val.length >= len;
+  minChar: (val: string | null, min: number): IError => {
+    const length = val ? val.length : 0;
+    const isValid = length >= min;
     return { isValid, errorCode: "ERR002" };
   },
   maxValue: (val: string, len: number): IError => {
@@ -94,6 +96,10 @@ const VALIDATORS = {
         return { isValid: true, errorCode: "" };
     }
   },
+  isSamePass: (pass1: string, pass2: string): IError => {
+    const isValid = pass1 === pass2;
+    return { isValid, errorCode: "ERR041" };
+  },
 };
 
 const getErrorMessage = (key: string, val: number | string | null): string => {
@@ -148,38 +154,17 @@ const isEmptyField = (value: any, fieldType: string) => {
   }
 };
 
-const getMandatoryFields = (fields: any[]): any[] => {
-  let mandatory: any[] = [];
+const getValidationErrors = (
+  fields: Record<string, unknown>[],
+  current: any,
+  name: string | null,
+  tab: string,
+  template: boolean
+) => {
+  let errors: IErrorItem[] = [];
+
   fields.forEach((field: any) => {
     if (field.mandatory) {
-      mandatory.push(field);
-    }
-
-    if (field.fields) {
-      const innerMandatories = getMandatoryFields(field.fields);
-      if (innerMandatories) {
-        mandatory = [...mandatory, ...innerMandatories];
-      }
-    }
-  });
-  return mandatory;
-};
-
-const getMandatoryFieldsErrors = (content: any, current: any, name: string | null, tab: string, template: boolean) => {
-  let mandatoryFields = [];
-  const errors: IErrorItem[] = [];
-
-  const conditionalKey = content.find((field: { type: string }) => field.type === "ConditionalField")?.key;
-  if (conditionalKey) {
-    mandatoryFields = getMandatoryFields(content).filter((field) => {
-      return field.condition === undefined || field.condition === current[conditionalKey];
-    });
-  } else {
-    mandatoryFields = getMandatoryFields(content);
-  }
-
-  mandatoryFields &&
-    mandatoryFields.forEach((field: any) => {
       const isEmpty = isEmptyField(current[field.key], field.type);
       if (isEmpty) {
         errors.push({
@@ -194,12 +179,41 @@ const getMandatoryFieldsErrors = (content: any, current: any, name: string | nul
           template,
         });
       }
-    });
+    }
+
+    if (Object.prototype.hasOwnProperty.call(field, "validators")) {
+      const { isValid, errorText } = getValidity(field.validators, current[field.key]);
+
+      if (!isValid) {
+        errors.push({
+          type: "Error",
+          message: errorText,
+          validator: field.validators,
+          editorID: current.editorID ? current.editorID : null,
+          component: current.component ? current.component : null,
+          name: name ? name : field.title,
+          key: field.key,
+          tab,
+          template,
+        });
+      }
+    }
+
+    if (Object.prototype.hasOwnProperty.call(field, "fields") && field.fields.length) {
+      const innerFields =
+        field.type === "ConditionalField"
+          ? field.fields.filter((f: any) => f.condition === undefined || f.condition === current[field.key])
+          : field.fields;
+
+      const innerErrors = getValidationErrors(innerFields, current, name, tab, template);
+      errors = [...errors, ...innerErrors];
+    }
+  });
 
   return errors;
 };
 
-const findMandatoryFieldsErrors = (content: any): IErrorItem[] => {
+const findFieldsErrors = (content: any): IErrorItem[] => {
   const queue: any[] = [content];
   let errors: IErrorItem[] = [];
   while (queue.length > 0) {
@@ -209,14 +223,14 @@ const findMandatoryFieldsErrors = (content: any): IErrorItem[] => {
       let schemaErrors: any[] = [];
       const schema: any = getSchema(currentObj.component);
       schema.configTabs.forEach((tab: any) => {
-        const tabErrors: IErrorItem[] = getMandatoryFieldsErrors(
+        const valErrors: IErrorItem[] = getValidationErrors(
           tab.fields,
           currentObj,
           schema.displayName,
           tab.title,
           false
         );
-        schemaErrors = [...schemaErrors, ...tabErrors];
+        schemaErrors = [...schemaErrors, ...valErrors];
       });
       errors = [...errors, ...schemaErrors];
     }
@@ -224,7 +238,7 @@ const findMandatoryFieldsErrors = (content: any): IErrorItem[] => {
     if (currentObj.type === "template") {
       const templateSchema: any = getTemplate(currentObj.templateType);
       const { content } = templateSchema;
-      const templateErrors: IErrorItem[] = getMandatoryFieldsErrors(
+      const templateErrors: IErrorItem[] = getValidationErrors(
         content,
         currentObj,
         templateSchema.displayName,
@@ -247,7 +261,7 @@ const findMandatoryFieldsErrors = (content: any): IErrorItem[] => {
 };
 
 const findMandatoryStructuredDataErrors = (content: any, schema: any): IErrorItem[] => {
-  const errors: IErrorItem[] = getMandatoryFieldsErrors(schema.fields, content, null, "", false);
+  const errors: IErrorItem[] = getValidationErrors(schema.fields, content, null, "", false);
   return errors;
 };
 
@@ -256,4 +270,4 @@ interface IError {
   errorCode: string;
 }
 
-export { getValidity, findMandatoryFieldsErrors, findMandatoryStructuredDataErrors };
+export { getValidity, findFieldsErrors, findMandatoryStructuredDataErrors };