From 1650566504a10d578c58008e00218783276808e2 Mon Sep 17 00:00:00 2001
From: Lera24 <bedulinavalera21@gmail.com>
Date: Mon, 18 Mar 2024 16:15:39 +0200
Subject: [PATCH 1/3] fix: routes in communication tabs[WTEL-4296]

---
 src/app/router/index.js                       | 13 ++++++++++
 .../opened-contact-communications.vue         | 25 ++++++++++++++++---
 .../components/opened-contact-tabs.vue        |  7 +++++-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/app/router/index.js b/src/app/router/index.js
index aa08eb0f..571c8363 100644
--- a/src/app/router/index.js
+++ b/src/app/router/index.js
@@ -62,9 +62,22 @@ const routes = [
         children: [
           {
             path: 'communications',
+            redirect: {
+              name: `${CrmSections.CONTACTS}-communications-phones`
+            },
             name: `${CrmSections.CONTACTS}-communications`,
             component: ContactCommunications,
           },
+          {
+            path: 'communications/phones',
+            name: `${CrmSections.CONTACTS}-communications-phones`,
+            component: ContactCommunications,
+          },
+          {
+            path: 'communications/emails',
+            name: `${CrmSections.CONTACTS}-communications-emails`,
+            component: ContactCommunications,
+          },
           {
             path: 'variables',
             name: `${CrmSections.CONTACTS}-variables`,
diff --git a/src/modules/contacts/components/opened-contact-communications.vue b/src/modules/contacts/components/opened-contact-communications.vue
index 14089800..73ac50a2 100644
--- a/src/modules/contacts/components/opened-contact-communications.vue
+++ b/src/modules/contacts/components/opened-contact-communications.vue
@@ -7,7 +7,7 @@
         :disabled="currentTab.value === tab.value"
         :color="currentTab.value !== tab.value && 'secondary'"
         wide
-        @click="currentTab = tab"
+        @click="changeTab(tab)"
       >
         <wt-icon
           :icon="tab.icon"
@@ -23,9 +23,11 @@
 </template>
 
 <script setup>
-import { computed, inject, ref } from 'vue';
+import { computed, inject, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
 import { useStore } from 'vuex';
+import CrmSections from '@webitel/ui-sdk/src/enums/WebitelApplications/CrmSections.enum';
 import TheEmails from '../modules/emails/components/the-emails.vue';
 import ThePhones from '../modules/phones/components/the-phones.vue';
 
@@ -43,6 +45,8 @@ const phonesNamespace = `${props.namespace}/phones`;
 
 const store = useStore();
 const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
 
 const tabs = computed(() => [
   {
@@ -52,6 +56,7 @@ const tabs = computed(() => [
     namespace: phonesNamespace,
     icon: 'call',
     channel: 'number', // must be same as comm popup channel
+    pathName: `${CrmSections.CONTACTS}-communications-phones`,
   },
   {
     value: 'emails',
@@ -60,10 +65,24 @@ const tabs = computed(() => [
     namespace: emailsNamespace,
     icon: 'email',
     channel: 'email', // must be same as comm popup channel
+    pathName: `${CrmSections.CONTACTS}-communications-emails`,
   },
 ]);
 
-const currentTab = ref(tabs.value[0]);
+const currentTab = ref({});
+
+function changeTab(tab) {
+  currentTab.value = tab;
+  return router.push({ name: tab.pathName });
+}
+
+function initializeCommunicationsTab() {
+   currentTab.value = tabs.value.find(({ pathName }) => pathName === route.name)
+}
+
+onMounted(() => {
+  initializeCommunicationsTab();
+});
 
 </script>
 
diff --git a/src/modules/contacts/components/opened-contact-tabs.vue b/src/modules/contacts/components/opened-contact-tabs.vue
index 27cd5009..3aca3cc6 100644
--- a/src/modules/contacts/components/opened-contact-tabs.vue
+++ b/src/modules/contacts/components/opened-contact-tabs.vue
@@ -51,7 +51,12 @@ const tabs = computed(() => [
   },
 ]);
 
-const currentTab = computed(() => tabs.value.find(({ pathName }) => pathName === route.name));
+const currentTab = computed(() => {
+  if(route.name.includes('communications')) {
+    return tabs.value.find(tab => tab.value === 'communications')
+  }
+  return tabs.value.find(({ pathName }) => pathName === route.name)
+});
 
 function changeTab(tab) {
   return router.push({ name: tab.pathName });

From 046b32318ce1aa2c5ad724aa75e381cb75ae370d Mon Sep 17 00:00:00 2001
From: Lera24 <bedulinavalera21@gmail.com>
Date: Tue, 19 Mar 2024 12:00:53 +0200
Subject: [PATCH 2/3] fix: add children routes[WTEL-4296]

---
 src/app/router/index.js                       | 25 +++++++++++--------
 .../components/opened-contact-tabs.vue        |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/app/router/index.js b/src/app/router/index.js
index 571c8363..82691621 100644
--- a/src/app/router/index.js
+++ b/src/app/router/index.js
@@ -63,21 +63,24 @@ const routes = [
           {
             path: 'communications',
             redirect: {
-              name: `${CrmSections.CONTACTS}-communications-phones`
+              name: `${CrmSections.CONTACTS}-communications-phones`,
             },
             name: `${CrmSections.CONTACTS}-communications`,
             component: ContactCommunications,
+            children: [
+              {
+                path: 'phones',
+                name: `${CrmSections.CONTACTS}-communications-phones`,
+                component: ContactCommunications,
+              },
+              {
+                path: 'emails',
+                name: `${CrmSections.CONTACTS}-communications-emails`,
+                component: ContactCommunications,
+              },
+            ],
           },
-          {
-            path: 'communications/phones',
-            name: `${CrmSections.CONTACTS}-communications-phones`,
-            component: ContactCommunications,
-          },
-          {
-            path: 'communications/emails',
-            name: `${CrmSections.CONTACTS}-communications-emails`,
-            component: ContactCommunications,
-          },
+
           {
             path: 'variables',
             name: `${CrmSections.CONTACTS}-variables`,
diff --git a/src/modules/contacts/components/opened-contact-tabs.vue b/src/modules/contacts/components/opened-contact-tabs.vue
index 3aca3cc6..8150ffb8 100644
--- a/src/modules/contacts/components/opened-contact-tabs.vue
+++ b/src/modules/contacts/components/opened-contact-tabs.vue
@@ -52,7 +52,7 @@ const tabs = computed(() => [
 ]);
 
 const currentTab = computed(() => {
-  if(route.name.includes('communications')) {
+  if(route?.name?.includes('communications')) {
     return tabs.value.find(tab => tab.value === 'communications')
   }
   return tabs.value.find(({ pathName }) => pathName === route.name)

From 534a920106d2ce9bd934c186079f162411bdede5 Mon Sep 17 00:00:00 2001
From: Lera24 <bedulinavalera21@gmail.com>
Date: Tue, 19 Mar 2024 12:33:54 +0200
Subject: [PATCH 3/3] fix: finding current Tab[WTEL-4296]

---
 .../components/opened-contact-communications.vue    | 11 +----------
 .../contacts/components/opened-contact-tabs.vue     | 13 +------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/modules/contacts/components/opened-contact-communications.vue b/src/modules/contacts/components/opened-contact-communications.vue
index 73ac50a2..7bbf2638 100644
--- a/src/modules/contacts/components/opened-contact-communications.vue
+++ b/src/modules/contacts/components/opened-contact-communications.vue
@@ -69,21 +69,12 @@ const tabs = computed(() => [
   },
 ]);
 
-const currentTab = ref({});
+const currentTab = computed(() => tabs.value.find(({ pathName }) => pathName === route.name))
 
 function changeTab(tab) {
-  currentTab.value = tab;
   return router.push({ name: tab.pathName });
 }
 
-function initializeCommunicationsTab() {
-   currentTab.value = tabs.value.find(({ pathName }) => pathName === route.name)
-}
-
-onMounted(() => {
-  initializeCommunicationsTab();
-});
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/modules/contacts/components/opened-contact-tabs.vue b/src/modules/contacts/components/opened-contact-tabs.vue
index 8150ffb8..9b1098c9 100644
--- a/src/modules/contacts/components/opened-contact-tabs.vue
+++ b/src/modules/contacts/components/opened-contact-tabs.vue
@@ -52,23 +52,12 @@ const tabs = computed(() => [
 ]);
 
 const currentTab = computed(() => {
-  if(route?.name?.includes('communications')) {
-    return tabs.value.find(tab => tab.value === 'communications')
-  }
-  return tabs.value.find(({ pathName }) => pathName === route.name)
+  return tabs.value.find(({ pathName }) => route?.matched?.find(({name}) => name === pathName));
 });
 
 function changeTab(tab) {
   return router.push({ name: tab.pathName });
 }
-
-function initializeTab() {
-  if (!currentTab.value) changeTab(tabs.value[0]);
-}
-
-onMounted(() => {
-  initializeTab();
-});
 </script>
 
 <style lang="scss" scoped>