From 7cd58dd7d03a388d2b69b9f877f4a2e105e8be66 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 6 Oct 2021 07:08:02 -0400
Subject: [PATCH] MySql: Fix reset button on config page (#39988) (#40064)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* MySql: Fix reset button on config page

* Use button instead of anchor

* Add aria labels

(cherry picked from commit 7fd7c985404faa43212b47c8d56ee215083651ce)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
---
 .../partials/tls_auth_settings.html           | 67 ++++++++++++-------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/public/app/features/datasources/partials/tls_auth_settings.html b/public/app/features/datasources/partials/tls_auth_settings.html
index f15193bf63b..76f0c1a66b8 100644
--- a/public/app/features/datasources/partials/tls_auth_settings.html
+++ b/public/app/features/datasources/partials/tls_auth_settings.html
@@ -7,17 +7,24 @@
     <div class="gf-form-inline">
       <div class="gf-form gf-form--v-stretch"><label class="gf-form-label width-7">CA Cert</label></div>
       <div class="gf-form gf-form--grow" ng-if="!current.secureJsonFields.tlsCACert">
-         <textarea
-           rows="7"
-           class="gf-form-input gf-form-textarea"
-           ng-model="current.secureJsonData.tlsCACert"
-           placeholder="Begins with -----BEGIN CERTIFICATE-----"
-         ></textarea>
+        <textarea
+          rows="7"
+          class="gf-form-input gf-form-textarea"
+          ng-model="current.secureJsonData.tlsCACert"
+          placeholder="Begins with -----BEGIN CERTIFICATE-----"
+        ></textarea>
       </div>
 
       <div class="gf-form" ng-if="current.secureJsonFields.tlsCACert">
         <input type="text" class="gf-form-input max-width-12" disabled="disabled" value="configured" />
-        <a class="btn btn-secondary gf-form-btn" href="#" ng-click="current.secureJsonFields.tlsCACert = false">reset</a>
+        <button
+          type="reset"
+          aria-label="Reset CA Cert"
+          class="btn btn-secondary gf-form-btn"
+          ng-click="current.secureJsonFields.tlsCACert = false"
+        >
+          reset
+        </button>
       </div>
     </div>
   </div>
@@ -26,36 +33,48 @@
     <div class="gf-form-inline">
       <div class="gf-form gf-form--v-stretch"><label class="gf-form-label width-7">Client Cert</label></div>
       <div class="gf-form gf-form--grow" ng-if="!current.secureJsonFields.tlsClientCert">
-         <textarea
-           rows="7"
-           class="gf-form-input gf-form-textarea"
-           ng-model="current.secureJsonData.tlsClientCert"
-           placeholder="Begins with -----BEGIN CERTIFICATE-----"
-           required
-         ></textarea>
+        <textarea
+          rows="7"
+          class="gf-form-input gf-form-textarea"
+          ng-model="current.secureJsonData.tlsClientCert"
+          placeholder="Begins with -----BEGIN CERTIFICATE-----"
+          required
+        ></textarea>
       </div>
       <div class="gf-form" ng-if="current.secureJsonFields.tlsClientCert">
         <input type="text" class="gf-form-input max-width-12" disabled="disabled" value="configured" />
-        <a class="btn btn-secondary gf-form-btn" href="#" ng-click="current.secureJsonFields.tlsClientCert = false"
-        >reset</a
+        <button
+          class="btn btn-secondary gf-form-btn"
+          aria-label="Reset Client Cert"
+          type="reset"
+          ng-click="current.secureJsonFields.tlsClientCert = false"
         >
+          reset
+        </button>
       </div>
     </div>
 
     <div class="gf-form-inline">
       <div class="gf-form gf-form--v-stretch"><label class="gf-form-label width-7">Client Key</label></div>
       <div class="gf-form gf-form--grow" ng-if="!current.secureJsonFields.tlsClientKey">
-         <textarea
-           rows="7"
-           class="gf-form-input gf-form-textarea"
-           ng-model="current.secureJsonData.tlsClientKey"
-           placeholder="Begins with -----BEGIN RSA PRIVATE KEY-----"
-           required
-         ></textarea>
+        <textarea
+          rows="7"
+          class="gf-form-input gf-form-textarea"
+          ng-model="current.secureJsonData.tlsClientKey"
+          placeholder="Begins with -----BEGIN RSA PRIVATE KEY-----"
+          required
+        ></textarea>
       </div>
       <div class="gf-form" ng-if="current.secureJsonFields.tlsClientKey">
         <input type="text" class="gf-form-input max-width-12" disabled="disabled" value="configured" />
-        <a class="btn btn-secondary gf-form-btn" href="#" ng-click="current.secureJsonFields.tlsClientKey = false">reset</a>
+        <button
+          class="btn btn-secondary gf-form-btn"
+          type="reset"
+          aria-label="Reset Client Key"
+          ng-click="current.secureJsonFields.tlsClientKey = false"
+        >
+          reset
+        </button>
       </div>
     </div>
   </div>