Merge pull request #122 from ilyarudyi/fix/editModalAdmin

Fix/edit modal admin

CHANGELOG.md

@@ -8,13 +8,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fix 
+
+- `EditUserModal` was not opening in the admin  
+
 ## [1.27.0] - 2023-08-14
 
 ### Added
 
 - Added metrics to Impersonate events
 - Added metrics to Stop Impersonating events
 - Added metrics to change team events
+
 ## [1.26.2] - 2023-08-11
 
 ### Added

react/components/OrganizationUsersTable.tsx

@@ -550,31 +550,30 @@ const OrganizationUsersTable: FunctionComponent<Props> = ({
   }
 
   const handleRowClick = ({ rowData }: CellRendererProps) => {
-    if (canManageOrganization) {
-      setEditUserDetails({
-        id: rowData.id,
-        roleId: rowData.roleId,
-        userId: rowData.userId,
-        clId: rowData.clId,
-        orgId: rowData.orgId,
-        costId: rowData.costId,
-        name: rowData.name,
-        email: rowData.email,
-        canImpersonate: rowData.canImpersonate,
-      })
-      setEditUserModalOpen(true)
-    } else if (
-      !ruleClickEnabled({
+    const canClick =
+      canManageOrganization ||
+      ruleClickEnabled({
         isAdmin,
         canEditSales,
         slug: rowData.role?.slug ?? '',
         canEdit,
         isSalesAdmin,
       })
-    ) {
-      // eslint-disable-next-line no-useless-return
-      return
-    }
+
+    if (!canClick) return
+
+    setEditUserDetails({
+      id: rowData.id,
+      roleId: rowData.roleId,
+      userId: rowData.userId,
+      clId: rowData.clId,
+      orgId: rowData.orgId,
+      costId: rowData.costId,
+      name: rowData.name,
+      email: rowData.email,
+      canImpersonate: rowData.canImpersonate,
+    })
+    setEditUserModalOpen(true)
   }
 
   const handleSort = ({