@griddo/ax 11.16.0-rc.1 → 11.16.0-rc.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/ax",
 	"description": "Griddo Author Experience",
-	"version": "11.16.0-rc.1",
+	"version": "11.16.0-rc.3",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -219,5 +219,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "637014e49d261e8866cb4268059007e7e50b3e51"
+	"gitHead": "f673c2a5efb5cd37858b5e6477aedbc44370271e"
 }

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

@@ -31,17 +31,13 @@ const GlobalPageForm = (props: IGlobalPageFormProps): JSX.Element => {
 
 	const isAllowedToEditGlobalData = useGlobalPermission("global.globalData.editAllGlobalData");
 
-	const handleGetGlobalPage = async () => {
-		actions.saveCurrentSiteInfoAction();
-		await actions.getGlobalFromLocalPageAction();
-	};
-
 	const handleClick = async () => {
 		if (isAllowedToEditGlobalData) {
 			const navigate = async () => {
-				await handleGetGlobalPage();
+				await actions.getGlobalFromLocalPageAction();
 				const path = "/data/pages/editor";
 				setHistoryPush?.(path, true);
+				actions.saveCurrentSiteInfoAction();
 			};
 
 			if (isDirty && onNavigateWithDirty) {

package/src/components/PageFinder/index.tsx

@@ -27,6 +27,7 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
 		fromPageOnly = true,
 		defaultLang,
 		disableTranslations = false,
+		onlyLocal,
 	} = props;
 
 	const langOptions = globalLangs.map((lang) => ({ label: lang.label, value: lang.id.toString() }));
@@ -34,7 +35,7 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
 	const initialState: IState = {
 		site: globalContent ? null : currentSiteID || allSites[0].id,
 		lang: defaultLang || lang.id,
-		type: "all",
+		type: onlyLocal ? "local" : "all",
 		items: [],
 		page: 1,
 		totalItems: 0,
@@ -49,12 +50,12 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
 
 	const defultTypeOptions = !globalContent
 		? [
-				{ label: "All content", value: "all" },
+				{ label: "All content", value: onlyLocal ? "local" : "all" },
 				{ label: "Base templates", value: "basic" },
 				{ label: "List pages", value: "list" },
 				{ label: "Static pages", value: "static" },
 			]
-		: [{ label: "All content", value: "all" }];
+		: [{ label: "All content", value: onlyLocal ? "local" : "all" }];
 
 	const [contentTypeOptions, setContentTypeOptions] = useState<{ label: string; value: string }[]>(defultTypeOptions);
 
@@ -120,7 +121,7 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
 			itemsPerPage,
 			query: searchQuery,
 			lang: state.lang,
-			filterStructuredData: isTypeFilter(state.type) ? "all" : state.type,
+			filterStructuredData: isTypeFilter(state.type) ? (onlyLocal ? "local" : "all") : state.type,
 			format: "list",
 		};
 
@@ -152,15 +153,19 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
 		const { site, lang } = state;
 		const { data }: { data: { items: IContentType[] } } = await structuredData.getData(null, site, lang);
 		let contentTypes = data.items
-			? data.items.map((type) => ({ label: type.title, value: type.id, fromPage: type.fromPage }))
+			? data.items.map((type) => ({ label: type.title, value: type.id, fromPage: type.fromPage, local: type.local }))
 			: [];
 
+		if (onlyLocal) {
+			contentTypes = contentTypes.filter((type) => type.local === true);
+		}
+
 		if (fromPageOnly) {
 			contentTypes = contentTypes.filter((type) => type.fromPage === true);
 		}
 
 		changeContentTypeOptions(contentTypes);
-		changeState("type", "all");
+		changeState("type", onlyLocal ? "local" : "all");
 	};
 
 	// biome-ignore lint/correctness/useExhaustiveDependencies: TODO: fix this
@@ -334,6 +339,7 @@ interface IPageFinderProps {
 	fromPageOnly?: boolean;
 	defaultLang?: number;
 	disableTranslations?: boolean;
+	onlyLocal?: boolean;
 }
 
 const mapStateToProps = (state: IRootState) => ({

package/src/containers/PageEditor/actions.tsx

@@ -1461,7 +1461,7 @@ function getGlobalFromLocalPage(): (dispatch: Dispatch, getState: any) => Promis
 			dispatch(setSitePageID(currentPageID));
 			dispatch(setCurrentPageID(originalGlobalPage));
 			structuredDataActions.setSelectedStructuredData(structuredData, "global")(dispatch, getState);
-			usersActions.getUserCurrentPermissions()(dispatch, getState);
+			usersActions.getUserCurrentPermissions("global")(dispatch, getState);
 			dispatch(setIsLoading(false));
 		} catch (e) {
 			console.log(e);

package/src/containers/Users/actions.tsx

@@ -312,7 +312,9 @@ function activateRoles(params: IActivateRole): (dispatch: Dispatch) => Promise<b
 	};
 }
 
-function getUserCurrentPermissions(): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
+function getUserCurrentPermissions(
+	scope?: "global" | "site",
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
 	return async (dispatch, getState) => {
 		const {
 			users: { roles, currentUser },
@@ -323,18 +325,22 @@ function getUserCurrentPermissions(): (dispatch: Dispatch, getState: () => IRoot
 			return;
 		}
 
-		const userRoles = currentSiteInfo
-			? currentUser.roles.find((roleSite) => roleSite.siteId === currentSiteInfo.id || roleSite.siteId === "all")?.roles
-			: currentUser.roles.find((roleSite) => roleSite.siteId === "global")?.roles;
+		const userRoles =
+			!currentSiteInfo || scope === "global"
+				? currentUser.roles.find((roleSite) => roleSite.siteId === "global")?.roles
+				: currentUser.roles.find((roleSite) => roleSite.siteId === currentSiteInfo.id || roleSite.siteId === "all")
+						?.roles;
 
 		let permissions: string[] = [];
 		if (userRoles?.length) {
 			userRoles.forEach((roleID: number) => {
 				const rolePerms = roles?.reduce((acc: string[], curr: IRole) => {
 					if (curr.id === roleID) {
-						const permissions = currentSiteInfo
-							? curr.permissions.sitePermissions
-							: [...curr.permissions.globalPermissions, ...curr.permissions.sitePermissions];
+						const permissions =
+							!currentSiteInfo || scope === "global"
+								? [...curr.permissions.globalPermissions, ...curr.permissions.sitePermissions]
+								: curr.permissions.sitePermissions;
+
 						const keys = permissions.map((perm) => perm.key);
 						acc.push(...keys);
 					}
@@ -344,7 +350,7 @@ function getUserCurrentPermissions(): (dispatch: Dispatch, getState: () => IRoot
 			});
 		}
 		dispatch(setCurrentPermissions(permissions));
-		if (!currentSiteInfo) {
+		if (!currentSiteInfo || scope === "global") {
 			dispatch(setGlobalPermissions(permissions));
 		}
 	};

package/src/hooks/users.tsx

@@ -152,6 +152,7 @@ const usePermissionsForPage = <T extends Record<string, string | string[]>>(
 	permissions: T,
 	accessGrants?: PageAccessGrantsSummary | null,
 	pageLanguages?: (IDataLanguage | IPageLanguage)[],
+	originalGlobalPage?: number,
 ): Record<keyof T, boolean> => {
 	const { currentUser, roles, isSuperAdmin } = useUserState();
 
@@ -234,20 +235,33 @@ const usePermissionsForPage = <T extends Record<string, string | string[]>>(
 					: false;
 
 		// User is restricted by pagePermissions and page is not in their list
-		// But they can still access if in accessGrants
+		// But they can still access if in accessGrants or via originalGlobalPage inheritance
 		if (isPagePermissionRestricted) {
-			const pageHasAccessGrants = accessGrants?.users?.length || accessGrants?.roles?.length;
+			let hasPermissionBypass = false;
+
+			// Check if user has access via originalGlobalPage inheritance
+			if (originalGlobalPage !== undefined && currentUser.pagePermissions?.length) {
+				const globalSiteEntry = currentUser.pagePermissions.find(
+					(entry) => entry.siteId === "global",
+				);
+				hasPermissionBypass = globalSiteEntry?.pageIds.includes(originalGlobalPage) ?? false;
+			}
+
+			// Check accessGrants as fallback
+			if (!hasPermissionBypass) {
+				const pageHasAccessGrants = accessGrants?.users?.length || accessGrants?.roles?.length;
 
-			if (pageHasAccessGrants) {
-				const hasAccessGrantsAccess =
-					accessGrants.users?.includes(currentUser.id || -1) ||
-					userRoles?.some((roleId) => accessGrants.roles?.includes(roleId));
+				if (pageHasAccessGrants) {
+					const hasAccessGrantsAccess =
+						accessGrants.users?.includes(currentUser.id || -1) ||
+						userRoles?.some((roleId) => accessGrants.roles?.includes(roleId));
 
-				if (!hasAccessGrantsAccess) {
+					if (!hasAccessGrantsAccess) {
+						return createPermissionResult(false);
+					}
+				} else {
 					return createPermissionResult(false);
 				}
-			} else {
-				return createPermissionResult(false);
 			}
 		}
 
@@ -275,7 +289,7 @@ const usePermissionsForPage = <T extends Record<string, string | string[]>>(
 			result[key] = arrayPermission.some((perm: string) => sitePermissionsSet.has(perm));
 		}
 		return result as Record<keyof T, boolean>;
-	}, [siteId, pageId, permissions, accessGrants, currentUser, roles, isSuperAdmin, pageLanguages]);
+	}, [siteId, pageId, permissions, accessGrants, currentUser, roles, isSuperAdmin, pageLanguages, originalGlobalPage]);
 };
 
 export {

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

@@ -110,6 +110,7 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
 		},
 		accessGrants,
 		pageLanguages,
+		page.originalGlobalPage,
 	);
 
 	const currentTemplateDataPacks = schemas.templates[templateId].dataPacks;

package/src/modules/GlobalEditor/index.tsx

@@ -562,7 +562,7 @@ const GlobalEditor = (props: IProps) => {
 		props.setHistoryPush(backLinkRoute, true);
 	};
 
-	const mainAction = { title: "Preview Page", onClick: toggleModal };
+	const mainAction = { title: "Preview Page", onClick: () => toggleModal("userEditing") };
 	const secondaryAction = { title: "Ok, go back", onClick: handleGoBack };
 
 	const mainUnpublishAction = { title: "Ok", onClick: () => toggleModal("unpublish") };

package/src/modules/PageEditor/index.tsx

@@ -95,6 +95,7 @@ const PageEditor = (props: IProps) => {
 		},
 		accessGrants,
 		pageLanguages,
+		editorContent?.originalGlobalPage,
 	);
 
 	const defaultTab = isAllowedTo.editContentPages ? "edit" : "view";

package/src/modules/Users/UserForm/index.tsx

@@ -464,7 +464,7 @@ const UserForm = (props: IProps) => {
 										<SettingsSection
 											heading="Page permissions"
 											description="You can give access only to a specific page/s to this user."
-											actionLabel="Add Role"
+											actionLabel="Add Page"
 											onActionClick={() => toggleModal("pagePermissions")}
 											showAction={selectedPages.length === 0}
 										/>
@@ -596,6 +596,7 @@ const UserForm = (props: IProps) => {
 							defaultLang={defaultLanguage?.id}
 							alwaysShowButton
 							disableTranslations
+							onlyLocal={isSiteView}
 						/>
 					)}
 				</S.PanelContent>

package/src/types/index.tsx

@@ -899,7 +899,7 @@ export interface IContentType {
 	editable: boolean;
 	fromPage: boolean;
 	id: string;
-	local: false;
+	local: boolean;
 	schema: any;
 	taxonomy: boolean;
 	title: string;