fix: finding current Tab[WTEL-4296]

webitel · Mar 19, 2024 · 534a920 · 534a920
1 parent 046b323
commit 534a920
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git 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
@@ -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>