ux(dashboard): fixes for changing panel tabs, grafana#6442

torkelo · torkelo · commit cdea420285b1 · 2016-11-02T21:45:46.000+01:00
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
@@ -100,15 +100,21 @@ export class KeybindingSrv {
     this.bind('e', () => {
       if (dashboard.meta.focusPanelId && dashboard.meta.canEdit) {
         this.$rootScope.appEvent('panel-change-view', {
-          fullscreen: true, edit: true, panelId: dashboard.meta.focusPanelId
+          fullscreen: true,
+          edit: true,
+          panelId: dashboard.meta.focusPanelId,
+          toggle: true
         });
       }
     });
 
     this.bind('v', () => {
       if (dashboard.meta.focusPanelId) {
         this.$rootScope.appEvent('panel-change-view', {
-          fullscreen: true, edit: null, panelId: dashboard.meta.focusPanelId
+          fullscreen: true,
+          edit: null,
+          panelId: dashboard.meta.focusPanelId,
+          toggle: true,
         });
       }
     });
diff --git a/public/app/features/dashboard/viewStateSrv.js b/public/app/features/dashboard/viewStateSrv.js
@@ -84,9 +84,12 @@ function (angular, _, $) {
 
     DashboardViewState.prototype.update = function(state) {
       // implement toggle logic
-      if (this.state.fullscreen && state.fullscreen) {
-        if (this.state.edit === state.edit) {
-          state.fullscreen = !state.fullscreen;
+      if (state.toggle) {
+        delete state.toggle;
+        if (this.state.fullscreen && state.fullscreen) {
+          if (this.state.edit === state.edit) {
+            state.fullscreen = !state.fullscreen;
+          }
         }
       }
 
@@ -163,7 +166,7 @@ function (angular, _, $) {
       if (!render) { return false;}
 
       $timeout(function() {
-        if (self.oldTimeRange && self.oldTimeRange !== ctrl.range) {
+        if (self.oldTimeRange !== ctrl.range) {
           self.$scope.broadcastRefresh();
         } else {
           self.$scope.$broadcast('render');
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
@@ -111,7 +111,6 @@ export class PanelCtrl {
   changeTab(newIndex) {
     this.editorTabIndex = newIndex;
     var route = this.$injector.get('$route');
-
     route.current.params.tab = this.editorTabs[newIndex].title.toLowerCase();
     route.updateParams();
   }
diff --git a/public/sass/components/_row.scss b/public/sass/components/_row.scss
@@ -247,7 +247,7 @@ a.dash-row-header-actions--tight {
 
 .row-open {
   margin-top: 1px;
-  left: -22px;
+  left: -24px;
   position: absolute;
   z-index: 100;
   transition: .10s left;
diff --git a/tasks/options/watch.js b/tasks/options/watch.js
@@ -33,9 +33,9 @@ module.exports = function(config, grunt) {
 
       // copy ts file also used by source maps
       //changes changed file source to that of the changed file
-      var option = 'typescript.build.src';
-      var result = filepath;
-      grunt.config(option, result);
+      grunt.config('typescript.build.src', filepath);
+      grunt.config('tslint.source.files.src', filepath);
+
       grunt.task.run('typescript:build');
       grunt.task.run('tslint');
     }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@ export class PanelCtrl {`
`111`	`111`	`changeTab(newIndex) {`
`112`	`112`	`this.editorTabIndex = newIndex;`
`113`	`113`	`var route = this.$injector.get('$route');`
`114`		`-`
`115`	`114`	`route.current.params.tab = this.editorTabs[newIndex].title.toLowerCase();`
`116`	`115`	`route.updateParams();`
`117`	`116`	`}`