[7.x] Rename QueryBar to QueryBarTopRow (#45250)

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

@@ -37,7 +37,7 @@ export {
   IndexPatterns,
   StaticIndexPattern,
 } from './index_patterns';
-export { Query, QueryBar, QueryBarInput } from './query';
+export { Query, QueryBarInput } from './query';
 export { SearchBar, SearchBarProps, SavedQueryAttributes, SavedQuery } from './search';
 
 /** @public static code */

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

@@ -21,8 +21,8 @@ import { mockPersistedLogFactory } from './query_bar_input.test.mocks';
 
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import './query_bar.test.mocks';
-import { QueryBar } from './query_bar';
+import './query_bar_top_row.test.mocks';
+import { QueryBarTopRow } from './query_bar_top_row';
 import { IndexPattern } from '../../../index';
 
 import { coreMock } from '../../../../../../../core/public/mocks';
@@ -88,7 +88,7 @@ const mockIndexPattern = {
   ],
 } as IndexPattern;
 
-describe('QueryBar', () => {
+describe('QueryBarTopRowTopRow', () => {
   const QUERY_INPUT_SELECTOR = 'InjectIntl(QueryBarInputUI)';
   const TIMEPICKER_SELECTOR = 'EuiSuperDatePicker';
   beforeEach(() => {
@@ -97,7 +97,7 @@ describe('QueryBar', () => {
 
   it('Should render the given query', () => {
     const component = shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
@@ -118,7 +118,7 @@ describe('QueryBar', () => {
 
   it('Should create a unique PersistedLog based on the appName and query language', () => {
     shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
@@ -139,7 +139,7 @@ describe('QueryBar', () => {
 
   it('Should render only timepicker when no options provided', () => {
     const component = shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}
@@ -157,7 +157,7 @@ describe('QueryBar', () => {
 
   it('Should not show timepicker when asked', () => {
     const component = shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}
@@ -176,7 +176,7 @@ describe('QueryBar', () => {
 
   it('Should render timepicker with options', () => {
     const component = shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}
@@ -198,7 +198,7 @@ describe('QueryBar', () => {
 
   it('Should render only query input bar', () => {
     const component = shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
@@ -220,7 +220,7 @@ describe('QueryBar', () => {
 
   it('Should NOT render query input bar if disabled', () => {
     const component = shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
@@ -243,7 +243,7 @@ describe('QueryBar', () => {
 
   it('Should NOT render query input bar if missing options', () => {
     const component = shallowWithIntl(
-      <QueryBar.WrappedComponent
+      <QueryBarTopRow.WrappedComponent
         uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}

src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx → src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx

@@ -74,7 +74,7 @@ interface State {
   isDateRangeInvalid: boolean;
 }
 
-export class QueryBarUI extends Component<Props, State> {
+export class QueryBarTopRowUI extends Component<Props, State> {
   public static defaultProps = {
     showQueryInput: true,
     showDatePicker: true,
@@ -354,4 +354,4 @@ export class QueryBarUI extends Component<Props, State> {
 }
 
 // @ts-ignore
-export const QueryBar = injectI18n(QueryBarUI);
+export const QueryBarTopRow = injectI18n(QueryBarTopRowUI);

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

@@ -17,7 +17,9 @@
  * under the License.
  */
 
-export { QueryBar, QueryBarInput } from './components';
+export { QueryBarTopRow } from './components/query_bar_top_row';
+export { QueryBarInput } from './components/query_bar_input';
+
 export { fromUser } from './lib/from_user';
 export { toUser } from './lib/to_user';
 export { getQueryLog } from './lib/get_query_log';

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

@@ -47,4 +47,4 @@ export class QueryService {
 /** @public */
 export type QuerySetup = ReturnType<QueryService['setup']>;
 
-export { Query, QueryBar, QueryBarInput } from './query_bar';
+export * from './query_bar';

src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx

@@ -28,7 +28,13 @@ const startMock = coreMock.createStart();
 jest.mock('../../../../../data/public', () => {
   return {
     FilterBar: () => <div className="filterBar"></div>,
-    QueryBar: () => <div className="queryBar"></div>,
+    QueryBarInput: () => <div className="queryBar"></div>,
+  };
+});
+
+jest.mock('../../../query/query_bar', () => {
+  return {
+    QueryBarTopRow: () => <div className="queryBar"></div>,
   };
 });
 

src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx

@@ -27,7 +27,8 @@ import { get, isEqual } from 'lodash';
 
 import { toastNotifications } from 'ui/notify';
 import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/public';
-import { IndexPattern, Query, QueryBar, FilterBar } from '../../../../../data/public';
+import { IndexPattern, Query, FilterBar } from '../../../../../data/public';
+import { QueryBarTopRow } from '../../../query';
 import { SavedQuery, SavedQueryAttributes } from '../index';
 import { SavedQueryMeta, SaveQueryForm } from './saved_query_management/save_query_form';
 import { SavedQueryManagementComponent } from './saved_query_management/saved_query_management_component';
@@ -366,7 +367,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
     let queryBar;
     if (this.shouldRenderQueryBar()) {
       queryBar = (
-        <QueryBar
+        <QueryBarTopRow
           uiSettings={this.props.uiSettings}
           savedObjectsClient={this.props.savedObjectsClient}
           query={this.state.query}