From 45e9f562e85e9a98072a6e90600360c291a387e8 Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Tue, 2 Sep 2025 14:14:30 +0200 Subject: [PATCH] Migrate UserInfoDto -> ExtendedUserInfoDto --- .../frontend/components/administration/UserManagement.tsx | 4 ++-- .../components/general/cards/UserManagementCard.tsx | 6 +++--- .../frontend/components/general/modals/AssignRolesModal.tsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/frontend/components/administration/UserManagement.tsx b/app/src/main/frontend/components/administration/UserManagement.tsx index 4c38313..99a4f69 100644 --- a/app/src/main/frontend/components/administration/UserManagement.tsx +++ b/app/src/main/frontend/components/administration/UserManagement.tsx @@ -3,16 +3,16 @@ import ConfigFormField from "Frontend/components/administration/ConfigFormField" import withConfigPage from "Frontend/components/administration/withConfigPage"; import Section from "Frontend/components/general/Section"; import {UserEndpoint} from "Frontend/generated/endpoints"; -import UserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/UserInfoDto"; import {UserManagementCard} from "Frontend/components/general/cards/UserManagementCard"; import {SmallInfoField} from "Frontend/components/general/SmallInfoField"; import {Info, UserPlus} from "@phosphor-icons/react"; import {Button, Divider, Tooltip, useDisclosure} from "@heroui/react"; import InviteUserModal from "Frontend/components/general/modals/InviteUserModal"; +import ExtendedUserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/ExtendedUserInfoDto"; function UserManagementLayout({getConfig, formik}: any) { const inviteUserModal = useDisclosure(); - const [users, setUsers] = useState([]); + const [users, setUsers] = useState([]); useEffect(() => { UserEndpoint.getAllUsers().then( diff --git a/app/src/main/frontend/components/general/cards/UserManagementCard.tsx b/app/src/main/frontend/components/general/cards/UserManagementCard.tsx index 3bdc20e..5d75a38 100644 --- a/app/src/main/frontend/components/general/cards/UserManagementCard.tsx +++ b/app/src/main/frontend/components/general/cards/UserManagementCard.tsx @@ -7,11 +7,11 @@ import Avatar from "Frontend/components/general/Avatar"; import ConfirmUserDeletionModal from "Frontend/components/general/modals/ConfirmUserDeletionModal"; import PasswordResetTokenModal from "Frontend/components/general/modals/PasswortResetTokenModal"; import TokenDto from "Frontend/generated/org/gameyfin/app/shared/token/TokenDto"; -import UserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/UserInfoDto"; import RoleChip from "Frontend/components/general/RoleChip"; import AssignRolesModal from "Frontend/components/general/modals/AssignRolesModal"; +import ExtendedUserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/ExtendedUserInfoDto"; -export function UserManagementCard({user}: { user: UserInfoDto }) { +export function UserManagementCard({user}: { user: ExtendedUserInfoDto }) { const userDeletionConfirmationModal = useDisclosure(); const passwordResetTokenModal = useDisclosure(); const roleAssignmentModal = useDisclosure(); @@ -141,7 +141,7 @@ export function UserManagementCard({user}: { user: UserInfoDto }) {

{user.username}

{user.email}

{user.roles?.map((role) => ( - + ))} diff --git a/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx b/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx index 58598c1..2fda413 100644 --- a/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx +++ b/app/src/main/frontend/components/general/modals/AssignRolesModal.tsx @@ -12,14 +12,14 @@ import { SelectItem } from "@heroui/react"; import {UserEndpoint} from "Frontend/generated/endpoints"; -import UserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/UserInfoDto"; import RoleChip from "Frontend/components/general/RoleChip"; import RoleAssignmentResult from "Frontend/generated/org/gameyfin/app/users/enums/RoleAssignmentResult"; +import ExtendedUserInfoDto from "Frontend/generated/org/gameyfin/app/users/dto/ExtendedUserInfoDto"; interface AssignRolesModalProps { isOpen: boolean; onOpenChange: () => void; - user: UserInfoDto; + user: ExtendedUserInfoDto; } interface Role {