datastake-daf 0.6.813 → 0.6.815

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

@@ -6,67 +6,42 @@ export default function NewAccount({
 	t,
 	isOpen,
 	onClose,
-	accountTypes ,
+	accountTypes = [],
 	fetchData,
-	updateAccount,
 	inviteAccount,
-	isPending=false,
-	accountToEdit,
 }) {
 	const [MainForm] = Form.useForm();
 	const [loading, setLoading] = useState(false);
 	const [accountUsed, setAccountUsed] = useState(false);
 
-	console.log("typesssssssss", accountToEdit);
-
-
-	const isEdit = useMemo(() => accountToEdit && typeof accountToEdit === "object", [accountToEdit]);
+	const isEdit = useMemo(() => isOpen && typeof isOpen === "object", [isOpen]);
 
 	useEffect(() => {
-		if (accountToEdit && typeof accountToEdit === "object") {
+		if (isOpen && typeof isOpen === "object") {
 			MainForm.setFieldsValue({
-				name: accountToEdit.name,
-				email: accountToEdit.email,
-				type: accountToEdit?.otherData?.interface,
+				name: isOpen.name,
+				email: isOpen?.admin?.email,
 			});
 		} else {
 			MainForm.resetFields();
 		}
-		}, [accountToEdit, MainForm]);
+	}, [isOpen, MainForm]);
 
-	const onSubmit = async () => {
-		try {
-			const val = await MainForm.validateFields();
-			console.log(val, "val");
-			setLoading(true);
-			
-			if (isEdit && accountToEdit?.id) {
-				// Update existing account
-				await updateAccount({ 
-					id: accountToEdit.id, 
-					data: val, 
-					isPending: accountToEdit.status === 'pending' || isPending 
-				});
-			} else {
-				// Create new account
-				if (!inviteAccount) {
-					throw new Error("inviteAccount function is required for creating new accounts");
+	const onSubmit = () => {
+		MainForm.validateFields()
+			.then(async (val) => {
+				try {
+					setLoading(true);
+					await inviteAccount(val);
+					setLoading(false);
+					fetchData();
+					onClose();
+				} catch (err) {
+					console.log(err);
+					setLoading(false);
 				}
-				await inviteAccount(val);
-			}
-			
-			setLoading(false);
-			fetchData();
-			onClose();
-			MainForm.resetFields();
-		} catch (err) {
-			console.log(err);
-			setLoading(false);
-			if (err.errorFields) {
-				// Validation errors, don't show error message
-				return;
-			}
-		}
+			})
+			.catch(() => {});
 	};
 
 	return (
@@ -82,18 +57,18 @@ export default function NewAccount({
 				<Form.Item name="name" label={t("Name")} rules={[{ required: true }]}>
 					<Input placeholder={t("Type")} />
 				</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 || []} />
+					<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);
+							}
+						}}
+					/>
 				</Form.Item>
 				{accountUsed && (
 					<Alert

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

@@ -13,17 +13,11 @@ 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({
@@ -36,12 +30,6 @@ export default function NewUser({
 	const onSubmit = async () => {
 		try {
 			const val = await MainForm.validateFields();
-			
-			if (checkEmailExists(val.email)) {
-				setAccountUsed(true);
-				return;
-			}
-			
 			setLoading(true);
 			
 			const apiPayload = {
@@ -62,7 +50,6 @@ 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,
@@ -97,29 +84,16 @@ 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={(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="email" label={t("Email")} rules={[{ required: true, type: "email" }]}>
+					<Input
+						placeholder={t("Type")}
+						onChange={() => {
+							if (accountUsed) {
+								setAccountUsed(false);
+							}
+						}}
+					/>
+				</Form.Item>
 
 				<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-account-admin-rights")}
+			title={t("admin::transfer-admin-rights")}
 			open={isOpen}
 			onClose={onClose}
 			loading={loading}

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

@@ -2,7 +2,6 @@ import React, { useCallback, useMemo, useState } from "react";
 import { message } from "antd";
 import AccountTable from "../AdminTables/AccountTable/index.jsx";
 import DefaultNewAccountModal from "../AdminModals/NewAccount/index.jsx";
-import { copyStringToClipboard } from "../../../../../../helpers/copyToClipboard.js";
 
 /**
  * Admin Accounts Screen Wrapper
@@ -36,21 +35,20 @@ export default function AdminAccountsScreen({ config }) {
 		options,
 		useQuery,
 		NewAccountModal, 
-		appUrl
 	} = config;
-console.log(accountTypes, "accountTypes");
-	// const userTypes = useMemo(() => accountTypes.map((c) => ({
-	// 	label: c.label,
-	// 	value: c.value,
-	// })), [accountTypes]);
 
 	const AccountModal = NewAccountModal || DefaultNewAccountModal;
 
 	const query = useQuery ? useQuery() : { get: () => null };
 	const [addAccountVisible, setAddAccountVisible] = useState(!!query.get("create"));
-	const [accountToEdit, setAccountToEdit] = useState(null);
 
+	const onResendInvitation = useCallback(() => {
+		message.success(t("Invitation email resent"));
+	}, [t]);
 
+	const onCopyInvitation = useCallback(() => {
+		message.success(t("Invitation link copied"));
+	}, [t]);
 
 	const actionButtons = useMemo(
 		() => [
@@ -64,13 +62,6 @@ console.log(accountTypes, "accountTypes");
 		[t]
 	);
 
-
-	function handleAccountModal(data) {
-		console.log(data, "data");
-		setAddAccountVisible(true);
-		setAccountToEdit(data);
-	}
-
 	function handleGetData(params) {
 		return AdminService.getAccounts(params);
 	}
@@ -78,18 +69,7 @@ console.log(accountTypes, "accountTypes");
 	function handleCancelVerification(token) {
 		return AdminService.cancelInvitation(token);
 	}
-	function handleResendInvitation(account) {
-		console.log("account", account);
-		const token = account.invitationToken || account.users?.[0]?.invitationToken || account.admin?.invitationToken;
-		return AdminService.resendInvitation({ invitationToken: token });
-	}
 
-
-function handleCopyInvitation(account) {
-	const link = `${appUrl}/register?code=${account.invitationToken}`;
-	copyStringToClipboard(link);
-	message.success(t("Invitation link copied"));
-}
 	return (
 		<>
 			<AccountTable
@@ -104,15 +84,14 @@ function handleCopyInvitation(account) {
 				getData={handleGetData}
 				config={{
 					accountTypes,
-					addAccountVisible,
 					options: {
 						countries: options?.countries,
 					},
 					onTableClick: {
 						onCanelVerification: handleCancelVerification,
-						onCopyInvitation: handleCopyInvitation,
-						onResendInvitation: handleResendInvitation,
-						setAddAccountVisible: handleAccountModal,
+						onCopyInvitation,
+						onResendInvitation,
+						setAddAccountVisible,
 					},
 				}}
 		/>
@@ -120,17 +99,11 @@ function handleCopyInvitation(account) {
 		<AccountModal
 			t={t}
 			isOpen={addAccountVisible}
-			onClose={() => {
-				setAddAccountVisible(false);
-				setAccountToEdit(null);
-			}}
+			onClose={() => setAddAccountVisible(false)}
 			accountTypes={accountTypes}
-			countriesOptions={options?.countries}
 			fetchData={() => {
 			}}
 			inviteAccount={(data) => AdminService.inviteAccount(data)}
-			updateAccount={({ data, id, isPending }) => AdminService.updateAccount({ data, id, isPending })}
-			accountToEdit={accountToEdit}
 		/>
 	</>
 );

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

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

package/src/@daf/core/components/Screens/Admin/AdminScreens/index.js

@@ -11,5 +11,3 @@ export { default as AdminAccountsViewScreen } from "./AccountsView.jsx";
 export { default as AdminSubjectsScreen } from "./Subjects.jsx";
 export { default as AdminLocationScreen } from "./Location.jsx";
 export { default as AdminSubjectsViewScreen } from "./SubjectsView.jsx";
-export { default as AdminDocumentsScreen } from "./Documents.jsx";
-export { default as AdminEventsScreen } from "./Events.jsx";

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

@@ -270,28 +270,36 @@ export const getColumns = ({
 					);
 				}
 
-				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),
-					},
-				];
+				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),
+							},
+					  ];
 
 				return <MoreMenu items={moreMenuItems} />;
 			},

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

@@ -35,7 +35,6 @@ export default function AccountTable({
 	actionButton,
 	inviteAccount,
 }) {
-	const accountTypes = config?.accountTypes;
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
 	const [selectedAccounts, setSelectedAccounts] = useState([]);
@@ -61,15 +60,15 @@ export default function AccountTable({
 		filtersConfig,
 		getRedirectLink,
 		getData,
-		fetchPendingOnMount: true,
+		fetchPendingOnMount: true, 
 	});
 
 	const selectOptions = useMemo(() => {
 		return {
 			country: config.options?.countries,
-			type: accountTypes,
+			type: config.accountTypes,
 		};
-	}, [config.options, accountTypes]);
+	}, [config.options, config.accountTypes]);
 
 	useEffect(() => {
 		if (initFetchDone) {
@@ -97,23 +96,12 @@ export default function AccountTable({
 						console.log(err);
 					}
 				},
-				onCancel: () => { },
+				onCancel: () => {},
 			});
 		},
 		[t, fetchData, fetchPendingAccounts],
 	);
 
-	const onResendInvitation = useCallback(
-		async (user) => {
-			try {
-				await config.onTableClick.onResendInvitation(user);
-				message.success(t("Email successfully sent"));
-			} catch (error) {
-				console.error("Failed to resend invitation:", error);
-				message.error(t("Failed to resend invitation"));
-			}
-		}, [t, config.onTableClick]);
-
 	const columns = useMemo(
 		() =>
 			getColumns({
@@ -125,7 +113,7 @@ export default function AccountTable({
 				getRedirectLink,
 				onCanelVerification: onCanelVerification,
 				onCopyInvitation: config.onTableClick.onCopyInvitation,
-				onResendInvitation: onResendInvitation,
+				onResendInvitation: config.onTableClick.onResendInvitation,
 				setAddAccountVisible: config.onTableClick.setAddAccountVisible,
 				setSelectedAccounts: setSelectedAccounts,
 				selectedAccounts: selectedAccounts,
@@ -141,13 +129,13 @@ export default function AccountTable({
 				headerTitle={headerTitle}
 				actionButton={[
 					...actionButton,
-					// {
-					// 	icon: "Merge",
-					// 	// type: "primary",
-					// 	onClick: () => setCombineAccountVisible(true),
-					// 	tooltip: "Combine",
-					// 	disabled: selectedAccounts.length < 2,
-					// },
+					{
+						icon: "Merge",
+						// type: "primary",
+						onClick: () => setCombineAccountVisible(true),
+						tooltip: "Combine",
+						disabled: selectedAccounts.length < 2,
+					},
 				]}
 				tabs={getTabs({
 					totalPending: totalPending,
@@ -219,7 +207,7 @@ export default function AccountTable({
 					fetchData();
 					fetchPendingAccounts();
 				}}
-				accountTypes={accountTypes}
+				accountTypes={config.accountTypes}
 				inviteAccount={inviteAccount}
 			/>
 			<CombineAccountModal

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

@@ -53,22 +53,7 @@ export default function LocationTable({
 				console.error('Failed to parse pagination', e);
 			}
 		}
-
-
-		const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
-
-		let pageNumber = 1;
-
-		if (paginationObj.page || paginationObj.current) {
-			pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
-		} else if (typeof paginationObj.skip === 'number') {
 		
-			pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
-		}
-
-		pageNumber = pageNumber || 1;
-
-
 		let activeTab = tab || "active";
 		if (!tab && filters) {
 			try {
@@ -81,8 +66,8 @@ export default function LocationTable({
 		
 		const transformedParams = {
 			pagination: {
-				skip: pageNumber, 
-				take: pageSize,
+				skip: String(paginationObj.page || 1),
+				take: String(paginationObj.pageSize || 20),
 			},
 			tab: activeTab,
 		};

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

@@ -13,6 +13,7 @@ import {
 } from "./helper.js";
 import { getColumns } from "./columns.js";
 import CombineSubjectsModal from "../../AdminModals/CombineSubjects/index.jsx";
+
 const { useToken } = theme;
 
 export default function SubjectsTable({
@@ -39,7 +40,10 @@ 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 };
@@ -50,21 +54,7 @@ export default function SubjectsTable({
 				console.error('Failed to parse pagination', e);
 			}
 		}
-
-		const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
-
-		let pageNumber = 1;
-
-		if (paginationObj.page || paginationObj.current) {
-			pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
-		} else if (typeof paginationObj.skip === 'number') {
-	
-			pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
-		}
-
-		pageNumber = pageNumber || 1;
-
-
+		
 		let activeTab = tab || "active";
 		if (!tab && filters) {
 			try {
@@ -77,16 +67,14 @@ export default function SubjectsTable({
 		
 		const transformedParams = {
 			pagination: {
-				skip: pageNumber, 
-				take: pageSize,
+				skip: String(paginationObj.page || 1),
+				take: String(paginationObj.pageSize || 20),
 			},
 			tab: activeTab,
 		};
 		
 		return getData({ params: transformedParams });
 	};
-
-
 	const {
 		filter,
 		activeTab,
@@ -145,7 +133,7 @@ export default function SubjectsTable({
 					{
 						icon: "Merge",
 						onClick: () => setIsModalOpen(true),
-						tooltip: t("merge-subjects"),
+						tooltip: t("admin::merge-subjects"),
 						disabled: selectedSubjects.length < 2,
 					},
 				]}
@@ -204,13 +192,11 @@ export default function SubjectsTable({
 				onSuccess={(data) => {
 					setIsModalOpen(false);
 					setLoading(true);
+					message.success(t("Subjects successfully merged."))
 					if (typeof mergeSubjectsFunction === 'function') {
-						mergeSubjectsFunction(data).then(() => {
-							setTimeout(() => {
-								fetchData();
-							}, 500);
-						}).finally(() => {
+						mergeSubjectsFunction(data).finally(() => {
 							setSelectedSubjects([]);
+							fetchData();
 						});
 					}
 				}}
@@ -221,4 +207,4 @@ export default function SubjectsTable({
 			/>
 		</>
 	);
-}
+}

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

@@ -56,6 +56,7 @@ 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/components/index.jsx

@@ -22,8 +22,6 @@ export default function AdminTable({
 	breadcrumbs,
 	children,
 }) {
-
-	console.log(tabs, "tabs");
 	return (
 		<>
 			<div className="semibold form-input-output daf-create-view">
@@ -31,7 +29,7 @@ export default function AdminTable({
 				<div className="column start table-content">
 					<div className="mt-6 ml-6 mr-6">
 						<div className="flex flex-row">
-							{tabs && tabs.length > 0 && <div className="mr-2">
+							<div className="mr-2">
 								<Tabs
 									t={t}
 									tabs={tabs}
@@ -40,7 +38,7 @@ export default function AdminTable({
 										filters.setActiveFilters((p) => ({ ...p, activeTab: val }))
 									}
 								/>
-							</div>}
+							</div>
 							<div className="flex-1">
 								<SearchFilters
 									t={t}

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

@@ -32,7 +32,6 @@ export function useAdminTable({
 		defaultPageSize: defaultPageSize || 20,
 		getRedirectLink,
 	});
-	console.log(filter, "filter.activeFilters");
 
 	const activeTab = useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
 
@@ -60,14 +59,12 @@ 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 }));