Refactor Overview page
Use SystemStore to get Server information values on the
overview page. Added missing properties to SystemStore
and removed hostFirmware from FirmwareStore.
Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Change-Id: I5923adb0345f0de28f9a66f460e41d15f87f743a
diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue
index 59b5063..fa7f524 100644
--- a/src/views/Overview/Overview.vue
+++ b/src/views/Overview/Overview.vue
@@ -105,13 +105,22 @@
},
mixins: [LoadingBarMixin],
computed: mapState({
- serverModel: state => state.overview.serverModel,
- serverManufacturer: state => state.overview.serverManufacturer,
- serverSerialNumber: state => state.overview.serverSerialNumber,
- hostFirmwareVersion: state => state.firmware.hostFirmwareVersion,
+ server: state => state.system.systems[0],
bmcFirmwareVersion: state => state.firmware.bmcFirmwareVersion,
powerCapValue: state => state.powerControl.powerCapValue,
- powerConsumptionValue: state => state.powerControl.powerConsumptionValue
+ powerConsumptionValue: state => state.powerControl.powerConsumptionValue,
+ serverManufacturer() {
+ return this.server ? this.server.manufacturer : '--';
+ },
+ serverModel() {
+ return this.server ? this.server.model : '--';
+ },
+ serverSerialNumber() {
+ return this.server ? this.server.serialNumber : '--';
+ },
+ hostFirmwareVersion() {
+ return this.server ? this.server.firmwareVersion : '--';
+ }
}),
created() {
this.startLoader();
@@ -125,9 +134,8 @@
this.$root.$on('overview::events::complete', () => resolve());
});
Promise.all([
- this.$store.dispatch('overview/getServerInfo'),
+ this.$store.dispatch('system/getSystem'),
this.$store.dispatch('firmware/getBmcFirmware'),
- this.$store.dispatch('firmware/getHostFirmware'),
this.$store.dispatch('powerControl/getPowerControl'),
quicklinksPromise,
networkPromise,