@griddo/ax 11.16.0-rc.0 → 11.16.0-rc.2

package/package.json

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

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() }));
@@ -152,9 +153,13 @@ 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);
 		}
@@ -334,6 +339,7 @@ interface IPageFinderProps {
 	fromPageOnly?: boolean;
 	defaultLang?: number;
 	disableTranslations?: boolean;
+	onlyLocal?: boolean;
 }
 
 const mapStateToProps = (state: IRootState) => ({

package/src/containers/PageEditor/actions.tsx

@@ -1662,7 +1662,7 @@ function updatePageAccessGrants(data: {
 
 			const callback = async () => {
 				if (data.pageID) {
-					await pages.setPageAccessGrants({ ...data, pageID: data.pageID });
+					return await pages.setPageAccessGrants({ ...data, pageID: data.pageID });
 				}
 			};
 

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;