feat(templating): making progress on adhoc template variable, grafana#6038

torkelo · torkelo · commit 94e5001c0ed3 · 2016-09-15T09:18:28.000+02:00
diff --git a/public/app/features/dashboard/ad_hoc_filters.ts b/public/app/features/dashboard/ad_hoc_filters.ts
@@ -21,7 +21,7 @@ export class AdHocFiltersCtrl {
     if (this.variable.value && !_.isArray(this.variable.value)) {
     }
 
-    for (let tag of this.variable.value) {
+    for (let tag of this.variable.tags) {
       if (this.segments.length > 0) {
         this.segments.push(this.uiSegmentSrv.newCondition('AND'));
       }
@@ -130,7 +130,7 @@ export class AdHocFiltersCtrl {
     });
 
     this.$rootScope.$broadcast('refresh');
-    this.variable.value = tags;
+    this.variable.tags = tags;
   }
 }
 
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
@@ -189,6 +189,7 @@ function (angular, _, $, kbn) {
       }
 
       if (variable.type === 'adhoc') {
+        variable.current = {};
         variable.options = [];
         return;
       }
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -56,7 +56,7 @@ export default class InfluxDatasource {
         // apply add hoc filters
         for (let variable of this.templateSrv.variables) {
           if (variable.type === 'adhoc' && variable.datasource === this.name) {
-            for (let tag of variable.value) {
+            for (let tag of variable.tags) {
               if (tag.key !== undefined && tag.value !== undefined) {
                 target.tags.push({key: tag.key, value: tag.value, condition: 'AND'});
               }
diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js
@@ -28,24 +28,43 @@ define([
     });
 
     describe('when template variable is present in url', function() {
-      var variable = {
-        name: 'apps',
-        current: {text: "test", value: "test"},
-        options: [{text: "test", value: "test"}]
-      };
+      describe('and setting simple variable', function() {
+        var variable = {
+          name: 'apps',
+          current: {text: "test", value: "test"},
+          options: [{text: "test", value: "test"}]
+        };
 
-      beforeEach(function(done) {
-        var dashboard = { templating: { list: [variable] } };
-        var urlParams = {};
-        urlParams["var-apps"] = "new";
-        ctx.$location.search = sinon.stub().returns(urlParams);
-        ctx.service.init(dashboard).then(function() { done(); });
-        ctx.$rootScope.$digest();
+        beforeEach(function(done) {
+          var dashboard = { templating: { list: [variable] } };
+          var urlParams = {};
+          urlParams["var-apps"] = "new";
+          ctx.$location.search = sinon.stub().returns(urlParams);
+          ctx.service.init(dashboard).then(function() { done(); });
+          ctx.$rootScope.$digest();
+        });
+
+        it('should update current value', function() {
+          expect(variable.current.value).to.be("new");
+          expect(variable.current.text).to.be("new");
+        });
       });
 
-      it('should update current value', function() {
-        expect(variable.current.value).to.be("new");
-        expect(variable.current.text).to.be("new");
+      describe('and setting adhoc variable', function() {
+        var variable = {name: 'filters', type: 'adhoc'};
+
+        beforeEach(function(done) {
+          var dashboard = { templating: { list: [variable] } };
+          var urlParams = {};
+          urlParams["var-filters"] = "hostname|gt|server2";
+          ctx.$location.search = sinon.stub().returns(urlParams);
+          ctx.service.init(dashboard).then(function() { done(); });
+          ctx.$rootScope.$digest();
+        });
+
+        it('should update current value', function() {
+          expect(variable.tags[0]).to.eq({tag: 'hostname', value: 'server2'});
+        });
       });
     });
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export class AdHocFiltersCtrl {`
`21`	`21`	`if (this.variable.value && !_.isArray(this.variable.value)) {`
`22`	`22`	`}`
`23`	`23`
`24`		`- for (let tag of this.variable.value) {`
	`24`	`+ for (let tag of this.variable.tags) {`
`25`	`25`	`if (this.segments.length > 0) {`
`26`	`26`	`this.segments.push(this.uiSegmentSrv.newCondition('AND'));`
`27`	`27`	`}`
`@@ -130,7 +130,7 @@ export class AdHocFiltersCtrl {`
`130`	`130`	`});`
`131`	`131`
`132`	`132`	`this.$rootScope.$broadcast('refresh');`
`133`		`- this.variable.value = tags;`
	`133`	`+ this.variable.tags = tags;`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ function (angular, _, $, kbn) {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`if (variable.type === 'adhoc') {`
	`192`	`+ variable.current = {};`
`192`	`193`	`variable.options = [];`
`193`	`194`	`return;`
`194`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export default class InfluxDatasource {`
`56`	`56`	`// apply add hoc filters`
`57`	`57`	`for (let variable of this.templateSrv.variables) {`
`58`	`58`	`if (variable.type === 'adhoc' && variable.datasource === this.name) {`
`59`		`- for (let tag of variable.value) {`
	`59`	`+ for (let tag of variable.tags) {`
`60`	`60`	`if (tag.key !== undefined && tag.value !== undefined) {`
`61`	`61`	`target.tags.push({key: tag.key, value: tag.value, condition: 'AND'});`
`62`	`62`	`}`