@griddo/ax 12.8.5-rc.0 → 12.8.5

package/package.json

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

package/src/__tests__/hooks/users.test.tsx

@@ -4,7 +4,7 @@ import "@testing-library/jest-dom";
 import * as reactRedux from "react-redux";
 
 import { usePermissionsForPage } from "@ax/hooks";
-import type { PageAccessGrantsSummary } from "@ax/types";
+import type { IPageLanguage, PageAccessGrantsSummary } from "@ax/types";
 
 import { renderHook } from "@testing-library/react";
 
@@ -388,4 +388,39 @@ describe("usePermissionsForPage hook", () => {
 			expect(result.current.edit).toBe(false);
 		});
 	});
+
+	describe("8. Drafts (sc-119759)", () => {
+		it("should not restrict a page missing from the translation group when user has no pagePermissions", () => {
+			// El draft nunca aparece en pageLanguages: el backend filtra draft_from_page IS NULL
+			const pageLanguages = [
+				{ pageId: 100, languageId: 1 },
+				{ pageId: 200, languageId: 2 },
+			] as unknown as IPageLanguage[];
+			setupMockState({ users: { currentUser: mockUser, roles: [mockRole] } });
+
+			const { result } = renderHook(() =>
+				usePermissionsForPage(1, 555, { edit: "edit_page" }, undefined, pageLanguages),
+			);
+
+			expect(result.current.edit).toBe(true);
+		});
+
+		it("should keep denying a page missing from the group when user IS restricted by pagePermissions", () => {
+			const userWithPagePerms = {
+				...mockUser,
+				pagePermissions: [{ siteId: 1, pageIds: [100] }],
+			};
+			const pageLanguages = [
+				{ pageId: 100, languageId: 1 },
+				{ pageId: 200, languageId: 2 },
+			] as unknown as IPageLanguage[];
+			setupMockState({ users: { currentUser: userWithPagePerms, roles: [mockRole] } });
+
+			const { result } = renderHook(() =>
+				usePermissionsForPage(1, 555, { edit: "edit_page" }, undefined, pageLanguages),
+			);
+
+			expect(result.current.edit).toBe(false);
+		});
+	});
 });

package/src/hooks/users.tsx

@@ -190,20 +190,24 @@ const usePermissionsForPage = <T extends Record<string, string | string[]>>(
 			return undefined;
 		};
 
-		const hasAccessToTranslationGroup = pageLanguages?.length
-			? (() => {
-					const isPartOfGroup = pageLanguages.some((lang) => getLanguagePageId(lang) === pageId);
-					if (!isPartOfGroup) {
-						return false; // pageId is not in this translation group
-					}
+		// La restricción por grupo de traducción solo aplica a usuarios limitados por
+		// pagePermissions. Sin esa restricción el grupo no debe denegar nada: para un draft
+		// pageLanguages es el grupo de su página original —el backend resuelve el borrador a su
+		// original y filtra draft_from_page IS NULL—, así que su propio id nunca aparece ahí.
+		const hasAccessToTranslationGroup =
+			pageLanguages?.length && currentUser.pagePermissions?.length
+				? (() => {
+						const isPartOfGroup = pageLanguages.some((lang) => getLanguagePageId(lang) === pageId);
+						if (!isPartOfGroup) {
+							return false; // pageId is not in this translation group
+						}
 
-					// Get all pageIds in this translation group
-					const translationPageIds = pageLanguages
-						.map((lang) => getLanguagePageId(lang))
-						.filter((id): id is number => id !== undefined);
+						// Get all pageIds in this translation group
+						const translationPageIds = pageLanguages
+							.map((lang) => getLanguagePageId(lang))
+							.filter((id): id is number => id !== undefined);
 
-					// Check if user has access to ANY of the translation pageIds
-					if (currentUser.pagePermissions?.length) {
+						// Check if user has access to ANY of the translation pageIds
 						const siteEntry = currentUser.pagePermissions.find(
 							(entry) => entry.siteId === siteId || entry.siteId === "global",
 						);
@@ -211,11 +215,8 @@ const usePermissionsForPage = <T extends Record<string, string | string[]>>(
 							return false;
 						}
 						return translationPageIds.some((translationPageId) => siteEntry.pageIds.includes(translationPageId));
-					}
-
-					return true; // No pagePermissions restrictions, allow access
-				})()
-			: undefined;
+					})()
+				: undefined;
 
 		// If pageId is part of a translation group, use the translation group access result
 		const isPagePermissionRestricted =