Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 23, 2023
+7 −6
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/config/__tests__/__snapshots__/product.rhel.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ exports[`Product RHEL config should apply hosts inventory configuration: filtere
</React.Fragment>,
},
{
"title": "",
"title": "--",
},
{
"title": <DateFormat
Expand Down Expand Up @@ -343,7 +343,7 @@ exports[`Product RHEL config should apply hosts inventory configuration: filtere
</React.Fragment>,
},
{
"title": "",
"title": "--",
},
{
"title": "",
Expand Down
5 changes: 3 additions & 2 deletions src/config/product.rhel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions src/services/rhsm/rhsmSchemas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down