From b771058d6cea7b9bed964a93ecebf79cdfc44a7d Mon Sep 17 00:00:00 2001
From: Bram Wiepjes <bramw@protonmail.com>
Date: Thu, 2 Nov 2023 16:24:02 +0000
Subject: [PATCH] Fix various loading states
---
.../components/snapshots/SnapshotsModal.vue | 4 +--
.../database/components/view/ViewContext.vue | 27 ++++++++++++-------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/web-frontend/modules/core/components/snapshots/SnapshotsModal.vue b/web-frontend/modules/core/components/snapshots/SnapshotsModal.vue
index c8defddc0..da03485e5 100644
--- a/web-frontend/modules/core/components/snapshots/SnapshotsModal.vue
+++ b/web-frontend/modules/core/components/snapshots/SnapshotsModal.vue
@@ -106,9 +106,9 @@ export default {
this.stopPollIfRunning()
},
methods: {
- async show(...args) {
+ show(...args) {
this.hideError()
- await this.loadSnapshots()
+ this.loadSnapshots()
modal.methods.show.bind(this)(...args)
},
async submitted(values) {
diff --git a/web-frontend/modules/database/components/view/ViewContext.vue b/web-frontend/modules/database/components/view/ViewContext.vue
index c7e6f1ab9..5c8d90e32 100644
--- a/web-frontend/modules/database/components/view/ViewContext.vue
+++ b/web-frontend/modules/database/components/view/ViewContext.vue
@@ -44,7 +44,10 @@
)
"
>
- <a @click="duplicateView()">
+ <a
+ :class="{ 'context__menu-item--loading': duplicateLoading }"
+ @click="duplicateView()"
+ >
<i class="context__menu-icon iconoir-copy"></i>
{{ $t('viewContext.duplicateView') }}
</a>
@@ -86,7 +89,10 @@
)
"
>
- <a @click="deleteView()">
+ <a
+ :class="{ 'context__menu-item--loading': deleteLoading }"
+ @click="deleteView()"
+ >
<i class="context__menu-icon iconoir-bin"></i>
{{ $t('viewContext.deleteView') }}
</a>
@@ -136,6 +142,12 @@ export default {
required: true,
},
},
+ data() {
+ return {
+ duplicateLoading: false,
+ deleteLoading: false,
+ }
+ },
computed: {
hasValidExporter() {
return viewTypeHasExporterTypes(this.view.type, this.$registry)
@@ -145,15 +157,12 @@ export default {
}),
},
methods: {
- setLoading(view, value) {
- this.$store.dispatch('view/setItemLoading', { view, value })
- },
enableRename() {
this.$refs.context.hide()
this.$emit('enable-rename')
},
async deleteView() {
- this.setLoading(this.view, true)
+ this.deleteLoading = true
try {
await this.$store.dispatch('view/delete', this.view)
@@ -161,10 +170,10 @@ export default {
this.handleError(error, 'view')
}
- this.setLoading(this.view, false)
+ this.deleteLoading = false
},
async duplicateView() {
- this.setLoading(this.view, true)
+ this.duplicateLoading = true
let newView
try {
@@ -174,7 +183,7 @@ export default {
}
this.$refs.context.hide()
- this.setLoading(this.view, false)
+ this.duplicateLoading = false
// Redirect to the newly created view.
this.$nuxt.$router.push({