@griddo/ax 11.2.12 → 11.3.0

package/src/containers/PageEditor/actions.tsx

@@ -44,6 +44,7 @@ import {
   getPageData,
   getPageNavigation,
   getStateValues,
+  protectFormKeys,
 } from "./utils";
 import {
   SET_BREADCRUMB,
@@ -85,6 +86,7 @@ import {
   IComponent,
   IModule,
   IRootState,
+  IGetSitePagesParams,
 } from "@ax/types";
 import {
   ISetBreadcrumb,
@@ -266,7 +268,7 @@ const setRootEditorID = (dispatch: Dispatch) => {
   dispatch(setSelectedEditorID(rootEditorID));
 };
 
-function generateNewPage(dispatch: Dispatch, getState: any, baseSchema: string) {
+function generateNewPage(dispatch: Dispatch, getState: () => IRootState, baseSchema: string) {
   const {
     structuredData: {
       structuredData: { site },
@@ -307,13 +309,13 @@ function generateNewPage(dispatch: Dispatch, getState: any, baseSchema: string)
 }
 
 // API RELATED ACTIONS
-function getPageBreadcrumb(pageId: number): (dispatch: Dispatch, getState: any) => Promise<void> {
+function getPageBreadcrumb(pageId: number): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const { selectedEditorID } = getState().pageEditor;
 
       const response: { status: number; data: any } = await pages.getPageBreadcrumb(pageId);
-      if (isReqOk(response.status)) {
+      if (isReqOk(response.status) && selectedEditorID) {
         const { breadcrumb, path } = response.data;
 
         updateEditorContent(selectedEditorID, "breadcrumb", breadcrumb)(dispatch, getState);
@@ -325,7 +327,7 @@ function getPageBreadcrumb(pageId: number): (dispatch: Dispatch, getState: any)
   };
 }
 
-function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getState: any) => Promise<void> {
+function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       dispatch(setIsLoading(true));
@@ -387,7 +389,7 @@ function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getSta
   };
 }
 
-function getTemplatePage(template: string): (dispatch: Dispatch, getState: any) => Promise<void> {
+function getTemplatePage(template: string): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       dispatch(setIsLoading(true));
@@ -473,7 +475,8 @@ function savePage(
         const { pageContent } = generateEditorIDs({ ...mappedData, header, footer });
 
         const isGlobalPage = saveResponse.data.component === "GlobalPage";
-        !isGlobalPage && (await getPageLanguages(pageID, currentSiteInfo.id, saveResponse.data.entity)(dispatch));
+        !isGlobalPage &&
+          (await getPageLanguages(pageID, currentSiteInfo?.id || null, saveResponse.data.entity)(dispatch));
 
         if (publishPage) {
           await pages.setPageStatus(publishPage.status, [pageID]);
@@ -510,7 +513,7 @@ function savePage(
   };
 }
 
-function deletePage(params?: ISavePageParams): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function deletePage(params?: ISavePageParams): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const page = getPageData(getState, true, params);
@@ -583,7 +586,7 @@ function updatePageStatus(
   ids: number[],
   status: string,
   updatedFromList?: boolean
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       dispatch(setIsSaving(true));
@@ -599,7 +602,7 @@ function updatePageStatus(
 
       const pagesWithErrors: number[] = [];
       if (status === pageStatus.UPLOAD_PENDING && updatedFromList && !skipReviewOnPublish && ids.length > 1) {
-        const getPagesParams = {
+        const getPagesParams: IGetSitePagesParams = {
           siteID: currentSiteInfo ? currentSiteInfo.id : "global",
           filterPages: ids,
           deleted: false,
@@ -637,7 +640,11 @@ function updatePageStatus(
   };
 }
 
-function getPageLanguages(pageID: number, siteID: number | null, entity?: string): (dispatch: any) => Promise<void> {
+function getPageLanguages(
+  pageID: number,
+  siteID: number | null,
+  entity?: string
+): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
       const response: any = await pages.getPageLanguages(pageID, siteID, entity);
@@ -690,7 +697,10 @@ function addTemplate(template: string): (dispatch: Dispatch) => Promise<void> {
   };
 }
 
-function addComponent(type: IComponent | string, key: string): (dispatch: Dispatch, getState: any) => void {
+function addComponent(
+  type: IComponent | string,
+  key: string
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const { editorContent, sections, editorID } = getStateValues(getState);
     const component = {
@@ -727,7 +737,7 @@ function addModule(
   key: string,
   selectedID: number,
   isComponentModule?: boolean
-): (dispatch: Dispatch, getState: any) => void {
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const { editorContent, sections, editorID } = getStateValues(getState);
 
@@ -773,7 +783,11 @@ function addModule(
   };
 }
 
-function replaceModule(module: any, parent: any, objKey: string): (dispatch: Dispatch, getState: any) => void {
+function replaceModule(
+  module: any,
+  parent: any,
+  objKey: string
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return async (dispatch, getState) => {
     const { editorContent } = getStateValues(getState);
 
@@ -801,7 +815,7 @@ function replaceModule(module: any, parent: any, objKey: string): (dispatch: Dis
 function replaceElementsInCollection(
   newValue: string,
   reference?: string
-): (dispatch: Dispatch, getState: any) => void {
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return async (dispatch, getState) => {
     const { selectedContent } = getStateValues(getState);
 
@@ -815,7 +829,7 @@ function replaceElementsInCollection(
   };
 }
 
-function deleteModule(editorID: number[], key?: string): (dispatch: Dispatch, getState: any) => void {
+function deleteModule(editorID: number[], key?: string): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const { sections, editorContent, errors } = getStateValues(getState);
 
@@ -845,7 +859,7 @@ function deleteModule(editorID: number[], key?: string): (dispatch: Dispatch, ge
   };
 }
 
-function duplicateModule(editorID: number[], key?: string): (dispatch: Dispatch, getState: any) => number {
+function duplicateModule(editorID: number[], key?: string): (dispatch: Dispatch, getState: () => IRootState) => number {
   return (dispatch, getState) => {
     const { sections, editorContent } = getStateValues(getState);
 
@@ -891,7 +905,7 @@ function duplicateModule(editorID: number[], key?: string): (dispatch: Dispatch,
   };
 }
 
-function copyModule(editorID: number[]): (dispatch: Dispatch, getState: any) => boolean | number {
+function copyModule(editorID: number[]): (dispatch: Dispatch, getState: () => IRootState) => boolean | number {
   return (dispatch, getState) => {
     const { sections } = getStateValues(getState);
     const modulesToCopy: Record<string, unknown>[] = [];
@@ -924,7 +938,7 @@ function pasteModule(
   editorID: number,
   key: string,
   modulesToPaste: IModule[]
-): (dispatch: Dispatch, getState: any) => Promise<{ error?: INotification }> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<{ error?: INotification }> {
   return async (dispatch, getState) => {
     const {
       sites: { currentSiteInfo },
@@ -989,7 +1003,7 @@ function pasteModule(
   };
 }
 
-function overwriteHeaderConfig(params: IFieldProps): (dispatch: Dispatch, getState: any) => void {
+function overwriteHeaderConfig(params: IFieldProps): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       pageEditor: { editorContent: content },
@@ -1032,7 +1046,7 @@ function generatePageContent(editorContent: IPage): (dispatch: Dispatch, getStat
     const { element: selectedContent, parent: selectedParent } = findByEditorID({ pageContent }, selectedEditorID);
     const { component } = selectedContent;
     const schema = getSchema(component);
-
+    if (!schema) return;
     dispatch(setSchema(schema));
     dispatch(setEditorContent(pageContent));
     dispatch(updateBreadcrumb(selectedEditorID));
@@ -1047,7 +1061,7 @@ function updateEditorContent(
   selectedEditorID: number,
   key: string,
   value: any
-): (dispatch: Dispatch, getState: any) => void {
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       pageEditor: { editorContent, selectedContent, lastTimeout },
@@ -1055,6 +1069,10 @@ function updateEditorContent(
 
     const clonedContent = deepClone(editorContent);
 
+    if (selectedContent.component === "FormPage") {
+      protectFormKeys(clonedContent, key);
+    }
+
     const updatedSelectedContent = updateByEditorID(selectedContent, selectedEditorID, key, value);
     let updatedEditorContent = updateByEditorID(clonedContent, selectedEditorID, key, value);
 
@@ -1079,7 +1097,7 @@ function updateEditorContent(
   };
 }
 
-function setSelectedContent(editorID: number): (dispatch: Dispatch, getState: any) => Promise<void> {
+function setSelectedContent(editorID: number): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     /*
       We set selectedID in localStorage to have it retrieved
@@ -1119,6 +1137,7 @@ function setSelectedContent(editorID: number): (dispatch: Dispatch, getState: an
     isUpdatedComponent && updateComponent(selectedContent, defaultSchema);
 
     const schema = getSchema(component);
+    if (!schema) return;
     const defaultTab = "content";
     dispatch(setTab(tab || defaultTab));
     dispatch(setSchema(schema));
@@ -1179,7 +1198,7 @@ function moveElement(
   content: any,
   newIndex: number,
   key: string
-): (dispatch: Dispatch, getState: any) => void {
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return async (dispatch, getState) => {
     try {
       const { editorContent, editorID, selectedContent } = getStateValues(getState);
@@ -1202,7 +1221,7 @@ function moveElement(
   };
 }
 
-function getTemplateConfig(template: string): (dispatch: Dispatch, getState: any) => Promise<void> {
+function getTemplateConfig(template: string): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -1223,7 +1242,7 @@ function getTemplateConfig(template: string): (dispatch: Dispatch, getState: any
   };
 }
 
-function validatePage(publish?: boolean): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function validatePage(publish?: boolean): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const { editorContent } = getStateValues(getState);
@@ -1243,7 +1262,7 @@ function validatePage(publish?: boolean): (dispatch: Dispatch, getState: any) =>
 
       const responseActions = {
         handleSuccess: (data: any) => {
-          const apiErrors = parseValidationErrors(data, content);
+          const apiErrors: IErrorItem[] = parseValidationErrors(data, content);
           errors = [...errors, ...apiErrors];
         },
         handleError: () => console.log("Error en page check"),
@@ -1285,7 +1304,7 @@ function validatePage(publish?: boolean): (dispatch: Dispatch, getState: any) =>
   };
 }
 
-function deleteError(error: IErrorItem): (dispatch: Dispatch, getState: any) => void {
+function deleteError(error: IErrorItem): (dispatch: Dispatch, getState: () => IRootState) => void {
   return async (dispatch, getState) => {
     try {
       const { errors } = getState().pageEditor;
@@ -1321,7 +1340,7 @@ function getGlobalFromLocalPage(): (dispatch: Dispatch, getState: any) => Promis
   };
 }
 
-function sendPagePing(pageID: number): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function sendPagePing(pageID: number): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -1348,7 +1367,7 @@ function sendPagePing(pageID: number): (dispatch: Dispatch, getState: any) => Pr
   };
 }
 
-function discardDraft(): (dispatch: Dispatch, getState: any) => Promise<void> {
+function discardDraft(): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const page = getPageData(getState, true);
@@ -1369,7 +1388,7 @@ function discardDraft(): (dispatch: Dispatch, getState: any) => Promise<void> {
   };
 }
 
-function removeNavigationFromPage(key: string): (dispatch: Dispatch, getState: any) => void {
+function removeNavigationFromPage(key: string): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       pageEditor: { editorContent },
@@ -1380,7 +1399,7 @@ function removeNavigationFromPage(key: string): (dispatch: Dispatch, getState: a
   };
 }
 
-function restorePageNavigation(key: string): (dispatch: Dispatch, getState: any) => void {
+function restorePageNavigation(key: string): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       pageEditor: { editorContent },
@@ -1406,7 +1425,7 @@ function restorePageNavigation(key: string): (dispatch: Dispatch, getState: any)
   };
 }
 
-function getPageSummary(): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function getPageSummary(): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -1433,7 +1452,7 @@ function getPageSummary(): (dispatch: Dispatch, getState: any) => Promise<boolea
   };
 }
 
-function getPageTranslation(langID: number): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function getPageTranslation(langID: number): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -1473,7 +1492,7 @@ function setIsTranslated(isTranslated: boolean): (dispatch: Dispatch) => Promise
 function schedulePublication(
   date: string | null,
   isDraft: boolean
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {

package/src/containers/PageEditor/reducer.tsx

@@ -33,7 +33,7 @@ export interface IPageEditorState {
   template: string;
   breadcrumb: IBreadcrumbItem[];
   schema: ISchema | Record<string, unknown>;
-  selectedContent: IPage | Record<string, unknown>;
+  selectedContent: any;
   tab: string;
   selectedEditorID: number | undefined;
   currentPageID: number | null;

package/src/containers/PageEditor/utils.tsx

@@ -1,5 +1,5 @@
 import { IIntegration, ISavePageParams } from "@ax/types";
-import { cleanContent } from "@ax/forms";
+import { cleanContent, findByComponent } from "@ax/forms";
 
 const getPageParams = (getState: any): ISavePageParams => {
   const {
@@ -77,19 +77,19 @@ const getPageNavigation = (
     headerID === 0
       ? headerID
       : headerID === undefined || headerID === null
-      ? headerDefault
-      : headers.find((content: any) =>
-          content.navigationLanguages.some((navLang: any) => navLang.navigationId === headerID)
-        ) || headerDefault;
+        ? headerDefault
+        : headers.find((content: any) =>
+            content.navigationLanguages.some((navLang: any) => navLang.navigationId === headerID)
+          ) || headerDefault;
 
   const footer =
     footerID === 0
       ? footerID
       : footerID === undefined || footerID === null
-      ? footerDefault
-      : footers.find((content: any) =>
-          content.navigationLanguages.some((navLang: any) => navLang.navigationId === footerID)
-        ) || footerDefault;
+        ? footerDefault
+        : footers.find((content: any) =>
+            content.navigationLanguages.some((navLang: any) => navLang.navigationId === footerID)
+          ) || footerDefault;
 
   return { header, footer };
 };
@@ -123,6 +123,18 @@ const getDefaultPageNavigation = (defaultsContent: any, type: string) => {
   return navitagion;
 };
 
+const protectFormKeys = (content: any, key: string) => {
+  const formComponent = findByComponent(content, "FormPage");
+  if (!formComponent) return;
+
+  const protectedKeys = formComponent.protectedKeys || [];
+  if (!protectedKeys.includes(key)) {
+    formComponent.protectedKeys = [...protectedKeys, key];
+  }
+
+  return content;
+};
+
 export {
   getPageParams,
   getPageData,
@@ -130,4 +142,5 @@ export {
   getPageNavigation,
   getDefaultIntegrations,
   getDefaultPageNavigation,
+  protectFormKeys,
 };

package/src/forms/editor.tsx

@@ -169,10 +169,13 @@ const getParentKey = (parentModule: any, editorID: number) => {
 };
 
 const checkMaxModules = (content: any, type: string): { isMaxModules: boolean; errorMessage?: string } => {
-  const { maxModulesPerPage } = getSchema(type);
+  const schema = getSchema(type);
+  const { maxModulesPerPage } = schema || {};
   const queue: any[] = [content];
   let counter = 0;
 
+  if (maxModulesPerPage === undefined) return { isMaxModules: false };
+
   while (queue.length > 0 && counter < maxModulesPerPage) {
     const obj = queue.shift();
     const currentObj = obj;
@@ -219,6 +222,21 @@ const evaluateComputedFields = async (page: IPage, operation: "save" | "refresh"
   return updatedPage;
 };
 
+function findByComponent(obj: any, componentName: string) {
+  if (typeof obj !== "object" || obj === null) return null;
+
+  if (obj.component === componentName) return obj;
+
+  for (const key in obj) {
+    if (typeof obj[key] === "object") {
+      const found: any = findByComponent(obj[key], componentName);
+      if (found) return found;
+    }
+  }
+
+  return null;
+}
+
 export {
   parseData,
   cleanContent,
@@ -234,4 +252,5 @@ export {
   getParentKey,
   checkMaxModules,
   evaluateComputedFields,
+  findByComponent,
 };

package/src/forms/elements.tsx

@@ -145,7 +145,10 @@ const updateByEditorID = (content: any, editorID: number, contentKey: string, va
     } else {
       content[parentKey] = value;
     }
+
+    return content;
   }
+
   for (const key in content) {
     if (Object.prototype.hasOwnProperty.call(content, key)) {
       content[key] = updateByEditorID(content[key], editorID, contentKey, value);

package/src/forms/index.tsx

@@ -12,6 +12,7 @@ import {
   getParentKey,
   checkMaxModules,
   evaluateComputedFields,
+  findByComponent,
 } from "./editor";
 import {
   getUpdatedComponents,
@@ -67,4 +68,5 @@ export {
   parseValidationErrors,
   checkMaxModules,
   evaluateComputedFields,
+  findByComponent,
 };