Moved kbnGlobalTimepicker into old kbn_top_nav (both do be deprecated)

.i18nrc.json

@@ -2,6 +2,7 @@
   "paths": {
     "common.ui": "src/legacy/ui",
     "data": "src/legacy/core_plugins/data",
+    "kibana_react": "src/legacy/core_plugins/kibana_react",
     "server": "src/legacy/server",
     "console": "src/legacy/core_plugins/console",
     "core": "src/core",

src/legacy/core_plugins/console/public/index.html

@@ -1,4 +1,7 @@
-<kbn-top-nav name="console" config="topNavMenu"></kbn-top-nav>
+<kbn-top-nav-v2 
+  app-name="'console'"
+  config="topNavMenu" 
+></kbn-top-nav-v2>
 <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">

src/legacy/core_plugins/console/public/src/helpers/get_top_nav.ts

@@ -28,20 +28,20 @@ import { showHelpPanel } from './help_show_panel';
 export function getTopNavConfig($scope: IScope, toggleHistory: () => {}) {
   return [
     {
-      key: 'history',
+      id: 'history',
       label: i18n.translate('console.topNav.historyTabLabel', {
         defaultMessage: 'History',
       }),
       description: i18n.translate('console.topNav.historyTabDescription', {
         defaultMessage: 'History',
       }),
       run: () => {
-        toggleHistory();
+        $scope.$evalAsync(toggleHistory);
       },
       testId: 'consoleHistoryButton',
     },
     {
-      key: 'settings',
+      id: 'settings',
       label: i18n.translate('console.topNav.settingsTabLabel', {
         defaultMessage: 'Settings',
       }),
@@ -54,7 +54,7 @@ export function getTopNavConfig($scope: IScope, toggleHistory: () => {}) {
       testId: 'consoleSettingsButton',
     },
     {
-      key: 'help',
+      id: 'help',
       label: i18n.translate('console.topNav.helpTabLabel', {
         defaultMessage: 'Help',
       }),

src/legacy/core_plugins/data/public/filter/index.tsx

@@ -18,3 +18,5 @@
  */
 
 export { FilterService, FilterSetup } from './filter_service';
+
+export { FilterBar } from './filter_bar';

src/legacy/core_plugins/data/public/index.ts

@@ -24,7 +24,6 @@
 // @ts-ignore
 import { renderersRegistry } from 'plugins/interpreter/registries';
 import { ExpressionsService, ExpressionsSetup } from './expressions';
-import { SearchService, SearchSetup } from './search';
 import { QueryService, QuerySetup } from './query';
 import { FilterService, FilterSetup } from './filter';
 import { IndexPatternsService, IndexPatternsSetup } from './index_patterns';
@@ -34,14 +33,12 @@ export class DataPlugin {
   private readonly expressions: ExpressionsService;
   private readonly filter: FilterService;
   private readonly indexPatterns: IndexPatternsService;
-  private readonly search: SearchService;
   private readonly query: QueryService;
 
   constructor() {
     this.indexPatterns = new IndexPatternsService();
     this.filter = new FilterService();
     this.query = new QueryService();
-    this.search = new SearchService();
     this.expressions = new ExpressionsService();
   }
 
@@ -61,7 +58,6 @@ export class DataPlugin {
       filter: this.filter.setup({
         indexPatterns: indexPatternsService.indexPatterns,
       }),
-      search: this.search.setup(),
       query: this.query.setup(),
     };
   }
@@ -70,7 +66,6 @@ export class DataPlugin {
     this.expressions.stop();
     this.indexPatterns.stop();
     this.filter.stop();
-    this.search.stop();
     this.query.stop();
   }
 }
@@ -80,7 +75,6 @@ export interface DataSetup {
   expressions: ExpressionsSetup;
   indexPatterns: IndexPatternsSetup;
   filter: FilterSetup;
-  search: SearchSetup;
   query: QuerySetup;
 }
 
@@ -89,7 +83,8 @@ export { ExpressionRenderer, ExpressionRendererProps, ExpressionRunner } from '.
 
 /** @public types */
 export { IndexPattern, StaticIndexPattern, StaticIndexPatternField, Field } from './index_patterns';
-export { Query } from './query';
+export { Query, QueryBar } from './query';
+export { FilterBar } from './filter';
 export { FilterManager, FilterStateManager, uniqFilters } from './filter/filter_manager';
 
 /** @public static code */

src/legacy/core_plugins/data/public/query/index.ts

@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { QueryService, QuerySetup, Query } from './query_service';
+export * from './query_service';

src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx

@@ -66,6 +66,8 @@ const mockIndexPattern = {
 };
 
 describe('QueryBar', () => {
+  const QUERY_INPUT_SELECTOR = 'InjectIntl(QueryBarInputUI)';
+  const TIMEPICKER_SELECTOR = 'EuiSuperDatePicker';
   beforeEach(() => {
     jest.clearAllMocks();
   });
@@ -102,4 +104,104 @@ describe('QueryBar', () => {
 
     expect(mockPersistedLogFactory.mock.calls[0][0]).toBe('typeahead:discover-kuery');
   });
+
+  it('Should render only timepicker when no options provided', () => {
+    const component = shallowWithIntl(
+      <QueryBar.WrappedComponent
+        onSubmit={noop}
+        appName={'discover'}
+        store={createMockStorage()}
+        intl={null as any}
+      />
+    );
+
+    expect(component.find(QUERY_INPUT_SELECTOR).length).toBe(0);
+    expect(component.find(TIMEPICKER_SELECTOR).length).toBe(1);
+  });
+
+  it('Should disable timepicker when asked', () => {
+    const component = shallowWithIntl(
+      <QueryBar.WrappedComponent
+        onSubmit={noop}
+        appName={'discover'}
+        store={createMockStorage()}
+        intl={null as any}
+        showDatePicker={false}
+      />
+    );
+
+    expect(component.find(QUERY_INPUT_SELECTOR).length).toBe(0);
+    expect(component.find(TIMEPICKER_SELECTOR).length).toBe(0);
+  });
+
+  it('Should render timepicker with options', () => {
+    const component = shallowWithIntl(
+      <QueryBar.WrappedComponent
+        onSubmit={noop}
+        appName={'discover'}
+        screenTitle={'Another Screen'}
+        store={createMockStorage()}
+        intl={null as any}
+        showDatePicker={true}
+        dateRangeFrom={'now-7d'}
+        dateRangeTo={'now'}
+      />
+    );
+
+    expect(component.find(QUERY_INPUT_SELECTOR).length).toBe(0);
+    expect(component.find(TIMEPICKER_SELECTOR).length).toBe(1);
+  });
+
+  it('Should render only query input bar', () => {
+    const component = shallowWithIntl(
+      <QueryBar.WrappedComponent
+        query={kqlQuery}
+        onSubmit={noop}
+        appName={'discover'}
+        screenTitle={'Another Screen'}
+        indexPatterns={[mockIndexPattern]}
+        store={createMockStorage()}
+        intl={null as any}
+        showDatePicker={false}
+      />
+    );
+
+    expect(component.find(QUERY_INPUT_SELECTOR).length).toBe(1);
+    expect(component.find(TIMEPICKER_SELECTOR).length).toBe(0);
+  });
+
+  it('Should NOT render query input bar if disabled', () => {
+    const component = shallowWithIntl(
+      <QueryBar.WrappedComponent
+        query={kqlQuery}
+        onSubmit={noop}
+        appName={'discover'}
+        screenTitle={'Another Screen'}
+        indexPatterns={[mockIndexPattern]}
+        store={createMockStorage()}
+        intl={null as any}
+        showQueryInput={false}
+        showDatePicker={false}
+      />
+    );
+
+    expect(component.find(QUERY_INPUT_SELECTOR).length).toBe(0);
+    expect(component.find(TIMEPICKER_SELECTOR).length).toBe(0);
+  });
+
+  it('Should NOT render query input bar if missing options', () => {
+    const component = shallowWithIntl(
+      <QueryBar.WrappedComponent
+        onSubmit={noop}
+        appName={'discover'}
+        screenTitle={'Another Screen'}
+        store={createMockStorage()}
+        intl={null as any}
+        showDatePicker={false}
+      />
+    );
+
+    expect(component.find(QUERY_INPUT_SELECTOR).length).toBe(0);
+    expect(component.find(TIMEPICKER_SELECTOR).length).toBe(0);
+  });
 });