From d0ee8b175446ade70c4653f6796ff094dc69f88c Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 03:00:13 -0700 Subject: [PATCH 01/19] Method to get nav link by its title + control nav link display state Former-commit-id: 8df249beec21f1cc7e3ed0a39dccda435f379446 --- src/ui/public/chrome/api/__tests__/nav.js | 13 +++++++++++++ src/ui/public/chrome/api/nav.js | 4 ++++ .../directives/app_switcher/app_switcher.html | 5 +++-- .../chrome/directives/app_switcher/app_switcher.js | 12 +++++++++--- .../directives/app_switcher/app_switcher.less | 9 ++++++++- 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js index 8dffa7e4eebbe..3e728dfc60ead 100644 --- a/src/ui/public/chrome/api/__tests__/nav.js +++ b/src/ui/public/chrome/api/__tests__/nav.js @@ -45,6 +45,19 @@ describe('chrome nav apis', function () { }); }); + describe('#getNavLinkByTitle', () => { + it ('retrieves the correct nav link, given its title', () => { + const nav = [ + { title: 'Discover', url: 'https://localhost:9200/app/kibana#discover' } + ]; + const { chrome, internals } = init({ nav }); + + const navLink = chrome.getNavLinkByTitle('Discover'); + expect(navLink).to.not.be(undefined); + expect(navLink.url).to.be('https://localhost:9200/app/kibana#discover'); + }); + }); + describe('internals.trackPossibleSubUrl()', function () { it('injects the globalState of the current url to all links for the same app', function () { const appUrlStore = new StubBrowserStorage(); diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js index fc815a34163a8..706468029fade 100644 --- a/src/ui/public/chrome/api/nav.js +++ b/src/ui/public/chrome/api/nav.js @@ -6,6 +6,10 @@ export default function (chrome, internals) { return internals.nav; }; + chrome.getNavLinkByTitle = (title) => { + return find(internals.nav, link => link.title === title); + }; + chrome.getBasePath = function () { return internals.basePath || ''; }; diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.html b/src/ui/public/chrome/directives/app_switcher/app_switcher.html index 1e0a0d0e665da..9f24453728f5b 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.html +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.html @@ -1,8 +1,9 @@
+ ng-repeat="link in switcher.shownNavLinks" + ng-class="{ active: link.active, 'is-app-switcher-app-link-disabled': link.enable !== undefined && !link.enable}" + > link.show === undefined || link.show); // links don't cause full-navigation events in certain scenarios // so we force them when needed diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.less b/src/ui/public/chrome/directives/app_switcher/app_switcher.less index aa4b9cec8ad23..d0d2f40ae72f6 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.less +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.less @@ -79,13 +79,20 @@ body { overflow-x: hidden; } height: @app-icon-height; line-height: @app-line-height; - > a { display: block; height: 100%; color: #ebf7fa; } + &.is-app-switcher-app-link-disabled { + opacity: 0.5; + + a { + cursor: default; + } + } + .app-icon { float: left; font-weight: bold; From 4e8a5d040ba262c1c6811c5a3a73d81ad4bac537 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 03:42:12 -0700 Subject: [PATCH 02/19] Add tooltip to nav link Former-commit-id: 27122034c93b9470858d6b86d81c03e92e7785ab --- .../public/chrome/directives/app_switcher/app_switcher.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.html b/src/ui/public/chrome/directives/app_switcher/app_switcher.html index 9f24453728f5b..3bbcea7255df0 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.html +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.html @@ -3,6 +3,10 @@ class="app-link" ng-repeat="link in switcher.shownNavLinks" ng-class="{ active: link.active, 'is-app-switcher-app-link-disabled': link.enable !== undefined && !link.enable}" + tooltip="{{link.tooltip}}" + tooltip-placement="right" + tooltip-popup-delay="400" + tooltip-append-to-body="1" > Date: Fri, 1 Jul 2016 04:03:08 -0700 Subject: [PATCH 03/19] Refactoring: extracting functions Former-commit-id: 96588bd12f2af6f9e1f5d45db710d0f44f2ba129 --- .../directives/app_switcher/app_switcher.html | 2 +- .../directives/app_switcher/app_switcher.js | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.html b/src/ui/public/chrome/directives/app_switcher/app_switcher.html index 3bbcea7255df0..bb900e985162c 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.html +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.html @@ -2,7 +2,7 @@
link.show === undefined || link.show); + this.shownNavLinks = filter(allNavLinks, isNavLinkShown); // links don't cause full-navigation events in certain scenarios // so we force them when needed From c237de6d5314b371a1f5c415b4302f23703a4cec Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 05:11:39 -0700 Subject: [PATCH 04/19] Giving nav links an ID For plugins, by default the plugin ID is used as the nav link ID. This can be overridden by explicitly specifying an ID on the nav link (useful for plugins that register multiple nav links). Former-commit-id: b25456a3c904ab44045241b7b887efc4219d6881 --- src/plugins/kibana/index.js | 4 ++++ src/ui/public/chrome/api/__tests__/nav.js | 10 +++++----- src/ui/public/chrome/api/nav.js | 4 ++-- src/ui/ui_app.js | 1 + src/ui/ui_nav_link.js | 3 ++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/plugins/kibana/index.js b/src/plugins/kibana/index.js index 61b83cb38c9d0..686c55ebd099b 100644 --- a/src/plugins/kibana/index.js +++ b/src/plugins/kibana/index.js @@ -40,6 +40,7 @@ module.exports = function (kibana) { links: [ { + id: 'kibana:discover', title: 'Discover', order: -1003, url: '/app/kibana#/discover', @@ -47,6 +48,7 @@ module.exports = function (kibana) { icon: 'plugins/kibana/assets/discover.svg', }, { + id: 'kibana:visualize', title: 'Visualize', order: -1002, url: '/app/kibana#/visualize', @@ -54,6 +56,7 @@ module.exports = function (kibana) { icon: 'plugins/kibana/assets/visualize.svg', }, { + id: 'kibana:dashboard', title: 'Dashboard', order: -1001, url: '/app/kibana#/dashboard', @@ -61,6 +64,7 @@ module.exports = function (kibana) { icon: 'plugins/kibana/assets/dashboard.svg', }, { + id: 'kibana:management', title: 'Management', order: 1000, url: '/app/kibana#/management', diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js index 3e728dfc60ead..54423781ffeb7 100644 --- a/src/ui/public/chrome/api/__tests__/nav.js +++ b/src/ui/public/chrome/api/__tests__/nav.js @@ -45,16 +45,16 @@ describe('chrome nav apis', function () { }); }); - describe('#getNavLinkByTitle', () => { - it ('retrieves the correct nav link, given its title', () => { + describe('#getNavLinkById', () => { + it ('retrieves the correct nav link, given its ID', () => { const nav = [ - { title: 'Discover', url: 'https://localhost:9200/app/kibana#discover' } + { id: 'kibana:discover', title: 'Discover' } ]; const { chrome, internals } = init({ nav }); - const navLink = chrome.getNavLinkByTitle('Discover'); + const navLink = chrome.getNavLinkById('kibana:discover'); expect(navLink).to.not.be(undefined); - expect(navLink.url).to.be('https://localhost:9200/app/kibana#discover'); + expect(navLink.title).to.be('Discover'); }); }); diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js index 706468029fade..89a8020d169b6 100644 --- a/src/ui/public/chrome/api/nav.js +++ b/src/ui/public/chrome/api/nav.js @@ -6,8 +6,8 @@ export default function (chrome, internals) { return internals.nav; }; - chrome.getNavLinkByTitle = (title) => { - return find(internals.nav, link => link.title === title); + chrome.getNavLinkById = (id) => { + return find(internals.nav, link => link.id === id); }; chrome.getBasePath = function () { diff --git a/src/ui/ui_app.js b/src/ui/ui_app.js index 57b9c6421a2dd..f7fd340c19d37 100644 --- a/src/ui/ui_app.js +++ b/src/ui/ui_app.js @@ -22,6 +22,7 @@ class UiApp { if (!this.hidden) { // any non-hidden app has a url, so it gets a "navLink" this.navLink = this.uiExports.navLinks.new({ + id: this.id, title: this.title, description: this.description, icon: this.icon, diff --git a/src/ui/ui_nav_link.js b/src/ui/ui_nav_link.js index a0db4646fdb32..fdcd81a9dd42d 100644 --- a/src/ui/ui_nav_link.js +++ b/src/ui/ui_nav_link.js @@ -3,6 +3,7 @@ import { join } from 'path'; export default class UiNavLink { constructor(uiExports, spec) { + this.id = spec.id; this.title = spec.title; this.order = spec.order || 0; this.url = `${uiExports.urlBasePath || ''}${spec.url}`; @@ -12,6 +13,6 @@ export default class UiNavLink { } toJSON() { - return pick(this, ['title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl']); + return pick(this, ['id', 'title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl']); } } From 29a53eb6a2a819574a7d6b1c8a84e40ec0ebdd83 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 05:34:33 -0700 Subject: [PATCH 05/19] Fixing test so it passes Former-commit-id: 0b1acad99cc1b2505006b9d64d0367b76f464782 --- src/ui/public/chrome/api/__tests__/nav.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js index 54423781ffeb7..2a42432a15db7 100644 --- a/src/ui/public/chrome/api/__tests__/nav.js +++ b/src/ui/public/chrome/api/__tests__/nav.js @@ -47,10 +47,11 @@ describe('chrome nav apis', function () { describe('#getNavLinkById', () => { it ('retrieves the correct nav link, given its ID', () => { + const appUrlStore = new StubBrowserStorage(); const nav = [ { id: 'kibana:discover', title: 'Discover' } ]; - const { chrome, internals } = init({ nav }); + const { chrome, internals } = init({ appUrlStore, nav }); const navLink = chrome.getNavLinkById('kibana:discover'); expect(navLink).to.not.be(undefined); From eb1fee085b4fe11b0805a92bb2b470704675a681 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 06:07:28 -0700 Subject: [PATCH 06/19] Throw error if nav link with given ID is not found Former-commit-id: 9161c0c170b5c76fd3f45e51f102e0eb05c6f831 --- src/ui/public/chrome/api/__tests__/nav.js | 16 ++++++++++++++++ src/ui/public/chrome/api/nav.js | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js index 2a42432a15db7..a9301cbebebeb 100644 --- a/src/ui/public/chrome/api/__tests__/nav.js +++ b/src/ui/public/chrome/api/__tests__/nav.js @@ -57,6 +57,22 @@ describe('chrome nav apis', function () { expect(navLink).to.not.be(undefined); expect(navLink.title).to.be('Discover'); }); + + it ('throws an error if the nav link with the given ID is not found', () => { + const appUrlStore = new StubBrowserStorage(); + const nav = [ + { id: 'kibana:discover', title: 'Discover' } + ]; + const { chrome, internals } = init({ appUrlStore, nav }); + + let errorThrown = false; + try { + const navLink = chrome.getNavLinkById('nonexistent'); + } catch (e) { + errorThrown = true; + } + expect(errorThrown).to.be(true); + }); }); describe('internals.trackPossibleSubUrl()', function () { diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js index 89a8020d169b6..f9e999087c202 100644 --- a/src/ui/public/chrome/api/nav.js +++ b/src/ui/public/chrome/api/nav.js @@ -7,7 +7,12 @@ export default function (chrome, internals) { }; chrome.getNavLinkById = (id) => { - return find(internals.nav, link => link.id === id); + const navLink = find(internals.nav, link => link.id === id); + if (navLink) { + return navLink; + } else { + throw new Error(`Nav link for id = ${id} not found`); + } }; chrome.getBasePath = function () { From f6e3c997d446d41270b2979800ba60f46d794eb8 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 06:58:53 -0700 Subject: [PATCH 07/19] Adding unit test for toJSON() Former-commit-id: bb45a390f8801301feaa7860a738a44c9152ad0e --- src/ui/__tests__/ui_nav_link.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/ui/__tests__/ui_nav_link.js diff --git a/src/ui/__tests__/ui_nav_link.js b/src/ui/__tests__/ui_nav_link.js new file mode 100644 index 0000000000000..dfb9bea74ff00 --- /dev/null +++ b/src/ui/__tests__/ui_nav_link.js @@ -0,0 +1,27 @@ +import expect from 'expect.js'; + +import UiNavLink from '../ui_nav_link'; + +describe('UiNavLink', () => { + describe('#toJSON', () => { + it ('returns the expected properties', () => { + const uiExports = { + urlBasePath: 'http://localhost:5601/rnd/' + }; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + const json = link.toJSON(); + + ['id', 'title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl'].forEach(expectedProperty => { + expect(json).to.have.property(expectedProperty); + }); + }); + }); +}); From 3ee63e5d64a342fb95378a27df6d63cd68dc0570 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 07:03:18 -0700 Subject: [PATCH 08/19] Fixing minor typo Former-commit-id: 921533a05402f4caf61adadf620413e0416ce782 --- src/ui/__tests__/ui_nav_link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/__tests__/ui_nav_link.js b/src/ui/__tests__/ui_nav_link.js index dfb9bea74ff00..77c62d02550e9 100644 --- a/src/ui/__tests__/ui_nav_link.js +++ b/src/ui/__tests__/ui_nav_link.js @@ -6,7 +6,7 @@ describe('UiNavLink', () => { describe('#toJSON', () => { it ('returns the expected properties', () => { const uiExports = { - urlBasePath: 'http://localhost:5601/rnd/' + urlBasePath: 'http://localhost:5601/rnd' }; const spec = { id: 'kibana:discover', From 0327be2e3db9aea7218373bbc8ad616c5d0c709e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 07:03:39 -0700 Subject: [PATCH 09/19] Adding unit test for constructor Former-commit-id: 7e931bd3a3a0899610bee66d7f3640da581adb6d --- src/ui/__tests__/ui_nav_link.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/ui/__tests__/ui_nav_link.js b/src/ui/__tests__/ui_nav_link.js index 77c62d02550e9..a06a23e165e7c 100644 --- a/src/ui/__tests__/ui_nav_link.js +++ b/src/ui/__tests__/ui_nav_link.js @@ -3,6 +3,31 @@ import expect from 'expect.js'; import UiNavLink from '../ui_nav_link'; describe('UiNavLink', () => { + describe('constructor', () => { + it ('initializes the object properties as expected', () => { + const uiExports = { + urlBasePath: 'http://localhost:5601/rnd' + }; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + + expect(link.id).to.be(spec.id); + expect(link.title).to.be(spec.title); + expect(link.order).to.be(spec.order); + expect(link.url).to.be(uiExports.urlBasePath + spec.url); + expect(link.description).to.be(spec.description); + expect(link.icon).to.be(spec.icon); + + }); + }); + describe('#toJSON', () => { it ('returns the expected properties', () => { const uiExports = { From c47c06e6db0d125d8a59e5e35077a363e3b07d5b Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 11:27:21 -0700 Subject: [PATCH 10/19] Outdenting closing bracket per styleguide Former-commit-id: a8995e3f53da96928d6c8a87e6824afc58bc2269 --- src/ui/public/chrome/directives/app_switcher/app_switcher.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.html b/src/ui/public/chrome/directives/app_switcher/app_switcher.html index bb900e985162c..4a332cc94e657 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.html +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.html @@ -7,7 +7,7 @@ tooltip-placement="right" tooltip-popup-delay="400" tooltip-append-to-body="1" - > + > Date: Fri, 1 Jul 2016 11:31:14 -0700 Subject: [PATCH 11/19] Use ES6 find instead of _.find Former-commit-id: a376c031159e9d7329fc1147b6822ebcc41435c5 --- src/ui/public/chrome/api/nav.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js index f9e999087c202..441658f84983c 100644 --- a/src/ui/public/chrome/api/nav.js +++ b/src/ui/public/chrome/api/nav.js @@ -7,7 +7,7 @@ export default function (chrome, internals) { }; chrome.getNavLinkById = (id) => { - const navLink = find(internals.nav, link => link.id === id); + const navLink = internals.nav.find(link => link.id === id); if (navLink) { return navLink; } else { From 1313b8f5f919466b9bc4743444507ffbc5c8779a Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 11:32:48 -0700 Subject: [PATCH 12/19] Using ES6 template literal instead of old school string concatenation Former-commit-id: f4390baae21425c15d4990d4d3140ff32ac15f93 --- src/ui/__tests__/ui_nav_link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/__tests__/ui_nav_link.js b/src/ui/__tests__/ui_nav_link.js index a06a23e165e7c..f7676fb9cd9cc 100644 --- a/src/ui/__tests__/ui_nav_link.js +++ b/src/ui/__tests__/ui_nav_link.js @@ -21,7 +21,7 @@ describe('UiNavLink', () => { expect(link.id).to.be(spec.id); expect(link.title).to.be(spec.title); expect(link.order).to.be(spec.order); - expect(link.url).to.be(uiExports.urlBasePath + spec.url); + expect(link.url).to.be(`${uiExports.urlBasePath}${spec.url}`); expect(link.description).to.be(spec.description); expect(link.icon).to.be(spec.icon); From 46fb76fa0036c67932de035d6e4933dcd647b939 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 11:35:06 -0700 Subject: [PATCH 13/19] Using native Array.prototype.filter() instead of _.filter() Former-commit-id: 30032c52b43d09b859ba6c8b39a2f8252fb89830 --- src/ui/public/chrome/directives/app_switcher/app_switcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/app_switcher.js index 2fc3e9348431a..01236785b5d02 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.js @@ -67,7 +67,7 @@ uiModules this.isNavLinkEnabled = isNavLinkEnabled; const allNavLinks = $scope.chrome.getNavLinks(); - this.shownNavLinks = filter(allNavLinks, isNavLinkShown); + this.shownNavLinks = allNavLinks.filter(isNavLinkShown); // links don't cause full-navigation events in certain scenarios // so we force them when needed From dbbd1951707e7ebb16b3b8ab4e6b470ce9de0f6a Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 11:45:42 -0700 Subject: [PATCH 14/19] Using class instead of element selector Former-commit-id: 8dac9c3a0a07796d2b7298b9d7169e6863299488 --- .../public/chrome/directives/app_switcher/app_switcher.html | 4 +++- .../public/chrome/directives/app_switcher/app_switcher.less | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.html b/src/ui/public/chrome/directives/app_switcher/app_switcher.html index 4a332cc94e657..10f5697bc8afa 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.html +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.html @@ -12,7 +12,9 @@ + data-test-subj="appLink" + ng-class="{ 'app-link__anchor': !switcher.isNavLinkEnabled(link) }" + >
{{ link.title[0] }}
diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.less b/src/ui/public/chrome/directives/app_switcher/app_switcher.less index d0d2f40ae72f6..997cdb17bcf39 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.less +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.less @@ -88,7 +88,7 @@ body { overflow-x: hidden; } &.is-app-switcher-app-link-disabled { opacity: 0.5; - a { + .app-link__anchor { cursor: default; } } From 0d4c75d280752ac5604d2c2b62a74be9e8ac8a3f Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 11:54:01 -0700 Subject: [PATCH 15/19] Adding unit tests for default paths involving various properties Former-commit-id: 2601fcfea7105b376282486a82332552097deb90 --- src/ui/__tests__/ui_nav_link.js | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/ui/__tests__/ui_nav_link.js b/src/ui/__tests__/ui_nav_link.js index f7676fb9cd9cc..e5a2ea8a2a706 100644 --- a/src/ui/__tests__/ui_nav_link.js +++ b/src/ui/__tests__/ui_nav_link.js @@ -24,7 +24,66 @@ describe('UiNavLink', () => { expect(link.url).to.be(`${uiExports.urlBasePath}${spec.url}`); expect(link.description).to.be(spec.description); expect(link.icon).to.be(spec.icon); + }); + + it ('initializes the url property without a base path when one is not specified in the spec', () => { + const uiExports = {}; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + + expect(link.url).to.be(spec.url); + }); + + it ('initializes the order property to 0 when order is not specified in the spec', () => { + const uiExports = {}; + const spec = { + id: 'kibana:discover', + title: 'Discover', + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + + expect(link.order).to.be(0); + }); + + it ('initializes the linkToLastSubUrl property to false when false is specified in the spec', () => { + const uiExports = {}; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + linkToLastSubUrl: false + }; + const link = new UiNavLink(uiExports, spec); + + expect(link.linkToLastSubUrl).to.be(false); + }); + + it ('initializes the linkToLastSubUrl property to true by default', () => { + const uiExports = {}; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + expect(link.linkToLastSubUrl).to.be(true); }); }); From 1d3245f02f81508442466181f15e970b0117946e Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 16:09:25 -0700 Subject: [PATCH 16/19] Adding hidden, disabled and tooltip properties to UiNavLink class Former-commit-id: 42cc3013667146462a07ee236c53e0dd8064dfe0 --- src/ui/__tests__/ui_nav_link.js | 54 +++++++++++++++++-- .../directives/app_switcher/app_switcher.js | 4 +- src/ui/ui_nav_link.js | 5 +- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/src/ui/__tests__/ui_nav_link.js b/src/ui/__tests__/ui_nav_link.js index e5a2ea8a2a706..f264ccf426ecc 100644 --- a/src/ui/__tests__/ui_nav_link.js +++ b/src/ui/__tests__/ui_nav_link.js @@ -15,6 +15,8 @@ describe('UiNavLink', () => { url: '/app/kibana#/discover', description: 'interactively explore your data', icon: 'plugins/kibana/assets/discover.svg', + hidden: true, + disabled: true }; const link = new UiNavLink(uiExports, spec); @@ -24,6 +26,8 @@ describe('UiNavLink', () => { expect(link.url).to.be(`${uiExports.urlBasePath}${spec.url}`); expect(link.description).to.be(spec.description); expect(link.icon).to.be(spec.icon); + expect(link.hidden).to.be(spec.hidden); + expect(link.disabled).to.be(spec.disabled); }); it ('initializes the url property without a base path when one is not specified in the spec', () => { @@ -85,6 +89,51 @@ describe('UiNavLink', () => { expect(link.linkToLastSubUrl).to.be(true); }); + + it ('initializes the hidden property to false by default', () => { + const uiExports = {}; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + + expect(link.hidden).to.be(false); + }); + + it ('initializes the disabled property to false by default', () => { + const uiExports = {}; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + + expect(link.disabled).to.be(false); + }); + + it ('initializes the tooltip property to an empty string by default', () => { + const uiExports = {}; + const spec = { + id: 'kibana:discover', + title: 'Discover', + order: -1003, + url: '/app/kibana#/discover', + description: 'interactively explore your data', + icon: 'plugins/kibana/assets/discover.svg', + }; + const link = new UiNavLink(uiExports, spec); + + expect(link.tooltip).to.be(''); + }); }); describe('#toJSON', () => { @@ -103,9 +152,8 @@ describe('UiNavLink', () => { const link = new UiNavLink(uiExports, spec); const json = link.toJSON(); - ['id', 'title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl'].forEach(expectedProperty => { - expect(json).to.have.property(expectedProperty); - }); + ['id', 'title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl', 'hidden', 'disabled', 'tooltip'] + .forEach(expectedProperty => expect(json).to.have.property(expectedProperty)); }); }); }); diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/app_switcher.js index 01236785b5d02..8f54b4aa4a09e 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.js @@ -6,11 +6,11 @@ import uiModules from 'ui/modules'; import appSwitcherTemplate from './app_switcher.html'; function isNavLinkEnabled(link) { - return link.enable === undefined || link.enable; + return !link.disabled; } function isNavLinkShown(link) { - return link.show === undefined || link.show; + return !link.hidden; } uiModules diff --git a/src/ui/ui_nav_link.js b/src/ui/ui_nav_link.js index fdcd81a9dd42d..63847d97de767 100644 --- a/src/ui/ui_nav_link.js +++ b/src/ui/ui_nav_link.js @@ -10,9 +10,12 @@ export default class UiNavLink { this.description = spec.description; this.icon = spec.icon; this.linkToLastSubUrl = spec.linkToLastSubUrl === false ? false : true; + this.hidden = spec.hidden || false; + this.disabled = spec.disabled || false; + this.tooltip = spec.tooltip || ''; } toJSON() { - return pick(this, ['id', 'title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl']); + return pick(this, ['id', 'title', 'url', 'order', 'description', 'icon', 'linkToLastSubUrl', 'hidden', 'disabled', 'tooltip']); } } From 68503539c473d3c10a38d0092a626ecc3769aed0 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 17:07:45 -0700 Subject: [PATCH 17/19] Replace 2 assertions with 1 Former-commit-id: de1ea90a846d1f2be66976ec3bc6d3d5096631ee --- src/ui/public/chrome/api/__tests__/nav.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js index a9301cbebebeb..735cde4683987 100644 --- a/src/ui/public/chrome/api/__tests__/nav.js +++ b/src/ui/public/chrome/api/__tests__/nav.js @@ -54,8 +54,7 @@ describe('chrome nav apis', function () { const { chrome, internals } = init({ appUrlStore, nav }); const navLink = chrome.getNavLinkById('kibana:discover'); - expect(navLink).to.not.be(undefined); - expect(navLink.title).to.be('Discover'); + expect(navLink).to.eql(nav[0]); }); it ('throws an error if the nav link with the given ID is not found', () => { From ac3cd6e96ee6aaefce8bb55ed549d860a6a58308 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Fri, 1 Jul 2016 17:09:24 -0700 Subject: [PATCH 18/19] Remove unused var Former-commit-id: 81072ad5c20e04456197f4dc5f1c4812ee2a106d --- src/ui/public/chrome/directives/app_switcher/app_switcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/app_switcher.js index 8f54b4aa4a09e..9119e0bf63828 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.js @@ -1,6 +1,6 @@ import DomLocationProvider from 'ui/dom_location'; import { parse } from 'url'; -import { bindKey, filter } from 'lodash'; +import { bindKey } from 'lodash'; import '../app_switcher/app_switcher.less'; import uiModules from 'ui/modules'; import appSwitcherTemplate from './app_switcher.html'; From e603442815a55d7b2d547dc5023a3c26f9ec3ca3 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 5 Jul 2016 15:14:29 -0700 Subject: [PATCH 19/19] Return early from function Former-commit-id: c8b4d2de2166cfe8bb14852921b4eb1503ba11a6 --- src/ui/public/chrome/api/nav.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js index 441658f84983c..f78ea3a364162 100644 --- a/src/ui/public/chrome/api/nav.js +++ b/src/ui/public/chrome/api/nav.js @@ -8,11 +8,10 @@ export default function (chrome, internals) { chrome.getNavLinkById = (id) => { const navLink = internals.nav.find(link => link.id === id); - if (navLink) { - return navLink; - } else { + if (!navLink) { throw new Error(`Nav link for id = ${id} not found`); } + return navLink; }; chrome.getBasePath = function () {