@griddo/ax 1.66.13 → 1.67.2

package/src/forms/validators.tsx

@@ -1,5 +1,16 @@
-import { dateToString, getSchema, getTemplate, isComponentEmpty, isEmptyContainer } from "@ax/helpers";
-import { IErrorItem } from "@ax/types";
+import {
+  dateToString,
+  getDeactivatedModules,
+  getDefaultSchema,
+  getSchema,
+  getTemplate,
+  hasProps,
+  isComponentEmpty,
+  isEmptyContainer,
+  isModuleDisabled,
+} from "@ax/helpers";
+import { findByEditorID } from "@ax/forms";
+import { IErrorItem, ITemplate } from "@ax/types";
 import { ERRORS } from "./errors";
 
 const VALIDATORS = {
@@ -96,6 +107,13 @@ const VALIDATORS = {
         return { isValid: true, errorCode: "" };
     }
   },
+  isMockup: (val: any, field: { type: string; defaultValue: any }): IError => {
+    const isValid = !checkMockupByType(field.type, val, field.defaultValue);
+    return { isValid, errorCode: "ERR016" };
+  },
+  apiValidator: (val: any, code: string): IError => {
+    return { isValid: false, errorCode: code };
+  },
   isSamePass: (pass1: string, pass2: string): IError => {
     const isValid = pass1 === pass2;
     return { isValid, errorCode: "ERR041" };
@@ -156,11 +174,33 @@ const isEmptyField = (value: any, fieldType: string, multiple: boolean) => {
       const { isEmpty } = isEmptyContainer(value, multiple);
       return isEmpty;
     }
+    case "NumberField":
+      return value === null || Number.isNaN(value);
     default:
       return typeof value === "string" && value.trim().length === 0;
   }
 };
 
+const checkMockupByType = (type: string, value: any, defaultValue: any) => {
+  if (!value || !defaultValue) return false;
+  switch (type) {
+    case "HeadingField":
+      return value.content && defaultValue.content && value.content.trim() === defaultValue.content.trim();
+    case "ImageField":
+      return (
+        (hasProps(value, ["publicId"]) && value.publicId === defaultValue.publicId) ||
+        (hasProps(value, ["url"]) && value.url === defaultValue.url)
+      );
+    default:
+      return typeof value === "string" && typeof defaultValue === "string" && value.trim() === defaultValue.trim();
+  }
+};
+
+const checkMockupContent = (component: string, key: string, type: string, value: any) => {
+  const moduleDefault = getDefaultSchema(component);
+  return { isMockup: checkMockupByType(type, value, moduleDefault[key]), defaultValue: moduleDefault[key] };
+};
+
 const getValidationErrors = (
   fields: Record<string, unknown>[],
   current: any,
@@ -176,8 +216,8 @@ const getValidationErrors = (
       const isEmpty = isEmptyField(current[field.key], field.type, hasMultipleOptions);
       if (isEmpty) {
         errors.push({
-          type: "Error",
-          message: "Empty Field",
+          type: "error",
+          message: getErrorMessage("ERR015", null),
           validator: { mandatory: true },
           editorID: current.editorID ? current.editorID : null,
           component: current.component ? current.component : null,
@@ -189,14 +229,42 @@ const getValidationErrors = (
       }
     }
 
-    if (Object.prototype.hasOwnProperty.call(field, "validators")) {
-      const { isValid, errorText } = getValidity(field.validators, current[field.key]);
+    if (current.component && field.isMockup) {
+      const { isMockup, defaultValue } = checkMockupContent(
+        current.component,
+        field.key,
+        field.type,
+        current[field.key]
+      );
+
+      if (isMockup) {
+        errors.push({
+          type: "error",
+          message: getErrorMessage("ERR016", null),
+          validator: { isMockup: { type: field.type, defaultValue } },
+          editorID: current.editorID ? current.editorID : null,
+          component: current.component ? current.component : null,
+          name: name ? name : field.title,
+          key: field.key,
+          tab,
+          template,
+        });
+      }
+    }
+
+    let fieldValidators: Record<string, unknown> = field.maxValue ? { maxValue: field.maxValue } : {};
+    fieldValidators = field.minValue ? { ...fieldValidators, minValue: field.minValue } : fieldValidators;
+
+    if (hasProps(field, ["validators"]) || Object.keys(fieldValidators).length) {
+      const allValidators = { ...field.validators, ...fieldValidators };
+
+      const { isValid, errorText } = getValidity(allValidators, current[field.key]);
 
       if (!isValid) {
         errors.push({
-          type: "Error",
+          type: "error",
           message: errorText,
-          validator: field.validators,
+          validator: allValidators,
           editorID: current.editorID ? current.editorID : null,
           component: current.component ? current.component : null,
           name: name ? name : field.title,
@@ -208,10 +276,13 @@ const getValidationErrors = (
     }
 
     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;
+      let innerFields = field.fields;
+
+      if (field.type === "ConditionalField") {
+        innerFields = field.fields.filter((f: any) => f.condition === undefined || f.condition === current[field.key]);
+        const hiddenFields = field.fields.filter((f: any) => f.condition !== current[field.key]);
+        hiddenFields.forEach((field: any) => delete current[field.key]);
+      }
 
       const innerErrors = getValidationErrors(innerFields, current, name, tab, template);
       errors = [...errors, ...innerErrors];
@@ -221,6 +292,57 @@ const getValidationErrors = (
   return errors;
 };
 
+const isTemplateActivated = (templates: ITemplate[], currentTemplateType: string): boolean =>
+  templates.find((temp: ITemplate) => temp.id === currentTemplateType) ? true : false;
+
+const findPackagesActivationErrors = (
+  pageEditor: any,
+  modules: string[],
+  templates: ITemplate[]
+): IErrorItem | null => {
+  const {
+    schema,
+    selectedContent: { component },
+  } = pageEditor;
+
+  let deactivatedModules: string[] = [];
+  let isCurrentTemplateActivated = true;
+  let hasDeactivatedModules = false;
+
+  const {
+    editorContent: { template },
+  } = pageEditor?.editorContent;
+
+  if (template) {
+    const mainContentModules = template?.mainContent?.modules;
+
+    if (mainContentModules) {
+      deactivatedModules = getDeactivatedModules(modules, mainContentModules);
+      hasDeactivatedModules = deactivatedModules.length > 0;
+    } else {
+      hasDeactivatedModules = isModuleDisabled(component, schema.schemaType, modules);
+    }
+
+    isCurrentTemplateActivated = isTemplateActivated(templates, template.templateType);
+  }
+
+  if (!isCurrentTemplateActivated || hasDeactivatedModules) {
+    return {
+      type: "error",
+      message: getErrorMessage("ERR042", null),
+      validator: {},
+      editorID: null,
+      component: "",
+      name: "",
+      key: "",
+      tab: "",
+      template: false,
+    };
+  }
+
+  return null;
+};
+
 const findFieldsErrors = (content: any): IErrorItem[] => {
   const queue: any[] = [content];
   let errors: IErrorItem[] = [];
@@ -274,9 +396,55 @@ const findMandatoryStructuredDataErrors = (content: any, schema: any): IErrorIte
   return errors;
 };
 
+const checkH1content = (content: any): IErrorItem | null => {
+  const h1s = content.getElementsByTagName("h1");
+
+  if (!h1s.length) {
+    return {
+      type: "warning",
+      message: getErrorMessage("ERR018", null),
+      validator: {},
+      editorID: null,
+      component: null,
+      name: "",
+      key: "",
+      tab: "",
+      template: false,
+    };
+  }
+
+  return null;
+};
+
+const parseValidationErrors = (errors: any[], content: any) => {
+  return errors.map((err: any) => {
+    const { element: module } = findByEditorID(content, err.editorID);
+    const schema = getSchema(module.component);
+    return {
+      type: "error",
+      message: getErrorMessage(err.error, null),
+      validator: { apiValidator: err.error },
+      editorID: err.editorID,
+      component: module.component,
+      name: schema.displayName,
+      key: err.key,
+      tab: "content",
+      template: false,
+    };
+  });
+};
+
 interface IError {
   isValid: boolean;
   errorCode: string;
 }
 
-export { getValidity, findFieldsErrors, findMandatoryStructuredDataErrors };
+export {
+  getValidity,
+  isTemplateActivated,
+  findPackagesActivationErrors,
+  findFieldsErrors,
+  findMandatoryStructuredDataErrors,
+  checkH1content,
+  parseValidationErrors,
+};

package/src/helpers/dataPacks.tsx

@@ -8,4 +8,11 @@ const getActivatedDataPacksIds = (activatedDataPacks: any) => {
 const isModuleDisabled = (selectedComponent: string, type: string, activatedModules: string[]): boolean =>
   type === "module" && !activatedModules.includes(selectedComponent);
 
-export { getActivatedDataPacksIds, isModuleDisabled };
+const getDeactivatedModules = (modules: any, currentModules: any) => {
+  const deactivatedModules = currentModules
+    .map((module: any) => (isModuleDisabled(module.component, "module", modules) ? module.component : null))
+    .filter((module: string | null) => !!module);
+  return deactivatedModules;
+};
+
+export { getActivatedDataPacksIds, isModuleDisabled, getDeactivatedModules };

package/src/helpers/index.tsx

@@ -34,6 +34,7 @@ import {
   getNullValue,
   removeEditorIds,
   trimObject,
+  hasProps,
 } from "./objects";
 
 import {
@@ -91,7 +92,7 @@ import { imageResizeCropAndCompress, compressImage } from "./imageResize";
 
 import { isEmptyArray, moveArrayElement } from "./arrays";
 
-import { getActivatedDataPacksIds, isModuleDisabled } from "./dataPacks";
+import { getActivatedDataPacksIds, isModuleDisabled, getDeactivatedModules } from "./dataPacks";
 
 import { isDevelopment } from "./environment";
 
@@ -114,6 +115,7 @@ export {
   getNullValue,
   removeEditorIds,
   trimObject,
+  hasProps,
   filterDuplicatedValues,
   areEquals,
   removeMenuEditorIds,
@@ -153,6 +155,7 @@ export {
   handleRequest,
   getActivatedDataPacksIds,
   isModuleDisabled,
+  getDeactivatedModules,
   getInitials,
   getSchemaType,
   getModuleCategories,

package/src/helpers/objects.tsx

@@ -1,6 +1,6 @@
 import { IMenuItem } from "@ax/types";
 
-const isEmptyObj = (obj: any) => {
+const isEmptyObj = (obj: any): boolean => {
   for (const key in obj) {
     if (Object.prototype.hasOwnProperty.call(obj, key)) return false;
   }
@@ -9,7 +9,7 @@ const isEmptyObj = (obj: any) => {
 
 const deepClone = (obj: any) => JSON.parse(JSON.stringify(obj));
 
-const isSelectedEditorID = (element: any, id: number) => element.editorID === id;
+const isSelectedEditorID = (element: any, id: number): boolean => element.editorID === id;
 
 const resetMultipleValues = (containerValue: any) => {
   const { id } = containerValue;
@@ -103,6 +103,13 @@ const trimObject = (obj: any) => {
   return obj;
 };
 
+const hasProps = (obj: Record<string, unknown>, props: string[]): boolean => {
+  return (
+    !!props &&
+    props.map((prop) => Object.prototype.hasOwnProperty.call(obj, prop)).filter(Boolean).length === props.length
+  );
+};
+
 export {
   isEmptyObj,
   deepClone,
@@ -115,4 +122,5 @@ export {
   getNullValue,
   removeEditorIds,
   trimObject,
+  hasProps,
 };

package/src/modules/Categories/CategoriesList/CategoryItem/index.tsx

@@ -24,6 +24,7 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
     onChange,
     toggleToast,
     setDeletedItem,
+    getContents,
   } = props;
 
   const { isOpen, toggleModal } = useModal();
@@ -140,7 +141,7 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
           <S.StyledActionMenu icon="more" options={menuOptions} tooltip="Actions" />
         </S.ActionsCell>
       </S.CategoryRow>
-      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} item={category} />
+      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} item={category} getContents={getContents}/>
     </>
   );
 };
@@ -154,6 +155,7 @@ interface IProps {
   onChange: (e: any) => void;
   toggleToast(): void;
   setDeletedItem(item: number): void;
+  getContents(dataId: string): void;
 }
 
 interface IDispatchProps {

package/src/modules/Categories/CategoriesList/CategoryPanel/index.tsx

@@ -16,6 +16,7 @@ const CategoryPanel = (props: IProps): JSX.Element => {
     item,
     createStructuredDataContent,
     updateStructuredDataContent,
+    getContents,
     currentStructuredData,
     category,
     entity,
@@ -41,18 +42,22 @@ const CategoryPanel = (props: IProps): JSX.Element => {
     newCategory = { ...newCategory, id: category.isTranslation ? category.id : item.id };
   }
 
-  const addItemAction = () => {
-    if (lang && category.isTranslation) {
-      createStructuredDataContent(newCategory, lang.id);
-    } else {
-      createStructuredDataContent(newCategory);
+  const addItemAction = async () => {
+    const langID = lang && category.isTranslation ? lang.id : undefined;
+    const isCreated = await createStructuredDataContent(newCategory, langID);
+
+    if (isCreated && currentStructuredData) {
+      getContents(currentStructuredData.id);
     }
 
     toggleModal();
   };
 
-  const editItemAction = () => {
-    updateStructuredDataContent(newCategory);
+  const editItemAction = async () => {
+    const isUpdated = await updateStructuredDataContent(newCategory);
+    if (isUpdated && currentStructuredData) {
+      getContents(currentStructuredData.id);
+    }
     toggleModal();
   };
 
@@ -122,11 +127,12 @@ interface ICategoryPanelProps {
   item?: IStructuredDataContent;
   isOpen: boolean;
   toggleModal(): any;
+  getContents(dataId: string): void;
 }
 
 interface IDispatchProps {
-  createStructuredDataContent(category: IStructuredDataContent, langId?: number | null): void;
-  updateStructuredDataContent(category: IStructuredDataContent): void;
+  createStructuredDataContent: (category: IStructuredDataContent, langId?: number | null) => Promise<boolean>;
+  updateStructuredDataContent: (category: IStructuredDataContent) => Promise<boolean>;
 }
 
 type IProps = IDispatchProps & ICategoryPanelProps & IStateProps;

package/src/modules/Categories/CategoriesList/index.tsx

@@ -209,6 +209,7 @@ const CategoriesList = (props: IProps): JSX.Element => {
                     onChange={addToBulkSelection}
                     toggleToast={toggleToast}
                     setDeletedItem={setDeletedItem}
+                    getContents={getContents}
                   />
                 );
               })
@@ -216,7 +217,7 @@ const CategoriesList = (props: IProps): JSX.Element => {
           </TableList>
         </S.TableWrapper>
       </S.CategoryListWrapper>
-      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} />
+      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} getContents={getContents}/>
       {isVisible && <Toast {...toastProps} />}
     </MainWrapper>
   );

package/src/modules/Content/PageItem/index.tsx

@@ -1,5 +1,7 @@
 import React, { memo, useState } from "react";
 
+import { schemas } from "components";
+
 import { useModal } from "@ax/hooks";
 import { getHumanLastModifiedDate, getTemplateDisplayName, slugify } from "@ax/helpers";
 import { IPage, ISite, ISavePageParams, ICheck, IColumn, IPageLanguage, IDataPack } from "@ax/types";
@@ -18,7 +20,7 @@ import {
   CategoryCell,
 } from "@ax/components";
 
-import { DeleteModal } from "../atoms";
+import { DeleteModal, CopyModal } from "../atoms";
 
 import * as S from "./style";
 
@@ -34,6 +36,7 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
     categoryColors,
     addCategoryColors,
     dataPacks,
+    sites,
   } = props;
   const { isSelected, siteLanguages, page, lang, isDuplicable } = item;
   const {
@@ -50,6 +53,7 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
     deleteBulk,
     getDataPack,
     setTemplateInstanceError,
+    toggleCopiedToast,
   } = functions;
   const { locale } = lang;
   const {
@@ -65,13 +69,18 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
   const displayName = getTemplateDisplayName(templateId);
 
   const initValue = { title: "", slug: "" };
+  const [site, setSite] = useState(null);
   const [modalState, setModalState] = useState(initValue);
   const [deleteAllVersions, setDeleteAllVersions] = useState(false);
   const { isOpen, toggleModal } = useModal();
   const { isOpen: isRemoveOpen, toggleModal: toggleRemoveModal } = useModal();
   const { isOpen: isUnpublishOpen, toggleModal: toggleUnpublishModal } = useModal();
   const { isOpen: isDeleteOpen, toggleModal: toggleDeleteModal } = useModal();
+  const { isOpen: isCopyOpen, toggleModal: toggleCopyModal } = useModal();
+
+  const currentTemplateDataPacks = schemas.templates[templateId].dataPacks;
 
+  const isCopyable = !currentTemplateDataPacks;
   const isGlobal = origin === "GLOBAL";
   const isTranslated = pageLanguages.length > 1;
   const activeColumns = Object.keys(columns).filter((col: string) => columns[col].show);
@@ -311,6 +320,13 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
     action: toggleModal,
   };
 
+  const copyOption = {
+    label: "Copy page in another site",
+    icon: "copy",
+    action: toggleCopyModal,
+  };
+
+  if (isCopyable) menuOptions.unshift(copyOption);
   if (!isGlobal) menuOptions.unshift(duplicateOption);
 
   const getPublishItem = (status: string, canBeUnpublished: boolean) => {
@@ -393,6 +409,26 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
 
   const secondaryRemoveModalAction = { title: "Cancel", onClick: toggleRemoveModal };
 
+  const copyToOtherSite = () => {
+    if (site) {
+      const siteID = parseInt(site);
+
+      duplicatePage(page.id, null, siteID).then((successEvent: boolean) => {
+        if (successEvent === true) {
+          toggleCopiedToast();
+        }
+        toggleCopyModal();
+      });
+    }
+  };
+
+  const secondaryCopyModalAction = {
+    title: "Cancel",
+    onClick: toggleCopyModal,
+  };
+
+  const mainCopyModalAction = { title: "Copy page", onClick: copyToOtherSite, disabled: !site };
+
   const getLiveStatus = () => (page.haveDraftPage ? "modified" : page.liveStatus.status);
 
   const mainUnpublishAction = { title: "Ok", onClick: toggleUnpublishModal };
@@ -471,6 +507,18 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
           <S.StyledActionMenu icon="more" options={menuOptions} tooltip="Page actions" />
         </S.ActionsCell>
       </S.PageRow>
+      <CopyModal
+        isOpen={isCopyOpen}
+        toggleModal={() => {
+          setSite(null);
+          toggleCopyModal();
+        }}
+        mainModalAction={mainCopyModalAction}
+        secondaryModalAction={secondaryCopyModalAction}
+        sites={sites}
+        site={site}
+        setSite={setSite}
+      />
       <Modal
         isOpen={isOpen}
         hide={toggleModal}
@@ -576,11 +624,12 @@ interface IPageItemProps {
     setHistoryPush(path: string, isEditor: boolean): void;
     updatePageStatus(ids: number[], status: string, updatedFromList: boolean): Promise<boolean>;
     setCurrentPageID(currentPageID: number | null): ISetCurrentPageIDAction;
-    duplicatePage(pageID: number, data: any): Promise<void>;
+    duplicatePage(pageID: number, data: any, siteID?: number): Promise<boolean>;
     removePageFromSite(pageID: number): Promise<boolean>;
     deleteBulk(ids: number[]): void;
     setTemplateInstanceError(error: any): void;
     getDataPack: (id: string) => Promise<void>;
+    toggleCopiedToast(): void;
   };
   activatedTemplates: any[];
   toggleToast(): void;
@@ -590,6 +639,7 @@ interface IPageItemProps {
   categoryColors: any;
   addCategoryColors(cats: string[]): void;
   dataPacks: IDataPack[];
+  sites: ISite[];
 }
 
 export default memo(PageItem);

package/src/modules/Content/atoms.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 
-import { IModal } from "@ax/types";
-import { Modal, FieldsBehavior, Button } from "@ax/components";
+import { IModal, ISite } from "@ax/types";
+import { Modal, FieldsBehavior, Select, Button } from "@ax/components";
 
 import * as S from "./style";
 
@@ -80,6 +80,38 @@ const SecondaryActionButton = (props: IActionButton): JSX.Element => (
   </Button>
 );
 
+const CopyModal = (props: ICopyModal): JSX.Element => {
+  const { isOpen, toggleModal, mainModalAction, secondaryModalAction, setSite, sites, site } = props;
+  const sitesOptions = sites.map((site: ISite) => ({ label: site.name, value: site.id.toString() }));
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      hide={toggleModal}
+      size="S"
+      title="Copy page in another site"
+      mainAction={mainModalAction}
+      secondaryAction={secondaryModalAction}
+    >
+      <S.ModalContent>
+        <p>
+          <strong>Select a site to copy this page. </strong>
+          You can only select sites with the same language as this page.
+        </p>
+        <S.SelectWrapper>
+          <Select
+            name="select"
+            options={sitesOptions}
+            onChange={(value: string) => setSite(value)}
+            value={site?.toString() || ""}
+            mandatory={true}
+          />
+        </S.SelectWrapper>
+      </S.ModalContent>
+    </Modal>
+  );
+};
+
 interface IDeleteModal extends IModal {
   isTranslated: boolean;
   deleteAllVersions: boolean;
@@ -92,4 +124,10 @@ interface IActionButton {
   title: string;
 }
 
-export { DeleteModal, MainActionButton, SecondaryActionButton };
+interface ICopyModal extends IModal {
+  setSite: React.Dispatch<React.SetStateAction<any>>;
+  sites: ISite[];
+  site: string | null;
+}
+
+export { DeleteModal, MainActionButton, SecondaryActionButton, CopyModal };