From 720d2487fa3cc24a62728100052bfeefdd374b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A3o=20Beir=C3=A3o?=
 <12198921+sebashb@users.noreply.github.com>
Date: Fri, 7 Jan 2022 13:56:55 +0000
Subject: [PATCH] Units: Fixed VAr (Volt-Ampere reactive), VA and kVA
 capitalization (#43779)

* Fixed VAr unit casing

* Fixed VAr unit casing

* Fixed VAr unit casing

* Fixed categories.ts file extension

* Fixed VA and kVA capitalization

* Fixed VA, kVA and kVAr capitalization.
---
 .../dev-dashboards-without-uid/panel_tests_polystat.json  | 8 ++++----
 devenv/dev-dashboards/panel-polystat/polystat_test.json   | 8 ++++----
 packages/grafana-data/src/valueFormats/categories.ts      | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
index fd44872f36d..cb201bb47c4 100644
--- a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
+++ b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
@@ -815,19 +815,19 @@
               "value": "Wm2"
             },
             {
-              "text": "Volt-ampere (VA)",
+              "text": "Volt-Ampere (VA)",
               "value": "voltamp"
             },
             {
-              "text": "Kilovolt-ampere (kVA)",
+              "text": "Kilovolt-Ampere (kVA)",
               "value": "kvoltamp"
             },
             {
-              "text": "Volt-ampere reactive (var)",
+              "text": "Volt-Ampere reactive (VAr)",
               "value": "voltampreact"
             },
             {
-              "text": "Kilovolt-ampere reactive (kvar)",
+              "text": "Kilovolt-Ampere reactive (kVAr)",
               "value": "kvoltampreact"
             },
             {
diff --git a/devenv/dev-dashboards/panel-polystat/polystat_test.json b/devenv/dev-dashboards/panel-polystat/polystat_test.json
index 9e1d2c26b15..36eb54dc2b4 100644
--- a/devenv/dev-dashboards/panel-polystat/polystat_test.json
+++ b/devenv/dev-dashboards/panel-polystat/polystat_test.json
@@ -815,19 +815,19 @@
               "value": "Wm2"
             },
             {
-              "text": "Volt-ampere (VA)",
+              "text": "Volt-Ampere (VA)",
               "value": "voltamp"
             },
             {
-              "text": "Kilovolt-ampere (kVA)",
+              "text": "Kilovolt-Ampere (kVA)",
               "value": "kvoltamp"
             },
             {
-              "text": "Volt-ampere reactive (var)",
+              "text": "Volt-Ampere reactive (VAr)",
               "value": "voltampreact"
             },
             {
-              "text": "Kilovolt-ampere reactive (kvar)",
+              "text": "Kilovolt-Ampere reactive (kVAr)",
               "value": "kvoltampreact"
             },
             {
diff --git a/packages/grafana-data/src/valueFormats/categories.ts b/packages/grafana-data/src/valueFormats/categories.ts
index 34cf8e711af..1bc51510107 100644
--- a/packages/grafana-data/src/valueFormats/categories.ts
+++ b/packages/grafana-data/src/valueFormats/categories.ts
@@ -215,10 +215,10 @@ export const getCategories = (): ValueFormatCategory[] => [
       { name: 'Gigawatt (GW)', id: 'gwatt', fn: SIPrefix('W', 3) },
       { name: 'Milliwatt (mW)', id: 'mwatt', fn: SIPrefix('W', -1) },
       { name: 'Watt per square meter (W/m²)', id: 'Wm2', fn: toFixedUnit('W/m²') },
-      { name: 'Volt-ampere (VA)', id: 'voltamp', fn: SIPrefix('VA') },
-      { name: 'Kilovolt-ampere (kVA)', id: 'kvoltamp', fn: SIPrefix('VA', 1) },
-      { name: 'Volt-ampere reactive (var)', id: 'voltampreact', fn: SIPrefix('var') },
-      { name: 'Kilovolt-ampere reactive (kVAr)', id: 'kvoltampreact', fn: SIPrefix('VAr', 1) },
+      { name: 'Volt-Ampere (VA)', id: 'voltamp', fn: SIPrefix('VA') },
+      { name: 'Kilovolt-Ampere (kVA)', id: 'kvoltamp', fn: SIPrefix('VA', 1) },
+      { name: 'Volt-Ampere reactive (VAr)', id: 'voltampreact', fn: SIPrefix('VAr') },
+      { name: 'Kilovolt-Ampere reactive (kVAr)', id: 'kvoltampreact', fn: SIPrefix('VAr', 1) },
       { name: 'Watt-hour (Wh)', id: 'watth', fn: SIPrefix('Wh') },
       { name: 'Watt-hour per Kilogram (Wh/kg)', id: 'watthperkg', fn: SIPrefix('Wh/kg') },
       { name: 'Kilowatt-hour (kWh)', id: 'kwatth', fn: SIPrefix('Wh', 1) },