Merge pull request #6154 from jeremy-farrance/personabar-web-roles-en…

…hancements Update PersonaBar Manage/Roles to show Role ID
dnnsoftware · Oct 5, 2024 · 87cbd77 · 87cbd77
2 parents 9f4833f + b940385
commit 87cbd77
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 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
@@ -194,6 +194,10 @@ 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} />
+            </div>
             <div className="editor-row divider">
                 <SingleLineInputWithError
                     value={state.roleDetails.name}
@@ -398,4 +402,4 @@ function mapStateToProps(state) {
     };
 }
 
-export default connect(mapStateToProps)(RolesEditor);
+export default connect(mapStateToProps)(RolesEditor);
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
@@ -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
@@ -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/...rience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/App_LocalResources/Roles.resx b/...rience/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>