From f81eb4da7dd2325ef1e116618c5c4b2dfcc45ba0 Mon Sep 17 00:00:00 2001 From: hherzog Date: Wed, 31 Aug 2022 09:58:41 +0200 Subject: [PATCH] TT#189650 Normalise item counts of all lists and set it to a value that fits all styles Change-Id: Ic884ad99aee70d3f03da7c6d472043078ce35a75 --- src/api/common.js | 2 +- src/api/conversations.js | 4 ++-- src/pages/CscPageCallRecording.vue | 3 ++- src/pages/CscPagePbxAutoAttendant.vue | 3 ++- src/pages/CscPageRegisteredDevices.vue | 3 ++- src/store/conversations/actions.js | 3 ++- src/store/conversations/state.js | 3 ++- src/store/dashboard.js | 7 ++++--- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/api/common.js b/src/api/common.js index 20ad4b6f..06f494e9 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -6,7 +6,7 @@ import { } from './utils' export const LIST_DEFAULT_PAGE = 1 -export const LIST_DEFAULT_ROWS = 25 +export const LIST_DEFAULT_ROWS = 24 export const LIST_ALL_ROWS = 1000 export const ContentType = { diff --git a/src/api/conversations.js b/src/api/conversations.js index 5f7a8dae..900c8d81 100644 --- a/src/api/conversations.js +++ b/src/api/conversations.js @@ -9,7 +9,7 @@ import { getOutgoingCallBlocking } from './call-blocking' import { - getList + getList, LIST_DEFAULT_ROWS } from './common' export function getConversations (options) { @@ -24,7 +24,7 @@ export function getConversations (options) { no_count: true, tz: 'UTC', page: _.get(options, 'page', 1), - rows: _.get(options, 'rows', 25) + rows: _.get(options, 'rows', LIST_DEFAULT_ROWS) } if (type !== null) { params.type = type diff --git a/src/pages/CscPageCallRecording.vue b/src/pages/CscPageCallRecording.vue index 076ea1a9..ef5eaf74 100644 --- a/src/pages/CscPageCallRecording.vue +++ b/src/pages/CscPageCallRecording.vue @@ -177,6 +177,7 @@ import CscAudioPlayer from 'components/CscAudioPlayer' import CscPageSticky from 'components/CscPageSticky' import CscCallRecordingFilters from 'components/pages/CallRecording/CscCallRecordingFilters' import CscRemoveDialog from 'components/CscRemoveDialog' +import {LIST_DEFAULT_ROWS} from "src/api/common"; export default { name: 'CscCallBlocking', components: { @@ -235,7 +236,7 @@ export default { sortBy: 'id', descending: false, page: 1, - rowsPerPage: 5, + rowsPerPage: LIST_DEFAULT_ROWS, rowsNumber: 0 }, rowStatus: [], diff --git a/src/pages/CscPagePbxAutoAttendant.vue b/src/pages/CscPagePbxAutoAttendant.vue index 92702246..26494df0 100644 --- a/src/pages/CscPagePbxAutoAttendant.vue +++ b/src/pages/CscPagePbxAutoAttendant.vue @@ -98,6 +98,7 @@ import { displayName } from 'src/filters/subscriber' import CscPage from 'components/CscPage' import CscPbxAutoAttendantSlotsTable from 'components/pages/PbxConfiguration/CscPbxAutoAttendantSlotsTable' import CscPopupMenuItem from 'components/CscPopupMenuItem' +import {LIST_DEFAULT_ROWS} from "src/api/common"; export default { name: 'CscPagePbxAutoAttendant', components: { @@ -128,7 +129,7 @@ export default { ], pagination: { page: 1, - rowsPerPage: 5, + rowsPerPage: LIST_DEFAULT_ROWS, rowsNumber: 0 } } diff --git a/src/pages/CscPageRegisteredDevices.vue b/src/pages/CscPageRegisteredDevices.vue index eccf6ef0..7411441e 100644 --- a/src/pages/CscPageRegisteredDevices.vue +++ b/src/pages/CscPageRegisteredDevices.vue @@ -41,6 +41,7 @@ import { mapState } from 'vuex' import CscPage from 'components/CscPage' import { mapWaitingActions } from 'vue-wait' import CscSpinner from 'components/CscSpinner' +import {LIST_DEFAULT_ROWS} from "src/api/common"; export default { name: 'CscPageRegisteredDevices', components: { @@ -54,7 +55,7 @@ export default { sortBy: 'id', descending: false, page: 1, - rowsPerPage: 5, + rowsPerPage: LIST_DEFAULT_ROWS, rowsNumber: 0 } } diff --git a/src/store/conversations/actions.js b/src/store/conversations/actions.js index c34bf7d6..67724ec4 100644 --- a/src/store/conversations/actions.js +++ b/src/store/conversations/actions.js @@ -15,8 +15,9 @@ import { removeFromOutgoingListByNumber, toggleNumberInBothLists } from 'src/api/call-blocking' +import { LIST_DEFAULT_ROWS } from 'src/api/common' -export const ROWS_PER_PAGE = 15 +export const ROWS_PER_PAGE = LIST_DEFAULT_ROWS const ReloadConfig = { retryLimit: 5, diff --git a/src/store/conversations/state.js b/src/store/conversations/state.js index 0ed13bad..6bb617ae 100644 --- a/src/store/conversations/state.js +++ b/src/store/conversations/state.js @@ -2,10 +2,11 @@ import { RequestState } from '../common' +import { LIST_DEFAULT_ROWS } from 'src/api/common' export default { page: 1, - rows: 10, + rows: LIST_DEFAULT_ROWS, conversations: [], downloadVoiceMailState: RequestState.button, downloadVoiceMailError: null, diff --git a/src/store/dashboard.js b/src/store/dashboard.js index 7522d3a6..79c0c787 100644 --- a/src/store/dashboard.js +++ b/src/store/dashboard.js @@ -8,6 +8,7 @@ import { import { getBrowserTimezone } from '../helpers/date-helper' +import { LIST_DEFAULT_ROWS } from 'src/api/common' export default { namespaced: true, @@ -20,7 +21,7 @@ export default { async getVoicemailsData (context) { const res = await getAllCallsOrVoicemails({ subscriber_id: context.getters.getSubscriberId, - rows: 5, + rows: LIST_DEFAULT_ROWS, order_by: 'timestamp', order_by_direction: 'desc', type: 'voicemail', @@ -31,7 +32,7 @@ export default { async getCallsData (context) { const res = await getAllCallsOrVoicemails({ subscriber_id: context.getters.getSubscriberId, - rows: 5, + rows: LIST_DEFAULT_ROWS, order_by: 'timestamp', order_by_direction: 'desc', type: 'call', @@ -42,7 +43,7 @@ export default { async getRegisteredDevicesData (context) { const res = await getSubscriberRegistrations({ subscriber_id: context.getters.getSubscriberId, - rows: 5, + rows: LIST_DEFAULT_ROWS, order_by: 'timestamp', order_by_direction: 'desc', tz: getBrowserTimezone()