From 3950effe8afc62ee823c6de9c98a4ec11166ccd4 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Sun, 6 Oct 2024 10:03:14 +0200
Subject: [PATCH] Minor UI fixes

---
 src/main/frontend/components/ProfileMenu.tsx  | 33 ++++++++++---------
 .../administration/UserManagement.tsx         |  8 ++---
 .../frontend/components/wizard/Wizard.tsx     |  4 +--
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/frontend/components/ProfileMenu.tsx b/src/main/frontend/components/ProfileMenu.tsx
index ba3d891..b13e20a 100644
--- a/src/main/frontend/components/ProfileMenu.tsx
+++ b/src/main/frontend/components/ProfileMenu.tsx
@@ -4,6 +4,7 @@ import {Dropdown, DropdownItem, DropdownMenu, DropdownTrigger} from "@nextui-org
 import {useNavigate} from "react-router-dom";
 import {ConfigEndpoint} from "Frontend/generated/endpoints";
 import Avatar from "Frontend/components/general/Avatar";
+import {CollectionElement} from "@react-types/shared";
 
 export default function ProfileMenu() {
     const auth = useAuth();
@@ -42,6 +43,7 @@ export default function ProfileMenu() {
         },
     ];
 
+    // @ts-ignore
     return (
         <Dropdown placement="bottom-end">
             <DropdownTrigger>
@@ -57,23 +59,24 @@ export default function ProfileMenu() {
                     />
                 </div>
             </DropdownTrigger>
-            <DropdownMenu>
-                {/* @ts-ignore */}
-                {profileMenuItems.map(({label, icon, onClick, showIf, color}) => {
+            <DropdownMenu disabledKeys={["username"]}>
+                <DropdownItem key="username">
+                    <p className="font-bold">Signed in as {auth.state.user?.username}</p>
+                </DropdownItem>
+                {profileMenuItems.filter(item => item.showIf !== false).map(({label, icon, onClick, color}) => {
                     return (
-                        (showIf === undefined || showIf === true) ?
-                            <DropdownItem
-                                key={label}
-                                onClick={onClick}
-                                startContent={<div color={color}>{icon}</div>}
-                                /* @ts-ignore */
-                                color={color ? color : ""}
-                                className={`text-${color} hover:bg-primary/20`}
-                            >
-                                {label}
-                            </DropdownItem> : null
+                        <DropdownItem
+                            key={label}
+                            onClick={onClick}
+                            startContent={<div color={color}>{icon}</div>}
+                            /* @ts-ignore */
+                            color={color ? color : ""}
+                            className={`text-${color} hover:bg-primary/20`}
+                        >
+                            {label}
+                        </DropdownItem>
                     );
-                })}
+                }) as unknown as CollectionElement<object>}
             </DropdownMenu>
         </Dropdown>
     );
diff --git a/src/main/frontend/components/administration/UserManagement.tsx b/src/main/frontend/components/administration/UserManagement.tsx
index 89469dc..30e5415 100644
--- a/src/main/frontend/components/administration/UserManagement.tsx
+++ b/src/main/frontend/components/administration/UserManagement.tsx
@@ -37,6 +37,10 @@ function UserManagementLayout({getConfig, formik}: any) {
 
             <div className="flex flex-row items-baseline justify-between">
                 <h2 className={"text-xl font-bold mt-8 mb-1"}>Users</h2>
+                {!autoRegisterNewUsers &&
+                    <SmallInfoField className="mb-4 text-warning" icon={Info}
+                                    message="Automatic user registration for SSO users is disabled"/>
+                }
                 <Tooltip content="Invite new user">
                     <Button isIconOnly variant="faded" onPress={inviteUserModal.onOpen}>
                         <UserPlus/>
@@ -44,10 +48,6 @@ function UserManagementLayout({getConfig, formik}: any) {
                 </Tooltip>
             </div>
             <Divider className="mb-4"/>
-            {!autoRegisterNewUsers &&
-                <SmallInfoField className="mb-4 text-warning" icon={Info}
-                                message="Automatic user registration for SSO users is disabled"/>
-            }
             <div className="grid grid-cols-300px gap-4">
                 {users.map((user) => <UserManagementCard user={user} key={user.username}/>)}
             </div>
diff --git a/src/main/frontend/components/wizard/Wizard.tsx b/src/main/frontend/components/wizard/Wizard.tsx
index 4f97304..3a4ea81 100644
--- a/src/main/frontend/components/wizard/Wizard.tsx
+++ b/src/main/frontend/components/wizard/Wizard.tsx
@@ -49,7 +49,7 @@ const Wizard = ({children, initialValues, onSubmit}: {
             /*// @ts-ignore*/
             validationSchema={step.props.validationSchema}
         >
-            {(formik: { values: any; isSubmitting: any; }) => (
+            {(formik) => (
                 <Form className="flex flex-col h-full">
                     <div className="w-full mb-8">
                         <Stepper activeStep={stepNumber} activeLineClassName="bg-primary"
@@ -76,7 +76,7 @@ const Wizard = ({children, initialValues, onSubmit}: {
                     </div>
                     <div className="left-8 right-8 absolute bottom-8 -z-1">
                         <div className="flex justify-between">
-                            <Button color="primary" onClick={() => previous(formik.values)} disabled={isFirstStep}>
+                            <Button color="primary" onClick={() => previous(formik.values)} isDisabled={isFirstStep}>
                                 <ArrowLeft/>
                             </Button>
                             <Button