Explorar o código

feat(plugins): various fixes entering edit mode after adding a new panel

Torkel Ödegaard %!s(int64=10) %!d(string=hai) anos
pai
achega
908765e0e7

+ 5 - 0
public/app/features/dashboard/viewStateSrv.js

@@ -103,6 +103,11 @@ function (angular, _, $) {
         if (!panelScope) {
           return;
         }
+
+        if (!panelScope.ctrl.editModeInitiated) {
+          panelScope.ctrl.initEditMode();
+        }
+
         this.enterFullscreen(panelScope);
         return;
       }

+ 1 - 0
public/app/features/panel/metrics_panel_ctrl.ts

@@ -41,6 +41,7 @@ class MetricsPanelCtrl extends PanelCtrl {
   }
 
   initEditMode() {
+    super.initEditMode();
     this.addEditorTab('Metrics', 'public/app/partials/metrics.html');
     this.addEditorTab('Time range', 'public/app/features/panel/partials/panelTime.html');
     this.datasources = this.datasourceSrv.getMetricSources();

+ 8 - 12
public/app/features/panel/panel_ctrl.ts

@@ -63,12 +63,6 @@ export class PanelCtrl {
   }
 
   editPanel() {
-    if (!this.editModeInitiated) {
-      this.editorTabs = [];
-      this.addEditorTab('General', 'public/app/partials/panelgeneral.html');
-      this.initEditMode();
-    }
-
     this.changeView(true, true);
   }
 
@@ -77,7 +71,9 @@ export class PanelCtrl {
   }
 
   initEditMode() {
-    return;
+    this.editorTabs = [];
+    this.addEditorTab('General', 'public/app/partials/panelgeneral.html');
+    this.editModeInitiated = true;
   }
 
   addEditorTab(title, directiveFn, index?) {
@@ -166,12 +162,12 @@ export class PanelCtrl {
     });
   }
 
- sharePanel() {
-   var shareScope = this.$scope.$new();
-   shareScope.panel = this.panel;
-   shareScope.dashboard = this.dashboard;
+  sharePanel() {
+    var shareScope = this.$scope.$new();
+    shareScope.panel = this.panel;
+    shareScope.dashboard = this.dashboard;
 
-   this.publishAppEvent('show-modal', {
+    this.publishAppEvent('show-modal', {
      src: 'public/app/features/dashboard/partials/shareModal.html',
      scope: shareScope
    });

+ 2 - 0
public/app/plugins/panel/singlestat/module.ts

@@ -32,6 +32,8 @@ class SingleStatPanel extends PanelDirective {
           $panelContainer = elem.parents('.panel-container');
           firstRender = false;
           hookupDrilldownLinkTooltip();
+        } else {
+          return;
         }
       }
 

+ 1 - 1
public/app/plugins/panel/table/controller.ts

@@ -57,7 +57,7 @@ export class TablePanelCtrl extends MetricsPanelCtrl {
 
   initEditMode() {
     super.initEditMode();
-    this.addEditorTab('Options', tablePanelEditor, 1);
+    this.addEditorTab('Options', tablePanelEditor, 2);
   }
 
   getExtendedMenu() {

+ 2 - 0
public/app/plugins/panel/text/module.ts

@@ -21,8 +21,10 @@ export class TextPanelCtrl extends PanelCtrl {
   }
 
   initEditMode() {
+    super.initEditMode();
     this.icon = 'fa fa-text-width';
     this.addEditorTab('Options', 'public/app/plugins/panel/text/editor.html');
+    this.editorTabIndex = 1;
   }
 
   refresh() {