ifritechnologies/pfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tenant management

Browse Source
This commit is contained in:
hermes
2026-10-20 17:56:04 +02:00
parent d7a168c9fa
commit dee9098379
16 changed files with 344 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PostFundManagement.Api/Endpoints/Governance/GetTenantUsersEndpoint.cs
+34
View File
@@ -0,0 +1,34 @@
using PostFundManagement.Application.Abstractions.Services;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Domain.Abstractions;
using PostFundManagement.Domain.Errors;
using PostFundManagement.Domain.Extensions;
using PostFundManagement.Domain.Models;
namespace PostFundManagement.Api.Endpoints.Governance;
[ApiVersionTarget(1)]
public sealed class GetTenantUsersEndpoint : IEndpoint
{
public void Map(IEndpointRouteBuilder builder)
{
builder.MapGet("api/governance/tenants/{tenantIdHash}/users", async (IGovernanceService service, string tenantIdHash,
CancellationToken cancellationToken = default) =>
await service.GetTenantUsersAsync(tenantIdHash, cancellationToken) switch
{
{ IsSuccess: true, Value: var tenantUsers } => Results.Ok(tenantUsers),
var r when r.HasError<IdDecodeError>() => Results.Forbid(),
var r => Results.InternalServerError(r.Errors.ToProblems())
})
.WithDescription("Gets users created and managed by one tenant")
.RequireAuthorization(Constants.MainScope)
.WithName(typeof(GetTenantUsersEndpoint).ToEndpointName("Retrieval"))
.MapToApiVersion(new ApiVersion(1))
.Produces<TenantUser[]>(StatusCodes.Status200OK)
.Produces(StatusCodes.Status403Forbidden)
.Produces(StatusCodes.Status401Unauthorized)
.Produces<Problems>(StatusCodes.Status500InternalServerError)
.WithTags(EndpointTags.Governance);
}
}
PostFundManagement.Application/Abstractions/Services/IGovernanceService.cs
+4 -1
View File
@@ -1,4 +1,4 @@
using PostFundManagement.Application.Services.Governance;
using PostFundManagement.Application.Services.Governance;
using PostFundManagement.Domain;
using PostFundManagement.Domain.Attributes;
using PostFundManagement.Domain.Models;
@@ -95,4 +95,7 @@ public interface IGovernanceService
[Log]
Task<Result<TenantOrganisation>> GetTenantOrganisationAsync(string tenantOrganisationIdHash, CancellationToken cancellationToken = default);
[Log]
Task<Result<TenantUser[]>> GetTenantUsersAsync(string tenantIdHash, CancellationToken cancellationToken = default);
}
PostFundManagement.Application/Services/Governance/GovernanceCacheService.cs
+4 -1
View File
@@ -1,4 +1,4 @@
using PostFundManagement.Application.Abstractions.Services;
using PostFundManagement.Application.Abstractions.Services;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Application.Services.Shared;
using PostFundManagement.Domain;
@@ -288,6 +288,9 @@ public sealed class GovernanceCacheService(GovernanceService service, IDistribut
return Result.Ok(cached.FromJson<TenantOrganisation[]>());
}));
public async Task<Result<TenantUser[]>> GetTenantUsersAsync(string tenantIdHash, CancellationToken cancellationToken = default) =>
await service.GetTenantUsersAsync(tenantIdHash, cancellationToken);
public async Task<Result<Tenant[]>> GetTenantsAsync(CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result<Tenant[]>>>)(async () =>
{
PostFundManagement.Application/Services/Governance/GovernanceService.cs
+21 -1
View File
@@ -1,4 +1,4 @@
using PostFundManagement.Application.Abstractions.Services;
using PostFundManagement.Application.Abstractions.Services;
using PostFundManagement.Application.Extensions;
using PostFundManagement.Application.Services.Shared;
using PostFundManagement.Domain;
@@ -452,6 +452,26 @@ public sealed class GovernanceService(IDbContextFactory<ApplicationDbContext> co
return Result.Ok(tenantOrganisations?.Select(i => i.Map()).ToArray() ?? []);
}));
public async Task<Result<TenantUser[]>> GetTenantUsersAsync(string tenantIdHash, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result<TenantUser[]>>>)(async () =>
{
var decodeResult = hashService.DecodeLongIdHash(tenantIdHash);
if (decodeResult.IsFailed)
return Result.Fail(IdDecodeError.Create()
.CausedBy(decodeResult.Errors));
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var tenantUsers = await context.TenantUsers.AsNoTracking()
.Include(i => i.User)
.Include(i => i.Tenant)
.Where(f => f.TenantId == decodeResult.Value)
.ToListAsync(cancellationToken);
return Result.Ok(tenantUsers?.Select(i => i.Map()).ToArray() ?? []);
}));
public async Task<Result<TenantOrganisation>> GetTenantOrganisationAsync(string tenantOrganisationIdHash, CancellationToken cancellationToken = default) =>
await Result.Try((Func<Task<Result<TenantOrganisation>>>)(async () =>
{
PostFundManagement.ConsoleUI/src/App.tsx
+5 -5
View File
@@ -3,7 +3,7 @@ import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
import { QueryClientProvider } from '@tanstack/react-query';
import { queryClient } from './lib/queryClient';
import { AuthProvider, ProtectedRoute, TenantAdminProtectedRoute } from './auth/AuthProvider';
import { ClaimProtectedRoute, useRbac } from './auth/rbac';
import { ClaimProtectedRoute, TenantManagementProtectedRoute, useRbac } from './auth/rbac';
import { ToastProvider } from './components/ui/Toast';
import { AppLayout } from './components/layout/AppLayout';
@@ -151,17 +151,17 @@ export default function App() {
<Route
path="/tenants"
element={
<TenantAdminProtectedRoute>
<TenantManagementProtectedRoute>
<TenantManagementPage />
</TenantAdminProtectedRoute>
</TenantManagementProtectedRoute>
}
/>
<Route
path="/governance/tenants"
element={
<TenantAdminProtectedRoute>
<TenantManagementProtectedRoute>
<TenantManagementPage />
</TenantAdminProtectedRoute>
</TenantManagementProtectedRoute>
}
/>
<Route path="/settings" element={<SettingsPage />} />
PostFundManagement.ConsoleUI/src/auth/rbac.ts
+26
View File
@@ -354,3 +354,29 @@ export const ClaimProtectedRoute: React.FC<{
return React.createElement(React.Fragment, null, children);
};
/**
* Route protection for Tenant Management (Solution Owners [Tenant 1 + Admin] OR Tenant Self-Service users).
*/
export const TenantManagementProtectedRoute: React.FC<{
children: React.ReactNode;
}> = ({ children }) => {
const { canManageTenants, isLoading } = useAuth();
const { canView, canAccess } = useRbac();
if (isLoading) {
return null;
}
const hasAccess =
canManageTenants ||
canView('tenant_management') ||
canView('tenant_self_service') ||
canAccess('tenant_self_service');
if (!hasAccess) {
return React.createElement(Navigate, { to: '/dashboard', replace: true });
}
return React.createElement(React.Fragment, null, children);
};
PostFundManagement.ConsoleUI/src/components/layout/AppLayout.tsx
+2 -2
View File
@@ -138,7 +138,7 @@ export const AppLayout: React.FC = () => {
const visibleNavItems = navItems
.filter((item) => {
if (item.path === '/tenants') {
return canManageTenants || canView('tenant_management');
return canManageTenants || canView('tenant_management') || canView('tenant_self_service');
}
if (item.path === '/settings') {
return (
@@ -456,7 +456,7 @@ export const AppLayout: React.FC = () => {
<div className="hidden sm:flex items-center gap-2 text-xs font-medium text-slate-300">
<span className="text-slate-400">Tenant:</span>
{canManageTenants ? (
{canManageTenants || canView('tenant_management') || canView('tenant_self_service') ? (
<Link
to="/tenants"
className="bg-slate-900/80 hover:bg-slate-800/90 text-slate-200 hover:text-white px-2.5 py-1 rounded-lg border border-slate-800 hover:border-slate-700 flex items-center gap-1.5 font-medium shadow-xs max-w-[320px] truncate transition group cursor-pointer"
PostFundManagement.ConsoleUI/src/components/users/UserSecurityModal.tsx
+117 -77
View File
@@ -54,9 +54,23 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
const { canApprove, canAdd, canView, canAccess, isUnrestricted } = useRbac();
const hasTenantSelfHelpAccess = canAccess('tenant_self_service') || canView('tenant_self_service');
const canManageRolesAndClaims = canApprove('settings_users') || canApprove('tenant_management') || isUnrestricted;
const canManageSessions = canApprove('settings_users') || canApprove('tenant_management') || hasTenantSelfHelpAccess || isUnrestricted;
const canChangeStatus = canAdd('settings_users') || canAdd('tenant_management') || canApprove('settings_users') || isUnrestricted;
const canManageRolesAndClaims =
canApprove('settings_users') ||
canApprove('tenant_management') ||
canApprove('tenant_self_service') ||
canAdd('tenant_self_service') ||
isUnrestricted;
const canManageSessions =
canApprove('settings_users') ||
canApprove('tenant_management') ||
hasTenantSelfHelpAccess ||
isUnrestricted;
const canChangeStatus =
canAdd('settings_users') ||
canAdd('tenant_management') ||
canAdd('tenant_self_service') ||
canApprove('settings_users') ||
isUnrestricted;
const [activeTab, setActiveTab] = useState<'overview' | 'roles' | 'claims' | 'sessions'>('overview');
@@ -105,8 +119,11 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
// Role Mutations
const assignRoleMutation = useMutation({
mutationFn: (roleId: string) => {
const selectedRole = systemRoles.find((r) => r.id === roleId);
if (selectedRole && (selectedRole.name.toLowerCase() === 'admin' || selectedRole.id === '1') && hasTenantSelfHelpAccess) {
const selectedRole = (Array.isArray(systemRoles) ? systemRoles : []).find(
(r) => r && (String(r.id) === String(roleId) || String((r as any).Id) === String(roleId))
);
const roleName = selectedRole?.name || (selectedRole as any)?.Name || '';
if (selectedRole && (roleName.toLowerCase() === 'admin' || String(selectedRole.id) === '1') && hasTenantSelfHelpAccess) {
throw new Error('Security policy: Users with tenant self-help access cannot assign Admin roles.');
}
return assignUserRole(userId, roleId);
@@ -192,11 +209,16 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
if (!user) return null;
const effectiveUser = freshUser || user;
const decodedId = effectiveUser.idNumber ? decodeIdNumberHex(effectiveUser.idNumber) : null;
const assignedRoleIds = new Set(userRoles.map((r) => r.id));
const availableRoles = systemRoles.filter((r) => {
if (assignedRoleIds.has(r.id)) return false;
if (hasTenantSelfHelpAccess && (r.name.toLowerCase() === 'admin' || r.id === '1')) {
const decodedId = effectiveUser?.idNumber ? decodeIdNumberHex(effectiveUser.idNumber) : null;
const assignedRoleIds = new Set(
(Array.isArray(userRoles) ? userRoles : []).map((r) => r?.id || (r as any)?.Id).filter(Boolean)
);
const availableRoles = (Array.isArray(systemRoles) ? systemRoles : []).filter((r) => {
if (!r) return false;
const rId = r.id || (r as any).Id;
const rName = r.name || (r as any).Name || '';
if (rId && assignedRoleIds.has(rId)) return false;
if (hasTenantSelfHelpAccess && (rName.toLowerCase() === 'admin' || String(rId) === '1')) {
return false;
}
return true;
@@ -204,21 +226,28 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
const assignableClaims = React.useMemo(() => {
const claimMap = new Map<string, { claim: string; label: string }>();
systemClaims.forEach((c) => {
const type = c.claimType || c.type;
if (type) {
if (hasTenantSelfHelpAccess && (type.toLowerCase() === 'unrestricted' || type.toLowerCase() === 'admin')) {
if (Array.isArray(systemClaims)) {
systemClaims.forEach((c) => {
if (!c) return;
const type = c.claimType || c.type;
if (type && typeof type === 'string') {
if (hasTenantSelfHelpAccess && (type.toLowerCase() === 'unrestricted' || type.toLowerCase() === 'admin')) {
return;
}
claimMap.set(type, { claim: type, label: type });
}
});
}
if (Array.isArray(ROLE_CLAIM_DEFINITIONS)) {
ROLE_CLAIM_DEFINITIONS.forEach((def) => {
if (!def || !def.claim) return;
const claimStr = String(def.claim);
if (hasTenantSelfHelpAccess && (claimStr.toLowerCase() === 'unrestricted' || claimStr.toLowerCase() === 'admin')) {
return;
}
claimMap.set(type, { claim: type, label: type });
}
});
ROLE_CLAIM_DEFINITIONS.forEach((def) => {
if (hasTenantSelfHelpAccess && (def.claim === 'unrestricted' || (def.claim as string) === 'admin')) {
return;
}
claimMap.set(def.claim, { claim: def.claim, label: `${def.claim} (${def.label})` });
});
claimMap.set(claimStr, { claim: claimStr, label: `${claimStr} (${def.label || claimStr})` });
});
}
return Array.from(claimMap.values());
}, [systemClaims, hasTenantSelfHelpAccess]);
@@ -325,10 +354,10 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
</span>
<span
className={`inline-flex items-center px-2 py-0.5 rounded text-[10px] font-semibold border ${
getActivityStatusBadge(effectiveUser.status).className
(getActivityStatusBadge(effectiveUser.status) || {}).className || 'bg-slate-800 text-slate-300'
}`}
>
{getActivityStatusBadge(effectiveUser.status).label}
{(getActivityStatusBadge(effectiveUser.status) || {}).label || 'Active'}
</span>
</div>
<div className="flex items-center gap-2">
@@ -336,8 +365,8 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
<button
type="button"
onClick={() => statusMutation.mutate(ActivityStatus.Inactive)}
disabled={statusMutation.isPending}
className="px-2.5 py-1 text-xs font-semibold text-amber-400 bg-amber-500/10 hover:bg-amber-500/20 border border-amber-500/20 rounded-lg transition"
disabled={statusMutation.isPending || !canChangeStatus}
className="px-2.5 py-1 text-xs font-semibold text-amber-400 bg-amber-500/10 hover:bg-amber-500/20 border border-amber-500/20 rounded-lg transition disabled:opacity-50 cursor-pointer"
>
Suspend User
</button>
@@ -345,8 +374,8 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
<button
type="button"
onClick={() => statusMutation.mutate(ActivityStatus.Active)}
disabled={statusMutation.isPending}
className="px-2.5 py-1 text-xs font-semibold text-emerald-400 bg-emerald-500/10 hover:bg-emerald-500/20 border border-emerald-500/20 rounded-lg transition"
disabled={statusMutation.isPending || !canChangeStatus}
className="px-2.5 py-1 text-xs font-semibold text-emerald-400 bg-emerald-500/10 hover:bg-emerald-500/20 border border-emerald-500/20 rounded-lg transition disabled:opacity-50 cursor-pointer"
>
Activate User
</button>
@@ -365,8 +394,8 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
<select
value={selectedRoleToAdd}
onChange={(e) => setSelectedRoleToAdd(e.target.value)}
disabled={loadingSystemRoles || availableRoles.length === 0}
className="flex-1 bg-slate-900 border border-slate-800 rounded-xl px-3 py-1.5 text-white focus:outline-none focus:border-blue-500"
disabled={loadingSystemRoles || availableRoles.length === 0 || !canManageRolesAndClaims}
className="flex-1 bg-slate-900 border border-slate-800 rounded-xl px-3 py-1.5 text-white focus:outline-none focus:border-blue-500 disabled:opacity-50"
>
<option value="">
{availableRoles.length === 0 ? 'All system roles assigned' : 'Select role to assign...'}
@@ -380,8 +409,8 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
<button
type="button"
onClick={() => selectedRoleToAdd && assignRoleMutation.mutate(selectedRoleToAdd)}
disabled={!selectedRoleToAdd || assignRoleMutation.isPending}
className="inline-flex items-center gap-1 px-3 py-1.5 bg-blue-600 hover:bg-blue-500 text-white rounded-xl font-semibold transition disabled:opacity-50"
disabled={!selectedRoleToAdd || assignRoleMutation.isPending || !canManageRolesAndClaims}
className="inline-flex items-center gap-1 px-3 py-1.5 bg-blue-600 hover:bg-blue-500 text-white rounded-xl font-semibold transition disabled:opacity-50 cursor-pointer"
>
<Plus className="w-3.5 h-3.5" />
<span>Assign Role</span>
@@ -392,29 +421,34 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
<div className="bg-slate-900/60 rounded-xl border border-slate-800 divide-y divide-slate-800/80">
{loadingUserRoles ? (
<div className="p-4 text-center text-slate-500">Loading roles...</div>
) : userRoles.length === 0 ? (
) : (Array.isArray(userRoles) ? userRoles : []).length === 0 ? (
<div className="p-4 text-center text-slate-500">No roles assigned to this user.</div>
) : (
userRoles.map((role) => (
<div key={role.id} className="p-3 flex items-center justify-between">
<div>
<div className="text-white font-semibold flex items-center gap-1.5">
<Shield className="w-3.5 h-3.5 text-blue-400" />
<span>{role.name}</span>
(Array.isArray(userRoles) ? userRoles : []).map((role) => {
if (!role) return null;
const roleId = role.id || (role as any).Id || String(role);
const roleName = role.name || (role as any).Name || String(role);
return (
<div key={roleId} className="p-3 flex items-center justify-between">
<div>
<div className="text-white font-semibold flex items-center gap-1.5">
<Shield className="w-3.5 h-3.5 text-blue-400" />
<span>{roleName}</span>
</div>
<div className="text-[10px] text-slate-500 font-mono">Role ID: {roleId}</div>
</div>
<div className="text-[10px] text-slate-500 font-mono">Role ID: {role.id}</div>
<button
type="button"
onClick={() => removeRoleMutation.mutate(roleId)}
disabled={removeRoleMutation.isPending || !canManageRolesAndClaims}
className="p-1.5 text-rose-400 hover:text-rose-300 hover:bg-rose-500/10 rounded-lg transition disabled:opacity-50 cursor-pointer"
title="Revoke Role"
>
<Trash2 className="w-3.5 h-3.5" />
</button>
</div>
<button
type="button"
onClick={() => removeRoleMutation.mutate(role.id)}
disabled={removeRoleMutation.isPending}
className="p-1.5 text-rose-400 hover:text-rose-300 hover:bg-rose-500/10 rounded-lg transition"
title="Revoke Role"
>
<Trash2 className="w-3.5 h-3.5" />
</button>
</div>
))
);
})
)}
</div>
</div>
@@ -497,7 +531,7 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
<button
type="button"
onClick={() => addClaimMutation.mutate()}
disabled={!newClaimType.trim() || !newClaimValue.trim() || addClaimMutation.isPending}
disabled={!newClaimType.trim() || !newClaimValue.trim() || addClaimMutation.isPending || !canManageRolesAndClaims}
className="inline-flex items-center gap-1 px-3 py-1 bg-blue-600 hover:bg-blue-500 text-white rounded-lg font-semibold transition disabled:opacity-50 cursor-pointer text-xs"
>
<Plus className="w-3.5 h-3.5" />
@@ -510,34 +544,40 @@ export const UserSecurityModal: React.FC<UserSecurityModalProps> = ({
<div className="bg-slate-900/60 rounded-xl border border-slate-800 divide-y divide-slate-800/80">
{loadingUserClaims ? (
<div className="p-4 text-center text-slate-500">Loading user claims...</div>
) : userClaims.length === 0 ? (
) : (Array.isArray(userClaims) ? userClaims : []).length === 0 ? (
<div className="p-4 text-center text-slate-500">No active claims found for user.</div>
) : (
userClaims.map((claim, idx) => (
<div key={idx} className="p-3 flex items-center justify-between">
<div>
<div className="text-white font-medium flex items-center gap-1.5">
<Key className="w-3.5 h-3.5 text-amber-400" />
<span>{claim.type || 'Custom Claim'}</span>
</div>
<div className="text-[11px] text-slate-300 font-mono mt-0.5">
Value: <span className="text-emerald-400">{claim.value}</span>
{claim.issuer && <span className="text-slate-500 ml-2">({claim.issuer})</span>}
(Array.isArray(userClaims) ? userClaims : []).map((claim, idx) => {
if (!claim) return null;
const claimType = claim.claimType || claim.type || 'Custom Claim';
const claimVal = claim.claimValue ?? claim.value ?? '';
const claimId = claim.claimId || (claim as any).id || claimType || String(idx);
return (
<div key={idx} className="p-3 flex items-center justify-between">
<div>
<div className="text-white font-medium flex items-center gap-1.5">
<Key className="w-3.5 h-3.5 text-amber-400" />
<span>{claimType}</span>
</div>
<div className="text-[11px] text-slate-300 font-mono mt-0.5">
Value: <span className="text-emerald-400">{claimVal}</span>
{claim.issuer && <span className="text-slate-500 ml-2">({claim.issuer})</span>}
</div>
</div>
{claimType && (
<button
type="button"
onClick={() => deleteClaimMutation.mutate(claimId)}
disabled={deleteClaimMutation.isPending || !canManageRolesAndClaims}
className="p-1.5 text-rose-400 hover:text-rose-300 hover:bg-rose-500/10 rounded-lg transition disabled:opacity-50 cursor-pointer"
title="Delete Claim"
>
<Trash2 className="w-3.5 h-3.5" />
</button>
)}
</div>
{claim.type && (
<button
type="button"
onClick={() => deleteClaimMutation.mutate(claim.type || String(idx))}
disabled={deleteClaimMutation.isPending}
className="p-1.5 text-rose-400 hover:text-rose-300 hover:bg-rose-500/10 rounded-lg transition"
title="Delete Claim"
>
<Trash2 className="w-3.5 h-3.5" />
</button>
)}
</div>
))
);
})
)}
</div>
</div>
PostFundManagement.ConsoleUI/src/pages/TenantManagementPage.tsx
+84 -73
View File
@@ -26,8 +26,7 @@ import {
createTenant,
updateTenant,
getTenantOrganisations,
getOrganisations,
getUsers,
getTenantUsers,
} from '../services/api';
import { Modal } from '../components/ui/Modal';
import { useToast } from '../components/ui/Toast';
@@ -36,7 +35,8 @@ import { ExportButton } from '../components/ui/ExportButton';
import { ExportColumn } from '../utils/exportUtils';
import { useTableSort, SortableTh } from '../utils/tableSort';
import { ActivityStatusBadge } from '../components/ui/StatusBadge';
import { Tenant, Organisation, TenantOrganisation, User, ActivityStatus, CreateTenantRequest, UpdateTenantRequest } from '../types';
import { ObfuscatedIdNumber } from '../components/ui/ObfuscatedIdNumber';
import { Tenant, Organisation, TenantOrganisation, TenantUser, User, ActivityStatus, CreateTenantRequest, UpdateTenantRequest } from '../types';
import { formatDate, getOrganisationTypeLabel, getUserEmail, registerUserEmails } from '../lib/formatters';
import { CreateUserModal } from '../components/users/CreateUserModal';
import { UserSecurityModal } from '../components/users/UserSecurityModal';
@@ -71,27 +71,21 @@ const TenantOrganisationsSubList: React.FC<{ tenantId: number | string; tenantNa
staleTime: 30000,
});
// Fetch all organisations directory (from governance cache) to resolve complete organisation details
const { data: allOrganisations = [], isLoading: loadingAllOrgs } = useQuery<Organisation[]>({
queryKey: ['organisations'],
queryFn: () => getOrganisations(),
staleTime: 60000,
});
// Fetch user directory to resolve linked user email per organisation
const { data: usersDirectory = [] } = useQuery<User[]>({
queryKey: ['users-directory'],
queryFn: () => getUsers(1, 200),
// Fetch tenant users directory to resolve linked user email per organisation
const { data: tenantUsers = [] } = useQuery<TenantUser[]>({
queryKey: ['tenant-users', tenantId],
queryFn: () => getTenantUsers(tenantId),
staleTime: 5 * 60 * 1000,
});
React.useEffect(() => {
if (usersDirectory && usersDirectory.length > 0) {
registerUserEmails(usersDirectory);
if (tenantUsers && tenantUsers.length > 0) {
const users = tenantUsers.map((tu) => tu.user).filter((u): u is User => !!u);
registerUserEmails(users);
}
}, [usersDirectory]);
}, [tenantUsers]);
const isLoading = loadingTenantOrgs || (loadingAllOrgs && tenantOrganisations.length > 0 && allOrganisations.length === 0);
const isLoading = loadingTenantOrgs;
return (
<div className="py-4 px-6 border-l-4 border-blue-500 bg-linear-to-r from-blue-950/20 via-slate-900/40 to-slate-950/60 space-y-3">
@@ -171,26 +165,16 @@ const TenantOrganisationsSubList: React.FC<{ tenantId: number | string; tenantNa
</thead>
<tbody className="divide-y divide-slate-800/50">
{tenantOrganisations.map((tOrg) => {
const orgId = tOrg.organisationId || tOrg.organisation?.id || tOrg.id;
// Use the organisationId to fetch/match the organisation detail
const detailedOrg = allOrganisations.find(
(o) => String(o.id) === String(orgId) || String(o.id) === String(tOrg.organisationId)
);
const org = detailedOrg || tOrg.organisation;
const orgName = org?.name || tOrg.organisation?.name || 'Unnamed Organisation';
const regNo = org?.registrationNo || tOrg.organisation?.registrationNo || '—';
const orgType = org?.type ?? tOrg.organisation?.type;
const orgEmail = org?.email || tOrg.organisation?.email || '—';
const linkedUserId =
org?.userId ||
(org as any)?.UserId ||
(org as any)?.organisationUser ||
(org as any)?.OrganisationUser ||
(tOrg.organisation as any)?.userId ||
(tOrg as any)?.userId;
const org = tOrg.organisation;
const orgId = org?.id || tOrg.organisationId || tOrg.id;
const orgName = org?.name || 'Unnamed Organisation';
const regNo = org?.registrationNo || '—';
const orgType = org?.type ?? tOrg.status;
const orgEmail = org?.email || '—';
const linkedUserId = org?.userId;
const matchedUser = linkedUserId
? usersDirectory.find((u) => u.id && String(u.id).toLowerCase() === String(linkedUserId).toLowerCase())
? tenantUsers.find((tu) => tu.user?.id && String(tu.user.id).toLowerCase() === String(linkedUserId).toLowerCase())?.user
: null;
const userEmailDisplay =
@@ -199,8 +183,8 @@ const TenantOrganisationsSubList: React.FC<{ tenantId: number | string; tenantNa
(linkedUserId && String(linkedUserId).includes('@') ? String(linkedUserId) : null) ||
org?.email ||
'—';
const status = org?.status ?? tOrg.organisation?.status ?? tOrg.status;
const createdAt = org?.createdAt || tOrg.createdAt || tOrg.organisation?.createdAt;
const status = org?.status ?? tOrg.status;
const createdAt = org?.createdAt || tOrg.createdAt;
return (
<tr key={String(tOrg.id) + '-' + String(orgId)} className="hover:bg-slate-800/30 transition">
@@ -274,21 +258,12 @@ const TenantUsersSubList: React.FC<{
onProvisionUser: (tenantId: number | string) => void;
onManageUser: (user: User) => void;
}> = ({ tenantId, tenantName, onProvisionUser, onManageUser }) => {
const { data: usersDirectory = [], isLoading, refetch } = useQuery<User[]>({
const { data: tenantUsers = [], isLoading, refetch } = useQuery<TenantUser[]>({
queryKey: ['tenant-users', tenantId],
queryFn: () => getUsers(1, 200),
queryFn: () => getTenantUsers(tenantId),
staleTime: 30000,
});
const tenantUsers = useMemo(() => {
return usersDirectory.filter((u) => {
if (u.tenant_id !== undefined && u.tenant_id !== null) {
return String(u.tenant_id) === String(tenantId);
}
return true;
});
}, [usersDirectory, tenantId]);
const { canAdd } = useRbac();
const canProvision = canAdd('tenant_management') || canAdd('tenant_self_service') || canAdd('settings_users');
@@ -356,24 +331,45 @@ const TenantUsersSubList: React.FC<{
<td colSpan={6} className="py-4 text-center text-slate-500">No users provisioned under Tenant #{tenantId}.</td>
</tr>
) : (
tenantUsers.map((u) => (
<tr key={u.id} className="hover:bg-slate-800/30 transition">
<td className="py-2 px-3 text-white font-medium">{u.email || '—'}</td>
<td className="py-2 px-3 font-mono text-slate-400 text-[11px]">{u.id}</td>
<td className="py-2 px-3 font-mono text-slate-300 text-[11px]">{u.idNumber || '—'}</td>
<td className="py-2 px-3 text-slate-300">{u.role || 'Standard User'}</td>
<td className="py-2 px-3"><ActivityStatusBadge status={u.status} /></td>
<td className="py-2 px-3 text-right">
<button
onClick={() => onManageUser(u)}
className="inline-flex items-center gap-1 px-2.5 py-1 text-[11px] font-semibold text-blue-300 bg-blue-500/10 hover:bg-blue-500/20 border border-blue-500/20 rounded-lg transition cursor-pointer"
>
<ShieldCheck className="w-3 h-3 text-blue-400" />
Manage Access &amp; Roles
</button>
</td>
</tr>
))
tenantUsers.map((tu) => {
const u = tu.user;
const userId = u?.id || tu.userId;
const email = u?.email || '—';
const role = u?.role || 'Standard User';
const idNumber = u?.idNumber;
const status = u?.status ?? tu.status;
return (
<tr key={String(tu.id) + '-' + String(userId)} className="hover:bg-slate-800/30 transition">
<td className="py-2 px-3 text-white font-medium">{email}</td>
<td className="py-2 px-3 font-mono text-slate-400 text-[11px]">{userId}</td>
<td className="py-2 px-3 font-mono text-slate-300 text-[11px]">
<ObfuscatedIdNumber idNumber={idNumber} />
</td>
<td className="py-2 px-3 text-slate-300">{role}</td>
<td className="py-2 px-3"><ActivityStatusBadge status={status} /></td>
<td className="py-2 px-3 text-right">
<button
onClick={() => {
const userToManage: User = u || {
id: tu.userId,
email: null,
role: null,
idNumber: null,
status: tu.status,
lastLoginAt: null,
};
onManageUser(userToManage);
}}
className="inline-flex items-center gap-1 px-2.5 py-1 text-[11px] font-semibold text-blue-300 bg-blue-500/10 hover:bg-blue-500/20 border border-blue-500/20 rounded-lg transition cursor-pointer"
>
<ShieldCheck className="w-3 h-3 text-blue-400" />
Manage Access &amp; Roles
</button>
</td>
</tr>
);
})
)}
</tbody>
</table>
@@ -541,9 +537,24 @@ export const TenantManagementPage: React.FC = () => {
return 'Active';
};
// Auto-expand active tenant for tenant self-service users
React.useEffect(() => {
if (!canManageTenants && currentTenantId) {
setExpandedTenants((prev) => ({
...prev,
[String(currentTenantId)]: true,
}));
}
}, [canManageTenants, currentTenantId]);
// Filter & Search
const filteredTenants = useMemo(() => {
return tenants.filter((t) => {
// Non-admins (tenant self-service) only see their own tenant partition boundary
if (!canManageTenants && currentTenantId && String(t.id) !== String(currentTenantId)) {
return false;
}
const s = Number(t.status ?? ActivityStatus.Active);
const matchesSearch =
!searchTerm.trim() ||
@@ -559,16 +570,16 @@ export const TenantManagementPage: React.FC = () => {
return matchesSearch && matchesStatus;
});
}, [tenants, searchTerm, statusFilter]);
}, [tenants, searchTerm, statusFilter, canManageTenants, currentTenantId]);
// Sorting
const { sortedData, sortColumn, sortDirection, handleSort } = useTableSort(filteredTenants, 'id', 'asc');
// Metrics
const totalCount = tenants.length;
const activeCount = tenants.filter((t) => Number(t.status ?? ActivityStatus.Active) === 1).length;
const inactiveCount = tenants.filter((t) => Number(t.status) === 2).length;
const disabledCount = tenants.filter((t) => Number(t.status) === 3).length;
// Metrics (scoped to visible partitions)
const totalCount = filteredTenants.length;
const activeCount = filteredTenants.filter((t) => Number(t.status ?? ActivityStatus.Active) === 1).length;
const inactiveCount = filteredTenants.filter((t) => Number(t.status) === 2).length;
const disabledCount = filteredTenants.filter((t) => Number(t.status) === 3).length;
// Export columns (using integer ID only, no hashid)
const exportColumns: ExportColumn<Tenant>[] = [
PostFundManagement.ConsoleUI/src/services/api.ts
+21
View File
@@ -65,6 +65,7 @@ import {
ActivityStatus,
Tenant,
TenantOrganisation,
TenantUser,
CreateTenantRequest,
UpdateTenantRequest,
Beneficiary,
@@ -1632,6 +1633,26 @@ export const getTenantOrganisations = async (tenantId: string | number): Promise
}
};
export const getTenantUsers = async (tenantId: string | number): Promise<TenantUser[]> => {
const hashedTenantId = await toolsService.encodeId(tenantId);
try {
const res = await apiClient.get<TenantUser[]>(
`/v1/api/governance/tenants/${encodeURIComponent(hashedTenantId)}/users`
);
return res.data || [];
} catch (err: any) {
if (String(tenantId) !== String(hashedTenantId)) {
try {
const fallbackRes = await apiClient.get<TenantUser[]>(
`/v1/api/governance/tenants/${encodeURIComponent(String(tenantId))}/users`
);
return fallbackRes.data || [];
} catch {}
}
throw err;
}
};
// ==========================================
// 10. Projects: Beneficiaries & Outcomes APIs
// ==========================================
PostFundManagement.ConsoleUI/src/types.ts
+12
View File
@@ -400,6 +400,18 @@ export interface TenantOrganisation {
creator?: User | null;
}
export interface TenantUser {
id: number | string;
tenantId: number | string;
userId: string;
status: ActivityStatus;
createdAt: string;
createdBy: string;
tenant?: Tenant | null;
user?: User | null;
creator?: User | null;
}
export interface Portfolio {
id: number | string;
tenantId?: number | string;
PostFundManagement.Domain/Entities/TenantOrganisation.cs
+2 -2
View File
@@ -1,11 +1,11 @@
namespace PostFundManagement.Domain.Entities;
namespace PostFundManagement.Domain.Entities;
[EntityTypeConfiguration<TenantOrganisationConfiguration, TenantOrganisation>]
public class TenantOrganisation : Models.TenantOrganisation
{
public virtual Tenant? Tenant { get; set; }
public virtual Organisation? Organisation { get; set; }
public new virtual Organisation? Organisation { get; set; }
public virtual User? Creator { get; set; }
}
PostFundManagement.Domain/Entities/TenantUser.cs
+2 -2
View File
@@ -1,4 +1,4 @@
namespace PostFundManagement.Domain.Entities;
namespace PostFundManagement.Domain.Entities;
[EntityTypeConfiguration<TenantUserConfiguration, TenantUser>]
public class TenantUser : Models.TenantUser
@@ -9,7 +9,7 @@ public class TenantUser : Models.TenantUser
public virtual User? Creator { get; set; }
[ForeignKey(nameof(UserId))]
public virtual User? User { get; set; }
public new virtual User? User { get; set; }
}
public sealed class TenantUserConfiguration : IEntityTypeConfiguration<TenantUser>
PostFundManagement.Domain/Extensions/Mappers.cs
+4 -2
View File
@@ -11,7 +11,8 @@ public static class Mappers
CreatedAt = entity.CreatedAt,
CreatedBy = entity.CreatedBy,
Status = entity.Status,
UserId = entity.UserId
UserId = entity.UserId,
User = entity.User?.Map()
};
public static TenantOrganisation Map(this Entities.TenantOrganisation entity) => new()
@@ -21,7 +22,8 @@ public static class Mappers
CreatedAt = entity.CreatedAt,
CreatedBy = entity.CreatedBy,
OrganisationId = entity.OrganisationId,
TenantId = entity.TenantId
TenantId = entity.TenantId,
Organisation = entity.Organisation?.Map()
};
public static Tenant Map(this Entities.Tenant entity) => new()
PostFundManagement.Domain/Models/TenantOrganisation.cs
+3 -1
View File
@@ -1,4 +1,4 @@
namespace PostFundManagement.Domain.Models;
namespace PostFundManagement.Domain.Models;
public class TenantOrganisation
{
@@ -13,4 +13,6 @@ public class TenantOrganisation
public long OrganisationId { get; set; }
public ActivityStatus Status { get; set; }
public Organisation? Organisation { get; set; }
}
PostFundManagement.Domain/Models/TenantUser.cs
+3 -1
View File
@@ -1,4 +1,4 @@
namespace PostFundManagement.Domain.Models;
namespace PostFundManagement.Domain.Models;
public class TenantUser
{
@@ -13,4 +13,6 @@ public class TenantUser
public Guid UserId { get; set; }
public ActivityStatus Status { get; set; }
public User? User { get; set; }
}