Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #615 from Tria-plc/freight/feature/user_management_UI

Browse Source 
Freight/feature/user management UI
This commit is contained in:
yaschalew10
2026-07-11 09:28:25 +03:00
committed by GitHub
parent d494377332 4c380e81dc
commit 932f9b2890
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/edr-freight-web/backoffice/src/pages/dashboard/user-management/UserManagementPage.tsx
View File

@@ -536,13 +536,12 @@ const UserManagementPage = () => {
[user?.employee],
);
const visibleOrganizations = useMemo(() => {
if (isSuperAdmin) {
return organizations;
}
return organizations.filter((organization) => allowedOrgIds.has(organization.id));
}, [allowedOrgIds, isSuperAdmin, organizations]);
// Both paths are already scoped server-side: super admins get every org from
// /organizations, org/unit admins get only theirs from my-admin-organizations.
// So no client-side re-filtering (allowedOrgIds, from employee.organizationId,
// wouldn't include orgs administered without an employee record there).
const visibleOrganizations = organizations;
void allowedOrgIds;
const selectedOrganization = useMemo(
() => visibleOrganizations.find((item) => item.id === selectedOrgId) ?? null,
@@ -636,7 +635,12 @@ const UserManagementPage = () => {
setLoadError(null);
try {
const response = await api.get<ListResponse<OrganizationRecord>>("/organizations");
// Super admins may list every organization (needs can:find_all:organization).
// Org/unit admins are scoped to the orgs they administer via my-admin-organizations.
const endpoint = isSuperAdmin
? "/organizations"
: "/organizations/my-admin-organizations";
const response = await api.get<ListResponse<OrganizationRecord>>(endpoint);
const nextOrganizations = getItems(response.data);
setOrganizations(nextOrganizations);
} catch (error) {
@@ -644,7 +648,7 @@ const UserManagementPage = () => {
} finally {
setLoading(false);
}
}, []);
}, [isSuperAdmin]);
const loadOrgEmployees = useCallback(async (organizationId: string) => {
setOrgEmployeesLoading(true);