IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 00:06:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

RoutingNG: fix locationSrv.update when query is provided (#31978)

Browse Source
This commit is contained in:
Domas 2021-03-15 11:02:45 +02:00 committed by GitHub
parent 31ab1a4afe
commit c479ca0161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/grafana-runtime/src/services/LocationService.ts
View File

@ -1,4 +1,4 @@
import { UrlQueryMap, urlUtil } from '@grafana/data';
import { deprecationWarning, UrlQueryMap, urlUtil } from '@grafana/data';
import * as H from 'history';
import { LocationUpdate } from './LocationSrv';
import { createLogger } from '@grafana/ui';
@ -123,14 +123,23 @@ export class HistoryWrapper implements LocationService {
return locationSearchToObject(this.history.location.search);
}
/** @depecreated */
/** @deprecated use partial, push or replace instead */
update(options: LocationUpdate) {
deprecationWarning('LocationSrv', 'update', 'partial, push or replace');
if (options.partial && options.query) {
this.partial(options.query, options.partial);
} else if (options.replace) {
this.replace(options.path!);
} else {
this.push(options.path!);
const newLocation: H.LocationDescriptor = {
pathname: options.path,
};
if (options.query) {
newLocation.search = urlUtil.toUrlParams(options.query);
}
if (options.replace) {
this.replace(newLocation);
} else {
this.push(newLocation);
}
}
}
}