From 60272d8a77a92c408ce8a6dfc12dd882c019e4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 14 Feb 2019 18:15:51 +0100
Subject: [PATCH 1/2] Simple implementation for preserve tags, closes #11627

---
 .../SaveModals/SaveDashboardAsModalCtrl.ts       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
index 60fa031f71c..59cfa22e468 100644
--- a/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
@@ -16,19 +16,19 @@ const template = `
 	<form name="ctrl.saveForm" class="modal-content" novalidate>
 		<div class="p-t-2">
 			<div class="gf-form">
-				<label class="gf-form-label width-7">New name</label>
+				<label class="gf-form-label width-8">New name</label>
 				<input type="text" class="gf-form-input" ng-model="ctrl.clone.title" give-focus="true" required>
 			</div>
-      <div class="gf-form">
-        <folder-picker initial-folder-id="ctrl.folderId"
+      <folder-picker initial-folder-id="ctrl.folderId"
                        on-change="ctrl.onFolderChange($folder)"
                        enter-folder-creation="ctrl.onEnterFolderCreation()"
                        exit-folder-creation="ctrl.onExitFolderCreation()"
                        enable-create-new="true"
-                       label-class="width-7"
+                       label-class="width-8"
                        dashboard-id="ctrl.clone.id">
         </folder-picker>
-      </div>
+      <gf-form-switch class="gf-form" label="Preserve tags" label-class="width-8" checked="ctrl.preseveTags">
+	    </gf-form-switch>
 		</div>
 
 		<div class="gf-form-button-row text-center">
@@ -44,6 +44,7 @@ export class SaveDashboardAsModalCtrl {
   folderId: any;
   dismiss: () => void;
   isValidFolderSelection = true;
+  preseveTags: boolean;
 
   /** @ngInject */
   constructor(private dashboardSrv) {
@@ -55,6 +56,7 @@ export class SaveDashboardAsModalCtrl {
     this.clone.editable = true;
     this.clone.hideControls = false;
     this.folderId = dashboard.meta.folderId;
+    this.preseveTags = false;
 
     // remove alerts if source dashboard is already persisted
     // do not want to create alert dupes
@@ -71,6 +73,10 @@ export class SaveDashboardAsModalCtrl {
   }
 
   save() {
+    if (!this.preseveTags) {
+      this.clone.tags = [];
+    }
+
     return this.dashboardSrv.save(this.clone, { folderId: this.folderId }).then(this.dismiss);
   }
 

From 04c88a226b1d36355fb92cd12a515d58ac88e76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 8 Mar 2019 14:24:45 +0100
Subject: [PATCH 2/2] Minor refactoring of copy tags when saving feature,
 #15446

---
 .../SaveModals/SaveDashboardAsModalCtrl.ts         | 14 ++++++++------
 public/sass/components/_tags.scss                  |  6 ++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
index 59cfa22e468..23ad97708b4 100644
--- a/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
@@ -26,9 +26,11 @@ const template = `
                        enable-create-new="true"
                        label-class="width-8"
                        dashboard-id="ctrl.clone.id">
-        </folder-picker>
-      <gf-form-switch class="gf-form" label="Preserve tags" label-class="width-8" checked="ctrl.preseveTags">
-	    </gf-form-switch>
+      </folder-picker>
+      <div class="gf-form-inline">
+        <gf-form-switch class="gf-form" label="Copy tags" label-class="width-8" checked="ctrl.copyTags">
+        </gf-form-switch>
+      </div>
 		</div>
 
 		<div class="gf-form-button-row text-center">
@@ -44,7 +46,7 @@ export class SaveDashboardAsModalCtrl {
   folderId: any;
   dismiss: () => void;
   isValidFolderSelection = true;
-  preseveTags: boolean;
+  copyTags: boolean;
 
   /** @ngInject */
   constructor(private dashboardSrv) {
@@ -56,7 +58,7 @@ export class SaveDashboardAsModalCtrl {
     this.clone.editable = true;
     this.clone.hideControls = false;
     this.folderId = dashboard.meta.folderId;
-    this.preseveTags = false;
+    this.copyTags = false;
 
     // remove alerts if source dashboard is already persisted
     // do not want to create alert dupes
@@ -73,7 +75,7 @@ export class SaveDashboardAsModalCtrl {
   }
 
   save() {
-    if (!this.preseveTags) {
+    if (!this.copyTags) {
       this.clone.tags = [];
     }
 
diff --git a/public/sass/components/_tags.scss b/public/sass/components/_tags.scss
index 692259facb3..4451f2ee8a6 100644
--- a/public/sass/components/_tags.scss
+++ b/public/sass/components/_tags.scss
@@ -21,10 +21,8 @@
   border-radius: 3px;
   text-shadow: none;
   font-size: 13px;
-  padding: 3px 6px 1px 6px;
-  border-width: 1px;
-  border-style: solid;
-  box-shadow: 0 0 1px rgba($white, 0.2);
+  padding: 2px 6px 2px 6px;
+  border: 1px solid lighten($purple, 10%);
 
   .icon-tag {
     position: relative;