scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-03 20:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixes error in ChatList component (#8266)

Browse Source 
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
This commit is contained in:
Nithin David Thomas
2023-11-02 03:23:29 +05:30
committed by GitHub
parent 1e70223ed7
commit 3c7854ccdf
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/dashboard/components/ChatList.vue
View File

@@ -410,8 +410,12 @@ export default {
}, },
conversationListPagination() { conversationListPagination() {
const conversationsPerPage = 25; const conversationsPerPage = 25;
const hasChatsOnView =
this.chatsOnView &&
Array.isArray(this.chatsOnView) &&
!this.chatsOnView.length;
const isNoFiltersOrFoldersAndChatListNotEmpty = const isNoFiltersOrFoldersAndChatListNotEmpty =
!this.hasAppliedFiltersOrActiveFolders && this.chatsOnView !== []; !this.hasAppliedFiltersOrActiveFolders && hasChatsOnView;
const isUnderPerPage = const isUnderPerPage =
this.chatsOnView.length < conversationsPerPage && this.chatsOnView.length < conversationsPerPage &&
this.activeAssigneeTabCount < conversationsPerPage && this.activeAssigneeTabCount < conversationsPerPage &&
@@ -516,10 +520,8 @@ export default {
this.chatsOnView = this.conversationList; this.chatsOnView = this.conversationList;
}, },
}, },
created() {
this.setFiltersFromUISettings();
},
mounted() { mounted() {
this.setFiltersFromUISettings();
this.$store.dispatch('setChatStatusFilter', this.activeStatus); this.$store.dispatch('setChatStatusFilter', this.activeStatus);
this.$store.dispatch('setChatSortFilter', this.activeSortBy); this.$store.dispatch('setChatSortFilter', this.activeSortBy);
this.resetAndFetchData(); this.resetAndFetchData();
@@ -550,8 +552,8 @@ export default {
this.closeAdvanceFiltersModal(); this.closeAdvanceFiltersModal();
}, },
setFiltersFromUISettings() { setFiltersFromUISettings() {
const { status, order_by: orderBy } = const { conversations_filter_by: filterBy = {} } = this.uiSettings;
this.uiSettings.conversations_filter_by; const { status, order_by: orderBy } = filterBy;
this.activeStatus = status || wootConstants.STATUS_TYPE.OPEN; this.activeStatus = status || wootConstants.STATUS_TYPE.OPEN;
this.activeSortBy = orderBy || wootConstants.SORT_BY_TYPE.LATEST; this.activeSortBy = orderBy || wootConstants.SORT_BY_TYPE.LATEST;
}, },