datastake-daf 0.6.819 → 0.6.821

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

@@ -6,42 +6,64 @@ 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);
 
-	const isEdit = useMemo(() => isOpen && typeof isOpen === "object", [isOpen]);
+
+
+	const isEdit = useMemo(() => accountToEdit && typeof accountToEdit === "object", [accountToEdit]);
 
 	useEffect(() => {
-		if (isOpen && typeof isOpen === "object") {
+		if (accountToEdit && typeof accountToEdit === "object") {
 			MainForm.setFieldsValue({
-				name: isOpen.name,
-				email: isOpen?.admin?.email,
+				name: accountToEdit.name,
+				email: accountToEdit.email,
+				type: accountToEdit?.otherData?.interface,
 			});
 		} else {
 			MainForm.resetFields();
 		}
-	}, [isOpen, MainForm]);
+		}, [accountToEdit, MainForm]);
 
-	const onSubmit = () => {
-		MainForm.validateFields()
-			.then(async (val) => {
-				try {
-					setLoading(true);
-					await inviteAccount(val);
-					setLoading(false);
-					fetchData();
-					onClose();
-				} catch (err) {
-					console.log(err);
-					setLoading(false);
+	const onSubmit = async () => {
+		try {
+			const val = await MainForm.validateFields();
+			console.log(val, "val");
+			setLoading(true);
+			
+			if (isEdit && accountToEdit?.id) {
+				await updateAccount({ 
+					id: accountToEdit.id, 
+					data: val, 
+					isPending: accountToEdit.status === 'pending' || isPending 
+				});
+			} else {
+				if (!inviteAccount) {
+					throw new Error("inviteAccount function is required for creating new accounts");
 				}
-			})
-			.catch(() => {});
+				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;
+			}
+		}
 	};
 
 	return (
@@ -57,18 +79,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} />
-				</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

@@ -39,7 +39,7 @@ export default function TransferRights({
 				setLoading(true);
 
 				try {
-					await transferAdmin({ id: accountData.id, userId: val.newAdmin });
+					await transferAdmin({ companyId: accountData.id, userId: val.newAdmin });
 					MainForm.resetFields();
 					fetchData();
 					onClose();
@@ -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

@@ -2,6 +2,7 @@ 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
@@ -35,20 +36,21 @@ 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(
 		() => [
@@ -62,6 +64,13 @@ export default function AdminAccountsScreen({ config }) {
 		[t]
 	);
 
+
+	function handleAccountModal(data) {
+		console.log(data, "data");
+		setAddAccountVisible(true);
+		setAccountToEdit(data);
+	}
+
 	function handleGetData(params) {
 		return AdminService.getAccounts(params);
 	}
@@ -69,7 +78,18 @@ export default function AdminAccountsScreen({ config }) {
 	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
@@ -84,14 +104,15 @@ export default function AdminAccountsScreen({ config }) {
 				getData={handleGetData}
 				config={{
 					accountTypes,
+					addAccountVisible,
 					options: {
 						countries: options?.countries,
 					},
 					onTableClick: {
 						onCanelVerification: handleCancelVerification,
-						onCopyInvitation,
-						onResendInvitation,
-						setAddAccountVisible,
+						onCopyInvitation: handleCopyInvitation,
+						onResendInvitation: handleResendInvitation,
+						setAddAccountVisible: handleAccountModal,
 					},
 				}}
 		/>
@@ -99,11 +120,17 @@ export default function AdminAccountsScreen({ config }) {
 		<AccountModal
 			t={t}
 			isOpen={addAccountVisible}
-			onClose={() => setAddAccountVisible(false)}
+			onClose={() => {
+				setAddAccountVisible(false);
+				setAccountToEdit(null);
+			}}
 			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,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/AdminScreens/Documents.jsx

@@ -0,0 +1,81 @@
+import React, { useCallback } from "react";
+import { message } from "antd";
+import DocumentsTable from "../AdminTables/DocumentsTable/index.jsx";
+/**
+ * Admin Location Screen Wrapper
+ * This is a ready-to-use route component that can be configured per application
+ * 
+ * @param {Object} config - Application configuration
+ * @param {string} config.appName - Application name
+ * @param {string} config.module - Module identifier (APP constant)
+ * @param {Function} config.goTo - Navigation function
+ * @param {Function} config.t - Translation function
+ * @param {Object} config.location - Router location object
+ * @param {boolean} config.isMobile - Is mobile viewport
+ * @param {Function} config.getRedirectLink - Function to get redirect links
+ * @param {Object} config.AdminService - Admin service with methods
+ * @param {Object} config.options - Options object with categories, countries, etc.
+ * @param {Function} config.handleError - Error handling function
+ * @param {number} config.defaultPageSize - Default pagination page size
+ * @param {string} config.view - View identifier
+ * @param {string} config.headerTitle - Header title for the table
+ * @param {Array} config.breadcrumbs - Breadcrumbs configuration
+ * @param {any} config.refetchTrigger - Trigger to refetch data
+ * @param {Function} config.getData - Optional custom getData function
+ */
+export default function AdminLocationScreen({ config }) {
+	const {
+		appName = "app",
+		module,
+		goTo,
+		t,
+		location,
+		isMobile,
+		getRedirectLink,
+		AdminService,
+		options,
+		handleError,
+		defaultPageSize = 20,
+		view,
+		headerTitle = "documents",
+		breadcrumbs,
+		refetchTrigger,
+		getData,
+		user,
+	} = config;
+
+
+
+	const getSubjects = useCallback((params) => {
+		if (getData) {
+			return getData(params);
+		}
+		return AdminService.getItems({ item: 'document', params });
+	}, [getData, AdminService]);
+
+	return (
+		<DocumentsTable
+			t={t}
+			goTo={goTo}
+			getRedirectLink={getRedirectLink}
+			location={location}
+			module={module}
+			headerTitle={headerTitle}
+			getData={getSubjects}
+			isMobile={isMobile}
+			defaultPageSize={defaultPageSize}
+			view={view}
+			breadcrumbs={breadcrumbs}
+			refetchTrigger={refetchTrigger}
+			config={{
+				options: {
+					category: options?.category,
+					countries: options?.countries,
+				},
+			}}
+			user={user}
+			options={options}
+		/>
+	);
+}
+

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

@@ -0,0 +1,77 @@
+import React, { useCallback } from "react";
+import { message } from "antd";
+import EventsTable from "../AdminTables/EventsTable/index.jsx";
+/**
+ * Admin Location Screen Wrapper
+ * This is a ready-to-use route component that can be configured per application
+ * 
+ * @param {Object} config - Application configuration
+ * @param {string} config.appName - Application name
+ * @param {string} config.module - Module identifier (APP constant)
+ * @param {Function} config.goTo - Navigation function
+ * @param {Function} config.t - Translation function
+ * @param {Object} config.location - Router location object
+ * @param {boolean} config.isMobile - Is mobile viewport
+ * @param {Function} config.getRedirectLink - Function to get redirect links
+ * @param {Object} config.AdminService - Admin service with methods
+ * @param {Object} config.options - Options object with categories, countries, etc.
+ * @param {Function} config.handleError - Error handling function
+ * @param {number} config.defaultPageSize - Default pagination page size
+ * @param {string} config.view - View identifier
+ * @param {string} config.headerTitle - Header title for the table
+ * @param {Array} config.breadcrumbs - Breadcrumbs configuration
+ * @param {any} config.refetchTrigger - Trigger to refetch data
+ * @param {Function} config.getData - Optional custom getData function
+ */
+export default function AdminEventsScreen({ config }) {
+	const {
+		appName = "app",
+		module,
+		goTo,
+		t,
+		location,
+		isMobile,
+		getRedirectLink,
+		AdminService,
+		options,
+		handleError,
+		defaultPageSize = 20,
+		view,
+		headerTitle = "events",
+		breadcrumbs,
+		refetchTrigger,
+		getData,
+		user,
+	} = config;
+
+
+
+	const getSubjects = useCallback((params) => {
+		if (getData) {
+			return getData(params);
+		}
+		return AdminService.getItems({ item: 'event', params });
+	}, [getData, AdminService]);
+
+	return (
+		<EventsTable
+			t={t}
+			goTo={goTo}
+			getRedirectLink={getRedirectLink}
+			location={location}
+			module={module}
+			headerTitle={headerTitle}
+			getData={getSubjects}
+			isMobile={isMobile}
+			defaultPageSize={defaultPageSize}
+			view={view}
+			breadcrumbs={breadcrumbs}
+			refetchTrigger={refetchTrigger}
+			config={{
+				options:options}}
+			user={user}
+			options={options}
+		/>
+	);
+}
+

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

@@ -10,4 +10,5 @@ export { default as AdminAccountsScreen } from "./Accounts.jsx";
 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";