From b33d59d804f865dbc2da6d811cb712ea80b691ef Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Tue, 13 Aug 2024 15:15:04 +0530 Subject: [PATCH] feat: Rewrite `conversations` mixin to a helper (#9931) --- .../dashboard/components/ChatList.vue | 3 +- .../widgets/conversation/ConversationCard.vue | 6 +- .../widgets/conversation/MessagesView.vue | 22 ++- .../dashboard/helper/conversationHelper.js | 93 +++++++++ .../helper/specs/conversationHelper.spec.js | 101 ++++++++++ .../specs/fixtures/conversationFixtures.js | 185 ++++++++++++++++++ .../dashboard/mixins/conversations.js | 68 ------- .../mixins/specs/conversation.spec.js | 126 ------------ .../mixins/specs/conversationFixtures.js | 185 ------------------ 9 files changed, 395 insertions(+), 394 deletions(-) create mode 100644 app/javascript/dashboard/helper/conversationHelper.js create mode 100644 app/javascript/dashboard/helper/specs/conversationHelper.spec.js create mode 100644 app/javascript/dashboard/helper/specs/fixtures/conversationFixtures.js delete mode 100644 app/javascript/dashboard/mixins/conversations.js delete mode 100644 app/javascript/dashboard/mixins/specs/conversation.spec.js delete mode 100644 app/javascript/dashboard/mixins/specs/conversationFixtures.js diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index 9c979a7fc..4f4519ca4 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -10,7 +10,6 @@ import ChatListHeader from './ChatListHeader.vue'; import ConversationAdvancedFilter from './widgets/conversation/ConversationAdvancedFilter.vue'; import ChatTypeTabs from './widgets/ChatTypeTabs.vue'; import ConversationItem from './ConversationItem.vue'; -import conversationMixin from '../mixins/conversations'; import wootConstants from 'dashboard/constants/globals'; import advancedFilterTypes from './widgets/conversation/advancedFilterItems'; import filterQueryGenerator from '../helper/filterQueryGenerator.js'; @@ -42,7 +41,7 @@ export default { IntersectionObserver, VirtualList, }, - mixins: [conversationMixin, filterMixin], + mixins: [filterMixin], provide() { return { // Actions to be performed on virtual list item and context menu. diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue index fc2b4d7b7..0685ebc53 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue @@ -1,8 +1,8 @@