@griddo/ax 1.56.8 → 1.57.1

package/src/containers/PageEditor/actions.tsx

@@ -288,7 +288,7 @@ function savePage(
   createDraft: boolean,
   publishPage?: any,
   publishDraft?: boolean
-): (dispatch: Dispatch, getState: any) => Promise<void> {
+): (dispatch: Dispatch, getState: any) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       dispatch(setIsSaving(true));
@@ -358,14 +358,17 @@ function savePage(
         if (selectedEditorID === rootEditorID) {
           setSelectedContent(rootEditorID)(dispatch, getState);
         }
+        dispatch(setIsSaving(false));
+        return true;
       } else {
         appActions.handleError(saveResponse)(dispatch);
+        dispatch(setIsSaving(false));
+        return false;
       }
-
-      dispatch(setIsSaving(false));
     } catch (e) {
       console.log(e); // TODO: capturar error bien
       dispatch(setIsSaving(false));
+      return false;
     }
   };
 }
@@ -519,8 +522,6 @@ function addComponent(type: any, key: string): (dispatch: Dispatch, getState: an
       },
     };
 
-    generatePageContent(updatedPageContent, dispatch, getState);
-
     if (type.editorID) {
       setSelectedContent(type.editorID)(dispatch, getState);
     } else {
@@ -528,6 +529,8 @@ function addComponent(type: any, key: string): (dispatch: Dispatch, getState: an
       const lastElementEditorID = getLastComponentEditorID(generatedSections, component.editorID, key);
       setSelectedContent(lastElementEditorID)(dispatch, getState);
     }
+
+    generatePageContent(updatedPageContent, dispatch, getState);
   };
 }
 
@@ -626,7 +629,6 @@ function deleteModule(editorID: number, key?: string): (dispatch: Dispatch, getS
 
     const updatedPageContent = {
       ...editorContent,
-      sections: [...updatedSections],
     };
 
     generatePageContent(updatedPageContent, dispatch, getState);
@@ -650,7 +652,6 @@ function duplicateModule(editorID: number, key?: string): (dispatch: Dispatch, g
 
     const updatedPageContent = {
       ...editorContent,
-      sections: [...updatedSections],
     };
 
     generatePageContent(updatedPageContent, dispatch, getState);
@@ -724,7 +725,7 @@ function updateEditorContent(
     dispatch(setEditorContent(updatedEditorContent));
 
     const isNavigation = ["header", "footer"].includes(key);
-    if (isNavigation) {
+    if (isNavigation || (value && typeof value === "object")) {
       generatePageContent(updatedEditorContent.editorContent, dispatch, getState);
     }
   };

package/src/containers/Settings/Social/actions.tsx

@@ -1,11 +1,8 @@
 import { Dispatch } from "redux";
 
-import { SET_SOCIAL, SET_FORM } from "./constants";
+import { SET_SOCIAL } from "./constants";
 
-import { ISetSocialAction, ISetFormAction } from "./interfaces";
-
-import { ISocialState } from "@ax/types";
-import { initialState } from "./reducer";
+import { ISetSocialAction } from "./interfaces";
 
 import { appActions } from "@ax/containers/App";
 import { handleRequest } from "@ax/helpers";
@@ -15,45 +12,27 @@ function setSocial(socialInfo: any): ISetSocialAction {
   return { type: SET_SOCIAL, payload: { ...socialInfo } };
 }
 
-function setForm(form: ISocialState): ISetFormAction {
-  return { type: SET_FORM, payload: form };
-}
-
-function updateFormValue(valueObj: any): (dispatch: Dispatch, getState: any) => void {
-  return (dispatch, getState) => {
-    const { social } = getState();
-    const updatedForm = { ...social, ...valueObj };
-    dispatch(setForm(updatedForm));
-  };
-}
-
-function resetForm(): (dispatch: Dispatch) => void {
-  return (dispatch) => {
-    dispatch(setForm(initialState));
-  };
-}
-
-function saveSocial(): (dispatch: Dispatch, getState: any) => Promise<void> {
+function saveSocial(form: Record<string, string>): (dispatch: Dispatch, getState: any) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
         sites: { currentSiteInfo },
-        social: form,
       } = getState();
 
       const responseActions = {
-        handleSuccess: (data: any) => {
+        handleSuccess: (data: Record<string, string>) => {
           dispatch(setSocial(data));
-          dispatch(setForm(data));
+          return true;
         },
         handleError: (data: any) => appActions.handleError(data)(dispatch),
       };
 
       const callback = async () => social.updateSocial(currentSiteInfo.id, form);
 
-      await handleRequest(callback, responseActions, [appActions.setIsSaving])(dispatch);
+      return await handleRequest(callback, responseActions, [appActions.setIsSaving])(dispatch);
     } catch (e) {
       console.log(e);
+      return false;
     }
   };
 }
@@ -66,9 +45,8 @@ function getSocial(): (dispatch: any, getState: any) => Promise<void> {
       } = getState();
 
       const responseActions = {
-        handleSuccess: (data: any) => {
+        handleSuccess: (data: Record<string, string>) => {
           dispatch(setSocial(data));
-          dispatch(setForm(data));
         },
         handleError: () => console.log("Error en getSocial"),
       };
@@ -82,4 +60,4 @@ function getSocial(): (dispatch: any, getState: any) => Promise<void> {
   };
 }
 
-export { getSocial, updateFormValue, resetForm, saveSocial, setSocial, setForm };
+export { getSocial, saveSocial, setSocial };

package/src/containers/Settings/Social/constants.tsx

@@ -1,4 +1,3 @@
-export const NAME: string = "social";
+export const NAME = "social";
 
-export const SET_SOCIAL: string = `${NAME}/SET_SOCIAL`;
-export const SET_FORM: string = `${NAME}/SET_UPDATED_FORM`;
+export const SET_SOCIAL = `${NAME}/SET_SOCIAL`;

package/src/containers/Settings/Social/interfaces.tsx

@@ -1,14 +1,9 @@
-import { SET_SOCIAL, SET_FORM } from "./constants";
+import { SET_SOCIAL } from "./constants";
 import { ISocialState } from "@ax/types";
 
 export interface ISetSocialAction {
   type: typeof SET_SOCIAL;
-  payload: any;
-}
-
-export interface ISetFormAction {
-  type: typeof SET_FORM;
   payload: ISocialState;
 }
 
-export type SocialActionsCreators = ISetSocialAction & ISetFormAction;
+export type SocialActionsCreators = ISetSocialAction;

package/src/containers/Settings/Social/reducer.tsx

@@ -1,26 +1,15 @@
-import { SET_FORM, SET_SOCIAL } from "./constants";
+import { SET_SOCIAL } from "./constants";
 
 import { ISocialState } from "@ax/types";
 
 import { SocialActionsCreators } from "./interfaces";
 
-export const initialState = {
-  instagram: "",
-  linkedIn: "",
-  facebook: "",
-  twitter: "",
-  youTube: "",
-  flicker: "",
-  tiktok: "",
-  snapchat: "",
-  newsletter: "",
-};
+export const initialState = {};
 
 export function reducer(state = initialState, action: SocialActionsCreators): ISocialState {
   switch (action.type) {
-    case SET_FORM:
     case SET_SOCIAL:
-      return { ...state, ...action.payload };
+      return { ...action.payload };
     default:
       return state;
   }

package/src/containers/Sites/actions.tsx

@@ -6,7 +6,6 @@ import {
   SET_FILTER,
   SET_TOTAL_ITEMS,
   SET_CURRENT_SITE_LANGUAGES,
-  SET_UPDATED_FORM,
   SET_SAVED_SITE_INFO,
   DEFAULT_PARAMS,
 } from "./constants";
@@ -17,7 +16,6 @@ import {
   ISetFilter,
   ISetTotalItems,
   ISetCurrentSiteLanguagesAction,
-  ISetUpdatedFormAction,
   ISetSavedSiteInfoAction,
 } from "./interfaces";
 
@@ -61,64 +59,10 @@ function setCurrentSiteLanguages(currentSiteLanguages: any[]): ISetCurrentSiteLa
   return { type: SET_CURRENT_SITE_LANGUAGES, payload: { currentSiteLanguages } };
 }
 
-function setUpdatedForm(form: ISettingsForm): ISetUpdatedFormAction {
-  return { type: SET_UPDATED_FORM, payload: { form } };
-}
-
 function setSavedSiteInfo(savedSiteInfo: ISite): ISetSavedSiteInfoAction {
   return { type: SET_SAVED_SITE_INFO, payload: { savedSiteInfo } };
 }
 
-function updateFormValue(valueObj: any): (dispatch: Dispatch, getState: any) => void {
-  return (dispatch, getState) => {
-    const {
-      sites: { form },
-    } = getState();
-    const updatedForm = { ...form, ...valueObj };
-    dispatch(setUpdatedForm(updatedForm));
-  };
-}
-
-function updateForm(currentSiteInfo: ISite): (dispatch: Dispatch) => void {
-  return (dispatch) => {
-    const { name, path, domain, timezone, theme, favicon, smallAvatar, bigAvatar, thumbnail, defaultLanguage } =
-      currentSiteInfo;
-    const siteSettings = {
-      name,
-      path,
-      domain,
-      timezone,
-      theme,
-      favicon,
-      smallAvatar,
-      bigAvatar,
-      thumbnail,
-      defaultLanguage,
-    };
-
-    dispatch(setUpdatedForm(siteSettings));
-  };
-}
-
-function resetForm(): (dispatch: Dispatch) => void {
-  return (dispatch) => {
-    const form = {
-      name: "",
-      defaultLanguage: null,
-      path: "",
-      domain: null,
-      timezone: "",
-      theme: "",
-      favicon: null,
-      smallAvatar: null,
-      bigAvatar: null,
-      thumbnail: null,
-    };
-
-    dispatch(setUpdatedForm(form));
-  };
-}
-
 // TODO: hay que controlar que cuando da error la API borrar los sites ya guardados y sacar el error (ver los siguientes FIXME)
 function getSites(token: string): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
@@ -138,12 +82,12 @@ function getSites(token: string): (dispatch: Dispatch) => Promise<void> {
   };
 }
 
-function saveSettings(): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function saveSettings(form: ISettingsForm): (dispatch: Dispatch, getState: any) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       dispatch(setIsSaving(true));
       const {
-        sites: { form, currentSiteInfo },
+        sites: { currentSiteInfo },
       } = getState();
 
       const saveResponse = currentSiteInfo
@@ -223,7 +167,6 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
 
       resetSiteValues(dispatch);
       dispatch(setCurrentSiteInfo(currentSiteInfo));
-      updateForm(currentSiteInfo)(dispatch);
 
       // get site languages
       const response: any = await languages.getSiteLanguages(currentSiteInfo.id);
@@ -259,7 +202,6 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
       const socialResponse: any = await social.getSocial(currentSiteInfo.id);
       if (isReqOk(socialResponse.status)) {
         dispatch(socialActions.setSocial(socialResponse.data));
-        dispatch(socialActions.setForm(socialResponse.data));
       } else {
         console.log("Error en sites getSocial"); // FIXME: capturar errores mejor
       }
@@ -419,7 +361,7 @@ function unpublishSite(siteID: number): (dispatch: Dispatch, getState: any) => P
 
 const resetSiteValues = (dispatch: Dispatch) => {
   dispatch(setFilter("unique-pages"));
-  resetDefaultsValues(dispatch);
+  resetDefaultsValues()(dispatch);
   resetPageEditor()(dispatch);
   resetMenuValues(dispatch);
   dispatch(setCurrentSitePages([]));
@@ -524,8 +466,6 @@ export {
   getFilteredContent,
   getSitePages,
   getSiteLanguages,
-  updateFormValue,
-  resetForm,
   deleteSite,
   publishSite,
   unpublishSite,

package/src/containers/Sites/constants.tsx

@@ -6,7 +6,6 @@ export const SET_CURRENT_SITE_PAGES = `${NAME}/SET_CURRENT_SITE_PAGES`;
 export const SET_FILTER: string | null = `${NAME}/SET_FILTER`;
 export const SET_TOTAL_ITEMS: string | null = `${NAME}/SET_TOTAL_ITEMS`;
 export const SET_CURRENT_SITE_LANGUAGES: string | null = `${NAME}/SET_CURRENT_SITE_LANGUAGES`;
-export const SET_UPDATED_FORM = `${NAME}/SET_UPDATED_FORM`;
 export const SET_INITIAL_VALUES = `${NAME}/SET_INITIAL_VALUES`;
 export const SET_SAVED_SITE_INFO = `${NAME}/SET_SAVED_SITE_INFO`;
 

package/src/containers/Sites/interfaces.tsx

@@ -5,7 +5,6 @@ import {
   SET_FILTER,
   SET_TOTAL_ITEMS,
   SET_CURRENT_SITE_LANGUAGES,
-  SET_UPDATED_FORM,
   SET_INITIAL_VALUES,
   SET_SAVED_SITE_INFO,
 } from "./constants";
@@ -46,11 +45,6 @@ export interface ISetCurrentSiteLanguagesAction {
   payload: { currentSiteLanguages: any[] }; // FIXME: establecer type
 }
 
-export interface ISetUpdatedFormAction {
-  type: typeof SET_UPDATED_FORM;
-  payload: { form: any };
-}
-
 export interface ISetInitialValuesAction {
   type: typeof SET_INITIAL_VALUES;
   payload: { initialValues: any };

package/src/containers/Sites/reducer.tsx

@@ -5,12 +5,11 @@ import {
   SET_FILTER,
   SET_TOTAL_ITEMS,
   SET_CURRENT_SITE_LANGUAGES,
-  SET_UPDATED_FORM,
   SET_INITIAL_VALUES,
   SET_SAVED_SITE_INFO,
 } from "./constants";
 
-import { ISite, IPage, ILanguage, ISettingsForm } from "@ax/types";
+import { ISite, IPage, ILanguage } from "@ax/types";
 
 import { SitesActionsCreators } from "./interfaces";
 
@@ -23,8 +22,6 @@ export interface ISitesState {
   totalItems: number;
   currentSiteLanguages: ILanguage[];
   savedSiteInfo: any;
-  form: ISettingsForm;
-  initialValues: ISettingsForm;
 }
 
 export const initialState = {
@@ -36,30 +33,6 @@ export const initialState = {
   totalItems: 0,
   currentSiteLanguages: [],
   savedSiteInfo: null,
-  form: {
-    name: "",
-    defaultLanguage: null,
-    path: "",
-    domain: null,
-    timezone: "",
-    theme: "",
-    favicon: null,
-    smallAvatar: null,
-    bigAvatar: null,
-    thumbnail: null,
-  },
-  initialValues: {
-    name: "",
-    defaultLanguage: null,
-    path: "",
-    domain: null,
-    timezone: "",
-    theme: "",
-    favicon: null,
-    smallAvatar: null,
-    bigAvatar: null,
-    thumbnail: null,
-  },
 };
 
 export function reducer(state = initialState, action: SitesActionsCreators): ISitesState {
@@ -70,7 +43,6 @@ export function reducer(state = initialState, action: SitesActionsCreators): ISi
     case SET_CURRENT_SITE_PAGES:
     case SET_TOTAL_ITEMS:
     case SET_CURRENT_SITE_LANGUAGES:
-    case SET_UPDATED_FORM:
     case SET_INITIAL_VALUES:
     case SET_SAVED_SITE_INFO:
       return { ...state, ...action.payload };

package/src/forms/editor.tsx

@@ -115,6 +115,7 @@ const cleanPageValues = (updatedValues: any, originalValues: any) => {
   delete updatedValues["draft"];
   delete updatedValues["hash"];
   delete updatedValues["editing"];
+  delete updatedValues["pageLanguages"];
 
   delete originalValues["setAsHome"];
   delete originalValues["modified"];
@@ -126,6 +127,7 @@ const cleanPageValues = (updatedValues: any, originalValues: any) => {
   delete originalValues["draft"];
   delete originalValues["hash"];
   delete originalValues["editing"];
+  delete originalValues["pageLanguages"];
 
   return {
     cleanUpdatedValues: updatedValues,

package/src/forms/validators.tsx

@@ -138,6 +138,8 @@ const isEmptyField = (value: any, fieldType: string) => {
       return !value || ((!value.href || value.href.trim().length === 0) && !value.linkTo);
     case "AsyncCheckGroup":
     case "CheckGroup":
+    case "ComponentArray":
+    case "ArrayFieldGroup":
       return !value || !value.length;
     default:
       return typeof value === "string" && value.trim().length === 0;

package/src/helpers/dates.tsx

@@ -1,13 +1,13 @@
 import { format, formatDistanceToNowStrict, addMinutes, isValid, parse } from "date-fns";
 
-const formatString = "yyyy/MM/dd";
+const formatString = "dd/MM/yyyy";
 
-const dateToString = (date: Date) : string => format(new Date(date), formatString);
+const dateToString = (date: Date): string => format(new Date(date), formatString);
 const stringToDate = (value: string): Date => parse(value, formatString, new Date());
 
-const isValidDate = (value: string) : boolean => {
+const isValidDate = (value: string): boolean => {
   // eslint-disable-next-line
-  const regEx = /^[0-9]{4}[\/][0-9]{2}[\/][0-9]{2}$/g;
+  const regEx = /^[0-9]{2}[\/][0-9]{2}[\/][0-9]{4}$/g;
   if (regEx.test(value)) {
     const date = stringToDate(value);
     return isValid(date);
@@ -17,12 +17,12 @@ const isValidDate = (value: string) : boolean => {
 
 const getRange = (value: string) => value.split(" ").join("").trim().split("-");
 
-const isValidDateRange = (value: string) : boolean => {
+const isValidDateRange = (value: string): boolean => {
   const range = getRange(value);
   return isValidDate(range[0]) && isValidDate(range[1]);
 };
 
-const getDateRange = (value: string): {start: Date; end: Date | null} => {
+const getDateRange = (value: string): { start: Date; end: Date | null } => {
   const range = getRange(value);
 
   const startDate = range[0];
@@ -33,46 +33,45 @@ const getDateRange = (value: string): {start: Date; end: Date | null} => {
 
   return {
     start: rangeStartDate,
-    end: rangeEndDate ? rangeEndDate : rangeStartDate
+    end: rangeEndDate ? rangeEndDate : rangeStartDate,
   };
 };
 
-const areEqualDates = (date1: Date, date2: Date) : boolean => dateToString(date1) === dateToString(date2);
+const areEqualDates = (date1: Date, date2: Date): boolean => dateToString(date1) === dateToString(date2);
 
-const getStringifyDateRange = (start: Date, end: Date) : string => {
+const getStringifyDateRange = (start: Date, end: Date): string => {
   const equalRangeDates = areEqualDates(start, end);
 
   const stringifyDates = {
     start: start ? dateToString(start) : "",
-    end: end ? dateToString(end) : ""
+    end: end ? dateToString(end) : "",
   };
 
-  return end && !equalRangeDates
-  ? `${stringifyDates.start} - ${stringifyDates.end}`
-  : stringifyDates.start;
-}
+  return end && !equalRangeDates ? `${stringifyDates.start} - ${stringifyDates.end}` : stringifyDates.start;
+};
 
-const getHumanLastModifiedDate = (modified: Date) : string => {
+const getHumanLastModifiedDate = (modified: Date): string => {
   const now = new Date();
   const date = new Date(modified);
   const dateWithTimezone = addMinutes(date, date.getTimezoneOffset());
 
   const oneDay = 60 * 60 * 24 * 1000;
-  const isMoreThan24Hours = (now.getTime() - dateWithTimezone.getTime()) > oneDay;
+  const isMoreThan24Hours = now.getTime() - dateWithTimezone.getTime() > oneDay;
 
-  return isMoreThan24Hours ? format(dateWithTimezone,"d MMM HH:mm") :
-    formatDistanceToNowStrict(dateWithTimezone, { addSuffix: true });
-}
+  return isMoreThan24Hours
+    ? format(dateWithTimezone, "d MMM HH:mm")
+    : formatDistanceToNowStrict(dateWithTimezone, { addSuffix: true });
+};
 
-const getFormattedDateWithTimezone = (date: Date, formatString: string) : string => {
+const getFormattedDateWithTimezone = (date: Date, formatString: string): string => {
   const objDate = new Date(date);
   return format(addMinutes(objDate, objDate.getTimezoneOffset()), formatString);
-}
+};
 
-const getDaysAgo = (date: Date) : string => {
+const getDaysAgo = (date: Date): string => {
   const dateObj = new Date(date);
   return formatDistanceToNowStrict(dateObj, { addSuffix: true });
-}
+};
 
 export {
   dateToString,
@@ -84,5 +83,5 @@ export {
   getStringifyDateRange,
   getHumanLastModifiedDate,
   getFormattedDateWithTimezone,
-  getDaysAgo
+  getDaysAgo,
 };

package/src/helpers/index.tsx

@@ -29,6 +29,7 @@ import {
   sortBy,
   getNullValue,
   removeEditorIds,
+  trimObject,
 } from "./objects";
 
 import {
@@ -97,6 +98,7 @@ export {
   resetMultipleValues,
   getNullValue,
   removeEditorIds,
+  trimObject,
   filterDuplicatedValues,
   areEquals,
   removeMenuEditorIds,

package/src/helpers/objects.tsx

@@ -2,7 +2,7 @@ import { IMenuItem } from "@ax/types";
 
 const isEmptyObj = (obj: any) => {
   for (const key in obj) {
-    if (obj.hasOwnProperty(key)) return false;
+    if (Object.prototype.hasOwnProperty.call(obj, key)) return false;
   }
   return true;
 };
@@ -19,7 +19,9 @@ const resetMultipleValues = (containerValue: any) => {
       const nullOptionKeys =
         typeof optionValue === "object" &&
         Object.keys(optionValue)
-          .filter((key: string) => key === "component" || key === "editorID" || key === "id")
+          .filter(
+            (key: string) => key === "component" || key === "editorID" || key === "id" || key === "parentEditorID"
+          )
           .map((cleanKey: string) => ({ [cleanKey]: optionValue[cleanKey] }))
           .reduce((accumulator, currValue) => {
             return {
@@ -89,6 +91,18 @@ const removeEditorIds = (editorContent: any) => {
   return cleanEditorContent;
 };
 
+const trimObject = (obj: any) => {
+  Object.keys(obj).forEach(function (key) {
+    if (typeof obj[key] === "string") {
+      obj[key] = obj[key].trim();
+    }
+    if (obj[key] && typeof obj[key] === "object") {
+      obj[key] = trimObject(obj[key]);
+    }
+  });
+  return obj;
+};
+
 export {
   isEmptyObj,
   deepClone,
@@ -100,4 +114,5 @@ export {
   sortBy,
   getNullValue,
   removeEditorIds,
+  trimObject,
 };

package/src/helpers/schemas.tsx

@@ -1,10 +1,13 @@
 import { schemas, moduleCategories } from "components";
 import { sortBy } from "@ax/helpers";
 import { ModuleCategoryInfo } from "@ax/types";
+import { pageSchemas } from "@ax/schemas";
 
-const getSchema = (name: string) => schemas.all[name];
-const getDefaultSchema = (name: string) => schemas.all[name].default;
-const getSchemaThumbnails = (name: string) => schemas.all[name].thumbnails;
+const allSChemas = { ...schemas.all, ...pageSchemas };
+
+const getSchema = (name: string) => allSChemas[name];
+const getDefaultSchema = (name: string) => allSChemas[name].default;
+const getSchemaThumbnails = (name: string) => allSChemas[name].thumbnails;
 const getTemplate = (name: string) => schemas.templates[name];
 const getDefaultTemplate = (name: string) => schemas.templates[name].default;
 const getTemplateThumbnails = (name: string) => schemas.templates[name] && schemas.templates[name].thumbnails;
@@ -29,7 +32,7 @@ const getTemplateDisplayName = (template: string) => {
 };
 
 const filterByCategory = (options: any, category: string) =>
-  options.filter((option: any) => schemas.all[option].category === category);
+  options.filter((option: any) => allSChemas[option].category === category);
 
 const getModuleCategories = (moduleList: string[]): ModuleCategoryInfo[] => {
   const categories: string[] = [];