feat(templating): progress on variable system refactoring, grafana#6048

torkelo · torkelo · commit 5ded88fa4d8a · 2016-09-19T11:34:08.000+02:00
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
@@ -9,6 +9,7 @@ export class User {
   isGrafanaAdmin: any;
   isSignedIn: any;
   orgRole: any;
+  timezone: string;
 
   constructor() {
     if (config.bootData.user) {
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
@@ -6,6 +6,8 @@ import moment from 'moment';
 import _ from 'lodash';
 import $ from 'jquery';
 
+import {Emitter} from 'app/core/core';
+import {contextSrv} from 'app/core/services/context_srv';
 import coreModule from 'app/core/core_module';
 
 export class DashboardModel {
@@ -31,14 +33,14 @@ export class DashboardModel {
   links: any;
   gnetId: any;
   meta: any;
-  contextSrv: any;
+  events: any;
 
-  constructor(data, meta, contextSrv) {
+  constructor(data, meta) {
     if (!data) {
       data = {};
     }
 
-    this.contextSrv = contextSrv;
+    this.events = new Emitter();
     this.id = data.id || null;
     this.title = data.title || 'No Title';
     this.autoUpdate = data.autoUpdate;
@@ -85,8 +87,18 @@ export class DashboardModel {
 
   // cleans meta data and other non peristent state
   getSaveModelClone() {
+    // temp remove stuff
+    var events = this.events;
+    var meta = this.meta;
+    delete this.events;
+    delete this.meta;
+
+    events.emit('prepare-save-model');
     var copy = $.extend(true, {}, this);
-    delete copy.meta;
+
+    // restore properties
+    this.events = events;
+    this.meta = meta;
     return copy;
   }
 
@@ -233,7 +245,7 @@ export class DashboardModel {
   }
 
   getTimezone() {
-    return this.timezone ? this.timezone : this.contextSrv.user.timezone;
+    return this.timezone ? this.timezone : contextSrv.user.timezone;
   }
 
   private updateSchema(old) {
@@ -561,12 +573,8 @@ export class DashboardModel {
 export class DashboardSrv {
   currentDashboard: any;
 
-  /** @ngInject */
-  constructor(private contextSrv) {
-  }
-
   create(dashboard, meta) {
-    return new DashboardModel(dashboard, meta, this.contextSrv);
+    return new DashboardModel(dashboard, meta);
   }
 
   setCurrent(dashboard) {
diff --git a/public/app/features/dashboard/specs/dashboard_srv_specs.ts b/public/app/features/dashboard/specs/dashboard_srv_specs.ts
@@ -6,7 +6,7 @@ describe('dashboardSrv', function() {
   var _dashboardSrv;
 
   beforeEach(() => {
-    _dashboardSrv = new DashboardSrv({});
+    _dashboardSrv = new DashboardSrv();
   });
 
   describe('when creating new dashboard with defaults only', function() {
diff --git a/public/app/features/dashboard/viewStateSrv.js b/public/app/features/dashboard/viewStateSrv.js
@@ -185,7 +185,7 @@ function (angular, _, $) {
     DashboardViewState.prototype.enterFullscreen = function(panelScope) {
       var ctrl = panelScope.ctrl;
 
-      ctrl.editMode = this.state.edit && this.$scope.dashboardMeta.canEdit;
+      ctrl.editMode = this.state.edit && this.dashboard.meta.canEdit;
       ctrl.fullscreen = true;
 
       this.oldTimeRange = ctrl.range;
diff --git a/public/app/features/templating/all.ts b/public/app/features/templating/all.ts
@@ -1,5 +1,4 @@
 import './templateSrv';
-import './templateValuesSrv';
 import './editorCtrl';
 
 import {VariableSrv} from './variable_srv';
diff --git a/public/app/features/templating/interval_variable.ts b/public/app/features/templating/interval_variable.ts
@@ -42,9 +42,7 @@ export class IntervalVariable implements Variable {
       return {text: text.trim(), value: text.trim()};
     });
 
-    if (this.auto) {
-      this.updateAutoValue();
-    }
+    this.updateAutoValue();
   }
 
   dependsOn(variable) {
diff --git a/public/app/features/templating/specs/variabe_srv_init_specs.ts b/public/app/features/templating/specs/variabe_srv_init_specs.ts
diff --git a/public/app/features/templating/specs/variable_srv_init_specs.ts b/public/app/features/templating/specs/variable_srv_init_specs.ts
@@ -1,8 +1,10 @@
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
 
+import '../all';
+
 import _ from 'lodash';
 import helpers from 'test/specs/helpers';
-import '../all';
+import {Emitter} from 'app/core/core';
 
 describe('VariableSrv init', function() {
   var ctx = new helpers.ControllerTestContext();
@@ -17,7 +19,6 @@ describe('VariableSrv init', function() {
     ctx.$rootScope = $rootScope;
     ctx.$location = $location;
     ctx.variableSrv = $injector.get('variableSrv');
-    ctx.variableSrv.init({templating: {list: []}});
     ctx.$rootScope.$digest();
   }));
 
@@ -39,8 +40,8 @@ describe('VariableSrv init', function() {
         ctx.datasourceSrv.getMetricSources = sinon.stub().returns(scenario.metricSources);
 
         ctx.$location.search = sinon.stub().returns(scenario.urlParams);
+        ctx.dashboard = {templating: {list: scenario.variables}, events: new Emitter()};
 
-        ctx.dashboard = {templating: {list: scenario.variables}};
         ctx.variableSrv.init(ctx.dashboard);
         ctx.$rootScope.$digest();
 
@@ -137,6 +138,5 @@ describe('VariableSrv init', function() {
     });
   });
 
-
 });
 
diff --git a/public/app/features/templating/specs/variable_srv_specs.ts b/public/app/features/templating/specs/variable_srv_specs.ts
@@ -1,8 +1,10 @@
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
 
+import '../all';
+
 import moment from 'moment';
 import helpers from 'test/specs/helpers';
-import '../all';
+import {Emitter} from 'app/core/core';
 
 describe('VariableSrv', function() {
   var ctx = new helpers.ControllerTestContext();
@@ -17,7 +19,10 @@ describe('VariableSrv', function() {
     ctx.$rootScope = $rootScope;
     ctx.$location = $location;
     ctx.variableSrv = $injector.get('variableSrv');
-    ctx.variableSrv.init({templating: {list: []}});
+    ctx.variableSrv.init({
+      templating: {list: []},
+      events: new Emitter(),
+    });
     ctx.$rootScope.$digest();
   }));
 
diff --git a/public/app/features/templating/variable_srv.ts b/public/app/features/templating/variable_srv.ts
diff --git a/public/test/core/utils/emitter_specs.ts b/public/test/core/utils/emitter_specs.ts
diff --git a/public/test/specs/unsavedChangesSrv-specs.js b/public/test/specs/unsavedChangesSrv-specs.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import './templateSrv';`
`2`		`-import './templateValuesSrv';`
`3`	`2`	`import './editorCtrl';`
`4`	`3`
`5`	`4`	`import {VariableSrv} from './variable_srv';`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,7 @@ export class IntervalVariable implements Variable {`
`42`	`42`	`return {text: text.trim(), value: text.trim()};`
`43`	`43`	`});`
`44`	`44`
`45`		`- if (this.auto) {`
`46`		`- this.updateAutoValue();`
`47`		`- }`
	`45`	`+ this.updateAutoValue();`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`dependsOn(variable) {`