diff options
| author | Konstantin <sulwirld@gmail.com> | 2023-02-06 17:25:19 +0300 |
|---|---|---|
| committer | sulwirld <sulwirld@gmail.com> | 2023-02-10 16:17:48 +0300 |
| commit | da53c0676831e845ae22d3c9147df32f2cbb9fc7 (patch) | |
| tree | 5712ff8b75a48f948d2485190dfc6a3c4a43975d | |
| parent | d6ca6439518e044c1c30c020481743973ccafb0c (diff) | |
| download | webui-vue-da53c0676831e845ae22d3c9147df32f2cbb9fc7.tar.xz | |
Fix bug in Overview endless loading
Bug description:
Before this commit there was an endless loading
on blue bar when user entering to the Overview.
Problem was missing `if` statement
after what that promise wasn't be able to finish.
Test:
Step1. Launch webui on browser and see Overview page.
Step2. Wait a while. Blue loading bar finished pulsing.
Change-Id: I2ea3b6f125ca24fcefeea8020c4a903ea018f4f7
Signed-off-by: Konstantin Maskov <sulwirld@gmail.com>
| -rw-r--r-- | src/store/index.js | 2 | ||||
| -rw-r--r-- | src/views/Overview/Overview.vue | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/store/index.js b/src/store/index.js index ba248c58..c0b78945 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -14,6 +14,7 @@ import PowerControlStore from './modules/ResourceManagement/PowerControlStore'; import PowerPolicyStore from './modules/Settings/PowerPolicyStore'; import NetworkStore from './modules/Settings/NetworkStore'; import EventLogStore from './modules/Logs/EventLogStore'; +import DumpsStore from './modules/Logs/DumpsStore'; import SensorsStore from './modules/HardwareStatus/SensorsStore'; import ServerLedStore from './modules/HardwareStatus/ServerLedStore'; import SystemStore from './modules/HardwareStatus/SystemStore'; @@ -54,6 +55,7 @@ export default new Vuex.Store({ powerSupply: PowerSupplyStore, network: NetworkStore, eventLog: EventLogStore, + dumps: DumpsStore, sensors: SensorsStore, serverLed: ServerLedStore, certificates: CertificatesStore, diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue index 9960f373..d999be4c 100644 --- a/src/views/Overview/Overview.vue +++ b/src/views/Overview/Overview.vue @@ -85,8 +85,7 @@ export default { this.$root.$on('overview-server-complete', () => resolve()); }); - Promise.all([ - dumpsPromise, + const promises = [ eventsPromise, firmwarePromise, inventoryPromise, @@ -94,7 +93,9 @@ export default { powerPromise, quicklinksPromise, serverPromise, - ]).finally(() => this.endLoader()); + ]; + if (this.showDumps) promises.push(dumpsPromise); + Promise.all(promises).finally(() => this.endLoader()); }, }; </script> |