github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ui/vis_maps] use modifyUrl() helper to extend query string

Browse source
This commit is contained in:
spalger 2017-01-03 13:49:56 -06:00
parent d4b9849fe5
commit bf4083fc74
1 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/ui/public/vis_maps/lib/tilemap_settings.js
View file

@ -3,6 +3,7 @@ import _ from 'lodash';
import marked from 'marked';
import url from 'url';
import uiRoutes from 'ui/routes';
import { modifyUrl } from 'ui/url';
marked.setOptions({
gfm: true, // Github-flavored markdown
@ -25,6 +26,21 @@ uiModules.get('kibana')
const attributionFromConfig = $sanitize(marked(tilemapsConfig.deprecated.config.options.attribution || ''));
const optionsFromConfig = _.assign({}, tilemapsConfig.deprecated.config.options, { attribution: attributionFromConfig });
const extendUrl = (url, props) => (
modifyUrl(url, parsed => _.merge(parsed, props))
);
/**
* Unescape a url template that was escaped by encodeURI() so leaflet
* will be able to correctly locate the varables in the template
* @param {String} url
* @return {String}
*/
const unescapeTemplateVars = url => {
const ENCODED_TEMPLATE_VARS_RE = /%7B(\w+?)%7D/g;
return url.replace(ENCODED_TEMPLATE_VARS_RE, (total, varName) => `{${varName}}`);
};
class TilemapSettings {
constructor() {
@ -66,10 +82,12 @@ uiModules.get('kibana')
subdomains: []
};
//additional query params need to be propagated to the TMS endpoint as well.
const queryparams = _.assign({ }, manifest.services[0].query_parameters, this._queryParams);
const query = url.format({ query: queryparams });
this._url = manifest.services[0].url + query;//must preserve {} patterns from the url, so do not format path.
this._url = unescapeTemplateVars(extendUrl(manifest.services[0].url, {
query: {
...(manifest.services[0].query_parameters || {}),
...this._queryParams
}
}));
this._settingsInitialized = true;
})
@ -153,11 +171,8 @@ uiModules.get('kibana')
* Make this instance property to allow for overrides by test code
*/
_getTileServiceManifest(manifestUrl, additionalQueryParams) {
const manifestServiceTokens = url.parse(manifestUrl);
manifestServiceTokens.query = _.assign({}, manifestServiceTokens.query, additionalQueryParams);
const requestUrl = url.format(manifestServiceTokens);
return $http({
url: requestUrl,
url: extendUrl(manifestUrl, { query: this._queryParams }),
method: 'GET'
});
}