diff options
author | MichalX Szopinski <michalx.szopinski@intel.com> | 2022-02-25 18:34:54 +0300 |
---|---|---|
committer | Damian Celico <damianx.celico@intel.com> | 2022-09-26 18:20:00 +0300 |
commit | 112dbb266e659e252e42f2230ddb4a80a467da20 (patch) | |
tree | 1022fa9dc6a501e1f7ed852502b08f215d8e5962 /src/views/Overview | |
parent | 31fb2b96a58492c3214197685787f42f305a42ad (diff) | |
download | webui-vue-112dbb266e659e252e42f2230ddb4a80a467da20.tar.xz |
Server manufacturer and Firmware version on Overview tab
Add "Server manufacturer" and "Firmware version" to "Server
information" card in Overview tab.
Signed-off-by: MichalX Szopinski <michalx.szopinski@intel.com>
Change-Id: If02516b1b721920f83c5fe42a7c5e79fbb1825ca
Diffstat (limited to 'src/views/Overview')
-rw-r--r-- | src/views/Overview/OverviewFirmware.vue | 39 | ||||
-rw-r--r-- | src/views/Overview/OverviewServer.vue | 11 |
2 files changed, 36 insertions, 14 deletions
diff --git a/src/views/Overview/OverviewFirmware.vue b/src/views/Overview/OverviewFirmware.vue index f1f9ce53..c2c7f4ad 100644 --- a/src/views/Overview/OverviewFirmware.vue +++ b/src/views/Overview/OverviewFirmware.vue @@ -4,7 +4,7 @@ :to="`/operations/firmware`" > <b-row class="mt-3"> - <b-col> + <b-col sm="6"> <dl> <dt>{{ $t('pageOverview.runningVersion') }}</dt> <dd>{{ dataFormatter(runningVersion) }}</dd> @@ -12,6 +12,12 @@ <dd>{{ dataFormatter(backupVersion) }}</dd> </dl> </b-col> + <b-col sm="6"> + <dl> + <dt>{{ $t('pageOverview.firmwareVersion') }}</dt> + <dd>{{ dataFormatter(firmwareVersion) }}</dd> + </dl> + </b-col> </b-row> </overview-card> </template> @@ -19,6 +25,7 @@ <script> import OverviewCard from './OverviewCard'; import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin'; +import { mapState } from 'vuex'; export default { name: 'Firmware', @@ -27,18 +34,24 @@ export default { }, mixins: [DataFormatterMixin], computed: { - backupBmcFirmware() { - return this.$store.getters['firmware/backupBmcFirmware']; - }, - backupVersion() { - return this.backupBmcFirmware?.version; - }, - activeBmcFirmware() { - return this.$store.getters[`firmware/activeBmcFirmware`]; - }, - runningVersion() { - return this.activeBmcFirmware?.version; - }, + ...mapState({ + server: (state) => state.system.systems[0], + backupBmcFirmware() { + return this.$store.getters['firmware/backupBmcFirmware']; + }, + backupVersion() { + return this.backupBmcFirmware?.version; + }, + activeBmcFirmware() { + return this.$store.getters[`firmware/activeBmcFirmware`]; + }, + firmwareVersion() { + return this.server?.firmwareVersion; + }, + runningVersion() { + return this.activeBmcFirmware?.version; + }, + }), }, created() { this.$store.dispatch('firmware/getFirmwareInformation').finally(() => { diff --git a/src/views/Overview/OverviewServer.vue b/src/views/Overview/OverviewServer.vue index d066d391..8fc16d14 100644 --- a/src/views/Overview/OverviewServer.vue +++ b/src/views/Overview/OverviewServer.vue @@ -4,7 +4,7 @@ :to="`/hardware-status/inventory`" > <b-row class="mt-3"> - <b-col lg="6"> + <b-col sm="6"> <dl> <dt>{{ $t('pageOverview.model') }}</dt> <dd>{{ dataFormatter(serverModel) }}</dd> @@ -12,6 +12,12 @@ <dd>{{ dataFormatter(serverSerialNumber) }}</dd> </dl> </b-col> + <b-col sm="6"> + <dl> + <dt>{{ $t('pageOverview.serverManufacturer') }}</dt> + <dd>{{ dataFormatter(serverManufacturer) }}</dd> + </dl> + </b-col> </b-row> </overview-card> </template> @@ -36,6 +42,9 @@ export default { serverSerialNumber() { return this.server?.serialNumber; }, + serverManufacturer() { + return this.server?.manufacturer; + }, }), }, created() { |