Skip to content

Commit cf09106

Browse files
kertalkertal
committed
Merge upstream/master and fix conflicts, again
2 parents 117bafa + 492a97e commit cf09106

85 files changed

Lines changed: 797 additions & 373 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/core/MIGRATION.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,10 +1178,10 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
11781178
| `ui/index_patterns` | `data.indexPatterns` | still in progress |
11791179
| `ui/registry/field_formats` | `data.fieldFormats` | |
11801180
| `ui/registry/feature_catalogue` | `home.featureCatalogue.register` | Must add `home` as a dependency in your kibana.json. |
1181-
| `ui/registry/vis_types` | `visualizations.types` | -- |
1182-
| `ui/vis` | `visualizations.types` | -- |
1181+
| `ui/registry/vis_types` | `visualizations` | -- |
1182+
| `ui/vis` | `visualizations` | -- |
11831183
| `ui/share` | `share` | `showShareContextMenu` is now called `toggleShareContextMenu`, `ShareContextMenuExtensionsRegistryProvider` is now called `register` |
1184-
| `ui/vis/vis_factory` | `visualizations.types` | -- |
1184+
| `ui/vis/vis_factory` | `visualizations` | -- |
11851185
| `ui/vis/vis_filters` | `visualizations.filters` | -- |
11861186
| `ui/utils/parse_es_interval` | `import { parseEsInterval } from '../data/public'` | `parseEsInterval`, `ParsedInterval`, `InvalidEsCalendarIntervalError`, `InvalidEsIntervalFormatError` items were moved to the `Data Plugin` as a static code |
11871187

‎src/legacy/core_plugins/data/public/search/expressions/esaggs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
} from '../../../../../../plugins/data/public';
3939

4040
import { buildTabularInspectorData } from './build_tabular_inspector_data';
41-
import { calculateObjectHash } from '../../../../visualizations/public';
41+
import { calculateObjectHash } from '../../../../../../plugins/kibana_utils/common';
4242
import { tabifyAggResponse } from '../../../../../core_plugins/data/public';
4343
import { PersistedState } from '../../../../../../plugins/visualizations/public';
4444
import { Adapters } from '../../../../../../plugins/inspector/public';

‎src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import { i18n } from '@kbn/i18n';
2222
import { createInputControlVisController } from './vis_controller';
2323
import { getControlsTab } from './components/editor/controls_tab';
2424
import { OptionsTab } from './components/editor/options_tab';
25-
import { Status, defaultFeedbackMessage } from '../../visualizations/public';
25+
import { Status } from '../../visualizations/public';
2626
import { InputControlVisDependencies } from './plugin';
27+
import { defaultFeedbackMessage } from '../../../../plugins/kibana_utils/common';
2728

2829
export function createInputControlVisTypeDefinition(deps: InputControlVisDependencies) {
2930
const InputControlVisController = createInputControlVisController(deps);

‎src/legacy/core_plugins/input_control_vis/public/plugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class InputControlVisPlugin implements Plugin<Promise<void>, void> {
5959
};
6060

6161
expressions.registerFunction(createInputControlVisFn);
62-
visualizations.types.createBaseVisualization(
62+
visualizations.createBaseVisualization(
6363
createInputControlVisTypeDefinition(visualizationDependencies)
6464
);
6565
}

‎src/legacy/core_plugins/kibana/public/discover/kibana_services.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export function setServices(newServices: any) {
5050
// EXPORT legacy static dependencies, should be migrated when available in a new version;
5151
export { angular };
5252
export { wrapInI18nContext } from 'ui/i18n';
53-
export { buildVislibDimensions } from '../../../visualizations/public';
5453
export { getRequestInspectorStats, getResponseInspectorStats } from '../../../data/public';
5554
// @ts-ignore
5655
export { intervalOptions } from 'ui/agg_types';

‎src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import '../components/fetch_error';
4141
import { getPainlessError } from './get_painless_error';
4242
import { discoverResponseHandler } from './response_handler';
4343
import {
44-
buildVislibDimensions,
4544
getRequestInspectorStats,
4645
getResponseInspectorStats,
4746
getServices,
@@ -71,6 +70,7 @@ const {
7170
import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../helpers/breadcrumbs';
7271
import {
7372
esFilters,
73+
fieldFormats,
7474
indexPatterns as indexPatternsUtils,
7575
connectToQueryState,
7676
syncQueryStateWithUrl,
@@ -833,21 +833,45 @@ function discoverController(
833833
}
834834
};
835835

836+
function getDimensions(aggs, timeRange) {
837+
const [metric, agg] = aggs;
838+
agg.params.timeRange = timeRange;
839+
const bounds = agg.params.timeRange ? timefilter.calculateBounds(agg.params.timeRange) : null;
840+
agg.buckets.setBounds(bounds);
841+
842+
const { esUnit, esValue } = agg.buckets.getInterval();
843+
return {
844+
x: {
845+
accessor: 0,
846+
label: agg.makeLabel(),
847+
format: fieldFormats.serialize(agg),
848+
params: {
849+
date: true,
850+
interval: moment.duration(esValue, esUnit),
851+
intervalESValue: esValue,
852+
intervalESUnit: esUnit,
853+
format: agg.buckets.getScaledDateFormat(),
854+
bounds: agg.buckets.getBounds(),
855+
},
856+
},
857+
y: {
858+
accessor: 1,
859+
format: fieldFormats.serialize(metric),
860+
label: metric.makeLabel(),
861+
},
862+
};
863+
}
864+
836865
function onResults(resp) {
837866
inspectorRequest.stats(getResponseInspectorStats($scope.searchSource, resp)).ok({ json: resp });
838867

839868
if (getTimeField()) {
840869
const tabifiedData = tabifyAggResponse($scope.vis.aggs, resp);
841870
$scope.searchSource.rawResponse = resp;
842-
Promise.resolve(
843-
buildVislibDimensions($scope.vis, {
844-
timefilter,
845-
timeRange: $scope.timeRange,
846-
searchSource: $scope.searchSource,
847-
})
848-
).then(resp => {
849-
$scope.histogramData = discoverResponseHandler(tabifiedData, resp);
850-
});
871+
$scope.histogramData = discoverResponseHandler(
872+
tabifiedData,
873+
getDimensions($scope.vis.aggs.aggs, $scope.timeRange)
874+
);
851875
}
852876

853877
$scope.hits = resp.hits.total;
@@ -1010,7 +1034,7 @@ function discoverController(
10101034
},
10111035
};
10121036

1013-
$scope.vis = new visualizations.Vis(
1037+
$scope.vis = visualizations.createVis(
10141038
$scope.searchSource.getField('index'),
10151039
visSavedObject.visState
10161040
);

‎src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { getServices } from '../../../../kibana_services';
2929

3030
function getMapsAppBaseUrl() {
3131
const mapsAppVisAlias = getServices()
32-
.visualizations.types.getAliases()
32+
.visualizations.getAliases()
3333
.find(({ name }) => {
3434
return name === 'maps';
3535
});
@@ -38,7 +38,7 @@ function getMapsAppBaseUrl() {
3838

3939
export function isMapsAppRegistered() {
4040
return getServices()
41-
.visualizations.types.getAliases()
41+
.visualizations.getAliases()
4242
.some(({ name }) => {
4343
return name === 'maps';
4444
});

‎src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n';
2222
import { npStart } from 'ui/new_platform';
2323
import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
2424
import { createSavedDashboardLoader } from '../dashboard';
25-
import { TypesService, createSavedVisLoader } from '../../../visualizations/public';
25+
import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
2626
import { createSavedSearchesLoader } from '../../../../../plugins/discover/public';
2727

2828
/**
@@ -58,10 +58,7 @@ const services = {
5858

5959
savedObjectManagementRegistry.register({
6060
id: 'savedVisualizations',
61-
service: createSavedVisLoader({
62-
...services,
63-
...{ visualizationTypes: new TypesService().start() },
64-
}),
61+
service: visualizations.savedVisualizationsLoader,
6562
title: 'visualizations',
6663
});
6764

‎src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export function initVisualizeApp(app, deps) {
102102
resolve: {
103103
savedVis: function(redirectWhenMissing, $route, $rootScope, kbnUrl) {
104104
const { core, data, savedVisualizations, visualizations } = deps;
105-
const visTypes = visualizations.types.all();
105+
const visTypes = visualizations.all();
106106
const visType = find(visTypes, { name: $route.current.params.type });
107107
const shouldHaveIndex = visType.requiresSearch && visType.options.showIndexSelection;
108108
const hasIndex =

‎src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ describe('RegionMapsVisualizationTests', function() {
111111

112112
if (!visRegComplete) {
113113
visRegComplete = true;
114-
visualizationsSetup.types.createBaseVisualization(
115-
createRegionMapTypeDefinition(dependencies)
116-
);
114+
visualizationsSetup.createBaseVisualization(createRegionMapTypeDefinition(dependencies));
117115
}
118116

119117
RegionMapsVisualization = createRegionMapVisualization(dependencies);
@@ -160,7 +158,7 @@ describe('RegionMapsVisualizationTests', function() {
160158

161159
imageComparator = new ImageComparator();
162160

163-
vis = new visualizationsStart.Vis(indexPattern, {
161+
vis = visualizationsStart.createVis(indexPattern, {
164162
type: 'region_map',
165163
});
166164

0 commit comments

Comments
 (0)