datastake-daf 0.6.808 → 0.6.809

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/hook.js

@@ -12,7 +12,6 @@ export default function useUserGrowth({ container, data: mainData = {}, t, trans
 	const [mainGraph, setMainGraph] = useState(null);
 	const [data, setData] = useState([]);
 	const { token } = useToken();
-console.log("mainData", mainData);
 	const fetchData = () => {
 		const { dates = [] } = mainData;
 		const _data = [];

package/src/@daf/core/components/Screens/Admin/AdminDashboard/components/UserStatistics/UserGrowth/index.jsx

@@ -9,13 +9,11 @@ export default function UserGrowth({ loading, data = [], t, translationKeys, fet
 	const [selectValue, setSelectValue] = useState(selectOptions[0]?.value);
 
 	useUserGrowth({ container, data, t, translationKeys });
-console.log("usergrowthhhhh", data);
-
 	useEffect(() => {
 		if (typeof fetchUserGrowth === "function") {
 			fetchUserGrowth(selectValue);
 		}
-	}, [selectValue]);
+	}, [selectValue, fetchUserGrowth]);
 
 	return (
 		<Widget

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

@@ -34,19 +34,19 @@ export default function CombineLocationModal({
 
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
-			const ids = selectedLocations.map((location) => location.id);	  
+			const ids = selectedLocations.map((location) => location.id);
 			const allowedKeys = [
-				"id", 
-				"name", 
-				"country", 
-				"category", 
-				"administrativeLevel1", 
+				"id",
+				"name",
+				"country",
+				"category",
+				"administrativeLevel1",
 				"administrativeLevel2"
-			];		  
+			];
 			const filteredData = Object.fromEntries(
 				Object.entries(data).filter(([key]) => allowedKeys.includes(key))
 			);
-	
+
 			onSuccess({
 				ids,
 				data: filteredData,
@@ -66,15 +66,15 @@ export default function CombineLocationModal({
 			destroyOnHidden={true}
 			onValuesChange={() => {
 				setIsDisabled(() => {
-				  const values = MainForm.getFieldsValue();
-			  
-				  const requiredFields = entity?.includes("location")
-					  ? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
-					  : ["id", "name", "category", "country"];
-			  
-				  return requiredFields.some((field) => values[field] === undefined);
+					const values = MainForm.getFieldsValue();
+
+					const requiredFields = entity?.includes("location")
+						? ["id", "name", "category", "country", "administrativeLevel1", "administrativeLevel2"]
+						: ["id", "name", "category", "country"];
+
+					return requiredFields.some((field) => values[field] === undefined);
 				});
-			  }}
+			}}
 		>
 			<Container>
 				<div className="daf-table-wrapper no-pagination">
@@ -124,7 +124,7 @@ export default function CombineLocationModal({
 							options={selectedLocations.map((location) => {
 								return {
 									label: location?.datastakeId || "-",
-                value: location?.id || "-",
+									value: location?.id || "-",
 								};
 							})}
 							placeholder={t("ID")}
@@ -181,41 +181,41 @@ export default function CombineLocationModal({
 
 					{entity?.includes("location") && (
 						<>
-						<Form.Item className="flex-1" name="administrativeLevel1">
-							<Select
-							placeholder={t("Province")}
-							options={selectedLocations
-								.map((location) => {
-								const _data = getAdminLevelName(location?.linking?.SCL, "level_1");
-								return {
-									label: _data?.name || "-",
-									value: _data?.id || "-",
-								};
-								})
-								.filter(
-								(option, index, self) =>
-									index === self.findIndex((o) => o.value === option.value),
-								)}
-							/>
-						</Form.Item>
+							<Form.Item className="flex-1" name="administrativeLevel1">
+								<Select
+									placeholder={t("Province")}
+									options={selectedLocations
+										.map((location) => {
+											const _data = getAdminLevelName(location?.linking?.SCL, "level_1");
+											return {
+												label: _data?.name || "-",
+												value: _data?.id || "-",
+											};
+										})
+										.filter(
+											(option, index, self) =>
+												index === self.findIndex((o) => o.value === option.value),
+										)}
+								/>
+							</Form.Item>
 
-						<Form.Item className="flex-1" name="administrativeLevel2">
-							<Select
-							placeholder={t("Territory")}
-							options={selectedLocations
-								.map((location) => {
-								const _data = getAdminLevelName(location?.linking?.SCL, "level_2");
-								return {
-									label: _data?.name || "-",
-									value: _data?.id || "-",
-								};
-								})
-								.filter(
-								(option, index, self) =>
-									index === self.findIndex((o) => o.value === option.value),
-								)}
-							/>
-						</Form.Item>
+							<Form.Item className="flex-1" name="administrativeLevel2">
+								<Select
+									placeholder={t("Territory")}
+									options={selectedLocations
+										.map((location) => {
+											const _data = getAdminLevelName(location?.linking?.SCL, "level_2");
+											return {
+												label: _data?.name || "-",
+												value: _data?.id || "-",
+											};
+										})
+										.filter(
+											(option, index, self) =>
+												index === self.findIndex((o) => o.value === option.value),
+										)}
+								/>
+							</Form.Item>
 						</>
 					)}
 				</Form>

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

@@ -37,6 +37,8 @@ export default function CombineSubjectsModal({
 	const onSubmit = () => {
 		MainForm.validateFields().then((data) => {
 			const ids = selectedSubjects.map((subject) => subject.id);
+			console.log(ids, "ids");
+			console.log(data, "data");
 			onSuccess({
 				ids,
 				data,
@@ -112,7 +114,10 @@ export default function CombineSubjectsModal({
 				>
 					<Form.Item className="flex-1" name="id">
 						<Select
-							options={mapToSelectOptions(selectedSubjects, "datastakeId", selectOptions, null)}
+							options={selectedSubjects.map((s) => ({
+								label: s?.datastakeId || "-",
+								value: s?.id || "-",
+							}))}
 							placeholder={t("ID")}
 						></Select>
 					</Form.Item>

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

@@ -1,6 +1,8 @@
 import Modal from "../../../../Modal/index.jsx";
 import { Form, Select, Input, Alert } from "antd";
 import { useState, useEffect, useMemo } from "react";
+import AuthenticationService from "../../../../../../services/AuthenticationService.js";
+import { StorageManager } from "../../../../../../../helpers/StorageManager.js";
 
 export default function NewAccount({
 	t,
@@ -9,10 +11,28 @@ export default function NewAccount({
 	accountTypes = [],
 	fetchData,
 	inviteAccount,
+	selectOptions,
 }) {
 	const [MainForm] = Form.useForm();
 	const [loading, setLoading] = useState(false);
 	const [accountUsed, setAccountUsed] = useState(false);
+	const [countries, setCountries] = useState([]);
+
+	useEffect(() => {
+		const getCountries = async () => {
+			try {
+				const language = StorageManager.get("datastakeLng") || "en";
+				const { data } = await AuthenticationService.getFormOptions({
+					references: ["countries"],
+					language,
+				});
+				setCountries(data?.countries || []);
+			} catch (e) {
+				console.error(e);
+			}
+		};
+		getCountries();
+	}, []);
 
 	const isEdit = useMemo(() => isOpen && typeof isOpen === "object", [isOpen]);
 
@@ -20,7 +40,8 @@ export default function NewAccount({
 		if (isOpen && typeof isOpen === "object") {
 			MainForm.setFieldsValue({
 				name: isOpen.name,
-				email: isOpen?.admin?.email,
+				country: isOpen?.country,
+				type: isOpen?.type,
 			});
 		} else {
 			MainForm.resetFields();
@@ -57,18 +78,32 @@ export default function NewAccount({
 				<Form.Item name="name" label={t("Name")} rules={[{ required: true }]}>
 					<Input placeholder={t("Type")} />
 				</Form.Item>
+				
+				{isEdit ? (
+					<Form.Item
+						name="country"
+						label={t("Country")}
+						rules={[{ required: true, type: "country" }]}
+					>
+						<Select
+							placeholder={t("Select")}
+							options={(countries || []).map((c) => ({
+								label: c?.label,
+								value: c?.value,
+							}))}
+						/>
+					</Form.Item>
+				) : (
+					<Form.Item
+						name="email"
+						label={t("Email")}
+						rules={[{ required: true, type: "email" }]}
+					>
+						<Input placeholder={t("Type")} />
+					</Form.Item>
+				)}
 				<Form.Item name="type" label={t("Type")} rules={[{ required: true }]}>
-					<Select placeholder={t("Select")} options={accountTypes} />
-				</Form.Item>
-				<Form.Item name="email" label={t("Email")} rules={[{ required: true, type: "email" }]}>
-					<Input
-						placeholder={t("Type")}
-						onChange={() => {
-							if (accountUsed) {
-								setAccountUsed(false);
-							}
-						}}
-					/>
+					<Select placeholder={t("Select")} options={accountTypes || []} />
 				</Form.Item>
 				{accountUsed && (
 					<Alert

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

@@ -13,11 +13,17 @@ export default function NewUser({
 	inviteCompanyAccount = () => {},
 	companyId,
 	handleError = () => {},
+	existingEmails = [],
 }) {
 	const [MainForm] = Form.useForm();
 	const [accountUsed, setAccountUsed] = useState(false);
 	const [loading, setLoading] = useState(false);
 
+	const checkEmailExists = (email) => {
+		if (!email) return false;
+		return existingEmails.includes(email.toLowerCase());
+	};
+
 	useEffect(() => {
 		if (defaultData) {
 			MainForm.setFieldsValue({
@@ -30,6 +36,12 @@ export default function NewUser({
 	const onSubmit = async () => {
 		try {
 			const val = await MainForm.validateFields();
+			
+			if (checkEmailExists(val.email)) {
+				setAccountUsed(true);
+				return;
+			}
+			
 			setLoading(true);
 			
 			const apiPayload = {
@@ -50,6 +62,7 @@ export default function NewUser({
 			const localUserData = {
 				...apiPayload,
 				status: 'pending',
+				id: apiPayload.email, // Add a unique ID for the table key
 				// apps: {
 				// 	[module]: {
 				// 		role: val.role,
@@ -84,16 +97,29 @@ export default function NewUser({
 					<Input placeholder={t("Type")} />
 				</Form.Item>
 
-				<Form.Item name="email" label={t("Email")} rules={[{ required: true, type: "email" }]}>
-					<Input
-						placeholder={t("Type")}
-						onChange={() => {
-							if (accountUsed) {
-								setAccountUsed(false);
-							}
-						}}
-					/>
-				</Form.Item>
+			<Form.Item name="email" label={t("Email")} rules={[{ required: true, type: "email" }]}>
+				<Input
+					placeholder={t("Type")}
+					onChange={(e) => {
+						const emailExists = checkEmailExists(e.target.value);
+						setAccountUsed(emailExists);
+					}}
+					onBlur={(e) => {
+						const emailExists = checkEmailExists(e.target.value);
+						setAccountUsed(emailExists);
+					}}
+				/>
+			</Form.Item>
+			{accountUsed && (
+				<Alert
+					message={t("This email corresponds to another account.")}
+					type="error"
+					className="mb-2"
+					showIcon
+					closable
+					onClose={() => setAccountUsed(false)}
+				/>
+			)}
 
 				<Form.Item name="role" label={t("Role")} rules={[{ required: true }]}>
 					<Select

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

@@ -56,7 +56,7 @@ export default function TransferRights({
 	return (
 		<Modal
 			t={t}
-			title={t("admin::transfer-admin-rights")}
+			title={t("admin::transfer-account-admin-rights")}
 			open={isOpen}
 			onClose={onClose}
 			loading={loading}

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

@@ -101,6 +101,7 @@ export default function AdminAccountsScreen({ config }) {
 			isOpen={addAccountVisible}
 			onClose={() => setAddAccountVisible(false)}
 			accountTypes={accountTypes}
+			countriesOptions={options?.countries}
 			fetchData={() => {
 			}}
 			inviteAccount={(data) => AdminService.inviteAccount(data)}

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

@@ -38,8 +38,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);
+  const safeUserGrowth = userGrowthData || data?.userGrowthData || [];
 
   return (
     <AdminDashboard
@@ -50,6 +49,7 @@ console.log("safeUserGrowth", safeUserGrowth);
       loadingUserGrowth={userGrowthDataLoading}
       fetchUserGrowth={fetchUserGrowth}
       adminTranslationIdentifier={appName}
+      userGrowthData={safeUserGrowth}
       data={{
         keyIndicatorsData: keyIndicatorsConfig,
         userActivityData: safeUserActivity,

package/src/@daf/core/components/Screens/Admin/AdminTables/AccountTable/helper.js

@@ -270,36 +270,28 @@ export const getColumns = ({
 					);
 				}
 
-				const moreMenuItems = !val.emailVerified
-					? [
-							{
-								label: t("admin::cancel-invitation"),
-								value: "cancel",
-								onClick: () => onCanelVerification(val),
-							},
-					  ]
-					: [
-							{
-								label: t("Edit"),
-								value: "edit",
-								onClick: () => setAddAccountVisible(val),
-							},
-							{
-								label: t("Resend Invitation"),
-								value: "resend",
-								onClick: () => onResendInvitation(val),
-							},
-							{
-								label: t("Copy Invitation Link"),
-								value: "copy",
-								onClick: () => onCopyInvitation(val),
-							},
-							{
-								label: t("admin::cancel-invitation"),
-								value: "cancel",
-								onClick: () => onCanelVerification(val),
-							},
-					  ];
+				const moreMenuItems = [
+					{
+						label: t("Edit"),
+						value: "edit",
+						onClick: () => setAddAccountVisible(val),
+					},
+					{
+						label: t("Resend Invitation"),
+						value: "resend",
+						onClick: () => onResendInvitation(val),
+					},
+					{
+						label: t("Copy Invitation Link"),
+						value: "copy",
+						onClick: () => onCopyInvitation(val),
+					},
+					{
+						label: t("admin::cancel-invitation"),
+						value: "cancel",
+						onClick: () => onCanelVerification(val),
+					},
+				];
 
 				return <MoreMenu items={moreMenuItems} />;
 			},

package/src/@daf/core/components/Screens/Admin/AdminTables/AccountTable/index.jsx

@@ -35,6 +35,7 @@ export default function AccountTable({
 	actionButton,
 	inviteAccount,
 }) {
+	const accountTypes = config?.accountTypes;
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
 	const [selectedAccounts, setSelectedAccounts] = useState([]);
@@ -66,9 +67,9 @@ export default function AccountTable({
 	const selectOptions = useMemo(() => {
 		return {
 			country: config.options?.countries,
-			type: config.accountTypes,
+			type: accountTypes,
 		};
-	}, [config.options, config.accountTypes]);
+	}, [config.options, accountTypes]);
 
 	useEffect(() => {
 		if (initFetchDone) {
@@ -207,7 +208,7 @@ export default function AccountTable({
 					fetchData();
 					fetchPendingAccounts();
 				}}
-				accountTypes={config.accountTypes}
+				accountTypes={accountTypes}
 				inviteAccount={inviteAccount}
 			/>
 			<CombineAccountModal

package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/index.jsx

@@ -64,10 +64,14 @@ export default function LocationTable({
 			}
 		}
 		
+		const page = Number(paginationObj.page) || 1;
+		const pageSize = Number(paginationObj.pageSize) || 20;
+		const skip = (page - 1) * pageSize;
+		
 		const transformedParams = {
 			pagination: {
-				skip: String(paginationObj.page || 1),
-				take: String(paginationObj.pageSize || 20),
+				skip,
+				take: pageSize,
 			},
 			tab: activeTab,
 		};

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/index.jsx

@@ -13,7 +13,6 @@ import {
 } from "./helper.js";
 import { getColumns } from "./columns.js";
 import CombineSubjectsModal from "../../AdminModals/CombineSubjects/index.jsx";
-
 const { useToken } = theme;
 
 export default function SubjectsTable({
@@ -40,10 +39,7 @@ export default function SubjectsTable({
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
-
-
-
-const getDataWithStringPagination = async ({ params }) => {
+	const getDataWithStringPagination = async ({ params }) => {
 		const { pagination, tab, filters, search, sort, ...otherParams } = params;
 		
 		let paginationObj = { page: 1, pageSize: 20 };
@@ -65,10 +61,14 @@ const getDataWithStringPagination = async ({ params }) => {
 			}
 		}
 		
+		const page = Number(paginationObj.page) || 1;
+		const pageSize = Number(paginationObj.pageSize) || 20;
+		const skip = (page - 1) * pageSize;
+		
 		const transformedParams = {
 			pagination: {
-				skip: String(paginationObj.page || 1),
-				take: String(paginationObj.pageSize || 20),
+				skip,
+				take: pageSize,
 			},
 			tab: activeTab,
 		};
@@ -133,7 +133,7 @@ const getDataWithStringPagination = async ({ params }) => {
 					{
 						icon: "Merge",
 						onClick: () => setIsModalOpen(true),
-						tooltip: t("admin::merge-subjects"),
+						tooltip: t("merge-subjects"),
 						disabled: selectedSubjects.length < 2,
 					},
 				]}
@@ -192,11 +192,13 @@ const getDataWithStringPagination = async ({ params }) => {
 				onSuccess={(data) => {
 					setIsModalOpen(false);
 					setLoading(true);
-					message.success(t("Subjects successfully merged."))
 					if (typeof mergeSubjectsFunction === 'function') {
-						mergeSubjectsFunction(data).finally(() => {
+						mergeSubjectsFunction(data).then(() => {
+							setTimeout(() => {
+								fetchData();
+							}, 500);
+						}).finally(() => {
 							setSelectedSubjects([]);
-							fetchData();
 						});
 					}
 				}}
@@ -207,4 +209,4 @@ const getDataWithStringPagination = async ({ params }) => {
 			/>
 		</>
 	);
-}
+}

package/src/@daf/core/components/Screens/Admin/AdminTables/UserTable/index.jsx

@@ -56,7 +56,6 @@ export default function UserTable({
 		defaultPageSize,
 		fetchPendingOnMount: true, // Users table needs pending count
 	});
-
 	const selectOptions = useMemo(() => {
 		return {
 			account: accounts,

package/src/@daf/core/components/Screens/Admin/AdminTables/hook.js

@@ -32,6 +32,7 @@ export function useAdminTable({
 		defaultPageSize: defaultPageSize || 20,
 		getRedirectLink,
 	});
+	console.log(filter, "filter.activeFilters");
 
 	const activeTab = useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
 
@@ -59,12 +60,14 @@ export function useAdminTable({
 		fetchPendingAccounts();
 	}, []);
 
+	
 	const fetchData = useCallback(async () => {
 		try {
 			setLoading(true);
 			const params = filterParams({
 				activeFilters: filter.activeFilters,
 			});
+			console.log(params, "params");
 			const { data } = await getData({ params });
 			setData(data.data || data);
 			filter.setPagination((prev) => ({ ...prev, total: data?.meta?.total || data?.length || 0 }));

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Edit/index.jsx

@@ -3,7 +3,7 @@ import { ExclamationCircleOutlined } from "@ant-design/icons";
 import { useCallback, useEffect } from "react";
 import { useForms } from "../../../../../../context/Forms/index.js";
 import Users from "../Users/index.jsx";
-
+import AdminService from "../../../../../../../services/AdminService.js";
 export default function Edit({
 	t,
 	goTo,
@@ -37,14 +37,17 @@ export default function Edit({
 	}, [isChanged, addCheck, removeCheck]);
 
 	const deleteUser = useCallback(
-		(id) => {
-			// TODO: add call 
-			console.log("DELETE", id);
-			fetchData();
+		async (id) => {
+			try {
+				await AdminService.removeUserFromAccount({ accountId: data.id, userId: id });
+				message.success(t("User removed successfully"));
+				fetchData();
+			} catch (err) {
+				handleError(err);
+			}
 		},
-		[fetchData],
+		[fetchData, data.id, t, handleError],
 	);
-
 	const updateUser = useCallback((id, val) => {
 		setIsChanged(true);
 		setData((prev) => ({
@@ -71,9 +74,9 @@ export default function Edit({
 
 	const onSuspend = () => {
 		Modal.confirm({
-			title: t("sbg-admin::suspend-title"),
+			title: t("Are-you-sure-you-want-to-suspend-this-account?"),
 			icon: <ExclamationCircleOutlined />,
-			content: t("sbg-admin::suspend-content"),
+			content: <span style={{ color: "#888" }}>{t("Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")}</span>,
 			okText: t("Yes"),
 			cancelText: t("No"),
 			onOk: async () => {