datastake-daf 0.6.811 → 0.6.813

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

@@ -0,0 +1,58 @@
+export const getTabs = ({ t }) => {
+	return [
+		{
+			key: "active",
+			label: t("Active"),
+		},
+		{
+			key: "pending",
+			label: t("Pending"),
+		},
+		{
+			key: 'suspended',
+			label: t("Suspended"),
+		}
+	];
+};
+
+export const selectFiltersConfig = {
+	category: {
+		type: "select",
+		label: "Category",
+		placeholder: (t) => t("Category"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+	country: {
+		type: "select",
+		label: "Country",
+		placeholder: (t) => t("Country"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+	sources: {
+		type: "select",
+		label: "Sources",
+		placeholder: (t) => t("Sources"),
+		style: { flex: 1 },
+		labelStyle: { flex: 1 },
+		getLabel: (option) => option.label,
+		getValue: (option) => option.value,
+	},
+};
+
+export const filtersConfig = {
+	name: "",
+	datastakeId: "",
+};
+
+export const defaultUrlParams = { activeTab: "active" };
+
+export const checkboxConfig = {
+	name: "Name",
+	datastakeId: "ID",
+};

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

@@ -0,0 +1,176 @@
+import { useState, useMemo } from "react";
+import { useAdminTable } from "../hook";
+import AdminTable from "../components/index.jsx";
+import DAFTable from "../../../../Table/index.jsx";
+import { theme, Tag, message } from "antd";
+import CustomIcon from "../../../../Icon/CustomIcon.jsx";
+import {
+	getTabs,
+	selectFiltersConfig,
+	filtersConfig,
+	defaultUrlParams,
+	checkboxConfig,
+} from "./helper.js";
+import { getColumns } from "./column.js";
+const { useToken } = theme;
+
+export default function EventsTable({
+	t = (text) => text,
+	isMobile,
+	goTo,
+	getRedirectLink,
+	location,
+	getData,
+	module,
+	config,
+	defaultPageSize = 20,
+	view,
+	headerTitle,
+	breadcrumbs,
+	refetchTrigger,
+	user,
+	options,
+}) {
+	const [showFilters, setShowFilters] = useState(false);
+	const [hasError, setHasError] = useState(false);
+	const [selectedEvents, setSelectedEvents] = useState([]);
+	const { token } = useToken();
+
+	const getDataWithStringPagination = async ({ params }) => {
+		const { pagination, tab, filters, search, sort, ...otherParams } = params;
+		
+		// Don't send pagination to API - we'll fetch all data and slice on frontend
+		let activeTab = tab || "active";
+		if (!tab && filters) {
+			try {
+				const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+				activeTab = parsedFilters.activeTab || "active";
+			} catch (e) {
+				activeTab = "active";
+			}
+		}
+		
+		// Fetch all data without pagination - we'll slice on frontend based on URL params
+		const transformedParams = {
+			tab: activeTab,
+			...otherParams,
+		};
+		
+		return getData({ params: transformedParams });
+	};
+	const {
+		filter,
+		// activeTab,
+		canClearSearch,
+		totalPending,
+		data,
+		loading,
+		initFetchDone,
+		fetchData,
+		fetchPendingAccounts,
+		setLoading,
+	} = useAdminTable({
+		goTo,
+		location,
+		selectFiltersConfig,
+		view,
+		defaultUrlParams,
+		module,
+		defaultPageSize,
+		filtersConfig,
+		getRedirectLink,
+		getData: getDataWithStringPagination,
+		refetchTrigger,
+	});
+
+	const selectOptions = useMemo(() => {
+		return {
+			category: config.options?.category,
+			country: config.options?.countries,
+			sources: [],
+		};
+	}, [config.options]);
+
+
+
+	const columns = useMemo(() => {
+		return getColumns({
+			t,
+			goTo,
+			token,
+			module,
+			selectedEvents,
+			setSelectedEvents,
+			getRedirectLink,
+			selectOptions,
+			entity: headerTitle,
+			options,
+		});
+	}, [t, goTo, module, token, selectedEvents, getRedirectLink, selectOptions, headerTitle, options]);
+
+	return (
+		<>
+			<AdminTable
+				filters={filter}
+				t={t}
+				headerTitle={headerTitle}
+				// actionButton={[
+				// 	{
+				// 		icon: "Merge",
+				// 		onClick: () => setIsModalOpen(true),
+				// 		tooltip: t("merge-subjects"),
+				// 		disabled: selectedEvents.length < 2,
+				// 	},
+				// ]}
+				// tabs={getTabs({ t })}
+				isMobile={isMobile}
+				// activeTab={activeTab}
+				showFilters={showFilters}
+				setShowFilters={setShowFilters}
+				hasError={hasError}
+				setHasError={setHasError}
+				canClearSearch={canClearSearch}
+				selectOptions={selectOptions}
+				checkboxConfig={checkboxConfig}
+				defaultTableFilters={{}}
+				breadcrumbs={breadcrumbs}
+			>
+				{selectedEvents.length > 0 && (
+					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
+						{selectedEvents.map((event) => (
+							<Tag
+								key={event.id}
+								className="flex flex-row gap-2 items-center"
+								onClick={() =>
+									setSelectedEvents((prev) => prev.filter((a) => a.id !== event.id))
+								}
+								style={{ cursor: "pointer" }}
+							>
+								<span>{event.title}</span>
+								<CustomIcon name="Close" size={10} />
+							</Tag>
+						))}
+					</div>
+				)}
+				<DAFTable
+					columns={columns}
+					data={data}
+					loading={loading}
+					hideOnLoading={false}
+					pagination={filter.pagination}
+					rowKey="id"
+					selectOptions={selectOptions}
+					doEmptyRows
+					setShowFilters={setShowFilters}
+					filtersConfig={selectFiltersConfig}
+					onFilterChange={filter.onFiltersChange}
+					showFilters={showFilters}
+					defaultFilters={filter.defaultFilters}
+					onChange={filter.onTableChange}
+				/>
+			</AdminTable>
+
+		
+		</>
+	);
+}

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

@@ -53,7 +53,22 @@ 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 {
@@ -66,8 +81,8 @@ export default function LocationTable({
 		
 		const transformedParams = {
 			pagination: {
-				skip: String(paginationObj.page || 1),
-				take: String(paginationObj.pageSize || 20),
+				skip: pageNumber, 
+				take: pageSize,
 			},
 			tab: activeTab,
 		};

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

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

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

@@ -56,7 +56,6 @@ 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,6 +22,8 @@ export default function AdminTable({
 	breadcrumbs,
 	children,
 }) {
+
+	console.log(tabs, "tabs");
 	return (
 		<>
 			<div className="semibold form-input-output daf-create-view">
@@ -29,7 +31,7 @@ export default function AdminTable({
 				<div className="column start table-content">
 					<div className="mt-6 ml-6 mr-6">
 						<div className="flex flex-row">
-							<div className="mr-2">
+							{tabs && tabs.length > 0 && <div className="mr-2">
 								<Tabs
 									t={t}
 									tabs={tabs}
@@ -38,7 +40,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,6 +32,7 @@ export function useAdminTable({
 		defaultPageSize: defaultPageSize || 20,
 		getRedirectLink,
 	});
+	console.log(filter, "filter.activeFilters");
 
 	const activeTab = useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
 
@@ -59,12 +60,14 @@ 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,14 +37,17 @@ export default function Edit({
 	}, [isChanged, addCheck, removeCheck]);
 
 	const deleteUser = useCallback(
-		(id) => {
-			// TODO: add call 
-			console.log("DELETE", id);
-			fetchData();
+		async (id) => {
+			try {
+				await AdminService.removeUserFromAccount({ accountId: data.id, userId: id });
+				message.success(t("User removed successfully"));
+				fetchData();
+			} catch (err) {
+				handleError(err);
+			}
 		},
-		[fetchData],
+		[fetchData, data.id, t, handleError],
 	);
-
 	const updateUser = useCallback((id, val) => {
 		setIsChanged(true);
 		setData((prev) => ({
@@ -71,9 +74,9 @@ export default function Edit({
 
 	const onSuspend = () => {
 		Modal.confirm({
-			title: t("sbg-admin::suspend-title"),
+			title: t("Are-you-sure-you-want-to-suspend-this-account?"),
 			icon: <ExclamationCircleOutlined />,
-			content: t("sbg-admin::suspend-content"),
+			content: <span style={{ color: "#888" }}>{t("Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")}</span>,
 			okText: t("Yes"),
 			cancelText: t("No"),
 			onOk: async () => {

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

@@ -34,6 +34,7 @@ export default function Users({
 	inviteCompanyAccount = () => {},
 	companyId,
 	handleError = () => {},
+
 }) {
 	const [hasError, setHasError] = useState(false);
 	const [showFilters, setShowFilters] = useState(false);
@@ -72,9 +73,9 @@ export default function Users({
 	const onDeleteUserClick = useCallback(
 		(id) => {
 			Modal.confirm({
-				title: t("sbg-admin::remove-user-title"),
+				title: t("Are-you-sure-you-want-to-remove-the-user-from-this-account?"),
 				icon: <ExclamationCircleOutlined />,
-				content: t("sbg-admin::remove-user-body"),
+				content: <span style={{ color: "#888" }}>{t("The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.")}</span>,
 				okText: t("Yes"),
 				cancelText: t("No"),
 				onOk: () => {
@@ -87,8 +88,15 @@ export default function Users({
 	);
 
 	const data = useMemo(() => {
-		const { users = [] } = accountData;
-		let filtered = [...users];
+		const { users = [], pendingUsers = [] } = accountData;
+		let filtered = [
+			...users,
+			...pendingUsers.map(u => ({ 
+				...u, 
+				status: 'pending',
+				id: u.invitationToken || u.email // ensure pending users have an ID
+			}))
+		];
 
 		if (!isEmptyOrSpaces(activeFilters.search)) {
 			const search = activeFilters.search.toLowerCase();
@@ -186,6 +194,10 @@ 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,23 +1,15 @@
 import { Tag } from "antd";
 
 export const renderStatus = ({ val, t = (s) => s }) => {
-	// 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) {
+	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) {
 		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,14 +172,15 @@ function AdminView({
 									try {
 										const { pendingCompanyId, status, ...userDataToInvite } = user;
 										console.log('Sending invitation for:', user.email, userDataToInvite);
-										await inviteCompanyAccount({
-											companyId: editData.id,
-											data: {
-												...userDataToInvite,
-												pendingCompanyId,
-											},
-										});
-										console.log('Invitation sent successfully for:', user.email);
+										// 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);
 									} catch (inviteError) {
 										console.error('Failed to invite user:', user.email, inviteError);
 										handleError(inviteError);