feat(rhelView): issues/226 display cloud metering data (#237)

* i18, public cloud string * rhelView, filter for cloud meter sockets * rhsmServices, mock for cloud meter properties * rhsmApiTypes, add cloud meter types
RedHatInsights · Mar 26, 2020 · 26319ae · 26319ae
1 parent f39426c
commit 26319ae
Show file tree

Hide file tree

Showing 8 changed files with 446 additions and 16 deletions.
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -17,6 +17,7 @@
     "dateLabel": "Date",
     "coresLabel": "Cores",
     "socketsLabel": "Sockets",
+    "cloudSocketsLabel": "Public cloud",
     "hypervisorCoresLabel": "Virtualized cores",
     "hypervisorSocketsLabel": "Virtualized {{product}}",
     "physicalCoresLabel": "Physical cores",

diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -15,7 +15,7 @@ msgstr \\"\\"
 \\"Content-Type: text/plain; charset=UTF-8\\\\n\\"
 
 #: src/components/openshiftView/openshiftView.js:92
-#: src/components/rhelView/rhelView.js:47
+#: src/components/rhelView/rhelView.js:49
 msgid \\"curiosity-graph.cardHeading\\"
 msgstr \\"\\"
 

diff --git a/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap b/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap
@@ -30,6 +30,11 @@ exports[`RhelView Component should have a fallback title: title 1`] = `
             "id": "hypervisorSockets",
             "stroke": "#009596",
           },
+          Object {
+            "fill": "#b2b0ea",
+            "id": "cloudSockets",
+            "stroke": "#5752d1",
+          },
           Object {
             "id": "thresholdSockets",
           },
@@ -79,6 +84,11 @@ exports[`RhelView Component should render a non-connected component: non-connect
             "id": "hypervisorSockets",
             "stroke": "#009596",
           },
+          Object {
+            "fill": "#b2b0ea",
+            "id": "cloudSockets",
+            "stroke": "#5752d1",
+          },
           Object {
             "id": "thresholdSockets",
           },

diff --git a/src/components/rhelView/rhelView.js b/src/components/rhelView/rhelView.js
@@ -4,7 +4,9 @@ import {
   chart_color_blue_100 as chartColorBlueLight,
   chart_color_blue_300 as chartColorBlueDark,
   chart_color_cyan_100 as chartColorCyanLight,
-  chart_color_cyan_300 as chartColorCyanDark
+  chart_color_cyan_300 as chartColorCyanDark,
+  chart_color_purple_100 as chartColorPurpleLight,
+  chart_color_purple_300 as chartColorPurpleDark
 } from '@patternfly/react-tokens';
 import { PageLayout, PageHeader, PageSection, PageToolbar } from '../pageLayout/pageLayout';
 import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES, rhsmApiTypes } from '../../types/rhsmApiTypes';
@@ -86,6 +88,7 @@ RhelView.defaultProps = {
   initialFilters: [
     { id: 'physicalSockets', fill: chartColorBlueLight.value, stroke: chartColorBlueDark.value },
     { id: 'hypervisorSockets', fill: chartColorCyanLight.value, stroke: chartColorCyanDark.value },
+    { id: 'cloudSockets', fill: chartColorPurpleLight.value, stroke: chartColorPurpleDark.value },
     { id: 'thresholdSockets' }
   ],
   t: helpers.noopTranslate,