fix(graphCardMetricTotals): ent-4366 daily, monthly header copy (#840)

RedHatInsights · Nov 29, 2021 · 7e0b5c1 · 7e0b5c1
1 parent 6565813
commit 7e0b5c1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 27 deletions.
diff --git 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}}</0> Gibibyte hours",
     "cardBodyMetric_total_Storage-gibibytes": "<0>{{total}}</0> Gibibyte hours",

diff --git 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"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_dailyTotal, {})
         </CardTitle>
         <MinHeight
           key="currentBody"
@@ -59,7 +59,7 @@ exports[`GraphCardMetricTotals Component should handle multiple display states:
         data-test="graphMonthlyTotalCard"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {})
         </CardTitle>
         <MinHeight
           key="totalMonthlyBody"
@@ -139,7 +139,7 @@ exports[`GraphCardMetricTotals Component should handle multiple display states:
         data-test="graphDailyTotalCard"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_dailyTotal, {})
         </CardTitle>
         <MinHeight
           key="currentBody"
@@ -171,7 +171,7 @@ exports[`GraphCardMetricTotals Component should handle multiple display states:
         data-test="graphMonthlyTotalCard"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {})
         </CardTitle>
         <MinHeight
           key="totalMonthlyBody"
@@ -253,7 +253,7 @@ exports[`GraphCardMetricTotals Component should handle multiple display states:
         data-test="graphDailyTotalCard"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_dailyTotal, {})
         </CardTitle>
         <MinHeight
           key="currentBody"
@@ -293,7 +293,7 @@ exports[`GraphCardMetricTotals Component should handle multiple display states:
         data-test="graphMonthlyTotalCard"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {})
         </CardTitle>
         <MinHeight
           key="totalMonthlyBody"
@@ -383,7 +383,7 @@ exports[`GraphCardMetricTotals Component should render a basic component: basic
         data-test="graphDailyTotalCard"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_dailyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_dailyTotal, {})
         </CardTitle>
         <MinHeight
           key="currentBody"
@@ -413,7 +413,7 @@ exports[`GraphCardMetricTotals Component should render a basic component: basic
         data-test="graphMonthlyTotalCard"
       >
         <CardTitle>
-          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {"context":""})
+          t(curiosity-graph.cardHeadingMetric_monthlyTotal, {})
         </CardTitle>
         <MinHeight
           key="totalMonthlyBody"

diff --git a/src/components/graphCard/graphCardMetricTotals.js b/src/components/graphCard/graphCardMetricTotals.js
@@ -55,7 +55,7 @@ const GraphCardMetricTotals = ({
           >
             <CardTitle>
               {t('curiosity-graph.cardHeadingMetric_dailyTotal', {
-                context: [isCurrent && 'current', metricId],
+                context: metricId,
                 month: selectedMonth
               })}
             </CardTitle>
@@ -101,7 +101,7 @@ const GraphCardMetricTotals = ({
           >
             <CardTitle>
               {t('curiosity-graph.cardHeadingMetric_monthlyTotal', {
-                context: [isCurrent && 'current', metricId],
+                context: metricId,
                 month: selectedMonth
               })}
             </CardTitle>

diff --git 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",