From 66fa2f1d2593e527db9f0ea1fcf5a029efd84de3 Mon Sep 17 00:00:00 2001 From: Lera24 Date: Wed, 24 Apr 2024 13:52:32 +0300 Subject: [PATCH] fix: style, classes and locale[WTEL-4418] --- package-lock.json | 14 +++++----- package.json | 2 +- src/app/locale/en/en.js | 5 ++++ src/app/locale/ru/ru.js | 5 ++++ src/app/locale/ua/ua.js | 5 ++++ .../day-row/day-timeline-row-counters.vue | 5 ++-- .../day-row/day-timeline-row-section.vue | 28 ------------------- .../task-row/call-task-timeline-row.vue | 4 +-- .../components/task-row/task-timeline-row.vue | 3 +- .../components/timeline-container.vue | 3 +- .../timeline/components/timeline-header.vue | 14 +++++----- .../components/utils/timeline-pin.vue | 4 ++- .../components/utils/timeline-row-info.vue | 2 +- .../components/timeline-task-type-filter.vue | 18 ++++++------ 14 files changed, 51 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0065d34..b9101972 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@vue/compat": "^3.3.9", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.2", - "@webitel/ui-sdk": "^24.4.25", + "@webitel/ui-sdk": "^24.4.28", "axios": "^1.6.5", "core-js": "^3.8.3", "deep-equal": "^2.2.1", @@ -1794,9 +1794,9 @@ } }, "node_modules/@webitel/ui-sdk": { - "version": "24.4.25", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.4.25.tgz", - "integrity": "sha512-z2jPqS0Q8igKZ1pCG9SXrtZm9eZ4eLRYwZmkwQN8d11FQ6YUT+qInTWI8LlrIkXdJhiNlqC/HcRaa+yJLiwWVQ==", + "version": "24.4.28", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.4.28.tgz", + "integrity": "sha512-LRDfoIhYiyWts8jnDU6ZlXwyrM8OgaXoCwuVHeEouaSsHQhxHIX6etid+BE13Nkdr954Xbx1QJ/BCID5eDeHqw==", "dependencies": { "@floating-ui/vue": "^1.0.1", "@vuelidate/core": "^2.0.3", @@ -10864,9 +10864,9 @@ } }, "@webitel/ui-sdk": { - "version": "24.4.25", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.4.25.tgz", - "integrity": "sha512-z2jPqS0Q8igKZ1pCG9SXrtZm9eZ4eLRYwZmkwQN8d11FQ6YUT+qInTWI8LlrIkXdJhiNlqC/HcRaa+yJLiwWVQ==", + "version": "24.4.28", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.4.28.tgz", + "integrity": "sha512-LRDfoIhYiyWts8jnDU6ZlXwyrM8OgaXoCwuVHeEouaSsHQhxHIX6etid+BE13Nkdr954Xbx1QJ/BCID5eDeHqw==", "requires": { "@floating-ui/vue": "^1.0.1", "@vuelidate/core": "^2.0.3", diff --git a/package.json b/package.json index 55194e67..28a7ce1b 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@vue/compat": "^3.3.9", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.2", - "@webitel/ui-sdk": "^24.4.25", + "@webitel/ui-sdk": "^24.4.28", "axios": "^1.6.5", "core-js": "^3.8.3", "deep-equal": "^2.2.1", diff --git a/src/app/locale/en/en.js b/src/app/locale/en/en.js index a304ca07..b3148a9c 100644 --- a/src/app/locale/en/en.js +++ b/src/app/locale/en/en.js @@ -4,6 +4,7 @@ import AccessMode from '../../../modules/contacts/modules/permissions/enums/AccessMode.enum'; import TimelineTaskStatusEnum from '../../../modules/contacts/modules/timeline/enums/TimelineTaskStatus.enum.js'; +import { WebitelContactsTimelineEventType } from 'webitel-sdk'; export default { crm: 'CRM', @@ -25,6 +26,10 @@ export default { [TimelineTaskStatusEnum.TRANSFERRED]: 'Transferred', [TimelineTaskStatusEnum.ENDED]: 'Ended', }, + eventType: { + [WebitelContactsTimelineEventType.Call]: 'Call | Calls', + [WebitelContactsTimelineEventType.Chat]: 'Chat | Chats', + }, }, communications: { communications: 'Communication option | Communication options', diff --git a/src/app/locale/ru/ru.js b/src/app/locale/ru/ru.js index 8141d0c7..88be35a8 100644 --- a/src/app/locale/ru/ru.js +++ b/src/app/locale/ru/ru.js @@ -1,5 +1,6 @@ import ChatGatewayProvider from '@webitel/ui-sdk/src/enums/ChatGatewayProvider/ChatGatewayProvider.enum'; +import { WebitelContactsTimelineEventType } from 'webitel-sdk'; import AccessMode from '../../../modules/contacts/modules/permissions/enums/AccessMode.enum'; import TimelineTaskStatusEnum @@ -25,6 +26,10 @@ export default { [TimelineTaskStatusEnum.TRANSFERRED]: 'Переведено', [TimelineTaskStatusEnum.ENDED]: 'Кінець', }, + eventType: { + [WebitelContactsTimelineEventType.Call]: 'Звонок | Звонки', + [WebitelContactsTimelineEventType.Chat]: 'Чат | Чаты', + }, }, communications: { communications: 'Средство связи | Средства связи', diff --git a/src/app/locale/ua/ua.js b/src/app/locale/ua/ua.js index a232bce7..34c95e6a 100644 --- a/src/app/locale/ua/ua.js +++ b/src/app/locale/ua/ua.js @@ -1,5 +1,6 @@ import ChatGatewayProvider from '@webitel/ui-sdk/src/enums/ChatGatewayProvider/ChatGatewayProvider.enum'; +import { WebitelContactsTimelineEventType } from 'webitel-sdk'; import AccessMode from '../../../modules/contacts/modules/permissions/enums/AccessMode.enum'; import TimelineTaskStatusEnum @@ -25,6 +26,10 @@ export default { [TimelineTaskStatusEnum.TRANSFERRED]: 'Переведено', [TimelineTaskStatusEnum.ENDED]: 'Конец', }, + eventType: { + [WebitelContactsTimelineEventType.Call]: 'Дзвінок | Дзвінки', + [WebitelContactsTimelineEventType.Chat]: 'Чат | Чати', + }, }, communications: { communications: 'Засіб зв\'язку | Засоби зв\'язку', diff --git a/src/modules/contacts/modules/timeline/components/day-row/day-timeline-row-counters.vue b/src/modules/contacts/modules/timeline/components/day-row/day-timeline-row-counters.vue index e4993058..f4313236 100644 --- a/src/modules/contacts/modules/timeline/components/day-row/day-timeline-row-counters.vue +++ b/src/modules/contacts/modules/timeline/components/day-row/day-timeline-row-counters.vue @@ -1,14 +1,15 @@ diff --git a/src/modules/contacts/modules/timeline/components/task-row/call-task-timeline-row.vue b/src/modules/contacts/modules/timeline/components/task-row/call-task-timeline-row.vue index 4a98cf71..8fc09489 100644 --- a/src/modules/contacts/modules/timeline/components/task-row/call-task-timeline-row.vue +++ b/src/modules/contacts/modules/timeline/components/task-row/call-task-timeline-row.vue @@ -22,7 +22,7 @@