From 4ede7239e599359e4667d3255ad9bcef2813ebe1 Mon Sep 17 00:00:00 2001
From: itsiprikshit <prikshittekta@gmail.com>
Date: Fri, 4 Mar 2022 19:11:22 +0000
Subject: [PATCH] url check

---
 .../javascripts/countly/vue/components/sidebar.js    | 12 ++++++++++--
 .../vue/templates/sidebar/analytics-menu.html        |  2 +-
 .../public/stylesheets/styles/blocks/_sidebar.scss   |  1 -
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/express/public/javascripts/countly/vue/components/sidebar.js b/frontend/express/public/javascripts/countly/vue/components/sidebar.js
index ae50fe59748..626c9d4b354 100644
--- a/frontend/express/public/javascripts/countly/vue/components/sidebar.js
+++ b/frontend/express/public/javascripts/countly/vue/components/sidebar.js
@@ -273,7 +273,11 @@
                     var self = this;
                     var menus = this.menus.reduce(function(acc, val) {
                         if (val.app_type === self.activeApp.type && checkMenuPermission(val.name)) {
-                            (acc[val.category] = acc[val.category] || []).push(val);
+                            if (!acc[val.category]) {
+                                acc[val.category] = [];
+                            }
+
+                            acc[val.category].push(val);
                         }
                         return acc;
                     }, {});
@@ -286,7 +290,11 @@
                     var self = this;
                     var submenus = this.submenus.reduce(function(acc, val) {
                         if (val.app_type === self.activeApp.type && checkSubMenuPermission(val.name)) {
-                            (acc[val.parent_code] = acc[val.parent_code] || []).push(val);
+                            if (!acc[val.parent_code]) {
+                                acc[val.parent_code] = [];
+                            }
+
+                            acc[val.parent_code].push(val);
                         }
                         return acc;
                     }, {});
diff --git a/frontend/express/public/javascripts/countly/vue/templates/sidebar/analytics-menu.html b/frontend/express/public/javascripts/countly/vue/templates/sidebar/analytics-menu.html
index 351f7ce666c..ac0098caf44 100644
--- a/frontend/express/public/javascripts/countly/vue/templates/sidebar/analytics-menu.html
+++ b/frontend/express/public/javascripts/countly/vue/templates/sidebar/analytics-menu.html
@@ -46,7 +46,7 @@
                                 </el-collapse-item>
                             </el-collapse>
                         </div>
-                        <a v-else :href="menu.url">
+                        <a v-else-if="menu.url" :href="menu.url">
                             <div
                                 style="width: calc(100% - 24px);"
                                 :class="['cly-vue-sidebar__menu-items has-ellipsis',
diff --git a/frontend/express/public/stylesheets/styles/blocks/_sidebar.scss b/frontend/express/public/stylesheets/styles/blocks/_sidebar.scss
index 356022fc690..a10c3d97434 100644
--- a/frontend/express/public/stylesheets/styles/blocks/_sidebar.scss
+++ b/frontend/express/public/stylesheets/styles/blocks/_sidebar.scss
@@ -207,7 +207,6 @@ $bg-color: #24292e;
         border-bottom: 1px solid map.get(c.$colors, "warm-gray-70");
         background-color: $bg-color;
         box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.4);
-        padding-bottom: 16px;
     }
 
     &__header {