From 17adb58d803008562faaaa6ff51546816154e773 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 5 Nov 2018 17:32:28 +0100
Subject: [PATCH 1/2] export: provide more help regarding export format

this will provide the user with more info about
the export format and default to not use the format
for sharing on grafana.com etc.

ref #13781
---
 .../dashboard/export/export_modal.html        | 12 +++++-
 .../features/dashboard/export/export_modal.ts | 40 ++++++++++++++-----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/public/app/features/dashboard/export/export_modal.html b/public/app/features/dashboard/export/export_modal.html
index 0598c612fd6..3505e50b821 100644
--- a/public/app/features/dashboard/export/export_modal.html
+++ b/public/app/features/dashboard/export/export_modal.html
@@ -15,11 +15,19 @@
 			You can share dashboards on <a class="external-link" href="https://grafana.com">Grafana.com</a>
 		</p>
 
+		<gf-form-switch
+			class="gf-form"
+			label="Export for sharing externally"
+			label-class="width-16"
+			checked="ctrl.shareExternally"
+			tooltip="Useful for sharing dashboard publicly on grafana.com. Will templatize data source names. Can then only be used with the specific dashboard import API.">
+		</gf-form-switch>
+
 		<div class="gf-form-button-row">
-			<button type="button" class="btn gf-form-btn width-10 btn-success" ng-click="ctrl.save()">
+			<button type="button" class="btn gf-form-btn width-10 btn-success" ng-click="ctrl.saveDashboardAsFile()">
 				<i class="fa fa-save"></i> Save to file
 			</button>
-			<button type="button" class="btn gf-form-btn width-10 btn-secondary" ng-click="ctrl.saveJson()">
+			<button type="button" class="btn gf-form-btn width-10 btn-secondary" ng-click="ctrl.viewJson()">
 				<i class="fa fa-file-text-o"></i> View JSON
 			</button>
 			<a class="btn btn-link" ng-click="ctrl.dismiss()">Cancel</a>
diff --git a/public/app/features/dashboard/export/export_modal.ts b/public/app/features/dashboard/export/export_modal.ts
index f99946915d6..08a79702ed5 100644
--- a/public/app/features/dashboard/export/export_modal.ts
+++ b/public/app/features/dashboard/export/export_modal.ts
@@ -8,27 +8,47 @@ export class DashExportCtrl {
   dash: any;
   exporter: DashboardExporter;
   dismiss: () => void;
+  shareExternally: boolean;
 
   /** @ngInject */
   constructor(private dashboardSrv, datasourceSrv, private $scope, private $rootScope) {
     this.exporter = new DashboardExporter(datasourceSrv);
 
-    this.exporter.makeExportable(this.dashboardSrv.getCurrent()).then(dash => {
-      this.$scope.$apply(() => {
-        this.dash = dash;
-      });
-    });
+    this.dash = this.dashboardSrv.getCurrent();
   }
 
-  save() {
-    const blob = new Blob([angular.toJson(this.dash, true)], {
+  saveDashboardAsFile() {
+    if (this.shareExternally) {
+      this.exporter.makeExportable(this.dash).then((dashboardJson: any) => {
+        this.$scope.$apply(() => {
+          this._saveFile(dashboardJson);
+        });
+      });
+    } else {
+      this._saveFile(this.dash.getSaveModelClone());
+    }
+  }
+
+  viewJson() {
+    if (this.shareExternally) {
+      this.exporter.makeExportable(this.dash).then((dashboardJson: any) => {
+        this.$scope.$apply(() => {
+          this._viewJson(dashboardJson);
+        });
+      });
+    } else {
+      this._viewJson(this.dash.getSaveModelClone());
+    }
+  }
+
+  _saveFile(dash: any) {
+    const blob = new Blob([angular.toJson(dash, true)], {
       type: 'application/json;charset=utf-8',
     });
-    saveAs(blob, this.dash.title + '-' + new Date().getTime() + '.json');
+    saveAs(blob, dash.title + '-' + new Date().getTime() + '.json');
   }
 
-  saveJson() {
-    const clone = this.dash;
+  _viewJson(clone: any) {
     const editScope = this.$rootScope.$new();
     editScope.object = clone;
     editScope.enableCopy = true;

From 7bde98aff9789c071bb3221d50ffe17798e371bb Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 6 Nov 2018 09:00:17 +0100
Subject: [PATCH 2/2] rename and mark functions as private

---
 public/app/features/dashboard/export/export_modal.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/app/features/dashboard/export/export_modal.ts b/public/app/features/dashboard/export/export_modal.ts
index 08a79702ed5..0e48041ca87 100644
--- a/public/app/features/dashboard/export/export_modal.ts
+++ b/public/app/features/dashboard/export/export_modal.ts
@@ -21,11 +21,11 @@ export class DashExportCtrl {
     if (this.shareExternally) {
       this.exporter.makeExportable(this.dash).then((dashboardJson: any) => {
         this.$scope.$apply(() => {
-          this._saveFile(dashboardJson);
+          this.openSaveAsDialog(dashboardJson);
         });
       });
     } else {
-      this._saveFile(this.dash.getSaveModelClone());
+      this.openSaveAsDialog(this.dash.getSaveModelClone());
     }
   }
 
@@ -33,22 +33,22 @@ export class DashExportCtrl {
     if (this.shareExternally) {
       this.exporter.makeExportable(this.dash).then((dashboardJson: any) => {
         this.$scope.$apply(() => {
-          this._viewJson(dashboardJson);
+          this.openJsonModal(dashboardJson);
         });
       });
     } else {
-      this._viewJson(this.dash.getSaveModelClone());
+      this.openJsonModal(this.dash.getSaveModelClone());
     }
   }
 
-  _saveFile(dash: any) {
+  private openSaveAsDialog(dash: any) {
     const blob = new Blob([angular.toJson(dash, true)], {
       type: 'application/json;charset=utf-8',
     });
     saveAs(blob, dash.title + '-' + new Date().getTime() + '.json');
   }
 
-  _viewJson(clone: any) {
+  private openJsonModal(clone: any) {
     const editScope = this.$rootScope.$new();
     editScope.object = clone;
     editScope.enableCopy = true;