@griddo/ax 1.49.42 → 1.51.2

package/src/containers/PageEditor/interfaces.tsx

@@ -15,6 +15,7 @@ import {
   SET_TEMPLATE_CONFIG,
   SET_ERRORS,
   SET_VALIDATED,
+  SET_SITE_PAGE_ID,
 } from "./constants";
 import { IBreadcrumbItem, ISchema, IPage, IErrorItem } from "@ax/types";
 
@@ -98,6 +99,11 @@ export interface ISetValidated {
   payload: { validated: boolean };
 }
 
+export interface ISetSitePageID {
+  type: typeof SET_SITE_PAGE_ID;
+  payload: { sitePageID: number | null };
+}
+
 export interface IFieldProps {
   id: number;
   key: string;

package/src/containers/PageEditor/reducer.tsx

@@ -18,6 +18,7 @@ import {
   SET_SELECTED_PARENT,
   SET_ERRORS,
   SET_VALIDATED,
+  SET_SITE_PAGE_ID,
 } from "./constants";
 
 import { PageEditorActionsCreators } from "./interfaces";
@@ -39,6 +40,7 @@ export interface IPageEditorState {
   selectedParent: Record<string, unknown> | null;
   errors: IErrorItem[];
   validated: boolean;
+  sitePageID: number | null;
 }
 
 export const initialState = {
@@ -58,6 +60,7 @@ export const initialState = {
   selectedParent: null,
   errors: [],
   validated: false,
+  sitePageID: null,
 };
 
 export function reducer(state = initialState, action: PageEditorActionsCreators): IPageEditorState {
@@ -79,6 +82,7 @@ export function reducer(state = initialState, action: PageEditorActionsCreators)
     case SET_SELECTED_PARENT:
     case SET_ERRORS:
     case SET_VALIDATED:
+    case SET_SITE_PAGE_ID:
       return { ...state, ...action.payload };
     default:
       return state;

package/src/containers/Sites/actions.tsx

@@ -7,6 +7,7 @@ import {
   SET_TOTAL_ITEMS,
   SET_CURRENT_SITE_LANGUAGES,
   SET_UPDATED_FORM,
+  SET_SAVED_SITE_INFO,
 } from "./constants";
 import {
   ISetSitesAction,
@@ -16,6 +17,7 @@ import {
   ISetTotalItems,
   ISetCurrentSiteLanguagesAction,
   ISetUpdatedFormAction,
+  ISetSavedSiteInfoAction,
 } from "./interfaces";
 
 import { ISite, IGetSitePagesParams, ISettingsForm, IGetGlobalPagesParams, IPage } from "@ax/types";
@@ -62,6 +64,10 @@ function setUpdatedForm(form: ISettingsForm): ISetUpdatedFormAction {
   return { type: SET_UPDATED_FORM, payload: { form } };
 }
 
+function setSavedSiteInfo(savedSiteInfo: ISite): ISetSavedSiteInfoAction {
+  return { type: SET_SAVED_SITE_INFO, payload: { savedSiteInfo } };
+}
+
 function updateFormValue(valueObj: any): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const {
@@ -425,6 +431,20 @@ const resetSiteValues = (dispatch: Dispatch) => {
   dispatch(setTotalItems(0));
 };
 
+function saveCurrentSiteInfo(): (dispatch: Dispatch, getState: any) => Promise<void> {
+  return async (dispatch, getState) => {
+    try {
+      const {
+        sites: { currentSiteInfo },
+      } = getState();
+
+      dispatch(setSavedSiteInfo(currentSiteInfo));
+    } catch (e) {
+      console.log(e);
+    }
+  };
+}
+
 export {
   // setSites,
   setCurrentSiteInfo,
@@ -445,4 +465,6 @@ export {
   unpublishSite,
   saveSettings,
   getGlobalPages,
+  setSavedSiteInfo,
+  saveCurrentSiteInfo,
 };

package/src/containers/Sites/constants.tsx

@@ -1,11 +1,11 @@
-export const NAME: string = "sites";
+export const NAME = "sites";
 
-export const SET_SITES: string = `${NAME}/SET_SITES`;
-export const SET_CURRENT_SITE_INFO: string = `${NAME}/SET_CURRENT_SITE_INFO`;
-export const SET_CURRENT_SITE_PAGES: string = `${NAME}/SET_CURRENT_SITE_PAGES`;
+export const SET_SITES = `${NAME}/SET_SITES`;
+export const SET_CURRENT_SITE_INFO = `${NAME}/SET_CURRENT_SITE_INFO`;
+export const SET_CURRENT_SITE_PAGES = `${NAME}/SET_CURRENT_SITE_PAGES`;
 export const SET_FILTER: string | null = `${NAME}/SET_FILTER`;
 export const SET_TOTAL_ITEMS: string | null = `${NAME}/SET_TOTAL_ITEMS`;
 export const SET_CURRENT_SITE_LANGUAGES: string | null = `${NAME}/SET_CURRENT_SITE_LANGUAGES`;
-export const SET_UPDATED_FORM: string = `${NAME}/SET_UPDATED_FORM`;
-export const SET_INITIAL_VALUES: string = `${NAME}/SET_INITIAL_VALUES`;
-
+export const SET_UPDATED_FORM = `${NAME}/SET_UPDATED_FORM`;
+export const SET_INITIAL_VALUES = `${NAME}/SET_INITIAL_VALUES`;
+export const SET_SAVED_SITE_INFO = `${NAME}/SET_SAVED_SITE_INFO`;

package/src/containers/Sites/interfaces.tsx

@@ -7,6 +7,7 @@ import {
   SET_CURRENT_SITE_LANGUAGES,
   SET_UPDATED_FORM,
   SET_INITIAL_VALUES,
+  SET_SAVED_SITE_INFO,
 } from "./constants";
 import { ISite } from "@ax/types";
 
@@ -55,4 +56,9 @@ export interface ISetInitialValuesAction {
   payload: { initialValues: any };
 }
 
+export interface ISetSavedSiteInfoAction {
+  type: typeof SET_SAVED_SITE_INFO;
+  payload: { savedSiteInfo: ISite };
+}
+
 export type SitesActionsCreators = ISetSitesAction & ISetCurrentSiteInfoAction;

package/src/containers/Sites/reducer.tsx

@@ -7,6 +7,7 @@ import {
   SET_CURRENT_SITE_LANGUAGES,
   SET_UPDATED_FORM,
   SET_INITIAL_VALUES,
+  SET_SAVED_SITE_INFO,
 } from "./constants";
 
 import { ISite, IPage, ILanguage, ISettingsForm } from "@ax/types";
@@ -21,6 +22,7 @@ export interface ISitesState {
   currentFilter: string | null;
   totalItems: number;
   currentSiteLanguages: ILanguage[];
+  savedSiteInfo: any;
   form: ISettingsForm;
   initialValues: ISettingsForm;
 }
@@ -33,6 +35,7 @@ export const initialState = {
   currentFilter: "unique-pages",
   totalItems: 0,
   currentSiteLanguages: [],
+  savedSiteInfo: null,
   form: {
     name: "",
     defaultLanguage: null,
@@ -69,6 +72,7 @@ export function reducer(state = initialState, action: SitesActionsCreators): ISi
     case SET_CURRENT_SITE_LANGUAGES:
     case SET_UPDATED_FORM:
     case SET_INITIAL_VALUES:
+    case SET_SAVED_SITE_INFO:
       return { ...state, ...action.payload };
     default:
       return state;

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/fields.tsx

@@ -18,7 +18,7 @@ const getInnerFields = (
       const { key } = singleFieldProps;
       const error = errors && errors.find((err: any) => err.editorID === selectedContent.editorID && err.key === key);
 
-      if (singleFieldProps.type === "ConditionalField") {
+      if (singleFieldProps.type === "ConditionalField" || singleFieldProps.type === "ArrayFieldGroup") {
         fieldArr = getInnerFields(
           singleFieldProps.fields,
           innerActions,

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/hooks/bulk.tsx

@@ -10,6 +10,7 @@ const useBulkSelection = (itemIDs: any[]) => {
     published: [],
   };
 
+  const [items, setItems] = useState<any[]>([]);
   const [selectedItems, setSelectedItems] = useState(selectedItemsInitialState);
   const [checkState, setCheckState] = useState<Record<string, boolean>>({
     isAllSelected: false,
@@ -17,13 +18,21 @@ const useBulkSelection = (itemIDs: any[]) => {
   });
 
   useEffect(() => {
-    const isAllSelected = areAllItemsSelected(itemIDs);
-    const indeterminate = !isAllSelected && areItemsSelected(itemIDs);
+    const isAllSelected = areAllItemsSelected(items);
+    const indeterminate = !isAllSelected && areItemsSelected(items);
 
     setCheckState({ isAllSelected, indeterminate });
 
     // eslint-disable-next-line
-  }, [selectedItems]);
+  }, [selectedItems, items]);
+
+  useEffect(() => {
+    if (items.length !== itemIDs.length) {
+      setItems(itemIDs);
+    }
+
+    // eslint-disable-next-line
+  }, [itemIDs]);
 
   const isSelected = (value: any) => selectedItems.all.includes(value);
   const areAllItemsSelected = (itemsAvailable: any) =>

package/src/modules/Content/PageImporter/index.tsx

@@ -30,6 +30,7 @@ const PageImporter = (props: any): JSX.Element => {
       filterStructuredData: structuredData,
       query: searchQuery,
       excludeSite: siteID,
+      liveStatus: "active,upload-pending",
     };
 
     return params;

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

@@ -115,6 +115,11 @@ const GlobalEditor = (props: IProps) => {
     setTab,
     validated,
     pageEditor: { editorContent },
+    sitePageID,
+    setHistoryPush,
+    setCurrentPageID,
+    setCurrentSiteInfo,
+    savedSiteInfo,
   } = props;
 
   const languageActions = {
@@ -176,11 +181,22 @@ const GlobalEditor = (props: IProps) => {
     action: handleSavePage,
   };
 
+  const handleClickNotification = () => {
+    if (sitePageID) {
+      setCurrentSiteInfo(savedSiteInfo);
+      setCurrentPageID(sitePageID);
+      const path = "/sites/pages/editor";
+      setHistoryPush(path, true);
+    }
+  };
+
   const errorNotificationText =
     "There are some errors on the page so you can not publish yet. Please review them in the error panel.";
 
   const validatedNotificationText = "Everything seems ok, you can publish the page.";
 
+  const globalNotificationText = "You’ re working on the Global Page. Make sure you want to make changes to this page.";
+
   const backLinkRoute = "/data";
 
   return isLoading ? (
@@ -205,6 +221,7 @@ const GlobalEditor = (props: IProps) => {
         errors={errors}
         errorActions={{ goToError }}
         inversed={true}
+        isFromEditor={true}
       >
         {errors.length > 0 && (
           <S.NotificationWrapper>
@@ -216,6 +233,16 @@ const GlobalEditor = (props: IProps) => {
             <Notification type="success" text={validatedNotificationText} />
           </S.NotificationWrapper>
         )}
+        {sitePageID && (
+          <S.NotificationWrapper>
+            <Notification
+              type="info"
+              text={globalNotificationText}
+              btnText="Go Back"
+              onClick={handleClickNotification}
+            />
+          </S.NotificationWrapper>
+        )}
         <ErrorToast size="l" />
         <S.Content>
           <Editor isGlobal={true} isEditable={isEditable} />
@@ -237,6 +264,8 @@ const mapStateToProps = (state: IRootState): IPageEditorStateProps => ({
   pageEditor: state.pageEditor,
   errors: state.pageEditor.errors,
   validated: state.pageEditor.validated,
+  sitePageID: state.pageEditor.sitePageID,
+  savedSiteInfo: state.sites.savedSiteInfo,
 });
 
 interface IPageEditorStateProps {
@@ -251,6 +280,8 @@ interface IPageEditorStateProps {
   pageEditor: any;
   errors: IErrorItem[];
   validated: boolean;
+  sitePageID: number | null;
+  savedSiteInfo: any;
 }
 
 const mapDispatchToProps = {
@@ -264,6 +295,7 @@ const mapDispatchToProps = {
   createNewTranslation: pageEditorActions.createNewTranslation,
   setTab: pageEditorActions.setTab,
   setSelectedContent: pageEditorActions.setSelectedContent,
+  setCurrentPageID: pageEditorActions.setCurrentPageID,
   setCurrentSiteInfo: sitesActions.setCurrentSiteInfo,
 };
 
@@ -279,6 +311,7 @@ interface IPageEditorDispatchProps {
   setTab(tab: string): void;
   setSelectedContent(editorID: number): void;
   setCurrentSiteInfo(currentSiteInfo: any): void;
+  setCurrentPageID(currentPageID: number): void;
 }
 
 type IProps = IPageEditorStateProps & IPageEditorDispatchProps & RouteComponentProps;

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

@@ -2,6 +2,7 @@ import React from "react";
 import { connect } from "react-redux";
 
 import { pageEditorActions } from "@ax/containers/PageEditor";
+import { sitesActions } from "@ax/containers/Sites";
 import { appActions } from "@ax/containers/App";
 import { ConfigPanel, ResizePanel } from "@ax/components";
 import { IBreadcrumbItem, IRootState, ISchema } from "@ax/types";
@@ -30,6 +31,7 @@ const Editor = (props: IProps) => {
     pageTitle,
     setHistoryPush,
     getGlobalFromLocalPage,
+    saveCurrentSiteInfo,
   } = props;
 
   const actions = {
@@ -41,6 +43,7 @@ const Editor = (props: IProps) => {
     duplicateModuleAction: duplicateModule,
     replaceElementsInCollectionAction: replaceElementsInCollection,
     getGlobalFromLocalPageAction: getGlobalFromLocalPage,
+    saveCurrentSiteInfoAction: saveCurrentSiteInfo,
   };
 
   return (
@@ -81,15 +84,16 @@ 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;
   isTemplateActivated: boolean;
   isGlobal: boolean;
   isEditable: boolean;
@@ -119,6 +123,7 @@ const mapDispatchToProps = {
   replaceElementsInCollection: pageEditorActions.replaceElementsInCollection,
   setHistoryPush: appActions.setHistoryPush,
   getGlobalFromLocalPage: pageEditorActions.getGlobalFromLocalPage,
+  saveCurrentSiteInfo: sitesActions.saveCurrentSiteInfo,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(Editor);

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

package/src/types/index.tsx

@@ -262,6 +262,7 @@ export interface IGetGlobalPagesParams {
   filterQuery?: string;
   filterStructuredData?: boolean | string;
   excludeSite?: number;
+  liveStatus?: string;
 }
 
 export interface IGetStructuredDataParams {