From 85baa50194226e1c3433531c0eca73331d66e0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 18 Apr 2017 16:30:20 +0200
Subject: [PATCH] recfactor: added unit test for the new scenario, #8143

---
 .../plugins/datasource/graphite/query_ctrl.ts | 10 +++++-----
 .../graphite/specs/query_ctrl_specs.ts        | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts
index 7c89ac1a0a9..1cf4406c7b8 100644
--- a/public/app/plugins/datasource/graphite/query_ctrl.ts
+++ b/public/app/plugins/datasource/graphite/query_ctrl.ts
@@ -28,7 +28,6 @@ export class GraphiteQueryCtrl extends QueryCtrl {
   }
 
   toggleEditorMode() {
-    this.target.textEditor = !this.target.textEditor;
     this.parseTarget();
   }
 
@@ -220,17 +219,17 @@ export class GraphiteQueryCtrl extends QueryCtrl {
       this.target.target = _.reduce(this.functions, this.wrapFunction, metricPath);
     }
 
-    this.resolveTarget(this.target);
+    this.updateRenderedTarget(this.target);
 
     // loop through other queries and update targetFull as needed
     for (const target of this.panelCtrl.panel.targets || []) {
       if (target.refId !== this.target.refId) {
-        this.resolveTarget(target);
+        this.updateRenderedTarget(target);
       }
     }
   }
 
-  resolveTarget(target) {
+  updateRenderedTarget(target) {
     // render nested query
     var targetsByRefId = _.keyBy(this.panelCtrl.panel.targets, 'refId');
 
@@ -240,6 +239,8 @@ export class GraphiteQueryCtrl extends QueryCtrl {
     var nestedSeriesRefRegex = /\#([A-Z])/g;
     var targetWithNestedQueries = target.target;
 
+    // Keep interpolating until there are no query references
+    // The reason for the loop is that the referenced query might contain another reference to another query
     while (targetWithNestedQueries.match(nestedSeriesRefRegex)) {
       var updated = targetWithNestedQueries.replace(nestedSeriesRefRegex, (match, g1) => {
         var t = targetsByRefId[g1];
@@ -249,7 +250,6 @@ export class GraphiteQueryCtrl extends QueryCtrl {
 
         // no circular references
         delete targetsByRefId[g1];
-
         return t.target;
       });
 
diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
index 95691ae0b7b..e88fbc044c1 100644
--- a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
+++ b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
@@ -186,4 +186,24 @@ describe('GraphiteQueryCtrl', function() {
       expect(ctx.ctrl.target.targetFull).to.be('scaleToSeconds(nested.query.count)');
     });
   });
+
+  describe('when updating target used in other query', function() {
+    beforeEach(function() {
+      ctx.ctrl.target.target = 'metrics.a.count';
+      ctx.ctrl.target.refId = 'A';
+      ctx.ctrl.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([{expandable: false}]));
+      ctx.ctrl.parseTarget();
+
+      ctx.ctrl.panelCtrl.panel.targets = [
+        ctx.ctrl.target, {target: 'sumSeries(#A)', refId: 'B'}
+      ];
+
+      ctx.ctrl.updateModelTarget();
+    });
+
+    it('targetFull of other query should update', function() {
+      expect(ctx.ctrl.panel.targets[1].targetFull).to.be('sumSeries(metrics.a.count)');
+    });
+  });
+
 });