IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

DatasourceSettings: Fixed issue navigating away from data source settings page (#21841)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-01-30 13:40:55 +00:00 committed by GitHub
parent 050d902ed1
commit b7faa9023e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/plugins/plugin_component.ts
View File

@ -1,4 +1,4 @@
import angular from 'angular';
import angular, { ILocationService } from 'angular';
import _ from 'lodash';
import config from 'app/core/config';
@ -16,7 +16,8 @@ function pluginDirectiveLoader(
$rootScope: GrafanaRootScope,
$http: any,
$templateCache: any,
$timeout: any
$timeout: any,
$location: ILocationService
) {
function getTemplate(component: { template: any; templateUrl: any }) {
if (component.template) {
@ -145,11 +146,19 @@ function pluginDirectiveLoader(
// Datasource ConfigCtrl
case 'datasource-config-ctrl': {
const dsMeta = scope.ctrl.datasourceMeta;
const angularUrl = $location.url();
return importDataSourcePlugin(dsMeta).then(dsPlugin => {
scope.$watch(
'ctrl.current',
() => {
scope.onModelChanged(scope.ctrl.current);
// This watcher can trigger when we navigate away due to late digests
// This check is to stop onModelChanged from being called when navigating away
// as it triggers a redux action which comes before the angular $routeChangeSucces and
// This makes the bridgeSrv think location changed from redux before detecting it was actually
// changed from angular.
if (angularUrl === $location.url()) {
scope.onModelChanged(scope.ctrl.current);
}
},
true
);