From 53140053451302c5a49c181cb05cebcd963e1d0c Mon Sep 17 00:00:00 2001 From: RekHoto Date: Sat, 23 Sep 2023 13:00:14 +0400 Subject: [PATCH] status filter fix --- src/api.js | 6 ++---- src/modules/Table/PendingTable/usePendingTableData.js | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/api.js b/src/api.js index ca5b919..db49ee2 100644 --- a/src/api.js +++ b/src/api.js @@ -102,7 +102,6 @@ export const importPoints = async (id) => { }; export const useGetTotalInitialPointsCount = () => { - const { isImportMode } = useMode(); const dbTable = useDbTableName(); const { updateCounter } = useUpdateLayerCounter(); return useQuery( @@ -112,7 +111,7 @@ export const useGetTotalInitialPointsCount = () => { page: 1, page_size: 1, }); - if (!isImportMode) params.append("status[]", STATUSES.pending); + params.append("status[]", STATUSES.pending); return await getPoints(params, null, dbTable); }, @@ -122,7 +121,6 @@ export const useGetTotalInitialPointsCount = () => { export const useGetFilteredPendingPointsCount = (isMerge) => { const { filters, ranges } = usePendingPointsFilters(); - const { isImportMode } = useMode(); const { updateCounter } = useUpdateLayerCounter(); const { categories, @@ -140,7 +138,7 @@ export const useGetFilteredPendingPointsCount = (isMerge) => { "categories[]": categories, "included[]": includedIds, }); - if (!isImportMode) params.append("status[]", STATUSES.pending); + params.append("status[]", STATUSES.pending); appendFiltersInUse(params, filters, ranges); diff --git a/src/modules/Table/PendingTable/usePendingTableData.js b/src/modules/Table/PendingTable/usePendingTableData.js index a6d5075..6f86fbe 100644 --- a/src/modules/Table/PendingTable/usePendingTableData.js +++ b/src/modules/Table/PendingTable/usePendingTableData.js @@ -4,7 +4,6 @@ import { useMergeTableData } from "../useMergeTableData"; import { STATUSES } from "../../../config"; import { usePendingPointsFilters } from "../../../stores/usePendingPointsFilters"; import { appendFiltersInUse } from "../../../utils.js"; -import { useMode } from "../../../stores/useMode.js"; import { useUpdateLayerCounter } from "../../../stores/useUpdateLayerCounter.js"; export const usePendingTableData = (page, resetPage, pageSize, setPageSize, sort) => { @@ -16,7 +15,6 @@ export const usePendingTableData = (page, resetPage, pageSize, setPageSize, sort } = filters; const dbTable = useDbTableName(); - const { isImportMode } = useMode(); const getParams = () => { const params = new URLSearchParams({ @@ -27,7 +25,7 @@ export const usePendingTableData = (page, resetPage, pageSize, setPageSize, sort }); appendFiltersInUse(params, filters, ranges); - if (!isImportMode) params.append("status[]", [STATUSES.pending, STATUSES.cancelled].join(",")) + params.append("status[]", [STATUSES.pending, STATUSES.cancelled].join(",")) return params; }