Merge pull request #2148 from Infisical/user-page-fix

Minor Patches for User Page

backend/src/services/org/org-service.ts

@@ -57,7 +57,7 @@ type TOrgServiceFactoryDep = {
   projectDAL: TProjectDALFactory;
   projectMembershipDAL: Pick<TProjectMembershipDALFactory, "findProjectMembershipsByUserId" | "delete">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "delete">;
-  orgMembershipDAL: Pick<TOrgMembershipDALFactory, "findOrgMembershipById">;
+  orgMembershipDAL: Pick<TOrgMembershipDALFactory, "findOrgMembershipById" | "findOne">;
   incidentContactDAL: TIncidentContactsDALFactory;
   samlConfigDAL: Pick<TSamlConfigDALFactory, "findOne" | "findEnforceableSamlCfg">;
   smtpService: TSmtpService;
@@ -379,7 +379,10 @@ export const orgServiceFactory = ({
     const { permission } = await permissionService.getUserOrgPermission(userId, orgId, actorAuthMethod, actorOrgId);
     ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Edit, OrgPermissionSubjects.Member);
 
-    const [foundMembership] = await orgDAL.findMembership({ id: membershipId, orgId });
+    const foundMembership = await orgMembershipDAL.findOne({
+      id: membershipId,
+      orgId
+    });
     if (!foundMembership) throw new NotFoundError({ message: "Failed to find organization membership" });
     if (foundMembership.userId === userId)
       throw new BadRequestError({ message: "Cannot update own organization membership" });

frontend/src/views/Org/UserPage/UserPage.tsx

@@ -16,7 +16,12 @@ import {
   Tooltip,
   UpgradePlanModal
 } from "@app/components/v2";
-import { OrgPermissionActions, OrgPermissionSubjects, useOrganization } from "@app/context";
+import {
+  OrgPermissionActions,
+  OrgPermissionSubjects,
+  useOrganization,
+  useUser
+} from "@app/context";
 import { withPermission } from "@app/hoc";
 import {
   useDeleteOrgMembership,
@@ -31,7 +36,10 @@ export const UserPage = withPermission(
   () => {
     const router = useRouter();
     const membershipId = router.query.membershipId as string;
+    const { user } = useUser();
     const { currentOrg } = useOrganization();
+
+    const userId = user?.id || "";
     const orgId = currentOrg?.id || "";
 
     const { data: membership } = useGetOrgMembership(orgId, membershipId);
@@ -115,6 +123,7 @@ export const UserPage = withPermission(
                   ? `${membership.user.firstName} ${membership.user.lastName}`
                   : "-"}
               </p>
+              {userId !== membership.user.id && (
                 <DropdownMenu>
                   <DropdownMenuTrigger asChild className="rounded-lg">
                     <div className="hover:text-primary-400 data-[state=open]:text-primary-400">
@@ -225,6 +234,7 @@ export const UserPage = withPermission(
                     </OrgPermissionCan>
                   </DropdownMenuContent>
                 </DropdownMenu>
+              )}
             </div>
             <div className="flex">
               <div className="mr-4 w-96">

frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectsSection.tsx

@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { createNotification } from "@app/components/notifications";
 import { DeleteActionModal, IconButton } from "@app/components/v2";
-import { useOrganization,useUser } from "@app/context";
+import { useOrganization, useUser } from "@app/context";
 import { useDeleteUserFromWorkspace, useGetOrgMembership } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
 
@@ -51,7 +51,7 @@ export const UserProjectsSection = ({ membershipId }: Props) => {
     <div className="w-full rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
       <div className="flex items-center justify-between border-b border-mineshaft-400 pb-4">
         <h3 className="text-lg font-semibold text-mineshaft-100">Projects</h3>
-        {userId !== membership.user.id && (
+        {userId !== membership.user.id && membership.status !== "invited" && (
           <IconButton
             ariaLabel="copy icon"
             variant="plain"