@griddo/ax 1.66.4 → 1.66.7

package/src/forms/validators.tsx

@@ -1,15 +1,5 @@
-import {
-  dateToString,
-  getDeactivatedModules,
-  getDefaultSchema,
-  getSchema,
-  getTemplate,
-  isComponentEmpty,
-  isEmptyContainer,
-  isModuleDisabled,
-} from "@ax/helpers";
-import { findByEditorID } from "@ax/forms";
-import { IErrorItem, ITemplate } from "@ax/types";
+import { dateToString, getSchema, getTemplate, isComponentEmpty, isEmptyContainer } from "@ax/helpers";
+import { IErrorItem } from "@ax/types";
 import { ERRORS } from "./errors";
 
 const VALIDATORS = {
@@ -106,13 +96,6 @@ 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" };
@@ -178,23 +161,6 @@ const isEmptyField = (value: any, fieldType: string, multiple: boolean) => {
   }
 };
 
-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 value.publicId === defaultValue.publicId;
-    default:
-      return 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,
@@ -210,8 +176,8 @@ const getValidationErrors = (
       const isEmpty = isEmptyField(current[field.key], field.type, hasMultipleOptions);
       if (isEmpty) {
         errors.push({
-          type: "error",
-          message: getErrorMessage("ERR015", null),
+          type: "Error",
+          message: "Empty Field",
           validator: { mandatory: true },
           editorID: current.editorID ? current.editorID : null,
           component: current.component ? current.component : null,
@@ -223,42 +189,14 @@ const getValidationErrors = (
       }
     }
 
-    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 (Object.prototype.hasOwnProperty.call(field, "validators") || Object.keys(fieldValidators).length) {
-      const allValidators = { ...field.validators, ...fieldValidators };
-
-      const { isValid, errorText } = getValidity(allValidators, current[field.key]);
+    if (Object.prototype.hasOwnProperty.call(field, "validators")) {
+      const { isValid, errorText } = getValidity(field.validators, current[field.key]);
 
       if (!isValid) {
         errors.push({
-          type: "error",
+          type: "Error",
           message: errorText,
-          validator: allValidators,
+          validator: field.validators,
           editorID: current.editorID ? current.editorID : null,
           component: current.component ? current.component : null,
           name: name ? name : field.title,
@@ -283,57 +221,6 @@ 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[] = [];
@@ -387,55 +274,9 @@ 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,
-  isTemplateActivated,
-  findPackagesActivationErrors,
-  findFieldsErrors,
-  findMandatoryStructuredDataErrors,
-  checkH1content,
-  parseValidationErrors,
-};
+export { getValidity, findFieldsErrors, findMandatoryStructuredDataErrors };

package/src/guards/error/index.tsx

@@ -50,7 +50,7 @@ const ErrorGuard = (props: IProps) => {
     return domNode && createPortal(Notifications, domNode);
   };
 
-  return code || text ? isBlocking ? <ErrorView code={code} text={text} /> : createErrorNotification() : null;
+  return code ? isBlocking ? <ErrorView code={code} text={text} /> : createErrorNotification() : null;
 };
 
 const mapStateToProps = (state: IRootState) => {

package/src/helpers/dataPacks.tsx

@@ -8,11 +8,4 @@ const getActivatedDataPacksIds = (activatedDataPacks: any) => {
 const isModuleDisabled = (selectedComponent: string, type: string, activatedModules: string[]): boolean =>
   type === "module" && !activatedModules.includes(selectedComponent);
 
-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 };
+export { getActivatedDataPacksIds, isModuleDisabled };

package/src/helpers/index.tsx

@@ -91,7 +91,7 @@ import { imageResizeCropAndCompress, compressImage } from "./imageResize";
 
 import { isEmptyArray, moveArrayElement } from "./arrays";
 
-import { getActivatedDataPacksIds, isModuleDisabled, getDeactivatedModules } from "./dataPacks";
+import { getActivatedDataPacksIds, isModuleDisabled } from "./dataPacks";
 
 import { isDevelopment } from "./environment";
 
@@ -153,7 +153,6 @@ export {
   handleRequest,
   getActivatedDataPacksIds,
   isModuleDisabled,
-  getDeactivatedModules,
   getInitials,
   getSchemaType,
   getModuleCategories,

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

@@ -1,9 +1,8 @@
 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, IDataPack, IPageLanguage } from "@ax/types";
+import { IPage, ISite, ISavePageParams, ICheck, IColumn, IPageLanguage, IDataPack } from "@ax/types";
 import { pageStatus, ISetCurrentPageIDAction } from "@ax/containers/PageEditor/interfaces";
 
 import {
@@ -19,7 +18,7 @@ import {
   CategoryCell,
 } from "@ax/components";
 
-import { DeleteModal, CopyModal } from "../atoms";
+import { DeleteModal } from "../atoms";
 
 import * as S from "./style";
 
@@ -35,7 +34,6 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
     categoryColors,
     addCategoryColors,
     dataPacks,
-    sites,
   } = props;
   const { isSelected, siteLanguages, page, lang, isDuplicable } = item;
   const {
@@ -49,10 +47,9 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
     languageActions,
     duplicatePage,
     removePageFromSite,
-    getDataPack,
     deleteBulk,
+    getDataPack,
     setTemplateInstanceError,
-    toggleCopiedToast,
   } = functions;
   const { locale } = lang;
   const {
@@ -65,22 +62,16 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
     templateId,
     structuredDataContent,
   } = page;
-
   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);
@@ -320,13 +311,6 @@ 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) => {
@@ -419,25 +403,6 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
   };
 
   const secondaryDeleteModalAction = { title: "Cancel", onClick: toggleDeleteModal };
-  const copyToOtherSite = () => {
-    if (site) {
-      const siteID = parseInt(site);
-
-      duplicatePage(page.id, null, siteID).then((successEvent: boolean) => {
-        if (successEvent) {
-          toggleCopiedToast();
-        }
-        toggleCopyModal();
-      });
-    }
-  };
-
-  const secondaryCopyModalAction = {
-    title: "Cancel",
-    onClick: toggleCopyModal,
-  };
-
-  const mainCopyModalAction = { title: "Copy page", onClick: copyToOtherSite, disabled: !site };
 
   const CategoryColumns =
     isGlobal &&
@@ -506,18 +471,6 @@ 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}
@@ -581,7 +534,6 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
           </S.ModalContent>
         )}
       </Modal>
-
       <DeleteModal
         isOpen={isDeleteOpen}
         toggleModal={toggleDeleteModal}
@@ -624,12 +576,11 @@ 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, siteID?: number): Promise<boolean>;
+    duplicatePage(pageID: number, data: any): Promise<void>;
     removePageFromSite(pageID: number): Promise<boolean>;
     deleteBulk(ids: number[]): void;
     setTemplateInstanceError(error: any): void;
     getDataPack: (id: string) => Promise<void>;
-    toggleCopiedToast(): void;
   };
   activatedTemplates: any[];
   toggleToast(): void;
@@ -639,7 +590,6 @@ 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, ISite } from "@ax/types";
-import { Modal, FieldsBehavior, Select, Button } from "@ax/components";
+import { IModal } from "@ax/types";
+import { Modal, FieldsBehavior, Button } from "@ax/components";
 
 import * as S from "./style";
 
@@ -68,38 +68,6 @@ const DeleteModal = (props: IDeleteModal): JSX.Element => {
   );
 };
 
-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>
-          <br></br>
-          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>
-  );
-};
 const MainActionButton = (props: IActionButton): JSX.Element => (
   <Button type="button" onClick={props.onClick}>
     {props.title}
@@ -119,15 +87,9 @@ interface IDeleteModal extends IModal {
   title?: string;
 }
 
-interface ICopyModal extends IModal {
-  setSite: React.Dispatch<React.SetStateAction<any>>;
-  sites: ISite[];
-  site: string | null;
-}
-
 interface IActionButton {
   onClick: () => void;
   title: string;
 }
 
-export { DeleteModal, CopyModal, MainActionButton, SecondaryActionButton };
+export { DeleteModal, MainActionButton, SecondaryActionButton };