From 108c196d08cc685d2e6bb68bf6df6652d37bf594 Mon Sep 17 00:00:00 2001
From: Jamin <okpusjamin@gmail.com>
Date: Wed, 10 Jan 2024 11:20:51 +0000
Subject: [PATCH] Frontend: Migrate `Drawer.tsx` from aria-label e2e selectors
 to data-testid (#79616)

* refactor: update aria-label to data-testid

* refactor: update aria-label to data-testid

* refactor: replace title

* refactor: update selector text

* feat: update translation file

* fix old phrases

---------

Co-authored-by: joshhunt <josh@trtr.co>
---
 packages/grafana-ui/src/components/Drawer/Drawer.tsx | 2 +-
 public/locales/de-DE/grafana.json                    | 6 +++---
 public/locales/en-US/grafana.json                    | 6 +++---
 public/locales/es-ES/grafana.json                    | 6 +++---
 public/locales/fr-FR/grafana.json                    | 6 +++---
 public/locales/pseudo-LOCALE/grafana.json            | 6 +++---
 public/locales/zh-Hans/grafana.json                  | 6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/grafana-ui/src/components/Drawer/Drawer.tsx b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
index d36c05ff733..763a31ef953 100644
--- a/packages/grafana-ui/src/components/Drawer/Drawer.tsx
+++ b/packages/grafana-ui/src/components/Drawer/Drawer.tsx
@@ -122,7 +122,7 @@ export function Drawer({
                   variant="secondary"
                   onClick={onClose}
                   data-testid={selectors.components.Drawer.General.close}
-                  tooltip={t(`drawer.close`, 'Close Drawer')}
+                  tooltip={t(`grafana-ui.drawer.close`, 'Close')}
                 />
               </div>
               <div className={styles.titleWrapper}>
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 0f6373e3383..8b8d1774af3 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -413,9 +413,6 @@
       "label": "Neue Datenquelle hinzufügen"
     }
   },
-  "drawer": {
-    "close": ""
-  },
   "explore": {
     "add-to-dashboard": "Zum Dashboard hinzufügen",
     "rich-history": {
@@ -555,6 +552,9 @@
     "loading": "Ordner werden geladen …"
   },
   "grafana-ui": {
+    "drawer": {
+      "close": ""
+    },
     "modal": {
       "close-tooltip": "Schließen"
     },
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 1f2d2bd798a..b4263184b9d 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -413,9 +413,6 @@
       "label": "Add new data source"
     }
   },
-  "drawer": {
-    "close": "Close Drawer"
-  },
   "explore": {
     "add-to-dashboard": "Add to dashboard",
     "rich-history": {
@@ -555,6 +552,9 @@
     "loading": "Loading folders..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "Close"
+    },
     "modal": {
       "close-tooltip": "Close"
     },
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index dfbcdf65a07..c74fcd3eebb 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -418,9 +418,6 @@
       "label": "Añadir nueva fuente de datos"
     }
   },
-  "drawer": {
-    "close": ""
-  },
   "explore": {
     "add-to-dashboard": "Añadir al tablero",
     "rich-history": {
@@ -560,6 +557,9 @@
     "loading": "Cargando carpetas..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": ""
+    },
     "modal": {
       "close-tooltip": "Cerrar"
     },
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index d181288b531..0299020d77f 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -418,9 +418,6 @@
       "label": "Ajouter une nouvelle source de données"
     }
   },
-  "drawer": {
-    "close": ""
-  },
   "explore": {
     "add-to-dashboard": "Ajouter au tableau de bord",
     "rich-history": {
@@ -560,6 +557,9 @@
     "loading": "Chargement des dossiers..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": ""
+    },
     "modal": {
       "close-tooltip": "Fermer"
     },
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index e20fb1d4b44..527664d55ba 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -413,9 +413,6 @@
       "label": "Åđđ ʼnęŵ đäŧä şőūřčę"
     }
   },
-  "drawer": {
-    "close": "Cľőşę Đřäŵęř"
-  },
   "explore": {
     "add-to-dashboard": "Åđđ ŧő đäşĥþőäřđ",
     "rich-history": {
@@ -555,6 +552,9 @@
     "loading": "Ŀőäđįʼnģ ƒőľđęřş..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": "Cľőşę"
+    },
     "modal": {
       "close-tooltip": "Cľőşę"
     },
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 40b22e3c936..13fef03e0cc 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -408,9 +408,6 @@
       "label": "添加新数据源"
     }
   },
-  "drawer": {
-    "close": ""
-  },
   "explore": {
     "add-to-dashboard": "添加到仪表板",
     "rich-history": {
@@ -550,6 +547,9 @@
     "loading": "正在加载文件夹..."
   },
   "grafana-ui": {
+    "drawer": {
+      "close": ""
+    },
     "modal": {
       "close-tooltip": "关闭"
     },