@griddo/ax 11.9.6 → 11.9.7-rc.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "11.9.6",
+  "version": "11.9.7-rc.1",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -225,5 +225,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44905e1f1a7ff4c73244543b51c02110524de892"
+  "gitHead": "e2ee7aff8a992dc64b94c9aaf22734bae96140aa"
 }

package/src/components/ConfigPanel/Form/ConnectedField/NavConnectedField/index.tsx

@@ -31,13 +31,14 @@ const NavConnectedField = (props: any): JSX.Element => {
     tab,
   } = props;
 
-  const updateValue = (key: string, value: any) => {
+  const updateValue = (key: string, value: any, templateID?: number) => {
     const isMenu = field.entity && field.entity === "menu_containers";
+    const editorID = templateID ? templateID : selectedEditorID;
     if (isMenu) {
       const menu = menus.find((menu: any) => menu.id === value);
       updateEditorContent(selectedEditorID, key, menu);
     } else {
-      updateEditorContent(selectedEditorID, key, value);
+      updateEditorContent(editorID, key, value);
     }
   };
 
@@ -85,6 +86,9 @@ const NavConnectedField = (props: any): JSX.Element => {
       return !isHidden;
     });
 
+    const templateContent = selectedContent.template;
+    const handleUpdate = (fieldKey: string, value: any) => updateValue(fieldKey, value, templateContent.editorID);
+
     return (
       <>
         {templateFields.map((formField) => {
@@ -95,9 +99,9 @@ const NavConnectedField = (props: any): JSX.Element => {
               key={key}
               objKey={key}
               field={formField}
-              selectedContent={selectedContent}
+              selectedContent={templateContent}
               goTo={goTo}
-              updateValue={updateValue}
+              updateValue={handleUpdate}
               pages={pages}
               actions={actions}
               site={site}

package/src/containers/Navigation/Defaults/actions.tsx

@@ -20,6 +20,7 @@ import {
   getNullValue,
   getDefaultNavigationModules,
   getImageFromHtml,
+  protectFormKeys,
 } from "@ax/helpers";
 import {
   findByEditorID,
@@ -800,15 +801,24 @@ function updateEditorContent(
       navigation: { selectedContent, editorContent },
     } = getState();
 
+    const isFormPage = selectedContent.component === "FormPage";
     const clonedSelected = deepClone(selectedContent);
     const clonedEditor = deepClone(editorContent);
 
+    if (isFormPage) {
+      protectFormKeys(clonedEditor, key, selectedEditorID);
+    }
+
     const updatedSelectedContent = updateByEditorID(clonedSelected, selectedEditorID, key, value);
     const updatedEditorContent = updateByEditorID(clonedEditor, selectedEditorID, key, value);
     dispatch(setSelectedDefaultContent(updatedSelectedContent));
     dispatch(setEditorContent(updatedEditorContent));
 
-    generateContent(updatedEditorContent)(dispatch, getState);
+    const isObjectValue = value !== null && typeof value === "object";
+
+    if (isObjectValue) {
+      generateContent(updatedEditorContent)(dispatch, getState);
+    }
   };
 }
 

package/src/containers/PageEditor/actions.tsx

@@ -10,6 +10,7 @@ import {
   getCurrentPageStructuredData,
   getNullValue,
   handleRequest,
+  protectFormKeys,
 } from "@ax/helpers";
 import {
   getUpdatedComponents,
@@ -44,7 +45,6 @@ import {
   getPageData,
   getPageNavigation,
   getStateValues,
-  protectFormKeys,
   addElementToCollection,
 } from "./utils";
 import {
@@ -1095,12 +1095,8 @@ function updateEditorContent(
     const clonedContent = deepClone(editorContent);
     const clonedSelected = deepClone(selectedContent);
 
-    if (clonedSelected.component === "FormPage") {
-      if (Array.isArray(key)) {
-        key.forEach((k) => protectFormKeys(clonedContent, k));
-      } else {
-        protectFormKeys(clonedContent, key);
-      }
+    if (clonedSelected.component === "FormPage" && !Array.isArray(key)) {
+      protectFormKeys(clonedContent, key, selectedEditorID);
     }
 
     const updatedSelectedContent = updateByEditorID(clonedSelected, selectedEditorID, key, value);

package/src/containers/PageEditor/utils.tsx

@@ -1,5 +1,5 @@
 import { IIntegration, IRootState, ISavePageParams } from "@ax/types";
-import { cleanContent, findByComponent, updateElementCollection } from "@ax/forms";
+import { cleanContent, updateElementCollection } from "@ax/forms";
 import { Dispatch } from "redux";
 import { generatePageContent } from "./actions";
 
@@ -125,18 +125,6 @@ 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;
-};
-
 const addElementToCollection = (type: string, key: string, dispatch: Dispatch, getState: () => IRootState) => {
   const { editorContent } = getStateValues(getState);
   const updatedComponent = updateElementCollection(type, editorContent.template[key]);
@@ -156,6 +144,5 @@ export {
   getPageNavigation,
   getDefaultIntegrations,
   getDefaultPageNavigation,
-  protectFormKeys,
   addElementToCollection,
 };

package/src/helpers/forms.tsx

@@ -0,0 +1,18 @@
+import { findByEditorID } from "@ax/forms";
+
+const protectFormKeys = (content: any, key: string, editorID: number) => {
+  const { parent: formComponent } = findByEditorID(content, editorID);
+  if (!formComponent) return;
+
+  if (!Array.isArray(formComponent.protectedKeys)) {
+    formComponent.protectedKeys = [];
+  }
+
+  if (!formComponent.protectedKeys.includes(key)) {
+    formComponent.protectedKeys.push(key);
+  }
+
+  return formComponent;
+};
+
+export { protectFormKeys };

package/src/helpers/index.tsx

@@ -124,6 +124,8 @@ import { getFileIcon, getNewBreadcrumb, updatePropertyById } from "./files";
 
 import { getMaxColumns, updateColumns } from "./customColumns";
 
+import { protectFormKeys } from "./forms";
+
 export {
   isComponentEmpty,
   setAsContainedComponent,
@@ -233,4 +235,5 @@ export {
   findObjectValue,
   removeDuplicatesByProperty,
   delay,
+  protectFormKeys,
 };