From c42d09b26759fe0adc0fb303a6276dc69ed6e81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 29 Mar 2015 15:01:27 +0200 Subject: [PATCH] Enabled snapshot sharing of single panels, enabled sharing of snapshot dashboards (but you cannot snapshot a snapshot --- public/app/features/dashboard/dashboardSrv.js | 13 +++++ .../dashboard/partials/shareModal.html | 4 +- .../app/features/dashboard/shareModalCtrl.js | 20 +++---- .../features/dashboard/shareSnapshotCtrl.js | 58 +++++++++++-------- public/app/features/panel/soloPanelCtrl.js | 16 +---- public/test/specs/helpers.js | 1 + public/test/specs/shareModalCtrl-specs.js | 17 +++--- 7 files changed, 67 insertions(+), 62 deletions(-) diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js index 20f04b421d7..dc01a328b12 100644 --- a/public/app/features/dashboard/dashboardSrv.js +++ b/public/app/features/dashboard/dashboardSrv.js @@ -78,6 +78,19 @@ function (angular, $, kbn, _, moment) { } }; + p.getPanelById = function(id) { + for (var i = 0; i < this.rows.length; i++) { + var row = this.rows[i]; + for (var j = 0; j < row.panels.length; j++) { + var panel = row.panels[j]; + if (panel.id === id) { + return panel; + } + } + } + return null; + }; + p.rowSpan = function(row) { return _.reduce(row.panels, function(p,v) { return p + v.span; diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/partials/shareModal.html index b6b722465f9..881d30ada97 100644 --- a/public/app/features/dashboard/partials/shareModal.html +++ b/public/app/features/dashboard/partials/shareModal.html @@ -1,4 +1,4 @@ -
+
@@ -59,7 +59,7 @@
-
+
Direct link rendered image
diff --git a/public/app/features/dashboard/shareModalCtrl.js b/public/app/features/dashboard/shareModalCtrl.js index 5ad12b6e521..358c2c74f66 100644 --- a/public/app/features/dashboard/shareModalCtrl.js +++ b/public/app/features/dashboard/shareModalCtrl.js @@ -13,22 +13,20 @@ function (angular, _, require, config) { $scope.init = function() { $scope.editor = { index: 0 }; - $scope.options = { - forCurrent: true, - toPanel: $scope.panel ? true : false, - includeTemplateVars: true - }; + $scope.options = { forCurrent: true, includeTemplateVars: true }; + $scope.modeSharePanel = $scope.panel ? true : false; $scope.tabs = [{title: 'Link', src: 'shareLink.html'}]; - if ($scope.options.toPanel) { + if ($scope.modeSharePanel) { $scope.modalTitle = 'Share Panel'; $scope.tabs.push({title: 'Embed', src: 'shareEmbed.html'}); } else { $scope.modalTitle = 'Share Dashboard'; - if (!$scope.dashboardMeta.isSnapshot) { - $scope.tabs.push({title: 'Snapshot sharing', src: 'shareSnapshot.html'}); - } + } + + if (!$scope.dashboardMeta.isSnapshot) { + $scope.tabs.push({title: 'Snapshot sharing', src: 'shareSnapshot.html'}); } $scope.buildUrl(); @@ -64,7 +62,7 @@ function (angular, _, require, config) { delete params.to; } - if ($scope.options.toPanel) { + if ($scope.modeSharePanel) { params.panelId = $scope.panel.id; params.fullscreen = true; } else { @@ -97,8 +95,6 @@ function (angular, _, require, config) { $scope.imageUrl += '&height=500'; }; - $scope.init(); - }); module.directive('clipboardButton',function() { diff --git a/public/app/features/dashboard/shareSnapshotCtrl.js b/public/app/features/dashboard/shareSnapshotCtrl.js index d75da5d5524..ed6536face6 100644 --- a/public/app/features/dashboard/shareSnapshotCtrl.js +++ b/public/app/features/dashboard/shareSnapshotCtrl.js @@ -44,34 +44,12 @@ function (angular, _) { $timeout(function() { $scope.saveSnapshot(external); - }, 3000); + }, 4000); }; $scope.saveSnapshot = function(external) { var dash = angular.copy($scope.dashboard); - // change title - dash.title = $scope.snapshot.name; - // make relative times absolute - dash.time = timeSrv.timeRange(); - // remove panel queries & links - dash.forEachPanel(function(panel) { - panel.targets = []; - panel.links = []; - }); - // remove annotations - dash.annotations.list = []; - // remove template queries - _.each(dash.templating.list, function(variable) { - variable.query = ""; - variable.options = []; - variable.refresh = false; - }); - - // cleanup snapshotData - delete $scope.dashboard.snapshot; - $scope.dashboard.forEachPanel(function(panel) { - delete panel.snapshotData; - }); + $scope.scrubDashboard(dash); var cmdData = { dashboard: dash, @@ -99,6 +77,38 @@ function (angular, _) { }); }; + $scope.scrubDashboard = function(dash) { + // change title + dash.title = $scope.snapshot.name; + // make relative times absolute + dash.time = timeSrv.timeRange(); + // remove panel queries & links + dash.forEachPanel(function(panel) { + panel.targets = []; + panel.links = []; + }); + // remove annotations + dash.annotations.list = []; + // remove template queries + _.each(dash.templating.list, function(variable) { + variable.query = ""; + variable.options = []; + variable.refresh = false; + }); + + // snapshot single panel + if ($scope.modeSharePanel) { + var singlePanel = dash.getPanelById($scope.panel.id); + dash.rows = [{ height: '500px', span: 12, panels: [singlePanel] }]; + } + + // cleanup snapshotData + delete $scope.dashboard.snapshot; + $scope.dashboard.forEachPanel(function(panel) { + delete panel.snapshotData; + }); + }; + $scope.saveExternalSnapshotRef = function(cmdData, results) { // save external in local instance as well cmdData.external = true; diff --git a/public/app/features/panel/soloPanelCtrl.js b/public/app/features/panel/soloPanelCtrl.js index 9068c8f60e8..02727694e41 100644 --- a/public/app/features/panel/soloPanelCtrl.js +++ b/public/app/features/panel/soloPanelCtrl.js @@ -49,7 +49,7 @@ function (angular, $) { $scope.test = "Hej"; $scope.$index = 0; - $scope.panel = $scope.getPanelById(panelId); + $scope.panel = $scope.dashboard.getPanelById(panelId); if (!$scope.panel) { $scope.appEvent('alert-error', ['Panel not found', '']); @@ -63,20 +63,6 @@ function (angular, $) { templateValuesSrv.init($scope.dashboard, $scope.dashboardViewState); }; - $scope.getPanelById = function(id) { - var rows = $scope.dashboard.rows; - for (var i = 0; i < rows.length; i++) { - var row = rows[i]; - for (var j = 0; j < row.panels.length; j++) { - var panel = row.panels[j]; - if (panel.id === id) { - return panel; - } - } - } - return null; - }; - if (!$scope.skipAutoInit) { $scope.init(); } diff --git a/public/test/specs/helpers.js b/public/test/specs/helpers.js index 94c79b57f96..a0f7c186331 100644 --- a/public/test/specs/helpers.js +++ b/public/test/specs/helpers.js @@ -44,6 +44,7 @@ define([ self.scope.panel = {}; self.scope.row = { panels:[] }; self.scope.dashboard = {}; + self.scope.dashboardMeta = {}; self.scope.dashboardViewState = new DashboardViewStateStub(); self.scope.appEvent = sinon.spy(); self.scope.onAppEvent = sinon.spy(); diff --git a/public/test/specs/shareModalCtrl-specs.js b/public/test/specs/shareModalCtrl-specs.js index 40a2b2d868c..f7493f52ad0 100644 --- a/public/test/specs/shareModalCtrl-specs.js +++ b/public/test/specs/shareModalCtrl-specs.js @@ -4,7 +4,7 @@ define([ ], function(helpers) { 'use strict'; - describe('SharePanelCtrl', function() { + describe('ShareModalCtrl', function() { var ctx = new helpers.ControllerTestContext(); function setTime(range) { @@ -26,7 +26,7 @@ define([ setTime({ from: 'now-1h', to: 'now' }); - ctx.scope.buildUrl(); + ctx.scope.init(); expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&panelId=22&fullscreen'); }); @@ -35,24 +35,23 @@ define([ ctx.scope.panel = { id: 22 }; setTime({ from: 1362178800000, to: 1396648800000 }); - ctx.scope.buildUrl(); + ctx.scope.init(); expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1362178800000&to=1396648800000&panelId=22&fullscreen'); }); - it('should remove panel id when toPanel is false', function() { + it('should remove panel id when no panel in scope', function() { ctx.$location.path('/test'); - ctx.scope.panel = { id: 22 }; - ctx.scope.options = { toPanel: false, forCurrent: true }; + ctx.scope.options = { forCurrent: true }; + ctx.scope.panel = null; setTime({ from: 'now-1h', to: 'now' }); - ctx.scope.buildUrl(); + ctx.scope.init(); expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now'); }); it('should include template variables in url', function() { ctx.$location.path('/test'); - ctx.scope.panel = { id: 22 }; - ctx.scope.options = { includeTemplateVars: true, toPanel: false, forCurrent: true }; + ctx.scope.options = { includeTemplateVars: true, forCurrent: true }; ctx.templateSrv.variables = [{ name: 'app', current: {text: 'mupp' }}, {name: 'server', current: {text: 'srv-01'}}]; setTime({ from: 'now-1h', to: 'now' });