datastake-daf 0.6.819 → 0.6.820

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

@@ -270,36 +270,28 @@ export const getColumns = ({
 					);
 				}
 
-				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),
-							},
-					  ];
+				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),
+					},
+				];
 
 				return <MoreMenu items={moreMenuItems} />;
 			},

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

@@ -18,9 +18,9 @@ import {
 
 import CombineAccountModal from "../../AdminModals/CombineAccount/index.jsx";
 
-import NewAccount from "../../../Admin/AdminModals/NewAccount/index.jsx";
+// import NewAccount from "../../../Admin/AdminModals/NewAccount/index.jsx";
 import CustomIcon from "../../../../Icon/CustomIcon.jsx";
-
+import AddAccountModal from "../../AdminModals/AddAccount/index.jsx";
 export default function AccountTable({
 	goTo,
 	t = (text) => text,
@@ -35,6 +35,7 @@ export default function AccountTable({
 	actionButton,
 	inviteAccount,
 }) {
+	const accountTypes = config?.accountTypes;
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
 	const [selectedAccounts, setSelectedAccounts] = useState([]);
@@ -60,15 +61,15 @@ export default function AccountTable({
 		filtersConfig,
 		getRedirectLink,
 		getData,
-		fetchPendingOnMount: true, 
+		fetchPendingOnMount: true,
 	});
 
 	const selectOptions = useMemo(() => {
 		return {
 			country: config.options?.countries,
-			type: config.accountTypes,
+			type: accountTypes,
 		};
-	}, [config.options, config.accountTypes]);
+	}, [config.options, accountTypes]);
 
 	useEffect(() => {
 		if (initFetchDone) {
@@ -96,12 +97,23 @@ 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({
@@ -113,7 +125,7 @@ export default function AccountTable({
 				getRedirectLink,
 				onCanelVerification: onCanelVerification,
 				onCopyInvitation: config.onTableClick.onCopyInvitation,
-				onResendInvitation: config.onTableClick.onResendInvitation,
+				onResendInvitation: onResendInvitation,
 				setAddAccountVisible: config.onTableClick.setAddAccountVisible,
 				setSelectedAccounts: setSelectedAccounts,
 				selectedAccounts: selectedAccounts,
@@ -129,13 +141,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,
@@ -197,7 +209,7 @@ export default function AccountTable({
 				/>
 			</AdminTable>
 
-			<NewAccount
+			<AddAccountModal
 				t={t}
 				isOpen={config.addAccountVisible}
 				onClose={() => {
@@ -207,7 +219,7 @@ export default function AccountTable({
 					fetchData();
 					fetchPendingAccounts();
 				}}
-				accountTypes={config.accountTypes}
+				accountTypes={accountTypes}
 				inviteAccount={inviteAccount}
 			/>
 			<CombineAccountModal

package/src/@daf/core/components/Screens/Admin/AdminTables/DocumentsTable/column.js

@@ -0,0 +1,93 @@
+import { Checkbox, Tooltip, Avatar } from "antd";
+import CustomIcon from "../../../../Icon/CustomIcon.jsx";
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { renderDateFormatted } from "../../../../../../../helpers/Forms.js";
+export const getColumns = ({
+	t,
+	goTo = () => {},
+	show = "show",
+	getRedirectLink = () => {},
+
+}) => {
+	const cols = [
+	
+		{
+			title: t("ID"),
+			dataIndex: "datastakeId",
+			key: "datastakeId",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Title"),
+			dataIndex: "name",
+			key: "name",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		
+{
+    title: t("Date"),
+    dataIndex: "date",
+    key: "date",
+	show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+      return <Tooltip title={renderDateFormatted(value, "DD MMM YYYY", 'en')}>{renderDateFormatted(value, "DD MMM YYYY", 'en')	}</Tooltip>;
+    },
+  },
+{
+    title: t("Last Update"),
+    dataIndex: "updatedAt",
+    key: "updatedAt",
+	show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+      return <Tooltip title={renderDateFormatted(value, "DD MMM YYYY", 'en')}>{renderDateFormatted(value, "DD MMM YYYY", 'en')}</Tooltip>;
+    },
+},
+		{
+			title: "",
+			dataIndex: "actions",
+			key: "actions",
+			width: 60,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return (
+					<div
+						className="cursor-pointer"
+						onClick={() => {
+							goTo(getRedirectLink(`/app/view/management-document/${all.id}`));
+						}}
+					>
+						<CustomIcon name="Link" width={18} height={18} />
+					</div>
+				);
+			},
+		},
+	];
+
+	return cols.filter((c) => c[show]);
+};

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

@@ -0,0 +1,43 @@
+
+
+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/DocumentsTable/index.jsx

@@ -0,0 +1,201 @@
+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 {
+	selectFiltersConfig,
+	filtersConfig,
+	defaultUrlParams,
+	checkboxConfig,
+} from "./helper.js";
+import { getColumns } from "./column.js";
+const { useToken } = theme;
+
+export default function DocumentsTable({
+	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 [selectedDocuments, setSelectedDocuments] = useState([]);
+	const { token } = useToken();
+
+	const getDataWithStringPagination = async ({ params }) => {
+		const { pagination, tab, filters, search, sort, ...otherParams } = params;
+		
+		let paginationObj = { page: 1, pageSize: 20 };
+		if (pagination) {
+			try {
+				paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
+			} catch (e) {
+				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 {
+				const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
+				activeTab = parsedFilters.activeTab || "active";
+			} catch (e) {
+				activeTab = "active";
+			}
+		}
+		
+		const transformedParams = {
+			pagination: {
+				skip: pageNumber, 
+				take: pageSize,
+			},
+			tab: activeTab,
+		};
+		
+		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,
+			selectedDocuments,
+			setSelectedDocuments,
+			getRedirectLink,
+			selectOptions,
+			entity: headerTitle,
+			options,
+		});
+	}, [t, goTo, module, token, selectedDocuments, getRedirectLink, selectOptions, headerTitle, options]);
+
+	console.log({data}, "data");
+
+	return (
+		<>
+			<AdminTable
+				filters={filter}
+				t={t}
+				headerTitle={headerTitle}
+				// actionButton={[
+				// 	{
+				// 		icon: "Merge",
+				// 		onClick: () => setIsModalOpen(true),
+				// 		tooltip: t("merge-subjects"),
+				// 		disabled: selectedDocuments.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}
+			>
+				{selectedDocuments.length > 0 && (
+					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
+						{selectedDocuments.map((document) => (
+							<Tag
+								key={document.id}
+								className="flex flex-row gap-2 items-center"
+								onClick={() =>
+									setSelectedDocuments((prev) => prev.filter((a) => a.id !== document.id))
+								}
+								style={{ cursor: "pointer" }}
+							>
+								            <span>{document.name}</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/EventsTable/column.js

@@ -0,0 +1,113 @@
+import { Checkbox, Tooltip, Avatar } from "antd";
+import CustomIcon from "../../../../Icon/CustomIcon.jsx";
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+
+export const getColumns = ({
+	t,
+	goTo = () => {},
+	show = "show",
+	getRedirectLink = () => {},
+
+	options,
+}) => {
+	const cols = [
+	
+		{
+			title: t("ID"),
+			dataIndex: "datastakeId",
+			key: "datastakeId",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("Title"),
+			dataIndex: "name",
+			key: "name",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return <Tooltip title={value}>{value}</Tooltip>;
+			},
+		},
+		{
+			title: t("type"),
+			dataIndex: "typeOfEvent",
+			key: "typeOfEvent",
+			ellipsis: true,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+
+				const _categoryOptions = (options?.eventCategoryOptions || options?.categoryOptions || [])?.map((item) => ({
+					value: item.value,
+					label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
+				}))
+
+				const type = findOptions(value, options?.eventsType || []) || "-";
+
+				return <Tooltip title={type}>{type}</Tooltip>;
+			},
+		},
+{
+    title: t("Date"),
+    dataIndex: "date",
+    key: "date",
+    render: (value, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+      return <Tooltip title={value}>{value}</Tooltip>;
+    },
+  },
+  {
+    title: t("Scope"),
+    dataIndex: "scope",
+    key: "scope",
+    render: (value, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+      return <Tooltip title={value}>{value}</Tooltip>;
+    },
+  },
+		{
+			title: "",
+			dataIndex: "actions",
+			key: "actions",
+			width: 60,
+			show: true,
+			render: (value, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				return (
+					<div
+						className="cursor-pointer"
+						onClick={() => {
+							goTo(getRedirectLink(`/app/view/management-event/${all.id}`));
+						}}
+					>
+						<CustomIcon name="Link" width={18} height={18} />
+					</div>
+				);
+			},
+		},
+	];
+
+	return cols.filter((c) => c[show]);
+};

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",
+};