datastake-daf 0.6.798 → 0.6.800

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineSubjects/index.jsx

@@ -36,7 +36,7 @@ export default function CombineSubjectsModal({
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
-			const ids = selectedSubjects.map((subject) => subject._id);
+			const ids = selectedSubjects.map((subject) => subject.id);
 			onSuccess({
 				ids,
 				data,
@@ -47,7 +47,7 @@ export default function CombineSubjectsModal({
 	return (
 		<Modal
 			open={isOpen}
-			title={t("admin::merge")}
+			title={t("merge")}
 			onClose={onClose}
 			onSuccess={onSubmit}
 			withModalFormWrapper={false}
@@ -59,7 +59,7 @@ export default function CombineSubjectsModal({
 				  const values = MainForm.getFieldsValue();
 			  
 				  const requiredFields =
-					entity === "location"
+					entity.includes("location")
 					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
 					  : ["id", "name", "category", "country"];
 			  
@@ -75,7 +75,7 @@ export default function CombineSubjectsModal({
 							color: token.baseGray90,
 						}}
 					>
-						{t("admin::current_subjects")}
+						{t("current_subjects")}
 					</span>
 					<DAFTable
 						columns={columns}
@@ -93,7 +93,7 @@ export default function CombineSubjectsModal({
 						marginTop: 14,
 					}}
 				>
-					{t("admin::merged_output")}
+					{t("merged_output")}
 				</span>
 
 				<Form
@@ -135,7 +135,7 @@ export default function CombineSubjectsModal({
 						></Select>
 					</Form.Item>
 
-					{entity.includes("locations") && (
+					{entity.includes("location") && (
 						<>
 						<Form.Item className="flex-1" name="administrativeLevel1">
 							<Select

package/src/@daf/core/components/Screens/Admin/AdminModals/NewAccount/index.jsx

@@ -47,7 +47,7 @@ export default function NewAccount({
 	return (
 		<Modal
 			t={t}
-			title={t(isEdit ? "admin::edit-account" : "admin::add-account")}
+			title={t(isEdit ? "edit-account" : "add-account")}
 			open={isOpen}
 			onClose={onClose}
 			onSuccess={onSubmit}

package/src/@daf/core/components/Screens/Admin/AdminModals/NewUser/index.jsx

@@ -1,10 +1,22 @@
 import Modal from "../../../../Modal/index.jsx";
-import { Form, Select, Alert, Input } from "antd";
+import { Form, Select, Alert, Input, message } from "antd";
 import { useState, useEffect } from "react";
 
-export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [], addUser = () => {}, module = "straatos" }) {
+export default function NewUser({ 
+	t, 
+	isOpen, 
+	onClose, 
+	defaultData, 
+	userRoles = [], 
+	addUser = () => {}, 
+	module = "straatos",
+	inviteCompanyAccount = () => {},
+	companyId,
+	handleError = () => {},
+}) {
 	const [MainForm] = Form.useForm();
 	const [accountUsed, setAccountUsed] = useState(false);
+	const [loading, setLoading] = useState(false);
 
 	useEffect(() => {
 		if (defaultData) {
@@ -15,34 +27,54 @@ export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [
 		}
 	}, [defaultData]);
 
-	const onSubmit = () => {
-		MainForm.validateFields()
-			.then((val) => {
-				// Create user object with the form data
-				const userData = {
-					firstName: val.firstName,
-					lastName: val.lastName,
-					email: val.email,
-					role: val.role,
-					apps: {
-						[module]: {
-							role: val.role,					
-						}
-					}
-				};
-				
-				// Add user to local state
-				addUser(userData);
-				
-				// Close modal and reset form
-				onClose();
-				MainForm.resetFields();
-			})
-			.catch(() => {});
+	const onSubmit = async () => {
+		try {
+			const val = await MainForm.validateFields();
+			setLoading(true);
+			
+			const apiPayload = {
+				firstName: val.firstName,
+				lastName: val.lastName,
+				email: val.email,
+				role: val.role,
+				type: 'user',   
+				pendingCompanyId: companyId,
+				name: `${val.firstName} ${val.lastName}`,
+			};
+
+			await inviteCompanyAccount({
+				companyId: companyId,
+				data: apiPayload
+			});
+		
+			const localUserData = {
+				...apiPayload,
+				status: 'pending',
+				// apps: {
+				// 	[module]: {
+				// 		role: val.role,
+				// 	}
+				// },
+			};
+			
+			addUser(localUserData);
+
+			message.success(t("User added successfully"));
+
+			onClose();
+			MainForm.resetFields();
+		} catch (error) {
+			if (error.errorFields) {
+				return;
+			}
+			handleError(error);
+		} finally {
+			setLoading(false);
+		}
 	};
 
 	return (
-		<Modal t={t} title={t("admin::new-user")} open={isOpen} onClose={onClose} onSuccess={onSubmit}>
+		<Modal t={t} title={t("admin::new-user")} open={isOpen} onClose={onClose} onSuccess={onSubmit} loading={loading}>
 			<Form form={MainForm} layout="vertical" className="main-form pb-2">
 				<Form.Item name="firstName" label={t("First Name")} rules={[{ required: true }]}>
 					<Input placeholder={t("Type")} />
@@ -62,16 +94,6 @@ export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [
 						}}
 					/>
 				</Form.Item>
-				{/* {accountUsed && (
-					<Alert
-						message={t("FB00001")}
-						type="error"
-						className="mb-2"
-						showIcon
-						closable
-						onClose={() => setAccountUsed(false)}
-					/>
-				)} */}
 
 				<Form.Item name="role" label={t("Role")} rules={[{ required: true }]}>
 					<Select
@@ -79,7 +101,8 @@ export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [
 						placeholder={t("Select")}
 					/>
 				</Form.Item>
+	
 			</Form>
 		</Modal>
 	);
-}
+}

package/src/@daf/core/components/Screens/Admin/AdminScreens/Accounts.jsx

@@ -34,17 +34,15 @@ export default function AdminAccountsScreen({ config }) {
 		AdminService,
 		options,
 		useQuery,
-		NewAccountModal, // If not provided, use DAF's default
+		NewAccountModal, 
 	} = config;
 
-	// Use provided modal or fallback to DAF's default
 	const AccountModal = NewAccountModal || DefaultNewAccountModal;
 
 	const query = useQuery ? useQuery() : { get: () => null };
 	const [addAccountVisible, setAddAccountVisible] = useState(!!query.get("create"));
 
 	const onResendInvitation = useCallback(() => {
-		// TODO: implement in calling app if needed
 		message.success(t("Invitation email resent"));
 	}, [t]);
 
@@ -104,7 +102,6 @@ export default function AdminAccountsScreen({ config }) {
 			onClose={() => setAddAccountVisible(false)}
 			accountTypes={accountTypes}
 			fetchData={() => {
-				// Refresh table data - handled by AccountTable internally
 			}}
 			inviteAccount={(data) => AdminService.inviteAccount(data)}
 		/>

package/src/@daf/core/components/Screens/Admin/AdminScreens/AccountsView.jsx

@@ -45,6 +45,7 @@ export default function AdminAccountsViewScreen({ config }) {
 		handleError,
 		toggleAccountStatus,
 		transferAdmin,
+		inviteCompanyAccount,
 	} = config;
 
 	return (
@@ -67,6 +68,7 @@ export default function AdminAccountsViewScreen({ config }) {
 			handleError={handleError}
 			toggleAccountStatus={toggleAccountStatus}
 			transferAdmin={transferAdmin}
+			inviteCompanyAccount={inviteCompanyAccount}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminScreens/Dashboard.jsx

@@ -20,7 +20,7 @@ export default function AdminDashboardScreen({ config }) {
     userGrowthDataLoading,
   } = useWidgetFetch();
 
-  console.log({userGrowthData});
+  // console.log({userGrowthData});
 
   const actionsWidgetsConfig = useMemo(
     () => getActionWidgetsConfig({ getRedirectLink }),
@@ -39,7 +39,7 @@ export default function AdminDashboardScreen({ config }) {
   const safeUserActivity = Array.isArray(data?.data?.userActivity) ? data.data.userActivity : [];
   const safeTopContributors = Array.isArray(data?.topContributors) ? data.topContributors : [];
   const safeUserGrowth = Array.isArray(data?.userGrowthData) ? data.userGrowthData : [];
-
+console.log("safeUserGrowth", safeUserGrowth);
 
   return (
     <AdminDashboard

package/src/@daf/core/components/Screens/Admin/AdminScreens/Location.jsx

@@ -41,18 +41,19 @@ export default function AdminLocationScreen({ config }) {
 		headerTitle = "location",
 		breadcrumbs,
 		refetchTrigger,
-		getData
+		getData,
+		user,
 	} = config;
 
 	const handleMergeLocations = useCallback(
 		async (mergeData) => {
 			try {
 				if (AdminService.mergeLocations) {
-					await AdminService.mergeLocations(mergeData);
+					await AdminService.mergeLocations({ subject: 'location', ...mergeData });
 					message.success(t("Locations merged successfully"));
 				} else {
 					console.warn("AdminService.mergeLocations is not implemented");
-					message.success(t("Locations merged successfully"));
+					message.error(t("Locations not merged"));
 				}
 			} catch (err) {
 				handleError?.(err);
@@ -61,12 +62,11 @@ export default function AdminLocationScreen({ config }) {
 		[AdminService, t, handleError]
 	);
 
-	// Use custom getData if provided, otherwise use default AdminService.getLocations
-	const getLocations = useCallback((params) => {
+	const getSubjects = useCallback((params) => {
 		if (getData) {
 			return getData(params);
 		}
-		return AdminService.getLocations(params);
+		return AdminService.getSubjects({ subject: 'location', params });
 	}, [getData, AdminService]);
 
 	return (
@@ -77,12 +77,12 @@ export default function AdminLocationScreen({ config }) {
 			location={location}
 			module={module}
 			headerTitle={headerTitle}
-			getData={getLocations}
+			getData={getSubjects}
 			isMobile={isMobile}
 			defaultPageSize={defaultPageSize}
 			view={view}
 			breadcrumbs={breadcrumbs}
-			mergeSubjectsFunction={handleMergeLocations}
+			mergeLocationsFunction={handleMergeLocations}
 			refetchTrigger={refetchTrigger}
 			config={{
 				options: {
@@ -90,6 +90,8 @@ export default function AdminLocationScreen({ config }) {
 					countries: options?.countries,
 				},
 			}}
+			user={user}
+			options={options}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminScreens/Subjects.jsx

@@ -42,13 +42,14 @@ export default function AdminSubjectsScreen({ config }) {
 		breadcrumbs,
 		refetchTrigger,
 		getData,
+		user,
 	} = config;
 
 	const handleMergeSubjects = useCallback(
 		async (mergeData) => {
 			try {
 				if (AdminService.mergeSubjects) {
-					await AdminService.mergeSubjects(mergeData);
+					await AdminService.mergeSubjects({ subject: 'stakeholder', ...mergeData });
 					message.success(t("Subjects merged successfully"));
 				} else {
 					console.warn("AdminService.mergeSubjects is not implemented");
@@ -61,12 +62,11 @@ export default function AdminSubjectsScreen({ config }) {
 		[AdminService, t, handleError]
 	);
 
-	// Use custom getData if provided, otherwise use default AdminService.getSubjects
 	const getSubjects = useCallback((params) => {
 		if (getData) {
 			return getData(params);
 		}
-		return AdminService.getSubjects(params);
+		return AdminService.getSubjects({ subject: 'stakeholder', params });
 	}, [getData, AdminService]);
 
 	return (
@@ -90,6 +90,8 @@ export default function AdminSubjectsScreen({ config }) {
 					countries: options?.countries,
 				},
 			}}
+			user={user}
+			options={options}
 		/>
 	);
 }