Open platform to collect and prioritize feedback
More UI improvements for the user listing
Matt Roberts5c043e103c6d
diff --git a/public/assets/styles/utility/display.scss b/public/assets/styles/utility/display.scssindex 08088b05c..7df7b88ca 100644--- a/public/assets/styles/utility/display.scss+++ b/public/assets/styles/utility/display.scss@@ -199,6 +199,16 @@border-radius: sizing(2);}+.rounded-md-t {+ border-top-left-radius: sizing(2);+ border-top-right-radius: sizing(2);+}++.rounded-md-b {+ border-bottom-left-radius: sizing(2);+ border-bottom-right-radius: sizing(2);+}+.rounded-full {border-radius: 999px;}@@ -207,15 +217,15 @@visibility: hidden;}-.bt {+.border-t {border-top: 1px solid;}-.bb {+.border-b {border-bottom: 1px solid;}-.bl {+.border-l {border-inline-start: 1px solid;}diff --git a/public/components/NotificationIndicator.tsx b/public/components/NotificationIndicator.tsxindex c54776766..1b4470219 100644--- a/public/components/NotificationIndicator.tsx+++ b/public/components/NotificationIndicator.tsx@@ -118,7 +118,7 @@ export const NotificationIndicator = () => {)}{recent !== undefined && recent?.length > 0 && (<>- <p className="text-subtitle px-4 mb-0 pt-4 bg-gray-50 border-gray-200 bt">+ <p className="text-subtitle px-4 mb-0 pt-4 bg-gray-50 border-gray-200 border-t"><Trans id="modal.notifications.previous">Previous notifications</Trans></p><VStack spacing={0} className="py-2 bg-gray-50" divide={false}>diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsxindex ebcb3b79e..aca70c00d 100644--- a/public/pages/Administration/pages/ManageMembers.page.tsx+++ b/public/pages/Administration/pages/ManageMembers.page.tsx@@ -18,7 +18,11 @@ interface UserListItemProps {onAction: (actionName: string, user: User) => Promise<void>}-const UserListItem = (props: UserListItemProps) => {+interface UserListItemExtendedProps extends UserListItemProps {+ isLast?: boolean+}++const UserListItem = (props: UserListItemExtendedProps) => {const admin = props.user.role === UserRole.Administrator && <span className="text-xs bg-blue-100 text-blue-800 px-2 py-1 rounded">administrator</span>const collaborator = props.user.role === UserRole.Collaborator && <span className="text-xs bg-green-100 text-green-800 px-2 py-1 rounded">collaborator</span>const blocked = props.user.status === UserStatus.Blocked && <span className="text-xs bg-red-100 text-red-800 px-2 py-1 rounded">blocked</span>@@ -30,32 +34,36 @@ const UserListItem = (props: UserListItemProps) => {return (<div- className={`bb border-gray-200 grid gap-4 py-4 px-4 flex-items-center bg-white hover:bg-gray-100`}- style={{ gridTemplateColumns: "2fr 2fr 1fr 100px" }}+ className={`border-b border-gray-200 grid gap-4 py-4 px-4 flex-items-center bg-white hover:bg-gray-100 ${props.isLast ? "rounded-md-b" : ""}`}+ style={{ gridTemplateColumns: "minmax(200px, 1fr) minmax(280px, 2fr) minmax(120px, 150px) 100px" }}><HStack><Avatar user={props.user} /><div className="text-subtitle">{props.user.name}</div></HStack>- <div className="text-muted">{props.user.email || "No email"}</div>+ <div className="text-muted text-ellipsis" title={props.user.email}>+ {props.user.email || "No email"}+ </div><div>{admin} {collaborator} {blocked}{isVisitor && !blocked && <span className="text-xs text-gray-600">visitor</span>}</div>- <div className="flex justify-end">+ <div className="flex justify-end relative">{Fider.session.user.id !== props.user.id && Fider.session.user.isAdministrator && (- <Dropdown renderHandle={<Icon sprite={IconDotsHorizontal} width="16" height="16" />}>- {!blocked && (!!collaborator || isVisitor) && (- <Dropdown.ListItem onClick={actionSelected("to-administrator")}>Promote to Administrator</Dropdown.ListItem>- )}- {!blocked && (!!admin || isVisitor) && <Dropdown.ListItem onClick={actionSelected("to-collaborator")}>Promote to Collaborator</Dropdown.ListItem>}- {!blocked && (!!collaborator || !!admin) && <Dropdown.ListItem onClick={actionSelected("to-visitor")}>Demote to Visitor</Dropdown.ListItem>}- {isVisitor && !blocked && <Dropdown.ListItem onClick={actionSelected("block")}>Block User</Dropdown.ListItem>}- {isVisitor && !!blocked && <Dropdown.ListItem onClick={actionSelected("unblock")}>Unblock User</Dropdown.ListItem>}- </Dropdown>+ <div className="relative z-10">+ <Dropdown renderHandle={<Icon sprite={IconDotsHorizontal} width="16" height="16" />}>+ {!blocked && (!!collaborator || isVisitor) && (+ <Dropdown.ListItem onClick={actionSelected("to-administrator")}>Promote to Administrator</Dropdown.ListItem>+ )}+ {!blocked && (!!admin || isVisitor) && <Dropdown.ListItem onClick={actionSelected("to-collaborator")}>Promote to Collaborator</Dropdown.ListItem>}+ {!blocked && (!!collaborator || !!admin) && <Dropdown.ListItem onClick={actionSelected("to-visitor")}>Demote to Visitor</Dropdown.ListItem>}+ {isVisitor && !blocked && <Dropdown.ListItem onClick={actionSelected("block")}>Block User</Dropdown.ListItem>}+ {isVisitor && !!blocked && <Dropdown.ListItem onClick={actionSelected("unblock")}>Unblock User</Dropdown.ListItem>}+ </Dropdown>+ </div>)}</div></div>@@ -233,15 +241,18 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {</Dropdown></div>- <VStack className="rounded-md border border-gray-200 overflow-hidden">- <div className="grid gap-4 py-3 px-4 bg-gray-100 text-category border-b" style={{ gridTemplateColumns: "2fr 2fr 1fr 100px" }}>+ <VStack className="rounded-md border border-gray-200 relative">+ <div+ className="grid rounded-md-t gap-4 py-3 px-4 bg-gray-100 text-category"+ style={{ gridTemplateColumns: "minmax(200px, 1fr) minmax(280px, 2fr) minmax(120px, 150px) 100px" }}+ ><div>Name</div><div>Email</div><div>Role</div></div><div>{visibleUsers.map((user, index) => (- <UserListItem key={user.id} user={user} onAction={handleAction} />+ <UserListItem key={user.id} user={user} onAction={handleAction} isLast={index === visibleUsers.length - 1} />))}</div></VStack>