From 66a459234dcf882bdcf2896d379cbf795e2bdd58 Mon Sep 17 00:00:00 2001 From: hagen-danswer Date: Fri, 27 Sep 2024 09:50:03 -0700 Subject: [PATCH] Minor role display refactor (#2578) --- web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx | 5 +++-- web/src/components/admin/users/SignedUpUserTable.tsx | 9 +-------- web/src/lib/types.ts | 7 +++++++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx index cde36c9e5..b49ffdce1 100644 --- a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx +++ b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx @@ -1,7 +1,7 @@ "use client"; import { usePopup } from "@/components/admin/connectors/Popup"; -import { useState, useEffect } from "react"; +import { useState } from "react"; import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle"; import { AddMemberForm } from "./AddMemberForm"; import { updateUserGroup, updateCuratorStatus } from "./lib"; @@ -11,6 +11,7 @@ import { User, UserGroup, UserRole, + USER_ROLE_LABELS, } from "@/lib/types"; import { AddConnectorForm } from "./AddConnectorForm"; import { @@ -106,7 +107,7 @@ const UserRoleDropdown = ({ ); } else { - return
{localRole}
; + return
{USER_ROLE_LABELS[localRole]}
; } }; diff --git a/web/src/components/admin/users/SignedUpUserTable.tsx b/web/src/components/admin/users/SignedUpUserTable.tsx index b718221d6..9f44012d1 100644 --- a/web/src/components/admin/users/SignedUpUserTable.tsx +++ b/web/src/components/admin/users/SignedUpUserTable.tsx @@ -1,4 +1,4 @@ -import { type User, UserStatus, UserRole } from "@/lib/types"; +import { type User, UserStatus, UserRole, USER_ROLE_LABELS } from "@/lib/types"; import CenteredPageSelector from "./CenteredPageSelector"; import { type PageSelectorProps } from "@/components/PageSelector"; import { HidableSection } from "@/app/admin/assistants/HidableSection"; @@ -21,13 +21,6 @@ import { useState } from "react"; import { usePaidEnterpriseFeaturesEnabled } from "@/components/settings/usePaidEnterpriseFeaturesEnabled"; import { DeleteEntityModal } from "@/components/modals/DeleteEntityModal"; -const USER_ROLE_LABELS: Record = { - [UserRole.BASIC]: "Basic", - [UserRole.ADMIN]: "Admin", - [UserRole.GLOBAL_CURATOR]: "Global Curator", - [UserRole.CURATOR]: "Curator", -}; - interface Props { users: Array; setPopup: (spec: PopupSpec) => void; diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts index d10631056..6578c54cc 100644 --- a/web/src/lib/types.ts +++ b/web/src/lib/types.ts @@ -23,6 +23,13 @@ export enum UserRole { GLOBAL_CURATOR = "global_curator", } +export const USER_ROLE_LABELS: Record = { + [UserRole.BASIC]: "Basic", + [UserRole.ADMIN]: "Admin", + [UserRole.GLOBAL_CURATOR]: "Global Curator", + [UserRole.CURATOR]: "Curator", +}; + export interface User { id: string; email: string;