diff --git a/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx b/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
index b53b2bd..56c8e30 100644
--- a/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
+++ b/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
@@ -270,8 +270,6 @@ export const GovernancePage: React.FC = () => {
const linkedUserId =
editingOrg?.userId ||
editingOrg?.UserId ||
- editingOrg?.organisationUser ||
- editingOrg?.OrganisationUser ||
'';
if (linkedUserId) {
@@ -296,7 +294,7 @@ export const GovernancePage: React.FC = () => {
}
return list;
- }, [executiveAndManagerUsers, usersDirectory, editingOrg?.id, editingOrg?.userId, editingOrg?.organisationUser]);
+ }, [executiveAndManagerUsers, usersDirectory, editingOrg?.id, editingOrg?.userId]);
// Quick Add Executive User Subform state
const [isQuickAddUserOpen, setIsQuickAddUserOpen] = useState(false);
@@ -630,7 +628,6 @@ export const GovernancePage: React.FC = () => {
registrationNo: data.registrationNo,
email: data.email,
organisationUser: data.organisationUser,
- userId: data.organisationUser,
type: Number(data.type),
status: data.status !== undefined ? Number(data.status) : ActivityStatus.Active,
});
@@ -770,9 +767,6 @@ export const GovernancePage: React.FC = () => {
const targetUserId =
org.userId ||
org.UserId ||
- org.organisationUser ||
- org.OrganisationUser ||
- org.createdBy ||
'';
let selectedUserId = '';
@@ -1238,6 +1232,11 @@ export const GovernancePage: React.FC = () => {
{org.email}
+ {org.userId && (
+
+ Exec: {getUserEmail(org.userId)}
+
+ )}
@@ -1736,11 +1735,11 @@ export const GovernancePage: React.FC = () => {
@@ -2585,11 +2584,17 @@ export const GovernancePage: React.FC = () => {
{getOrganisationTypeLabel(orgFreshDetail?.type ?? selectedOrgForDetail?.type ?? OrganisationType.Enterprise)}
- Linked User:
+ Executive User:
{getUserEmail(orgFreshDetail?.userId || selectedOrgForDetail?.userId) || orgFreshDetail?.userId || selectedOrgForDetail?.userId || '—'}
+
+ Created By:
+
+ {getUserEmail(orgFreshDetail?.createdBy || selectedOrgForDetail?.createdBy) || orgFreshDetail?.createdBy || selectedOrgForDetail?.createdBy || '—'}
+
+
diff --git a/PostFundManagement.ConsoleUI/src/services/api.ts b/PostFundManagement.ConsoleUI/src/services/api.ts
index 908c458..d81ab01 100644
--- a/PostFundManagement.ConsoleUI/src/services/api.ts
+++ b/PostFundManagement.ConsoleUI/src/services/api.ts
@@ -247,7 +247,6 @@ export const createOrganisation = async (payload: CreateOrganisationRequest): Pr
email: payload.email,
idNumber: payload.idNumber || null,
organisationUser: payload.organisationUser,
- userId: payload.userId || payload.organisationUser,
type: payload.type !== undefined ? Number(payload.type) : 5,
});
return res.data;
@@ -260,9 +259,8 @@ export const updateOrganisation = async (payload: UpdateOrganisationRequest): Pr
name: payload.name,
registrationNo: payload.registrationNo,
email: payload.email,
- idNumber: payload.idNumber,
+ idNumber: payload.idNumber || null,
organisationUser: payload.organisationUser,
- userId: payload.userId || payload.organisationUser,
type: Number(payload.type),
status: orgStatus,
});
diff --git a/PostFundManagement.ConsoleUI/src/types.ts b/PostFundManagement.ConsoleUI/src/types.ts
index 16cffce..eaae2f9 100644
--- a/PostFundManagement.ConsoleUI/src/types.ts
+++ b/PostFundManagement.ConsoleUI/src/types.ts
@@ -388,7 +388,6 @@ export interface CreateOrganisationRequest {
email: string;
idNumber?: string | null;
organisationUser: string;
- userId?: string | null;
type: OrganisationType;
}
@@ -399,7 +398,6 @@ export interface UpdateOrganisationRequest {
email: string;
idNumber?: string | null;
organisationUser: string;
- userId?: string | null;
type: OrganisationType;
status?: ActivityStatus;
}
|