{
+ if (
+ element &&
+ (mountedTool.current === null ||
+ mountedTool.current.devTool !== activeDevTool ||
+ mountedTool.current.mountpoint !== element)
+ ) {
+ if (mountedTool.current) {
+ mountedTool.current.unmountHandler();
+ }
+ const unmountHandler = await activeDevTool.mount(appMountContext, {
+ element,
+ appBasePath: '',
+ });
+ mountedTool.current = {
+ devTool: activeDevTool,
+ mountpoint: element,
+ unmountHandler,
+ };
+ }
+ }}
+ />
+
+ );
+}
+
+function redirectOnMissingCapabilities(appMountContext: AppMountContext) {
+ if (!appMountContext.core.application.capabilities.dev_tools.show) {
+ window.location.hash = '/home';
+ return true;
+ }
+ return false;
+}
+
+function setBadge(appMountContext: AppMountContext) {
+ if (appMountContext.core.application.capabilities.dev_tools.save) {
+ return;
+ }
+ appMountContext.core.chrome.setBadge({
+ text: i18n.translate('kbn.devTools.badge.readOnly.text', {
+ defaultMessage: 'Read only',
+ }),
+ tooltip: i18n.translate('kbn.devTools.badge.readOnly.tooltip', {
+ defaultMessage: 'Unable to save',
+ }),
+ iconType: 'glasses',
+ });
+}
+
+function setBreadcrumbs(appMountContext: AppMountContext) {
+ appMountContext.core.chrome.setBreadcrumbs([
+ {
+ text: i18n.translate('kbn.devTools.k7BreadcrumbsDevToolsLabel', {
+ defaultMessage: 'Dev Tools',
+ }),
+ href: '#/dev_tools',
+ },
+ ]);
+}
+
+export function renderApp(
+ element: HTMLElement,
+ appMountContext: AppMountContext,
+ basePath: string,
+ devTools: readonly DevTool[]
+) {
+ if (redirectOnMissingCapabilities(appMountContext)) {
+ return () => {};
+ }
+ setBadge(appMountContext);
+ setBreadcrumbs(appMountContext);
+ ReactDOM.render(
+
+
+
+ {devTools.map(devTool => (
+ (
+
+
+
+
+ ,
+ element
+ );
+
+ return () => ReactDOM.unmountComponentAtNode(element);
+}
diff --git a/src/legacy/core_plugins/kibana/public/dev_tools/hacks/__tests__/hide_empty_tools.js b/src/legacy/core_plugins/kibana/public/dev_tools/hacks/__tests__/hide_empty_tools.js
deleted file mode 100644
index 25c7b945b9dfb..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dev_tools/hacks/__tests__/hide_empty_tools.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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 expect from '@kbn/expect';
-import sinon from 'sinon';
-
-import { hideEmptyDevTools } from '../hide_empty_tools';
-import { npStart } from 'ui/new_platform';
-
-describe('hide dev tools', function () {
- let updateNavLink;
-
- function PrivateWithoutTools() {
- return [];
- }
-
- function PrivateWithTools() {
- return ['tool1', 'tool2'];
- }
-
- function isHidden() {
- return updateNavLink.calledWith('kibana:dev_tools', { hidden: true });
- }
-
- beforeEach(function () {
- const coreNavLinks = npStart.core.chrome.navLinks;
- updateNavLink = sinon.spy(coreNavLinks, 'update');
- });
-
- it('should hide the app if there are no dev tools', function () {
- hideEmptyDevTools(PrivateWithTools);
- expect(isHidden()).to.be(false);
- });
-
- it('should not hide the app if there are tools', function () {
- hideEmptyDevTools(PrivateWithoutTools);
- expect(isHidden()).to.be(true);
- });
-
- afterEach(function () {
- updateNavLink.restore();
- });
-});
diff --git a/src/legacy/core_plugins/kibana/public/dev_tools/index.js b/src/legacy/core_plugins/kibana/public/dev_tools/index.js
deleted file mode 100644
index e36e75f6837ab..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dev_tools/index.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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 uiRoutes from 'ui/routes';
-import { i18n } from '@kbn/i18n';
-import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
-import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
-import 'ui/directives/kbn_href';
-import './directives/dev_tools_app';
-
-uiRoutes
- .when('/dev_tools', {
- resolve: {
- redirect(Private, kbnUrl) {
- const items = Private(DevToolsRegistryProvider).inOrder;
- kbnUrl.redirect(items[0].url.substring(1));
- }
- }
- });
-
-uiRoutes.defaults(/^\/dev_tools(\/|$)/, {
- badge: uiCapabilities => {
- if (uiCapabilities.dev_tools.save) {
- return undefined;
- }
-
- return {
- text: i18n.translate('kbn.devTools.badge.readOnly.text', {
- defaultMessage: 'Read only',
- }),
- tooltip: i18n.translate('kbn.devTools.badge.readOnly.tooltip', {
- defaultMessage: 'Unable to save',
- }),
- iconType: 'glasses'
- };
- },
- k7Breadcrumbs: () => [
- {
- text: i18n.translate('kbn.devTools.k7BreadcrumbsDevToolsLabel', {
- defaultMessage: 'Dev Tools'
- }),
- href: '#/dev_tools'
- }
- ]
-});
-
-FeatureCatalogueRegistryProvider.register(() => {
- return {
- id: 'console',
- title: i18n.translate('kbn.devTools.consoleTitle', {
- defaultMessage: 'Console'
- }),
- description: i18n.translate('kbn.devTools.consoleDescription', {
- defaultMessage: 'Skip cURL and use this JSON interface to work with your data directly.'
- }),
- icon: 'consoleApp',
- path: '/app/kibana#/dev_tools/console',
- showOnHomePage: true,
- category: FeatureCatalogueCategory.ADMIN
- };
-});
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_stats.ts b/src/legacy/core_plugins/kibana/public/dev_tools/index.ts
similarity index 68%
rename from src/legacy/core_plugins/telemetry/server/telemetry_collection/get_stats.ts
rename to src/legacy/core_plugins/kibana/public/dev_tools/index.ts
index b739b20545678..74708e36a98aa 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_collection/get_stats.ts
+++ b/src/legacy/core_plugins/kibana/public/dev_tools/index.ts
@@ -17,12 +17,18 @@
* under the License.
*/
-// @ts-ignore
-import { getLocalStats } from './get_local_stats';
-import { StatsGetter, getStatsCollectionConfig } from '../collection_manager';
+import { npSetup, npStart } from 'ui/new_platform';
-export const getStats: StatsGetter = async function(config) {
- const { callCluster, server } = getStatsCollectionConfig(config, 'data');
+import { DevToolsPlugin } from './plugin';
+import { localApplicationService } from '../local_application_service';
- return [await getLocalStats({ callCluster, server })];
-};
+const instance = new DevToolsPlugin();
+
+instance.setup(npSetup.core, {
+ __LEGACY: {
+ localApplicationService,
+ },
+});
+instance.start(npStart.core, {
+ newPlatformDevTools: npStart.plugins.devTools,
+});
diff --git a/src/legacy/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html b/src/legacy/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html
deleted file mode 100644
index 6c076092c76d5..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
diff --git a/src/legacy/core_plugins/kibana/public/dev_tools/plugin.ts b/src/legacy/core_plugins/kibana/public/dev_tools/plugin.ts
new file mode 100644
index 0000000000000..ec9af1a6acd92
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dev_tools/plugin.ts
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+// This import makes sure dev tools are registered before the app is.
+import 'uiExports/devTools';
+
+import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+
+import { LocalApplicationService } from '../local_application_service';
+import { DevTool, DevToolsStart } from '../../../../../plugins/dev_tools/public';
+
+export interface DevToolsPluginSetupDependencies {
+ __LEGACY: {
+ localApplicationService: LocalApplicationService;
+ };
+}
+
+export interface DevToolsPluginStartDependencies {
+ newPlatformDevTools: DevToolsStart;
+}
+
+export class DevToolsPlugin implements Plugin {
+ private getSortedDevTools: (() => readonly DevTool[]) | null = null;
+
+ public setup(
+ core: CoreSetup,
+ { __LEGACY: { localApplicationService } }: DevToolsPluginSetupDependencies
+ ) {
+ localApplicationService.register({
+ id: 'dev_tools',
+ title: 'Dev Tools',
+ mount: async (appMountContext, params) => {
+ if (!this.getSortedDevTools) {
+ throw new Error('not started yet');
+ }
+ const { renderApp } = await import('./application');
+ return renderApp(
+ params.element,
+ appMountContext,
+ params.appBasePath,
+ this.getSortedDevTools()
+ );
+ },
+ });
+ }
+
+ public start(core: CoreStart, { newPlatformDevTools }: DevToolsPluginStartDependencies) {
+ this.getSortedDevTools = newPlatformDevTools.getSortedDevTools;
+ if (this.getSortedDevTools().length === 0) {
+ core.chrome.navLinks.update('kibana:dev_tools', {
+ hidden: true,
+ });
+ }
+ }
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
index f472ff9250eb5..b3d37083b37f7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
@@ -26,7 +26,8 @@ export function createIndexPatternsStub() {
get: sinon.spy(indexPatternId =>
Promise.resolve({
id: indexPatternId,
- isTimeNanosBased: () => false
+ isTimeNanosBased: () => false,
+ popularizeField: () => {},
})
),
};
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
index b136b03bd500b..5a445a65939ed 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
@@ -19,32 +19,33 @@
import expect from '@kbn/expect';
import ngMock from 'ng_mock';
-import sinon from 'sinon';
import { getServices } from '../../../../kibana_services';
import { createStateStub } from './_utils';
import { QueryParameterActionsProvider } from '../actions';
-
+import { createIndexPatternsStub } from '../../api/__tests__/_stubs';
+import { npStart } from 'ui/new_platform';
describe('context app', function () {
beforeEach(ngMock.module('kibana'));
+ beforeEach(ngMock.module(function createServiceStubs($provide) {
+ $provide.value('indexPatterns', createIndexPatternsStub());
+ }));
+
describe('action addFilter', function () {
- let filterManagerStub;
let addFilter;
beforeEach(ngMock.inject(function createPrivateStubs(Private) {
- filterManagerStub = createQueryFilterStub();
- Private.stub(getServices().FilterBarQueryFilterProvider, filterManagerStub);
-
+ Private.stub(getServices().FilterBarQueryFilterProvider);
addFilter = Private(QueryParameterActionsProvider).addFilter;
}));
it('should pass the given arguments to the filterManager', function () {
const state = createStateStub();
+ const filterManagerAddStub = npStart.plugins.data.query.filterManager.addFilters;
addFilter(state)('FIELD_NAME', 'FIELD_VALUE', 'FILTER_OPERATION');
- const filterManagerAddStub = filterManagerStub.addFilters;
//get the generated filter
const generatedFilter = filterManagerAddStub.firstCall.args[0][0];
const queryKeys = Object.keys(generatedFilter.query.match_phrase);
@@ -55,20 +56,12 @@ describe('context app', function () {
it('should pass the index pattern id to the filterManager', function () {
const state = createStateStub();
+ const filterManagerAddStub = npStart.plugins.data.query.filterManager.addFilters;
addFilter(state)('FIELD_NAME', 'FIELD_VALUE', 'FILTER_OPERATION');
- const filterManagerAddStub = filterManagerStub.addFilters;
const generatedFilter = filterManagerAddStub.firstCall.args[0][0];
- expect(filterManagerAddStub.calledOnce).to.be(true);
expect(generatedFilter.meta.index).to.eql('INDEX_PATTERN_ID');
});
});
});
-
-function createQueryFilterStub() {
- return {
- addFilters: sinon.stub(),
- getAppFilters: sinon.stub(),
- };
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
index 9f7b180e8fe7d..10fe6c0e2eda1 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
@@ -18,7 +18,8 @@
*/
import _ from 'lodash';
-import { getServices, getFilterGenerator } from '../../../kibana_services';
+import { generateFilters } from '../../../../../../../../plugins/data/public';
+import { npStart } from 'ui/new_platform';
import {
MAX_CONTEXT_SIZE,
@@ -27,9 +28,8 @@ import {
} from './constants';
-export function QueryParameterActionsProvider(indexPatterns, Private) {
- const queryFilter = Private(getServices().FilterBarQueryFilterProvider);
- const filterGen = getFilterGenerator(queryFilter);
+export function QueryParameterActionsProvider(indexPatterns) {
+ const { filterManager } = npStart.plugins.data.query;
const setPredecessorCount = (state) => (predecessorCount) => (
state.queryParameters.predecessorCount = clamp(
@@ -55,13 +55,13 @@ export function QueryParameterActionsProvider(indexPatterns, Private) {
);
const updateFilters = () => filters => {
- queryFilter.setFilters(filters);
+ filterManager.setFilters(filters);
};
const addFilter = (state) => async (field, values, operation) => {
const indexPatternId = state.queryParameters.indexPatternId;
- const newFilters = filterGen.generate(field, values, operation, indexPatternId);
- queryFilter.addFilters(newFilters);
+ const newFilters = generateFilters(filterManager, field, values, operation, indexPatternId);
+ filterManager.addFilters(newFilters);
const indexPattern = await indexPatterns.get(indexPatternId);
indexPattern.popularizeField(field.name, 1);
};
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
index ed5049aa912e0..8ee23bfb005a2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
@@ -31,7 +31,6 @@ import './doc_table';
import { getSort } from './doc_table/lib/get_sort';
import { getSortForSearchSource } from './doc_table/lib/get_sort_for_search_source';
import * as columnActions from './doc_table/actions/columns';
-import * as filterActions from './doc_table/actions/filter';
import indexTemplate from './discover.html';
import { showOpenSearchPanel } from '../top_nav/show_open_search_panel';
@@ -41,7 +40,6 @@ import { getPainlessError } from './get_painless_error';
import {
angular,
buildVislibDimensions,
- getFilterGenerator,
getRequestInspectorStats,
getResponseInspectorStats,
getServices,
@@ -57,7 +55,7 @@ import {
subscribeWithScope,
tabifyAggResponse,
vislibSeriesResponseHandlerProvider,
- VisProvider,
+ Vis,
SavedObjectSaveModal,
} from '../kibana_services';
@@ -76,7 +74,7 @@ const {
import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
import { extractTimeFilter, changeTimeFilter } from '../../../../data/public';
import { start as data } from '../../../../data/public/legacy';
-
+import { generateFilters } from '../../../../../../plugins/data/public';
const { savedQueryService } = data.search.services;
@@ -190,13 +188,11 @@ function discoverController(
localStorage,
uiCapabilities
) {
- const Vis = Private(VisProvider);
const responseHandler = vislibSeriesResponseHandlerProvider().handler;
const getUnhashableStates = Private(getUnhashableStatesProvider);
const shareContextMenuExtensions = Private(ShareContextMenuExtensionsRegistryProvider);
const queryFilter = Private(FilterBarQueryFilterProvider);
- const filterGen = getFilterGenerator(queryFilter);
const inspectorAdapters = {
requests: new RequestAdapter()
@@ -901,7 +897,8 @@ function discoverController(
// TODO: On array fields, negating does not negate the combination, rather all terms
$scope.filterQuery = function (field, values, operation) {
$scope.indexPattern.popularizeField(field, 1);
- filterActions.addFilter(field, values, operation, $scope.indexPattern.id, $scope.state, filterGen);
+ const newFilters = generateFilters(queryFilter, field, values, operation, $scope.indexPattern.id);
+ return queryFilter.addFilters(newFilters);
};
$scope.addColumn = function addColumn(columnName) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/actions/filter.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/actions/filter.js
deleted file mode 100644
index 1f5db791469b9..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/actions/filter.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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 { addFilter } from '../../actions/filter';
-import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import NoDigestPromises from 'test_utils/no_digest_promises';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import sinon from 'sinon';
-
-function getFilterGeneratorStub() {
- return {
- add: sinon.stub()
- };
-}
-
-describe('doc table filter actions', function () {
- NoDigestPromises.activateForSuite();
-
- let filterGen;
- let indexPattern;
-
- beforeEach(ngMock.module(
- 'kibana',
- function ($provide) {
- $provide.service('indexPatterns', require('fixtures/mock_index_patterns'));
- }
- ));
-
- beforeEach(ngMock.inject(function (Private) {
- indexPattern = Private(StubbedLogstashIndexPatternProvider);
- filterGen = getFilterGeneratorStub();
- }));
-
- describe('add', function () {
-
- it('should defer to the FilterManager when dealing with a lucene query', function () {
- const state = {
- query: { query: 'foo', language: 'lucene' }
- };
- const args = ['foo', ['bar'], '+', indexPattern, ];
- addFilter('foo', ['bar'], '+', indexPattern, state, filterGen);
- expect(filterGen.add.calledOnce).to.be(true);
- expect(filterGen.add.calledWith(...args)).to.be(true);
- });
-
- });
-
-
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss
index c0bcc3ab8a614..8b754d23f9604 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss
@@ -62,6 +62,15 @@ doc-table {
margin: $euiSizeXS $euiSizeXS 0;
}
+.kbnDocTable__bar--footer {
+ position: relative;
+ margin: -($euiSize * 3) $euiSizeXS 0;
+}
+
+.kbnDocTable__padBottom {
+ padding-bottom: $euiSizeXL;
+}
+
.kbnDocTable__error {
display: flex;
flex-direction: column;
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html
index b6ac1d3fd8b4a..61bb5cbf39cbe 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html
@@ -1,5 +1,4 @@
-
@@ -26,32 +25,34 @@
>