@griddo/ax 1.72.11 → 1.73.2

package/src/containers/PageEditor/actions.tsx

@@ -35,7 +35,7 @@ import { appActions } from "@ax/containers/App";
 import { navigationActions } from "@ax/containers/Navigation";
 import { setCurrentSiteErrorPages } from "@ax/containers/Sites/actions";
 import { pages, sites, structuredData } from "@ax/api";
-import { getPageData, getPageNavigation, getStateValues } from "./utils";
+import { getDefaultPageNavigation, getPageData, getPageNavigation, getStateValues } from "./utils";
 import {
   SET_BREADCRUMB,
   SET_SCHEMA,
@@ -485,7 +485,14 @@ function deleteBulk(ids: any): (dispatch: Dispatch) => Promise<boolean> {
     try {
       const responseActions = {
         handleSuccess: () => true,
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The delete action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () => pages.bulkDelete(ids);
@@ -503,7 +510,14 @@ function restorePage(id: number | number[]): (dispatch: Dispatch) => Promise<boo
     try {
       const responseActions = {
         handleSuccess: () => true,
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The restore action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () => (Array.isArray(id) ? pages.bulkRestore(id) : pages.restorePage(id));
@@ -919,11 +933,16 @@ function generatePageContent(editorContent: IPage, dispatch: Dispatch, getState:
     navigation: { currentDefaultsContent },
     dataPacks: { configFormData },
   } = getState();
-  const { header, footer, isGlobal } = editorContent;
+
+  const { header: headerID, footer: footerID, isGlobal } = editorContent;
   const { defaultHeader, defaultFooter } = (configFormData.templates && configFormData.templates[template]) || {};
+
+  const header = headerID === null ? defaultHeader : headerID;
+  const footer = footerID === null ? defaultFooter : footerID;
+
   const { header: pageHeader, footer: pageFooter } = getPageNavigation(
-    header || defaultHeader,
-    footer || defaultFooter,
+    header,
+    footer,
     currentDefaultsContent,
     isGlobal
   );
@@ -972,6 +991,15 @@ function setSelectedContent(editorID: number): (dispatch: Dispatch, getState: an
       by DCX
     */
 
+    const iframe = document.querySelector("iframe");
+    iframe?.contentWindow?.postMessage(
+      {
+        type: "selected-content",
+        message: editorID,
+      },
+      "*"
+    );
+
     localStorage.setItem("selectedID", `${editorID}`);
 
     dispatch(setIsLoading(true));
@@ -1252,6 +1280,52 @@ function discardDraft(): (dispatch: Dispatch, getState: any) => Promise<void> {
   };
 }
 
+function removeNavigationFromPage(key: string): (dispatch: Dispatch, getState: any) => void {
+  return (dispatch, getState) => {
+    const {
+      pageEditor: { editorContent },
+    } = getState();
+
+    const updatedEditorContent = {
+      ...editorContent,
+      editorContent: { ...editorContent.editorContent, [key]: 0 },
+      [key]: null,
+    };
+
+    setSelectedContent(0)(dispatch, getState);
+    dispatch(setEditorContent(updatedEditorContent));
+  };
+}
+
+function restorePageNavigation(key: string): (dispatch: Dispatch, getState: any) => void {
+  return (dispatch, getState) => {
+    const {
+      pageEditor: { editorContent },
+      navigation: { currentDefaultsContent },
+    } = getState();
+
+    const { header, footer } = editorContent;
+
+    const navigation = getDefaultPageNavigation(currentDefaultsContent, key);
+
+    const pageHeader = key === "header" ? navigation : header;
+    const pageFooter = key === "footer" ? navigation : footer;
+
+    const updatedEditorContent = {
+      ...editorContent,
+      editorContent: { ...editorContent.editorContent, [key]: navigation.id },
+    };
+
+    const { pageContent } = generateEditorIDs({
+      editorContent: updatedEditorContent.editorContent,
+      header: pageHeader,
+      footer: pageFooter,
+    });
+
+    dispatch(setEditorContent(pageContent));
+  };
+}
+
 export {
   setEditorContent,
   setTemplate,
@@ -1298,4 +1372,6 @@ export {
   getTemplatePage,
   copyModule,
   pasteModule,
+  removeNavigationFromPage,
+  restorePageNavigation,
 };

package/src/containers/PageEditor/utils.tsx

@@ -1,7 +1,7 @@
 import { ISavePageParams } from "@ax/types";
 import { cleanContent } from "@ax/forms";
 
-export const getPageParams = (getState: any): ISavePageParams => {
+const getPageParams = (getState: any): ISavePageParams => {
   const {
     sites: { currentSiteInfo },
     pageEditor: { editorContent },
@@ -12,7 +12,7 @@ export const getPageParams = (getState: any): ISavePageParams => {
   };
 };
 
-export const getPageData = (getState: any, deleted: boolean, params = getPageParams(getState)) => {
+const getPageData = (getState: any, deleted: boolean, params = getPageParams(getState)) => {
   const { site, page } = params;
   const siteID = site ? site.id : null;
   const updatedPageContent = { ...page, site: siteID };
@@ -36,7 +36,7 @@ const getTemplateValues = (template: any) => {
   return sections;
 };
 
-export const getStateValues = (getState: any) => {
+const getStateValues = (getState: any) => {
   const {
     pageEditor: { editorContent: pageContent, selectedEditorID, selectedContent, template, errors },
   } = getState();
@@ -57,7 +57,7 @@ export const getStateValues = (getState: any) => {
   };
 };
 
-export const getPageNavigation = (
+const getPageNavigation = (
   headerID: number | null,
   footerID: number | null,
   defaultsContent: any,
@@ -69,12 +69,30 @@ export const getPageNavigation = (
 
   const headers: any = defaultsContent.filter((content: any) => content.type === "header");
   const footers: any = defaultsContent.filter((content: any) => content.type === "footer");
-  const header = !headerID
-    ? headers.find((content: any) => content.setAsDefault)
-    : headers.find((content: any) => content.id === headerID);
-  const footer = !footerID
-    ? footers.find((content: any) => content.setAsDefault)
-    : footers.find((content: any) => content.id === footerID);
+
+  const header =
+    headerID === 0
+      ? null
+      : headerID === undefined || headerID === null
+      ? headers.find((content: any) => content.setAsDefault)
+      : headers.find((content: any) => content.id === headerID);
+
+  const footer =
+    footerID === 0
+      ? null
+      : footerID === undefined || footerID === null
+      ? footers.find((content: any) => content.setAsDefault)
+      : footers.find((content: any) => content.id === footerID);
 
   return { header, footer };
 };
+
+const getDefaultPageNavigation = (defaultsContent: any, type: string) => {
+  const navigations: any = defaultsContent.filter((content: any) => content.type === type);
+
+  const navitagion = navigations.find((content: any) => content.setAsDefault);
+
+  return navitagion;
+};
+
+export { getPageParams, getPageData, getStateValues, getPageNavigation, getDefaultPageNavigation };

package/src/containers/Redirects/actions.tsx

@@ -130,7 +130,14 @@ function deleteRedirect(
           const siteFilterQuery = currentSiteInfo && currentSiteInfo.id ? `&sites=${currentSiteInfo.id}` : filter;
           dispatch(getRedirects(params, siteFilterQuery));
         },
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The delete action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       return await handleRequest(callback, responseActions, [])(dispatch);
@@ -161,7 +168,14 @@ function importRedirects(
             dispatch(getRedirects(params));
           }
         },
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The import action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       return await handleRequest(callback, responseActions, [])(dispatch);

package/src/containers/Sites/actions.tsx

@@ -26,7 +26,7 @@ import {
 } from "./interfaces";
 
 import { ISite, IGetSitePagesParams, ISettingsForm, IGetGlobalPagesParams, IPage } from "@ax/types";
-import { sites, languages, dataPack, social, structuredData, analytics } from "@ax/api";
+import { sites, languages, dataPack, social, structuredData, analytics, pages } from "@ax/api";
 import { appActions } from "@ax/containers/App";
 import { structuredDataActions } from "@ax/containers/StructuredData";
 import { navigationActions, menuActions } from "@ax/containers/Navigation";
@@ -411,7 +411,14 @@ function importPageFromGlobal(pageID: number | number[]): (dispatch: any, getSta
           const filter = currentFilter === "unique-pages" ? null : currentFilter;
           getSitePages(params, filter)(dispatch);
         },
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The import action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () =>
@@ -463,7 +470,14 @@ function removePageFromSite(
             getSitePages(params, filter)(dispatch);
           }
         },
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The delete action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () =>
@@ -479,6 +493,68 @@ function removePageFromSite(
   };
 }
 
+function deleteAndRemoveFromSiteBulk(
+  pageIds: number[],
+  globalPageIds: number[]
+): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+  return async (dispatch, getState) => {
+    try {
+      const {
+        sites: { currentSiteInfo },
+      } = getState();
+
+      let responseErrorPages: any = { data: { code: null, message: [] } };
+
+      const responsePageActions = {
+        handleSuccess: () => true,
+        handleError: (response: any) => {
+          responseErrorPages = response;
+        },
+      };
+
+      const getMessageErrors = () => {
+        const {
+          data: { message },
+        } = responseErrorPages;
+
+        const isMultiple = Array.isArray(message) && message.length > 1;
+        const msg = isMultiple ? `The delete action failed due to ${message.length} errors.` : undefined;
+        appActions.handleError(responseErrorPages, isMultiple, msg)(dispatch);
+      };
+
+      const responseGlobalPageActions = {
+        handleSuccess: () => {
+          if (responseErrorPages.data.message.length > 0) {
+            getMessageErrors();
+          }
+        },
+        handleError: (response: any) => {
+          responseErrorPages = {
+            ...responseErrorPages,
+            data: {
+              code: responseErrorPages.data.code || response.data.code,
+              message: [...responseErrorPages.data.message, ...response.data.message],
+            },
+          };
+
+          getMessageErrors();
+        },
+      };
+
+      const callbackPages = async () => pages.bulkDelete(pageIds);
+      const callbackGlobalPages = async () => sites.removePageBulk(currentSiteInfo.id, globalPageIds);
+
+      const resultPages = await handleRequest(callbackPages, responsePageActions, [])(dispatch);
+      const resultGlobalPages = await handleRequest(callbackGlobalPages, responseGlobalPageActions, [])(dispatch);
+
+      return resultPages && resultGlobalPages;
+    } catch (e) {
+      console.log(e);
+      return false;
+    }
+  };
+}
+
 function resetCurrentSiteErrorPages(): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
@@ -514,4 +590,5 @@ export {
   setCurrentSiteErrorPages,
   resetCurrentSiteErrorPages,
   setContentFilters,
+  deleteAndRemoveFromSiteBulk,
 };

package/src/containers/StructuredData/actions.tsx

@@ -385,7 +385,14 @@ function deleteStructuredDataContent(id: number | number[]): (dispatch: Dispatch
 
       const responseActions = {
         handleSuccess: () => getStructuredDataContents(params, siteID)(dispatch, getState),
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The delete action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () =>
@@ -415,7 +422,14 @@ function restoreStructuredDataContent(dataID: number | number[]): (dispatch: Dis
 
       const responseActions = {
         handleSuccess: () => getStructuredDataContents(params, siteID)(dispatch, getState),
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The restore action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () =>
@@ -483,7 +497,14 @@ function setStatusStructuredDataContent(
 
       const responseActions = {
         handleSuccess: () => getStructuredDataContents(params, siteID)(dispatch, getState),
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () =>

package/src/containers/Users/actions.tsx

@@ -137,7 +137,14 @@ function deleteUser(id: number | number[]): (dispatch: Dispatch) => Promise<bool
 
       const responseActions = {
         handleSuccess: () => getUsers(params)(dispatch),
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => {
+          const {
+            data: { message },
+          } = response;
+          const isMultiple = Array.isArray(message) && message.length > 1;
+          const msg = isMultiple ? `The delete action failed due to ${message.length} errors.` : undefined;
+          appActions.handleError(response, isMultiple, msg)(dispatch);
+        },
       };
 
       const callback = async () => (Array.isArray(id) ? users.deleteUserBulk(id) : users.deleteUser(id));

package/src/forms/errors.tsx

@@ -41,6 +41,7 @@ const ERRORS: Record<string, string> = {
   ERR040: "Sorry, the file is not in a valid format.",
   ERR041: "Sorry, the password doesn’t match.",
   ERR042: "This content is part of disabled content type package. To publish it, you must first activate it.",
+  ERR043: "Please, enter a valid date.",
 };
 
 export { ERRORS };

package/src/forms/fields.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { FieldContainer, FieldsBehavior } from "@ax/components";
-import { IErrorItem, IPage } from "@ax/types";
+import { IErrorItem, IPage, ISite } from "@ax/types";
 
 const getInnerFields = (
   innerFields: any[],
@@ -8,8 +8,9 @@ const getInnerFields = (
   selectedContent: IPage,
   isTemplateActivated: boolean,
   theme: string,
+  site?: ISite,
   errors?: IErrorItem[],
-  deleteError?: (error: IErrorItem) => void
+  deleteError?: (error: IErrorItem) => void,
 ) => {
   let fieldArr: any[] = [];
 
@@ -26,8 +27,9 @@ const getInnerFields = (
           selectedContent,
           isTemplateActivated,
           theme,
+          site,
           errors,
-          deleteError
+          deleteError,
         );
       }
 
@@ -41,6 +43,7 @@ const getInnerFields = (
           selectedContent={selectedContent}
           updateValue={innerActions.updateValue}
           goTo={innerActions.goTo}
+          site={site}
           {...singleFieldProps}
           disabled={!isTemplateActivated || singleFieldProps.disabled}
           error={error}

package/src/forms/validators.tsx

@@ -8,7 +8,12 @@ import {
   isComponentEmpty,
   isEmptyContainer,
   isModuleDisabled,
+  getRange,
+  isValidDate,
+  isValidDateRange,
+  stringToDate,
 } from "@ax/helpers";
+
 import { findByEditorID } from "@ax/forms";
 import { IErrorItem, ITemplate } from "@ax/types";
 import { ERRORS } from "./errors";
@@ -37,7 +42,7 @@ const VALIDATORS = {
     return { isValid, errorCode: "ERR008" };
   },
   format: (val: string, type: string): IError => {
-    if (!val || val.trim().length === 0) {
+    if (!val || (typeof val === "string" && val.trim().length === 0)) {
       return { isValid: true, errorCode: "" };
     }
 
@@ -79,6 +84,11 @@ const VALIDATORS = {
         const isValid = re.test(val);
         return { isValid, errorCode: "ERR007" };
       }
+      case "date": {
+        const range = getRange(val);
+        const isValid = range.length === 2 ? isValidDateRange(val) : isValidDate(val);
+        return { isValid, errorCode: "ERR043" };
+      }
       default:
         return { isValid: true, errorCode: "" };
     }
@@ -93,14 +103,14 @@ const VALIDATORS = {
       return { isValid: true, errorCode: "" };
     }
     const now = new Date();
-    const date = new Date(val);
+    const date = stringToDate(val);
     switch (type) {
       case "futureDate": {
-        const isValid = dateToString(date) >= dateToString(now);
+        const isValid = isValidDate(val) && dateToString(date) >= dateToString(now);
         return { isValid, errorCode: "ERR010" };
       }
       case "pastDate": {
-        const isValid = dateToString(date) <= dateToString(now);
+        const isValid = isValidDate(val) && dateToString(date) <= dateToString(now);
         return { isValid, errorCode: "ERR011" };
       }
       default:

package/src/guards/error/index.tsx

@@ -19,7 +19,7 @@ const ErrorView = (props: any) => {
 };
 
 const ErrorGuard = (props: IProps) => {
-  const { text, code, resetError, btnText, actionsBelow } = props;
+  const { text, code, resetError, btnText, actionsBelow, subErrors } = props;
 
   const isBlocking = blockingErrors.includes(code);
 
@@ -28,26 +28,20 @@ const ErrorGuard = (props: IProps) => {
     const lastErrorElement = errorElements.length - 1;
     const domNode = errorElements[lastErrorElement] || document.getElementById("default-error");
 
-    const isMultiple = Array.isArray(text);
-
-    const Notifications = isMultiple ? (
-      <>
-        {text.map((error: any) => (
-          <Notification
-            key={error.id}
-            resetError={resetError}
-            text={error.error}
-            type="error"
-            btnText={btnText}
-            actionsBelow={actionsBelow}
-          />
-        ))}
-      </>
-    ) : (
-      <Notification resetError={resetError} text={text} type="error" btnText={btnText} actionsBelow={actionsBelow} />
+    return (
+      domNode &&
+      createPortal(
+        <Notification
+          resetError={resetError}
+          text={text}
+          type="error"
+          btnText={btnText}
+          actionsBelow={actionsBelow}
+          subErrors={subErrors}
+        />,
+        domNode
+      )
     );
-
-    return domNode && createPortal(Notifications, domNode);
   };
 
   return code || text ? isBlocking ? <ErrorView code={code} text={text} /> : createErrorNotification() : null;
@@ -56,7 +50,7 @@ const ErrorGuard = (props: IProps) => {
 const mapStateToProps = (state: IRootState) => {
   const {
     app: {
-      error: { code, text, btnText, actionsBelow },
+      error: { code, text, btnText, actionsBelow, subErrors },
     },
   } = state;
   return {
@@ -64,6 +58,7 @@ const mapStateToProps = (state: IRootState) => {
     text,
     btnText,
     actionsBelow,
+    subErrors,
   };
 };
 
@@ -77,6 +72,7 @@ interface IProps {
   resetError: () => void;
   btnText?: string;
   actionsBelow?: boolean | undefined;
+  subErrors?: any[];
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(ErrorGuard);

package/src/helpers/dates.tsx

@@ -16,6 +16,7 @@ const isValidDate = (value: string): boolean => {
   // eslint-disable-next-line
   const regEx = /^[0-9]{4}[\/][0-9]{2}[\/][0-9]{2}$/g;
   const regEx2 = /^[0-9]{2}[\/][0-9]{2}[\/][0-9]{4}$/g;
+
   if (regEx.test(value) || regEx2.test(value)) {
     const date = stringToDate(value);
     return isValid(date);
@@ -89,4 +90,5 @@ export {
   getHumanLastModifiedDate,
   getFormattedDateWithTimezone,
   getDaysAgo,
+  getRange,
 };

package/src/helpers/index.tsx

@@ -87,6 +87,7 @@ import {
   getHumanLastModifiedDate,
   getFormattedDateWithTimezone,
   getDaysAgo,
+  getRange,
 } from "./dates";
 
 import { imageResizeCropAndCompress, compressImage } from "./imageResize";
@@ -150,6 +151,7 @@ export {
   getHumanLastModifiedDate,
   getFormattedDateWithTimezone,
   getDaysAgo,
+  getRange,
   imageResizeCropAndCompress,
   compressImage,
   validateEmail,

package/src/hooks/modals.tsx

@@ -14,7 +14,7 @@ const useModal = (initialState?: boolean) => {
 
   return {
     isOpen,
-    toggleModal
+    toggleModal,
   };
 };
 
@@ -36,16 +36,16 @@ const useToast = () => {
   const [isVisible, setIsVisible] = useState(false);
 
   let temp: any;
-  const setTemp = () => temp = setTimeout(() => setIsVisible(false), 6000);
+  const setTemp = () => (temp = setTimeout(() => setIsVisible(false), 6000));
   const stopTemp = () => clearTimeout(temp);
 
   const toggleToast = () => {
     setIsVisible(true);
     setTemp();
     stopTemp();
-  }
+  };
 
   return { isVisible, setIsVisible, toggleToast };
-}
+};
 
 export { useModal, useHandleClickOutside, useToast };