fix(dash): loose threads causing bad card reloads

simwrapper · Jul 20, 2021 · 90c74ed · 90c74ed
1 parent 79d6d9d
commit 90c74ed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/charts/area.vue b/src/charts/area.vue
@@ -18,7 +18,7 @@ export default class VueComponent extends Vue {
   @Prop({ required: true }) files!: string[]
   @Prop({ required: true }) config!: any
 
-  private solverThread!: any
+  private thread!: any
   private dataRows: any[] = []
 
   private async mounted() {
@@ -29,12 +29,12 @@ export default class VueComponent extends Vue {
   private async loadData() {
     if (!this.files.length) return
 
-    if (!this.solverThread) {
-      this.solverThread = await spawn(new Worker('../workers/DataFetcher.thread'))
-    }
+    // cancel any loose threads first
+    if (this.thread) Thread.terminate(this.thread)
+    this.thread = await spawn(new Worker('../workers/DataFetcher.thread'))
 
     try {
-      const data = await this.solverThread.fetchData({
+      const data = await this.thread.fetchData({
         fileSystemConfig: this.fileSystemConfig,
         subfolder: this.subfolder,
         files: this.files,
@@ -48,7 +48,7 @@ export default class VueComponent extends Vue {
       console.log(message)
       this.dataRows = []
     } finally {
-      Thread.terminate(this.solverThread)
+      Thread.terminate(this.thread)
     }
   }
 

diff --git a/src/charts/choropleth-map.vue b/src/charts/choropleth-map.vue
@@ -96,9 +96,9 @@ export default class VueComponent extends Vue {
   }
 
   private async loadDataset() {
-    if (!this.thread) {
-      this.thread = await spawn(new Worker('../workers/DataFetcher.thread'))
-    }
+    // cancel any loose threads first
+    if (this.thread) Thread.terminate(this.thread)
+    this.thread = await spawn(new Worker('../workers/DataFetcher.thread'))
 
     try {
       const data = await this.thread.fetchData({

diff --git a/src/charts/pie.vue b/src/charts/pie.vue
@@ -24,7 +24,7 @@ export default class VueComponent extends Vue {
   @Prop({ required: true }) files!: string[]
   @Prop({ required: true }) config!: any
 
-  private solverThread!: any
+  private thread!: any
   private dataRows: any = {}
 
   private async mounted() {
@@ -35,12 +35,11 @@ export default class VueComponent extends Vue {
   private async loadData() {
     if (!this.files.length) return
 
-    if (!this.solverThread) {
-      this.solverThread = await spawn(new Worker('../workers/DataFetcher.thread'))
-    }
+    if (this.thread) Thread.terminate(this.thread)
+    this.thread = await spawn(new Worker('../workers/DataFetcher.thread'))
 
     try {
-      const data = await this.solverThread.fetchData({
+      const data = await this.thread.fetchData({
         fileSystemConfig: this.fileSystemConfig,
         subfolder: this.subfolder,
         files: this.files,
@@ -54,7 +53,7 @@ export default class VueComponent extends Vue {
       console.log(message)
       this.dataRows = {}
     } finally {
-      Thread.terminate(this.solverThread)
+      Thread.terminate(this.thread)
     }
   }