diff --git a/src/categories/views/CategoryList/CategoryList.tsx b/src/categories/views/CategoryList/CategoryList.tsx index 18e9ea92e..923232b01 100644 --- a/src/categories/views/CategoryList/CategoryList.tsx +++ b/src/categories/views/CategoryList/CategoryList.tsx @@ -5,9 +5,11 @@ import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -49,12 +51,22 @@ interface CategoryListProps { export const CategoryList: React.FC = ({ params }) => { const navigate = useNavigator(); const paginate = usePaginator(); + const { isSelected, listElements, toggle, toggleAll, reset } = useBulkActions( params.ids ); const { updateListSettings, settings } = useListSettings( ListViews.CATEGORY_LIST ); + + usePaginationReset( + categoryListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const paginationState = createPaginationState(settings.rowNumber, params); diff --git a/src/collections/views/CollectionList/CollectionList.tsx b/src/collections/views/CollectionList/CollectionList.tsx index 3f170d6c1..411adea37 100644 --- a/src/collections/views/CollectionList/CollectionList.tsx +++ b/src/collections/views/CollectionList/CollectionList.tsx @@ -6,10 +6,12 @@ import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -53,6 +55,7 @@ interface CollectionListProps { export const CollectionList: React.FC = ({ params }) => { const navigate = useNavigator(); + const intl = useIntl(); const notify = useNotifier(); const paginate = usePaginator(); const { isSelected, listElements, reset, toggle, toggleAll } = useBulkActions( @@ -61,7 +64,14 @@ export const CollectionList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.COLLECTION_LIST ); - const intl = useIntl(); + + usePaginationReset( + collectionListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); const [ changeFilters, diff --git a/src/customers/views/CustomerList/CustomerList.tsx b/src/customers/views/CustomerList/CustomerList.tsx index 19ad1e9b0..7eb90db70 100644 --- a/src/customers/views/CustomerList/CustomerList.tsx +++ b/src/customers/views/CustomerList/CustomerList.tsx @@ -5,10 +5,12 @@ import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -60,6 +62,15 @@ export const CustomerList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.CUSTOMER_LIST ); + + usePaginationReset( + customerListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const paginationState = createPaginationState(settings.rowNumber, params); diff --git a/src/discounts/views/SaleList/SaleList.tsx b/src/discounts/views/SaleList/SaleList.tsx index 393f2c64c..5c9d7aa7a 100644 --- a/src/discounts/views/SaleList/SaleList.tsx +++ b/src/discounts/views/SaleList/SaleList.tsx @@ -7,10 +7,12 @@ import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; import { WindowTitle } from "@saleor/components/WindowTitle"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -62,6 +64,15 @@ export const SaleList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.SALES_LIST ); + + usePaginationReset( + saleListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const { availableChannels } = useAppChannel(false); const selectedChannel = availableChannels.find( diff --git a/src/discounts/views/VoucherList/VoucherList.tsx b/src/discounts/views/VoucherList/VoucherList.tsx index 1db4d3be5..80c538556 100644 --- a/src/discounts/views/VoucherList/VoucherList.tsx +++ b/src/discounts/views/VoucherList/VoucherList.tsx @@ -7,10 +7,12 @@ import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; import { WindowTitle } from "@saleor/components/WindowTitle"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -62,6 +64,15 @@ export const VoucherList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.VOUCHER_LIST ); + + usePaginationReset( + voucherListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const { availableChannels } = useAppChannel(false); diff --git a/src/hooks/usePaginationReset.ts b/src/hooks/usePaginationReset.ts new file mode 100644 index 000000000..4a237bc4d --- /dev/null +++ b/src/hooks/usePaginationReset.ts @@ -0,0 +1,9 @@ +import { useEffect } from "react"; + +import useNavigator from "./useNavigator"; + +export const usePaginationReset = (url: string, rowNumber: number) => { + const navigate = useNavigator(); + + useEffect(() => navigate(url, true), [rowNumber]); +}; diff --git a/src/navigation/views/MenuList/MenuList.tsx b/src/navigation/views/MenuList/MenuList.tsx index 1dc8aaecb..5b68e03cc 100644 --- a/src/navigation/views/MenuList/MenuList.tsx +++ b/src/navigation/views/MenuList/MenuList.tsx @@ -1,10 +1,12 @@ import { Button, DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import { configurationMenuUrl } from "@saleor/configuration"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -45,6 +47,15 @@ const MenuList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.NAVIGATION_LIST ); + + usePaginationReset( + menuListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const closeModal = () => diff --git a/src/orders/views/OrderDraftList/OrderDraftList.tsx b/src/orders/views/OrderDraftList/OrderDraftList.tsx index 4e807c76c..e8fc72231 100644 --- a/src/orders/views/OrderDraftList/OrderDraftList.tsx +++ b/src/orders/views/OrderDraftList/OrderDraftList.tsx @@ -8,10 +8,12 @@ import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; import { useShopLimitsQuery } from "@saleor/components/Shop/query"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -65,6 +67,15 @@ export const OrderDraftList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.DRAFT_LIST ); + + usePaginationReset( + orderDraftListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const handleCreateOrderCreateSuccess = (data: OrderDraftCreate) => { diff --git a/src/orders/views/OrderList/OrderList.tsx b/src/orders/views/OrderList/OrderList.tsx index 7c41455eb..6e862501a 100644 --- a/src/orders/views/OrderList/OrderList.tsx +++ b/src/orders/views/OrderList/OrderList.tsx @@ -5,9 +5,11 @@ import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; import { useShopLimitsQuery } from "@saleor/components/Shop/query"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -55,6 +57,15 @@ export const OrderList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.ORDER_LIST ); + + usePaginationReset( + orderListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const handleCreateOrderCreateSuccess = (data: OrderDraftCreate) => { diff --git a/src/pageTypes/views/PageTypeList/PageTypeList.tsx b/src/pageTypes/views/PageTypeList/PageTypeList.tsx index c6e7335a7..e393fda41 100644 --- a/src/pageTypes/views/PageTypeList/PageTypeList.tsx +++ b/src/pageTypes/views/PageTypeList/PageTypeList.tsx @@ -5,10 +5,12 @@ import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; import TypeDeleteWarningDialog from "@saleor/components/TypeDeleteWarningDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -63,6 +65,14 @@ export const PageTypeList: React.FC = ({ params }) => { const intl = useIntl(); const { settings } = useListSettings(ListViews.PAGES_LIST); + usePaginationReset( + pageTypeListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const paginationState = createPaginationState(settings.rowNumber, params); const queryVariables = React.useMemo( () => ({ @@ -70,7 +80,7 @@ export const PageTypeList: React.FC = ({ params }) => { filter: getFilterVariables(params), sort: getSortQueryVariables(params) }), - [params] + [params, settings.rowNumber] ); const { data, loading, refetch } = usePageTypeListQuery({ displayLoader: true, diff --git a/src/pages/views/PageList/PageList.tsx b/src/pages/views/PageList/PageList.tsx index bb108d0c8..b3f238022 100644 --- a/src/pages/views/PageList/PageList.tsx +++ b/src/pages/views/PageList/PageList.tsx @@ -1,11 +1,13 @@ import { Button, DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import { configurationMenuUrl } from "@saleor/configuration"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -46,6 +48,15 @@ export const PageList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.PAGES_LIST ); + + usePaginationReset( + pageListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const paginationState = createPaginationState(settings.rowNumber, params); diff --git a/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx b/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx index 84a196517..38253143d 100644 --- a/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx +++ b/src/permissionGroups/views/PermissionGroupList/PermissionGroupList.tsx @@ -1,8 +1,10 @@ +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import { configurationMenuUrl } from "@saleor/configuration"; import { PermissionGroupErrorFragment } from "@saleor/fragments/types/PermissionGroupErrorFragment"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -44,13 +46,21 @@ export const PermissionGroupList: React.FC = ({ ListViews.STAFF_MEMBERS_LIST ); + usePaginationReset( + permissionGroupListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const paginationState = createPaginationState(settings.rowNumber, params); const queryVariables = React.useMemo( () => ({ ...paginationState, sort: getSortQueryVariables(params) }), - [params] + [params, settings.rowNumber] ); const { data, loading, refetch } = usePermissionGroupListQuery({ displayLoader: true, @@ -98,6 +108,7 @@ export const PermissionGroupList: React.FC = ({ const [permissionGroupDelete] = usePermissionGroupDelete({ onCompleted: handleDeleteSuccess }); + return ( <> = ({ params }) => { ListViews.PLUGINS_LIST ); + usePaginationReset( + pluginListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const paginationState = createPaginationState(settings.rowNumber, params); const queryVariables = React.useMemo( () => ({ @@ -56,7 +66,7 @@ export const PluginsList: React.FC = ({ params }) => { filter: getFilterVariables(params), sort: getSortQueryVariables(params) }), - [params] + [params, settings.rowNumber] ); const { data, loading } = usePluginsListQuery({ displayLoader: true, diff --git a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx index 8f6956c0c..e4cf6bf6f 100644 --- a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx +++ b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx @@ -4,10 +4,12 @@ import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { SaveFilterTabDialogFormData } from "@saleor/components/SaveFilterTabDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -67,6 +69,14 @@ export const ProductTypeList: React.FC = ({ params }) => { const { settings } = useListSettings(ListViews.PRODUCT_LIST); const intl = useIntl(); + usePaginationReset( + productTypeListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const paginationState = createPaginationState(settings.rowNumber, params); const queryVariables = React.useMemo( () => ({ @@ -74,7 +84,7 @@ export const ProductTypeList: React.FC = ({ params }) => { filter: getFilterVariables(params), sort: getSortQueryVariables(params) }), - [params] + [params, settings.rowNumber] ); const { data, loading, refetch } = useProductTypeListQuery({ displayLoader: true, diff --git a/src/products/views/ProductList/ProductList.tsx b/src/products/views/ProductList/ProductList.tsx index 27b3298ff..d1af04c76 100644 --- a/src/products/views/ProductList/ProductList.tsx +++ b/src/products/views/ProductList/ProductList.tsx @@ -19,6 +19,7 @@ import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -94,6 +95,15 @@ export const ProductList: React.FC = ({ params }) => { const { updateListSettings, settings } = useListSettings( ListViews.PRODUCT_LIST ); + + usePaginationReset( + productListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const { data: initialFilterAttributes @@ -177,19 +187,6 @@ export const ProductList: React.FC = ({ params }) => { ProductListUrlQueryParams >(navigate, productListUrl, params); - // Reset pagination - React.useEffect( - () => - navigate( - productListUrl({ - ...params, - ...DEFAULT_INITIAL_PAGINATION_DATA - }), - true - ), - [settings.rowNumber] - ); - const tabs = getFilterTabs(); const currentTab = getFiltersCurrentTab(params, tabs); diff --git a/src/shipping/views/ShippingZonesList.tsx b/src/shipping/views/ShippingZonesList.tsx index ae81a565f..bdc107964 100644 --- a/src/shipping/views/ShippingZonesList.tsx +++ b/src/shipping/views/ShippingZonesList.tsx @@ -1,11 +1,13 @@ import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import { configurationMenuUrl } from "@saleor/configuration"; import useBulkActions from "@saleor/hooks/useBulkActions"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -53,10 +55,26 @@ export const ShippingZonesList: React.FC = ({ const { updateListSettings, settings } = useListSettings( ListViews.SHIPPING_METHODS_LIST ); + + usePaginationReset( + shippingZonesListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const intl = useIntl(); const paginationState = createPaginationState(settings.rowNumber, params); + const queryVariables = React.useMemo( + () => ({ + ...paginationState + }), + [params, settings.rowNumber] + ); + const [openModal, closeModal] = createDialogActionHandlers< ShippingZonesListUrlDialog, ShippingZonesListUrlQueryParams @@ -64,7 +82,7 @@ export const ShippingZonesList: React.FC = ({ const { data, loading, refetch } = useShippingZoneList({ displayLoader: true, - variables: paginationState + variables: queryVariables }); const [deleteShippingZone, deleteShippingZoneOpts] = useShippingZoneDelete({ @@ -116,6 +134,7 @@ export const ShippingZonesList: React.FC = ({ paginationState, params ); + return ( <> = ({ params }) => { ); const intl = useIntl(); + usePaginationReset( + staffListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const paginationState = createPaginationState(settings.rowNumber, params); const queryVariables = React.useMemo( () => ({ diff --git a/src/warehouses/views/WarehouseList/WarehouseList.tsx b/src/warehouses/views/WarehouseList/WarehouseList.tsx index 8fe3fa3e2..5d1c2c110 100644 --- a/src/warehouses/views/WarehouseList/WarehouseList.tsx +++ b/src/warehouses/views/WarehouseList/WarehouseList.tsx @@ -4,10 +4,12 @@ import SaveFilterTabDialog, { } from "@saleor/components/SaveFilterTabDialog"; import { useShopLimitsQuery } from "@saleor/components/Shop/query"; import { WindowTitle } from "@saleor/components/WindowTitle"; +import { DEFAULT_INITIAL_PAGINATION_DATA } from "@saleor/config"; import { configurationMenuUrl } from "@saleor/configuration"; import useListSettings from "@saleor/hooks/useListSettings"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; +import { usePaginationReset } from "@saleor/hooks/usePaginationReset"; import usePaginator, { createPaginationState } from "@saleor/hooks/usePaginator"; @@ -57,6 +59,14 @@ const WarehouseList: React.FC = ({ params }) => { ); const intl = useIntl(); + usePaginationReset( + warehouseListUrl({ + ...params, + ...DEFAULT_INITIAL_PAGINATION_DATA + }), + settings.rowNumber + ); + const paginationState = createPaginationState(settings.rowNumber, params); const queryVariables = React.useMemo( () => ({