From c3fb64e248f23a732e3bcce0664dddf3f16f5b9a Mon Sep 17 00:00:00 2001 From: Dixsie Wolmers Date: Wed, 1 Jul 2020 12:41:28 -0500 Subject: Fix overview page server information bug The frontend displays "--" as the default state when static values are null. When backend returns an empty string for server model, serial number, manufacturer or firmware version, then return "--" to follow the current default state pattern. Signed-off-by: Dixsie Wolmers Change-Id: Ica0d864993d7124598c09c5bd33d0313d84059db --- src/views/Overview/Overview.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue index fa7f5242..ba934130 100644 --- a/src/views/Overview/Overview.vue +++ b/src/views/Overview/Overview.vue @@ -110,16 +110,20 @@ export default { powerCapValue: state => state.powerControl.powerCapValue, powerConsumptionValue: state => state.powerControl.powerConsumptionValue, serverManufacturer() { - return this.server ? this.server.manufacturer : '--'; + if (this.server) return this.server.manufacturer || '--'; + return '--'; }, serverModel() { - return this.server ? this.server.model : '--'; + if (this.server) return this.server.model || '--'; + return '--'; }, serverSerialNumber() { - return this.server ? this.server.serialNumber : '--'; + if (this.server) return this.server.serialNumber || '--'; + return '--'; }, hostFirmwareVersion() { - return this.server ? this.server.firmwareVersion : '--'; + if (this.server) return this.server.firmwareVersion || '--'; + return '--'; } }), created() { -- cgit v1.2.3