From a749c4b09fc164def140934ac408925874059cd8 Mon Sep 17 00:00:00 2001
From: Michail Yasonik <michail.yasonik@elastic.co>
Date: Tue, 12 May 2020 17:05:00 -0500
Subject: [PATCH 1/3] revert kibana app link order

---
 src/legacy/core_plugins/kibana/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 3a796b3ba520c..625f27426752e 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -66,7 +66,7 @@ export default function(kibana) {
           title: i18n.translate('kbn.discoverTitle', {
             defaultMessage: 'Discover',
           }),
-          order: 2000,
+          order: 1000,
           url: `${kbnBaseUrl}#/discover`,
           euiIconType: 'discoverApp',
           disableSubUrlTracking: true,
@@ -77,7 +77,7 @@ export default function(kibana) {
           title: i18n.translate('kbn.visualizeTitle', {
             defaultMessage: 'Visualize',
           }),
-          order: 7000,
+          order: 2000,
           url: `${kbnBaseUrl}#/visualize`,
           euiIconType: 'visualizeApp',
           disableSubUrlTracking: true,
@@ -88,7 +88,7 @@ export default function(kibana) {
           title: i18n.translate('kbn.dashboardTitle', {
             defaultMessage: 'Dashboard',
           }),
-          order: 1000,
+          order: 2500,
           url: `${kbnBaseUrl}#/dashboards`,
           euiIconType: 'dashboardApp',
           disableSubUrlTracking: true,

From 25691290183cfaa0f2389361f02978a82e428897 Mon Sep 17 00:00:00 2001
From: Michail Yasonik <michail.yasonik@elastic.co>
Date: Tue, 2 Jun 2020 12:32:46 -0400
Subject: [PATCH 2/3] new nav order

---
 src/plugins/visualize/public/plugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index 83c12c9f47a23..8a05adc18964a 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -102,7 +102,7 @@ export class VisualizePlugin
     core.application.register({
       id: 'visualize',
       title: 'Visualize',
-      order: 2000,
+      order: 8000,
       euiIconType: 'visualizeApp',
       defaultPath: '#/',
       category: DEFAULT_APP_CATEGORIES.kibana,

From 7ea19b531b9f1b1a751200fa73a508769c263336 Mon Sep 17 00:00:00 2001
From: Michail Yasonik <michail.yasonik@elastic.co>
Date: Tue, 2 Jun 2020 12:33:10 -0400
Subject: [PATCH 3/3] legacy href fix

---
 src/core/public/chrome/nav_links/to_nav_link.ts | 4 +---
 src/core/public/chrome/ui/header/nav_link.tsx   | 7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/core/public/chrome/nav_links/to_nav_link.ts b/src/core/public/chrome/nav_links/to_nav_link.ts
index b8f97f9ddc005..2dedbfd5f36ac 100644
--- a/src/core/public/chrome/nav_links/to_nav_link.ts
+++ b/src/core/public/chrome/nav_links/to_nav_link.ts
@@ -42,9 +42,7 @@ export function toNavLink(
     legacy: isLegacyApp(app),
     baseUrl,
     ...(isLegacyApp(app)
-      ? {
-          href: url && !url.startsWith(app.subUrlBase!) ? url : baseUrl,
-        }
+      ? {}
       : {
           href: url,
           url,
diff --git a/src/core/public/chrome/ui/header/nav_link.tsx b/src/core/public/chrome/ui/header/nav_link.tsx
index c09b15fac9bdb..969b6728e0263 100644
--- a/src/core/public/chrome/ui/header/nav_link.tsx
+++ b/src/core/public/chrome/ui/header/nav_link.tsx
@@ -55,7 +55,12 @@ export function createEuiListItem({
   navigateToApp,
   dataTestSubj,
 }: Props) {
-  const { legacy, active, id, title, disabled, euiIconType, icon, tooltip, href } = link;
+  const { legacy, active, id, title, disabled, euiIconType, icon, tooltip } = link;
+  let { href } = link;
+
+  if (legacy) {
+    href = link.url && !active ? link.url : link.baseUrl;
+  }
 
   return {
     label: tooltip ?? title,