@griddo/ax 11.16.0-rc.2 → 11.16.0

package/package.json

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

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

@@ -35,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,
@@ -50,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);
 
@@ -121,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",
 		};
 
@@ -165,7 +165,7 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
 		}
 
 		changeContentTypeOptions(contentTypes);
-		changeState("type", "all");
+		changeState("type", onlyLocal ? "local" : "all");
 	};
 
 	// biome-ignore lint/correctness/useExhaustiveDependencies: TODO: fix this

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));
 		}
 	};