@griddo/ax 11.15.9 → 11.16.0-rc.1

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

@@ -1,13 +1,34 @@
 import { useEffect, useState } from "react";
 import { connect } from "react-redux";
 
-import { Button, ErrorToast, FieldsBehavior, ProfileImage, SearchField } from "@ax/components";
+import { sites as sitesApi } from "@ax/api";
+import {
+	Button,
+	ErrorToast,
+	FieldsBehavior,
+	FloatingPanel,
+	PageFinder,
+	ProfileImage,
+	SearchField,
+} from "@ax/components";
 import { appActions } from "@ax/containers/App";
 import { RouteLeavingGuard } from "@ax/guards";
-import { useModal } from "@ax/hooks";
-import type { IImage, IRole, IRootState, ISite, ISiteRoles, IUser } from "@ax/types";
+import { isReqOk } from "@ax/helpers";
+import { useModals } from "@ax/hooks";
+import type {
+	IImage,
+	ILanguage,
+	IPage,
+	IRole,
+	IRootState,
+	ISite,
+	IUser,
+	UserPagePermissionEntry,
+	UserRoleAssignment,
+} from "@ax/types";
 
 import { timezones } from "../../Settings/Globals/constants";
+import { PagePermissionsList, SettingsSection } from "../UserCreate/atoms";
 import OptionItem from "../UserCreate/OptionItem";
 import SiteItem from "../UserCreate/SiteItem";
 import RolesModal from "../UserCreate/SiteItem/RolesModal";
@@ -29,26 +50,30 @@ const UserForm = (props: IProps) => {
 		readOnlySites = false,
 		isSiteView = false,
 		site,
+		siteLanguages,
+		globalLanguages,
 	} = props;
 
-	const { id, username, name, email, image, company, position, timezone, isSuperAdmin } = form;
+	const { id, username, name, email, image, company, position, timezone, isSuperAdmin, pagePermissions } = form;
 
 	const getSortedItemsByName = (items: ISite[]) =>
 		items.sort((item1: ISite, item2: ISite) => item1.name.localeCompare(item2.name));
 
 	const sortedByNameSites = getSortedItemsByName(sites);
 
-	const { isOpen, toggleModal } = useModal(false);
-	const { isOpen: isOpenRoleModal, toggleModal: toggleRoleModal } = useModal(false);
-	const { isOpen: isOpenTypeChangeModal, toggleModal: toggleTypeChangeModal } = useModal(false);
+	const { isOpen, toggleModal } = useModals(["password", "roles", "typeChange", "pagePermissions"]);
 	const [sitesList, setSiteList] = useState(sortedByNameSites);
 	const [showMore, setShowMore] = useState(false);
+	const [selectedPages, setSelectedPages] = useState<IPage[]>([]);
 
 	const allowedRoutes = ["/profile"];
 	const { isDirty } = shouldBeSaved(user, form);
 
 	const isSameUser = currentUser && currentUser.id === user.id;
 	const isEditDisabled = !!currentUser && !currentUser.isSuperAdmin && isSiteView && !isSameUser;
+	const defaultLanguage = isSiteView
+		? siteLanguages.find((lang) => lang.isDefault)
+		: globalLanguages.find((lang) => lang.isDefault);
 
 	useEffect(() => {
 		if (form.roles.length === 0) {
@@ -56,6 +81,43 @@ const UserForm = (props: IProps) => {
 		}
 	}, [form.roles]);
 
+	// biome-ignore lint/correctness/useExhaustiveDependencies: runs on mount only
+	useEffect(() => {
+		const fetchPages = async () => {
+			if (!pagePermissions || pagePermissions.length === 0) {
+				setSelectedPages([]);
+				return;
+			}
+
+			const siteId: "global" | number = isSiteView ? site!.id : "global";
+			const pagePermission = pagePermissions.find((entry) => entry.siteId === siteId);
+
+			if (pagePermission && pagePermission.pageIds.length > 0) {
+				try {
+					const params = {
+						siteID: siteId,
+						page: 1,
+						itemsPerPage: 50,
+						deleted: false,
+						filterPages: pagePermission.pageIds,
+						lang: defaultLanguage?.id,
+						ignoreLang: true,
+					};
+					const response = await sitesApi.getSitePages(params);
+					if (isReqOk(response.status) && response.data?.items) {
+						setSelectedPages(response.data.items);
+					}
+				} catch (error) {
+					console.error("Failed to fetch page permissions", error);
+				}
+			} else {
+				setSelectedPages([]);
+			}
+		};
+
+		fetchPages();
+	}, []);
+
 	const handleImageChange = (value: IImage) => setForm({ ...form, image: value || null });
 	const handleNameChange = (value: string) => setForm({ ...form, name: value });
 	const handleEmailChange = (value: string) => setForm({ ...form, email: value });
@@ -64,16 +126,35 @@ const UserForm = (props: IProps) => {
 	const handlePositionChange = (value: string) => setForm({ ...form, position: value });
 	const handleTimezoneChange = (value: string) => setForm({ ...form, timezone: value });
 
+	const handleSetPage = (pages: IPage | IPage[]) => {
+		const pagesArray = Array.isArray(pages) ? pages : [pages];
+		const pageIds = pagesArray.map((p) => p.id);
+		const siteId: "global" | number = isSiteView ? site!.id : "global";
+
+		const newEntry: UserPagePermissionEntry = { siteId, pageIds };
+
+		const currentPagePermissions = pagePermissions || [];
+		const existingIndex = currentPagePermissions.findIndex((entry) => entry.siteId === siteId);
+		const newPagePermissions: UserPagePermissionEntry[] =
+			existingIndex >= 0
+				? currentPagePermissions.map((entry, index) => (index === existingIndex ? newEntry : entry))
+				: [...currentPagePermissions, newEntry];
+
+		setForm({ ...form, pagePermissions: newPagePermissions });
+		setSelectedPages(pagesArray);
+		toggleModal("pagePermissions");
+	};
+
 	const toggleSuperAdmin = () => {
 		setForm({ ...form, isSuperAdmin: !form.isSuperAdmin });
-		toggleTypeChangeModal();
+		toggleModal("typeChange");
 	};
 
-	const handleAddRoles = (newRoles: ISiteRoles) => {
+	const handleAddRoles = (newRoles: UserRoleAssignment) => {
 		const oldRoles =
 			newRoles.siteId === "all"
-				? form.roles.filter((role: ISiteRoles) => role.siteId === "global")
-				: form.roles.filter((role: ISiteRoles) => role.siteId !== newRoles.siteId);
+				? form.roles.filter((role) => role.siteId === "global")
+				: form.roles.filter((role) => role.siteId !== newRoles.siteId);
 
 		const updatedRoles = [...oldRoles, newRoles];
 
@@ -81,7 +162,7 @@ const UserForm = (props: IProps) => {
 	};
 
 	const getAllSitesWithRoles = () => {
-		const siteRoles = form.roles.find((role: ISiteRoles) => role.siteId === "all");
+		const siteRoles = form.roles.find((role) => role.siteId === "all");
 		return sites.map((site: ISite) => {
 			return { siteId: site.id, roles: siteRoles ? siteRoles.roles : [] };
 		});
@@ -89,9 +170,9 @@ const UserForm = (props: IProps) => {
 
 	const handleAddSiteRoles = (newRoles: number[]) => {
 		if (!site) return;
-		const hasAllSites = form.roles.find((role: ISiteRoles) => role.siteId === "all");
+		const hasAllSites = form.roles.find((role) => role.siteId === "all");
 		const userRoles = hasAllSites ? getAllSitesWithRoles() : form.roles;
-		const oldRoles = userRoles.filter((role: ISiteRoles) => role.siteId !== site.id);
+		const oldRoles = userRoles.filter((role) => role.siteId !== site.id);
 		const newSiteRoles = { siteId: site.id, roles: newRoles };
 		const updatedRoles = newRoles.length > 0 ? [...oldRoles, newSiteRoles] : oldRoles;
 		setForm({ ...form, roles: updatedRoles });
@@ -99,13 +180,13 @@ const UserForm = (props: IProps) => {
 
 	const handleChangeType = (value: string) => {
 		if ((isSuperAdmin && value === "member") || (!isSuperAdmin && value === "superadmin")) {
-			toggleTypeChangeModal();
+			toggleModal("typeChange");
 		}
 	};
 
 	const modalProps = {
-		isOpen,
-		toggleModal,
+		isOpen: isOpen("password"),
+		toggleModal: () => toggleModal("password"),
 		id,
 	};
 
@@ -114,11 +195,11 @@ const UserForm = (props: IProps) => {
 		onClick: toggleSuperAdmin,
 	};
 
-	const secondaryTypeChangeModalAction = { title: "Cancel", onClick: toggleTypeChangeModal };
+	const secondaryTypeChangeModalAction = { title: "Cancel", onClick: () => toggleModal("typeChange") };
 
 	const modalTypeChangeProps = {
-		isOpen: isOpenTypeChangeModal,
-		toggleModal: toggleTypeChangeModal,
+		isOpen: isOpen("typeChange"),
+		toggleModal: () => toggleModal("typeChange"),
 		email,
 		isSuperAdmin,
 		mainModalAction: mainTypeChangeModalAction,
@@ -135,12 +216,12 @@ const UserForm = (props: IProps) => {
 		setSiteList(sortedSites);
 	};
 
-	const selectSite = (id: number | string) => {
+	const selectSite = (id: number | "global" | "all") => {
 		const { roles } = form;
-		const hasSite = roles.find((siteRole: ISiteRoles) => siteRole.siteId === id);
+		const hasSite = roles.find((siteRole) => siteRole.siteId === id);
 		if (hasSite) {
 			const filteredRoles = roles.filter(
-				(siteRole: ISiteRoles) =>
+				(siteRole) =>
 					(Number.isInteger(id) && siteRole.siteId !== id && siteRole.siteId !== "all") ||
 					(!Number.isInteger(id) && siteRole.siteId !== id),
 			);
@@ -170,17 +251,17 @@ const UserForm = (props: IProps) => {
 		return currentSite?.name;
 	};
 
-	const sitesID = form.roles.map((roleSite: ISiteRoles) => roleSite.siteId);
+	const sitesID = form.roles.map((roleSite) => roleSite.siteId);
 
 	const siteSelectedRoles = isSiteView
-		? form.roles.find((roleSite: ISiteRoles) => roleSite.siteId === site?.id || roleSite.siteId === "all")
+		? form.roles.find((roleSite) => roleSite.siteId === site?.id || roleSite.siteId === "all")
 		: undefined;
 
-	const rolesAll = form.roles.find((roleSite: ISiteRoles) => roleSite.siteId === "all");
+	const rolesAll = form.roles.find((roleSite) => roleSite.siteId === "all");
 	const allDescription =
 		"The user will have access to all existing and future sites depending on the permissions assigned to the role.";
 
-	const rolesGlobal = form.roles.find((roleSite: ISiteRoles) => roleSite.siteId === "global");
+	const rolesGlobal = form.roles.find((roleSite) => roleSite.siteId === "global");
 	const globalDescription = "Global data will be accessible to the user based on the permissions assigned to the role.";
 
 	return (
@@ -198,125 +279,126 @@ const UserForm = (props: IProps) => {
 						<S.NameTitle>{user.name}</S.NameTitle>
 					</S.UserName>
 				</S.Header>
-				<FieldsBehavior
-					title="Name"
-					name="name"
-					fieldType="TextField"
-					placeholder="Type a name"
-					mandatory
-					value={name}
-					onChange={handleNameChange}
-					disabled={isEditDisabled}
-				/>
-				<FieldsBehavior
-					title="Email"
-					name="email"
-					fieldType="TextField"
-					placeholder="Type an email"
-					mandatory
-					value={email}
-					onChange={handleEmailChange}
-					disabled={isSameUser || isEditDisabled}
-				/>
-				<FieldsBehavior
-					title="Alias"
-					name="username"
-					fieldType="TextField"
-					placeholder="Type an alias"
-					mandatory
-					value={username}
-					onChange={handleUsernameChange}
-					prefix="@"
-					disabled={isEditDisabled}
-				/>
-				<FieldsBehavior
-					title="Company"
-					name="company"
-					fieldType="TextField"
-					placeholder="Type a company"
-					value={company || ""}
-					onChange={handleCompanyChange}
-					disabled={isEditDisabled}
-				/>
-				{isSameUser && (
+				<S.FieldsWrapper hasBoder={isSiteView}>
 					<FieldsBehavior
-						title="Password"
-						name="password"
+						title="Name"
+						name="name"
 						fieldType="TextField"
-						inputType="password"
-						placeholder="Type a password"
+						placeholder="Type a name"
 						mandatory
-						readonly
-						value="********"
-						icon="edit"
-						onClickIcon={toggleModal}
+						value={name}
+						onChange={handleNameChange}
+						disabled={isEditDisabled}
 					/>
-				)}
-				<FieldsBehavior
-					title="Job title"
-					name="position"
-					fieldType="TextField"
-					placeholder="Type a job"
-					value={position || ""}
-					onChange={handlePositionChange}
-					disabled={isEditDisabled}
-				/>
-				<FieldsBehavior
-					title="Time zone"
-					name="timezone"
-					fieldType="Select"
-					value={timezone}
-					options={timezones}
-					onChange={handleTimezoneChange}
-					mandatory={true}
-					disabled={isEditDisabled}
-				/>
+					<FieldsBehavior
+						title="Email"
+						name="email"
+						fieldType="TextField"
+						placeholder="Type an email"
+						mandatory
+						value={email}
+						onChange={handleEmailChange}
+						disabled={isSameUser || isEditDisabled}
+					/>
+					<FieldsBehavior
+						title="Alias"
+						name="username"
+						fieldType="TextField"
+						placeholder="Type an alias"
+						mandatory
+						value={username}
+						onChange={handleUsernameChange}
+						prefix="@"
+						disabled={isEditDisabled}
+					/>
+					<FieldsBehavior
+						title="Company"
+						name="company"
+						fieldType="TextField"
+						placeholder="Type a company"
+						value={company || ""}
+						onChange={handleCompanyChange}
+						disabled={isEditDisabled}
+					/>
+					{isSameUser && (
+						<FieldsBehavior
+							title="Password"
+							name="password"
+							fieldType="TextField"
+							inputType="password"
+							placeholder="Type a password"
+							mandatory
+							readonly
+							value="********"
+							icon="edit"
+							onClickIcon={toggleModal}
+						/>
+					)}
+					<FieldsBehavior
+						title="Job title"
+						name="position"
+						fieldType="TextField"
+						placeholder="Type a job"
+						value={position || ""}
+						onChange={handlePositionChange}
+						disabled={isEditDisabled}
+					/>
+					<FieldsBehavior
+						title="Time zone"
+						name="timezone"
+						fieldType="Select"
+						value={timezone}
+						options={timezones}
+						onChange={handleTimezoneChange}
+						mandatory={true}
+						disabled={isEditDisabled}
+					/>
+				</S.FieldsWrapper>
 				{isSiteView ? (
 					isSuperAdmin ? (
 						<>
-							<S.SettingsWrapper>
-								<S.Heading>Roles assigned</S.Heading>
-								<S.SettingContent>
-									<OptionItem
-										name="superadmin"
-										title="Super admin"
-										description="You can manage all aspects of your site, including inviting people and managing their permissions."
-										onChange={toggleSuperAdmin}
-										value={isSuperAdmin}
-										readOnly={readOnlySites}
-									/>
-								</S.SettingContent>
-							</S.SettingsWrapper>
+							<SettingsSection heading="Roles assigned">
+								<OptionItem
+									name="superadmin"
+									title="Super admin"
+									description="You can manage all aspects of your site, including inviting people and managing their permissions."
+									onChange={toggleSuperAdmin}
+									value={isSuperAdmin}
+									readOnly={readOnlySites}
+								/>
+							</SettingsSection>
 						</>
 					) : (
 						<>
-							<S.SettingsWrapper>
-								<S.HeadingWrapper>
-									<S.Heading>Roles Assigned</S.Heading>
-									{(!siteSelectedRoles || siteSelectedRoles.roles.length === 0) && (
-										<Button type="button" buttonStyle="text" onClick={toggleRoleModal} icon="addCircle">
-											Add Role
-										</Button>
-									)}
-								</S.HeadingWrapper>
-								<S.SettingContent>
-									<S.SettingText>You can add a one or more roles to this user.</S.SettingText>
-								</S.SettingContent>
-							</S.SettingsWrapper>
+							<SettingsSection
+								heading="Roles Assigned"
+								description="You can add a one or more roles to this user."
+								actionLabel="Add Role"
+								onActionClick={() => toggleModal("roles")}
+								showAction={!siteSelectedRoles || siteSelectedRoles.roles.length === 0}
+							/>
 							<S.RoleList>
 								{siteSelectedRoles?.roles.map((siteRoleId: number) => {
 									const role = roles.find((role: IRole) => role.id === siteRoleId);
 									return role && <RoleItem key={role.name} role={role} isReadOnly={true} />;
 								})}
 								{siteSelectedRoles && siteSelectedRoles.roles.length > 0 && !isSameUser && (
-									<Button type="button" buttonStyle="line" onClick={toggleRoleModal}>
+									<Button type="button" buttonStyle="line" onClick={() => toggleModal("roles")}>
 										Manage user roles
 									</Button>
 								)}
 							</S.RoleList>
+							<SettingsSection
+								heading="Page permissions"
+								description="You can give access only to a specific page/s to this user."
+								actionLabel="Add Page"
+								onActionClick={() => toggleModal("pagePermissions")}
+								showAction={selectedPages.length === 0}
+							/>
+							<PagePermissionsList pages={selectedPages} onManageClick={() => toggleModal("pagePermissions")} />
 							<RolesModal
-								isOpen={isOpenRoleModal}
-								toggleModal={toggleRoleModal}
+								isOpen={isOpen("roles")}
+								toggleModal={() => toggleModal("roles")}
 								roles={roles}
 								addRoles={handleAddSiteRoles}
 								selectedRoles={siteSelectedRoles ? siteSelectedRoles.roles : []}
@@ -348,28 +430,23 @@ const UserForm = (props: IProps) => {
 							</S.OptionsWrapper>
 						)}
 						{isSuperAdmin && readOnlySites && (
-							<S.SettingsWrapper>
-								<S.Heading>Sites & roles assigned</S.Heading>
-								<S.SettingContent>
-									<OptionItem
-										name="superadmin"
-										title="Super admin"
-										description="The user will have full access to all features and their configuration. They will also have access to all sites."
-										onChange={toggleSuperAdmin}
-										value={isSuperAdmin}
-										readOnly={readOnlySites}
-									/>
-								</S.SettingContent>
-							</S.SettingsWrapper>
+							<SettingsSection heading="Sites & roles assigned">
+								<OptionItem
+									name="superadmin"
+									title="Super admin"
+									description="The user will have full access to all features and their configuration. They will also have access to all sites."
+									onChange={toggleSuperAdmin}
+									value={isSuperAdmin}
+									readOnly={readOnlySites}
+								/>
+							</SettingsSection>
 						)}
 						{!isSuperAdmin && (
 							<S.MemberWrapper>
-								<S.SettingsWrapper>
-									<S.Heading>Global data Permissions</S.Heading>
-									<S.SettingContent>
-										<S.SettingText>The user can have access to global data with specific role.</S.SettingText>
-									</S.SettingContent>
-								</S.SettingsWrapper>
+								<SettingsSection
+									heading="Global data Permissions"
+									description="The user can have access to global data with specific role."
+								/>
 								<S.GlobalPermissionsFieldWrapper>
 									<SiteItem
 										sites={sitesID}
@@ -382,6 +459,18 @@ const UserForm = (props: IProps) => {
 										readOnly={readOnlySites}
 									/>
 								</S.GlobalPermissionsFieldWrapper>
+								{sitesID.includes("global") && (
+									<>
+										<SettingsSection
+											heading="Page permissions"
+											description="You can give access only to a specific page/s to this user."
+											actionLabel="Add Role"
+											onActionClick={() => toggleModal("pagePermissions")}
+											showAction={selectedPages.length === 0}
+										/>
+										<PagePermissionsList pages={selectedPages} onManageClick={() => toggleModal("pagePermissions")} />
+									</>
+								)}
 								<S.SettingsWrapper>
 									<S.Heading>Sites & roles assigned</S.Heading>
 									{form.roles.length > 0 ? (
@@ -398,7 +487,7 @@ const UserForm = (props: IProps) => {
 
 									<S.SiteList>
 										{!rolesAll &&
-											form.roles.map((siteRole: ISiteRoles, index: number) => {
+											form.roles.map((siteRole, index: number) => {
 												if (siteRole.siteId !== "all" && siteRole.siteId !== "global") {
 													const siteName = getSiteName(siteRole.siteId);
 													if (!siteName) return <></>;
@@ -465,7 +554,7 @@ const UserForm = (props: IProps) => {
 												sitesList.map((site: ISite) => {
 													const rolesSite = form.roles.find((roleSite: any) => roleSite.siteId === site.id);
 													return (
-														!form.roles.find((roleSite: ISiteRoles) => roleSite.siteId === site.id) && (
+														!form.roles.find((roleSite) => roleSite.siteId === site.id) && (
 															<SiteItem
 																readOnly={readOnlySites}
 																disabled={!!rolesAll}
@@ -490,6 +579,27 @@ const UserForm = (props: IProps) => {
 			</S.Wrapper>
 			<PasswordModal {...modalProps} />
 			<TypeChangeModal {...modalTypeChangeProps} />
+			<FloatingPanel
+				title="Page Permissions"
+				toggleModal={() => toggleModal("pagePermissions")}
+				isOpen={isOpen("pagePermissions")}
+			>
+				<S.PanelContent>
+					{isOpen("pagePermissions") && (
+						<PageFinder
+							onClick={handleSetPage}
+							isOpen={isOpen("pagePermissions")}
+							multiple
+							globalContent={!isSiteView}
+							hideSites
+							pages={selectedPages.map((p) => p.id)}
+							defaultLang={defaultLanguage?.id}
+							alwaysShowButton
+							disableTranslations
+						/>
+					)}
+				</S.PanelContent>
+			</FloatingPanel>
 		</>
 	);
 };
@@ -500,6 +610,8 @@ const mapStateToProps = (state: IRootState) => ({
 	currentUser: state.users.currentUser,
 	sites: state.sites.allSites,
 	roles: state.users.roles,
+	siteLanguages: state.sites.currentSiteLanguages,
+	globalLanguages: state.app.globalLangs,
 });
 
 interface IDispatchProps {
@@ -522,6 +634,8 @@ interface IProfileProps {
 	isSiteView?: boolean;
 	roles: IRole[];
 	site: ISite | null;
+	siteLanguages: ILanguage[];
+	globalLanguages: ILanguage[];
 }
 
 type IProps = IProfileProps & IDispatchProps;

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

@@ -34,7 +34,6 @@ const ModalContent = styled.div`
 
 const SettingsWrapper = styled.div`
   position: relative;
-  border-top: 1px solid ${(p) => p.theme.color.uiLine};
   padding-top: ${(p) => p.theme.spacing.m};
   padding-bottom: ${(p) => p.theme.spacing.s};
 `;
@@ -73,6 +72,7 @@ const SelectAllSitesFieldWrapper = styled.div``;
 
 const GlobalPermissionsFieldWrapper = styled.div`
   padding-bottom: ${(p) => p.theme.spacing.m};
+  border-bottom: 1px solid ${(p) => p.theme.color.uiLine};
 `;
 
 const SiteList = styled.div`
@@ -106,6 +106,7 @@ const MemberWrapper = styled.div``;
 
 const OptionsWrapper = styled.div`
   padding-bottom: ${(p) => p.theme.spacing.m};
+  border-bottom: 1px solid ${(p) => p.theme.color.uiLine};
 `;
 
 const Label = styled.div`
@@ -120,6 +121,15 @@ const HelpText = styled.div`
   color: ${(p) => p.theme.color?.textMediumEmphasis};
 `;
 
+const PanelContent = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+  height: 100%;
+`;
+
+const FieldsWrapper = styled.div<{ hasBoder: boolean }>`
+  border-bottom: ${(p) => (p.hasBoder ? `1px solid ${p.theme.color.uiLine}` : `none`)};
+`;
+
 export {
 	Wrapper,
 	Header,
@@ -142,4 +152,6 @@ export {
 	HelpText,
 	OptionsWrapper,
 	MemberWrapper,
+	PanelContent,
+	FieldsWrapper,
 };

package/src/modules/Users/UserList/UserItem/index.tsx

@@ -4,7 +4,7 @@ import { Avatar, CheckField, ElementsTooltip, Tag, Toast, Tooltip, TruncatedTool
 import { usersActions } from "@ax/containers/Users";
 import { getDaysAgo } from "@ax/helpers";
 import { useModal, usePermission, useToast } from "@ax/hooks";
-import type { ICheck, IRole, IRootState, ISite, ISiteRoles, IUser } from "@ax/types";
+import type { ICheck, IRole, IRootState, ISite, IUser } from "@ax/types";
 
 import { DeleteModal } from "../atoms";
 
@@ -110,8 +110,8 @@ const UserItem = (props: IUserItemProps): JSX.Element => {
 		user.isSuperAdmin
 			? ["ALL SITES"]
 			: user?.roles
-					.filter((siteRoles: ISiteRoles) => siteRoles.siteId === "all" || Number.isInteger(siteRoles.siteId))
-					.map((siteRoles: ISiteRoles) => getSiteNameById(siteRoles.siteId));
+					.filter((siteRoles) => siteRoles.siteId === "all" || Number.isInteger(siteRoles.siteId))
+					.map((siteRoles) => getSiteNameById(siteRoles.siteId));
 
 	let rolesIds: number[] = [];