datastake-daf 0.6.822 → 0.6.824

package/dist/pages/index.js

@@ -15640,7 +15640,7 @@ function DAFTable({
 
   const paginationPageSize = pagination?.pageSize;
   const dataSource = React.useMemo(() => {
-    const pageSize = paginationPageSize ? paginationPageSize : source.length > 10 ? source.length : 10;
+    const pageSize = paginationPageSize ? paginationPageSize : source?.length > 10 ? source?.length : 10;
     if (doEmptyRows && pageSize) {
       const emptyDataSource = [];
       for (let i = 0; i < pageSize; i++) {
@@ -52816,10 +52816,12 @@ class AdminService extends BaseService {
     });
   }
   getItems({
-    item
+    item,
+    params
   }) {
     return this.apiGet({
-      url: `/management/items/${item}`
+      url: `/management/items/${item}`,
+      params
     });
   }
   getItemForm({

package/dist/services/index.js

@@ -934,10 +934,12 @@ class AdminService extends BaseService {
     });
   }
   getItems({
-    item
+    item,
+    params
   }) {
     return this.apiGet({
-      url: `/management/items/${item}`
+      url: `/management/items/${item}`,
+      params
     });
   }
   getItemForm({

package/package.json

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

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

@@ -1,5 +1,3 @@
-
-
 export const selectFiltersConfig = {
 	category: {
 		type: "select",

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

@@ -1,5 +1,5 @@
 import { useState, useMemo } from "react";
-import { useAdminTable } from "../hook";
+import { useSubjectsAdminTable, useGetParams } from "../hook";
 import AdminTable from "../components/index.jsx";
 import DAFTable from "../../../../Table/index.jsx";
 import { theme, Tag, message } from "antd";
@@ -11,6 +11,8 @@ import {
 	checkboxConfig,
 } from "./helper.js";
 import { getColumns } from "./column.js";
+import { getTabs } from "../helper.js";
+
 const { useToken } = theme;
 
 export default function DocumentsTable({
@@ -35,51 +37,9 @@ export default function DocumentsTable({
 	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;
-
+	const transformedParams = useGetParams({location});
 
-		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,
-		};
-		
+	const getDataWithStringPagination = async () => {						
 		return getData({ params: transformedParams });
 	};
 
@@ -87,19 +47,17 @@ export default function DocumentsTable({
 		filter,
 		activeTab,
 		canClearSearch,
-		totalPending,
 		data,
 		loading,
 		initFetchDone,
 		fetchData,
-		fetchPendingAccounts,
 		setLoading,
-	} = useAdminTable({
+	} = useSubjectsAdminTable({
 		goTo,
 		location,
 		selectFiltersConfig,
 		view,
-		// defaultUrlParams,
+		defaultUrlParams,
 		module,
 		defaultPageSize,
 		filtersConfig,
@@ -147,9 +105,9 @@ export default function DocumentsTable({
 				// 		disabled: selectedDocuments.length < 2,
 				// 	},
 				// ]}
-				// tabs={getTabs({ t })}
+				tabs={getTabs({ t })}
 				isMobile={isMobile}
-				// activeTab={activeTab}
+				activeTab={activeTab}
 				showFilters={showFilters}
 				setShowFilters={setShowFilters}
 				hasError={hasError}

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

@@ -52,7 +52,7 @@ export const getColumns = ({
 				}
 
 
-				const _categoryOptions = (options?.eventCategoryOptions || options?.categoryOptions || [])?.map((item) => ({
+				const _categoryOptions = (options?.eventCategoryOptions || options?.eventsType || [])?.map((item) => ({
 					value: item.value,
 					label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
 				}))

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

@@ -1,17 +1,18 @@
 import { useState, useMemo } from "react";
-import { useAdminTable } from "../hook";
+import { useSubjectsAdminTable, useGetParams } 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";
+import { getTabs } from "../helper.js";
+import { useGetQueryParams } from "../../../../../../hooks/useGetQueryParams.js";
 const { useToken } = theme;
 
 export default function EventsTable({
@@ -36,40 +37,22 @@ export default function EventsTable({
 	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,
-		};
-		
+	const transformedParams = useGetParams({location});
+
+	const getDataWithStringPagination = async () => {						
 		return getData({ params: transformedParams });
 	};
+
 	const {
 		filter,
-		// activeTab,
+		activeTab,
 		canClearSearch,
-		totalPending,
 		data,
 		loading,
 		initFetchDone,
 		fetchData,
-		fetchPendingAccounts,
 		setLoading,
-	} = useAdminTable({
+	} = useSubjectsAdminTable({
 		goTo,
 		location,
 		selectFiltersConfig,
@@ -84,12 +67,8 @@ export default function EventsTable({
 	});
 
 	const selectOptions = useMemo(() => {
-		return {
-			category: config.options?.category,
-			country: config.options?.countries,
-			sources: [],
-		};
-	}, [config.options]);
+		return options;
+	}, [options]);
 
 
 
@@ -122,9 +101,9 @@ export default function EventsTable({
 				// 		disabled: selectedEvents.length < 2,
 				// 	},
 				// ]}
-				// tabs={getTabs({ t })}
+				tabs={getTabs({ t })}
 				isMobile={isMobile}
-				// activeTab={activeTab}
+				activeTab={activeTab}
 				showFilters={showFilters}
 				setShowFilters={setShowFilters}
 				hasError={hasError}

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

@@ -1,17 +1,3 @@
-export const getTabs = ({ t }) => {
-	return [
-		{
-			key: "active",
-			label: t("Active"),
-		},
-		{
-			key: "deleted",
-			label: t("admin::deleted"),
-		},
-
-	];
-};
-
 export const selectFiltersConfig = {
 	category: {
 		type: "select",

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

@@ -1,11 +1,10 @@
 import { useState, useMemo } from "react";
-import { useAdminTable } from "../hook";
+import { useSubjectsAdminTable, useGetParams } 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,
@@ -13,6 +12,7 @@ import {
 } from "./helper.js";
 import { getColumns } from "./column.js";
 import CombineLocationModal from "../../AdminModals/CombineLocation/index.jsx";
+import { getTabs } from "../helper.js";
 
 const { useToken } = theme;
 
@@ -42,51 +42,9 @@ export default function LocationTable({
     const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
 
-	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 transformedParams = useGetParams({location});
 
-
-		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,
-		};
-		
+	const getDataWithStringPagination = async () => {
 		return getData({ params: transformedParams });
 	};
 
@@ -94,14 +52,12 @@ export default function LocationTable({
 		filter,
 		activeTab,
 		canClearSearch,
-		totalPending,
 		data,
 		loading,
 		initFetchDone,
 		fetchData,
-		fetchPendingAccounts,
 		setLoading,
-	} = useAdminTable({
+	} = useSubjectsAdminTable({
 		goTo,
 		location,
 		selectFiltersConfig,

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

@@ -1,17 +1,3 @@
-export const getTabs = ({ t }) => {
-	return [
-		{
-			key: "active",
-			label: t("Active"),
-		},
-		{
-			key: "deleted",
-			label: t("admin::deleted"),
-		},
-		
-	];
-};
-
 export const selectFiltersConfig = {
 	category: {
 		type: "select",

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

@@ -1,11 +1,10 @@
 import { useState, useMemo } from "react";
-import { useAdminTable } from "../hook";
+import { useSubjectsAdminTable, useGetParams } 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,
@@ -13,6 +12,8 @@ import {
 } from "./helper.js";
 import { getColumns } from "./columns.js";
 import CombineSubjectsModal from "../../AdminModals/CombineSubjects/index.jsx";
+import { getTabs } from "../helper.js";
+
 const { useToken } = theme;
 
 export default function SubjectsTable({
@@ -38,51 +39,9 @@ export default function SubjectsTable({
 	const [selectedSubjects, setSelectedSubjects] = useState([]);
 	const { token } = useToken();
 	const [isCombineModalOpen, setIsModalOpen] = useState(false);
+	const transformedParams = useGetParams({location});
 
-	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,
-		};
-		
+	const getDataWithStringPagination = async () => {
 		return getData({ params: transformedParams });
 	};
 
@@ -91,14 +50,12 @@ export default function SubjectsTable({
 		filter,
 		activeTab,
 		canClearSearch,
-		totalPending,
 		data,
 		loading,
 		initFetchDone,
 		fetchData,
-		fetchPendingAccounts,
 		setLoading,
-	} = useAdminTable({
+	} = useSubjectsAdminTable({
 		goTo,
 		location,
 		selectFiltersConfig,
@@ -142,7 +99,7 @@ export default function SubjectsTable({
 						icon: "Merge",
 						onClick: () => setIsModalOpen(true),
 						tooltip: t("merge-subjects"),
-						disabled: selectedSubjects.length < 2,
+						disabled: selectedSubjects?.length < 2,
 					},
 				]}
 				tabs={getTabs({ t })}
@@ -158,9 +115,9 @@ export default function SubjectsTable({
 				defaultTableFilters={{}}
 				breadcrumbs={breadcrumbs}
 			>
-				{selectedSubjects.length > 0 && (
+				{selectedSubjects?.length > 0 && (
 					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
-						{selectedSubjects.map((account) => (
+						{selectedSubjects?.map((account) => (
 							<Tag
 								key={account.userId}
 								className="flex flex-row gap-2 items-center"

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

@@ -13,3 +13,18 @@ export const renderTypeTag = ({ label, value }) => {
 
 	return <Tag color={color}>{label}</Tag>;
 };
+
+
+export const getTabs = ({ t }) => {
+	return [
+		{
+			key: "active",
+			label: t("Active"),
+		},
+		{
+			key: "deleted",
+			label: t("admin::deleted"),
+		},
+		
+	];
+};

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

@@ -1,5 +1,6 @@
 import { useMemo, useEffect, useCallback, useState } from "react";
 import { useFilters } from "../../../../../hooks/useFilters.js";
+import { useGetQueryParams } from "../../../../../hooks/useGetQueryParams.js";
 
 import { filterParams } from "../../../../../utils/filters.js";
 
@@ -96,3 +97,96 @@ export function useAdminTable({
 		setLoading,
 	};
 }
+
+export const useGetParams = ({location}) => {
+	const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
+
+	const cleanSearchParams = Object.fromEntries(
+		Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
+	);
+
+	const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
+
+	const { activeTab, ...rest } = otherParams;
+
+	const params = useMemo(() => {
+		if (!hasPagination) {
+			return undefined;
+		}
+		
+		return {
+			pagination: paginationQuery,
+			...(Object.keys(rest)?.length > 0 && rest ),
+			...(Object.keys(cleanSearchParams)?.length > 0 && { search: cleanSearchParams }),
+			tab: activeTab,
+		}
+	}, [location.search, hasPagination, paginationQuery, rest, cleanSearchParams, activeTab]);
+
+	return params;
+}
+
+export function useSubjectsAdminTable({
+	goTo,
+	location,
+	selectFiltersConfig,
+	view,
+	defaultUrlParams,
+	module,
+	filtersConfig,
+	getRedirectLink,
+	getData,
+	defaultPageSize,
+	refetchTrigger,
+}) {
+	const [initFetchDone, setInitFetchDone] = useState(false);
+	const [loading, setLoading] = useState(false);
+	const [data, setData] = useState([]);
+
+	const filter = useFilters({
+		goTo,
+		location,
+		selectFiltersConfig,
+		view,
+		defaultUrlParams,
+		module,
+		filtersConfig,
+		defaultPageSize: defaultPageSize || 20,
+		getRedirectLink,
+	});
+
+	const activeTab = useMemo(() => filter.activeFilters.activeTab, [filter.activeFilters]);
+
+	const canClearSearch = useMemo(() => {
+		return !!filter.activeFilters.search;
+	}, [filter.activeFilters]);
+	
+	const fetchData = useCallback(async () => {
+		try {
+			setLoading(true);
+			const { data } = await getData();
+			setData(data.data || data || []);
+			filter.setPagination((prev) => ({ ...prev, total: data?.meta?.total || data?.length || 0 }));
+			if (!initFetchDone) {
+				setInitFetchDone(true);
+			}
+			setLoading(false);
+		} catch (err) {
+			console.log(err);
+		}
+	}, [filter.activeFilters, refetchTrigger, location.search]);
+
+	useEffect(() => {
+		fetchData();
+	}, [fetchData, refetchTrigger]);
+
+	return {
+		filter,
+		activeTab,
+		canClearSearch,
+		data,
+		loading,
+		initFetchDone,
+		fetchData,
+		setLoading,
+	};
+}

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

@@ -100,7 +100,7 @@ export default function DAFTable({
   const dataSource = useMemo(() => {
     const pageSize = paginationPageSize
     ? paginationPageSize
-    : source.length > 10 ? source.length : 10;
+    : source?.length > 10 ? source?.length : 10;
     
     if (doEmptyRows && pageSize) {
       const emptyDataSource = [];

package/src/@daf/services/AdminService.js

@@ -174,9 +174,10 @@ class AdminService extends BaseService {
       });
     }
   
-    getItems({ item }) {
+    getItems({ item, params }) {
       return this.apiGet({
         url: `/management/items/${item}`,
+        params,
       });
     }
     getItemForm({ item ,scope="create"}) {