Merge branch 'master' of github.com:elastic/kibana into pr/33438

elastic · Apr 22, 2019 · 6aad909 · 6aad909
2 parents 91cb4c7 + 3d7030c
commit 6aad909
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
@@ -306,6 +306,7 @@ include::{docdir}/settings/apm-settings.asciidoc[]
 include::{docdir}/settings/dev-settings.asciidoc[]
 include::{docdir}/settings/graph-settings.asciidoc[]
 include::{docdir}/settings/infrastructure-ui-settings.asciidoc[]
+include::{docdir}/settings/i18n-settings.asciidoc[]
 include::{docdir}/settings/logs-ui-settings.asciidoc[]
 include::{docdir}/settings/ml-settings.asciidoc[]
 include::{docdir}/settings/monitoring-settings.asciidoc[]

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.html b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.html
@@ -23,7 +23,6 @@
           is-refresh-paused="model.refreshInterval.pause"
           refresh-interval="model.refreshInterval.value"
           on-refresh-change="onRefreshChange"
-          watch-depth="reference"
         ></search-bar>
       </div>
     </div>

diff --git a/src/legacy/core_plugins/kibana/public/discover/index.html b/src/legacy/core_plugins/kibana/public/discover/index.html
@@ -45,7 +45,6 @@ <h1 tabindex="0" id="kui_local_breadcrumb" class="kuiLocalBreadcrumb" ng-if="opt
           is-refresh-paused="refreshInterval.pause"
           refresh-interval="refreshInterval.value"
           on-refresh-change="onRefreshChange"
-          watch-depth="reference"
         ></search-bar>
       </div>
     </div>

diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
@@ -45,7 +45,6 @@
             refresh-interval="refreshInterval.value"
             show-auto-refresh-only="showAutoRefreshOnlyInQueryBar"
             on-refresh-change="onRefreshChange"
-            watch-depth="reference"
           ></search-bar>
         </div>
       </div>

diff --git a/src/legacy/ui/public/search_bar/components/search_bar.tsx b/src/legacy/ui/public/search_bar/components/search_bar.tsx
@@ -39,6 +39,10 @@ interface DateRange {
   to: string;
 }
 
+/**
+ * NgReact lib requires that changes to the props need to be made in the directive config as well
+ * See [search_bar\directive\index.js] file
+ */
 interface Props {
   query: {
     query: string;

diff --git a/src/legacy/ui/public/search_bar/directive/index.js b/src/legacy/ui/public/search_bar/directive/index.js
@@ -27,10 +27,33 @@ const app = uiModules.get('app/kibana', ['react']);
 app.directive('searchBar', (reactDirective, localStorage) => {
   return reactDirective(
     wrapInI18nContext(SearchBar),
-    undefined,
+    [
+      ['query', { watchDepth: 'reference' }],
+      ['store', { watchDepth: 'reference' }],
+      ['intl', { watchDepth: 'reference' }],
+
+      ['onQuerySubmit', { watchDepth: 'reference' }],
+      ['onFiltersUpdated', { watchDepth: 'reference' }],
+      ['onRefreshChange', { watchDepth: 'reference' }],
+
+      ['indexPatterns', { watchDepth: 'collection' }],
+      ['filters', { watchDepth: 'collection' }],
+
+      'appName',
+      'screenTitle',
+      'showFilterBar',
+      'showQueryBar',
+      'showDatePicker',
+      'dateRangeFrom',
+      'dateRangeTo',
+      'isRefreshPaused',
+      'refreshInterval',
+      'disableAutoFocus',
+      'showAutoRefreshOnly',
+    ],
     {},
     {
       store: localStorage,
-    }
+    },
   );
 });