datastake-daf 0.6.809 → 0.6.810

package/src/@daf/core/components/AuthForm/index.jsx

@@ -13,20 +13,13 @@ function AuthForm ({
   errors,
   t = (key) => key,
   executeRecaptcha = () => {},
-  getCurrentStep = () => {},
-  theme,
+  getCurrentStep = () => {}
 }){
   const [formInstance] = Form.useForm(form);
   const [currentStep, setCurrentStep] = useState(0);
   const [allFormValues, setAllFormValues] = useState(initialValues);
   const [formErrors, setFormErrors] = useState(null);
 
-  const buttonStyle = theme?.colorPrimary ? {
-    backgroundColor: theme.colorPrimary,
-    borderColor: theme.colorPrimary,
-  } : {};
-
-
   const isMultiStep = !!steps;
   const currentFields = isMultiStep ? steps?.[currentStep]?.fields : fields || [];
 
@@ -173,7 +166,6 @@ function AuthForm ({
       name: field.name,
       label: field.label,
       rules: field.rules,
-      dependencies: field.dependencies,
       style: { marginBottom: 0 }
     };
     if (field.valuePropName && field.type !== 'select') {
@@ -225,7 +217,6 @@ function AuthForm ({
                                 htmlType="submit"
                                 disabled={isLastStep && !allFieldsFilled}
                                 block className="normal-br"
-                                style={buttonStyle}
                             >
                                 {isLastStep ? submitText : t("Next")}
                             </BorderedButton>
@@ -234,14 +225,14 @@ function AuthForm ({
                 }}
                 </Form.Item>
                 <div className="buttons" style={{ marginTop: 0}}>
-                    <BorderedButton onClick={prev} block className="normal-br" style={buttonStyle}>
+                    <BorderedButton onClick={prev} block className="normal-br">
                         {t("Back")}
                     </BorderedButton>
                 </div>
             </div>
         ) : (
             <div className="buttons" style={{ marginTop: isMultiStep ? '16px' : 0}}>
-                <BorderedButton type="primary" htmlType="submit" block className="normal-br" style={buttonStyle}>
+                <BorderedButton type="primary" htmlType="submit" block className="normal-br">
                     {isMultiStep ? t("Next") : submitText}
                 </BorderedButton>
             </div>

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

@@ -8,6 +8,7 @@ export default function TopContributors({ data, loading, t }) {
 	const container = useRef(null);
 
 	useTopContributors({ container, data, t });
+console.log("topcontributorshhhh", data);
 	return (
 		<Widget
 			title={t(`admin::top-contributors`)}

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

@@ -12,6 +12,7 @@ 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,11 +9,13 @@ 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, fetchUserGrowth]);
+	}, [selectValue]);
 
 	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,8 +37,6 @@ 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,
@@ -114,10 +112,7 @@ export default function CombineSubjectsModal({
 				>
 					<Form.Item className="flex-1" name="id">
 						<Select
-							options={selectedSubjects.map((s) => ({
-								label: s?.datastakeId || "-",
-								value: s?.id || "-",
-							}))}
+							options={mapToSelectOptions(selectedSubjects, "datastakeId", selectOptions, null)}
 							placeholder={t("ID")}
 						></Select>
 					</Form.Item>

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

@@ -1,8 +1,6 @@
 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,
@@ -11,28 +9,10 @@ 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]);
 
@@ -40,8 +20,7 @@ export default function NewAccount({
 		if (isOpen && typeof isOpen === "object") {
 			MainForm.setFieldsValue({
 				name: isOpen.name,
-				country: isOpen?.country,
-				type: isOpen?.type,
+				email: isOpen?.admin?.email,
 			});
 		} else {
 			MainForm.resetFields();
@@ -78,32 +57,18 @@ 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 || []} />
+					<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

@@ -101,7 +101,6 @@ 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,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/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([]);
@@ -67,9 +66,9 @@ export default function AccountTable({
 	const selectOptions = useMemo(() => {
 		return {
 			country: config.options?.countries,
-			type: accountTypes,
+			type: config.accountTypes,
 		};
-	}, [config.options, accountTypes]);
+	}, [config.options, config.accountTypes]);
 
 	useEffect(() => {
 		if (initFetchDone) {
@@ -208,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

@@ -64,14 +64,10 @@ 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,
-				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 };
@@ -61,14 +65,10 @@ export default function SubjectsTable({
 			}
 		}
 		
-		const page = Number(paginationObj.page) || 1;
-		const pageSize = Number(paginationObj.pageSize) || 20;
-		const skip = (page - 1) * pageSize;
-		
 		const transformedParams = {
 			pagination: {
-				skip,
-				take: pageSize,
+				skip: String(paginationObj.page || 1),
+				take: String(paginationObj.pageSize || 20),
 			},
 			tab: activeTab,
 		};
@@ -133,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,
 					},
 				]}
@@ -192,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();
 						});
 					}
 				}}
@@ -209,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/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 }));