feat(productViewOpenShiftContainer): ent-3324 two column view (#591)

* i18n, locale strings * openshiftView, converted to productViewOpenShiftContainer * productView(s), remove unused viewSelector, redux refs * productViewOpenShiftContainer, useSelector for uom * routerConfig, point to new component * viewSelectors, removed, unnecessary
RedHatInsights · Mar 2, 2021 · 818d341 · 818d341
1 parent 897526d
commit 818d341
Show file tree

Hide file tree

Showing 21 changed files with 1,414 additions and 1,589 deletions.
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -12,6 +12,8 @@
     "cardHeading": "CPU usage",
     "cardHeading_cores": "CPU core usage",
     "cardHeading_sockets": "CPU socket usage",
+    "cardHeading_OpenShift Container Platform": "Fixed capacity",
+    "cardHeading_OpenShift-metrics": "Flexible subscriptions",
     "cardHeading_OpenShift-dedicated-metrics": "Flexible subscriptions",
     "cardHeading_RHEL": "CPU socket usage",
     "cardHeading_Satellite": "CPU socket usage",
@@ -83,7 +85,12 @@
     "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_lastSeen_OpenShift Container Platform": "Last check-in",
+    "header_lastSeen_OpenShift-metrics": "Last check-in",
     "header_lastSeen_OpenShift-dedicated-metrics": "Last check-in",
     "header_productName": "Product",
     "header_serviceLevel": "Service level",
@@ -152,8 +159,8 @@
   "curiosity-view": {
     "title": "{{appName}}",
     "subtitle": "Monitor your usage based on your subscription terms. <0>Learn more about {{appName}} reporting</0>",
-    "title_OpenShift Container Platform": "Red Hat OpenShift",
-    "subtitle_OpenShift Container Platform": "Monitor your Red Hat OpenShift usage by socket or core usage, based on your subscription terms. <0>Learn more about {{appName}} reporting</0>",
+    "title_OpenShift Container Platform": "OpenShift Container Platform",
+    "subtitle_OpenShift Container Platform": "Monitor your OpenShift Container Platform usage for both fixed and flexible capacity subscriptions. <0>Learn more about {{appName}} reporting</0>",
     "title_OpenShift-dedicated-metrics": "OpenShift Dedicated",
     "subtitle_OpenShift-dedicated-metrics": "Monitor your OpenShift Dedicated usage for flexible capacity subscriptions. <0>Learn more about {{appName}} reporting</0>",
     "title_RHEL": "Red Hat Enterprise Linux",

diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -146,43 +146,6 @@ Array [
       },
     ],
   },
-  Object {
-    "file": "./src/components/openshiftView/openshiftView.js",
-    "keys": Array [
-      Object {
-        "key": "curiosity-view.title",
-        "match": "t(\`curiosity-view.title\`, { appName: helpers.UI_DISPLAY_NAME, context: productLabel })",
-      },
-      Object {
-        "key": "curiosity-graph.cardHeading",
-        "match": "t('curiosity-graph.cardHeading', { context: uomFilter })",
-      },
-      Object {
-        "key": "curiosity-inventory.tab",
-        "match": "t('curiosity-inventory.tab', { context: 'hosts' })",
-      },
-      Object {
-        "key": "curiosity-inventory.tab",
-        "match": "t('curiosity-inventory.tab', { context: 'subscriptions' })",
-      },
-      Object {
-        "key": "curiosity-inventory.header",
-        "match": "translate('curiosity-inventory.header', { context: 'guestsDisplayName' })",
-      },
-      Object {
-        "key": "curiosity-inventory.label",
-        "match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
-      },
-      Object {
-        "key": "curiosity-inventory.measurementType",
-        "match": "translate('curiosity-inventory.measurementType', { context: measurementType.value })",
-      },
-      Object {
-        "key": "curiosity-inventory.cloudProvider",
-        "match": "translate('curiosity-inventory.cloudProvider', { context: cloudProvider.value })",
-      },
-    ],
-  },
   Object {
     "file": "./src/components/optinView/optinView.js",
     "keys": Array [
@@ -290,6 +253,47 @@ Array [
       },
     ],
   },
+  Object {
+    "file": "./src/components/productView/productViewOpenShiftContainer.js",
+    "keys": Array [
+      Object {
+        "key": "curiosity-graph.cardHeading",
+        "match": "t('curiosity-graph.cardHeading', { context: productId })",
+      },
+      Object {
+        "key": "curiosity-inventory.tab",
+        "match": "t('curiosity-inventory.tab', { context: 'hosts' })",
+      },
+      Object {
+        "key": "curiosity-inventory.tab",
+        "match": "t('curiosity-inventory.tab', { context: 'subscriptions' })",
+      },
+      Object {
+        "key": "curiosity-view.title",
+        "match": "t(\`curiosity-view.title\`, { appName: helpers.UI_DISPLAY_NAME, context: viewProductLabel })",
+      },
+      Object {
+        "key": "curiosity-inventory.header",
+        "match": "translate('curiosity-inventory.header', { context: 'guestsDisplayName' })",
+      },
+      Object {
+        "key": "curiosity-inventory.label",
+        "match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
+      },
+      Object {
+        "key": "curiosity-inventory.header",
+        "match": "translate('curiosity-inventory.header', { context: 'sockets_OpenShift Container Platform' })",
+      },
+      Object {
+        "key": "curiosity-inventory.header",
+        "match": "translate('curiosity-inventory.header', { context: 'cores_OpenShift Container Platform' })",
+      },
+      Object {
+        "key": "curiosity-inventory.label",
+        "match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', count: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
+      },
+    ],
+  },
   Object {
     "file": "./src/components/productView/productViewOpenShiftDedicated.js",
     "keys": Array [
@@ -548,24 +552,28 @@ Array [
     "key": "curiosity-inventory.tab",
   },
   Object {
-    "file": "./src/components/openshiftView/openshiftView.js",
+    "file": "./src/components/productView/productView.js",
     "key": "curiosity-inventory.tab",
   },
   Object {
-    "file": "./src/components/openshiftView/openshiftView.js",
+    "file": "./src/components/productView/productView.js",
     "key": "curiosity-inventory.tab",
   },
   Object {
-    "file": "./src/components/openshiftView/openshiftView.js",
-    "key": "curiosity-inventory.label",
+    "file": "./src/components/productView/productViewOpenShiftContainer.js",
+    "key": "curiosity-inventory.tab",
   },
   Object {
-    "file": "./src/components/productView/productView.js",
+    "file": "./src/components/productView/productViewOpenShiftContainer.js",
     "key": "curiosity-inventory.tab",
   },
   Object {
-    "file": "./src/components/productView/productView.js",
-    "key": "curiosity-inventory.tab",
+    "file": "./src/components/productView/productViewOpenShiftContainer.js",
+    "key": "curiosity-inventory.label",
+  },
+  Object {
+    "file": "./src/components/productView/productViewOpenShiftContainer.js",
+    "key": "curiosity-inventory.label",
   },
   Object {
     "file": "./src/components/productView/productViewOpenShiftDedicated.js",