feat(productView,inventoryList): ent-4367 rhosak inventory (#831)

* config, product.rhosak, inventory filters * locale, instances inventory strings * inventoryList.deprecated, hosts based inventory to deprecated * inventoryList, instances based inventory * productView, instances inventory for rhosak * styling, minor margin adjustment
RedHatInsights · Dec 6, 2021 · 8b9a560 · 8b9a560
1 parent 6db7120
commit 8b9a560
Show file tree

Hide file tree

Showing 24 changed files with 2,077 additions and 92 deletions.
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -115,6 +115,7 @@
     "tabHosts_noInstances_OpenShift-dedicated-metrics": "Current instances",
     "tabHosts_OpenShift-dedicated-metrics": "{{count}} instance",
     "tabHosts_OpenShift-dedicated-metrics_plural": "{{count}} instances",
+    "tabInstances": "Current monthly instances",
     "tabSubscriptions": "Current subscriptions",
     "tab_disabled": "The {{tabName}} display is currently disabled.",
     "tableAriaLabel": "{{appName}} systems inventory table.",
@@ -142,23 +143,31 @@
     "header_cores_OpenShift-dedicated-metrics": "Cores",
     "header_coreHours": "Core hours",
     "header_displayName": "Name",
+    "header_display_name": "Name",
     "header_guestsDisplayName": "Guest name",
     "header_hardwareType": "Type",
     "header_instanceHours": "Instance hours",
+    "header_Instance-hours": "Monthly instance hours",
     "header_measurementType": "Type",
     "header_inventoryId": "UUID",
     "header_sockets": "Subscribed sockets",
     "header_sockets_OpenShift Container Platform": "Sockets",
     "header_sockets_OpenShift-metrics": "Sockets",
     "header_sockets_OpenShift-dedicated-metrics": "Sockets",
     "header_lastSeen": "Last seen",
+    "header_last_seen": "Last seen",
     "header_nextEventDate": "Next renewal",
     "header_productName": "Product",
     "header_quantity": "Quantity",
     "header_serviceLevel": "Service level",
+    "header_Storage-gibibytes": "Monthly data storage",
     "header_subscriptions": "Sockets",
     "header_subscriptions_cores": "Cores",
     "header_subscriptions_sockets": "Sockets",
+    "header_Transfer-gibibytes": "Monthly data transfer",
+    "measurement_Instance-hours": "{{total}} GiB hours",
+    "measurement_Storage-gibibytes": "{{total}} GiB",
+    "measurement_Transfer-gibibytes": "{{total}} GiB",
     "measurementType": "{{context}}",
     "measurementType_cloud": "Public cloud",
     "measurementType_alibaba": "Public cloud",

diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -161,6 +161,15 @@ Array [
       },
     ],
   },
+  Object {
+    "file": "./src/components/inventoryList/inventoryList.deprecated.js",
+    "keys": Array [
+      Object {
+        "key": "curiosity-inventory.tab",
+        "match": "t('curiosity-inventory.tab', { context: 'disabled' })",
+      },
+    ],
+  },
   Object {
     "file": "./src/components/inventoryList/inventoryList.js",
     "keys": Array [
@@ -306,6 +315,10 @@ Array [
         "key": "curiosity-inventory.tabHosts",
         "match": "t('curiosity-inventory.tabHosts', { context: ['noInstances', productId] })",
       },
+      Object {
+        "key": "curiosity-inventory.tabInstances",
+        "match": "t('curiosity-inventory.tabInstances', { context: ['noInstances', productId] })",
+      },
       Object {
         "key": "curiosity-inventory.tabSubscriptions",
         "match": "t('curiosity-inventory.tabSubscriptions', { context: productId })",
@@ -619,6 +632,18 @@ Array [
         "key": "curiosity-graph.label_axisX",
         "match": "translate('curiosity-graph.label_axisX', { context: GRANULARITY_TYPES.DAILY })",
       },
+      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.measurement",
+        "match": "translate('curiosity-inventory.measurement', { context: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES, total: helpers.numberDisplay(total?.value)",
+      },
+      Object {
+        "key": "curiosity-inventory.measurement",
+        "match": "translate('curiosity-inventory.measurement', { context: RHSM_API_PATH_METRIC_TYPES.INSTANCE_HOURS, total: helpers.numberDisplay(total?.value)",
+      },
     ],
   },
   Object {
@@ -672,6 +697,10 @@ Array [
     "file": "./src/components/graphCard/graphCardChartTooltip.js",
     "key": "curiosity-graph.label",
   },
+  Object {
+    "file": "./src/components/inventoryList/inventoryList.deprecated.js",
+    "key": "curiosity-inventory.tab",
+  },
   Object {
     "file": "./src/components/inventoryList/inventoryList.js",
     "key": "curiosity-inventory.tab",
@@ -728,6 +757,18 @@ Array [
     "file": "./src/config/product.rhosak.js",
     "key": "curiosity-graph.label_axisX",
   },
+  Object {
+    "file": "./src/config/product.rhosak.js",
+    "key": "curiosity-inventory.measurement",
+  },
+  Object {
+    "file": "./src/config/product.rhosak.js",
+    "key": "curiosity-inventory.measurement",
+  },
+  Object {
+    "file": "./src/config/product.rhosak.js",
+    "key": "curiosity-inventory.measurement",
+  },
   Object {
     "file": "./src/config/product.satellite.js",
     "key": "curiosity-inventory.label",