@griddo/ax 1.51.1 → 1.51.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.51.1",
+  "version": "1.51.2",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -232,5 +232,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "db3b9481ca1ef33aad641cf6b693356055e9dedc"
+  "gitHead": "137fb5810ec6523db7745a43f77e47484611441b"
 }

package/src/components/Fields/ComponentArray/MixableComponentArray/index.tsx

@@ -4,7 +4,7 @@ import { IModule } from "@ax/types";
 import { ComponentContainer } from "@ax/components";
 
 import AddItemButton from "./AddItemButton";
-import { getComponentProps, containerToComponentArray } from "../helpers";
+import { getComponentProps, containerToComponentArray, getTypefromKey } from "../helpers";
 
 import * as S from "./style";
 
@@ -21,8 +21,13 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
     maxItems,
     disabled,
     activatedModules,
+    objKey,
+    field,
   } = props;
 
+  const type = getTypefromKey(objKey);
+  const { contentType = type } = field;
+
   let addModuleAction: any;
   let addComponentAction: any;
 
@@ -38,14 +43,12 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
     return fixedValue.length > 1 ? `#${index + 1} ${name}` : name;
   };
 
-  const { elements, componentModules } = selectedContent;
-
-  const isComponentModule = !!componentModules;
-  const isModuleArr = !elements && !isComponentModule;
+  const isComponentModule = contentType === "components";
+  const isModuleArr = contentType === "modules";
 
   const handleAddModule = (moduleType: string) => addModuleAction(moduleType, editorID, isComponentModule);
 
-  const handleAddComponent = (componentType: string) => addComponentAction && addComponentAction(componentType);
+  const handleAddComponent = (componentType: string) => addComponentAction && addComponentAction(componentType, objKey);
 
   const handleAdd = isModuleArr ? handleAddModule : handleAddComponent;
 
@@ -90,6 +93,7 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
               selectedContent={selectedContent}
               disabled={disabled}
               canDuplicate={showAddItemButton && !isModuleDeactivated}
+              parentKey={objKey}
             />
           );
         })}
@@ -109,6 +113,8 @@ export interface IMixableComponentArrayProps {
   categories?: any;
   disabled?: boolean;
   activatedModules: string[];
+  objKey: string;
+  field: any;
 }
 
 export default MixableComponentArray;

package/src/components/Fields/ComponentArray/SameComponentArray/index.tsx

@@ -4,7 +4,7 @@ import { IModule } from "@ax/types";
 import { ComponentContainer } from "@ax/components";
 
 import AddItemButton from "./AddItemButton";
-import { getComponentProps } from "../helpers";
+import { getComponentProps, getTypefromKey } from "../helpers";
 
 import * as S from "./style";
 
@@ -21,8 +21,13 @@ const SameComponentArray = (props: ISameComponentArrayProps): JSX.Element => {
     maxItems,
     disabled,
     activatedModules,
+    objKey,
+    field,
   } = props;
 
+  const type = getTypefromKey(objKey);
+  const { contentType = type } = field;
+
   let addModuleAction: any;
   let addComponentAction: any;
 
@@ -35,14 +40,14 @@ const SameComponentArray = (props: ISameComponentArrayProps): JSX.Element => {
     return value.length > 1 ? `#${index + 1} ${name}` : name;
   };
 
-  const { elements, componentModules, kind } = selectedContent;
+  const { kind } = selectedContent;
 
-  const isModuleArr = !elements;
-  const isComponentModule = !!componentModules;
+  const isModuleArr = contentType === "modules";
+  const isComponentModule = contentType === "components";
 
   const handleAddModule = (moduleType: string) => addModuleAction(moduleType, editorID, isComponentModule);
 
-  const handleAddComponent = () => addComponentAction && addComponentAction(kind);
+  const handleAddComponent = () => addComponentAction && addComponentAction(kind, objKey);
 
   const handleAdd = isModuleArr ? handleAddModule : handleAddComponent;
 
@@ -82,6 +87,7 @@ const SameComponentArray = (props: ISameComponentArrayProps): JSX.Element => {
               selectedContent={selectedContent}
               disabled={disabled}
               canDuplicate={showAddItemButton && !isModuleDeactivated}
+              parentKey={objKey}
             />
           );
         })}
@@ -102,6 +108,8 @@ export interface ISameComponentArrayProps {
   categories?: any;
   disabled?: boolean;
   activatedModules: string[];
+  objKey: string;
+  field: any;
 }
 
 export default SameComponentArray;

package/src/components/Fields/ComponentArray/helpers.tsx

@@ -29,4 +29,16 @@ const getComponentProps = (element: any, activatedModules: string[], isModuleArr
 const containerToComponentArray = (value: Record<string, IComponent>): IComponent[] =>
   Object.values(value).filter((item: IComponent) => !isComponentEmpty(item));
 
-export { getComponentTitle, getComponentProps, containerToComponentArray };
+const getTypefromKey = (key: string) => {
+  switch (key) {
+    case "elements":
+    case "componentModules":
+      return "components";
+    case "modules":
+      return key;
+    default:
+      return null;
+  }
+};
+
+export { getComponentTitle, getComponentProps, containerToComponentArray, getTypefromKey };

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

@@ -26,6 +26,7 @@ const ComponentContainer = (props: IComponentContainerProps): JSX.Element => {
     arrayLength,
     disabled,
     canDuplicate,
+    parentKey,
   } = props;
 
   let deleteModuleAction: any;
@@ -65,8 +66,8 @@ const ComponentContainer = (props: IComponentContainerProps): JSX.Element => {
     }
   };
 
-  const removeItem = () => deleteModuleAction(editorID);
-  const duplicateItem = () => duplicateModuleAction(editorID);
+  const removeItem = () => deleteModuleAction(editorID, parentKey);
+  const duplicateItem = () => parentKey && duplicateModuleAction(editorID, parentKey);
 
   const duplicateOpt = {
     label: "duplicate",
@@ -99,7 +100,7 @@ const ComponentContainer = (props: IComponentContainerProps): JSX.Element => {
   const moveModule = (e: any, isPush: boolean) => {
     e.preventDefault();
     e.stopPropagation();
-    moveModuleAction(editorID, selectedContent, isPush);
+    moveModuleAction(editorID, selectedContent, isPush, parentKey);
   };
 
   const handleOptionClick = (option: any) => actions.addComponentAction(option);
@@ -177,6 +178,7 @@ interface IComponentContainerProps {
   arrayLength: number;
   disabled?: boolean;
   canDuplicate?: boolean;
+  parentKey?: string;
 }
 
 export default ComponentContainer;

package/src/components/Fields/VisualUniqueSelection/ScrollableSelection/index.tsx

@@ -4,16 +4,8 @@ import { IconAction, VisualOption } from "@ax/components";
 
 import * as S from "./style";
 
-const ScrollableSelection = ({
-  value,
-  onChange,
-  actions,
-  options,
-  objKey,
-  columns,
-  disabled,
-  ...props
-}: IScrollableSelectionProps): JSX.Element => {
+const ScrollableSelection = (props: IScrollableSelectionProps): JSX.Element => {
+  const { value, onChange, actions, options, objKey, columns, disabled, reference } = props;
   const [carouselIndex, setCarouselIndex] = useState(0);
   const [carouselItemWidth, setCarouselItemWidth] = useState<number>();
   const carouselRef = useRef<HTMLDivElement>(null);
@@ -22,7 +14,7 @@ const ScrollableSelection = ({
 
   const handleSelection = (newValue: string) => {
     onChange(newValue);
-    actions.replaceElementsInCollectionAction(newValue);
+    actions.replaceElementsInCollectionAction(newValue, reference);
   };
 
   const handlePreviousPage = () => {
@@ -90,6 +82,7 @@ interface IScrollableSelectionProps {
   disabled?: boolean;
   actions: any;
   selectedContent: any;
+  reference?: string;
 }
 
 interface IScrollableUniqueSelectionFieldOptionsProps {

package/src/components/MainWrapper/AppBar/index.tsx

@@ -31,6 +31,7 @@ const AppBar = (props: IProps): JSX.Element => {
     currentPageUrl,
     errors,
     errorActions,
+    isFromEditor,
   } = props;
 
   const publishedTooltip: any = {
@@ -43,7 +44,7 @@ const AppBar = (props: IProps): JSX.Element => {
   const fixedClass = fixedAppBar ? "fixed" : "";
 
   const goToPages = () => {
-    typeof backLink === "string" ? props.history.push(backLink) : props.history.goBack();
+    typeof backLink === "string" ? props.history.push(backLink, { isFromEditor }) : props.history.goBack();
   };
 
   const getCurrentLanguage = (lang: string) =>
@@ -251,6 +252,7 @@ interface IAppBarProps {
   errorActions?: {
     goToError(editorID: number, tab: string, template: boolean): void;
   };
+  isFromEditor?: boolean;
 }
 
 type IProps = IAppBarProps & RouteComponentProps;

package/src/components/MainWrapper/index.tsx

@@ -35,6 +35,7 @@ interface IWrapperProps {
   currentPageID?: number;
   currentPageUrl?: string;
   fullWidth?: boolean;
+  isFromEditor?: boolean;
   languageActions?: {
     setLanguage?(lang: { locale: string; id: number | null }): void;
     setIsNewTranslation?(isNewTranslation: boolean): void;

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

@@ -4,11 +4,11 @@ import { navigation } from "@ax/api";
 import { IBreadcrumbItem, ISchema } from "@ax/types";
 import { getDefaultSchema, getSchema, handleRequest, removeEditorIds, deepClone, getNullValue } from "@ax/helpers";
 import {
-  deleteComponent,
   findByEditorID,
   generateEditorIDs,
   getLastComponentEditorID,
   getNewBreadcrumb,
+  getParentKey,
   moveElement,
   replaceElements,
   setIsSavedData,
@@ -441,7 +441,7 @@ const updateCollection = (elementType: string, prevCollection: any[]) => {
   return [...prevCollection, newModule];
 };
 
-const getUpdatedComponents = (editorContent: any, element: any) => {
+const getUpdatedComponents = (editorContent: any, element: any, key: string) => {
   const { editorID, type } = element;
   const isCollectionItem = typeof type === "string";
   const updatedDefault = isCollectionItem ? deepClone(editorContent) : editorContent;
@@ -449,7 +449,7 @@ const getUpdatedComponents = (editorContent: any, element: any) => {
   const mapValues = (item: any) => {
     if (item.editorID !== undefined && item.editorID === editorID) {
       if (isCollectionItem) {
-        item.elements = updateCollection(type, item.elements);
+        item[key] = updateCollection(type, item[key]);
       } else {
         addElement(type);
       }
@@ -468,41 +468,39 @@ const getUpdatedComponents = (editorContent: any, element: any) => {
   return updatedDefault;
 };
 
-function addComponent(type: any): (dispatch: Dispatch, getState: any) => void {
+function addComponent(type: any, key: string): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const { editorContent, selectedEditorID } = getStateValues(getState);
     const component = {
       editorID: selectedEditorID,
       type,
     };
-    const updatedContent = getUpdatedComponents(editorContent, component);
+    const updatedContent = getUpdatedComponents(editorContent, component, key);
     generateContent(updatedContent, dispatch, getState);
 
     if (type.editorID) {
       setSelectedContent(type.editorID)(dispatch, getState);
     } else {
       const { editorContent } = getStateValues(getState);
-      const lastElementEditorID = getLastComponentEditorID(editorContent, component.editorID);
+      const lastElementEditorID = getLastComponentEditorID(editorContent, component.editorID, key);
       setSelectedContent(lastElementEditorID)(dispatch, getState);
     }
   };
 }
 
-function deleteModule(editorID: number): (dispatch: Dispatch, getState: any) => void {
+function deleteModule(editorID: number, key: string): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const { editorContent } = getStateValues(getState);
     const updatedContent: any = deepClone(editorContent);
 
-    updatedContent.elements = updatedContent.elements.filter((module: any) => {
-      if (module.elements) {
-        module.elements = deleteComponent(module.elements, editorID);
-      }
-      return module.editorID !== editorID;
-    });
-
-    const { parent, grandParent } = findByEditorID(editorContent, editorID);
+    const { parent, grandParent } = findByEditorID(updatedContent, editorID);
     const parentModule = Array.isArray(parent) ? grandParent : parent;
-    setSelectedContent(parentModule.editorID)(dispatch, getState);
+
+    const parentKey = key ? key : getParentKey(parentModule, editorID);
+    const itemsArr = parentModule[parentKey];
+
+    const index = itemsArr.findIndex((module: any) => module.editorID === editorID);
+    itemsArr.splice(index, 1);
 
     generateContent(updatedContent, dispatch, getState);
   };
@@ -530,7 +528,7 @@ function replaceModule(module: any, parent: any, objKey: string): (dispatch: Dis
   };
 }
 
-function duplicateModule(editorID: number): (dispatch: Dispatch, getState: any) => void {
+function duplicateModule(editorID: number, key?: string): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const { editorContent } = getStateValues(getState);
 
@@ -538,33 +536,39 @@ function duplicateModule(editorID: number): (dispatch: Dispatch, getState: any)
     const { element: originalItem, parent, grandParent } = findByEditorID(updatedContent, editorID);
     const parentModule = Array.isArray(parent) ? grandParent : parent;
 
-    const { elements } = parentModule;
+    const parentKey = key ? key : getParentKey(parentModule, editorID);
+    const itemsArr = parentModule[parentKey];
 
-    const originalItemIndex = elements.findIndex((module: any) => module.editorID === editorID);
+    const originalItemIndex = itemsArr.findIndex((module: any) => module.editorID === editorID);
     const duplicatedItemIndex = originalItemIndex + 1;
-    elements.splice(duplicatedItemIndex, 0, originalItem);
+    itemsArr.splice(duplicatedItemIndex, 0, originalItem);
 
     generateContent(updatedContent, dispatch, getState);
 
     const { editorContent: generatedContent } = getStateValues(getState);
     const { parent: generatedParent, grandParent: generatedGrandParent } = findByEditorID(generatedContent, editorID);
     const module = Array.isArray(generatedParent) ? generatedGrandParent : generatedParent;
-    const duplicatedEditorID = module.elements[duplicatedItemIndex].editorID;
+    const duplicatedEditorID = module[parentKey][duplicatedItemIndex].editorID;
 
     setSelectedContent(duplicatedEditorID)(dispatch, getState);
   };
 }
 
-function moveModule(elementID: number, content: any, isPush: boolean): (dispatch: Dispatch, getState: any) => void {
+function moveModule(
+  elementID: number,
+  content: any,
+  isPush: boolean,
+  key: string
+): (dispatch: Dispatch, getState: any) => void {
   return async (dispatch, getState) => {
     try {
       const {
         navigation: { selectedContent, editorContent },
       } = getState();
 
-      const contentElements = [...selectedContent.elements];
+      const contentElements = [...selectedContent[key]];
       const { element: selectedModule } = findByEditorID(editorContent, selectedContent.editorID);
-      selectedModule.elements = moveElement(elementID, contentElements, isPush);
+      selectedModule[key] = moveElement(elementID, contentElements, isPush);
 
       generateContent(editorContent, dispatch, getState);
     } catch {
@@ -573,13 +577,14 @@ function moveModule(elementID: number, content: any, isPush: boolean): (dispatch
   };
 }
 
-function replaceElementsInCollection(newValue: string): (dispatch: Dispatch, getState: any) => void {
+function replaceElementsInCollection(newValue: string, reference: string): (dispatch: Dispatch, getState: any) => void {
   return async (dispatch, getState) => {
     const { selectedContent } = getStateValues(getState);
+    const key = reference ? reference : "elements";
 
-    const updatedContent = replaceElements(selectedContent.elements, newValue);
+    const updatedContent = replaceElements(selectedContent[key], newValue);
 
-    updateEditorContent(selectedContent.editorID, "elements", updatedContent)(dispatch, getState);
+    updateEditorContent(selectedContent.editorID, key, updatedContent)(dispatch, getState);
   };
 }
 

package/src/containers/PageEditor/actions.tsx

@@ -15,7 +15,6 @@ import {
   getUpdatedComponents,
   getUpdatedSections,
   updateComponent,
-  deleteModules,
   updateByEditorID,
   findByEditorID,
   generateEditorIDs,
@@ -26,6 +25,7 @@ import {
   getLastComponentEditorID,
   replaceElements,
   findMandatoryFieldsErrors,
+  getParentKey,
 } from "@ax/forms";
 import { appActions } from "@ax/containers/App";
 import { navigationActions } from "@ax/containers/Navigation";
@@ -462,7 +462,7 @@ function addTemplate(template: string): (dispatch: Dispatch) => Promise<void> {
   };
 }
 
-function addComponent(type: any): (dispatch: Dispatch, getState: any) => void {
+function addComponent(type: any, key: string): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const { editorContent, sections, editorID } = getStateValues(getState);
     const component = {
@@ -470,7 +470,7 @@ function addComponent(type: any): (dispatch: Dispatch, getState: any) => void {
       type,
     };
 
-    const updatedObj = getUpdatedComponents(sections, component);
+    const updatedObj = getUpdatedComponents(sections, component, key);
     const updatedSections = updatedObj.updatedSections;
 
     const updatedPageContent = {
@@ -487,7 +487,7 @@ function addComponent(type: any): (dispatch: Dispatch, getState: any) => void {
       setSelectedContent(type.editorID)(dispatch, getState);
     } else {
       const { sections: generatedSections } = getStateValues(getState);
-      const lastElementEditorID = getLastComponentEditorID(generatedSections, component.editorID);
+      const lastElementEditorID = getLastComponentEditorID(generatedSections, component.editorID, key);
       setSelectedContent(lastElementEditorID)(dispatch, getState);
     }
   };
@@ -496,6 +496,7 @@ function addComponent(type: any): (dispatch: Dispatch, getState: any) => void {
 function addModule(
   type: string,
   selectedID: number,
+  key: string,
   isComponentModule?: boolean
 ): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
@@ -509,7 +510,7 @@ function addModule(
       updatedSectionIndex = 0;
 
     if (isComponentModule) {
-      const updatedObj = getUpdatedComponents(sections, componentModule);
+      const updatedObj = getUpdatedComponents(sections, componentModule, key);
       updatedSections = updatedObj.updatedSections;
       updatedSectionIndex = updatedObj.selectedIndex;
     } else {
@@ -557,33 +558,44 @@ function replaceModule(module: any, parent: any, objKey: string): (dispatch: Dis
   };
 }
 
-function replaceElementsInCollection(newValue: string): (dispatch: Dispatch, getState: any) => void {
+function replaceElementsInCollection(newValue: string, reference: string): (dispatch: Dispatch, getState: any) => void {
   return async (dispatch, getState) => {
     const { selectedContent } = getStateValues(getState);
 
-    const updatedContent = replaceElements(selectedContent.elements, newValue);
+    const key = reference ? reference : "elements";
+    const updatedContent = replaceElements(selectedContent[key], newValue);
 
-    updateEditorContent(selectedContent.editorID, "elements", updatedContent)(dispatch, getState);
+    updateEditorContent(selectedContent.editorID, key, updatedContent)(dispatch, getState);
 
     const { editorContent } = getStateValues(getState);
     generatePageContent(editorContent, dispatch, getState);
   };
 }
 
-function deleteModule(editorID: number): (dispatch: Dispatch, getState: any) => void {
+function deleteModule(editorID: number, key?: string): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
-    const { editorContent, sections } = getStateValues(getState);
-    deleteModules(sections, editorID);
+    const { sections, editorContent } = getStateValues(getState);
+
+    const updatedSections: any = [...sections];
+    const { parent, grandParent } = findByEditorID(updatedSections, editorID);
+    const parentModule = Array.isArray(parent) ? grandParent : parent;
+
+    const parentKey = key ? key : getParentKey(parentModule, editorID);
+    const itemsArr = parentModule[parentKey];
+
+    const index = itemsArr.findIndex((module: any) => module.editorID === editorID);
+    itemsArr.splice(index, 1);
 
     const updatedPageContent = {
       ...editorContent,
+      sections: [...updatedSections],
     };
 
     generatePageContent(updatedPageContent, dispatch, getState);
   };
 }
 
-function duplicateModule(editorID: number): (dispatch: Dispatch, getState: any) => void {
+function duplicateModule(editorID: number, key?: string): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const { sections, editorContent } = getStateValues(getState);
 
@@ -591,9 +603,8 @@ function duplicateModule(editorID: number): (dispatch: Dispatch, getState: any)
     const { element: originalItem, parent, grandParent } = findByEditorID(updatedSections, editorID);
     const parentModule = Array.isArray(parent) ? grandParent : parent;
 
-    const { modules, elements, componentModules } = parentModule;
-
-    const itemsArr = modules ? modules : elements ? elements : componentModules;
+    const parentKey = key ? key : getParentKey(parentModule, editorID);
+    const itemsArr = parentModule[parentKey];
 
     const originalItemIndex = itemsArr.findIndex((module: any) => module.editorID === editorID);
     const duplicatedItemIndex = originalItemIndex + 1;
@@ -609,11 +620,7 @@ function duplicateModule(editorID: number): (dispatch: Dispatch, getState: any)
     const { sections: generatedSections } = getStateValues(getState);
     const { parent: generatedParent, grandParent: generatedGrandParent } = findByEditorID(generatedSections, editorID);
     const section = Array.isArray(generatedParent) ? generatedGrandParent : generatedParent;
-    const duplicatedEditorID = modules
-      ? section.modules[duplicatedItemIndex].editorID
-      : elements
-      ? section.elements[duplicatedItemIndex].editorID
-      : section.componentModules[duplicatedItemIndex].editorID;
+    const duplicatedEditorID = section[parentKey][duplicatedItemIndex].editorID;
 
     setSelectedContent(duplicatedEditorID)(dispatch, getState);
   };
@@ -773,7 +780,12 @@ function resetPageEditor(): (dispatch: Dispatch) => Promise<void> {
   };
 }
 
-function moveElement(elementID: number, content: any, isPush: boolean): (dispatch: Dispatch, getState: any) => void {
+function moveElement(
+  elementID: number,
+  content: any,
+  isPush: boolean,
+  key: string
+): (dispatch: Dispatch, getState: any) => void {
   return async (dispatch, getState) => {
     try {
       const { selectedContent, editorContent } = getState().pageEditor;
@@ -783,6 +795,7 @@ function moveElement(elementID: number, content: any, isPush: boolean): (dispatc
         selectedContent,
         isPush,
         page: editorContent.editorContent,
+        key,
       });
 
       generatePageContent(newContent, dispatch, getState);

package/src/forms/editor.tsx

@@ -137,16 +137,23 @@ const getLastModuleEditorID = (sections: any, sectionIndex: number) => {
   return updatedModules[lastModuleIndex].editorID;
 };
 
-const getLastComponentEditorID = (sections: any, parentEditorID: number) => {
+const getLastComponentEditorID = (sections: any, parentEditorID: number, key: string) => {
   const { element: module } = findByEditorID(sections, parentEditorID);
-  if (module.elements) {
-    const lastElementIndex = module.elements.length - 1;
-    return module.elements[lastElementIndex].editorID;
-  }
-  if (module.componentModules) {
-    const lastElementIndex = module.componentModules.length - 1;
-    return module.componentModules[lastElementIndex].editorID;
-  }
+  const lastElementIndex = module[key].length - 1;
+  return module[key][lastElementIndex].editorID;
+};
+
+const getParentKey = (parentModule: any, editorID: number) => {
+  let keyFound = "";
+  Object.keys(parentModule).forEach((objKey: any) => {
+    if (Array.isArray(parentModule[objKey])) {
+      const moduleFound = parentModule[objKey].find((module: any) => module.editorID === editorID);
+      if (moduleFound) {
+        keyFound = objKey;
+      }
+    }
+  });
+  return keyFound;
 };
 
 export {
@@ -161,4 +168,5 @@ export {
   cleanPageValues,
   getLastModuleEditorID,
   getLastComponentEditorID,
+  getParentKey,
 };

package/src/forms/elements.tsx

@@ -22,18 +22,16 @@ const updateComponent = (component: any, schema: any) => {
   }
 };
 
-const updateCollection = (type: string, item: any) =>
-  item.elements
-    ? (item.elements = updateElementCollection(type, item.elements))
-    : (item.componentModules = updateElementCollection(type, item.componentModules));
+const updateCollection = (type: string, item: any, key: string) =>
+  (item[key] = updateElementCollection(type, item[key]));
 
-const getUpdatedComponents = (sections: any, component: any) => {
+const getUpdatedComponents = (sections: any, component: any, key: string) => {
   const { editorID, type } = component;
 
   const isCollectionItem = typeof type === "string";
   let selectedIndex = 0;
 
-  const addItem = (item: any) => (isCollectionItem ? updateCollection(type, item) : addElement(type));
+  const addItem = (item: any) => (isCollectionItem ? updateCollection(type, item, key) : addElement(type));
 
   const sectionEntries = sections.map((section: any, index: number) => {
     const updatedModules = section.modules.map((module: any) => {
@@ -168,7 +166,7 @@ const moveElement = (elementID: number, arr: any[], isPush: boolean, idKey = "ed
 };
 
 const moveModule = (params: IMoveElementParams) => {
-  const { elementID, content, selectedContent, isPush, page } = params;
+  const { elementID, content, selectedContent, isPush, page, key } = params;
   const isPage = ["Page", "GlobalPage"].includes(selectedContent.component);
   let newContent;
   if (isPage) {
@@ -191,15 +189,10 @@ const moveModule = (params: IMoveElementParams) => {
         }
       : null;
   } else {
-    const { elements, componentModules } = content;
-    const contentElements = componentModules ? componentModules : elements;
+    const contentElements = content[key];
     const { template } = page;
     const { element: selectedModule } = findByEditorID(page, selectedContent.editorID);
-    if (componentModules) {
-      selectedModule.componentModules = moveElement(elementID, contentElements, isPush);
-    } else {
-      selectedModule.elements = moveElement(elementID, contentElements, isPush);
-    }
+    selectedModule[key] = moveElement(elementID, contentElements, isPush);
 
     newContent = {
       ...page,
@@ -229,6 +222,7 @@ interface IMoveElementParams {
   isPush: boolean;
   selectedContent: any;
   page: any;
+  key: string;
 }
 
 export {

package/src/forms/index.tsx

@@ -9,6 +9,7 @@ import {
   cleanPageValues,
   getLastModuleEditorID,
   getLastComponentEditorID,
+  getParentKey,
 } from "./editor";
 import {
   getUpdatedComponents,
@@ -45,6 +46,7 @@ export {
   getInnerFields,
   getLastModuleEditorID,
   getLastComponentEditorID,
+  getParentKey,
   getValidity,
   findMandatoryFieldsErrors,
 };

package/src/modules/Content/index.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useCallback, useState, useRef } from "react";
 import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
 
 import { useModal, useBulkSelection, useToast } from "@ax/hooks";
 import {
@@ -86,6 +87,7 @@ const Content = (props: IProps): JSX.Element => {
   const { isOpen: isImporterOpen, toggleModal: toggleImporterModal } = useModal();
   const { sortedListStatus, setSortedListStatus } = useSortedListStatus();
   const { setFiltersSelection, setFilterQuery } = useFilterQuery();
+  const { state: locationState } = useLocation<{ isFromEditor: boolean }>();
 
   const currentFilter = getCurrentFilter(structuredData, filter);
   const checkFromPage = currentFilter ? currentFilter.fromPage : undefined;
@@ -189,7 +191,9 @@ const Content = (props: IProps): JSX.Element => {
   useEffect(() => setPage(firstPage), [filter]);
 
   useEffect(() => {
-    setFilter("unique-pages");
+    if (!locationState || locationState.isFromEditor !== true) {
+      setFilter("unique-pages");
+    }
     resetPageEditor();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

package/src/modules/GlobalEditor/Editor/index.tsx

@@ -73,13 +73,13 @@ interface IEditorStateProps {
 interface IPageBrowserDispatchProps {
   setSelectedContent(editorID: number): void;
   setSelectedTab(tab: string): void;
-  deleteModule(editorID: number): void;
-  duplicateModule(editorID: number): void;
-  addComponent: (componentType: any) => void;
-  addModule: (moduleType: string, selectedID: number) => void;
-  moveElement(moduleID: number, selectedContent: any, isPush: boolean): void;
+  deleteModule(editorID: number, key: string): void;
+  duplicateModule(editorID: number, key: string): void;
+  addComponent: (componentType: any, key: string) => void;
+  addModule: (moduleType: string, selectedID: number, key: string) => void;
+  moveElement(moduleID: number, selectedContent: any, isPush: boolean, key: string): void;
   replaceModule(module: any, parent: any, objKey: string): void;
-  replaceElementsInCollection(module: any, parent: any, objKey: string): void;
+  replaceElementsInCollection(newValue: string, reference: string): void;
   isGlobal: boolean;
   isEditable: boolean;
 }

package/src/modules/GlobalEditor/index.tsx

@@ -221,6 +221,7 @@ const GlobalEditor = (props: IProps) => {
         errors={errors}
         errorActions={{ goToError }}
         inversed={true}
+        isFromEditor={true}
       >
         {errors.length > 0 && (
           <S.NotificationWrapper>

package/src/modules/Navigation/Defaults/DefaultsEditor/Editor/index.tsx

@@ -68,12 +68,12 @@ interface IEditorStateProps {
 interface IPageBrowserDispatchProps {
   setSelectedContent(editorID: number): void;
   setSelectedTab(tab: string): void;
-  deleteModule(editorID: number): void;
-  duplicateModule(editorID: number): void;
-  addComponent: (componentType: any) => void;
+  deleteModule(editorID: number, key: string): void;
+  duplicateModule(editorID: number, key: string): void;
+  addComponent: (componentType: any, key: string) => void;
   replaceModule(module: any, parent: any, objKey: string): void;
-  replaceElementsInCollection(module: any, parent: any, objKey: string): void;
-  moveModule(moduleID: number, selectedContent: any, isPush: boolean): void;
+  replaceElementsInCollection(newValue: string, reference: string): void;
+  moveModule(moduleID: number, selectedContent: any, isPush: boolean, key: string): void;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

package/src/modules/PageEditor/Editor/index.tsx

@@ -84,13 +84,13 @@ interface IEditorStateProps {
 interface IPageBrowserDispatchProps {
   setSelectedContent(editorID: number): void;
   setSelectedTab(tab: string): void;
-  deleteModule(editorID: number): void;
-  duplicateModule(editorID: number): void;
-  addComponent: (componentType: any) => void;
-  addModule: (moduleType: string, selectedID: number) => void;
-  moveElement(moduleID: number, selectedContent: any, isPush: boolean): void;
+  deleteModule(editorID: number, key: string): void;
+  duplicateModule(editorID: number, key: string): void;
+  addComponent: (componentType: any, key: string) => void;
+  addModule: (moduleType: string, selectedID: number, key: string) => void;
+  moveElement(moduleID: number, selectedContent: any, isPush: boolean, key: string): void;
   replaceModule(module: any, parent: any, objKey: string): void;
-  replaceElementsInCollection(module: any, parent: any, objKey: string): void;
+  replaceElementsInCollection(newValue: string, reference: string): void;
   setHistoryPush(path: string, isEditor: boolean): void;
   getGlobalFromLocalPage(): void;
   saveCurrentSiteInfo(): void;

package/src/modules/PageEditor/index.tsx

@@ -255,6 +255,7 @@ const PageEditor = (props: IProps) => {
         currentPageUrl={editorContent.editorContent.fullUrl}
         errors={errors}
         errorActions={{ goToError }}
+        isFromEditor={true}
       >
         {(!isTemplateActivated || hasDeactivatedModules) && !isGlobal && (
           <S.NotificationWrapper>

package/src/modules/StructuredData/Form/index.tsx

@@ -217,6 +217,7 @@ const Form = (props: IProps) => {
         pageLanguages={currentLanguages}
         pageStatus={status}
         downArrowMenu={downArrowMenu}
+        isFromEditor={true}
       >
         {isDisabled && (
           <S.NotificationWrapper>

package/src/modules/StructuredData/StructuredDataList/index.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { connect } from "react-redux";
-import { useHistory } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 
 import {
   IRootState,
@@ -105,6 +105,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
   const [isFirstRender, setIsFirstRender] = useState(true);
   const [deleteAllVersions, setDeleteAllVersions] = useState(false);
   const [arePagesTranslated, setArePagesTranslated] = useState(false);
+  const { state: locationState } = useLocation<{ isFromEditor: boolean }>();
 
   const scope = currentSiteID ? "site" : "global";
   const isDataEditable = !currentStructuredData || currentStructuredData.editable;
@@ -159,8 +160,14 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     isStructuredDataFromPage ? handleGetGlobalPages() : getStructuredData(filter);
   };
 
+  const resetFilter = () => {
+    if (!locationState || locationState.isFromEditor !== true) {
+      setFilter("all-pages");
+    }
+  };
+
   useLayoutEffect(() => {
-    history.action !== "POP" ? setFilter("all-pages") : handleGetData();
+    history.action !== "POP" ? resetFilter() : handleGetData();
     setIsFirstRender(false);
     resetPageEditor();
     // eslint-disable-next-line react-hooks/exhaustive-deps