github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Maps] replace angular serviceSettings service with EmsClient (#32725)

Browse source 
* [Maps] replace angular serviceSettings service with EmsClient

* clean up
This commit is contained in:
Nathan Reese 2019-03-07 20:09:55 -07:00 • committed by GitHub
parent 78cbe42982
commit c91e940103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/maps/public/index.js
View file

@ -27,7 +27,6 @@ import 'react-vis/dist/style.css';
import 'mapbox-gl/dist/mapbox-gl.css';
import 'ui/vis/map/service_settings';
import './angular/services/gis_map_saved_object_loader';
import './angular/map_controller';
import listingTemplate from './angular/listing_ng_wrapper.html';

2
x-pack/plugins/maps/public/kibana_services.js
View file

@ -12,7 +12,6 @@ import { getRequestInspectorStats, getResponseInspectorStats } from 'ui/courier/
export const timeService = timefilter;
export let indexPatternService;
export let SearchSource;
export let emsServiceSettings;
export async function fetchSearchSourceAndRecordWithInspector({ searchSource, requestId, requestName, requestDesc, inspectorAdapters }) {
const inspectorRequest = inspectorAdapters.requests.start(
@ -40,5 +39,4 @@ uiModules.get('app/maps').run(($injector) => {
indexPatternService = $injector.get('indexPatterns');
const Private = $injector.get('Private');
SearchSource = Private(SearchSourceProvider);
emsServiceSettings = $injector.get('serviceSettings');
});

13
x-pack/plugins/maps/public/shared/layers/sources/ems_file_source/ems_file_source.js
View file

@ -7,7 +7,6 @@
import { AbstractVectorSource } from '../vector_source';
import React from 'react';
import { GIS_API_PATH, EMS_FILE } from '../../../../../common/constants';
import { emsServiceSettings } from '../../../../kibana_services';
import { getEmsVectorFilesMeta } from '../../../../meta';
import { EMSFileCreateSourceEditor } from './create_source_editor';
import { i18n } from '@kbn/i18n';
@ -68,7 +67,14 @@ export class EMSFileSource extends AbstractVectorSource {
}
async getImmutableProperties() {
const emsLink = await emsServiceSettings.getEMSHotLink({ id: this._descriptor.id });
let emsLink;
try {
const emsVectorFileMeta = await this._getEmsVectorFileMeta();
emsLink = emsVectorFileMeta.emsLink;
} catch(error) {
// ignore error if EMS layer id could not be found
}
return [
{
label: getDataSourceLabel(),
@ -79,7 +85,8 @@ export class EMSFileSource extends AbstractVectorSource {
defaultMessage: `Layer`,
}),
value: this._descriptor.id,
link: emsLink }
link: emsLink
}
];
}

3
x-pack/plugins/maps/server/routes.js
View file

@ -106,7 +106,8 @@ export function initRoutes(server, licenseUid) {
fields: fileLayer.getFieldsInLanguage(),
url: fileLayer.getDefaultFormatUrl(),
format: format, //legacy: format and meta are split up
meta: meta //legacy, format and meta are split up
meta: meta, //legacy, format and meta are split up,
emsLink: fileLayer.getEMSHotLink()
};
});