From 53f74914415e34cbf4d296754322df23404e1297 Mon Sep 17 00:00:00 2001 From: carlosmonastyrski Date: Tue, 4 Mar 2025 16:30:22 -0300 Subject: [PATCH] Update UpgradePlanModal message to show relevant message on user actions --- .../admin/OverviewPage/components/UserPanel.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/admin/OverviewPage/components/UserPanel.tsx b/frontend/src/pages/admin/OverviewPage/components/UserPanel.tsx index d628e57fa..9f1f8060f 100644 --- a/frontend/src/pages/admin/OverviewPage/components/UserPanel.tsx +++ b/frontend/src/pages/admin/OverviewPage/components/UserPanel.tsx @@ -32,8 +32,12 @@ import { } from "@app/hooks/api"; import { UsePopUpState } from "@app/hooks/usePopUp"; +const deleteUserUpgradePlanMessage = "Deleting users via Admin UI" +const addServerAdminUpgradePlanMessage = "Granting another user Server Admin permissions" + const UserPanelTable = ({ - handlePopUpOpen + handlePopUpOpen, + setUpgradePlanMessage }: { handlePopUpOpen: ( popUpName: keyof UsePopUpState<["removeUser", "upgradePlan", "upgradeToServerAdmin"]>, @@ -42,6 +46,7 @@ const UserPanelTable = ({ id: string; } ) => void; + setUpgradePlanMessage: (message: string) => void; }) => { const [searchUserFilter, setSearchUserFilter] = useState(""); const { user } = useUser(); @@ -105,6 +110,7 @@ const UserPanelTable = ({ onClick={(e) => { e.stopPropagation(); if (!subscription?.instanceUserManagement) { + setUpgradePlanMessage(deleteUserUpgradePlanMessage) handlePopUpOpen("upgradePlan"); return; } @@ -118,6 +124,7 @@ const UserPanelTable = ({ onClick={(e) => { e.stopPropagation(); if (!subscription?.instanceUserManagement) { + setUpgradePlanMessage(addServerAdminUpgradePlanMessage) handlePopUpOpen("upgradePlan"); return; } @@ -164,6 +171,8 @@ export const UserPanel = () => { "upgradeToServerAdmin" ] as const); + const [upgradePlanMessage, setUpgradePlanMessage] = useState(deleteUserUpgradePlanMessage) + const { mutateAsync: deleteUser } = useAdminDeleteUser(); const { mutateAsync: grantAdminAccess } = useAdminGrantServerAdminAccess(); @@ -210,7 +219,7 @@ export const UserPanel = () => {

Users

- + { handlePopUpToggle("upgradePlan", isOpen)} - text="Deleting users via Admin UI is only available on Infisical's Pro plan and above." + text={`${upgradePlanMessage} is only available on Infisical's Pro plan and above.`} /> );