Skip to content

Fixed issue with Dashboard cards #1022

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

Merged
merged 3 commits into from
Sep 10, 2021
Merged

Fixed issue with Dashboard cards #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1e6ed7
Added verification to server & drive cards for missing fields
Sep 9, 2021
5aa6cb2
Merge branch 'master' into warning-cleanup-new
dvaldivia Sep 10, 2021
1910a58
Merge branch 'master' into warning-cleanup-new
dvaldivia Sep 10, 2021
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
8 changes: 4 additions & 4 deletions portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,19 @@ const DriveInfoCard = ({ classes, drive }: ICardProps) => {
</div>
</div>
}
title={drive.endpoint}
title={drive.endpoint || ""}
subheader={
<Grid item xs={12} className={classes.stateContainer}>
<span className={classes.infoValue}>
<strong>Capacity:</strong>{" "}
{niceBytes(drive.totalSpace.toString())}
{niceBytes(drive.totalSpace ? drive.totalSpace.toString() : "0")}
</span>
<span className={classes.infoValue}>
<strong>Used:</strong> {niceBytes(drive.usedSpace.toString())}
<strong>Used:</strong> {niceBytes(drive.usedSpace ? drive.usedSpace.toString() : "0")}
</span>
<span className={classes.infoValue}>
<strong>Available:</strong>{" "}
{niceBytes(drive.availableSpace.toString())}
{niceBytes(drive.availableSpace ? drive.availableSpace.toString() : "0")}
</span>
</Grid>
}
Expand Down
12 changes: 6 additions & 6 deletions portal-ui/src/screens/Console/Dashboard/BasicDashboard/ServerInfoCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
}
};

const networkKeys = Object.keys(get(server, "network", []));
const networkKeys = Object.keys(get(server, "network", {}));

const networkTotal = networkKeys.length;
const totalDrives = server.drives.length;
const totalDrives = server.drives ? server.drives.length : 0;

const activeNetwork = networkKeys.reduce((acc: number, currValue: string) => {
const item = server.network[currValue];
Expand All @@ -117,9 +117,9 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
return acc;
}, 0);

const activeDisks = server.drives.filter(
const activeDisks = server.drives ? server.drives.filter(
(element) => element.state === "ok"
).length;
).length : 0;

return (
<Card>
Expand All @@ -137,7 +137,7 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
</div>
</div>
}
title={server.endpoint}
title={server.endpoint || ""}
subheader={
<Grid item xs={12} className={classes.stateContainer}>
<span className={classes.infoValue}>
Expand Down Expand Up @@ -165,7 +165,7 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
</span>
</span>
<span className={classes.infoValue}>
<strong>Uptime:</strong> {niceDays(server.uptime)}
<strong>Uptime:</strong> {server.uptime ? niceDays(server.uptime) : "N/A"}
</span>
</Grid>
}
Expand Down