datastake-daf 0.6.813 → 0.6.814

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 }));

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

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

@@ -34,7 +34,6 @@ export default function Users({
 	inviteCompanyAccount = () => {},
 	companyId,
 	handleError = () => {},
-
 }) {
 	const [hasError, setHasError] = useState(false);
 	const [showFilters, setShowFilters] = useState(false);
@@ -73,9 +72,9 @@ export default function Users({
 	const onDeleteUserClick = useCallback(
 		(id) => {
 			Modal.confirm({
-				title: t("Are-you-sure-you-want-to-remove-the-user-from-this-account?"),
+				title: t("sbg-admin::remove-user-title"),
 				icon: <ExclamationCircleOutlined />,
-				content: <span style={{ color: "#888" }}>{t("The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")}</span>,
+				content: t("sbg-admin::remove-user-body"),
 				okText: t("Yes"),
 				cancelText: t("No"),
 				onOk: () => {
@@ -88,15 +87,8 @@ export default function Users({
 	);
 
 	const data = useMemo(() => {
-		const { users = [], pendingUsers = [] } = accountData;
-		let filtered = [
-			...users,
-			...pendingUsers.map(u => ({ 
-				...u, 
-				status: 'pending',
-				id: u.invitationToken || u.email // ensure pending users have an ID
-			}))
-		];
+		const { users = [] } = accountData;
+		let filtered = [...users];
 
 		if (!isEmptyOrSpaces(activeFilters.search)) {
 			const search = activeFilters.search.toLowerCase();
@@ -194,10 +186,6 @@ export default function Users({
 			inviteCompanyAccount={inviteCompanyAccount}
 			companyId={companyId}
 			handleError={handleError}
-			existingEmails={[
-				...(accountData?.users || []).map(u => u.email?.toLowerCase()),
-				...(accountData?.pendingUsers || []).map(u => u.email?.toLowerCase()),
-			].filter(Boolean)}
 		/>
 		</div>
 	);

package/src/@daf/core/components/Screens/Admin/AdminViews/components/View/helpers.js

@@ -1,15 +1,23 @@
 import { Tag } from "antd";
 
 export const renderStatus = ({ val, t = (s) => s }) => {
-	if (val === 'pending') {
-		return <Tag color="orange">{t("Pending")}</Tag>;
-	}
-	if (val === 'unsaved') {
-		return <Tag color="red">{t("Unsaved")}</Tag>;
-	}
-	if (val === 'active' || val === true) {
+	// switch (val) {
+	// 	case "active":
+	// 		return <Tag color="green">{t("Active")}</Tag>;
+	// 	case "unsaved":
+	// 		return <Tag color="red">{t("Unsaved")}</Tag>;
+	// 	case "inactive":
+	// 	case "suspended":
+	// 		return <Tag color="red">{t("Suspended")}</Tag>;
+	// 	case "pending":
+	// 		return <Tag color="orange">{t("Pending")}</Tag>;
+	// 	default:
+	// 		return <Tag color="default">{t("Unknown")}</Tag>;
+	// }
+
+	if (val) {
 		return <Tag color="green">{t("Active")}</Tag>;
+	} else {
+		return <Tag color="red">{t("Suspended")}</Tag>;
 	}
-	
-	return <Tag color="red">{t("Suspended")}</Tag>;
 };

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

@@ -172,15 +172,14 @@ function AdminView({
 									try {
 										const { pendingCompanyId, status, ...userDataToInvite } = user;
 										console.log('Sending invitation for:', user.email, userDataToInvite);
-										// Use the standalone invite function, don't mix it with updateAccount
-										// await inviteCompanyAccount({
-										// 	companyId: editData.id,
-										// 	data: {
-										// 		...userDataToInvite,
-										// 		pendingCompanyId,
-										// 	},
-										// });
-										// console.log('Invitation sent successfully for:', user.email);
+										await inviteCompanyAccount({
+											companyId: editData.id,
+											data: {
+												...userDataToInvite,
+												pendingCompanyId,
+											},
+										});
+										console.log('Invitation sent successfully for:', user.email);
 									} catch (inviteError) {
 										console.error('Failed to invite user:', user.email, inviteError);
 										handleError(inviteError);