feat: add dept admin, add facility admin #737

CK-7vn · 2025-02-13T06:48:28Z

Description of the change

This pull request slightly revamps the admin roles and abilities. Pre this pull-request we had two different types of admins, system admins, and admins, system admins were presumed to be a member of Unlocked Labs, while admins were presumed to be an administrator user from the department of corrections. This had very little separation of concerns and warranted a standard admin to access every facility within that running instance of the applications database, warranting potential worrisome conditions, as a department of corrections may not want an administrator from one facility having power over the users, and or admins of another facility. We fix this concern in this pull request by creating Department Admins, and Facility Admins, System Admins did not change. Currently this does not separate things out too much deeper, but it does allow for a separation of concerns and abilities.
Facility Admins

Can create users for that facility
Can create programs for that facility
Can see metrics for that facility

Department Admins

Can create facility admins for any facility
Can create users for any facility
Can create programs for any facility
Can view metrics for any facility

System Admins

No Changes Made
Related issues: Closes FEAT: New Roles > Department Admin and Facility Admin #715

Screenshot(s)

Video shows users being created, in a linear fashion from system admin -> Dept Admin -> Facility admin
https://www.loom.com/share/738b6d35e0f5452786c122d944683052?sid=7371616d-2b4f-453c-b7e7-ff16ad36a5cb

Facility drop down for programs (staging)

Additional context

Also, while working through things I noticed that the facility drop down on the Programs page was not mapping and or receiving any facilities, this was because the route loader in Programs.tsx was conflicting with the route loader being used in app.tsx, I moved the routeloader to a parent component, and this fixed the issue. Please reference the video, where I explicitly show the facilities drop down on the programs page, comparative to the screenshot that was taken in staging.

frontend/src/Components/Navbar.tsx

PThorpe92 · 2025-02-14T19:59:10Z

frontend/src/Components/Navbar.tsx

-                                            Learning Platforms
-                                        </Link>
-                                    </li>
+                                    {(isSysAdmin(user) ||


can we do something like a canSwitchFacilities that does that check, that way it can be used both ways and we can distill it down to one point of entry in case anything changes or we add roles

carddev81

Found a couple minor things.

carddev81 · 2025-02-14T22:40:46Z

backend/src/database/users.go

during testing I found a bug that should be fixed. So the issue is that you can duplicate a user in the system by character case and this will cause issue with a user with the same name logging onto the system. I believe the issue is with line 155 where the user.username within sql should be wrapped in a function to make the case of the username lowercase.

db.Raw("SELECT EXISTS(SELECT 1 FROM users WHERE username = ? OR email = ?)", strings.ToLower(username), email)

carddev81 · 2025-02-14T22:51:01Z

backend/migrations/00033_update_admin_roles.sql

+SET role = 'admin'
+WHERE role = 'department_admin';
+
+delete from public.user_roles


If the goose down statement is ran here it will violate foreign key constraints because the user is mapped to the user_roles. Should the users with facility_admin role be updated to just admin?

I'm not entirely sure to tell you the truth, The idea with this change currently is that, any current admins when this migration happens, basically already have department admin controls, so, we switch them to department admin, and then any admins created from those department admins, will actually be facility admins, I don't know enough about goose to know if this is an issue, is it?

yeah, it's an issue with goose. It will cause the script to fail. To be on the safe side I think you should change your goose down to: (basically just the update statement was changed here)

INSERT INTO public.user_roles(name) VALUES ('admin'); UPDATE public.users SET role = 'admin' WHERE role IN ( 'department_admin', 'facility_admin' ); delete from public.user_roles where name in ('department_admin', 'facility_admin');

carddev81 · 2025-02-15T03:11:33Z

backend/src/database/users.go

@@ -34,8 +34,10 @@ func (db *DB) GetCurrentUsers(qCtx *models.QueryContext, role string) ([]models.
 	}
 	tx := db.Model(&models.User{}).Where("facility_id = ?", qCtx.FacilityID)
 	switch role {
-	case "admin":
-		tx = tx.Where("role IN ('admin', 'system_admin')")


I noticed when logging in as a SuperAdmin I was unable to see SuperAdmin witthin the Admin listing screen, is this correct functionality?

carddev81 · 2025-02-15T03:28:52Z

frontend/src/Components/dashboard/ExpandableCardGrid.tsx

@@ -22,7 +22,9 @@ export default function ExpandableCardGrid<T>({
    const [expanded, setExpanded] = useState<boolean>(false);
    const slice = expanded ? items.length : cols;
    const isAdmin =
-        user?.role === UserRole.Admin || user?.role === UserRole.SystemAdmin;
+        user?.role === UserRole.FacilityAdmin ||


can you call isAdministrator(user) here? import isAdministrator

carddev81 · 2025-02-15T03:30:05Z

frontend/src/Pages/AdminLayer1.tsx

@@ -34,6 +34,7 @@ export default function AdminLayer1() {
    useEffect(() => {
        console.log(timeFilter);
    }, [timeFilter]);
+    console.log(favoritedLibraries?.data);


can this console.log come out here?

carddev81 · 2025-02-15T03:52:06Z

frontend/src/Pages/HelpfulLinksManagement.tsx

@@ -125,9 +125,13 @@ export default function HelpfulLinksManagement() {
                            mutate={updateLinks}
                            showModal={showModifyLink}
                            role={
-                                isAdministrator(user)


After looking at the HelpfuLlinkCard you should only need to pass the user role here and not have to execute any role checks here. The underlying logic handles checking the role using AdminRoles.includes(role).

carddev81 · 2025-02-15T04:07:45Z

frontend/src/Pages/AdminLayer2.tsx

the call to load data initially and on refresh for facility_admin roles is loading 'all' cache by default

/api/users/${user?.id}/admin-layer2?facility=${facility}&reset=${resetCache}

carddev81 · 2025-02-15T04:11:33Z

frontend/src/Components/OperationalInsightsCharts.tsx

the call to load data initially and on refresh for facility_admin roles is loading 'all' cache by default

/api/login-metrics?facility=${facility}&days=${days}&reset=${resetCache}

carddev81 · 2025-02-15T04:32:58Z

frontend/src/Pages/Programs.tsx

When adding a Program as a facility administrator, i noticed that the program doesn't show up in the users listing screen?

github-actions bot added frontend Backend ProviderMiddleware labels Feb 13, 2025

CK-7vn added the HAS MIGRATION This PR has a migration added. Please collaborate with the author to resolve the ordering label Feb 13, 2025

CK-7vn force-pushed the user_controls branch from 5ca52cf to ac6b1b7 Compare February 13, 2025 14:43

carddev81 self-requested a review February 14, 2025 19:27

carddev81 assigned carddev81 and CK-7vn and unassigned carddev81 Feb 14, 2025

PThorpe92 reviewed Feb 14, 2025

View reviewed changes

frontend/src/Components/Navbar.tsx Outdated Show resolved Hide resolved

feat: add dept admin, add facility admin

7a25366

CK-7vn force-pushed the user_controls branch from ac6b1b7 to 7a25366 Compare February 14, 2025 19:43

github-actions bot added the HAS_MIGRATION label Feb 14, 2025

PThorpe92 reviewed Feb 14, 2025

View reviewed changes

carddev81 requested changes Feb 15, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add dept admin, add facility admin #737

feat: add dept admin, add facility admin #737

CK-7vn commented Feb 13, 2025 •

edited

Loading

PThorpe92 Feb 14, 2025

carddev81 left a comment

carddev81 Feb 14, 2025

carddev81 Feb 14, 2025 •

edited

Loading

CK-7vn Feb 15, 2025

carddev81 Feb 15, 2025

carddev81 Feb 15, 2025

carddev81 Feb 15, 2025

carddev81 Feb 15, 2025

carddev81 Feb 15, 2025

carddev81 Feb 15, 2025

carddev81 Feb 15, 2025

carddev81 Feb 15, 2025

feat: add dept admin, add facility admin #737

Are you sure you want to change the base?

feat: add dept admin, add facility admin #737

Conversation

CK-7vn commented Feb 13, 2025 • edited Loading

Description of the change

Screenshot(s)

Additional context

Choose a reason for hiding this comment

carddev81 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carddev81 Feb 14, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CK-7vn commented Feb 13, 2025 •

edited

Loading

carddev81 Feb 14, 2025 •

edited

Loading