datastake-daf 0.6.366 → 0.6.368

package/dist/components/index.js

@@ -47019,20 +47019,20 @@ const useFilters = ({
   const params = React.useMemo(() => new URLSearchParams(location.search), [location.search]);
   const [activeFilters, setActiveFilters] = React.useState(defaultActiveFilters || getDefaultActiveFilters(params, selectFiltersConfig, defaultPageSize, defaultUrlParams, doPagination));
   const [pagination, setPagination] = React.useState(defaultActiveFilters ? {
-    current: defaultActiveFilters.page || 1,
-    pageSize: defaultActiveFilters.pageSize || defaultPageSize,
+    current: defaultActiveFilters[PAGE] || 1,
+    [PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
     showSizeChanger: true
   } : {
     current: !isNaN(Number(params.get(PAGE))) ? Number(params.get(PAGE)) || 1 : 1,
-    pageSize: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
+    [PAGE_SIZE]: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
     showSizeChanger: true
   });
   React.useEffect(() => {
     if (defaultActiveFilters) {
       setPagination(prev => ({
         ...prev,
-        current: defaultActiveFilters.page || 1,
-        pageSize: defaultActiveFilters.pageSize || defaultPageSize,
+        current: defaultActiveFilters[PAGE] || 1,
+        [PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
         showSizeChanger: true
       }));
       return;
@@ -47040,7 +47040,7 @@ const useFilters = ({
     setPagination(prev => ({
       ...prev,
       current: !isNaN(Number(params.get(PAGE))) ? Number(params.get(PAGE)) || 1 : 1,
-      pageSize: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
+      [PAGE_SIZE]: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
       showSizeChanger: true
     }));
   }, []);
@@ -47097,9 +47097,9 @@ const useFilters = ({
     const filters = StorageManager.saveFilters(module, view, {
       ...filteredFilters
     });
-    if (!filters.pageSize) {
-      filters.page = 1;
-      filters.pageSize = pagination.pageSize;
+    if (!filters[PAGE_SIZE]) {
+      filters[PAGE] = 1;
+      filters[PAGE_SIZE] = pagination[PAGE_SIZE];
     }
     updateQuery(filters, 1);
   }, [activeFilters]);
@@ -47136,7 +47136,7 @@ const useFilters = ({
         o[k] = v;
       });
       if (doPagination) {
-        o.page = 1;
+        o[PAGE] = 1;
       }
       return o;
     });
@@ -47156,11 +47156,11 @@ const useFilters = ({
     } = sorter || {};
     let fs = {
       ...activeFilters,
-      page: page.pageSize !== activeFilters.pageSize ? 1 : page.current,
-      pageSize: page.pageSize || defaultPageSize
+      [PAGE]: page[PAGE_SIZE] !== activeFilters[PAGE_SIZE] ? 1 : page.current,
+      [PAGE_SIZE]: page[PAGE_SIZE] || defaultPageSize
     };
     if (sorter && (columnKey !== sortBy || order !== sortDir)) {
-      fs.page = 1;
+      fs[PAGE] = 1;
     }
     if (order) {
       fs = {
@@ -47185,19 +47185,19 @@ const useFilters = ({
       page.current = 1;
     }
     const filters = StorageManager.saveFilters(module, view, {
-      page: page.current
+      [PAGE]: page.current
     }, true);
     updateQuery(filters, page.current);
     setPagination(prev => ({
       ...prev,
-      current: fs.page,
-      pageSize: fs.pageSize || defaultPageSize
+      current: fs[PAGE],
+      [PAGE_SIZE]: fs[PAGE_SIZE] || defaultPageSize
     }));
   };
   const onSearch = React.useCallback((activeFilter, value) => {
     setActiveFilters(prev => ({
       ...prev,
-      page: 1,
+      [PAGE]: 1,
       searchParams: activeFilter,
       search: value
     }));
@@ -47207,7 +47207,7 @@ const useFilters = ({
     }));
   }, []);
   const totalPages = React.useMemo(() => {
-    return Math.ceil(pagination.total / pagination.pageSize);
+    return Math.ceil(pagination.total / pagination[PAGE_SIZE]);
   }, [pagination]);
   const canGoPrev = React.useMemo(() => pagination.current !== 1, [pagination]);
   const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages, [pagination, totalPages]);

package/dist/hooks/index.js

@@ -219,20 +219,20 @@ const useFilters = ({
   const params = React.useMemo(() => new URLSearchParams(location.search), [location.search]);
   const [activeFilters, setActiveFilters] = React.useState(defaultActiveFilters || getDefaultActiveFilters(params, selectFiltersConfig, defaultPageSize, defaultUrlParams, doPagination));
   const [pagination, setPagination] = React.useState(defaultActiveFilters ? {
-    current: defaultActiveFilters.page || 1,
-    pageSize: defaultActiveFilters.pageSize || defaultPageSize,
+    current: defaultActiveFilters[PAGE] || 1,
+    [PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
     showSizeChanger: true
   } : {
     current: !isNaN(Number(params.get(PAGE))) ? Number(params.get(PAGE)) || 1 : 1,
-    pageSize: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
+    [PAGE_SIZE]: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
     showSizeChanger: true
   });
   React.useEffect(() => {
     if (defaultActiveFilters) {
       setPagination(prev => ({
         ...prev,
-        current: defaultActiveFilters.page || 1,
-        pageSize: defaultActiveFilters.pageSize || defaultPageSize,
+        current: defaultActiveFilters[PAGE] || 1,
+        [PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
         showSizeChanger: true
       }));
       return;
@@ -240,7 +240,7 @@ const useFilters = ({
     setPagination(prev => ({
       ...prev,
       current: !isNaN(Number(params.get(PAGE))) ? Number(params.get(PAGE)) || 1 : 1,
-      pageSize: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
+      [PAGE_SIZE]: !isNaN(Number(params.get(PAGE_SIZE))) ? Number(params.get(PAGE_SIZE)) || defaultPageSize : defaultPageSize,
       showSizeChanger: true
     }));
   }, []);
@@ -297,9 +297,9 @@ const useFilters = ({
     const filters = StorageManager.saveFilters(module, view, {
       ...filteredFilters
     });
-    if (!filters.pageSize) {
-      filters.page = 1;
-      filters.pageSize = pagination.pageSize;
+    if (!filters[PAGE_SIZE]) {
+      filters[PAGE] = 1;
+      filters[PAGE_SIZE] = pagination[PAGE_SIZE];
     }
     updateQuery(filters, 1);
   }, [activeFilters]);
@@ -336,7 +336,7 @@ const useFilters = ({
         o[k] = v;
       });
       if (doPagination) {
-        o.page = 1;
+        o[PAGE] = 1;
       }
       return o;
     });
@@ -356,11 +356,11 @@ const useFilters = ({
     } = sorter || {};
     let fs = {
       ...activeFilters,
-      page: page.pageSize !== activeFilters.pageSize ? 1 : page.current,
-      pageSize: page.pageSize || defaultPageSize
+      [PAGE]: page[PAGE_SIZE] !== activeFilters[PAGE_SIZE] ? 1 : page.current,
+      [PAGE_SIZE]: page[PAGE_SIZE] || defaultPageSize
     };
     if (sorter && (columnKey !== sortBy || order !== sortDir)) {
-      fs.page = 1;
+      fs[PAGE] = 1;
     }
     if (order) {
       fs = {
@@ -385,19 +385,19 @@ const useFilters = ({
       page.current = 1;
     }
     const filters = StorageManager.saveFilters(module, view, {
-      page: page.current
+      [PAGE]: page.current
     }, true);
     updateQuery(filters, page.current);
     setPagination(prev => ({
       ...prev,
-      current: fs.page,
-      pageSize: fs.pageSize || defaultPageSize
+      current: fs[PAGE],
+      [PAGE_SIZE]: fs[PAGE_SIZE] || defaultPageSize
     }));
   };
   const onSearch = React.useCallback((activeFilter, value) => {
     setActiveFilters(prev => ({
       ...prev,
-      page: 1,
+      [PAGE]: 1,
       searchParams: activeFilter,
       search: value
     }));
@@ -407,7 +407,7 @@ const useFilters = ({
     }));
   }, []);
   const totalPages = React.useMemo(() => {
-    return Math.ceil(pagination.total / pagination.pageSize);
+    return Math.ceil(pagination.total / pagination[PAGE_SIZE]);
   }, [pagination]);
   const canGoPrev = React.useMemo(() => pagination.current !== 1, [pagination]);
   const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages, [pagination, totalPages]);
@@ -1162,6 +1162,8 @@ const useIsMobile = () => {
   return isMobile;
 };
 
+const PAGE = "page";
+const PAGE_SIZE = "pageSize";
 function useSource({
   user = {},
   t = () => {},
@@ -1180,8 +1182,8 @@ function useSource({
         const {
           data
         } = await getData({
-          page: 1,
-          pageSize: 100,
+          [PAGE]: 1,
+          [PAGE_SIZE]: 100,
           type: "partners"
         });
         if (id === undefined) {

package/package.json

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

package/src/@daf/hooks/useFilters.js

@@ -34,15 +34,13 @@ export const useFilters = ({
 	const [pagination, setPagination] = useState(
 		defaultActiveFilters
 			? {
-					current: defaultActiveFilters.page || 1,
-					pageSize: defaultActiveFilters.pageSize || defaultPageSize,
+					current: defaultActiveFilters[PAGE] || 1,
+					[PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
 					showSizeChanger: true,
 			  }
 			: {
-					current: !isNaN(Number(params.get(PAGE)))
-						? Number(params.get(PAGE)) || 1
-						: 1,
-					pageSize: !isNaN(Number(params.get(PAGE_SIZE)))
+					current: !isNaN(Number(params.get(PAGE))) ? Number(params.get(PAGE)) || 1 : 1,
+					[PAGE_SIZE]: !isNaN(Number(params.get(PAGE_SIZE)))
 						? Number(params.get(PAGE_SIZE)) || defaultPageSize
 						: defaultPageSize,
 					showSizeChanger: true,
@@ -53,8 +51,8 @@ export const useFilters = ({
 		if (defaultActiveFilters) {
 			setPagination((prev) => ({
 				...prev,
-				current: defaultActiveFilters.page || 1,
-				pageSize: defaultActiveFilters.pageSize || defaultPageSize,
+				current: defaultActiveFilters[PAGE] || 1,
+				[PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
 				showSizeChanger: true,
 			}));
 			return;
@@ -62,7 +60,7 @@ export const useFilters = ({
 		setPagination((prev) => ({
 			...prev,
 			current: !isNaN(Number(params.get(PAGE))) ? Number(params.get(PAGE)) || 1 : 1,
-			pageSize: !isNaN(Number(params.get(PAGE_SIZE)))
+			[PAGE_SIZE]: !isNaN(Number(params.get(PAGE_SIZE)))
 				? Number(params.get(PAGE_SIZE)) || defaultPageSize
 				: defaultPageSize,
 			showSizeChanger: true,
@@ -159,9 +157,9 @@ export const useFilters = ({
 
 		const filters = StorageManager.saveFilters(module, view, { ...filteredFilters });
 
-		if (!filters.pageSize) {
-			filters.page = 1;
-			filters.pageSize = pagination.pageSize;
+		if (!filters[PAGE_SIZE]) {
+			filters[PAGE] = 1;
+			filters[PAGE_SIZE] = pagination[PAGE_SIZE];
 		}
 
 		updateQuery(filters, 1);
@@ -201,7 +199,7 @@ export const useFilters = ({
 				});
 
 				if (doPagination) {
-					o.page = 1;
+					o[PAGE] = 1;
 				}
 
 				return o;
@@ -217,12 +215,12 @@ export const useFilters = ({
 
 		let fs = {
 			...activeFilters,
-			page: page.pageSize !== activeFilters.pageSize ? 1 : page.current,
-			pageSize: page.pageSize || defaultPageSize,
+			[PAGE]: page[PAGE_SIZE] !== activeFilters[PAGE_SIZE] ? 1 : page.current,
+			[PAGE_SIZE]: page[PAGE_SIZE] || defaultPageSize,
 		};
 
 		if (sorter && (columnKey !== sortBy || order !== sortDir)) {
-			fs.page = 1;
+			fs[PAGE] = 1;
 		}
 
 		if (order) {
@@ -246,20 +244,20 @@ export const useFilters = ({
 			page.current = 1;
 		}
 
-		const filters = StorageManager.saveFilters(module, view, { page: page.current }, true);
+		const filters = StorageManager.saveFilters(module, view, { [PAGE]: page.current }, true);
 
 		updateQuery(filters, page.current);
 		setPagination((prev) => ({
 			...prev,
-			current: fs.page,
-			pageSize: fs.pageSize || defaultPageSize,
+			current: fs[PAGE],
+			[PAGE_SIZE]: fs[PAGE_SIZE] || defaultPageSize,
 		}));
 	};
 
 	const onSearch = useCallback((activeFilter, value) => {
 		setActiveFilters((prev) => ({
 			...prev,
-			page: 1,
+			[PAGE]: 1,
 			searchParams: activeFilter,
 			search: value,
 		}));
@@ -267,7 +265,7 @@ export const useFilters = ({
 	}, []);
 
 	const totalPages = useMemo(() => {
-		return Math.ceil(pagination.total / pagination.pageSize);
+		return Math.ceil(pagination.total / pagination[PAGE_SIZE]);
 	}, [pagination]);
 
 	const canGoPrev = useMemo(() => pagination.current !== 1, [pagination]);

package/src/@daf/hooks/useSources.js

@@ -1,17 +1,20 @@
 import { useEffect, useState } from "react";
 
+const PAGE = "page";
+const PAGE_SIZE = "pageSize";
+
 export default function useSource({ user = {}, t = () => {}, getData = () => {}, id }) {
 	const [loading, setLoading] = useState(true);
 	const [partners, setPartners] = useState([]);
 	const [selectedPartners, setSelectedPartners] = useState({ loading: true });
-	
+
 	useEffect(() => {
 		async function fetchPartners() {
 			try {
 				setLoading(true);
 				const { data } = await getData({
-					page: 1,
-					pageSize: 100,
+					[PAGE]: 1,
+					[PAGE_SIZE]: 100,
 					type: "partners",
 				});