From 2aa548c7dc3789b3d66a92eecb5faf28385a2a30 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Tue, 29 Jul 2025 17:06:33 -0700
Subject: [PATCH] improvement: address feedback

---
 backend/src/services/org/org-fns.ts                       | 8 ++++----
 .../services/project-membership/project-membership-dal.ts | 1 -
 .../components/OrgMembersSection/OrgMembersSection.tsx    | 4 ++--
 .../components/OrgMembersSection/OrgMembersTable.tsx      | 4 +++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/backend/src/services/org/org-fns.ts b/backend/src/services/org/org-fns.ts
index 6d959c3a3..30e67cca4 100644
--- a/backend/src/services/org/org-fns.ts
+++ b/backend/src/services/org/org-fns.ts
@@ -15,7 +15,7 @@ type TDeleteOrgMembership = {
   userAliasDAL: Pick<TUserAliasDALFactory, "delete">;
   licenseService: Pick<TLicenseServiceFactory, "updateSubscriptionOrgMemberCount">;
   projectUserAdditionalPrivilegeDAL: Pick<TProjectUserAdditionalPrivilegeDALFactory, "delete">;
-  userId: string;
+  userId?: string;
 };
 
 type TDeleteOrgMemberships = {
@@ -27,7 +27,7 @@ type TDeleteOrgMemberships = {
   userAliasDAL: Pick<TUserAliasDALFactory, "delete">;
   licenseService: Pick<TLicenseServiceFactory, "updateSubscriptionOrgMemberCount">;
   projectUserAdditionalPrivilegeDAL: Pick<TProjectUserAdditionalPrivilegeDALFactory, "delete">;
-  userId: string;
+  userId?: string;
 };
 
 export const deleteOrgMembershipFn = async ({
@@ -44,7 +44,7 @@ export const deleteOrgMembershipFn = async ({
   const deletedMembership = await orgDAL.transaction(async (tx) => {
     const orgMembership = await orgDAL.deleteMembershipById(orgMembershipId, orgId, tx);
 
-    if (orgMembership.userId === userId) {
+    if (userId && orgMembership.userId === userId) {
       // scott: this is temporary, we will add a leave org endpoint with proper handling to ensure org isn't abandoned/broken
       throw new BadRequestError({ message: "You cannot remove yourself from an organization" });
     }
@@ -125,7 +125,7 @@ export const deleteOrgMembershipsFn = async ({
       .filter((member) => Boolean(member.userId))
       .map((member) => member.userId) as string[];
 
-    if (membershipUserIds.includes(userId)) {
+    if (userId && membershipUserIds.includes(userId)) {
       // scott: this is temporary, we will add a leave org endpoint with proper handling to ensure org isn't abandoned/broken
       throw new BadRequestError({ message: "You cannot remove yourself from an organization" });
     }
diff --git a/backend/src/services/project-membership/project-membership-dal.ts b/backend/src/services/project-membership/project-membership-dal.ts
index 488f52b90..7dfd1f65c 100644
--- a/backend/src/services/project-membership/project-membership-dal.ts
+++ b/backend/src/services/project-membership/project-membership-dal.ts
@@ -339,7 +339,6 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
         )
         .select(
           db.ref("id").withSchema(TableName.ProjectMembership),
-          db.ref("userId").withSchema(TableName.ProjectMembership),
           db.ref("isGhost").withSchema(TableName.Users),
           db.ref("username").withSchema(TableName.Users),
           db.ref("email").withSchema(TableName.Users),
diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
index dc5d9c368..c01ed1ba9 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
@@ -159,7 +159,7 @@ export const OrgMembersSection = () => {
         )}
       >
         <div className="flex items-center rounded-md border border-mineshaft-600 bg-mineshaft-800 px-4 py-2 text-bunker-300">
-          <div className="mr-2 text-sm">{selectedMemberIds.length > 0} Selected</div>
+          <div className="mr-2 text-sm">{selectedMemberIds.length} Selected</div>
           <button
             type="button"
             className="mr-auto text-xs text-mineshaft-400 underline-offset-2 hover:text-mineshaft-200 hover:underline"
@@ -271,7 +271,7 @@ export const OrgMembersSection = () => {
               {(popUp.removeMembers.data?.selectedOrgMemberships as OrgUser[])?.map((member) => {
                 const email = member.user.email ?? member.user.username ?? member.inviteEmail;
                 return (
-                  <li className="flex items-center">
+                  <li key={member.id} className="flex items-center">
                     <span className={userId === member.user.id ? "line-through" : ""}>
                       {member.user.firstName || member.user.lastName
                         ? `${`${member.user.firstName} ${member.user.lastName}`.trim()} (${email})`
diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
index 45bc7ac8a..bbed63813 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -387,7 +387,9 @@ export const OrgMembersTable = ({
                   onCheckedChange={() => {
                     if (isPageSelected) {
                       setSelectedMemberIds((prev) =>
-                        prev.filter((member) => !filteredMembersPage.find((m) => m.id !== member))
+                        prev.filter(
+                          (memberId) => !filteredMembersPage.find((m) => m.id === memberId)
+                        )
                       );
                     } else {
                       setSelectedMemberIds((prev) => [