Merge remote-tracking branch 'origin/menu-top-6.1.4' into integration-6.1.4-optimized

Author: dlumbrer

src/ui/public/kbn_top_nav/kbn_top_nav.html

@@ -38,7 +38,7 @@
           <ul class="list-unstyled">
             <li ng-repeat="subitem in currentPanelsons[i]" class="ng-scope">
               <a ng-mouseover="showDescription(subitem)" ng-mouseleave="hideDescription()" class="kuiLink submenuitem"
-                tabindex="0" role="button" ng-click="redirectToPanel(subitem.panel_id)">{{subitem.name}}</a>
+                tabindex="0" role="button" ng-click="redirectToPanel(subitem.name, subitem.panel_id)">{{subitem.name}}</a>
             </li>
           </ul>
         </div>

src/ui/public/kibiter/menu/render_kibiter_menu.js

@@ -5,7 +5,7 @@ export function renderKibiterMenu($scope) {
 
     $scope.showInfo = (item) => {
         if (item.type === "entry") {
-            $scope.redirectToPanel(item.panel_id)
+            $scope.redirectToPanel(item.name, item.panel_id)
         } else if (item.type === "menu") {
             if ($scope.parentDashboard === item) {
                 closeSubmenu($scope)
@@ -25,9 +25,13 @@ export function renderKibiterMenu($scope) {
         $scope.showDescriptionDiv = false;
     }
 
-    $scope.redirectToPanel = (panel_id) => {
+    $scope.redirectToPanel = (name, panel_id) => {
         $scope.showKibiterMenu = false;
-        window.location.replace(window.location.href.split("app/")[0] + "app/kibana#/dashboard/" + panel_id)
+        if (name === "Contact") {
+            window.location.replace(panel_id)
+        } else {
+            window.location.replace(window.location.href.split("app/")[0] + "app/kibana#/dashboard/" + panel_id)
+        }
     }
 
     const showSubmenu = ($scope, item) => {