From 1913369042949b9b7e7da7def7e416c8eb73cff0 Mon Sep 17 00:00:00 2001
From: Lera24 <bedulinavalera21@gmail.com>
Date: Wed, 4 Sep 2024 13:29:12 +0300
Subject: [PATCH] feature: add username in messaging[WTEL-4985]

---
 src/app/locale/en/en.js                                    | 1 +
 src/app/locale/ru/ru.js                                    | 1 +
 src/app/locale/ua/ua.js                                    | 1 +
 src/modules/contacts/modules/messaging/api/MessagingAPI.js | 2 --
 .../modules/messaging/components/the-messaging.vue         | 3 +++
 .../contacts/modules/messaging/store/_internals/headers.js | 7 +++++++
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/app/locale/en/en.js b/src/app/locale/en/en.js
index aa0bcc0a..3f688e82 100644
--- a/src/app/locale/en/en.js
+++ b/src/app/locale/en/en.js
@@ -57,6 +57,7 @@ export default {
       messaging: {
         gateway: 'Gateway',
         provider: 'Provider ',
+        username: 'Username',
         dummy: 'There are no messaging options yet',
         messengers: {
           [ChatGatewayProvider.TELEGRAM_BOT]: 'Telegram Bot',
diff --git a/src/app/locale/ru/ru.js b/src/app/locale/ru/ru.js
index a2f04586..9f99eebd 100644
--- a/src/app/locale/ru/ru.js
+++ b/src/app/locale/ru/ru.js
@@ -57,6 +57,7 @@ export default {
       messaging: {
         gateway: 'Шлюз',
         provider: 'Провайдер',
+        username: 'Имя пользователя',
         dummy: 'Пока еще не было текстовых диалогов',
         messengers: {
           [ChatGatewayProvider.TELEGRAM_BOT]: 'Telegram Бот',
diff --git a/src/app/locale/ua/ua.js b/src/app/locale/ua/ua.js
index b968773d..5218ac51 100644
--- a/src/app/locale/ua/ua.js
+++ b/src/app/locale/ua/ua.js
@@ -57,6 +57,7 @@ export default {
       messaging: {
         gateway: 'Шлюз',
         provider: 'Провайдер',
+        username: 'Ім\'я користувача',
         dummy: 'Поки ще не було текстових діалогів',
         messengers: {
           [ChatGatewayProvider.TELEGRAM_BOT]: 'Telegram Бот',
diff --git a/src/modules/contacts/modules/messaging/api/MessagingAPI.js b/src/modules/contacts/modules/messaging/api/MessagingAPI.js
index 52f6fa49..95852caa 100644
--- a/src/modules/contacts/modules/messaging/api/MessagingAPI.js
+++ b/src/modules/contacts/modules/messaging/api/MessagingAPI.js
@@ -18,7 +18,6 @@ const getList = async (params) => {
     size,
     q,
     sort,
-    fields,
     id,
   } = applyTransform(params, [
     merge(getDefaultGetParams()),
@@ -31,7 +30,6 @@ const getList = async (params) => {
       size,
       q,
       sort,
-      ['etag', ...fields],
       id,
     );
     const { data, next } = applyTransform(response.data, [
diff --git a/src/modules/contacts/modules/messaging/components/the-messaging.vue b/src/modules/contacts/modules/messaging/components/the-messaging.vue
index 6631d5be..72c8838c 100644
--- a/src/modules/contacts/modules/messaging/components/the-messaging.vue
+++ b/src/modules/contacts/modules/messaging/components/the-messaging.vue
@@ -37,6 +37,9 @@
         <template #app="{ item }">
           {{ item.app.name }}
         </template>
+        <template #user="{ item }">
+          {{ item.user.name }}
+        </template>
         <template #actions="{ item }">
           <wt-icon-action
             :disabled="!access.hasRbacEditAccess"
diff --git a/src/modules/contacts/modules/messaging/store/_internals/headers.js b/src/modules/contacts/modules/messaging/store/_internals/headers.js
index 2bb9672f..ca31ab9f 100644
--- a/src/modules/contacts/modules/messaging/store/_internals/headers.js
+++ b/src/modules/contacts/modules/messaging/store/_internals/headers.js
@@ -20,4 +20,11 @@ export default [
     field: 'app',
     sort: SortSymbols.NONE,
   },
+  {
+    value: 'user',
+    locale: 'contacts.communications.messaging.username',
+    show: true,
+    field: 'user',
+    sort: SortSymbols.NONE,
+  },
 ];