Tenant Name
{selectedTenant.name || '—'}
@@ -892,7 +891,9 @@ export const TenantManagementPage: React.FC = () => {
Created By
-
{selectedTenant.createdBy || 'System Admin'}
+
+ {getUserEmail(selectedTenant.createdBy) || selectedTenant.createdBy || 'System Admin'}
+
{selectedTenant.updatedAt && (
@@ -905,7 +906,9 @@ export const TenantManagementPage: React.FC = () => {
{selectedTenant.updatedBy && (
Updated By
-
{selectedTenant.updatedBy}
+
+ {getUserEmail(selectedTenant.updatedBy) || selectedTenant.updatedBy}
+
)}
@@ -913,7 +916,7 @@ export const TenantManagementPage: React.FC = () => {
When users authenticate, their security token contains claims identifying their tenant partition.
@@ -928,7 +931,7 @@ export const TenantManagementPage: React.FC = () => {
setIsDetailModalOpen(false);
handleOpenUpdate(selectedTenant);
}}
- className="flex items-center gap-1.5 px-4 py-2 bg-blue-600 hover:bg-blue-500 text-white text-xs font-semibold rounded-lg transition cursor-pointer"
+ className="flex items-center gap-1.5 px-4 py-2 bg-gradient-to-r from-blue-600 to-indigo-600 hover:from-blue-500 hover:to-indigo-500 text-white text-xs font-semibold rounded-xl transition cursor-pointer"
>
Edit Tenant Status
@@ -936,7 +939,7 @@ export const TenantManagementPage: React.FC = () => {
setIsDetailModalOpen(false)}
- className="px-4 py-2 bg-slate-800 hover:bg-slate-700 text-slate-300 text-xs font-medium rounded-lg transition cursor-pointer"
+ className="px-4 py-2 bg-slate-800 hover:bg-slate-700 text-slate-300 text-xs font-medium rounded-xl transition cursor-pointer"
>
Close
diff --git a/PostFundManagement.ConsoleUI/src/services/api.ts b/PostFundManagement.ConsoleUI/src/services/api.ts
index 8497e17..9acc636 100644
--- a/PostFundManagement.ConsoleUI/src/services/api.ts
+++ b/PostFundManagement.ConsoleUI/src/services/api.ts
@@ -64,6 +64,7 @@ import {
ProblemDetails,
ActivityStatus,
Tenant,
+ TenantOrganisation,
CreateTenantRequest,
UpdateTenantRequest,
Beneficiary,
@@ -180,6 +181,7 @@ export const normalizeOrganisation = (raw: any): Organisation => {
name: raw.name ?? raw.Name ?? null,
registrationNo: raw.registrationNo ?? raw.RegistrationNo ?? raw.regNo ?? raw.RegNo ?? null,
email: raw.email ?? raw.Email ?? null,
+ userId: raw.userId ?? raw.UserId ?? raw.organisationUser ?? raw.OrganisationUser ?? null,
type: raw.type ?? raw.Type ?? raw.organisationType ?? raw.OrganisationType ?? 5,
status,
createdAt: raw.createdAt ?? raw.CreatedAt ?? new Date().toISOString(),
@@ -214,6 +216,8 @@ export const createOrganisation = async (payload: CreateOrganisationRequest): Pr
name: payload.name,
registrationNo: payload.registrationNo,
email: payload.email,
+ idNumber: payload.idNumber,
+ organisationUser: payload.organisationUser,
type: payload.type !== undefined ? Number(payload.type) : 5,
});
return res.data;
@@ -225,6 +229,8 @@ export const updateOrganisation = async (payload: UpdateOrganisationRequest): Pr
name: payload.name,
registrationNo: payload.registrationNo,
email: payload.email,
+ idNumber: payload.idNumber,
+ organisationUser: payload.organisationUser,
type: Number(payload.type),
status: payload.status !== undefined ? Number(payload.status) : ActivityStatus.Active,
});
@@ -1527,6 +1533,26 @@ export const updateTenant = async (payload: UpdateTenantRequest): Promise
});
};
+export const getTenantOrganisations = async (tenantId: string | number): Promise => {
+ const hashedTenantId = await toolsService.encodeId(tenantId);
+ try {
+ const res = await apiClient.get(
+ `/v1/api/governance/tenants/${encodeURIComponent(hashedTenantId)}/organisations`
+ );
+ return res.data || [];
+ } catch (err: any) {
+ if (String(tenantId) !== String(hashedTenantId)) {
+ try {
+ const fallbackRes = await apiClient.get(
+ `/v1/api/governance/tenants/${encodeURIComponent(String(tenantId))}/organisations`
+ );
+ return fallbackRes.data || [];
+ } catch {}
+ }
+ throw err;
+ }
+};
+
// ==========================================
// 10. Projects: Beneficiaries & Outcomes APIs
// ==========================================
diff --git a/PostFundManagement.ConsoleUI/src/types.ts b/PostFundManagement.ConsoleUI/src/types.ts
index b8e8f0d..a4336aa 100644
--- a/PostFundManagement.ConsoleUI/src/types.ts
+++ b/PostFundManagement.ConsoleUI/src/types.ts
@@ -262,6 +262,7 @@ export interface User {
status: ActivityStatus;
lastLoginAt: string | null;
role?: string | UserRole | null;
+ idNumber?: string | null;
name?: string;
organisationId?: number | string;
organisationName?: string;
@@ -302,6 +303,7 @@ export interface Organisation {
name: string | null;
registrationNo: string | null;
email: string | null;
+ userId?: string | null;
type: OrganisationType;
status: ActivityStatus;
createdAt: string;
@@ -312,6 +314,8 @@ export interface CreateOrganisationRequest {
name: string;
registrationNo: string;
email: string;
+ idNumber: string;
+ organisationUser: string;
type: OrganisationType;
}
@@ -320,10 +324,24 @@ export interface UpdateOrganisationRequest {
name: string;
registrationNo: string;
email: string;
+ idNumber: string;
+ organisationUser: string;
type: OrganisationType;
status?: ActivityStatus;
}
+export interface TenantOrganisation {
+ id: number | string;
+ tenantId: number | string;
+ organisationId: number | string;
+ status: ActivityStatus;
+ createdAt: string;
+ createdBy: string;
+ tenant?: Tenant | null;
+ organisation?: Organisation | null;
+ creator?: User | null;
+}
+
export interface Portfolio {
id: number | string;
tenantId?: number | string;