@griddo/ax 11.9.5 → 11.9.7-rc.0

package/package.json

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

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

@@ -50,6 +50,8 @@ const PageConnectedField = (props: any): JSX.Element => {
     isReadOnly,
     themeElements,
     scrollEditorID,
+    oldConfig,
+    setOldConfig,
   } = props;
 
   const isTemplate = field.type === "template";
@@ -115,18 +117,25 @@ const PageConnectedField = (props: any): JSX.Element => {
       getPageBreadcrumb(value);
     }
 
-    if (key === "isHome") {
-      updateEditorContent(selectedEditorID, "parent", null);
-      updateEditorContent(selectedEditorID, "slug", value ? "/" : slugify(selectedContent.title));
-    }
+    const editorID = templateID ? templateID : selectedEditorID;
+    updateEditorContent(editorID, key, value);
 
     if (slugTo) {
       const slugValue = typeof value === "object" && value.content ? value.content : value;
       updateEditorContent(selectedEditorID, slugTo, slugify(slugValue));
     }
 
-    const editorID = templateID ? templateID : selectedEditorID;
-    updateEditorContent(editorID, key, value);
+    if (key === "isHome") {
+      if (value) {
+        setOldConfig({ slug: selectedContent.slug, parent: selectedContent.parent });
+        updateEditorContent(selectedEditorID, ["parent", "slug"], [null, "/"]);
+      } else {
+        const slugValue = oldConfig ? oldConfig.slug : slugify(selectedContent.title);
+        const parentValue = oldConfig ? oldConfig.parent : null;
+        updateEditorContent(selectedEditorID, ["parent", "slug"], [parentValue, slugValue]);
+        setOldConfig(null);
+      }
+    }
 
     const isPageTitle = ["Page", "GlobalPage"].includes(selectedContent.component) && key === "title";
     if (isPageTitle) {
@@ -143,8 +152,7 @@ const PageConnectedField = (props: any): JSX.Element => {
 
     const isComponentImage = ["LinkableImage", "Image"].includes(selectedContent.component) && key === "file";
     if (isComponentImage) {
-      updateEditorContent(selectedEditorID, "title", value.title);
-      updateEditorContent(selectedEditorID, "alt", value.alt);
+      updateEditorContent(selectedEditorID, ["title", "alt"], [value.title, value.alt]);
     }
   };
 

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 
 import { ISchema, ISchemaTab, ISchemaField } from "@ax/types";
 import { Tabs } from "@ax/components";
@@ -30,6 +30,7 @@ export const Form = (props: IFormProps): JSX.Element => {
   const isAllowedToEditConfigPages = usePermission("content.editConfigPages");
   const isAllowedToEditSiteSeo = usePermission("seoAnalytics.editSeoAnalyticsPages");
   const isAllowedToEditGlobalSeo = usePermission("global.seoAnalytics.editSeoAnalyticsInGlobalPages");
+  const [oldConfig, setOldConfig] = useState<IOldConfig | null>(null);
 
   const isAllowedToEditPageContent = (!isGlobal && isAllowedToEditSitePages) || (isGlobal && isAllowedToEditGlobalData);
   const isAllowedToEditPageConfig =
@@ -60,6 +61,8 @@ export const Form = (props: IFormProps): JSX.Element => {
         theme={theme}
         setHistoryPush={setHistoryPush}
         isReadOnly={isEditLive || isDisabled}
+        oldConfig={oldConfig}
+        setOldConfig={setOldConfig}
       />
     );
   };
@@ -136,6 +139,11 @@ export const Form = (props: IFormProps): JSX.Element => {
   );
 };
 
+interface IOldConfig {
+  slug: string;
+  parent: number;
+}
+
 export interface IFormProps {
   selectedTab: string;
   schema: ISchema;

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

@@ -61,6 +61,14 @@ const DateField = (props: IDateFieldProps): JSX.Element => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editorID]);
 
+  useEffect(() => {
+    if ((!value || value.length === 0) && mandatory) {
+      const { start, end } = initialDate;
+      handleOnChange([start, end]);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   registerLocale("en", en);
 
   const handleOnChange = (dates: any) => {

package/src/containers/ActivityLog/actions.tsx

@@ -244,13 +244,15 @@ function goToLogContent(
               await sitesActions.getSite(site)(dispatch, getState);
               structuredDataActions.setSelectedStructuredData(contentType.content.id, "site")(dispatch, getState);
               dispatch(structuredDataActions.setCurrentDataID(contentType.id));
+              await structuredDataActions.getDataContent(contentType.id)(dispatch);
               dispatch(appActions.setLanguage(language));
-              appActions.setHistoryPush(`/sites/data/${contentType.content.id}/editor`, true)(dispatch);
+              appActions.setHistoryPush(`/sites/data/${contentType.content.id}/editor`)(dispatch);
             } else {
               structuredDataActions.setSelectedStructuredData(contentType.content.id, "global")(dispatch, getState);
               dispatch(structuredDataActions.setCurrentDataID(contentType.id));
+              await structuredDataActions.getDataContent(contentType.id)(dispatch);
               dispatch(appActions.setLanguage(language));
-              appActions.setHistoryPush(`/data/${contentType.content.id}/editor`, true)(dispatch);
+              appActions.setHistoryPush(`/data/${contentType.content.id}/editor`)(dispatch);
             }
           }
           break;

package/src/containers/PageEditor/actions.tsx

@@ -1084,7 +1084,7 @@ function generatePageContent(editorContent: IPage): (dispatch: Dispatch, getStat
 
 function updateEditorContent(
   selectedEditorID: number,
-  key: string,
+  key: string | string[],
   value: any
 ): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
@@ -1096,7 +1096,11 @@ function updateEditorContent(
     const clonedSelected = deepClone(selectedContent);
 
     if (clonedSelected.component === "FormPage") {
-      protectFormKeys(clonedContent, key);
+      if (Array.isArray(key)) {
+        key.forEach((k) => protectFormKeys(clonedContent, k));
+      } else {
+        protectFormKeys(clonedContent, key);
+      }
     }
 
     const updatedSelectedContent = updateByEditorID(clonedSelected, selectedEditorID, key, value);
@@ -1116,8 +1120,15 @@ function updateEditorContent(
 
     dispatch(setLastTimeout(timeoutId));
 
-    const isNavigation = ["header", "footer"].includes(key);
-    if (isNavigation || (value && typeof value === "object")) {
+    const isNavigation = Array.isArray(key)
+      ? key.some((k) => ["header", "footer"].includes(k))
+      : ["header", "footer"].includes(key);
+
+    const isObjectValue = Array.isArray(value)
+      ? value.some((v) => v !== null && typeof v === "object")
+      : value !== null && typeof value === "object";
+
+    if (isNavigation || isObjectValue) {
       generatePageContent(updatedEditorContent)(dispatch, getState);
     }
   };

package/src/containers/StructuredData/actions.tsx

@@ -97,7 +97,7 @@ function setSchema(schema: any) {
   return { type: SET_SCHEMA, payload: { schema } };
 }
 
-function setForm(form: any) {
+function setForm(form: IStructuredDataContent) {
   return { type: CREATE_FORM, payload: { form } };
 }
 
@@ -137,7 +137,7 @@ function setCurrentSearch(currentSearch: string): ISetCurrentSearch {
   return { type: SET_CURRENT_SEARCH, payload: { currentSearch } };
 }
 
-function updateFormValue(valueObj: any): (dispatch: Dispatch, getState: any) => void {
+function updateFormValue(valueObj: any): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       structuredData: { form },
@@ -148,7 +148,7 @@ function updateFormValue(valueObj: any): (dispatch: Dispatch, getState: any) =>
   };
 }
 
-function resetForm(setDefault?: boolean): (dispatch: Dispatch, getState: any) => void {
+function resetForm(setDefault?: boolean): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       structuredData: { currentStructuredData },
@@ -179,7 +179,7 @@ function getStructuredData(
   token: string | null,
   siteID?: number | null,
   hasLoading = true
-): (dispatch: Dispatch, getState: any) => Promise<void> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -215,7 +215,10 @@ function getStructuredData(
   };
 }
 
-function setSelectedStructuredData(id: string, scope: string): (dispatch: Dispatch, getState: any) => void {
+function setSelectedStructuredData(
+  id: string,
+  scope: "global" | "site"
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       structuredData: { structuredData: data },
@@ -233,7 +236,10 @@ function setSelectedStructuredData(id: string, scope: string): (dispatch: Dispat
   };
 }
 
-function setSelectedCategory(id: string, scope: string): (dispatch: Dispatch, getState: any) => void {
+function setSelectedCategory(
+  id: string,
+  scope: "global" | "site"
+): (dispatch: Dispatch, getState: () => IRootState) => void {
   return (dispatch, getState) => {
     const {
       structuredData: { categories: data },
@@ -249,7 +255,7 @@ function getStructuredDataContents(
   params: IGetStructuredDataParams,
   siteID?: number | null,
   hasLoading = true
-): (dispatch: Dispatch, getState: any) => Promise<void> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     const { groupingCategories } = params;
 
@@ -308,7 +314,7 @@ function getDataContent(id: number, lang?: { locale: string; id: number }): (dis
       const langID = lang ? lang.id : null;
 
       const responseActions = {
-        handleSuccess: (response: any) => dispatch(setForm(response)),
+        handleSuccess: (response: IStructuredDataContent) => dispatch(setForm(response)),
         handleError: (response: any) => appActions.handleError(response)(dispatch),
       };
 
@@ -324,14 +330,14 @@ function getDataContent(id: number, lang?: { locale: string; id: number }): (dis
 function createStructuredDataContent(
   structuredDataContent: IStructuredDataContent | IStructuredDataCategory,
   langId?: number | null
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
         app: { lang },
         sites: { currentSiteInfo },
         structuredData: { schema, currentStructuredData },
-      }: IRootState = getState();
+      } = getState();
 
       const isCategory = currentStructuredData?.taxonomy === true;
       let dataContent = prepareStructuredDataContent(structuredDataContent);
@@ -363,12 +369,12 @@ function createStructuredDataContent(
 
 function updateStructuredDataContent(
   structuredDataContent: IStructuredDataContent | IStructuredDataCategory
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
         structuredData: { schema, currentStructuredData },
-      }: IRootState = getState();
+      } = getState();
 
       const isCategory = currentStructuredData?.taxonomy === true;
       let dataContent = prepareStructuredDataContent(structuredDataContent);
@@ -394,7 +400,7 @@ function updateStructuredDataContent(
 function deleteStructuredDataContent(
   id: number | number[],
   refresh = true
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       dispatch(setIsLoading(true));
@@ -402,7 +408,7 @@ function deleteStructuredDataContent(
       const {
         structuredData: { currentFilter, currentStructuredData },
         sites: { currentSiteInfo, currentFilter: currentSiteFilter },
-      }: IRootState = getState();
+      } = getState();
 
       const params = {
         ...DEFAULT_PARAMS,
@@ -476,15 +482,15 @@ function restoreStructuredDataContent(
   };
 }
 
-function getDistributorContent(data: any): (getState: any) => Promise<any> {
+function getDistributorContent(data: any): (getState: () => IRootState) => Promise<any> {
   return async (getState) => {
     try {
       const {
-        sites: {
-          currentSiteInfo: { id },
-        },
+        sites: { currentSiteInfo },
       } = getState();
-      return structuredData.getDistributorContent(id, data);
+
+      const siteID = currentSiteInfo ? currentSiteInfo.id : "global";
+      return structuredData.getDistributorContent(siteID, data);
     } catch (e) {
       console.log("error in get distributor");
     }
@@ -494,7 +500,7 @@ function getDistributorContent(data: any): (getState: any) => Promise<any> {
 function setStatusStructuredDataContent(
   id: number | number[],
   status: string
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -529,17 +535,14 @@ function setStatusStructuredDataContent(
   };
 }
 
-function validateForm(publish?: boolean): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function validateForm(publish?: boolean): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
-        structuredData: {
-          form: { content },
-          schema,
-        },
+        structuredData: { form, schema },
       } = getState();
 
-      const formContent = deepClone(content);
+      const formContent = deepClone(form?.content || {});
       const errors = findMandatoryStructuredDataErrors(formContent, schema);
       dispatch(setErrors(errors));
       if (errors.length === 0) {
@@ -556,7 +559,7 @@ function validateForm(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 {
@@ -584,7 +587,9 @@ function resetStructuredData(): (dispatch: Dispatch) => void {
   };
 }
 
-function getDataContentTranslation(langID: number): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function getDataContentTranslation(
+  langID: number
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -645,7 +650,9 @@ function resetCurrentData(): (dispatch: Dispatch) => Promise<void> {
   };
 }
 
-function createCategoryGroup(data: ICategoryGroupParams): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function createCategoryGroup(
+  data: ICategoryGroupParams
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -696,7 +703,7 @@ function deleteCategoryGroup(
   id: number | number[],
   deleteChildren: boolean,
   refresh = true
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -737,7 +744,9 @@ function deleteCategoryGroup(
   };
 }
 
-function orderCategory(data: IOrderCategoryParams): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function orderCategory(
+  data: IOrderCategoryParams
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -775,7 +784,7 @@ function updateCurrentSearch(query: string): (dispatch: Dispatch) => Promise<voi
 function exportDataContent(
   structuredDataID: string,
   data: IExportDataParams
-): (dispatch: Dispatch, getState: any) => Promise<void> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const {

package/src/containers/StructuredData/reducer.tsx

@@ -29,7 +29,7 @@ export interface IStructuredDataState {
   currentDataContent: IStructuredDataContent[];
   currentDataCategory: IStructuredDataCategory[];
   schema: any;
-  form: any;
+  form: IStructuredDataContent | null;
   entity: string | null;
   currentFilter: string;
   schemaVersion: string;
@@ -49,7 +49,7 @@ export const initialState = {
   currentDataContent: [],
   currentDataCategory: [],
   schema: {},
-  form: {},
+  form: null,
   entity: null,
   currentFilter: "all-pages",
   schemaVersion: "",

package/src/forms/elements.tsx

@@ -132,18 +132,27 @@ function deleteModules(sections: any, editorID: number) {
   });
 }
 
-const updateByEditorID = (content: any, editorID: number, contentKey: string, value: any): any => {
-  const isContent = !content || typeof content !== "object";
+const setKeyValue = (obj: any, key: string, val: any) => {
+  const [parentKey, childKey] = key.split(".");
+  if (childKey) {
+    if (obj[parentKey] && typeof obj[parentKey] === "object") {
+      obj[parentKey][childKey] = val;
+    }
+  } else {
+    obj[parentKey] = val;
+  }
+};
 
-  if (isContent) return content;
+const updateByEditorID = (content: any, editorID: number, contentKey: string | string[], value: any): any => {
+  if (!content || typeof content !== "object") return content;
 
   if (content.editorID === editorID) {
-    const [parentKey, childKey] = contentKey.split(".");
-
-    if (childKey) {
-      content[parentKey][childKey] = value;
+    if (Array.isArray(contentKey)) {
+      const keys = contentKey;
+      const values = Array.isArray(value) ? value : [value];
+      keys.forEach((k, i) => setKeyValue(content, k, values[i]));
     } else {
-      content[parentKey] = value;
+      setKeyValue(content, contentKey, value);
     }
 
     return content;
@@ -151,7 +160,10 @@ const updateByEditorID = (content: any, editorID: number, contentKey: string, va
 
   for (const key in content) {
     if (Object.prototype.hasOwnProperty.call(content, key)) {
-      content[key] = updateByEditorID(content[key], editorID, contentKey, value);
+      const child = content[key];
+      if (typeof child === "object") {
+        content[key] = updateByEditorID(child, editorID, contentKey, value);
+      }
     }
   }
 

package/src/modules/ActivityLog/index.tsx

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import { format, subDays } from "date-fns";
 
 import { LogActivityExportRequest, LogActivityPaginationRequest } from "@griddo/api-types";
-import { ILogItemsByDay, ILogItemsByUser, IQueryValue, IRootState } from "@ax/types";
+import { ILogItemsByDay, ILogItemsByUser, IQueryValue, IRootState, IStructuredData } from "@ax/types";
 import { EmptyState, ErrorToast, FilterTagsBar, MainWrapper, SearchTagsBar, Select, TableList } from "@ax/components";
 import { activityLogActions } from "@ax/containers/ActivityLog";
 import { structuredDataActions } from "@ax/containers/StructuredData";
@@ -26,6 +26,7 @@ const ActivityLog = (props: IActivityLogProps) => {
     getActivityLogByUser,
     downloadActivityLog,
     getStructuredData,
+    setCurrentData,
   } = props;
 
   const itemsPerPage = 100;
@@ -82,6 +83,7 @@ const ActivityLog = (props: IActivityLogProps) => {
 
   useEffect(() => {
     handleUpdateStructuredDate();
+    setCurrentData(null);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -295,6 +297,7 @@ interface IActivityLogProps {
   setListMode(listMode: string): void;
   downloadActivityLog(data: LogActivityExportRequest): Promise<void>;
   getStructuredData(token: string | null, siteID?: number | null, hasLoading?: boolean): Promise<void>;
+  setCurrentData(currentStructuredData: IStructuredData | null): void;
 }
 
 const mapStateToProps = (state: IRootState) => ({
@@ -308,6 +311,7 @@ const mapDispatchToProps = {
   setListMode: activityLogActions.setListMode,
   downloadActivityLog: activityLogActions.downloadActivityLog,
   getStructuredData: structuredDataActions.getStructuredData,
+  setCurrentData: structuredDataActions.setCurrentData,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(ActivityLog);

package/src/modules/FileDrive/FileModal/DetailPanel/UsageContent/index.tsx

@@ -21,6 +21,7 @@ const UsageContent = (props: IProps) => {
     getSite,
     setCurrentDataID,
     setSelectedStructuredData,
+    getDataContent,
   } = props;
   const {
     contentInUse: { pages, simpleStructuredData, globalPages },
@@ -70,9 +71,10 @@ const UsageContent = (props: IProps) => {
     }
     if (isSiteView && selectedTab !== "global") {
       return simpleStructuredData.map((item: IFileUseItem) => {
-        const handleClick = () => {
+        const handleClick = async () => {
           item.structuredDataId && setSelectedStructuredData(item.structuredDataId, "site");
           setCurrentDataID(item.id);
+          await getDataContent(item.id);
           setHistoryPush(`data/${item.structuredDataId}/editor`, true);
         };
 
@@ -87,9 +89,10 @@ const UsageContent = (props: IProps) => {
         );
       });
     } else {
-      const handleClick = (item: IFileUseItem) => {
+      const handleClick = async (item: IFileUseItem) => {
         item.structuredDataId && setSelectedStructuredData(item.structuredDataId, "global");
         setCurrentDataID(item.id);
+        await getDataContent(item.id);
         setHistoryPush(`/data/${item.structuredDataId}/editor`, true);
       };
       return <ItemGroup title="Global Simple Content" items={simpleStructuredData} onClick={handleClick} />;
@@ -120,6 +123,7 @@ interface IProps {
   getSite(siteID: number): Promise<void>;
   setCurrentDataID(id: number | null): void;
   setSelectedStructuredData(id: string, scope: string): void;
+  getDataContent(id: number): Promise<void>;
 }
 
 const mapDispatchToProps = {
@@ -128,6 +132,7 @@ const mapDispatchToProps = {
   getSite: sitesActions.getSite,
   setCurrentDataID: structuredDataActions.setCurrentDataID,
   setSelectedStructuredData: structuredDataActions.setSelectedStructuredData,
+  getDataContent: structuredDataActions.getDataContent,
 };
 
 const mapStateToProps = (state: IRootState) => ({

package/src/modules/MediaGallery/ImageModal/DetailPanel/UsageContent/index.tsx

@@ -29,6 +29,7 @@ const UsageContent = (props: IProps) => {
     setSelectedStructuredData,
     getUserCurrentPermissions,
     setCurrentSiteInfo,
+    getDataContent,
   } = props;
 
   const { id } = image;
@@ -79,11 +80,12 @@ const UsageContent = (props: IProps) => {
       });
 
       const dataItems = data.map((item: IImageUseItem) => {
-        const handleClick = () => {
+        const handleClick = async () => {
           if (!item.structuredData) return;
           setSelectedStructuredData(item.structuredData.id, "site");
           setCurrentDataID(item.id);
-          setHistoryPush(`/sites/data/${item.structuredData.id}/editor`, true);
+          await getDataContent(item.id);
+          setHistoryPush(`/sites/data/${item.structuredData.id}/editor`);
         };
 
         return (
@@ -108,7 +110,8 @@ const UsageContent = (props: IProps) => {
           } else {
             setSelectedStructuredData(page.structuredData.id, "site");
             setCurrentDataID(page.id);
-            setHistoryPush(`/sites/data/${page.structuredData.id}/editor`, true);
+            await getDataContent(page.id);
+            setHistoryPush(`/sites/data/${page.structuredData.id}/editor`);
           }
         };
         return (
@@ -146,15 +149,16 @@ const UsageContent = (props: IProps) => {
       return <></>;
     }
     const hasGlobal = currentUser?.isSuperAdmin || !!currentUser?.roles.find((rol) => rol.siteId === "global");
-    const handleClick = (item: IImageUseItem) => {
+    const handleClick = async (item: IImageUseItem) => {
       if (!item.structuredData) return;
       setSelectedStructuredData(item.structuredData.id, "global");
       setCurrentDataID(item.id);
+      await getDataContent(item.id);
       if (isSiteView) {
         setCurrentSiteInfo(null);
         getUserCurrentPermissions();
       }
-      setHistoryPush(`/data/${item.structuredData.id}/editor`, true);
+      setHistoryPush(`/data/${item.structuredData.id}/editor`);
     };
     return (
       <ItemGroup title="Global Simple Content" items={items.simpleData} onClick={handleClick} disabled={!hasGlobal} />
@@ -192,13 +196,14 @@ interface IProps {
   currentSiteID: number | null;
   selectedTab: "site" | "global";
   currentUser: IUser | null;
-  setHistoryPush(page: string, isEditor: boolean): Promise<void>;
+  setHistoryPush(page: string, isEditor?: boolean): Promise<void>;
   setCurrentPageID(currentPageID: number | null): ISetCurrentPageIDAction;
   getSite(siteID: number): Promise<void>;
   setCurrentDataID(id: number | null): void;
   setSelectedStructuredData(id: string, scope: string): void;
   getUserCurrentPermissions(): Promise<void>;
   setCurrentSiteInfo(currentSiteInfo: ISite | null): void;
+  getDataContent(id: number): Promise<void>;
 }
 
 interface IInUseItems {
@@ -222,6 +227,7 @@ const mapDispatchToProps = {
   setCurrentDataID: structuredDataActions.setCurrentDataID,
   setSelectedStructuredData: structuredDataActions.setSelectedStructuredData,
   getUserCurrentPermissions: usersActions.getUserCurrentPermissions,
+  getDataContent: structuredDataActions.getDataContent,
 };
 
 const mapStateToProps = (state: IRootState) => ({

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

@@ -111,16 +111,9 @@ const Form = (props: IProps) => {
   const theme = getDefaultTheme();
 
   useEffect(() => {
-    const handleGetContent = async (dataID: number) => {
-      await getDataContent(dataID);
-    };
-
-    if (currentStructuredDataId) {
-      handleGetContent(currentStructuredDataId);
-    } else {
+    if (!currentStructuredDataId) {
       setIsDirty(true);
     }
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 

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

@@ -50,6 +50,7 @@ const StructuredDataItem = (props: IStructuredDataItemProps): JSX.Element => {
     addCategoryColors,
     currentSiteInfo,
     hoverCheck,
+    getDataContent,
   } = props;
 
   const isPrivateData = currentStructuredData?.private || false;
@@ -80,6 +81,7 @@ const StructuredDataItem = (props: IStructuredDataItemProps): JSX.Element => {
   };
 
   const _handleClick = () => {
+    getDataContent(structuredData.id);
     setCurrentDataID(structuredData.id);
     handleClick();
   };
@@ -289,7 +291,7 @@ interface IStructuredDataItemProps {
   setLanguage(lang: { locale: string; id: number | null }): void;
   deleteStructuredDataContent(id: number): Promise<boolean>;
   setEntity(entity: string | null): void;
-  getDataContent(id: number, lang: { locale: string; id: number }): void;
+  getDataContent(id: number, lang?: { locale: string; id: number }): void;
   resetForm(): void;
   isSelected: boolean;
   onChange: (value: ICheck) => void;

package/src/types/index.tsx

@@ -497,6 +497,7 @@ export interface IStructuredData {
   private?: boolean;
   exportable?: boolean;
   relatedCategories: string[];
+  defaultValues: any;
 }
 
 export interface IDataLanguage {