Merge pull request elastic#7595 from cjcenizal/chore/remove-deprecate…

…d-tabs-nav Remove deprecated nav UI and chrome tabs API. Former-commit-id: b258ddc
airow · Jul 18, 2016 · 4b949e8 · 4b949e8
2 parents 8cdc4ec + c3a515d
commit 4b949e8
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 631 deletions.
diff --git a/src/core_plugins/console/public/tests/tests.js b/src/core_plugins/console/public/tests/tests.js
@@ -1,10 +1,6 @@
 require('ace');
 
 require('ui/chrome')
-  .setTabs([{
-    id: '',
-    title: 'Sense Tests'
-  }])
   .setRootTemplate(require('./index.html'))
   .setRootController(function () {
     window.QUnit = require('qunit-1.10.0');

diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js
@@ -28,11 +28,6 @@ routes
 });
 
 chrome
-.setTabDefaults({
-  resetWhenActive: true,
-  lastUrlStore: window.sessionStorage,
-  activeIndicatorColor: '#656a76'
-})
 .setRootController('kibana', function ($scope, courier, config) {
   // wait for the application to finish loading
   $scope.$on('application.load', function () {

diff --git a/src/ui/public/chrome/__tests__/tab.js b/src/ui/public/chrome/__tests__/tab.js
diff --git a/src/ui/public/chrome/__tests__/tab_collection.js b/src/ui/public/chrome/__tests__/tab_collection.js
diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js
@@ -101,19 +101,13 @@ export default function (chrome, internals) {
     const { appId, globalState: newGlobalState } = decodeKibanaUrl(url);
 
     for (const link of internals.nav) {
-      const matchingTab = find(internals.tabs, { rootUrl: link.url });
-
       link.active = startsWith(url, link.url);
       if (link.active) {
         setLastUrl(link, url);
         continue;
       }
 
-      if (matchingTab) {
-        setLastUrl(link, matchingTab.getLastUrl());
-      } else {
-        refreshLastUrl(link);
-      }
+      refreshLastUrl(link);
 
       if (newGlobalState) {
         injectNewGlobalState(link, appId, newGlobalState);