fix(graphCardHelpers): issues/317 yAxisTickFormat locale (#319)

* helpers, expose default locale, description * graphCardHelpers, apply helper default locale * userServices, apply helper default locale
RedHatInsights · Jul 30, 2020 · 5cc5dbd · 5cc5dbd
1 parent 73b57ef
commit 5cc5dbd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/common/__tests__/__snapshots__/helpers.test.js.snap b/src/common/__tests__/__snapshots__/helpers.test.js.snap
@@ -14,6 +14,8 @@ Object {
   "UI_DISPLAY_CONFIG_NAME": "Subscription Watch",
   "UI_DISPLAY_NAME": "Subscription Watch",
   "UI_DISPLAY_START_NAME": "Subscription Watch",
+  "UI_LOCALE_DEFAULT": "en-US",
+  "UI_LOCALE_DEFAULT_DESC": "English",
   "UI_LOGGER_ID": "curiosity",
   "UI_NAME": "subscriptions",
   "UI_PATH": "/",
@@ -43,6 +45,8 @@ Object {
   "UI_DISPLAY_CONFIG_NAME": "Subscription Watch",
   "UI_DISPLAY_NAME": "Subscription Watch",
   "UI_DISPLAY_START_NAME": "Subscription Watch",
+  "UI_LOCALE_DEFAULT": "en-US",
+  "UI_LOCALE_DEFAULT_DESC": "English",
   "UI_LOGGER_ID": "curiosity",
   "UI_NAME": "subscriptions",
   "UI_PATH": "/",
@@ -72,6 +76,8 @@ Object {
   "UI_DISPLAY_CONFIG_NAME": "Subscription Watch",
   "UI_DISPLAY_NAME": "Subscription Watch",
   "UI_DISPLAY_START_NAME": "Subscription Watch",
+  "UI_LOCALE_DEFAULT": "en-US",
+  "UI_LOCALE_DEFAULT_DESC": "English",
   "UI_LOGGER_ID": "curiosity",
   "UI_NAME": "subscriptions",
   "UI_PATH": "/",

diff --git a/src/common/helpers.js b/src/common/helpers.js
@@ -138,6 +138,20 @@ const UI_DISPLAY_CONFIG_NAME = process.env.REACT_APP_UI_DISPLAY_CONFIG_NAME;
  */
 const UI_DISPLAY_START_NAME = process.env.REACT_APP_UI_DISPLAY_START_NAME;
 
+/**
+ * UI locale default.
+ *
+ * @type {string}
+ */
+const UI_LOCALE_DEFAULT = process.env.REACT_APP_CONFIG_SERVICE_LOCALES_DEFAULT_LNG;
+
+/**
+ * UI locale default description.
+ *
+ * @type {string}
+ */
+const UI_LOCALE_DEFAULT_DESC = process.env.REACT_APP_CONFIG_SERVICE_LOCALES_DEFAULT_LNG_DESC;
+
 /**
  * UI state logging name/id.
  * See dotenv config files for updating.
@@ -212,6 +226,8 @@ const helpers = {
   UI_DISPLAY_NAME,
   UI_DISPLAY_CONFIG_NAME,
   UI_DISPLAY_START_NAME,
+  UI_LOCALE_DEFAULT,
+  UI_LOCALE_DEFAULT_DESC,
   UI_LOGGER_ID,
   UI_NAME,
   UI_PATH,

diff --git a/src/components/graphCard/graphCardHelpers.js b/src/components/graphCard/graphCardHelpers.js
@@ -1,6 +1,6 @@
 import moment from 'moment';
 import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../../types/rhsmApiTypes';
-import { dateHelpers } from '../../common/dateHelpers';
+import { dateHelpers, helpers } from '../../common';
 
 /**
  * Returns x axis ticks/intervals array for the xAxisTickInterval
@@ -109,7 +109,7 @@ const xAxisTickFormat = ({ date, granularity, tick, previousDate }) => {
  * @param {string} params.locale
  * @returns {string}
  */
-const yAxisTickFormat = ({ tick, locale }) =>
+const yAxisTickFormat = ({ tick, locale = helpers.UI_LOCALE_DEFAULT }) =>
   new Intl.NumberFormat(locale, { maximumFractionDigits: 1, notation: 'compact', compactDisplay: 'short' }).format(
     tick
   );

diff --git a/src/services/userServices.js b/src/services/userServices.js
@@ -55,8 +55,8 @@ const getLocaleFromCookie = () => {
  */
 const getLocale = () => {
   const defaultLocale = {
-    value: process.env.REACT_APP_CONFIG_SERVICE_LOCALES_DEFAULT_LNG,
-    key: process.env.REACT_APP_CONFIG_SERVICE_LOCALES_DEFAULT_LNG_DESC
+    value: helpers.UI_LOCALE_DEFAULT,
+    key: helpers.UI_LOCALE_DEFAULT_DESC
   };
 
   return new Promise(resolve =>