@afeefa/vue-app 0.0.140 → 0.0.141

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.140
+0.0.141

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.140",
+  "version": "0.0.141",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/list/ListViewMixin.js

@@ -2,6 +2,7 @@ import { Component, Vue, Watch } from '@a-vue'
 import { ListAction } from '@a-vue/api-resources/ApiActions'
 import { sleep } from '@a-vue/utils/timeout'
 import { ListViewModel } from '@afeefa/api-resources-client'
+import axios from 'axios'
 
 import { CurrentRouteFilterSource } from './CurrentRouteFilterSource'
 import { FilterSourceType } from './FilterSourceType'
@@ -26,6 +27,7 @@ export class ListViewMixin extends Vue {
   models_ = []
   meta_ = {}
   isLoading = false
+  cancelSource = null
 
   created () {
     this.init()
@@ -132,10 +134,16 @@ export class ListViewMixin extends Vue {
     this.isLoading = true
     this.$emit('update:isLoading', this.isLoading)
 
+    if (this.cancelSource) {
+      this.cancelSource.cancel()
+    }
+
+    this.cancelSource = axios.CancelToken.source()
     const request = this.listViewModel.getApiRequest()
 
     const {models, meta} = await ListAction
       .fromRequest(request)
+      .cancelSource(this.cancelSource)
       .dispatchGlobalLoadingEvents(this.events)
       .load()
 

package/src-admin/components/App.vue

@@ -94,7 +94,7 @@
       top
       left
       class="loadingIndicator"
-      :isLoading="isLoading"
+      :isLoading="!!numLoadingRequests"
       :color="loaderColor"
     />
 
@@ -119,7 +119,7 @@
       >
         <sticky-header />
 
-        <router-view :class="{isLoading}" />
+        <router-view :class="{isLoading: !!numLoadingRequests}" />
       </v-container>
 
       <sticky-footer-container />
@@ -164,7 +164,7 @@ export default class App extends Vue {
 
   drawer = true
   closeMenuIcon = mdiBackburger
-  isLoading = false
+  numLoadingRequests = 0
 
   created () {
     this.$events.on(LoadingEvent.START_LOADING, this.startLoading)
@@ -200,11 +200,11 @@ export default class App extends Vue {
   }
 
   startLoading () {
-    this.isLoading = true
+    this.numLoadingRequests++
   }
 
   stopLoading () {
-    this.isLoading = false
+    this.numLoadingRequests--
   }
 
   toggleDrawer () {