From 1083a24a2649b97d421c3c458ef02bf44148d90d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 30 Sep 2021 15:11:00 +0530
Subject: [PATCH] fix: Update Re-rendering behaviour for lists in conversation
 view (#3117)

* fix: Update Re-rendering behaviour for lists in conversation view

* Remove console.log
---
 app/javascript/dashboard/routes/dashboard/Dashboard.vue    | 2 +-
 .../dashboard/routes/dashboard/settings/Wrapper.vue        | 7 ++++++-
 .../routes/dashboard/settings/reports/reports.routes.js    | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/Dashboard.vue b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
index e4c525488..1b0744bbd 100644
--- a/app/javascript/dashboard/routes/dashboard/Dashboard.vue
+++ b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
@@ -2,7 +2,7 @@
   <div class="row app-wrapper">
     <sidebar :route="currentRoute" :class="sidebarClassName"></sidebar>
     <section class="app-content columns" :class="contentClassName">
-      <router-view :key="$route.path"></router-view>
+      <router-view></router-view>
     </section>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
index c0aa1eae9..c289cea17 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
@@ -9,9 +9,10 @@
       :back-url="backUrl"
       :show-new-button="showNewButton"
     />
-    <keep-alive>
+    <keep-alive v-if="keepAlive">
       <router-view></router-view>
     </keep-alive>
+    <router-view v-else></router-view>
   </div>
 </template>
 
@@ -27,6 +28,10 @@ export default {
     headerTitle: String,
     headerButtonText: String,
     icon: String,
+    keepAlive: {
+      type: Boolean,
+      default: true,
+    },
     newButtonRoutes: {
       type: Array,
       default: () => [],
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js b/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
index 96e9062fa..d37331f02 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
@@ -14,6 +14,7 @@ export default {
       props: {
         headerTitle: 'REPORT.HEADER',
         icon: 'ion-arrow-graph-up-right',
+        keepAlive: false,
       },
       children: [
         {
@@ -34,6 +35,7 @@ export default {
       props: {
         headerTitle: 'CSAT_REPORTS.HEADER',
         icon: 'ion-happy-outline',
+        keepAlive: false,
       },
       children: [
         {
@@ -49,7 +51,8 @@ export default {
       component: SettingsContent,
       props: {
         headerTitle: 'AGENT_REPORTS.HEADER',
-        icon: 'ion-people',
+        icon: 'ion-ios-people',
+        keepAlive: false,
       },
       children: [
         {
@@ -66,6 +69,7 @@ export default {
       props: {
         headerTitle: 'LABEL_REPORTS.HEADER',
         icon: 'ion-pricetags',
+        keepAlive: false,
       },
       children: [
         {
@@ -82,6 +86,7 @@ export default {
       props: {
         headerTitle: 'INBOX_REPORTS.HEADER',
         icon: 'ion-archive',
+        keepAlive: false,
       },
       children: [
         {