From f5f5657a99fe35708cb14370ed6e1b581c346a38 Mon Sep 17 00:00:00 2001
From: CD Cabrera <ccabrera@redhat.com>
Date: Thu, 3 Sep 2020 17:19:02 -0400
Subject: [PATCH] fix(openshiftView): issues/383 apply uom query filter (#408)

* i18n, uom strings
* openshiftView, filter, default props avoid 2x XHR on load
* redux, queryTypes, viewReducer, sort statements, uom filter
* rhsmApiTypes, uom types
---
 public/locales/en-US.json                     |  2 +
 .../__tests__/__snapshots__/i18n.test.js.snap | 16 ++++
 .../__snapshots__/openshiftView.test.js.snap  | 19 +++--
 src/components/openshiftView/openshiftView.js | 48 +++++++----
 .../__snapshots__/viewReducer.test.js.snap    | 13 +++
 .../reducers/__tests__/viewReducer.test.js    |  5 +-
 src/redux/reducers/viewReducer.js             | 30 +++++--
 .../__snapshots__/index.test.js.snap          |  4 +
 src/redux/types/queryTypes.js                 |  7 +-
 .../__snapshots__/index.test.js.snap          | 24 ++++++
 src/types/rhsmApiTypes.js                     | 79 +++++++++++++++----
 11 files changed, 197 insertions(+), 50 deletions(-)

diff --git a/public/locales/en-US.json b/public/locales/en-US.json
index ec4c65995..aa0eac646 100644
--- a/public/locales/en-US.json
+++ b/public/locales/en-US.json
@@ -69,6 +69,8 @@
     "slaPremium": "Premium",
     "slaSelfSupport": "Self-Support",
     "slaStandard": "Standard",
+    "uom_cores": "Cores",
+    "uom_sockets": "Sockets",
     "usageDevelopment": "Development/Test",
     "usageDisaster": "Disaster Recovery",
     "usageProduction": "Production",
diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
index 275dca431..a790d4367 100644
--- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
+++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -189,6 +189,14 @@ Array [
   Object {
     "file": "./src/components/openshiftView/openshiftView.js",
     "keys": Array [
+      Object {
+        "key": "curiosity-toolbar.uom",
+        "match": "t('curiosity-toolbar.uom', { context: RHSM_API_QUERY_UOM_TYPES.CORES })",
+      },
+      Object {
+        "key": "curiosity-toolbar.uom",
+        "match": "t('curiosity-toolbar.uom', { context: RHSM_API_QUERY_UOM_TYPES.SOCKETS })",
+      },
       Object {
         "key": "curiosity-view.title",
         "match": "t(\`curiosity-view.title\`, { appName: helpers.UI_DISPLAY_NAME, context: viewId })",
@@ -444,6 +452,14 @@ Array [
 
 exports[`I18n Component should have locale keys that exist in the default language JSON: missing locale keys 1`] = `
 Array [
+  Object {
+    "file": "./src/components/openshiftView/openshiftView.js",
+    "key": "curiosity-toolbar.uom",
+  },
+  Object {
+    "file": "./src/components/openshiftView/openshiftView.js",
+    "key": "curiosity-toolbar.uom",
+  },
   Object {
     "file": "./src/components/openshiftView/openshiftView.js",
     "key": "curiosity-inventory.hardwareType",
diff --git a/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap b/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
index 066212268..0915049de 100644
--- a/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
+++ b/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
@@ -22,6 +22,7 @@ exports[`OpenshiftView Component should display an alternate graph on query-stri
           "granularity": "daily",
           "limit": 10,
           "offset": 0,
+          "uom": "cores",
         }
       }
       viewId="OpenShift"
@@ -66,11 +67,11 @@ exports[`OpenshiftView Component should display an alternate graph on query-stri
         options={
           Array [
             Object {
-              "title": "Cores",
+              "title": "t(curiosity-toolbar.uom, [object Object])",
               "value": "cores",
             },
             Object {
-              "title": "Sockets",
+              "title": "t(curiosity-toolbar.uom, [object Object])",
               "value": "sockets",
             },
           ]
@@ -124,6 +125,7 @@ exports[`OpenshiftView Component should display an alternate graph on query-stri
         Object {
           "limit": 10,
           "offset": 0,
+          "uom": "cores",
         }
       }
       viewId="OpenShift"
@@ -154,6 +156,7 @@ exports[`OpenshiftView Component should have a fallback title: title 1`] = `
           "granularity": "daily",
           "limit": 10,
           "offset": 0,
+          "uom": "cores",
         }
       }
       viewId="OpenShift"
@@ -198,11 +201,11 @@ exports[`OpenshiftView Component should have a fallback title: title 1`] = `
         options={
           Array [
             Object {
-              "title": "Cores",
+              "title": "t(curiosity-toolbar.uom, [object Object])",
               "value": "cores",
             },
             Object {
-              "title": "Sockets",
+              "title": "t(curiosity-toolbar.uom, [object Object])",
               "value": "sockets",
             },
           ]
@@ -256,6 +259,7 @@ exports[`OpenshiftView Component should have a fallback title: title 1`] = `
         Object {
           "limit": 10,
           "offset": 0,
+          "uom": "cores",
         }
       }
       viewId="OpenShift"
@@ -441,6 +445,7 @@ Object {
     "granularity": "daily",
     "limit": 10,
     "offset": 0,
+    "uom": "cores",
   },
 }
 `;
@@ -467,6 +472,7 @@ exports[`OpenshiftView Component should render a non-connected component: non-co
           "granularity": "daily",
           "limit": 10,
           "offset": 0,
+          "uom": "cores",
         }
       }
       viewId="OpenShift"
@@ -511,11 +517,11 @@ exports[`OpenshiftView Component should render a non-connected component: non-co
         options={
           Array [
             Object {
-              "title": "Cores",
+              "title": "t(curiosity-toolbar.uom, [object Object])",
               "value": "cores",
             },
             Object {
-              "title": "Sockets",
+              "title": "t(curiosity-toolbar.uom, [object Object])",
               "value": "sockets",
             },
           ]
@@ -569,6 +575,7 @@ exports[`OpenshiftView Component should render a non-connected component: non-co
         Object {
           "limit": 10,
           "offset": 0,
+          "uom": "cores",
         }
       }
       viewId="OpenShift"
diff --git a/src/components/openshiftView/openshiftView.js b/src/components/openshiftView/openshiftView.js
index 36cfe5069..22c35b353 100644
--- a/src/components/openshiftView/openshiftView.js
+++ b/src/components/openshiftView/openshiftView.js
@@ -6,8 +6,12 @@ import {
 } from '@patternfly/react-tokens';
 import { Badge, Button } from '@patternfly/react-core';
 import { PageLayout, PageHeader, PageSection, PageToolbar } from '../pageLayout/pageLayout';
-import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES, RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
-import { apiQueries, connect, reduxSelectors } from '../../redux';
+import {
+  RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES,
+  RHSM_API_QUERY_TYPES,
+  RHSM_API_QUERY_UOM_TYPES
+} from '../../types/rhsmApiTypes';
+import { apiQueries, connect, reduxSelectors, reduxTypes, store } from '../../redux';
 import GraphCard from '../graphCard/graphCard';
 import C3GraphCard from '../c3GraphCard/c3GraphCard';
 import { Select } from '../form/select';
@@ -42,7 +46,7 @@ class OpenshiftView extends React.Component {
    */
   onSelect = (event = {}) => {
     const { option } = this.state;
-    const { initialGraphFilters, initialInventoryFilters } = this.props;
+    const { initialGraphFilters, initialInventoryFilters, viewId } = this.props;
     const { value } = event;
 
     if (value !== option) {
@@ -56,11 +60,20 @@ class OpenshiftView extends React.Component {
       const graphFilters = initialGraphFilters.filter(filter);
       const inventoryFilters = initialInventoryFilters.filter(filter);
 
-      this.setState({
-        option,
-        graphFilters,
-        inventoryFilters
-      });
+      this.setState(
+        {
+          option,
+          graphFilters,
+          inventoryFilters
+        },
+        () => {
+          store.dispatch({
+            type: reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.UOM],
+            viewId,
+            [RHSM_API_QUERY_TYPES.UOM]: value
+          });
+        }
+      );
     }
   };
 
@@ -71,10 +84,16 @@ class OpenshiftView extends React.Component {
    */
   renderSelect() {
     const { option } = this.state;
-    const { initialOption } = this.props;
+    const { initialOption, t } = this.props;
     const options = [
-      { title: 'Cores', value: 'cores' },
-      { title: 'Sockets', value: 'sockets' }
+      {
+        title: t('curiosity-toolbar.uom', { context: RHSM_API_QUERY_UOM_TYPES.CORES }),
+        value: RHSM_API_QUERY_UOM_TYPES.CORES
+      },
+      {
+        title: t('curiosity-toolbar.uom', { context: RHSM_API_QUERY_UOM_TYPES.SOCKETS }),
+        value: RHSM_API_QUERY_UOM_TYPES.SOCKETS
+      }
     ];
 
     return <Select onSelect={this.onSelect} options={options} selectedOptions={option || initialOption} />;
@@ -153,7 +172,7 @@ OpenshiftView.propTypes = {
   query: PropTypes.shape({
     [RHSM_API_QUERY_TYPES.GRANULARITY]: PropTypes.oneOf([...Object.values(GRANULARITY_TYPES)])
   }),
-  initialOption: PropTypes.oneOf(['cores', 'sockets']),
+  initialOption: PropTypes.oneOf(Object.values(RHSM_API_QUERY_UOM_TYPES)),
   initialGraphFilters: PropTypes.array,
   initialGuestsFilters: PropTypes.array,
   initialInventoryFilters: PropTypes.array,
@@ -182,9 +201,10 @@ OpenshiftView.defaultProps = {
   query: {
     [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.DAILY,
     [RHSM_API_QUERY_TYPES.LIMIT]: 10,
-    [RHSM_API_QUERY_TYPES.OFFSET]: 0
+    [RHSM_API_QUERY_TYPES.OFFSET]: 0,
+    [RHSM_API_QUERY_TYPES.UOM]: RHSM_API_QUERY_UOM_TYPES.CORES
   },
-  initialOption: 'cores',
+  initialOption: RHSM_API_QUERY_UOM_TYPES.CORES,
   initialGraphFilters: [
     {
       id: 'cores',
diff --git a/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap
index b6d8fc975..73b8cfcce 100644
--- a/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap
+++ b/src/redux/reducers/__tests__/__snapshots__/viewReducer.test.js.snap
@@ -63,6 +63,19 @@ Object {
 }
 `;
 
+exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_RHSM_uom 1`] = `
+Object {
+  "result": Object {
+    "query": Object {
+      "test_id": Object {
+        "uom": "lorem uom",
+      },
+    },
+  },
+  "type": "SET_QUERY_RHSM_uom",
+}
+`;
+
 exports[`ViewReducer should handle specific defined types: defined type SET_QUERY_RHSM_usage 1`] = `
 Object {
   "result": Object {
diff --git a/src/redux/reducers/__tests__/viewReducer.test.js b/src/redux/reducers/__tests__/viewReducer.test.js
index 12a050b83..c3732af2f 100644
--- a/src/redux/reducers/__tests__/viewReducer.test.js
+++ b/src/redux/reducers/__tests__/viewReducer.test.js
@@ -14,10 +14,11 @@ describe('ViewReducer', () => {
       const dispatched = {
         type: value,
         [RHSM_API_QUERY_TYPES.GRANULARITY]: 'lorem granularity',
-        [RHSM_API_QUERY_TYPES.SLA]: 'lorem sla',
-        [RHSM_API_QUERY_TYPES.USAGE]: 'ipsum usage',
         [RHSM_API_QUERY_TYPES.LIMIT]: 10,
         [RHSM_API_QUERY_TYPES.OFFSET]: 10,
+        [RHSM_API_QUERY_TYPES.SLA]: 'lorem sla',
+        [RHSM_API_QUERY_TYPES.UOM]: 'lorem uom',
+        [RHSM_API_QUERY_TYPES.USAGE]: 'ipsum usage',
         viewId: 'test_id'
       };
 
diff --git a/src/redux/reducers/viewReducer.js b/src/redux/reducers/viewReducer.js
index 141ebc0fa..e954456fb 100644
--- a/src/redux/reducers/viewReducer.js
+++ b/src/redux/reducers/viewReducer.js
@@ -49,13 +49,13 @@ const viewReducer = (state = initialState, action) => {
           reset: false
         }
       );
-    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.SLA]:
+    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.LIMIT]:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            [RHSM_API_QUERY_TYPES.SLA]: action[RHSM_API_QUERY_TYPES.SLA]
+            [RHSM_API_QUERY_TYPES.LIMIT]: action[RHSM_API_QUERY_TYPES.LIMIT]
           }
         },
         {
@@ -63,13 +63,13 @@ const viewReducer = (state = initialState, action) => {
           reset: false
         }
       );
-    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.USAGE]:
+    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.OFFSET]:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            [RHSM_API_QUERY_TYPES.USAGE]: action[RHSM_API_QUERY_TYPES.USAGE]
+            [RHSM_API_QUERY_TYPES.OFFSET]: action[RHSM_API_QUERY_TYPES.OFFSET]
           }
         },
         {
@@ -77,13 +77,13 @@ const viewReducer = (state = initialState, action) => {
           reset: false
         }
       );
-    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.LIMIT]:
+    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.SLA]:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            [RHSM_API_QUERY_TYPES.LIMIT]: action[RHSM_API_QUERY_TYPES.LIMIT]
+            [RHSM_API_QUERY_TYPES.SLA]: action[RHSM_API_QUERY_TYPES.SLA]
           }
         },
         {
@@ -91,13 +91,27 @@ const viewReducer = (state = initialState, action) => {
           reset: false
         }
       );
-    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.OFFSET]:
+    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.UOM]:
       return reduxHelpers.setStateProp(
         'query',
         {
           [action.viewId]: {
             ...state.query[action.viewId],
-            [RHSM_API_QUERY_TYPES.OFFSET]: action[RHSM_API_QUERY_TYPES.OFFSET]
+            [RHSM_API_QUERY_TYPES.UOM]: action[RHSM_API_QUERY_TYPES.UOM]
+          }
+        },
+        {
+          state,
+          reset: false
+        }
+      );
+    case reduxTypes.query.SET_QUERY_RHSM_TYPES[RHSM_API_QUERY_TYPES.USAGE]:
+      return reduxHelpers.setStateProp(
+        'query',
+        {
+          [action.viewId]: {
+            ...state.query[action.viewId],
+            [RHSM_API_QUERY_TYPES.USAGE]: action[RHSM_API_QUERY_TYPES.USAGE]
           }
         },
         {
diff --git a/src/redux/types/__tests__/__snapshots__/index.test.js.snap b/src/redux/types/__tests__/__snapshots__/index.test.js.snap
index e5b69a703..03884b39d 100644
--- a/src/redux/types/__tests__/__snapshots__/index.test.js.snap
+++ b/src/redux/types/__tests__/__snapshots__/index.test.js.snap
@@ -30,6 +30,7 @@ Object {
         "limit": "SET_QUERY_RHSM_limit",
         "offset": "SET_QUERY_RHSM_offset",
         "sla": "SET_QUERY_RHSM_sla",
+        "uom": "SET_QUERY_RHSM_uom",
         "usage": "SET_QUERY_RHSM_usage",
       },
     },
@@ -72,6 +73,7 @@ Object {
       "limit": "SET_QUERY_RHSM_limit",
       "offset": "SET_QUERY_RHSM_offset",
       "sla": "SET_QUERY_RHSM_sla",
+      "uom": "SET_QUERY_RHSM_uom",
       "usage": "SET_QUERY_RHSM_usage",
     },
   },
@@ -99,6 +101,7 @@ Object {
         "limit": "SET_QUERY_RHSM_limit",
         "offset": "SET_QUERY_RHSM_offset",
         "sla": "SET_QUERY_RHSM_sla",
+        "uom": "SET_QUERY_RHSM_uom",
         "usage": "SET_QUERY_RHSM_usage",
       },
     },
@@ -169,6 +172,7 @@ Object {
       "limit": "SET_QUERY_RHSM_limit",
       "offset": "SET_QUERY_RHSM_offset",
       "sla": "SET_QUERY_RHSM_sla",
+      "uom": "SET_QUERY_RHSM_uom",
       "usage": "SET_QUERY_RHSM_usage",
     },
   },
diff --git a/src/redux/types/queryTypes.js b/src/redux/types/queryTypes.js
index 25d25315c..3333225b7 100644
--- a/src/redux/types/queryTypes.js
+++ b/src/redux/types/queryTypes.js
@@ -4,10 +4,11 @@ const SET_QUERY_CLEAR = 'SET_QUERY_CLEAR';
 
 const SET_QUERY_RHSM_TYPES = {
   [RHSM_API_QUERY_TYPES.GRANULARITY]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.GRANULARITY}`,
-  [RHSM_API_QUERY_TYPES.USAGE]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.USAGE}`,
-  [RHSM_API_QUERY_TYPES.SLA]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.SLA}`,
   [RHSM_API_QUERY_TYPES.LIMIT]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.LIMIT}`,
-  [RHSM_API_QUERY_TYPES.OFFSET]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.OFFSET}`
+  [RHSM_API_QUERY_TYPES.OFFSET]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.OFFSET}`,
+  [RHSM_API_QUERY_TYPES.SLA]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.SLA}`,
+  [RHSM_API_QUERY_TYPES.UOM]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.UOM}`,
+  [RHSM_API_QUERY_TYPES.USAGE]: `SET_QUERY_RHSM_${RHSM_API_QUERY_TYPES.USAGE}`
 };
 
 /**
diff --git a/src/types/__tests__/__snapshots__/index.test.js.snap b/src/types/__tests__/__snapshots__/index.test.js.snap
index 4a3fbeb4d..fd7b35dc5 100644
--- a/src/types/__tests__/__snapshots__/index.test.js.snap
+++ b/src/types/__tests__/__snapshots__/index.test.js.snap
@@ -47,6 +47,7 @@ Object {
         "LIMIT": "limit",
         "OFFSET": "offset",
         "SLA": "sla",
+        "UOM": "uom",
         "USAGE": "usage",
       },
       "RHSM_API_QUERY_SET_OPTIN_TYPES": Object {
@@ -77,8 +78,13 @@ Object {
         "START_DATE": "beginning",
         "TALLY_REPORT": "enable_tally_reporting",
         "TALLY_SYNC": "enable_tally_sync",
+        "UOM": "uom",
         "USAGE": "usage",
       },
+      "RHSM_API_QUERY_UOM_TYPES": Object {
+        "CORES": "cores",
+        "SOCKETS": "sockets",
+      },
       "RHSM_API_QUERY_USAGE_TYPES": Object {
         "DEVELOPMENT": "Development/Test",
         "DISASTER": "Disaster Recovery",
@@ -198,6 +204,7 @@ Object {
         "LIMIT": "limit",
         "OFFSET": "offset",
         "SLA": "sla",
+        "UOM": "uom",
         "USAGE": "usage",
       },
       "RHSM_API_QUERY_SET_OPTIN_TYPES": Object {
@@ -228,8 +235,13 @@ Object {
         "START_DATE": "beginning",
         "TALLY_REPORT": "enable_tally_reporting",
         "TALLY_SYNC": "enable_tally_sync",
+        "UOM": "uom",
         "USAGE": "usage",
       },
+      "RHSM_API_QUERY_UOM_TYPES": Object {
+        "CORES": "cores",
+        "SOCKETS": "sockets",
+      },
       "RHSM_API_QUERY_USAGE_TYPES": Object {
         "DEVELOPMENT": "Development/Test",
         "DISASTER": "Disaster Recovery",
@@ -348,6 +360,7 @@ Object {
       "LIMIT": "limit",
       "OFFSET": "offset",
       "SLA": "sla",
+      "UOM": "uom",
       "USAGE": "usage",
     },
     "RHSM_API_QUERY_SET_OPTIN_TYPES": Object {
@@ -378,8 +391,13 @@ Object {
       "START_DATE": "beginning",
       "TALLY_REPORT": "enable_tally_reporting",
       "TALLY_SYNC": "enable_tally_sync",
+      "UOM": "uom",
       "USAGE": "usage",
     },
+    "RHSM_API_QUERY_UOM_TYPES": Object {
+      "CORES": "cores",
+      "SOCKETS": "sockets",
+    },
     "RHSM_API_QUERY_USAGE_TYPES": Object {
       "DEVELOPMENT": "Development/Test",
       "DISASTER": "Disaster Recovery",
@@ -502,6 +520,7 @@ Object {
       "LIMIT": "limit",
       "OFFSET": "offset",
       "SLA": "sla",
+      "UOM": "uom",
       "USAGE": "usage",
     },
     "RHSM_API_QUERY_SET_OPTIN_TYPES": Object {
@@ -532,8 +551,13 @@ Object {
       "START_DATE": "beginning",
       "TALLY_REPORT": "enable_tally_reporting",
       "TALLY_SYNC": "enable_tally_sync",
+      "UOM": "uom",
       "USAGE": "usage",
     },
+    "RHSM_API_QUERY_UOM_TYPES": Object {
+      "CORES": "cores",
+      "SOCKETS": "sockets",
+    },
     "RHSM_API_QUERY_USAGE_TYPES": Object {
       "DEVELOPMENT": "Development/Test",
       "DISASTER": "Disaster Recovery",
diff --git a/src/types/rhsmApiTypes.js b/src/types/rhsmApiTypes.js
index 9578d0bc5..5170bb821 100644
--- a/src/types/rhsmApiTypes.js
+++ b/src/types/rhsmApiTypes.js
@@ -202,6 +202,16 @@ const RHSM_API_QUERY_SLA_TYPES = {
   NONE: ''
 };
 
+/**
+ * RHSM API query/search parameter UOM type values.
+ *
+ * @type {{CORES: string, SOCKETS: string}}
+ */
+const RHSM_API_QUERY_UOM_TYPES = {
+  CORES: 'cores',
+  SOCKETS: 'sockets'
+};
+
 /**
  * RHSM API query/search parameter USAGE type values.
  *
@@ -214,12 +224,22 @@ const RHSM_API_QUERY_USAGE_TYPES = {
   UNSPECIFIED: ''
 };
 
+/**
+ * RHSM API query/search parameter OPTIN type values.
+ *
+ * @type {{TALLY_SYNC: string, TALLY_REPORT: string, CONDUIT_SYNC: string}}
+ */
 const RHSM_API_QUERY_SET_OPTIN_TYPES = {
   CONDUIT_SYNC: 'enable_conduit_sync',
   TALLY_REPORT: 'enable_tally_reporting',
   TALLY_SYNC: 'enable_tally_sync'
 };
 
+/**
+ * RHSM API query/search parameter CAPACITY type values.
+ *
+ * @type {{GRANULARITY: string, USAGE: string, END_DATE: string, SLA: string, START_DATE: string}}
+ */
 const RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES = {
   END_DATE: 'ending',
   GRANULARITY: 'granularity',
@@ -228,18 +248,36 @@ const RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES = {
   USAGE: 'usage'
 };
 
+/**
+ * RHSM API query/search parameter INVENTORY type values.
+ *
+ * @type {{USAGE: string, UOM: string, OFFSET: string, SLA: string, LIMIT: string}}
+ */
 const RHSM_API_QUERY_SET_INVENTORY_TYPES = {
   LIMIT: 'limit',
   OFFSET: 'offset',
   SLA: 'sla',
+  UOM: 'uom',
   USAGE: 'usage'
 };
 
+/**
+ * RHSM API query/search parameter GUESTS type values.
+ *
+ * @type {{OFFSET: string, LIMIT: string}}
+ */
 const RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES = {
   LIMIT: 'limit',
   OFFSET: 'offset'
 };
 
+/**
+ * RHSM API query/search parameter values.
+ *
+ * @type {{GRANULARITY: string, TALLY_SYNC: string, TALLY_REPORT: string, USAGE: string,
+ *     UOM: string, END_DATE: string, SLA: string, OFFSET: string, START_DATE: string,
+ *     LIMIT: string, CONDUIT_SYNC: string}}
+ */
 const RHSM_API_QUERY_TYPES = {
   ...RHSM_API_QUERY_SET_OPTIN_TYPES,
   ...RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES,
@@ -253,27 +291,32 @@ const RHSM_API_QUERY_TYPES = {
  * @type {{RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES: {OFFSET: string, LIMIT: string},
  *     RHSM_API_RESPONSE_ERROR_DATA_CODE_TYPES: {GENERIC: string, OPTIN: string},
  *     RHSM_API_RESPONSE_INVENTORY_DATA: string, RHSM_API_RESPONSE_CAPACITY_DATA: string,
- *     RHSM_API_PATH_ID_TYPES: {RHEL_ARM: string, RHEL_WORKSTATION: string, RHEL_DESKTOP: string, RHEL: string,
- *     RHEL_SERVER: string, RHEL_IBM_Z: string, RHEL_COMPUTE_NODE: string, RHEL_IBM_POWER: string,
- *     RHEL_X86: string, OPENSHIFT: string}, RHSM_API_RESPONSE_ERROR_DATA_TYPES: {CODE: string, DETAIL: string},
+ *     RHSM_API_PATH_ID_TYPES: {RHEL_ARM: string, RHEL_WORKSTATION: string, RHEL_DESKTOP: string,
+ *     RHEL: string, RHEL_SERVER: string, RHEL_IBM_Z: string, RHEL_COMPUTE_NODE: string,
+ *     RHEL_IBM_POWER: string, RHEL_X86: string, OPENSHIFT: string},
+ *     RHSM_API_RESPONSE_ERROR_DATA_TYPES: {CODE: string, DETAIL: string},
  *     RHSM_API_QUERY_SET_OPTIN_TYPES: {TALLY_SYNC: string, TALLY_REPORT: string, CONDUIT_SYNC: string},
- *     RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, PRODUCTION: string},
- *     RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string},
- *     RHSM_API_QUERY_SET_INVENTORY_TYPES: {USAGE: string, OFFSET: string, SLA: string, LIMIT: string},
- *     RHSM_API_RESPONSE_CAPACITY_DATA_TYPES: {HYPERVISOR_SOCKETS: string, CORES: string, DATE: string, SOCKETS: string,
- *     PHYSICAL_SOCKETS: string, HYPERVISOR_CORES: string, HAS_INFINITE: string, PHYSICAL_CORES: string},
- *     RHSM_API_RESPONSE_META_TYPES: string, RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES: {HYPERVISOR_SOCKETS: string,
- *     CORES: string, DATE: string, SOCKETS: string, HAS_DATA: string, PHYSICAL_SOCKETS: string,
- *     HYPERVISOR_CORES: string, PHYSICAL_CORES: string}, RHSM_API_RESPONSE_LINKS_TYPES: string,
+ *     RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string,
+ *     PRODUCTION: string}, RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string,
+ *     STANDARD: string}, RHSM_API_QUERY_SET_INVENTORY_TYPES: {USAGE: string, UOM: string,
+ *     OFFSET: string, SLA: string, LIMIT: string},
+ *     RHSM_API_RESPONSE_CAPACITY_DATA_TYPES: {HYPERVISOR_SOCKETS: string, CORES: string, DATE: string,
+ *     SOCKETS: string, PHYSICAL_SOCKETS: string, HYPERVISOR_CORES: string, HAS_INFINITE: string,
+ *     PHYSICAL_CORES: string}, RHSM_API_RESPONSE_META_TYPES: string,
+ *     RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES: {HYPERVISOR_SOCKETS: string, CORES: string, DATE: string,
+ *     SOCKETS: string, HAS_DATA: string, PHYSICAL_SOCKETS: string, HYPERVISOR_CORES: string,
+ *     PHYSICAL_CORES: string}, RHSM_API_RESPONSE_LINKS_TYPES: string,
  *     RHSM_API_RESPONSE_INVENTORY_GUESTS_DATA_TYPES: {SUBSCRIPTION_ID: string, ID: string, NAME: string,
- *     LAST_SEEN: string}, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY: string,
- *     MONTHLY: string}, RHSM_API_RESPONSE_ERROR_DATA: string, RHSM_API_RESPONSE_META: string,
- *     RHSM_API_RESPONSE_PRODUCTS_DATA: string, RHSM_API_QUERY_TYPES: {GRANULARITY: string, TALLY_SYNC: string,
- *     TALLY_REPORT: string, USAGE: string, END_DATE: string, SLA: string, OFFSET: string, START_DATE: string,
+ *     LAST_SEEN: string}, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string,
+ *     DAILY: string, MONTHLY: string}, RHSM_API_RESPONSE_ERROR_DATA: string,
+ *     RHSM_API_RESPONSE_META: string, RHSM_API_RESPONSE_PRODUCTS_DATA: string,
+ *     RHSM_API_QUERY_TYPES: {GRANULARITY: string, TALLY_SYNC: string, TALLY_REPORT: string,
+ *     USAGE: string, UOM: string, END_DATE: string, SLA: string, OFFSET: string, START_DATE: string,
  *     LIMIT: string, CONDUIT_SYNC: string}, RHSM_API_RESPONSE_INVENTORY_DATA_TYPES: {CORES: string,
  *     HARDWARE: string, SOCKETS: string, ID: string, NAME: string, LAST_SEEN: string},
- *     RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string, END_DATE: string, SLA: string,
- *     START_DATE: string}, RHSM_API_RESPONSE_LINKS: string}}
+ *     RHSM_API_QUERY_UOM_TYPES: {CORES: string, SOCKETS: string},
+ *     RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string, END_DATE: string,
+ *     SLA: string, START_DATE: string}, RHSM_API_RESPONSE_LINKS: string}}
  */
 const rhsmApiTypes = {
   RHSM_API_RESPONSE_ERROR_DATA,
@@ -293,6 +336,7 @@ const rhsmApiTypes = {
   RHSM_API_PATH_ID_TYPES,
   RHSM_API_QUERY_GRANULARITY_TYPES,
   RHSM_API_QUERY_SLA_TYPES,
+  RHSM_API_QUERY_UOM_TYPES,
   RHSM_API_QUERY_USAGE_TYPES,
   RHSM_API_QUERY_TYPES,
   RHSM_API_QUERY_SET_OPTIN_TYPES,
@@ -321,6 +365,7 @@ export {
   RHSM_API_PATH_ID_TYPES,
   RHSM_API_QUERY_GRANULARITY_TYPES,
   RHSM_API_QUERY_SLA_TYPES,
+  RHSM_API_QUERY_UOM_TYPES,
   RHSM_API_QUERY_USAGE_TYPES,
   RHSM_API_QUERY_TYPES,
   RHSM_API_QUERY_SET_OPTIN_TYPES,