From b7faa9023ed07d4f494440504fa6ed488b2f0d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 30 Jan 2020 13:40:55 +0000
Subject: [PATCH] DatasourceSettings: Fixed issue navigating away from data
 source settings page (#21841)

---
 public/app/features/plugins/plugin_component.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts
index ad07f571240..55564a6f9b5 100644
--- a/public/app/features/plugins/plugin_component.ts
+++ b/public/app/features/plugins/plugin_component.ts
@@ -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
           );