fix: chat name computations [WTEL-5553](https://webitel.atlassian.net…

…/browse/WTEL-5553)
webitel · Nov 19, 2024 · 289d10a · 289d10a
1 parent 98054d2
commit 289d10a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/src/ui/mixins/displayInfoMixin.js b/src/ui/mixins/displayInfoMixin.js
@@ -1,7 +1,17 @@
 export default {
   computed: {
     displayChatName() {
-      return this.task && this.task?.members?.map((member) => member.name).join(', ');
+      const chat = this.chat || this.task;
+
+      if (this.contact?.name) {
+        return this.contact.name;
+      }
+
+      if (chat?.members?.length) {
+        return chat?.members?.map((member) => member.name).join(', ');
+      }
+
+      return chat.title;
     },
     displayName() {
       return (this.task || this.call)?.displayName;

diff --git a/src/ui/modules/work-section/modules/chat/chat-header/chat-header.vue b/src/ui/modules/work-section/modules/chat/chat-header/chat-header.vue
@@ -1,5 +1,8 @@
 <template>
-  <task-header :size="size" :username="contact?.name">
+  <task-header
+    :size="size"
+    :username="displayChatName"
+  >
     <template v-slot:after-avatar>
       <wt-rounded-action
         v-show="isTransferAction"
@@ -21,24 +24,25 @@
         v-if="contact?.id"
         :href="contactLink(contact?.id)"
         class="chat-header-title"
-        target="_blank">
-        {{ contact?.name }}
+        target="_blank"
+      >
+        {{ displayChatName }}
       </a>
       <span v-else>
-        {{ title }}
+        {{ displayChatName }}
       </span>
     </template>
   </task-header>
 </template>
 
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
-import displayInfoMixin from '../../../../../mixins/displayInfoMixin.js';
 import sizeMixin from '../../../../../../app/mixins/sizeMixin.js';
-import TaskHeader from '../../_shared/components/task-header/task-header.vue';
-import ChatHeaderCloseAction from './chat-header-close-action.vue';
 import HotkeyAction from '../../../../../hotkeys/HotkeysActiom.enum.js';
 import { useHotkeys } from '../../../../../hotkeys/useHotkeys.js';
+import displayInfoMixin from '../../../../../mixins/displayInfoMixin.js';
+import TaskHeader from '../../_shared/components/task-header/task-header.vue';
+import ChatHeaderCloseAction from './chat-header-close-action.vue';
 
 export default {
   name: 'chat-header',
@@ -48,7 +52,7 @@ export default {
     ChatHeaderCloseAction,
   },
   data: () => ({
-    hotkeyUnsubscribers : [],
+    hotkeyUnsubscribers: [],
   }),
   computed: {
     ...mapState('ui/infoSec/client/contact', {
@@ -62,18 +66,13 @@ export default {
     ...mapGetters('ui/infoSec/client/contact', {
       contactLink: 'CONTACT_LINK',
     }),
-    title() {
-      return this.chat?.members
-        ? this.chat?.members[this.chat?.members?.length - 1]?.name
-        : this.chat?.title;
-    },
   },
   methods: {
     ...mapActions('features/chat', {
       close: 'CLOSE',
     }),
     openTab() {
-      this.$emit('openTab', 'transfer')
+      this.$emit('openTab', 'transfer');
     },
     setupHotkeys() {
       const subscripers = [
@@ -85,17 +84,17 @@ export default {
           event: HotkeyAction.TRANSFER,
           callback: () => {
             if (this.isTransferAction) this.openTab();
-          }
-        }
+          },
+        },
       ];
-      this.hotkeyUnsubscribers  = useHotkeys(subscripers);
+      this.hotkeyUnsubscribers = useHotkeys(subscripers);
     },
   },
   mounted() {
     this.setupHotkeys();
   },
   unmounted() {
-    this.hotkeyUnsubscribers .forEach((unsubscribe) => unsubscribe());
+    this.hotkeyUnsubscribers.forEach((unsubscribe) => unsubscribe());
   },
 };
 </script>
@@ -104,6 +103,7 @@ export default {
 .chat-header-title {
   color: var(--text-main-color);
 }
+
 a:hover {
   text-decoration: underline;
 }