diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index b90ee30f6..a77e68465 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -207,6 +207,7 @@ import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCust import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue'; import alertMixin from 'shared/mixins/alertMixin'; import filterMixin from 'shared/mixins/filterMixin'; +import uiSettingsMixin from 'dashboard/mixins/uiSettings'; import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages'; import countries from 'shared/constants/countries'; import { generateValuesForEditCustomViews } from 'dashboard/helper/customViewsHelper'; @@ -238,6 +239,7 @@ export default { eventListenerMixins, alertMixin, filterMixin, + uiSettingsMixin, ], props: { conversationInbox: { @@ -514,6 +516,9 @@ export default { this.chatsOnView = this.conversationList; }, }, + created() { + this.setFiltersFromUISettings(); + }, mounted() { this.$store.dispatch('setChatStatusFilter', this.activeStatus); this.$store.dispatch('setChatSortFilter', this.activeSortBy); @@ -544,6 +549,12 @@ export default { this.$store.dispatch('customViews/update', payloadData); this.closeAdvanceFiltersModal(); }, + setFiltersFromUISettings() { + const { status, order_by: orderBy } = + this.uiSettings.conversations_filter_by; + this.activeStatus = status || wootConstants.STATUS_TYPE.OPEN; + this.activeSortBy = orderBy || wootConstants.SORT_BY_TYPE.LATEST; + }, onClickOpenAddFoldersModal() { this.showAddFoldersModal = true; }, diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue index ab7d577ac..01a6bb442 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue @@ -32,7 +32,7 @@ }}