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

Jump to bottom

Only show file system chart when there is >0 file systems #1056

Merged
merged 1 commit into from
Jul 10, 2019
Merged

Only show file system chart when there is >0 file systems #1056

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/components/VmDetails/cards/UtilizationCard/DiskCharts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ DiskBar.propTypes = {
* via REST. Storage allocation is being used instead.
*/
const DiskCharts = ({ vm, diskStats, isRunning, id, ...props }) => {
const diskDetails = diskStats && diskStats['usage'] && diskStats['usage'].datum
const diskDetails = diskStats && diskStats.usage && diskStats.usage.datum
const hasDiskDetails = diskDetails && diskDetails.length > 0

let actualSize = 0
let provisionedSize = 0
Expand Down Expand Up @@ -125,7 +126,7 @@ const DiskCharts = ({ vm, diskStats, isRunning, id, ...props }) => {
</UtilizationCardDetailsLine2>
</UtilizationCardDetailsDesc>
</UtilizationCardDetails>
{ !diskDetails &&
{ !hasDiskDetails &&
<DonutChart
id={`${id}-donut-chart`}
data={{
Expand All @@ -145,7 +146,7 @@ const DiskCharts = ({ vm, diskStats, isRunning, id, ...props }) => {
}}
/>
}
{ isRunning && diskDetails &&
{ isRunning && hasDiskDetails &&
<div className={style['disk-fs-list']}>
{
diskDetails.map((disk) =>
Expand All @@ -154,14 +155,14 @@ const DiskCharts = ({ vm, diskStats, isRunning, id, ...props }) => {
}
</div>
}
{ isRunning && !diskDetails &&
{ isRunning && !hasDiskDetails &&
<NoHistoricData message={msg.utilizationCardNoGuestAgent()} />
}
{/*
Disks don't have historic data but stub the space so the card stretches like the others,
thus if message above doesn't show, need to insert EmptyBlock
*/}
{ !(isRunning && !diskDetails) &&
{ !(isRunning && !hasDiskDetails) &&
<EmptyBlock />
}
</React.Fragment>
Expand Down