From fcace4213cc469a9c1ba098d7351a37ad115edd1 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Sun, 26 Sep 2021 14:02:26 +0200 Subject: [PATCH] feat: change default page size pagination. --- src/components/Pagination.js | 2 +- src/hooks/query/customers.js | 2 +- src/hooks/query/estimates.js | 2 +- src/hooks/query/exchangeRates.js | 4 ++-- src/hooks/query/expenses.js | 2 +- src/hooks/query/inventoryAdjustments.js | 2 +- src/hooks/query/invoices.js | 2 +- src/hooks/query/items.js | 18 ++++++++++-------- src/hooks/query/paymentReceives.js | 2 +- src/store/Bills/bills.reducer.js | 2 +- src/store/Estimate/estimates.reducer.js | 11 +++-------- src/store/ExchangeRate/exchange.reducer.js | 2 +- src/store/Invoice/invoices.reducer.js | 15 +++++---------- src/store/PaymentMades/paymentMades.reducer.js | 2 +- .../PaymentReceives/paymentReceives.reducer.js | 11 +++-------- src/store/accounts/accounts.reducer.js | 7 +++---- src/store/customers/customers.reducer.js | 2 +- src/store/expenses/expenses.reducer.js | 4 ++-- .../inventoryAdjustment.reducer.js | 2 +- src/store/items/items.reducer.js | 2 +- .../manualJournals/manualJournals.reducers.js | 4 ++-- src/store/receipts/receipts.reducer.js | 2 +- src/store/vendors/vendors.reducer.js | 2 +- 23 files changed, 45 insertions(+), 59 deletions(-) diff --git a/src/components/Pagination.js b/src/components/Pagination.js index b3e16ab36..c3e634560 100644 --- a/src/components/Pagination.js +++ b/src/components/Pagination.js @@ -86,7 +86,7 @@ function Pagination({ currentPage, total, size, - pageSizesOptions = [5, 12, 20, 30, 50, 75, 100, 150], + pageSizesOptions = [20, 30, 50, 75, 100, 150], onPageChange, onPageSizeChange, }) { diff --git a/src/hooks/query/customers.js b/src/hooks/query/customers.js index 630892453..3e397972a 100644 --- a/src/hooks/query/customers.js +++ b/src/hooks/query/customers.js @@ -5,7 +5,7 @@ import useApiRequest from '../useRequest'; import t from './types'; const defaultPagination = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; diff --git a/src/hooks/query/estimates.js b/src/hooks/query/estimates.js index 7b49349d6..26b4ecc63 100644 --- a/src/hooks/query/estimates.js +++ b/src/hooks/query/estimates.js @@ -86,7 +86,7 @@ export function useEstimates(query, props) { estimates: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, }, filterMeta: {}, diff --git a/src/hooks/query/exchangeRates.js b/src/hooks/query/exchangeRates.js index 7f7435d37..7a0cd1efe 100644 --- a/src/hooks/query/exchangeRates.js +++ b/src/hooks/query/exchangeRates.js @@ -5,7 +5,7 @@ import { transformPagination } from 'utils'; import useApiRequest from '../useRequest'; const defaultPagination = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; @@ -82,7 +82,7 @@ export function useExchangeRates(query, props) { exchangesRates: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, }, filterMeta: {}, diff --git a/src/hooks/query/expenses.js b/src/hooks/query/expenses.js index ac5a3a24e..571f31c36 100644 --- a/src/hooks/query/expenses.js +++ b/src/hooks/query/expenses.js @@ -5,7 +5,7 @@ import { transformPagination } from 'utils'; import t from './types'; const defaultPagination = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; diff --git a/src/hooks/query/inventoryAdjustments.js b/src/hooks/query/inventoryAdjustments.js index b5b2f0b08..c2382b821 100644 --- a/src/hooks/query/inventoryAdjustments.js +++ b/src/hooks/query/inventoryAdjustments.js @@ -76,7 +76,7 @@ export function useInventoryAdjustments(query, props) { transactions: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, pagesCount: 0, }, diff --git a/src/hooks/query/invoices.js b/src/hooks/query/invoices.js index 9d639d2a6..e397fd509 100644 --- a/src/hooks/query/invoices.js +++ b/src/hooks/query/invoices.js @@ -110,7 +110,7 @@ export function useInvoices(query, props) { invoices: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, }, filterMeta: {}, diff --git a/src/hooks/query/items.js b/src/hooks/query/items.js index ebff0a27d..aa5c60559 100644 --- a/src/hooks/query/items.js +++ b/src/hooks/query/items.js @@ -5,7 +5,7 @@ import useApiRequest from '../useRequest'; import t from './types'; const DEFAULT_PAGINATION = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; @@ -75,7 +75,7 @@ export function useDeleteItem(props) { /** * Activate the given item. */ - export function useActivateItem(props) { +export function useActivateItem(props) { const queryClient = useQueryClient(); const apiRequest = useApiRequest(); @@ -114,7 +114,9 @@ export function useInactivateItem(props) { const transformItemsResponse = (response) => { return { items: response.data.items, - pagination: transformPagination(transformResponse(response.data.pagination)), + pagination: transformPagination( + transformResponse(response.data.pagination), + ), filterMeta: transformResponse(response.data.filter_meta), }; }; @@ -137,8 +139,8 @@ export function useItems(query, props) { pagination: DEFAULT_PAGINATION, filterMeta: {}, }, - ...props - } + ...props, + }, ); } @@ -149,7 +151,7 @@ export function useRefreshItems() { refresh: () => { queryClient.invalidateQueries(t.ITEMS); }, - } + }; } /** @@ -166,7 +168,7 @@ export function useItem(id, props) { { select: (response) => response.data.item, defaultData: {}, - ...props + ...props, }, ); -} \ No newline at end of file +} diff --git a/src/hooks/query/paymentReceives.js b/src/hooks/query/paymentReceives.js index b206e5a3d..b395ab053 100644 --- a/src/hooks/query/paymentReceives.js +++ b/src/hooks/query/paymentReceives.js @@ -44,7 +44,7 @@ export function usePaymentReceives(query, props) { select: transformPaymentReceives, defaultData: { paymentReceives: [], - pagination: { page: 1, pageSize: 12, total: 0 }, + pagination: { page: 1, pageSize: 20, total: 0 }, filterMeta: {}, }, ...props, diff --git a/src/store/Bills/bills.reducer.js b/src/store/Bills/bills.reducer.js index 272f231d2..3311c6c6a 100644 --- a/src/store/Bills/bills.reducer.js +++ b/src/store/Bills/bills.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, diff --git a/src/store/Estimate/estimates.reducer.js b/src/store/Estimate/estimates.reducer.js index 616e97c8e..bef9b8925 100644 --- a/src/store/Estimate/estimates.reducer.js +++ b/src/store/Estimate/estimates.reducer.js @@ -1,13 +1,11 @@ import { createReducer } from '@reduxjs/toolkit'; import { persistReducer, purgeStoredState } from 'redux-persist'; import storage from 'redux-persist/lib/storage'; -import { - createTableStateReducers, -} from 'store/tableState.reducer'; +import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -33,7 +31,4 @@ const reducerInstance = createReducer(initialState, { }, }); -export default persistReducer( - CONFIG, - reducerInstance, -); +export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/ExchangeRate/exchange.reducer.js b/src/store/ExchangeRate/exchange.reducer.js index 3b746a127..857ea7dcc 100644 --- a/src/store/ExchangeRate/exchange.reducer.js +++ b/src/store/ExchangeRate/exchange.reducer.js @@ -3,7 +3,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; const initialState = { tableState: { - pageSize: 12, + pageSize: 20, pageIndex: 0, }, }; diff --git a/src/store/Invoice/invoices.reducer.js b/src/store/Invoice/invoices.reducer.js index 958815d75..1d7aeec4d 100644 --- a/src/store/Invoice/invoices.reducer.js +++ b/src/store/Invoice/invoices.reducer.js @@ -1,13 +1,11 @@ import { createReducer } from '@reduxjs/toolkit'; import { persistReducer, purgeStoredState } from 'redux-persist'; import storage from 'redux-persist/lib/storage'; -import { - createTableStateReducers, -} from 'store/tableState.reducer'; +import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -27,13 +25,10 @@ const CONFIG = { const reducerInstance = createReducer(initialState, { ...createTableStateReducers('INVOICES', defaultTableQuery), - + [t.RESET]: () => { purgeStoredState(CONFIG); - } + }, }); -export default persistReducer( - CONFIG, - reducerInstance, -); +export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/PaymentMades/paymentMades.reducer.js b/src/store/PaymentMades/paymentMades.reducer.js index 98aba95bf..44400c74b 100644 --- a/src/store/PaymentMades/paymentMades.reducer.js +++ b/src/store/PaymentMades/paymentMades.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], sortBy: [], diff --git a/src/store/PaymentReceives/paymentReceives.reducer.js b/src/store/PaymentReceives/paymentReceives.reducer.js index ef9fb2c04..0c6dece76 100644 --- a/src/store/PaymentReceives/paymentReceives.reducer.js +++ b/src/store/PaymentReceives/paymentReceives.reducer.js @@ -1,13 +1,11 @@ import { createReducer } from '@reduxjs/toolkit'; import { persistReducer, purgeStoredState } from 'redux-persist'; import storage from 'redux-persist/lib/storage'; -import { - createTableStateReducers, -} from 'store/tableState.reducer'; +import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -33,7 +31,4 @@ const reducerInstance = createReducer(initialState, { }, }); -export default persistReducer( - CONFIG, - reducerInstance, -); +export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/accounts/accounts.reducer.js b/src/store/accounts/accounts.reducer.js index 755765a68..b19686f18 100644 --- a/src/store/accounts/accounts.reducer.js +++ b/src/store/accounts/accounts.reducer.js @@ -4,9 +4,8 @@ import storage from 'redux-persist/lib/storage'; import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; - -export const defaultTableQuery = { - pageSize: 12, +export const defaultTableQuery = { + pageSize: 20, pageIndex: 0, filterRoles: [], }; @@ -28,7 +27,7 @@ const reducerInstance = createReducer(initialState, { [t.RESET]: () => { purgeStoredState(CONFIG); - } + }, }); export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/customers/customers.reducer.js b/src/store/customers/customers.reducer.js index 3b48816a7..4a1f14c33 100644 --- a/src/store/customers/customers.reducer.js +++ b/src/store/customers/customers.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; // Default table query state. export const defaultTableQueryState = { - pageSize: 12, + pageSize: 20, pageIndex: 0, inactiveMode: false, filterRoles: [], diff --git a/src/store/expenses/expenses.reducer.js b/src/store/expenses/expenses.reducer.js index 9cbc6a8da..e377d0010 100644 --- a/src/store/expenses/expenses.reducer.js +++ b/src/store/expenses/expenses.reducer.js @@ -6,7 +6,7 @@ import t from 'store/types'; // Default table query. export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -30,7 +30,7 @@ const reducerInstance = createReducer(initialState, { [t.RESET]: () => { purgeStoredState(CONFIG); - } + }, }); export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js b/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js index 15e673224..8545cfcb7 100644 --- a/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js +++ b/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js @@ -6,7 +6,7 @@ import t from 'store/types'; const initialState = { tableState: { - pageSize: 12, + pageSize: 20, pageIndex: 0, sortBy: [], }, diff --git a/src/store/items/items.reducer.js b/src/store/items/items.reducer.js index fb4c3bce9..e28d44a93 100644 --- a/src/store/items/items.reducer.js +++ b/src/store/items/items.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], inactiveMode: false, diff --git a/src/store/manualJournals/manualJournals.reducers.js b/src/store/manualJournals/manualJournals.reducers.js index 279ccf3ef..9d44bd1b5 100644 --- a/src/store/manualJournals/manualJournals.reducers.js +++ b/src/store/manualJournals/manualJournals.reducers.js @@ -5,11 +5,11 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, -} +}; const initialState = { tableState: defaultTableQuery, diff --git a/src/store/receipts/receipts.reducer.js b/src/store/receipts/receipts.reducer.js index 98029f7fe..5ac82ec3f 100644 --- a/src/store/receipts/receipts.reducer.js +++ b/src/store/receipts/receipts.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, diff --git a/src/store/vendors/vendors.reducer.js b/src/store/vendors/vendors.reducer.js index 0f1fe726e..76c895bb8 100644 --- a/src/store/vendors/vendors.reducer.js +++ b/src/store/vendors/vendors.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQueryState = { - pageSize: 12, + pageSize: 20, pageIndex: 0, inactiveMode: false, filterRoles: [],