New Kibana app link order (#66320)

elastic · Jun 2, 2020 · 0247df4 · 0247df4
1 parent 5e2a78b
commit 0247df4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 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
@@ -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
@@ -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,

diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -228,7 +228,7 @@ export class DashboardPlugin
     const app: App = {
       id: DashboardConstants.DASHBOARDS_ID,
       title: 'Dashboard',
-      order: -1001,
+      order: 2500,
       euiIconType: 'dashboardApp',
       defaultPath: `#${DashboardConstants.LANDING_PAGE_PATH}`,
       updater$: this.appStateUpdater,

diff --git a/src/plugins/discover/public/plugin.ts b/src/plugins/discover/public/plugin.ts
@@ -188,7 +188,7 @@ export class DiscoverPlugin
       id: 'discover',
       title: 'Discover',
       updater$: this.appStateUpdater.asObservable(),
-      order: -1004,
+      order: 1000,
       euiIconType: 'discoverApp',
       defaultPath: '#/',
       category: DEFAULT_APP_CATEGORIES.kibana,

diff --git 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: -1002,
+      order: 8000,
       euiIconType: 'visualizeApp',
       defaultPath: '#/',
       category: DEFAULT_APP_CATEGORIES.kibana,