Move search bar and query bar to data plugin

src/legacy/core_plugins/data/index.ts

@@ -32,6 +32,10 @@ export default function DataPlugin(kibana: any) {
       }).default();
     },
     init: (server: Legacy.Server) => ({}),
+    uiExports: {
+      injectDefaultVars: () => ({}),
+      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
+    },
   };
 
   return new kibana.Plugin(config);

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

@@ -0,0 +1,4 @@
+@import 'src/legacy/ui/public/styles/styling_constants';
+
+@import './query_bar/index';
+

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

@@ -18,22 +18,32 @@
  */
 
 import { IndexPatternsService } from './index_patterns';
+import { SearchBarService } from './search_bar';
+import { QueryBarService } from './query_bar';
 
 class DataService {
   private readonly indexPatterns: IndexPatternsService;
+  private readonly searchBar: SearchBarService;
+  private readonly queryBar: QueryBarService;
 
   constructor() {
     this.indexPatterns = new IndexPatternsService();
+    this.searchBar = new SearchBarService();
+    this.queryBar = new QueryBarService();
   }
 
   public setup() {
     return {
       indexPatterns: this.indexPatterns.setup(),
+      ...this.searchBar.setup(),
+      ...this.queryBar.setup(),
     };
   }
 
   public stop() {
     this.indexPatterns.stop();
+    this.searchBar.stop();
+    this.queryBar.stop();
   }
 }
 
@@ -43,7 +53,8 @@ class DataService {
  * the data that will eventually be injected by the new platform.
  */
 // eslint-disable-next-line import/no-default-export
-export default new DataService().setup();
+const data = new DataService().setup();
+export { data };
 
 /** @public */
 export type DataSetup = ReturnType<DataService['setup']>;

src/legacy/ui/public/query_bar/components/language_switcher.tsx → src/legacy/core_plugins/data/public/query_bar/components/language_switcher.tsx

@@ -30,7 +30,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
-import { documentationLinks } from '../../documentation_links/documentation_links';
+import { documentationLinks } from 'ui/documentation_links/documentation_links';
 
 const kueryQuerySyntaxDocs = documentationLinks.query.kueryQuerySyntax;
 

src/legacy/ui/public/query_bar/components/query_bar.tsx → src/legacy/core_plugins/data/public/query_bar/components/query_bar.tsx

@@ -45,13 +45,13 @@ import { EuiSuperUpdateButton } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { documentationLinks } from 'ui/documentation_links';
 import { Toast, toastNotifications } from 'ui/notify';
-
 import {
   AutocompleteSuggestion,
   AutocompleteSuggestionType,
   getAutocompleteProvider,
-} from '../../autocomplete_providers';
-import chrome from '../../chrome';
+} from 'ui/autocomplete_providers';
+import chrome from 'ui/chrome';
+
 import { fromUser, matchPairs, toUser } from '../lib';
 import { QueryLanguageSwitcher } from './language_switcher';
 import { SuggestionsComponent } from './typeahead/suggestions_component';

src/legacy/ui/public/query_bar/directive/index.js → src/legacy/core_plugins/data/public/query_bar/directive/index.js

@@ -21,18 +21,20 @@
 
 import 'ngreact';
 import { wrapInI18nContext } from 'ui/i18n';
-import { uiModules } from '../../modules';
+import { uiModules } from 'ui/modules';
 import { QueryBar } from '../components';
 
-const app = uiModules.get('app/kibana', ['react']);
+const app = uiModules.get('app/data', ['react']);
 
-app.directive('queryBar', (reactDirective, localStorage) => {
-  return reactDirective(
-    wrapInI18nContext(QueryBar),
-    undefined,
-    {},
-    {
-      store: localStorage,
-    }
-  );
-});
+export function setupDirective() {
+  app.directive('queryBar', (reactDirective, localStorage) => {
+    return reactDirective(
+      wrapInI18nContext(QueryBar),
+      undefined,
+      {},
+      {
+        store: localStorage,
+      }
+    );
+  });
+}

src/legacy/ui/public/query_bar/index.ts → src/legacy/core_plugins/data/public/query_bar/index.ts

@@ -17,4 +17,6 @@
  * under the License.
  */
 
-export { QueryBar } from './components';
+export { QueryBarService } from './query_bar_service';
+
+export { QueryBar } from './components';

src/legacy/core_plugins/data/public/query_bar/query_bar_service.ts

@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { QueryBar } from './components/query_bar';
+import { fromUser } from './lib/from_user';
+import { toUser } from './lib/to_user';
+
+// @ts-ignore
+import { setupDirective } from './directive';
+
+/**
+ * Search Bar Service
+ * 
+ * @internal
+ */
+export class QueryBarService {
+  public setup() {
+    setupDirective(); 
+    return {
+      helpers: {
+        fromUser,
+        toUser,
+      },
+      QueryBar,
+    };
+  }
+
+  public stop() {
+    // nothing to do here yet
+  }
+}
+
+/** @public */
+export type QueryBarSetup = ReturnType<QueryBarService['setup']>;

src/legacy/ui/public/search_bar/components/search_bar.tsx → src/legacy/core_plugins/data/public/search_bar/components/search_bar.tsx

@@ -26,9 +26,10 @@ import React, { Component } from 'react';
 import ResizeObserver from 'resize-observer-polyfill';
 import { FilterBar } from 'ui/filter_bar';
 import { IndexPattern } from 'ui/index_patterns';
-import { QueryBar } from 'ui/query_bar';
 import { Storage } from 'ui/storage';
 
+import { QueryBar } from '../../query_bar';
+
 interface Query {
   query: string;
   language: string;

src/legacy/ui/public/search_bar/directive/index.js → src/legacy/core_plugins/data/public/search_bar/directive/index.js

@@ -19,18 +19,20 @@
 
 import 'ngreact';
 import { wrapInI18nContext } from 'ui/i18n';
-import { uiModules } from '../../modules';
+import { uiModules } from 'ui/modules';
 import { SearchBar } from '../components';
 
-const app = uiModules.get('app/kibana', ['react']);
+const app = uiModules.get('app/data', ['react']);
 
-app.directive('searchBar', (reactDirective, localStorage) => {
-  return reactDirective(
-    wrapInI18nContext(SearchBar),
-    undefined,
-    {},
-    {
-      store: localStorage,
-    }
-  );
-});
+export function setupDirective() {
+  app.directive('searchBar', (reactDirective, localStorage) => {
+    return reactDirective(
+      wrapInI18nContext(SearchBar),
+      undefined,
+      {},
+      {
+        store: localStorage,
+      }
+    );
+  });
+}

src/legacy/ui/public/search_bar/index.tsx → src/legacy/core_plugins/data/public/search_bar/index.tsx

@@ -17,6 +17,4 @@
  * under the License.
  */
 
-import './directive';
-
-export { SearchBar } from './components';
+export { SearchBarService } from './search_bar_service';

src/legacy/core_plugins/data/public/search_bar/search_bar_service.ts

@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SearchBar } from './components/search_bar';
+
+// @ts-ignore
+import { setupDirective } from './directive';
+
+/**
+ * Search Bar Service
+ * 
+ * @internal
+ */
+export class SearchBarService {
+  public setup() {
+    setupDirective(); 
+    return {
+      SearchBar,
+    };
+  }
+
+  public stop() {
+    // nothing to do here yet
+  }
+}
+
+/** @public */
+export type SearchBarSetup = ReturnType<SearchBarService['setup']>;

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js

@@ -26,7 +26,6 @@ import { wrapInI18nContext } from 'ui/i18n';
 import { toastNotifications } from 'ui/notify';
 
 import 'ui/listen';
-import 'ui/search_bar';
 import 'ui/apply_filters';
 
 import { panelActionsStore } from './store/panel_actions_store';
@@ -59,6 +58,8 @@ import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
 
 import { DashboardViewportProvider } from './viewport/dashboard_viewport_provider';
 
+import 'plugins/data';
+
 const app = uiModules.get('app/dashboard', [
   'elasticsearch',
   'ngRoute',

src/legacy/core_plugins/kibana/public/discover/controllers/discover.js

@@ -36,7 +36,6 @@ import 'ui/fixed_scroll';
 import 'ui/index_patterns';
 import 'ui/state_management/app_state';
 import { timefilter } from 'ui/timefilter';
-import 'ui/search_bar';
 import { hasSearchStategyForIndexPattern, isDefaultTypeIndexPattern } from 'ui/courier';
 import { toastNotifications } from 'ui/notify';
 import { VisProvider } from 'ui/vis';
@@ -70,6 +69,9 @@ import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
 import { buildVislibDimensions } from 'ui/visualize/loader/pipeline_helpers/build_pipeline';
 import 'ui/capabilities/route_setup';
 
+import 'plugins/data';
+
+
 const fetchStatuses = {
   UNINITIALIZED: 'uninitialized',
   LOADING: 'loading',

src/legacy/core_plugins/kibana/public/visualize/editor/editor.js

@@ -23,9 +23,7 @@ import './visualization_editor';
 import 'ui/vis/editors/default/sidebar';
 import 'ui/visualize';
 import 'ui/collapsible_sidebar';
-import 'ui/query_bar';
 import { uiCapabilities } from 'ui/capabilities';
-import 'ui/search_bar';
 import 'ui/apply_filters';
 import 'ui/listen';
 import chrome from 'ui/chrome';
@@ -55,6 +53,8 @@ import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
 import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs';
 
+import 'plugins/data';
+
 uiRoutes
   .when(VisualizeConstants.CREATE_PATH, {
     template: editorTemplate,

src/legacy/plugin_discovery/plugin_spec/plugin_spec_options.d.ts

@@ -21,6 +21,7 @@ import { Server } from '../../server/kbn_server';
 export type InitPluginFunction = (server: Server) => void;
 export interface UiExports {
   injectDefaultVars: (server: Server) => { [key: string]: any };
+  styleSheetPaths?: string;
 }
 
 export interface PluginSpecOptions {

src/legacy/ui/public/_index.scss

@@ -22,7 +22,7 @@
 // @import './timepicker/index';
 @import './markdown/index';
 @import './notify/index';
-@import './query_bar/index';
+// @import './query_bar/index';
 @import './share/index';
 @import './filter_bar/index';
 @import './style_compile/index';

src/legacy/ui/public/agg_types/directives/parse_query.js

@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { toUser, fromUser } from '../../query_bar/lib';
+import { data } from 'plugins/data';
+const { toUser, fromUser } = data.helpers;
 import { uiModules } from '../../modules';
 
 uiModules

src/legacy/ui/public/filter_bar/filter_bar.tsx

@@ -33,9 +33,9 @@ import classNames from 'classnames';
 import React, { Component } from 'react';
 import chrome from 'ui/chrome';
 import { IndexPattern } from 'ui/index_patterns';
-import { FilterOptions } from 'ui/search_bar/components/filter_options';
 import { FilterEditor } from './filter_editor';
 import { FilterItem } from './filter_item';
+import { FilterOptions } from './filter_options';
 
 const config = chrome.getUiSettingsClient();
 

tsconfig.json

@@ -6,12 +6,13 @@
       "kibana": ["./kibana"],
       "kibana/public": ["src/core/public"],
       "kibana/server": ["src/core/server"],
+      "plugins/*": ["src/legacy/core_plugins/*/public/"],
       "ui/*": [
         "src/legacy/ui/public/*"
       ],
       "test_utils/*": [
         "src/test_utils/public/*"
-      ]
+      ],
     },
     // Support .tsx files and transform JSX into calls to React.createElement
     "jsx": "react",

x-pack/plugins/maps/public/components/layer_panel/filter_editor/filter_editor.js

@@ -19,10 +19,12 @@ import {
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { QueryBar } from 'ui/query_bar';
 import { indexPatternService } from '../../../kibana_services';
 import { Storage } from 'ui/storage';
 
+import { data } from 'plugins/data';
+const { QueryBar } = data;
+
 const settings = chrome.getUiSettingsClient();
 const localStorage = new Storage(window.localStorage);