From 7e0b5c198c78ce30c4547d12c7c9a01878b7e6b8 Mon Sep 17 00:00:00 2001 From: CD Cabrera Date: Fri, 19 Nov 2021 13:52:37 -0500 Subject: [PATCH] fix(graphCardMetricTotals): ent-4366 daily, monthly header copy (#840) --- public/locales/en-US.json | 15 --------------- .../graphCardMetricTotals.test.js.snap | 16 ++++++++-------- .../graphCard/graphCardMetricTotals.js | 4 ++-- .../__tests__/__snapshots__/i18n.test.js.snap | 4 ++-- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/public/locales/en-US.json b/public/locales/en-US.json index c769b8516..cba65b4e0 100644 --- a/public/locales/en-US.json +++ b/public/locales/en-US.json @@ -36,28 +36,13 @@ "cardHeadingDescription_OpenShift-metrics": "A subscription model that offers purchasing options to match your usage patterns.", "cardHeadingDescription_OpenShift-dedicated-metrics": "A subscription model that offers purchasing options to match your usage patterns.", "cardHeadingMetric_dailyTotal": "Daily total", - "cardHeadingMetric_dailyTotal_current_Instance-hours": "Today's instance hours", - "cardHeadingMetric_dailyTotal_current_Storage-gibibytes": "Today's data storage", - "cardHeadingMetric_dailyTotal_current_Transfer-gibibytes": "Today's data transfer", "cardHeadingMetric_dailyTotal_Instance-hours": "Daily instance hours", "cardHeadingMetric_dailyTotal_Storage-gibibytes": "Daily data storage", "cardHeadingMetric_dailyTotal_Transfer-gibibytes": "Daily data transfer", "cardHeadingMetric_monthlyTotal": "Monthly total", - "cardHeadingMetric_monthlyTotal_current_Instance-hours": "This month's instance hours", - "cardHeadingMetric_monthlyTotal_current_Storage-gibibytes": "This month's data storage", - "cardHeadingMetric_monthlyTotal_current_Transfer-gibibytes": "This month's data transfer", "cardHeadingMetric_monthlyTotal_Instance-hours": "Monthly instance hours", "cardHeadingMetric_monthlyTotal_Storage-gibibytes": "Monthly data storage", "cardHeadingMetric_monthlyTotal_Transfer-gibibytes": "Monthly data transfer", - "cardHeadingMetric_currentTotal_current_Instance-hours": "Today's instance hours", - "cardHeadingMetric_currentTotal_Instance-hours": "{{month}}'s instance hours", - "cardHeadingMetric_total_Instance-hours": "{{month}}'s instance hours", - "cardHeadingMetric_currentTotal_current_Storage-gibibytes": "Today's data storage", - "cardHeadingMetric_currentTotal_Storage-gibibytes": "{{month}}'s data storage", - "cardHeadingMetric_total_Storage-gibibytes": "{{month}}'s data storage", - "cardHeadingMetric_currentTotal_current_Transfer-gibibytes": "Today's data transfer", - "cardHeadingMetric_currentTotal_Transfer-gibibytes": "{{month}}'s data transfer", - "cardHeadingMetric_total_Transfer-gibibytes": "{{month}}'s data transfer", "cardBodyMetric_total": "No data", "cardBodyMetric_total_Instance-hours": "<0>{{total}} Gibibyte hours", "cardBodyMetric_total_Storage-gibibytes": "<0>{{total}} Gibibyte hours", diff --git a/src/components/graphCard/__tests__/__snapshots__/graphCardMetricTotals.test.js.snap b/src/components/graphCard/__tests__/__snapshots__/graphCardMetricTotals.test.js.snap index 4d57f7b7e..c7dead634 100644 --- a/src/components/graphCard/__tests__/__snapshots__/graphCardMetricTotals.test.js.snap +++ b/src/components/graphCard/__tests__/__snapshots__/graphCardMetricTotals.test.js.snap @@ -29,7 +29,7 @@ exports[`GraphCardMetricTotals Component should handle multiple display states: data-test="graphDailyTotalCard" > - t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_dailyTotal, {}) - t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_monthlyTotal, {}) - t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_dailyTotal, {}) - t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_monthlyTotal, {}) - t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_dailyTotal, {}) - t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_monthlyTotal, {}) - t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_dailyTotal, {}) - t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""}) + t(curiosity-graph.cardHeadingMetric_monthlyTotal, {}) {t('curiosity-graph.cardHeadingMetric_dailyTotal', { - context: [isCurrent && 'current', metricId], + context: metricId, month: selectedMonth })} @@ -101,7 +101,7 @@ const GraphCardMetricTotals = ({ > {t('curiosity-graph.cardHeadingMetric_monthlyTotal', { - context: [isCurrent && 'current', metricId], + context: metricId, month: selectedMonth })} diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap index 229f3d3c2..3fbc82c58 100644 --- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap +++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap @@ -137,7 +137,7 @@ Array [ "keys": Array [ Object { "key": "curiosity-graph.cardHeadingMetric_dailyTotal", - "match": "t('curiosity-graph.cardHeadingMetric_dailyTotal', { context: [isCurrent && 'current', metricId], month: selectedMonth })", + "match": "t('curiosity-graph.cardHeadingMetric_dailyTotal', { context: metricId, month: selectedMonth })", }, Object { "key": "curiosity-graph.cardBodyMetric_total", @@ -149,7 +149,7 @@ Array [ }, Object { "key": "curiosity-graph.cardHeadingMetric_monthlyTotal", - "match": "t('curiosity-graph.cardHeadingMetric_monthlyTotal', { context: [isCurrent && 'current', metricId], month: selectedMonth })", + "match": "t('curiosity-graph.cardHeadingMetric_monthlyTotal', { context: metricId, month: selectedMonth })", }, Object { "key": "curiosity-graph.cardBodyMetric_total",