From 082fba5a201b54cabb01805e930c4a39529cb4b1 Mon Sep 17 00:00:00 2001
From: Jeremy Farrance <jfarrance@accuraty.com>
Date: Fri, 4 Oct 2024 22:41:09 -0500
Subject: [PATCH 1/2] Update PersonaBar Manage/Roles to show Role ID

---
 .../Roles.Web/src/components/roles/RoleEditor/index.jsx      | 5 +++++
 .../Roles.Web/src/components/roles/RoleRow/index.jsx         | 4 +++-
 .../src/components/roles/UsersInRole/UserRow/index.jsx       | 4 +++-
 .../admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx
index b30335f2609..4602bcb9458 100644
--- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx
@@ -194,6 +194,11 @@ class RolesEditor extends Component {
     render() {
         let { state, props } = this;
         const columnOne = <div key="editor-container-columnOne" className="editor-container">
+            <div className="editor-row divider" style={{marginTop:"-3rem"}}>
+                <Label
+                    label={resx.get("RoleId") + ": " + state.roleDetails.id}
+                    style={{ fontWeight: "bolder" }} />
+            </div>
             <div className="editor-row divider">
                 <SingleLineInputWithError
                     value={state.roleDetails.name}
diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleRow/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleRow/index.jsx
index 7095a6c37f6..0a234858731 100644
--- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleRow/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleRow/index.jsx
@@ -119,7 +119,9 @@ RoleRow.propTypes = {
     openId: PropTypes.string,
     currentIndex: PropTypes.number,
     visible: PropTypes.bool,
-    roleIsApproved: PropTypes.bool
+    roleIsApproved: PropTypes.bool,
+    addIsClosed: PropTypes.bool,
+    children: PropTypes.node
 };
 RoleRow.defaultProps = {
     collapsed: true,
diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/UserRow/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/UserRow/index.jsx
index 54cb8718e37..4fb9f9b25a1 100644
--- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/UserRow/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/UserRow/index.jsx
@@ -138,7 +138,9 @@ UserRow.propTypes = {
     userDetails: PropTypes.object.isRequired,
     index: PropTypes.number,
     saveUser: PropTypes.func.isRequired,
-    deleteUser: PropTypes.func.isRequired
+    deleteUser: PropTypes.func.isRequired,
+    roleName: PropTypes.string.isRequired,
+    dispatch: PropTypes.func.isRequired
 };
 UserRow.defaultProps = {
     roleUsersList: []
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx
index 5cfeafcd4c9..8f7d054b917 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx
@@ -189,6 +189,9 @@
   <data name="RoleName.Text" xml:space="preserve">
     <value>Role Name</value>
   </data>
+  <data name="RoleId.Text" xml:space="preserve">
+    <value>Role ID</value>
+  </data>
   <data name="securityModeListLabel.Text" xml:space="preserve">
     <value>Security Mode</value>
   </data>

From b940385d4e9012a9724f38a13245257856fc86d8 Mon Sep 17 00:00:00 2001
From: Jeremy Farrance <jfarrance@accuraty.com>
Date: Sat, 5 Oct 2024 17:15:09 -0500
Subject: [PATCH 2/2] Update index.jsx

Removed bolder from label.
---
 .../Roles.Web/src/components/roles/RoleEditor/index.jsx      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx
index 4602bcb9458..a9272b42350 100644
--- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/index.jsx
@@ -196,8 +196,7 @@ class RolesEditor extends Component {
         const columnOne = <div key="editor-container-columnOne" className="editor-container">
             <div className="editor-row divider" style={{marginTop:"-3rem"}}>
                 <Label
-                    label={resx.get("RoleId") + ": " + state.roleDetails.id}
-                    style={{ fontWeight: "bolder" }} />
+                    label={resx.get("RoleId") + ": " + state.roleDetails.id} />
             </div>
             <div className="editor-row divider">
                 <SingleLineInputWithError
@@ -403,4 +402,4 @@ function mapStateToProps(state) {
     };
 }
 
-export default connect(mapStateToProps)(RolesEditor);
\ No newline at end of file
+export default connect(mapStateToProps)(RolesEditor);