From f11ba60f289652eb27f3548bb31ef3b5830c1e44 Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 11:08:50 -0300
Subject: [PATCH 01/10] feat: Displays what entity is being edited in side
 modal

Signed-off-by: Tiago Fonseca <tiagoapolo@gmail.com>
---
 frontend/web/components/EditPermissions.tsx   | 82 ++++++++++---------
 frontend/web/components/PermissionsTabs.tsx   |  4 +
 .../web/components/RolePermissionsList.tsx    |  2 +-
 frontend/web/components/modals/CreateRole.tsx |  3 +
 4 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/frontend/web/components/EditPermissions.tsx b/frontend/web/components/EditPermissions.tsx
index 229f6afaa0c3..ee8a356f3fcf 100644
--- a/frontend/web/components/EditPermissions.tsx
+++ b/frontend/web/components/EditPermissions.tsx
@@ -467,7 +467,7 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
           })
       }
       //eslint-disable-next-line
-  }, [])
+    }, [])
 
     const admin = () => entityPermissions && entityPermissions.admin
 
@@ -804,9 +804,24 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
         })
     }
 
+    const getEditText = () => {
+      if (isGroup) {
+        return `the ${group?.name || ''} group`
+      }
+      if (user) {
+        return `${user.first_name || ''} ${user.last_name || ''}`
+      }
+      if (role) {
+        return role.name
+      }
+      return name
+    }
+
     const rolesAdded = getRoles(roles, rolesSelected || [])
     const isAdmin = admin()
 
+    console.log('aosidjaosijaosijosi', level)
+
     return !permissions || !entityPermissions ? (
       <div className='modal-body text-center'>
         <Loader />
@@ -826,15 +841,15 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                   <Switch
                     disabled={saving}
                     data-test={`admin-switch-${level}`}
-                  onChange={() => {
-                    toggleAdmin()
-                    setValueChanged(true)
-                  }}
-                  checked={isAdmin}
-                />
-              </Row>
-            </div>
-          )}
+                    onChange={() => {
+                      toggleAdmin()
+                      setValueChanged(true)
+                    }}
+                    checked={isAdmin}
+                  />
+                </Row>
+              </div>
+            )}
             <PanelSearch
               filterRow={(item: AvailablePermission, search: string) => {
                 const name = Format.enumeration.get(item.key).toLowerCase()
@@ -844,24 +859,24 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
               className='no-pad mb-2 overflow-visible'
               items={permissions}
               renderRow={(p: AvailablePermission, index: number) => {
-              const levelUpperCase = level.toUpperCase()
-              const disabled =
-                level !== 'organisation' &&
-                p.key !== `VIEW_${levelUpperCase}` &&
-                !hasPermission(`VIEW_${levelUpperCase}`)
+                const levelUpperCase = level.toUpperCase()
+                const disabled =
+                  level !== 'organisation' &&
+                  p.key !== `VIEW_${levelUpperCase}` &&
+                  !hasPermission(`VIEW_${levelUpperCase}`)
                 const permission = entityPermissions.permissions.find(
                   (v) => v.permission_key === p.key,
                 )
                 const permissionType = getPermissionType(p.key)
-              return (
-                <Row
-                  key={p.key}
-                  style={admin() ? { opacity: 0.5 } : undefined}
+                return (
+                  <Row
+                    key={p.key}
+                    style={admin() ? { opacity: 0.5 } : undefined}
                     className='list-item list-item-sm px-3 py-2'
-                >
-                  <Row space>
-                    <Flex>
-                      <strong>{Format.enumeration.get(p.key)}</strong>
+                  >
+                    <Row space>
+                      <Flex>
+                        <strong>{Format.enumeration.get(p.key)}</strong>
                         <div className='list-item-subtitle'>
                           {p.description}
                         </div>
@@ -875,7 +890,7 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                             }}
                           />
                         )}
-                    </Flex>
+                      </Flex>
                       {tagBasedPermissions ? (
                         <div className='ms-2' style={{ width: 200 }}>
                           <Select
@@ -899,8 +914,8 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                           />
                         </div>
                       ) : (
-                    <Switch
-                      data-test={`permission-switch-${level}-${index}`}
+                        <Switch
+                          data-test={`permission-switch-${level}-${index}`}
                           onChange={() => {
                             setValueChanged(true)
                             togglePermission(p.key)
@@ -917,20 +932,7 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
 
             <p className='text-right mt-5 text-dark'>
               This will edit the permissions for{' '}
-              <strong>
-                {isGroup ? (
-                  `the ${group?.name || ''} group`
-                ) : user ? (
-                  <>
-                    {user.first_name || ''} {user.last_name || ''}
-                  </>
-                ) : role ? (
-                  ` ${role.name}`
-                ) : (
-                  ` ${name}`
-                )}
-              </strong>
-              .
+              <strong>{getEditText()}</strong>.
             </p>
 
             {!!parentWarning && (
diff --git a/frontend/web/components/PermissionsTabs.tsx b/frontend/web/components/PermissionsTabs.tsx
index 0749ce796f60..c74e0aaa6ed1 100644
--- a/frontend/web/components/PermissionsTabs.tsx
+++ b/frontend/web/components/PermissionsTabs.tsx
@@ -173,6 +173,10 @@ const PermissionsTabs: FC<PermissionsTabsType> = ({
               />
             )}
           </div>
+          <p className='text-right mt-5 text-dark'>
+            This will edit the permissions for{' '}
+            <strong>the {group?.name} group</strong>.
+          </p>
         </TabItem>
       </Tabs>
     </PlanBasedAccess>
diff --git a/frontend/web/components/RolePermissionsList.tsx b/frontend/web/components/RolePermissionsList.tsx
index 04cf7c7ada6b..01191a27039f 100644
--- a/frontend/web/components/RolePermissionsList.tsx
+++ b/frontend/web/components/RolePermissionsList.tsx
@@ -6,7 +6,7 @@ import {
   useGetRoleProjectPermissionsQuery,
 } from 'common/services/useRolePermission'
 import { PermissionLevel } from 'common/types/requests'
-import { Role, User, UserGroup, UserGroupSummary } from 'common/types/responses'
+import { Role, User, UserGroupSummary } from 'common/types/responses'
 import PanelSearch from './PanelSearch'
 import PermissionsSummaryList from './PermissionsSummaryList'
 
diff --git a/frontend/web/components/modals/CreateRole.tsx b/frontend/web/components/modals/CreateRole.tsx
index 579437cfab30..f23d439c5ba5 100644
--- a/frontend/web/components/modals/CreateRole.tsx
+++ b/frontend/web/components/modals/CreateRole.tsx
@@ -511,6 +511,9 @@ const CreateRole: FC<CreateRoleType> = ({
                 ))}
               </div>
             </div>
+            <p className='text-right mt-5 text-dark'>
+              This will edit the members for <strong>{role?.name}</strong>.
+            </p>
           </div>
         </TabItem>
         <TabItem

From 2f4859dfe0868e8f2f0ac5ea23863bcd3cf8879e Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 16:28:27 -0300
Subject: [PATCH 02/10] remove comment

---
 frontend/web/components/EditPermissions.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/web/components/EditPermissions.tsx b/frontend/web/components/EditPermissions.tsx
index ee8a356f3fcf..28b8405dfb93 100644
--- a/frontend/web/components/EditPermissions.tsx
+++ b/frontend/web/components/EditPermissions.tsx
@@ -820,8 +820,6 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
     const rolesAdded = getRoles(roles, rolesSelected || [])
     const isAdmin = admin()
 
-    console.log('aosidjaosijaosijosi', level)
-
     return !permissions || !entityPermissions ? (
       <div className='modal-body text-center'>
         <Loader />

From 7b0aba29235f74411db977390343f8ee18ac58fb Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 16:45:26 -0300
Subject: [PATCH 03/10] temp commit

---
 frontend/web/components/EditPermissions.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/web/components/EditPermissions.tsx b/frontend/web/components/EditPermissions.tsx
index 28b8405dfb93..98d2b4239018 100644
--- a/frontend/web/components/EditPermissions.tsx
+++ b/frontend/web/components/EditPermissions.tsx
@@ -836,6 +836,7 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                       Administrator
                     </div>
                   </Flex>
+
                   <Switch
                     disabled={saving}
                     data-test={`admin-switch-${level}`}

From 48ed42d2764d9627e94770018177bc8573e4db8d Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 16:46:00 -0300
Subject: [PATCH 04/10] commit

---
 frontend/web/components/EditPermissions.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/web/components/EditPermissions.tsx b/frontend/web/components/EditPermissions.tsx
index 98d2b4239018..28b8405dfb93 100644
--- a/frontend/web/components/EditPermissions.tsx
+++ b/frontend/web/components/EditPermissions.tsx
@@ -836,7 +836,6 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                       Administrator
                     </div>
                   </Flex>
-
                   <Switch
                     disabled={saving}
                     data-test={`admin-switch-${level}`}

From a05365cb765c6ac2be2016286e945181b6a2cf35 Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 16:49:19 -0300
Subject: [PATCH 05/10] remove space

---
 frontend/web/components/EditPermissions.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/web/components/EditPermissions.tsx b/frontend/web/components/EditPermissions.tsx
index 28b8405dfb93..a8a1c2bcaf05 100644
--- a/frontend/web/components/EditPermissions.tsx
+++ b/frontend/web/components/EditPermissions.tsx
@@ -467,7 +467,7 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
           })
       }
       //eslint-disable-next-line
-    }, [])
+  }, [])
 
     const admin = () => entityPermissions && entityPermissions.admin
 

From 7f1b62d0de4fc0e3c9942ad15d14d764fc859974 Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 16:50:44 -0300
Subject: [PATCH 06/10] spaces


From a2e08c9f4e08d9d38307bf8e7e3674554efa5cd9 Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 16:51:51 -0300
Subject: [PATCH 07/10] spaces


From 632753462a21df2c6c870f65ab08559a4a5d1929 Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 16:55:07 -0300
Subject: [PATCH 08/10] test


From 9fe2a00dc5b20d05a6305c60e600e19cb53def71 Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 17:01:17 -0300
Subject: [PATCH 09/10] change


From dfb9ca27e3141af8faea8e671d6a38c351dec8c9 Mon Sep 17 00:00:00 2001
From: Tiago Fonseca <tiagoapolo@gmail.com>
Date: Tue, 17 Dec 2024 17:12:45 -0300
Subject: [PATCH 10/10] revert

---
 frontend/web/components/EditPermissions.tsx | 50 ++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/frontend/web/components/EditPermissions.tsx b/frontend/web/components/EditPermissions.tsx
index a8a1c2bcaf05..60ac4455afe7 100644
--- a/frontend/web/components/EditPermissions.tsx
+++ b/frontend/web/components/EditPermissions.tsx
@@ -839,15 +839,15 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                   <Switch
                     disabled={saving}
                     data-test={`admin-switch-${level}`}
-                    onChange={() => {
-                      toggleAdmin()
-                      setValueChanged(true)
-                    }}
-                    checked={isAdmin}
-                  />
-                </Row>
-              </div>
-            )}
+                  onChange={() => {
+                    toggleAdmin()
+                    setValueChanged(true)
+                  }}
+                  checked={isAdmin}
+                />
+              </Row>
+            </div>
+          )}
             <PanelSearch
               filterRow={(item: AvailablePermission, search: string) => {
                 const name = Format.enumeration.get(item.key).toLowerCase()
@@ -857,24 +857,24 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
               className='no-pad mb-2 overflow-visible'
               items={permissions}
               renderRow={(p: AvailablePermission, index: number) => {
-                const levelUpperCase = level.toUpperCase()
-                const disabled =
-                  level !== 'organisation' &&
-                  p.key !== `VIEW_${levelUpperCase}` &&
-                  !hasPermission(`VIEW_${levelUpperCase}`)
+              const levelUpperCase = level.toUpperCase()
+              const disabled =
+                level !== 'organisation' &&
+                p.key !== `VIEW_${levelUpperCase}` &&
+                !hasPermission(`VIEW_${levelUpperCase}`)
                 const permission = entityPermissions.permissions.find(
                   (v) => v.permission_key === p.key,
                 )
                 const permissionType = getPermissionType(p.key)
-                return (
-                  <Row
-                    key={p.key}
-                    style={admin() ? { opacity: 0.5 } : undefined}
+              return (
+                <Row
+                  key={p.key}
+                  style={admin() ? { opacity: 0.5 } : undefined}
                     className='list-item list-item-sm px-3 py-2'
-                  >
-                    <Row space>
-                      <Flex>
-                        <strong>{Format.enumeration.get(p.key)}</strong>
+                >
+                  <Row space>
+                    <Flex>
+                      <strong>{Format.enumeration.get(p.key)}</strong>
                         <div className='list-item-subtitle'>
                           {p.description}
                         </div>
@@ -888,7 +888,7 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                             }}
                           />
                         )}
-                      </Flex>
+                    </Flex>
                       {tagBasedPermissions ? (
                         <div className='ms-2' style={{ width: 200 }}>
                           <Select
@@ -912,8 +912,8 @@ const _EditPermissionsModal: FC<EditPermissionModalType> = withAdminPermissions(
                           />
                         </div>
                       ) : (
-                        <Switch
-                          data-test={`permission-switch-${level}-${index}`}
+                    <Switch
+                      data-test={`permission-switch-${level}-${index}`}
                           onChange={() => {
                             setValueChanged(true)
                             togglePermission(p.key)