@griddo/ax 11.15.5 → 11.15.6-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/ax",
 	"description": "Griddo Author Experience",
-	"version": "11.15.5",
+	"version": "11.15.6-rc.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": "bd040f49a71fc8eb3ced92dd17cd3e27bb885b36"
+	"gitHead": "9f4379b06a1656e5e1d2762a87d06e5b9ce53a65"
 }

package/src/modules/PublicPreview/index.tsx

@@ -1,9 +1,8 @@
-import { useEffect, useState } from "react";
-import { useParams } from "react-router-dom";
-
 import { pages, shareToken as shareTokenApi } from "@ax/api";
 import { BrowserContent, ErrorPage, Loading } from "@ax/components";
 import { getDefaultTheme, isReqOk } from "@ax/helpers";
+import { useEffect, useState } from "react";
+import { useParams } from "react-router-dom";
 
 import * as S from "./style";
 
@@ -39,7 +38,13 @@ const PublicPreview = () => {
 					setShareEndDate(shareResponse.data.endDate);
 				}
 			} else {
-				setTokenError(response.status === 404 ? "404" : response.status === 410 ? "linkExpired" : "wrong");
+				setTokenError(
+					response.status === 404
+						? "404"
+						: response.status === 410
+							? "linkExpired"
+							: "wrong",
+				);
 			}
 
 			setIsLoading(false);
@@ -59,7 +64,13 @@ const PublicPreview = () => {
 	const globalTheme = getDefaultTheme();
 	const theme = state?.site ? state.siteInfo.theme : globalTheme;
 	const socials = state?.site ? state.siteInfo.socials : [];
-	const langs = state?.site ? state.siteInfo.siteLanguages : [];
+	const derivedLangs = (state?.pageLanguages ?? []).map(
+		(pl: { languageId: number; locale: string }) => ({
+			id: pl.languageId,
+			locale: pl.locale,
+		}),
+	);
+	const langs = state?.site ? state.siteInfo.siteLanguages : derivedLangs;
 	const siteID = state?.siteInfo ? state.siteInfo.siteId : undefined;
 
 	if (tokenError) {

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

@@ -15,10 +15,11 @@ import { appActions } from "@ax/containers/App";
 import { sitesActions } from "@ax/containers/Sites";
 import { usersActions } from "@ax/containers/Users";
 import { RouteLeavingGuard } from "@ax/guards";
-import { useModal, useShouldBeSaved, useURLSearchParam } from "@ax/hooks";
+import { useModals, useShouldBeSaved, useURLSearchParam } from "@ax/hooks";
 import type { IImage, IRole, IRootState, ISite, IUser } from "@ax/types";
 
 import { timezones } from "../../Settings/Globals/constants";
+import { PasswordModal } from "../UserForm/atoms";
 import { LinkDeviceModal } from "./atoms";
 
 import * as S from "./style";
@@ -45,7 +46,7 @@ const Profile = (props: IProps) => {
 
 	const [form, setForm] = useState<IUser>(initForm);
 	const [activeTab, setActiveTab] = useState<(typeof PROFILE_TABS)[keyof typeof PROFILE_TABS]>(PROFILE_TABS.PROFILE);
-	const { isOpen, toggleModal } = useModal();
+	const { isOpen, toggleModal } = useModals(["linkDevice", "password"]);
 	const { isDirty, setIsDirty } = useShouldBeSaved(form);
 
 	useEffect(() => {
@@ -78,7 +79,7 @@ const Profile = (props: IProps) => {
 	const lineButtonProps = user.isSuperAdmin
 		? {
 				label: "Link Device",
-				action: toggleModal,
+				action: () => toggleModal("linkDevice"),
 				icon: "QrCode",
 			}
 		: undefined;
@@ -156,7 +157,7 @@ const Profile = (props: IProps) => {
 									readonly
 									value="********"
 									icon="edit"
-									onClickIcon={toggleModal}
+									onClickIcon={() => toggleModal("password")}
 								/>
 							</S.FormColumn>
 							<S.FormColumn>
@@ -206,7 +207,8 @@ const Profile = (props: IProps) => {
 					)}
 				</S.Content>
 			</S.ProfileWrapper>
-			<LinkDeviceModal isOpen={isOpen} toggleModal={toggleModal} token={token} />
+			<PasswordModal isOpen={isOpen("password")} toggleModal={() => toggleModal("password")} id={user.id} />
+			<LinkDeviceModal isOpen={isOpen("linkDevice")} toggleModal={() => toggleModal("linkDevice")} token={token} />
 		</MainWrapper>
 	);
 };

package/src/schemas/pages/GlobalPage.ts

@@ -41,6 +41,7 @@ export default {
 					title: "Slug",
 					type: "TextField",
 					key: "slug",
+					humanReadable: true,
 				},
 				{
 					title: "Template",

package/src/schemas/pages/Page.ts

@@ -53,6 +53,7 @@ export default {
 					title: "Slug",
 					type: "TextField",
 					key: "slug",
+					humanReadable: true,
 				},
 				{
 					title: "Template",