fix(config): sw-106 disable category, metric sort (#1038)

* config, rhel disable sort, metric dash display * rhsmSchemas, lowercase response, allow empty
RedHatInsights · Jan 23, 2023 · 6f7e745 · 6f7e745
1 parent 17b739c
commit 6f7e745
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/config/__tests__/__snapshots__/product.rhel.test.js.snap b/src/config/__tests__/__snapshots__/product.rhel.test.js.snap
@@ -247,7 +247,7 @@ exports[`Product RHEL config should apply hosts inventory configuration: filtere
       </React.Fragment>,
     },
     {
-      "title": "",
+      "title": "--",
     },
     {
       "title": <DateFormat
@@ -343,7 +343,7 @@ exports[`Product RHEL config should apply hosts inventory configuration: filtere
       </React.Fragment>,
     },
     {
-      "title": "",
+      "title": "--",
     },
     {
       "title": "",

diff --git a/src/config/product.rhel.js b/src/config/product.rhel.js
@@ -217,12 +217,13 @@ const config = {
             ''}
         </React.Fragment>
       ),
-      isSortable: true,
+      isSortable: false,
       cellWidth: 20
     },
     {
       id: RHSM_API_PATH_METRIC_TYPES.SOCKETS,
-      isSortable: true,
+      cell: ({ [RHSM_API_PATH_METRIC_TYPES.SOCKETS]: sockets } = {}) => sockets?.value || '--',
+      isSortable: false,
       isWrappable: true,
       cellWidth: 15
     },

diff --git a/src/services/rhsm/rhsmSchemas.js b/src/services/rhsm/rhsmSchemas.js
@@ -168,9 +168,9 @@ const instancesMetaSchema = metaResponseSchema
  */
 const instancesItem = Joi.object({
   inventory_id: Joi.string().optional().allow(null),
-  category: Joi.string().optional().allow(null),
+  category: Joi.string().lowercase().optional().allow(null),
   display_name: Joi.string().optional().allow(null),
-  billing_provider: Joi.string().optional().allow(null),
+  billing_provider: Joi.string().lowercase().optional().allow(null, ''),
   billing_account_id: Joi.string().optional().allow(null),
   measurements: Joi.array().default([]),
   number_of_guests: Joi.number().integer().default(0),