fix: clear all intervals before destroying components

zazuko · Feb 11, 2020 · 096d6ad · 096d6ad
1 parent 3a1d55d
commit 096d6ad
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/pages/install/index.vue b/pages/install/index.vue
@@ -186,12 +186,12 @@ export default {
       }
       this.rebooting = true
       setTimeout(() => {
-        const checker = setInterval(async () => {
+        this.checker = setInterval(async () => {
           if (this.checkInProgress) {
             return
           }
           if (await this.isUp()) {
-            clearInterval(checker)
+            clearInterval(this.checker)
             setTimeout(() => {
               window.location.href = `${this.protocol}://${this.host}/install`
             }, 10 * 1000)
@@ -200,6 +200,11 @@ export default {
       }, 1000)
     }
   },
+  beforeDestroy () {
+    if (this.checker) {
+      clearInterval(this.checker)
+    }
+  },
   head () {
     const h = {
       title: this.$headTitle('Ontology Manager Installation')

diff --git a/pages/proposal/_id.vue b/pages/proposal/_id.vue
@@ -267,11 +267,11 @@ export default {
           message: 'Not found'
         })
       }
-      const waitForAuth = setInterval(() => {
+      this.waitForAuth = setInterval(() => {
         if (!this.$store.state.authProcessDone) {
           return
         }
-        clearInterval(waitForAuth)
+        clearInterval(this.waitForAuth)
 
         loader(this.id)
           .then((isDraft) => {
@@ -288,6 +288,11 @@ export default {
       }, 200)
     }
   },
+  beforeDestroy () {
+    if (this.waitForAuth) {
+      clearInterval(this.waitForAuth)
+    }
+  },
   validate ({ params }) {
     // Must be a number
     return /^\d+$/.test(params.id)

diff --git a/pages/proposal/property.vue b/pages/proposal/property.vue
@@ -213,11 +213,11 @@ export default {
     }
     // if we have an ID from the URL here, we load
     else if (this.isEditingExistingDraft) {
-      const waitForAuth = setInterval(() => {
+      this.waitForAuth = setInterval(() => {
         if (!this.$store.state.authProcessDone || typeof this.prop === 'undefined') {
           return
         }
-        clearInterval(waitForAuth)
+        clearInterval(this.waitForAuth)
         this.load(this.id)
           .then((isDraft) => {
             this.storeReady = true
@@ -248,9 +248,10 @@ export default {
       this.storeReady = true
     }
   },
-  beforeDestroy () {
+  async beforeDestroy () {
+    clearInterval(this.waitForAuth)
     if (this.saveInterval) {
-      this.saveDraft()
+      await this.saveDraft()
       this.stopAutosave()
     }
   },