Skip to content

Commit

Permalink
fix(rhosak): ent-4615 gibibytes to binary gigabytes (#895)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdcabrera
cdcabrera committed Mar 1, 2022
1 parent cfe17de commit 82600b8
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 16 deletions.
26 changes: 14 additions & 12 deletions public/locales/en-US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"cardHeading_Satellite Capsule": "CPU socket usage",
"cardHeading_Satellite Server": "CPU socket usage",
"cardHeadingDescription": "...",
"cardHeadingDescription_Instance-hours": "Instance hours usage in gibibyte hours",
"cardHeadingDescription_Storage-gibibytes": "Data storage usage in gibibyte hours",
"cardHeadingDescription_Transfer-gibibytes": "Gibibyte hour usage per instance",
"cardHeadingDescription_Instance-hours": "Instance hours usage in hours",
"cardHeadingDescription_Storage-gibibytes": "Data storage usage in binary gigabyte hours",
"cardHeadingDescription_Transfer-gibibytes": "Data transfer usage in binary gigabytes",
"cardHeadingDescription_OpenShift Container Platform": "A pre-paid subscription model that offers a designated maximum quota of units within a set time frame.",
"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.",
Expand All @@ -44,14 +44,14 @@
"cardHeadingMetric_monthlyTotal_Storage-gibibytes": "Monthly data storage",
"cardHeadingMetric_monthlyTotal_Transfer-gibibytes": "Monthly data transfer",
"cardBodyMetric_total": "No data",
"cardBodyMetric_total_Instance-hours": "<0>{{total}}</0> Gibibyte hours",
"cardBodyMetric_total_Storage-gibibytes": "<0>{{total}}</0> Gibibyte hours",
"cardBodyMetric_total_Transfer-gibibytes": "<0>{{total}}</0> Gibibytes",
"cardBodyMetric_total_Instance-hours": "<0>{{total}}</0> Instance hours",
"cardBodyMetric_total_Storage-gibibytes": "<0>{{total}}</0> Binary gigabyte hours",
"cardBodyMetric_total_Transfer-gibibytes": "<0>{{total}}</0> Binary gigabytes",
"cardFooterMetric": "Last update {{date}}",
"label_axisX_Daily": "Day of the month",
"label_axisY_Instance-hours": "Instance hours",
"label_axisY_Storage-gibibytes": "Gibibyte hours",
"label_axisY_Transfer-gibibytes": "Gibibytes",
"label_axisY_Storage-gibibytes": "Binary gigabyte hours",
"label_axisY_Transfer-gibibytes": "Binary gigabytes",
"label_cores": "Cores",
"label_coreHours": "Core hours",
"label_instanceHours": "Instance hours",
Expand All @@ -72,7 +72,7 @@
"legendTooltip_cores": "{{product}} CPU usage, per CPU core.",
"legendTooltip_coreHours": "{{product}} core hours usage.",
"legendTooltip_coreHours_OpenShift-dedicated-metrics": "OpenShift Dedicated <0>On-Demand</0> core hour usage.",
"legendTooltip_Instance-hours": "Instance hour usage",
"legendTooltip_Instance-hours": "Instance hours usage",
"legendTooltip_instanceHours_OpenShift-dedicated-metrics": "OpenShift Dedicated <0>On-Demand</0> instance hour usage.",
"legendTooltip_coreHours_OpenShift-metrics": "OpenShift Container Platform <0>On-Demand</0> core hour usage.",
"legendTooltip_cloudSockets": "Public cloud {{product}} CPU usage, 1 CPU socket per instance.",
Expand Down Expand Up @@ -148,9 +148,11 @@
"header_subscriptions_cores": "Cores",
"header_subscriptions_sockets": "Sockets",
"header_Transfer-gibibytes": "Data transfer",
"measurement_Instance-hours": "{{total}} GiB hours",
"measurement_Storage-gibibytes": "{{total}} GiB",
"measurement_Transfer-gibibytes": "{{total}} GiB",
"header_tooltip_Storage-gibibytes": "Measurements in binary gigabyte hours",
"header_tooltip_Transfer-gibibytes": "Measurements in binary gigabytes",
"measurement_Instance-hours": "{{total}} hours",
"measurement_Storage-gibibytes": "{{total}} GB hours",
"measurement_Transfer-gibibytes": "{{total}} GB",
"measurementType": "{{context}}",
"measurementType_cloud": "Public cloud",
"measurementType_alibaba": "Public cloud",
Expand Down
8 changes: 8 additions & 0 deletions src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,10 +623,18 @@ Array [
"key": "curiosity-graph.label_axisX",
"match": "translate('curiosity-graph.label_axisX', { context: GRANULARITY_TYPES.DAILY })",
},
Object {
"key": "curiosity-inventory.header",
"match": "translate('curiosity-inventory.header', { context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.TRANSFER_GIBIBYTES] })",
},
Object {
"key": "curiosity-inventory.measurement",
"match": "translate('curiosity-inventory.measurement', { context: RHSM_API_PATH_METRIC_TYPES.TRANSFER_GIBIBYTES, total: helpers.numberDisplay(total?.value)",
},
Object {
"key": "curiosity-inventory.header",
"match": "translate('curiosity-inventory.header', { context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES] })",
},
Object {
"key": "curiosity-inventory.measurement",
"match": "translate('curiosity-inventory.measurement', { context: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES, total: helpers.numberDisplay(total?.value)",
Expand Down
48 changes: 44 additions & 4 deletions src/config/__tests__/__snapshots__/product.rhosak.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,33 @@ Object {
"transforms": Array [],
},
Object {
"title": "t(curiosity-inventory.header, {\\"context\\":\\"Transfer-gibibytes\\"})",
"title": <Tooltip
content="t(curiosity-inventory.header, {\\"context\\":\\"tooltip_Transfer-gibibytes\\"})"
distance={5}
enableFlip={false}
entryDelay={100}
exitDelay={0}
isNoWrap={false}
position="top"
>
t(curiosity-inventory.header, {"context":"Transfer-gibibytes"})
</Tooltip>,
"transforms": Array [
[Function],
],
},
Object {
"title": "t(curiosity-inventory.header, {\\"context\\":\\"Storage-gibibytes\\"})",
"title": <Tooltip
content="t(curiosity-inventory.header, {\\"context\\":\\"tooltip_Storage-gibibytes\\"})"
distance={5}
enableFlip={false}
entryDelay={100}
exitDelay={0}
isNoWrap={false}
position="top"
>
t(curiosity-inventory.header, {"context":"Storage-gibibytes"})
</Tooltip>,
"transforms": Array [
[Function],
],
Expand Down Expand Up @@ -110,13 +130,33 @@ Object {
"transforms": Array [],
},
Object {
"title": "t(curiosity-inventory.header, {\\"context\\":\\"Transfer-gibibytes\\"})",
"title": <Tooltip
content="t(curiosity-inventory.header, {\\"context\\":\\"tooltip_Transfer-gibibytes\\"})"
distance={5}
enableFlip={false}
entryDelay={100}
exitDelay={0}
isNoWrap={false}
position="top"
>
t(curiosity-inventory.header, {"context":"Transfer-gibibytes"})
</Tooltip>,
"transforms": Array [
[Function],
],
},
Object {
"title": "t(curiosity-inventory.header, {\\"context\\":\\"Storage-gibibytes\\"})",
"title": <Tooltip
content="t(curiosity-inventory.header, {\\"context\\":\\"tooltip_Storage-gibibytes\\"})"
distance={5}
enableFlip={false}
entryDelay={100}
exitDelay={0}
isNoWrap={false}
position="top"
>
t(curiosity-inventory.header, {"context":"Storage-gibibytes"})
</Tooltip>,
"transforms": Array [
[Function],
],
Expand Down
12 changes: 12 additions & 0 deletions src/config/product.rhosak.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ const config = {
},
{
id: RHSM_API_PATH_METRIC_TYPES.TRANSFER_GIBIBYTES,
header: {
tooltip: () =>
translate('curiosity-inventory.header', {
context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.TRANSFER_GIBIBYTES]
})
},
cell: ({ [RHSM_API_PATH_METRIC_TYPES.TRANSFER_GIBIBYTES]: total }) =>
translate('curiosity-inventory.measurement', {
context: RHSM_API_PATH_METRIC_TYPES.TRANSFER_GIBIBYTES,
Expand All @@ -151,6 +157,12 @@ const config = {
},
{
id: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES,
header: {
tooltip: () =>
translate('curiosity-inventory.header', {
context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES]
})
},
cell: ({ [RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES]: total }) =>
translate('curiosity-inventory.measurement', {
context: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES,
Expand Down

0 comments on commit 82600b8

Please sign in to comment.