Skip to content

Commit

Permalink
Deleted old kbn-top-nav directive (#43168) (#43523)
Browse files Browse the repository at this point in the history
* Deleted old kbn-top-nav directive.
Can be merged only when monitoring replace their last usage.

* fix texts

* Remove CSS import
Removed fix to config in monitoring (fix is on #43187)

* rename monitoring directive
  • Loading branch information
Liza Katz authored Aug 19, 2019
1 parent d22c55d commit 4849d03
Show file tree
Hide file tree
Showing 27 changed files with 111 additions and 1,139 deletions.
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/console/public/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<kbn-top-nav-v2
<kbn-top-nav
app-name="'console'"
config="topNavMenu"
></kbn-top-nav-v2>
></kbn-top-nav>
<kbn-dev-tools-app data-test-subj="console">
<sense-history ng-show="showHistory" is-shown="showHistory" close="closeHistory()" history-dirty="lastRequestTimestamp"></sense-history>
<div class="conApp">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
}

public render() {
// This is needed, as kbn-top-nav-v2 might render before npSetup.core.uiSettings is set.
// This is needed, as kbn-top-nav might render before npSetup.core.uiSettings is set.
// This won't be needed when it's loaded exclusively with React.
if (!this.props.uiSettings) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ng-class="{'dshAppContainer--withMargins': model.useMargins}"
>
<!-- Local nav. -->
<kbn-top-nav-v2
<kbn-top-nav
ng-show="chrome.getVisible()"
app-name="'dashboard'"
config="topNavMenu"
Expand All @@ -23,7 +23,7 @@
is-refresh-paused="model.refreshInterval.pause"
refresh-interval="model.refreshInterval.value"
on-refresh-change="onRefreshChange">
</kbn-top-nav-v2>
</kbn-top-nav>

<!--
The top nav is hidden in embed mode but the filter bar must still be present so
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/kibana/public/discover/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<discover-app class="app-container">
<!-- Local nav. -->

<kbn-top-nav-v2
<kbn-top-nav
app-name="'discover'"
config="topNavMenu"
show-search-bar="true"
Expand All @@ -18,7 +18,7 @@
refresh-interval="refreshInterval.value"
on-refresh-change="onRefreshChange"
>
</kbn-top-nav-v2>
</kbn-top-nav>

<main class="container-fluid">
<div class="row">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
All visualizaions also have least a timepicker \ autorefresh component, which is why
show-query-bar is set to "true".
-->
<kbn-top-nav-v2
<kbn-top-nav
app-name="'visualize'"
config="topNavMenu"
show-search-bar="true"
Expand All @@ -53,7 +53,7 @@
refresh-interval="refreshInterval.value"
on-refresh-change="onRefreshChange"
>
</kbn-top-nav-v2>
</kbn-top-nav>

<!--
The top nav is hidden in embed mode but the filter bar must still be present so
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/timelion/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</span>
</span>
<!-- Local nav. -->
<kbn-top-nav-v2
<kbn-top-nav
app-name="'timelion'"
config="topNavMenu"
show-search-bar="true"
Expand All @@ -24,7 +24,7 @@
refresh-interval="model.refreshInterval.value"
on-refresh-change="onRefreshChange"
on-query-submit="onTimeUpdate">
</kbn-top-nav-v2>
</kbn-top-nav>


<div class="timApp__menus">
Expand Down
1 change: 0 additions & 1 deletion src/legacy/ui/public/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
@import './error_url_overflow/index';
@import './exit_full_screen/index';
@import './field_editor/index';
@import './kbn_top_nav/index';
@import './notify/index';
@import './share/index';
@import './style_compile/index';
Expand Down
88 changes: 0 additions & 88 deletions src/legacy/ui/public/kbn_top_nav/__tests__/kbn_top_nav.js

This file was deleted.

Loading

0 comments on commit 4849d03

Please sign in to comment.