@griddo/ax 11.9.11 → 11.9.12

package/package.json

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

package/src/components/Fields/ComponentContainer/index.tsx

@@ -132,11 +132,11 @@ const ComponentContainer = (props: IComponentContainerProps): JSX.Element => {
   const actionMenuIcon = "more";
 
   const handleEmptyContainerClick = () => {
-    if (addComponentAction) addComponentAction(value);
+    if (addComponentAction) addComponentAction(value, objKey);
   };
 
   const handleOptionClick = (option: any) => {
-    if (addComponentAction) addComponentAction(option);
+    if (addComponentAction) addComponentAction(option, objKey);
   };
 
   const compoundKey = parentKey ? `${parentKey}.${objKey}` : objKey;

package/src/containers/PageEditor/actions.tsx

@@ -735,11 +735,13 @@ function addComponent(
         localStorage.setItem("selectedID", `${lastElementEditorID}`);
       }
     } else {
-      lastElementEditorID = addElementToCollection(type as string, key, dispatch, getState);
+      lastElementEditorID = addElementToCollection(type, key, dispatch, getState);
     }
 
-    dispatch(setLastElementAddedId(lastElementEditorID));
-    localStorage.setItem("selectedID", `${lastElementEditorID}`);
+    if (lastElementEditorID) {
+      dispatch(setLastElementAddedId(lastElementEditorID));
+      localStorage.setItem("selectedID", `${lastElementEditorID}`);
+    }
   };
 }
 

package/src/containers/PageEditor/utils.tsx

@@ -1,7 +1,7 @@
-import { IIntegration, IRootState, ISavePageParams } from "@ax/types";
-import { cleanContent, updateElementCollection } from "@ax/forms";
+import { IComponent, IIntegration, IRootState, ISavePageParams } from "@ax/types";
+import { addElement, cleanContent, updateElementCollection } from "@ax/forms";
 import { Dispatch } from "redux";
-import { generatePageContent } from "./actions";
+import { generatePageContent, setSelectedContent } from "./actions";
 
 const getPageParams = (getState: any): ISavePageParams => {
   const {
@@ -125,16 +125,42 @@ const getDefaultPageNavigation = (defaultsContent: any, type: string) => {
   return navitagion;
 };
 
-const addElementToCollection = (type: string, key: string, dispatch: Dispatch, getState: () => IRootState) => {
+const addElementToComponent = (component: Record<string, any>, type: IComponent) => {
+  const element = addElement(type);
+  Object.keys(component).forEach((key: string) => {
+    const containedValue = component[key];
+    if (containedValue.editorID === type.editorID) {
+      component[key] = element;
+    }
+  });
+  return component;
+};
+
+const addElementToCollection = (
+  type: string | IComponent,
+  key: string,
+  dispatch: Dispatch,
+  getState: () => IRootState
+) => {
+  const isSimpleField = typeof type === "string";
   const { editorContent } = getStateValues(getState);
-  const updatedComponent = updateElementCollection(type, editorContent.template[key]);
+
+  const updatedComponent = isSimpleField
+    ? updateElementCollection(type, editorContent.template[key])
+    : addElementToComponent(editorContent.template[key], type);
+
   const updatedPageContent = { ...editorContent, template: { ...editorContent.template, [key]: updatedComponent } };
+
   generatePageContent(updatedPageContent)(dispatch, getState);
 
-  const { editorContent: generatedEditor } = getStateValues(getState);
-  const generatedElement = generatedEditor.template[key];
-  const lastModuleEditorID = generatedElement[generatedElement.length - 1].editorID as number;
-  return lastModuleEditorID;
+  if (isSimpleField) {
+    const { editorContent: generatedEditor } = getStateValues(getState);
+    const generatedElement = generatedEditor.template[key];
+    const lastModuleEditorID = generatedElement[generatedElement.length - 1].editorID as number;
+    return lastModuleEditorID;
+  } else {
+    setSelectedContent(type.editorID)(dispatch, getState);
+  }
 };
 
 export {

package/src/forms/elements.tsx

@@ -12,6 +12,7 @@ const addElement = (componentType: IComponent) => {
   for (const key in defaultSchema) {
     componentType[key] = defaultSchema[key];
   }
+  return componentType;
 };
 
 const updateComponent = (component: any, schema: any) => {
@@ -258,4 +259,5 @@ export {
   deleteComponent,
   replaceElements,
   updateElementCollection,
+  addElement,
 };

package/src/forms/index.tsx

@@ -25,6 +25,7 @@ import {
   deleteComponent,
   replaceElements,
   updateElementCollection,
+  addElement,
 } from "./elements";
 import { getInnerFields, getStructuredDataInnerFields } from "./fields";
 import {
@@ -71,4 +72,5 @@ export {
   evaluateComputedFields,
   findByComponent,
   updateElementCollection,
+  addElement,
 };