Skip to content

[2115] Dynamic Role Stats & Update yarn #2177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 9, 2024
Merged

[2115] Dynamic Role Stats & Update yarn #2177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fc4e58
[2115] Dynamic Role Stats & Update yarn
S78901 Apr 5, 2024
20e261c
Merge branch 'develop' into feature-2115/display-role-stats
S78901 Apr 8, 2024
8b87b54
[2115] PR Review Adjustment
S78901 Apr 8, 2024
fb23e97
[2115] Reverse Yarn.lock updates - tests failing
S78901 Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions web-ui/src/components/admin/roles/Roles.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import {
import PersonAddIcon from "@mui/icons-material/PersonAdd";
import Autocomplete from '@mui/material/Autocomplete';

import { isArrayPresent } from './../../../helpers/checks';

import "./Roles.css";

const Roles = () => {
Expand Down Expand Up @@ -71,6 +73,11 @@ const Roles = () => {

const uniqueRoles = Object.keys(roleToMemberMap);

const getRoleStats = (role) => {
let members = roleToMemberMap[role];
return isArrayPresent(members) ? members.length : 0;
}

const removeFromRole = async (member, role) => {
const members = roleToMemberMap[role];
const { roleId } = members.find((m) => member.id === m.id);
Expand Down Expand Up @@ -184,6 +191,9 @@ const Roles = () => {
<Typography variant="h5" component="h5">
{role.description || ""}
</Typography>
<Typography variant="h5" component="h5">
{getRoleStats(role)} Users
</Typography>
</div>
}
subheader={
Expand Down
16 changes: 15 additions & 1 deletion web-ui/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7841,6 +7841,11 @@ mute-stream@^1.0.0:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==

nanoid@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==

nanoid@^3.3.6, nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
Expand Down Expand Up @@ -8453,7 +8458,16 @@ postcss@8.4.31:
picocolors "^1.0.0"
source-map-js "^1.0.2"

postcss@^8.3.11, postcss@^8.4.33, postcss@^8.4.36:
postcss@^8.3.11:
version "8.4.8"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.8.tgz#dad963a76e82c081a0657d3a2f3602ce10c2e032"
integrity sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==
dependencies:
nanoid "^3.3.1"
picocolors "^1.0.0"
source-map-js "^1.0.2"

postcss@^8.4.33, postcss@^8.4.36:
version "8.4.38"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
Expand Down