From 9e38d32601f024bac676d3fe0339d0495c858716 Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Thu, 16 Sep 2021 19:24:09 +0000
Subject: [PATCH 1/5] PMCORE-3329

---
 resources/assets/js/home/Home.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 455195399..656d65b6c 100755
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -388,7 +388,10 @@ export default {
          */
         pageFactory(item){
             this.filters = [];
+            // Updating the last page ATTENTION
+            this.lastPage = this.page;
             this.page = item.item.page;
+
             this.filters = item.item.filters;
             this.pageId = item.item.id;
             this.pageUri = item.item.href;
@@ -417,7 +420,6 @@ export default {
                 && this.$refs["component"].updateView) {
                 this.$refs["component"].updateView(this.pageData);
             }
-            this.lastPage = this.page;
         },
         /**
          * Click sidebar menu item handler

From f8646a85877bfffd759ac528991fac84e94c6852 Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Thu, 16 Sep 2021 19:25:21 +0000
Subject: [PATCH 2/5] PMCORE-3329

---
 resources/assets/js/home/Home.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 656d65b6c..203a6cac8 100755
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -388,10 +388,9 @@ export default {
          */
         pageFactory(item){
             this.filters = [];
-            // Updating the last page ATTENTION
+            // Updating the last page
             this.lastPage = this.page;
             this.page = item.item.page;
-
             this.filters = item.item.filters;
             this.pageId = item.item.id;
             this.pageUri = item.item.href;

From 9a83feb5da153c5e731913d03ee35ef7a8107128 Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Fri, 17 Sep 2021 23:14:57 +0000
Subject: [PATCH 3/5] PMCORE-3326

---
 .../components/menu/CustomSidebarMenuItem.vue | 29 ++++++++++++++++---
 resources/assets/js/home/Home.vue             | 18 +++++++-----
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
index 1271a1391..7fd0d4261 100644
--- a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
+++ b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
@@ -26,7 +26,7 @@
                 @click.native="clickEvent"
             >
                 <custom-sidebar-menu-icon
-                    v-if="item.icon && !isMobileItem"
+                    v-if="item.icon && !isMobileItem && item.specialType !='header'"
                     :icon="item.icon"
                     v-bind:style="setIconColor"
                 />
@@ -37,9 +37,8 @@
                                 !isCollapsed ||
                                 isMobileItem
                         "
-                    >
-                    
-                        <span class="vsm--title">
+                    >  
+                        <span :class="item.specialType != 'header'?'vsm--title': 'vsm--header vsm--title--header'">
                             <template v-if="itemTaskList">
                                 <custom-tooltip
                                     :data="item"
@@ -57,6 +56,11 @@
                         </span>
                     </template>
                 </transition>
+                <custom-sidebar-menu-icon
+                    v-if="item.icon && !isMobileItem && item.specialType =='header'"
+                    :icon="item.icon"
+                    v-bind:style="setIconColor"
+                />
                 <template
                     v-if="
                         (isCollapsed && !isFirstLevel) ||
@@ -568,3 +572,20 @@ export default {
     inject: ["emitActiveShow", "emitItemClick", "emitItemUpdate"],
 };
 </script>
+<style scoped>
+.vsm--header.vsm--title--header{
+    display: initial;
+    white-space: nowrap;
+    max-width: 150px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.vsm--header.vsm--title--header + .vsm--icon{
+    float: none;
+    line-height: 30px;
+    margin-right: 10px;
+    margin-left: 0px;
+}
+</style>
\ No newline at end of file
diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 203a6cac8..04b4b0613 100755
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -109,7 +109,8 @@ export default {
                 CASES_SELFSERVICE: "unassigned",
                 CONSOLIDATED_CASES: "batch-routing",
                 CASES_TO_REASSIGN: "task-reassignments",
-                CASES_FOLDERS: "my-documents"
+                CASES_FOLDERS: "my-documents",
+                TASK_METRICS:"task-metrics"
             },
             defaultOption: window.config.defaultOption || '',
             pageData: {},
@@ -294,16 +295,15 @@ export default {
                         props: {
                             isCollapsed: this.collapsed? true: false,
                             item: {
-                                header: data[i].header,
+                                href: "/task-metrics/" + data[i].id,
+                                icon: "fas fa-chart-pie",
+                                id: "TASK_METRICS",
+                                page: "task-metrics",
                                 title: data[i].title,
-                                hiddenOnCollapse: data[i].hiddenOnCollapse,
-                                icon: 'pie-chart-fill',
-                                onClick: function (item) {
-                                  that.onUpdatePage("task-metrics");
-                                }
+                                specialType: "header"
                             }
                         }
-                    }
+                    };
                 }
                 if (data[i].customCasesList)  {
                     data[i]["child"] = this.sortCustomCasesList(
@@ -325,6 +325,8 @@ export default {
                     };
                 }
             }
+            console.log("JON");
+
             return newData;
         },
         /**

From 1d1c10065b21397ea7ce1eafba9a7d0b437586ef Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Fri, 17 Sep 2021 23:17:38 +0000
Subject: [PATCH 4/5] PMCORE-3326

---
 resources/assets/js/home/Home.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 04b4b0613..399572480 100755
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -325,8 +325,6 @@ export default {
                     };
                 }
             }
-            console.log("JON");
-
             return newData;
         },
         /**
@@ -390,8 +388,6 @@ export default {
          */
         pageFactory(item){
             this.filters = [];
-            // Updating the last page
-            this.lastPage = this.page;
             this.page = item.item.page;
             this.filters = item.item.filters;
             this.pageId = item.item.id;
@@ -421,6 +417,7 @@ export default {
                 && this.$refs["component"].updateView) {
                 this.$refs["component"].updateView(this.pageData);
             }
+            this.lastPage = this.page;
         },
         /**
          * Click sidebar menu item handler

From ec76a6bbfc3d1ff876b5d9a75db59c7e3d1604d1 Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Fri, 17 Sep 2021 23:18:59 +0000
Subject: [PATCH 5/5] PMCORE-3326

---
 resources/assets/js/components/menu/CustomSidebarMenuItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
index 7fd0d4261..1e528adff 100644
--- a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
+++ b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
@@ -37,7 +37,7 @@
                                 !isCollapsed ||
                                 isMobileItem
                         "
-                    >  
+                    >
                         <span :class="item.specialType != 'header'?'vsm--title': 'vsm--header vsm--title--header'">
                             <template v-if="itemTaskList">
                                 <custom-tooltip