@griddo/ax 11.10.30 → 11.10.34-rc.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/ax",
 	"description": "Griddo Author Experience",
-	"version": "11.10.30",
+	"version": "11.10.34-rc.1",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -217,5 +217,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "287381274d3d0fdae99a83dd5bf5633a3ddbb4e2"
+	"gitHead": "11975ec49f376d26b53ebd7c338b5eddd961bc5f"
 }

package/src/__tests__/components/ConfigPanel/Form/ConnectedField/PageConnectedField/PageConnectedField.test.tsx

@@ -1,5 +1,6 @@
 import axios from "axios";
 import configureStore from "redux-mock-store";
+import thunk from "redux-thunk";
 import { ThemeProvider } from "styled-components";
 
 import { cleanup, fireEvent, render, screen } from "../../../../../../../config/jest/test-utils";
@@ -9,7 +10,7 @@ import PageConnectedField from "@ax/components/ConfigPanel/Form/ConnectedField/P
 import { parseTheme } from "@ax/helpers";
 import globalTheme from "@ax/themes/theme.json";
 
-import thunk from "redux-thunk";
+// Mocks configuration
 
 beforeEach(() => {
 	cleanup();
@@ -18,7 +19,7 @@ beforeEach(() => {
 jest.mock("axios");
 const mockedAxios = axios as jest.MockedFunction<typeof axios>;
 
-// Mock schemasService to prevent access to undefined config and ensure all helper functions work
+// Mock @ax/services
 jest.mock("@ax/services", () => ({
 	schemasService: {
 		isLoaded: jest.fn(() => true),
@@ -79,15 +80,54 @@ jest.mock("@ax/services", () => ({
 	},
 }));
 
-// Mock schemas to prevent getPageSchemas from accessing schemasService
+// Mock @ax/schemas
 jest.mock("@ax/schemas", () => ({
 	getPageSchemas: jest.fn(() => ({})),
 	getFixedSchemas: jest.fn(() => ({})),
 }));
 
+// Mock @ax/containers/PageEditor
+jest.mock("@ax/containers/PageEditor", () => ({
+	pageEditorActions: {
+		updateEditorContent: jest.fn((_editorID: number, _key: string | string[], _value: any) => {
+			return (dispatch: any, getState: any) => {
+				const state = getState();
+				dispatch({
+					type: "pageEditor/SET_EDITOR_CONTENT",
+					payload: { editorContent: state.pageEditor.editorContent || {} },
+				});
+				dispatch({
+					type: "pageEditor/SET_SELECTED_PAGE_CONTENT",
+					payload: { selectedContent: state.pageEditor.selectedContent || {} },
+				});
+			};
+		}),
+		overwriteHeaderConfig: jest.fn(() => ({
+			type: "pageEditor/OVERWRITE_HEADER_CONFIG",
+			payload: {},
+		})),
+		setCurrentPageName: jest.fn(() => ({
+			type: "pageEditor/SET_CURRENT_PAGE_NAME",
+			payload: {},
+		})),
+		getPageBreadcrumb: jest.fn(() => (dispatch: any) => {
+			dispatch({
+				type: "pageEditor/SET_BREADCRUMB",
+				payload: {},
+			});
+		}),
+		deleteError: jest.fn(() => ({
+			type: "pageEditor/DELETE_ERROR",
+			payload: {},
+		})),
+	},
+}));
+
+// Configuración de datos (store & props)
+
 const middlewares: any = [thunk];
 const mockStore = configureStore(middlewares);
-const updateEditorContentMock = jest.fn();
+
 const initialStore = {
 	pageEditor: {
 		selectedContent: {
@@ -132,7 +172,9 @@ const initialStore = {
 		savedMenus: null,
 	},
 	navigationActions: {
-		updateEditorContent: updateEditorContentMock,
+		// Aquí usamos un jest.fn() simple placeholder si es necesario,
+		// o podemos omitirlo si el componente no lo llama directamente desde el state
+		updateEditorContent: jest.fn(),
 	},
 };
 
@@ -249,7 +291,6 @@ describe("PageConnectedField component rendering", () => {
 			{ store },
 		);
 
-		// Check that "Template Options" title is rendered
 		const templateTitles = screen.getAllByText("Template Options");
 		expect(templateTitles).toHaveLength(2); // Title and label
 		const titleElement = templateTitles[0]; // First one should be the title
@@ -257,9 +298,13 @@ describe("PageConnectedField component rendering", () => {
 	});
 
 	it("should call getPageBreadCrumb", () => {
-		defaultProps.field.key = "parent";
-		const initialStore = {
+		// Clonamos para no mutar el original en otros tests si corren en paralelo/secuencia
+		const props = { ...defaultProps, field: { ...defaultProps.field, key: "parent" } };
+
+		const localStoreState = {
+			...initialStore,
 			pageEditor: {
+				...initialStore.pageEditor,
 				selectedEditorID: 1,
 				selectedContent: {
 					type: "TextField",
@@ -272,29 +317,13 @@ describe("PageConnectedField component rendering", () => {
 						headerConfig: {},
 					},
 				},
-				errors: [{}],
-			},
-			sites: {
-				currentSitePages: [
-					{
-						editorID: 1,
-					},
-				],
-				themeElements: null,
-			},
-			app: {
-				lang: { locale: "es-ES", id: 0 },
-			},
-			dataPacks: {
-				templates: [{ id: "default" }, { id: "BasicTemplate" }],
-				activated: [],
 			},
 		};
 
-		const store = mockStore(initialStore);
+		const store = mockStore(localStoreState);
 		const component = (
 			<ThemeProvider theme={parseTheme(globalTheme)}>
-				<PageConnectedField {...defaultProps} />
+				<PageConnectedField {...props} />
 			</ThemeProvider>
 		);
 
@@ -304,16 +333,19 @@ describe("PageConnectedField component rendering", () => {
 		const inputComponent = screen.getByTestId<HTMLInputElement>("input-component");
 		expect(inputComponent).toBeTruthy();
 		fireEvent.change(inputComponent, { target: { value: "value" } });
+
 		expect(store.getActions()).toContainEqual({
-			payload: { editorContent: initialStore.pageEditor.editorContent },
+			payload: { editorContent: localStoreState.pageEditor.editorContent },
 			type: "pageEditor/SET_EDITOR_CONTENT",
 		});
 	});
 
 	it("should call updateEditorContent if key is title and isPageTitle", () => {
-		defaultProps.field.key = "title";
-		const initialStore = {
+		const props = { ...defaultProps, field: { ...defaultProps.field, key: "title" } };
+		const localStoreState = {
+			...initialStore,
 			pageEditor: {
+				...initialStore.pageEditor,
 				selectedEditorID: 1,
 				selectedContent: {
 					type: "TextField",
@@ -326,48 +358,33 @@ describe("PageConnectedField component rendering", () => {
 						headerConfig: {},
 					},
 				},
-				errors: [{}],
-			},
-			sites: {
-				currentSitePages: [
-					{
-						editorID: 1,
-					},
-				],
-				themeElements: null,
-			},
-			app: {
-				lang: { locale: "es-ES", id: 0 },
-			},
-			dataPacks: {
-				templates: [{ id: "default" }, { id: "BasicTemplate" }],
-				activated: [],
 			},
 		};
 
-		const store = mockStore(initialStore);
+		const store = mockStore(localStoreState);
 		const component = (
 			<ThemeProvider theme={parseTheme(globalTheme)}>
-				<PageConnectedField {...defaultProps} />
+				<PageConnectedField {...props} />
 			</ThemeProvider>
 		);
 
 		render(component, { store });
 
-		// It's loading Field -> FieldContainer with a TextField
 		const inputComponent = screen.getByTestId<HTMLInputElement>("input-component");
 		expect(inputComponent).toBeTruthy();
 		fireEvent.change(inputComponent, { target: { value: "value" } });
 		expect(store.getActions()).toContainEqual({
-			payload: { editorContent: initialStore.pageEditor.editorContent },
+			payload: { editorContent: localStoreState.pageEditor.editorContent },
 			type: "pageEditor/SET_EDITOR_CONTENT",
 		});
 	});
 
 	it("should call updateEditorContent if key is file and isComponentImage", () => {
-		defaultProps.field.key = "file";
-		const initialStore = {
+		const props = { ...defaultProps, field: { ...defaultProps.field, key: "file" } };
+		const localStoreState = {
+			...initialStore,
 			pageEditor: {
+				...initialStore.pageEditor,
 				selectedEditorID: 1,
 				selectedContent: {
 					type: "TextField",
@@ -380,29 +397,13 @@ describe("PageConnectedField component rendering", () => {
 						headerConfig: {},
 					},
 				},
-				errors: [{}],
-			},
-			sites: {
-				currentSitePages: [
-					{
-						editorID: 1,
-					},
-				],
-				themeElements: null,
-			},
-			app: {
-				lang: { locale: "es-ES", id: 0 },
-			},
-			dataPacks: {
-				templates: [{ id: "default" }, { id: "BasicTemplate" }],
-				activated: [],
 			},
 		};
 
-		const store = mockStore(initialStore);
+		const store = mockStore(localStoreState);
 		const component = (
 			<ThemeProvider theme={parseTheme(globalTheme)}>
-				<PageConnectedField {...defaultProps} />
+				<PageConnectedField {...props} />
 			</ThemeProvider>
 		);
 
@@ -413,17 +414,25 @@ describe("PageConnectedField component rendering", () => {
 		expect(inputComponent).toBeTruthy();
 		fireEvent.change(inputComponent, { target: { value: "value" } });
 		expect(store.getActions()).toContainEqual({
-			payload: { editorContent: initialStore.pageEditor.editorContent },
+			payload: { editorContent: localStoreState.pageEditor.editorContent },
 			type: "pageEditor/SET_EDITOR_CONTENT",
 		});
 	});
 
 	it("should call updateEditorContent if key is slugTo is present", () => {
-		defaultProps.field.key = "file";
-		defaultProps.field.slugTo = "value";
+		const props = {
+			...defaultProps,
+			field: {
+				...defaultProps.field,
+				key: "file",
+				slugTo: "value",
+			},
+		};
 
-		const initialStore = {
+		const localStoreState = {
+			...initialStore,
 			pageEditor: {
+				...initialStore.pageEditor,
 				selectedEditorID: 1,
 				selectedContent: {
 					type: "TextField",
@@ -436,29 +445,13 @@ describe("PageConnectedField component rendering", () => {
 						headerConfig: {},
 					},
 				},
-				errors: [{}],
-			},
-			sites: {
-				currentSitePages: [
-					{
-						editorID: 1,
-					},
-				],
-				themeElements: null,
-			},
-			app: {
-				lang: { locale: "es-ES", id: 0 },
-			},
-			dataPacks: {
-				templates: [{ id: "default" }, { id: "BasicTemplate" }],
-				activated: [],
 			},
 		};
 
-		const store = mockStore(initialStore);
+		const store = mockStore(localStoreState);
 		const component = (
 			<ThemeProvider theme={parseTheme(globalTheme)}>
-				<PageConnectedField {...defaultProps} />
+				<PageConnectedField {...props} />
 			</ThemeProvider>
 		);
 
@@ -469,7 +462,7 @@ describe("PageConnectedField component rendering", () => {
 		expect(inputComponent).toBeTruthy();
 		fireEvent.change(inputComponent, { target: { value: "value" } });
 		expect(store.getActions()).toContainEqual({
-			payload: { editorContent: initialStore.pageEditor.editorContent },
+			payload: { editorContent: localStoreState.pageEditor.editorContent },
 			type: "pageEditor/SET_EDITOR_CONTENT",
 		});
 	});

package/src/components/Modal/style.tsx

@@ -90,7 +90,6 @@ export const ButtonWrapper = styled.div`
 `;
 
 export const ModalFooter = styled.div`
-  position: fixed;
   bottom: 0;
   left: 0;
   width: 100%;

package/src/containers/App/actions.tsx

@@ -66,7 +66,7 @@ function setHistoryPush(path: string, isEditor?: boolean): (dispatch: Dispatch)
 			if (isEditor) {
 				resetStateValues(dispatch);
 			}
-			history.push(path);
+			history.push(path, isEditor ? { isFromEditor: true } : undefined);
 		} catch (e) {
 			console.log("Error", e);
 		}

package/src/hooks/forms.tsx

@@ -1,9 +1,10 @@
-import { useState, useEffect, useRef, memo } from "react";
-import isEqual from "lodash.isequal";
+import { memo, useEffect, useRef, useState } from "react";
 
-import { deepClone } from "@ax/helpers";
 import { cleanPageValues, getIsSavedData } from "@ax/forms";
-import { FormContent, IUser } from "@ax/types";
+import { deepClone, isEmptyObj } from "@ax/helpers";
+import type { FormContent, IUser } from "@ax/types";
+
+import isEqual from "lodash.isequal";
 
 const useDebounce = (value: any) => {
 	// State and setters for debounced value
@@ -26,28 +27,38 @@ const useDebounce = (value: any) => {
 const useEqualStructured = (component: any) => {
 	return memo(component, (prevProps: any, newProps: any) => {
 		const { fieldKey } = prevProps;
-		const prevValue = prevProps.form.content && prevProps.form.content[fieldKey];
+		const prevValue = prevProps.form.content?.[fieldKey];
 		const newValue = newProps.form.content[fieldKey];
 
 		return prevValue === newValue;
 	});
 };
 
-const usePrevious = (value: any, isSaved?: boolean): Record<string, unknown> | undefined => {
-	const stringValue = value && JSON.stringify(value);
-	const ref = useRef();
+/**
+ * Stores the provided value (object or string) and returns the previous value,
+ * updating it only when a "saved" state is detected (either from the external state
+ * manager, or explicitly via the second argument). Useful for detecting changes
+ * and implementing dirty checks.
+ *
+ * @param value - The current value to track.
+ * @param isSaved - Optional flag to indicate if the value has been saved/reset externally.
+ * @returns The previously saved value, or undefined for first render.
+ */
+const usePrevious = (value: Record<string, unknown> | string, isSaved?: boolean) => {
+	const valueStr = value && JSON.stringify(value);
+	const ref = useRef<Record<string, unknown> | string | undefined>(undefined);
 	const isSavedData = getIsSavedData();
 
 	useEffect(() => {
-		if (!ref.current) {
-			ref.current = stringValue && JSON.parse(stringValue);
+		if (!ref.current || isEmptyObj(ref.current)) {
+			ref.current = valueStr && JSON.parse(valueStr);
 		}
-	}, [stringValue]);
+	}, [valueStr]);
 
-	// biome-ignore lint/correctness/useExhaustiveDependencies: TODO: fix this
+	// biome-ignore lint/correctness/useExhaustiveDependencies: TODO fix this
 	useEffect(() => {
 		if (isSavedData || isSaved) {
-			ref.current = stringValue && JSON.parse(stringValue);
+			ref.current = valueStr && JSON.parse(valueStr);
 		}
 	}, [isSavedData, isSaved]);
 
@@ -62,14 +73,12 @@ const useIsDirty = (
 	const [isSaved, setIsSaved] = useState(false);
 	const [isResetting, setIsResetting] = useState(false);
 
-	const updatedValuesStr = JSON.stringify(updatedValues);
-
 	const prevContent = usePrevious(updatedValues, isSaved);
 
 	const hasChanged = (): boolean => {
-		if (prevContent && updatedValuesStr) {
-			const updatedValuesCloned = updatedValuesStr && deepClone(updatedValuesStr);
+		if (prevContent && updatedValues) {
 			const originalValuesCloned = prevContent && deepClone(prevContent);
+			const updatedValuesCloned = updatedValues && deepClone(updatedValues);
 
 			const { cleanUpdatedValues, cleanOriginalValues } = cleanPageValues(updatedValuesCloned, originalValuesCloned);
 
@@ -95,7 +104,7 @@ const useIsDirty = (
 
 		if (isNew) {
 			setIsDirty(false);
-		} else if (prevContent && updatedValuesStr) {
+		} else if (prevContent && updatedValues) {
 			const isUpdated = hasChanged();
 
 			if (isUpdated) {
@@ -105,15 +114,15 @@ const useIsDirty = (
 				setIsDirty(false);
 			}
 		}
-	}, [updatedValuesStr]);
+	}, [updatedValues]);
 
 	return { isDirty, setIsDirty, resetDirty };
 };
 
 const cleanModified = (updatedValues: any, originalValues: any) => {
-	delete updatedValues["modified"];
+	delete updatedValues.modified;
 
-	delete originalValues["modified"];
+	delete originalValues.modified;
 
 	return {
 		cleanUpdatedValues: updatedValues,
@@ -127,6 +136,7 @@ const useShouldBeSaved = (form: Record<string, unknown> | IUser | FormContent) =
 
 	const stringValue = form && JSON.stringify(form);
 
+	// biome-ignore lint/correctness/useExhaustiveDependencies: TODO fix this
 	useEffect(() => {
 		if (!formRef.current) {
 			formRef.current = stringValue && JSON.parse(stringValue);

package/src/modules/Content/index.tsx

@@ -321,7 +321,16 @@ const Content = (props: IProps): JSX.Element => {
 	// biome-ignore lint/correctness/useExhaustiveDependencies: TODO: fix this
 	useLayoutEffect(() => {
 		checkUserSession();
-		if (history.action !== "POP" && (!locationState || locationState.isFromEditor !== true)) {
+		const isFromEditor = locationState?.isFromEditor === true;
+		const hasFilterSet = filter && filter !== "unique-pages";
+		// Only reset filter if:
+		// - Not a POP navigation (back button) - preserve filter when going back
+		// - Not coming from editor - preserve filter when returning from editor
+		// - If POP without filter set and not from editor, reset to default
+		if (history.action !== "POP" && !isFromEditor) {
+			setFilter("unique-pages");
+		} else if (history.action === "POP" && !hasFilterSet && !isFromEditor) {
+			// Only reset on POP if no filter was set and not coming from editor
 			setFilter("unique-pages");
 		}
 		resetPageEditor();

package/src/modules/Settings/ContentTypes/DataPacks/Config/Form/index.tsx

@@ -1,7 +1,10 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { connect } from "react-redux";
 
-import {
+import { FieldsBehavior, Modal, Tag } from "@ax/components";
+import { dataPacksActions } from "@ax/containers/Settings";
+import { useModal } from "@ax/hooks";
+import type {
 	IDataPack,
 	IDataPackConfigImport,
 	IDataPackConfigImportCategory,
@@ -10,11 +13,9 @@ import {
 	IStructuredData,
 	ITemplate,
 } from "@ax/types";
-import { dataPacksActions } from "@ax/containers/Settings";
-import { FieldsBehavior, Modal, Tag } from "@ax/components";
-import { useModal } from "@ax/hooks";
 
 import TemplateConfig from "./TemplateConfig";
+
 import * as S from "./style";
 
 const Form = (props: IProps): JSX.Element => {
@@ -34,11 +35,10 @@ const Form = (props: IProps): JSX.Element => {
 		const value: Record<string, ICategoryValue[]> = {};
 		if (!importValue) return value;
 		importValue.forEach((item: IDataPackConfigImport) => {
-			item.categories &&
-				item.categories.forEach((cat: IDataPackConfigImportCategory) => {
-					const catObj = { value: cat.id, title: cat.title, structuredData: cat.structuredData };
-					value[cat.structuredData] = value[cat.structuredData] ? [...value[cat.structuredData], catObj] : [catObj];
-				});
+			item.categories?.forEach((cat: IDataPackConfigImportCategory) => {
+				const catObj = { value: cat.id, title: cat.title, structuredData: cat.structuredData };
+				value[cat.structuredData] = value[cat.structuredData] ? [...value[cat.structuredData], catObj] : [catObj];
+			});
 		});
 		return value;
 	};
@@ -48,12 +48,12 @@ const Form = (props: IProps): JSX.Element => {
 	const { isOpen, toggleModal } = useModal();
 
 	const selectOptions: { value: string; label: string }[] = [];
-	templates.forEach((template: ITemplate) =>
+	templates.forEach((template: ITemplate) => {
 		selectOptions.push({
 			value: template.id,
 			label: template.title,
-		}),
-	);
+		});
+	});
 
 	const indexDefaultOptions = [
 		{
@@ -100,18 +100,15 @@ const Form = (props: IProps): JSX.Element => {
 	};
 
 	const getIsGlobal = (id: string): boolean => {
-		const data = allStructuredData && allStructuredData.site.find((elem) => elem.id === id);
-		return data && data.local ? false : true;
+		const data = allStructuredData?.site.find((elem) => elem.id === id);
+		return !data?.local;
 	};
 
 	const globalPageData = structuredData.find((data) => data.fromPage && !data.local);
 
-	const elements =
-		globalPageData &&
-		globalPageData.relatedCategories &&
-		globalPageData.relatedCategories.map((cat) => {
-			return { source: cat, key: cat, placeholder: getCategoryText(cat), isGlobal: getIsGlobal(cat) };
-		});
+	const elements = globalPageData?.relatedCategories?.map((cat) => {
+		return { source: cat, key: cat, placeholder: getCategoryText(cat), isGlobal: getIsGlobal(cat) };
+	});
 
 	const deleteTag = (catID: number) => {
 		const newCategories = configFormData.import.map((type: IDataPackConfigImport) => {
@@ -124,24 +121,19 @@ const Form = (props: IProps): JSX.Element => {
 
 	const getCategoryLabels = () => (
 		<S.CategoriesWrapper isEmpty={!Object.keys(selectedCategories).length}>
-			{configFormData &&
-				configFormData.import &&
-				configFormData.import.map((data: IDataPackConfigImport) => {
+			{configFormData?.import?.map((data: IDataPackConfigImport) => {
+				return data.categories?.map((category: IDataPackConfigImportCategory) => {
+					const categoryText = getCategoryText(category.structuredData);
+					const handleDeleteTag = () => deleteTag(category.id);
 					return (
-						data.categories &&
-						data.categories.map((category: IDataPackConfigImportCategory) => {
-							const categoryText = getCategoryText(category.structuredData);
-							const handleDeleteTag = () => deleteTag(category.id);
-							return (
-								<Tag
-									key={`${categoryText}-${category.title}`}
-									text={`${categoryText}: ${category.title}`}
-									onDeleteAction={handleDeleteTag}
-								/>
-							);
-						})
+						<Tag
+							key={`${categoryText}-${category.title}`}
+							text={`${categoryText}: ${category.title}`}
+							onDeleteAction={handleDeleteTag}
+						/>
 					);
-				})}
+				});
+			})}
 		</S.CategoriesWrapper>
 	);
 
@@ -156,10 +148,12 @@ const Form = (props: IProps): JSX.Element => {
 								If you want to get any Global {selected.title} Pages on this site automatically, you can do so by
 								selecting the respective categories.
 							</S.Text>
-							{configFormData && configFormData.import && getCategoryLabels()}
-							<S.StyledButton type="button" buttonStyle="text" icon="addCircle" onClick={toggleModal}>
-								Add Category
-							</S.StyledButton>
+							{configFormData?.import && getCategoryLabels()}
+							{elements && elements.length > 0 ? (
+								<S.StyledButton type="button" buttonStyle="text" icon="addCircle" onClick={toggleModal}>
+									Add Category
+								</S.StyledButton>
+							) : null}
 						</S.SubscribeWrapper>
 					</S.SectionContent>
 				)}
@@ -171,7 +165,7 @@ const Form = (props: IProps): JSX.Element => {
 						fieldType="AsyncSelect"
 						site={currentSite}
 						entity={"pages"}
-						value={configFormData && configFormData.defaultParent}
+						value={configFormData?.defaultParent}
 						onChange={setDefaultParent}
 						options={{ excludeDetailPages: true }}
 					/>
@@ -179,14 +173,14 @@ const Form = (props: IProps): JSX.Element => {
 						title="Modifiable in page"
 						name="defaultParent"
 						fieldType="ToggleField"
-						value={(configFormData && configFormData.modifiableOnPage) || false}
+						value={configFormData?.modifiableOnPage || false}
 						onChange={setModifiableOnPage}
 					/>
 					<FieldsBehavior
 						title="Meta robots index default"
 						name="indexDefault"
 						fieldType="RadioGroup"
-						value={(configFormData && configFormData.indexDefault) || false}
+						value={configFormData?.indexDefault || false}
 						options={indexDefaultOptions}
 						onChange={setIndexDefault}
 					/>

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

@@ -92,7 +92,7 @@ const Form = (props: IProps) => {
 	const isDeleted = !!form?.deleted;
 	const isDisabled = isDeleted || disabledDatapack;
 
-	const isDataTranslatable = currentStructuredData && currentStructuredData.translate;
+	const isDataTranslatable = currentStructuredData?.translate;
 	const isScheduled = !!form && !!form.publicationScheduled;
 	const status = isScheduled
 		? "scheduled"
@@ -117,27 +117,25 @@ const Form = (props: IProps) => {
 		}
 	}, []);
 
-	const Fields =
-		fieldsTranslate &&
-		fieldsTranslate
-			.filter((field: ISchemaField) => !field.hidden)
-			.map((field: ISchemaField, i: number) => {
-				const { type, key } = field;
-				if (key === "title") {
-					title = form?.content && form.content[key] ? form.content[key] : "";
-				}
-				return (
-					<ConnectedField
-						fieldKey={key}
-						field={field}
-						key={`${type}${i}`}
-						site={site}
-						disabled={isDisabled}
-						theme={site ? site.theme : theme}
-						languages={languages}
-					/>
-				);
-			});
+	const Fields = fieldsTranslate
+		?.filter((field: ISchemaField) => !field.hidden)
+		.map((field: ISchemaField, i: number) => {
+			const { type, key } = field;
+			if (key === "title") {
+				title = form?.content?.[key] ? form.content[key] : "";
+			}
+			return (
+				<ConnectedField
+					fieldKey={key}
+					field={field}
+					key={`${type}${i}`}
+					site={site}
+					disabled={isDisabled}
+					theme={site ? site.theme : theme}
+					languages={languages}
+				/>
+			);
+		});
 
 	const handleSave = async (publish: boolean, scheduleDate?: string | null) => {
 		const validated = publish && !skipReviewOnPublish ? await validateForm(true) : true;
@@ -195,7 +193,7 @@ const Form = (props: IProps) => {
 
 	const availableLanguages = isDisabled ? currentLanguages : languages;
 
-	const setRoute = (path: string) => setHistoryPush(path);
+	const setRoute = (path: string) => setHistoryPush(path, true);
 
 	const modalText = (
 		<>