datastake-daf 0.6.813 → 0.6.814

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.813",
+	"version": "0.6.814",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

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/Icon/configs/index.js

@@ -230,6 +230,7 @@ import Up from "./Up";
 import Down from "./Down";
 import TrendUp from "./TrendUp";
 import Droplets from "./Droplets";
+import AddDocument from "./AddDocument";
 
 const config = {
 	AppAdmin,
@@ -463,7 +464,8 @@ const config = {
 	Up,
 	Down,
 	TrendUp,
-	Droplets
+	Droplets,
+	AddDocument
 };
 
 export default config;

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

@@ -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} />;
 			},