datastake-daf 0.6.367 → 0.6.368

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

@@ -1,281 +1,321 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { getDefaultActiveFilters } from '../utils/filters';
-import { StorageManager } from '../../helpers/StorageManager';
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { getDefaultActiveFilters } from "../utils/filters";
+import { StorageManager } from "../../helpers/StorageManager";
+
+const NEW_PAGINATION_TITLES = ["nashiriki"];
 
 export const useFilters = ({
-  view,
-  module,
-  filtersConfig,
-  goTo,
-  location,
-  selectFiltersConfig,
-  defaultPageSize = 20,
-  defaultActiveFilters,
-  defaultUrlParams = {},
-  doPagination = true,
-  getRedirectLink,
+	view,
+	module,
+	filtersConfig,
+	goTo,
+	location,
+	selectFiltersConfig,
+	defaultPageSize = 20,
+	defaultActiveFilters,
+	defaultUrlParams = {},
+	doPagination = true,
+	getRedirectLink,
 }) => {
-  const params = useMemo(() => new URLSearchParams(location.search), [location.search]);
-  const [activeFilters, setActiveFilters] = useState(
-    defaultActiveFilters || getDefaultActiveFilters(params, selectFiltersConfig, defaultPageSize, defaultUrlParams, doPagination)
-  );
-  const [pagination, setPagination] = useState(
-    defaultActiveFilters ? {
-      current: defaultActiveFilters.page || 1,
-      pageSize: defaultActiveFilters.pageSize || defaultPageSize,
-      showSizeChanger: true,
-    } : {
-      current: !isNaN(Number(params.get('page'))) ? Number(params.get('page')) || 1 : 1,
-      pageSize: !isNaN(Number(params.get('pageSize'))) ? Number(params.get('pageSize')) || defaultPageSize : defaultPageSize,
-      showSizeChanger: true,
-    });
-
-  useEffect(() => {
-    if (defaultActiveFilters) {
-      setPagination((prev) => ({
-        ...prev,
-        current: defaultActiveFilters.page || 1,
-        pageSize: defaultActiveFilters.pageSize || defaultPageSize,
-        showSizeChanger: true,
-      }));
-      return;
-    }
-    setPagination((prev) => ({
-      ...prev,
-      current: !isNaN(Number(params.get('page'))) ? Number(params.get('page')) || 1 : 1,
-      pageSize: !isNaN(Number(params.get('pageSize'))) ? Number(params.get('pageSize')) || defaultPageSize : defaultPageSize,
-      showSizeChanger: true,
-    }));
-  }, []);
-
-  const updateQuery = useCallback((filters, page) => {
-    const qs = Object.keys(filters)
-      .filter((key) => {
-        if (!doPagination) {
-          return !!filters[key] && key !== 'page' && key !== 'pageSize';
-        }
-
-        return !!filters[key];
-      })
-      .map(key => {
-        if (filters[key] && typeof filters[key] === 'object') {
-          return `${key}=${JSON.stringify(filters[key])}`;
-        }
-        return `${key}=${filters[key]}`;
-      })
-      .join('&');
-
-    if (view) {
-      if (typeof getRedirectLink === 'function') {
-        goTo(getRedirectLink(
-          view === 'mine-monitoring' 
-            ? (qs !== '' ? `${location.pathname}?${qs}`
-                : doPagination ? `${location.pathname}?page=${page}`
-                  : location.pathname)
-            : (qs !== '' ? `${`/app/${view}`}?${qs}`
-                : doPagination ? `${`/app/${view}`}?page=${page}`
-                  : `${`/app/${view}`}`)
-        ));
-        return;
-      }
-
-      if (view === 'mine-monitoring') {
-        goTo(
-          qs !== '' ? `${location.pathname}?${qs}`
-            : doPagination ? `${location.pathname}?page=${page}`
-              : location.pathname);
-      } else {
-        goTo(
-          qs !== '' ? `${`/app/${module}/${view}`}?${qs}`
-            : doPagination ? `${`/app/${module}/${view}`}?page=${page}`
-              : `${`/app/${module}/${view}`}`);
-      }
-    }
-  }, [module, view, location.pathname]); // Updated dependency array
-
-  const defaultFilters = useMemo(() => {
-    const def = {};
-    Object.keys(selectFiltersConfig).forEach((key) => {
-      if (activeFilters[key]) {
-        def[key] = activeFilters[key];
-      }
-    });
-    return def;
-  }, [activeFilters, selectFiltersConfig]);
-
-  const newFiltersConfig = useMemo(() => {
-    const o = filtersConfig;
-    Object.keys(filtersConfig).forEach((key) => {
-      if (params.has(key)) {
-        o[key] = params.get(key);
-      }
-    });
-    return o;
-  }, [params, filtersConfig]);
-
-  useEffect(() => {
-    const filteredFilters = Object.keys(activeFilters).reduce((all, key) => {
-      if (activeFilters[key]) {
-        all[key] = activeFilters[key];
-      }
-      return all;
-    }, {});
-
-    const filters = StorageManager.saveFilters(module, view, { ...filteredFilters });
-
-    if (!filters.pageSize) {
-      filters.page = 1;
-      filters.pageSize = pagination.pageSize;
-    }
-
-    updateQuery(filters, 1);
-  }, [activeFilters]);
-
-  const onFiltersChange = useCallback((filters) => {
-    const filteredFilters = Object.keys(filters).reduce((all, key) => {
-      const conf = selectFiltersConfig[key];
-      if (conf) {
-        const { show } = conf;
-        if (typeof show === 'function') {
-          if (show(filters)) {
-            return all;
-          }
-        }
-      }
-
-      if (Array.isArray(filters[key]) && !filters[key].length) {
-        all[key] = undefined;
-        return all;
-      }
-
-      all[key] = filters[key];
-      return all;
-    }, {});
-
-    setActiveFilters((prev) => {
-      const o = { ...prev };
-      Object.keys(o).forEach((k) => {
-        if (Object.keys(selectFiltersConfig).includes(k) || k === 'authorId') {
-          delete o[k];
-        }
-      });
-      Object.entries(filteredFilters).forEach(([k, v]) => {
-        o[k] = v;
-      });
-
-      if (doPagination) {
-        o.page = 1;
-      }
-
-      return o;
-    });
-    setPagination((prev) => ({ ...prev, current: 1 }));
-  }, [selectFiltersConfig]);
-
-  const onTableChange = (page, f, sorter) => {
-    const { sortBy, sortDir } = activeFilters;
-    const { columnKey, order } = sorter || {};
-
-    let fs = {
-      ...activeFilters,
-      page: page.pageSize !== activeFilters.pageSize ? 1 : page.current,
-      pageSize: page.pageSize || defaultPageSize,
-    };
-
-    if (sorter && (columnKey !== sortBy || order !== sortDir)) {
-      fs.page = 1;
-    }
-
-    if (order) {
-      fs = { ...fs, sortDir: order, sortBy: columnKey };
-    } else if (sortBy || sortDir) {
-      fs = Object.keys(fs).reduce((all, key) => {
-        if (key !== 'sortDir' && key !== 'sortBy') {
-          if (key === 'page' || key === 'pageSize') {
-            all[key] = fs[key];
-          } else {
-            all[key] = activeFilters[key];
-          }
-        }
-        return all;
-      }, {});
-    }
-
-    setActiveFilters(fs);
-
-    if (isNaN(page.current)) {
-      page.current = 1;
-    }
-
-    const filters = StorageManager.saveFilters(module, view, { page: page.current }, true);
-
-    updateQuery(filters, page.current);
-    setPagination((prev) => ({
-      ...prev,
-      current: fs.page,
-      pageSize: fs.pageSize || defaultPageSize
-    }));
-  };
-
-  const onSearch = useCallback((activeFilter, value) => {
-    setActiveFilters((prev) => ({
-      ...prev,
-      page: 1,
-      searchParams: activeFilter,
-      search: value,
-    }));
-    setPagination((prev) => ({ ...prev, current: 1 }));
-  }, []);
-
-  const totalPages = useMemo(() => {
-    return Math.ceil(pagination.total / pagination.pageSize);
-  }, [pagination]);
-
-  const canGoPrev = useMemo(() => pagination.current !== 1, [pagination]);
-  const canGoNext = useMemo(() => pagination.current !== totalPages && totalPages, [pagination, totalPages]);
-
-  const goPrev = () => {
-    if (!canGoPrev) {
-      return;
-    }
-
-    const { sortDir, sortBy } = activeFilters;
-
-    onTableChange(
-      { ...pagination, current: pagination.current - 1 },
-      undefined,
-      sortBy && sortDir ? { sortBy, sortDir } : undefined
-    );
-  };
-
-  const goNext = () => {
-    if (!canGoNext) {
-      return;
-    }
-
-    const { sortDir, sortBy } = activeFilters;
-
-    onTableChange(
-      { ...pagination, current: pagination.current + 1 },
-      undefined,
-      sortBy && sortDir ? { columnKey: sortBy, order: sortDir } : undefined
-    );
-  };
-
-  return {
-    newFiltersConfig,
-    totalPages,
-    canGoNext,
-    canGoPrev,
-    goPrev,
-    goNext,
-    pagination,
-    activeFilters,
-    onSearch,
-    defaultFilters,
-    onTableChange,
-    setPagination,
-    onFiltersChange,
-    setActiveFilters,
-  };
+	const PAGE = NEW_PAGINATION_TITLES.includes(module) ? "skip" : "page";
+	const PAGE_SIZE = NEW_PAGINATION_TITLES.includes(module) ? "take" : "pageSize";
+
+	const params = useMemo(() => new URLSearchParams(location.search), [location.search]);
+	const [activeFilters, setActiveFilters] = useState(
+		defaultActiveFilters ||
+			getDefaultActiveFilters(
+				params,
+				selectFiltersConfig,
+				defaultPageSize,
+				defaultUrlParams,
+				doPagination,
+			),
+	);
+	const [pagination, setPagination] = useState(
+		defaultActiveFilters
+			? {
+					current: defaultActiveFilters[PAGE] || 1,
+					[PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
+					showSizeChanger: true,
+			  }
+			: {
+					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,
+			  },
+	);
+
+	useEffect(() => {
+		if (defaultActiveFilters) {
+			setPagination((prev) => ({
+				...prev,
+				current: defaultActiveFilters[PAGE] || 1,
+				[PAGE_SIZE]: defaultActiveFilters[PAGE_SIZE] || defaultPageSize,
+				showSizeChanger: true,
+			}));
+			return;
+		}
+		setPagination((prev) => ({
+			...prev,
+			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,
+		}));
+	}, []);
+
+	const updateQuery = useCallback(
+		(filters, page) => {
+			const qs = Object.keys(filters)
+				.filter((key) => {
+					if (!doPagination) {
+						return !!filters[key] && key !== PAGE && key !== PAGE_SIZE;
+					}
+
+					return !!filters[key];
+				})
+				.map((key) => {
+					if (filters[key] && typeof filters[key] === "object") {
+						return `${key}=${JSON.stringify(filters[key])}`;
+					}
+					return `${key}=${filters[key]}`;
+				})
+				.join("&");
+
+			if (view) {
+				if (typeof getRedirectLink === "function") {
+					goTo(
+						getRedirectLink(
+							view === "mine-monitoring"
+								? qs !== ""
+									? `${location.pathname}?${qs}`
+									: doPagination
+									? `${location.pathname}?${PAGE}=${page}`
+									: location.pathname
+								: qs !== ""
+								? `${`/app/${view}`}?${qs}`
+								: doPagination
+								? `${`/app/${view}`}?${PAGE}=${page}`
+								: `${`/app/${view}`}`,
+						),
+					);
+					return;
+				}
+
+				if (view === "mine-monitoring") {
+					goTo(
+						qs !== ""
+							? `${location.pathname}?${qs}`
+							: doPagination
+							? `${location.pathname}?${PAGE}=${page}`
+							: location.pathname,
+					);
+				} else {
+					goTo(
+						qs !== ""
+							? `${`/app/${module}/${view}`}?${qs}`
+							: doPagination
+							? `${`/app/${module}/${view}`}?${PAGE}=${page}`
+							: `${`/app/${module}/${view}`}`,
+					);
+				}
+			}
+		},
+		[module, view, location.pathname],
+	); // Updated dependency array
+
+	const defaultFilters = useMemo(() => {
+		const def = {};
+		Object.keys(selectFiltersConfig).forEach((key) => {
+			if (activeFilters[key]) {
+				def[key] = activeFilters[key];
+			}
+		});
+		return def;
+	}, [activeFilters, selectFiltersConfig]);
+
+	const newFiltersConfig = useMemo(() => {
+		const o = filtersConfig;
+		Object.keys(filtersConfig).forEach((key) => {
+			if (params.has(key)) {
+				o[key] = params.get(key);
+			}
+		});
+		return o;
+	}, [params, filtersConfig]);
+
+	useEffect(() => {
+		const filteredFilters = Object.keys(activeFilters).reduce((all, key) => {
+			if (activeFilters[key]) {
+				all[key] = activeFilters[key];
+			}
+			return all;
+		}, {});
+
+		const filters = StorageManager.saveFilters(module, view, { ...filteredFilters });
+
+		if (!filters[PAGE_SIZE]) {
+			filters[PAGE] = 1;
+			filters[PAGE_SIZE] = pagination[PAGE_SIZE];
+		}
+
+		updateQuery(filters, 1);
+	}, [activeFilters]);
+
+	const onFiltersChange = useCallback(
+		(filters) => {
+			const filteredFilters = Object.keys(filters).reduce((all, key) => {
+				const conf = selectFiltersConfig[key];
+				if (conf) {
+					const { show } = conf;
+					if (typeof show === "function") {
+						if (show(filters)) {
+							return all;
+						}
+					}
+				}
+
+				if (Array.isArray(filters[key]) && !filters[key].length) {
+					all[key] = undefined;
+					return all;
+				}
+
+				all[key] = filters[key];
+				return all;
+			}, {});
+
+			setActiveFilters((prev) => {
+				const o = { ...prev };
+				Object.keys(o).forEach((k) => {
+					if (Object.keys(selectFiltersConfig).includes(k) || k === "authorId") {
+						delete o[k];
+					}
+				});
+				Object.entries(filteredFilters).forEach(([k, v]) => {
+					o[k] = v;
+				});
+
+				if (doPagination) {
+					o[PAGE] = 1;
+				}
+
+				return o;
+			});
+			setPagination((prev) => ({ ...prev, current: 1 }));
+		},
+		[selectFiltersConfig],
+	);
+
+	const onTableChange = (page, f, sorter) => {
+		const { sortBy, sortDir } = activeFilters;
+		const { columnKey, order } = sorter || {};
+
+		let fs = {
+			...activeFilters,
+			[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;
+		}
+
+		if (order) {
+			fs = { ...fs, sortDir: order, sortBy: columnKey };
+		} else if (sortBy || sortDir) {
+			fs = Object.keys(fs).reduce((all, key) => {
+				if (key !== "sortDir" && key !== "sortBy") {
+					if (key === PAGE || key === PAGE_SIZE) {
+						all[key] = fs[key];
+					} else {
+						all[key] = activeFilters[key];
+					}
+				}
+				return all;
+			}, {});
+		}
+
+		setActiveFilters(fs);
+
+		if (isNaN(page.current)) {
+			page.current = 1;
+		}
+
+		const filters = StorageManager.saveFilters(module, view, { [PAGE]: page.current }, true);
+
+		updateQuery(filters, page.current);
+		setPagination((prev) => ({
+			...prev,
+			current: fs[PAGE],
+			[PAGE_SIZE]: fs[PAGE_SIZE] || defaultPageSize,
+		}));
+	};
+
+	const onSearch = useCallback((activeFilter, value) => {
+		setActiveFilters((prev) => ({
+			...prev,
+			[PAGE]: 1,
+			searchParams: activeFilter,
+			search: value,
+		}));
+		setPagination((prev) => ({ ...prev, current: 1 }));
+	}, []);
+
+	const totalPages = useMemo(() => {
+		return Math.ceil(pagination.total / pagination[PAGE_SIZE]);
+	}, [pagination]);
+
+	const canGoPrev = useMemo(() => pagination.current !== 1, [pagination]);
+	const canGoNext = useMemo(
+		() => pagination.current !== totalPages && totalPages,
+		[pagination, totalPages],
+	);
+
+	const goPrev = () => {
+		if (!canGoPrev) {
+			return;
+		}
+
+		const { sortDir, sortBy } = activeFilters;
+
+		onTableChange(
+			{ ...pagination, current: pagination.current - 1 },
+			undefined,
+			sortBy && sortDir ? { sortBy, sortDir } : undefined,
+		);
+	};
+
+	const goNext = () => {
+		if (!canGoNext) {
+			return;
+		}
+
+		const { sortDir, sortBy } = activeFilters;
+
+		onTableChange(
+			{ ...pagination, current: pagination.current + 1 },
+			undefined,
+			sortBy && sortDir ? { columnKey: sortBy, order: sortDir } : undefined,
+		);
+	};
+
+	return {
+		newFiltersConfig,
+		totalPages,
+		canGoNext,
+		canGoPrev,
+		goPrev,
+		goNext,
+		pagination,
+		activeFilters,
+		onSearch,
+		defaultFilters,
+		onTableChange,
+		setPagination,
+		onFiltersChange,
+		setActiveFilters,
+	};
 };

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