From bb3160669584e165bb0be40bc3daef2e78307624 Mon Sep 17 00:00:00 2001 From: Dixsie Wolmers Date: Tue, 4 Aug 2020 19:17:33 -0500 Subject: Add last reset time to server power operations page - Timestamp is displayed to inform user of last power operation Signed-off-by: Dixsie Wolmers Change-Id: I14c23ff56b3a0cf134c0ad2d831290971d93e293 --- .../Control/ServerPowerOperations/BootSettings.vue | 4 +- .../ServerPowerOperations.vue | 54 +++++++++++++++++----- 2 files changed, 45 insertions(+), 13 deletions(-) (limited to 'src/views') diff --git a/src/views/Control/ServerPowerOperations/BootSettings.vue b/src/views/Control/ServerPowerOperations/BootSettings.vue index c56bcf50..37de1e76 100644 --- a/src/views/Control/ServerPowerOperations/BootSettings.vue +++ b/src/views/Control/ServerPowerOperations/BootSettings.vue @@ -106,7 +106,9 @@ export default { Promise.all([ this.$store.dispatch('hostBootSettings/getBootSettings'), this.$store.dispatch('hostBootSettings/getTpmPolicy') - ]).finally(() => this.endLoader()); + ]).finally(() => + this.$root.$emit('serverPowerOperations::bootSettings::complete') + ); }, methods: { handleSubmit() { diff --git a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue index 41d8cf07..0db01298 100644 --- a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue +++ b/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue @@ -6,18 +6,36 @@ -
-
{{ $t('pageServerPowerOperations.hostStatus') }}
-
- {{ $t('global.status.on') }} -
-
- {{ $t('global.status.off') }} -
-
- {{ $t('global.status.notAvailable') }} -
-
+ + +
+
{{ $t('pageServerPowerOperations.hostStatus') }}
+
+ {{ $t('global.status.on') }} +
+
+ {{ $t('global.status.off') }} +
+
+ {{ $t('global.status.notAvailable') }} +
+
+
+
+ + +
+
+ {{ $t('pageServerPowerOperations.lastPowerOperation') }} +
+
+ {{ lastPowerOperationTime | formatDate }} + {{ lastPowerOperationTime | formatTime }} +
+
--
+
+
+
@@ -142,12 +160,24 @@ export default { isOperationInProgress() { return this.$store.getters['controls/isOperationInProgress']; }, + lastPowerOperationTime() { + return this.$store.getters['controls/lastPowerOperationTime']; + }, oneTimeBootEnabled() { return this.$store.getters['hostBootSettings/overrideEnabled']; } }, created() { this.startLoader(); + const bootSettingsPromise = new Promise(resolve => { + this.$root.$on('serverPowerOperations::bootSettings::complete', () => + resolve() + ); + }); + Promise.all([ + this.$store.dispatch('controls/getLastPowerOperationTime'), + bootSettingsPromise + ]).finally(() => this.endLoader()); }, beforeRouteLeave(to, from, next) { this.hideLoader(); -- cgit v1.2.3