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

Fixes #36766 - Set disks to amount of disks instead of bytes #10750

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Fixes #36766 - Set disks to amount of disks instead of bytes #10750

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
21 changes: 11 additions & 10 deletions webpack/components/extensions/HostDetails/DetailsTabCards/HwPropertiesCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { propsToCamelCase } from 'foremanReact/common/helpers';
import { translate as __ } from 'foremanReact/common/I18n';
import {
DescriptionList,
Expand All @@ -14,7 +13,12 @@ import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem
import { TranslatedPlural } from '../../../Table/components/TranslatedPlural';
import { hostIsNotRegistered } from '../hostDetailsHelpers';

const HostDisks = ({ totalDisks }) => {
const HostDisks = ({ blockDevices }) => {
chris1984 marked this conversation as resolved.
Show resolved Hide resolved
if (!blockDevices) return null;
// blockDevices fact will look like this by default 'sr0,sda' and increment like sdb etc
const disks = blockDevices.split(',');
// We are filtering out the CDROM drive that gets added by default a lot of the time
const totalDisks = disks.filter(e => !e.startsWith('sr')).length;
if (!totalDisks) return null;
return (
<>
Expand All @@ -27,11 +31,11 @@ const HostDisks = ({ totalDisks }) => {
};

HostDisks.propTypes = {
totalDisks: PropTypes.number,
blockDevices: PropTypes.string,
};

HostDisks.defaultProps = {
totalDisks: null,
blockDevices: '',
};

const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
Expand All @@ -41,8 +45,7 @@ const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
const cpuCount = facts?.['cpu::cpu(s)'];
const cpuSockets = facts?.['cpu::cpu_socket(s)'];
const coreSocket = facts?.['cpu::core(s)_per_socket'];
const reportedFacts = propsToCamelCase(hostDetails?.reported_data || {});
const totalDisks = reportedFacts?.disksTotal;
const blockDevices = facts?.blockdevices;
chris1984 marked this conversation as resolved.
Show resolved Hide resolved
const memory = facts?.['dmi::memory::maximum_capacity'];

return (
Expand Down Expand Up @@ -74,7 +77,7 @@ const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
<DescriptionListDescription>{memory}</DescriptionListDescription>
</DescriptionListGroup>
<DescriptionListGroup>
<HostDisks totalDisks={totalDisks} />
<HostDisks blockDevices={blockDevices} />
</DescriptionListGroup>
</DescriptionList>
</CardTemplate>
Expand All @@ -90,9 +93,7 @@ HwPropertiesCard.propTypes = {
cpuSockets: PropTypes.number,
coreSocket: PropTypes.number,
memory: PropTypes.string,
}),
reported_data: PropTypes.shape({
totalDisks: PropTypes.number,
blockdevices: PropTypes.string,
}),
}),
};
Expand Down