Merge pull request #125 from webitel/feature/add-username-in-messaging

feature: add username in messaging[WTEL-4985]
webitel · Sep 4, 2024 · 62d1ae5 · 62d1ae5
2 parents db16df2 + 1913369
commit 62d1ae5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
+  },
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ const getList = async (params) => { @@
         size,
         q,
         sort,
-        fields,
         id,
       } = applyTransform(params, [
         merge(getDefaultGetParams()),
@@ Expand All / @@ -31,7 +30,6 @@ const getList = async (params) => { @@
           size,
           q,
           sort,
-          ['etag', ...fields],
           id,
         );
         const { data, next } = applyTransform(response.data, [
@@ Expand Down @@