From 13bd357e0a9e5849f4f44638cba8ac8132d4c6f2 Mon Sep 17 00:00:00 2001
From: fabio <fabio.guachalla@processmaker.com>
Date: Tue, 8 Dec 2020 18:01:22 -0400
Subject: [PATCH] PMCORE-2523:Use the service for sidebar menu

Correction myCases

Correction
---
 resources/assets/js/api/Menu.js               |  9 ++--
 .../js/components/menu/CustomSidebar.vue      | 41 +++++++++++++++++--
 resources/assets/js/home/Home.vue             |  4 +-
 resources/assets/sass/menu.scss               | 24 ++++-------
 4 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/resources/assets/js/api/Menu.js b/resources/assets/js/api/Menu.js
index 68c788eb9..22162b64b 100644
--- a/resources/assets/js/api/Menu.js
+++ b/resources/assets/js/api/Menu.js
@@ -1,9 +1,12 @@
-import menuData from "./../mocks/menu.json";
+import axios from 'axios';
 
 export let menu = {
     get() {
-        return new Promise((resolutionFunc, rejectionFunc) => {
-            resolutionFunc(menuData);
+        return axios.get(window.config.SYS_SERVER + '/api/1.0/' + window.config.SYS_WORKSPACE + '/home/menu', {
+            headers: {
+                'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken
+              }
         });
+        
     },
 };
diff --git a/resources/assets/js/components/menu/CustomSidebar.vue b/resources/assets/js/components/menu/CustomSidebar.vue
index 5a93a31f4..e54df92ed 100644
--- a/resources/assets/js/components/menu/CustomSidebar.vue
+++ b/resources/assets/js/components/menu/CustomSidebar.vue
@@ -20,12 +20,12 @@
 </template>
 
 <script>
-
+import api from "./../../api/index";
 export default {
     name: "CustomSidebar",
-    props: ['menu'],
     data() {
         return {
+            menu: [],
             collapsed: false,
             isOnMobile: false,
             hideToggle: true,
@@ -43,7 +43,14 @@ export default {
     mounted() {
         this.onResize();
         window.addEventListener("resize", this.onResize);
-       
+        api.menu
+            .get()
+            .then((response) => {
+                this.menu = this.mappingMenu(response.data);
+            })
+            .catch((e) => {
+                console.error(e);
+            });
     },
     methods: {
         /**
@@ -76,6 +83,34 @@ export default {
                 this.collapsed = false;
             }
         },
+        /**
+         * Do a mapping of vue view for menus
+         * @returns array
+         */
+        mappingMenu(data) {
+            var i,
+                j,
+                newData = data,
+                auxId,
+                viewVue = {
+                    'CASES_MY_CASES': 'MyCases',
+                    'CASES_SEARCH': 'advanced-search',
+                    'CASES_INBOX': 'todo',
+                    'CASES_DRAFT': 'draft',
+                    'CASES_PAUSED': 'paused',
+                    'CASES_SELFSERVICE': 'unassigned',
+                    'CONSOLIDATED_CASES': 'batch-routing',
+                    'CASES_TO_REASSIGN': 'task-reassignments',
+                    'CASES_FOLDERS': 'my-documents'
+                };
+            for (i = 0; i < data.length; i += 1) {
+                auxId = data[i].id || '';
+                if (auxId !== '' && viewVue[auxId]) {
+                    newData[i].id = viewVue[auxId];
+                }
+            }
+            return newData;
+        }
     },
 };
 </script>
diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 449c1cff6..1f42f442d 100644
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -95,9 +95,7 @@ export default {
                 });
         },
         OnClickSidebarItem(item) {
-            this.page = item.item.page || "MyCases";
-            this.pageId = item.item.id || null;
-            this.pageName = item.item.title || null;
+            this.page = item.item.id || "MyCases";
         },
         /**
          * Update page component
diff --git a/resources/assets/sass/menu.scss b/resources/assets/sass/menu.scss
index 706bb08ff..92d24bee0 100755
--- a/resources/assets/sass/menu.scss
+++ b/resources/assets/sass/menu.scss
@@ -37,7 +37,8 @@
 .v-sidebar-menu .vsm--item {
   position: relative;
   display: block;
-  width: 100%
+  width: 90%;
+  margin-left: 10px;
 }
 
 .v-sidebar-menu .vsm--link {
@@ -69,11 +70,12 @@
 }
 
 .v-sidebar-menu .vsm--link_level-1 .vsm--icon {
-  height: 30px;
   line-height: 30px;
   width: 30px;
   text-align: center;
-  border-radius: 3px
+  border-radius: 3px;
+  margin-top: 8px;
+  margin-right: 0px;
 }
 
 .v-sidebar-menu .vsm--link:after {
@@ -149,7 +151,8 @@
   right: 10px;
   top: 50%;
   -webkit-transform: translateY(-50%);
-  transform: translateY(-50%)
+  transform: translateY(-50%);
+  border-radius: 11px;
 }
 
 .v-sidebar-menu .vsm--badge_default {
@@ -287,7 +290,6 @@
 .v-sidebar-menu .vsm--link_level-1.vsm--link_exact-active .vsm--icon,
 .v-sidebar-menu .vsm--link_level-1.vsm--link_active .vsm--icon {
   color: #fff;
-  background-color: #1e1e21
 }
 
 /*.v-sidebar-menu .vsm--link_hover,
@@ -311,21 +313,13 @@
   background-color: #3397E1
 }
 
-.v-sidebar-menu .vsm--dropdown .vsm--list {
-  background-color: #c1c1c1
-}
-
 .v-sidebar-menu .vsm--dropdown .vsm--link {
-  color: #222222
+  color: #fff
 }
 
-/*.v-sidebar-menu .vsm--dropdown .vsm--icon {
-  color: #222222
-}*/
-
 .vsm--link_level-2:hover .vsm--title,
 .vsm--link_level-2:hover .vsm--icon {
-  color: #3397E1
+  color: #94c0e0
 }
 
 .v-sidebar-menu .vsm--mobile-bg {