Merge pull request #90 from mapswipe/fix/remove-group-and-task-listeners

Fix/remove group and task listeners

Author: frozenhelium

src/views/ProjectView.vue

@@ -1,8 +1,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { goOffline, goOnline, off, onValue, set } from 'firebase/database'
+import { get, off, onValue, set } from 'firebase/database'
 import {
-  db,
   getGroupsQuery,
   getProjectRef,
   getProjectContributionsRef,
@@ -54,7 +53,6 @@ export default defineComponent({
       tutorial: null,
       tutorialTasks: null,
       to: null,
-      unsubscribeGroup: null,
     }
   },
   provide() {
@@ -92,7 +90,6 @@ export default defineComponent({
 
         this.completedGroupId = this.group.groupId
 
-        goOnline(db)
         set(getResultsRef(this.project.projectId, this.group.groupId, this.user.uid), entry)
           .then(() => {
             this.showSnackbar(
@@ -117,7 +114,7 @@ export default defineComponent({
   computed: {
     ...mapStores(useCurrentUserStore),
     options() {
-      const options = this.project?.customOptions ?? this.project?.answerLabels;
+      const options = this.project?.customOptions ?? this.project?.answerLabels
       const completedOptions = options?.map(this.completeOptions)
       return completedOptions
     },
@@ -156,37 +153,36 @@ export default defineComponent({
         this.projectContributions = data
       })
     },
-    bindTaskGroup() {
-      this.unsubscribeGroup = onValue(getGroupsQuery(this.projectId), (snapshot) => {
-        const data = snapshot.val() || {}
-        const flatGroups = Object.values(data).flat()
-        const completed = Object.keys(this.projectContributions)
-        const available = flatGroups.filter(
-          (g) => g.requiredCount > 0 && !completed.includes(g.groupId),
+    async bindTaskGroup() {
+      this.tasks = null
+      const snapshot = await get(getGroupsQuery(this.projectId))
+      const data = snapshot.val() || {}
+      const flatGroups = Object.values(data).flat()
+      const completed = Object.keys(this.projectContributions)
+      const available = flatGroups.filter(
+        (g) => g.requiredCount > 0 && !completed.includes(g.groupId),
+      )
+      if (!available.length) {
+        this.nextDialog = false
+        this.to = this.i18nRoute({ name: 'projects' })
+        this.showDialog(
+          this.$t('projectView.noTasksAvailable'),
+          this.$t('projectView.goBackToProjects', { user: this.user.displayName }),
+          this.leaveProject,
+          true,
+          false,
         )
-        if (!available.length) {
-          this.nextDialog = false
-          this.to = this.i18nRoute({ name: 'projects' })
-          this.showDialog(
-            this.$t('projectView.noTasksAvailable'),
-            this.$t('projectView.goBackToProjects', { user: this.user.displayName }),
-            this.leaveProject,
-            true,
-            false,
-          )
-        } else {
-          this.hideDialog()
-        }
-        const random = available[Math.floor(Math.random() * available.length)]
-        this.group = random
-        this.bindTasks()
-      })
+      } else {
+        this.hideDialog()
+      }
+      const random = available[Math.floor(Math.random() * available.length)]
+      this.group = random
+      await this.bindTasks()
     },
-    bindTasks() {
-      onValue(getTasksRef(this.projectId, this.group?.groupId), (snapshot) => {
-        const data = snapshot.val()
-        this.tasks = decompressTasks(data)
-      })
+    async bindTasks() {
+      const snapshot = await get(getTasksRef(this.projectId, this.group?.groupId))
+      const data = snapshot.val()
+      this.tasks = decompressTasks(data)
     },
     bindTutorial(tutorialId) {
       onValue(getProjectRef(tutorialId), (snapshot) => {
@@ -195,12 +191,11 @@ export default defineComponent({
         this.bindTutorialTasks(tutorialId)
       })
     },
-    bindTutorialTasks(tutorialId) {
-      onValue(getTasksRef(tutorialId, '101'), (snapshot) => {
-        const data = snapshot.val()
-        this.tutorialTasks = decompressTasks(data)
-        this.mode = 'contribute'
-      })
+    async bindTutorialTasks(tutorialId) {
+      const snapshot = await get(getTasksRef(tutorialId, '101'))
+      const data = snapshot.val()
+      this.tutorialTasks = decompressTasks(data)
+      this.mode = 'contribute'
     },
     completeOptions(option, index) {
       option.title ??= option.label
@@ -213,13 +208,9 @@ export default defineComponent({
         this.matchIcon(option.icon) || option.icon || `mdi-numeric-${option.shortkey}-box`
       return option
     },
-    continueMapping() {
+    async continueMapping() {
       this.nextDialog = false
-      // Disconnect and reconnect to force fresh group data
-      if (this.unsubscribeGroup) {
-        this.unsubscribeGroup()
-      }
-      this.bindTaskGroup()
+      await this.bindTaskGroup()
       this.mode = 'contribute'
     },
     i18nRoute,
@@ -233,9 +224,7 @@ export default defineComponent({
       if (!this.completedGroupId) {
         return true
       } else {
-        const updated =
-          this.projectContributions[this.completedGroupId] &&
-          this.completedGroupId !== this.group?.groupId
+        const updated = Boolean(this.projectContributions?.[this.completedGroupId])
         /*
           Firebase rejects results that are produced at a speed of less than 125 ms per task. Therefore, we do not wait for
           updated projectContributions for speedy results.
@@ -244,9 +233,6 @@ export default defineComponent({
         return updated || tooSpeedy
       }
     },
-    handleTaskComponentCreated() {
-      goOffline(db)
-    },
   },
   beforeRouteLeave(to, from, next) {
     if (this.mode === 'contribute' && to.name !== 'authentication') {
@@ -259,9 +245,7 @@ export default defineComponent({
       )
     } else {
       off(getProjectRef(this.projectId))
-      off(getGroupsQuery(this.projectId))
       off(getProjectContributionsRef(this.user.uid, this.projectId))
-      goOnline(db)
       next()
     }
   },
@@ -286,7 +270,7 @@ export default defineComponent({
       :tasks="tasks"
       :tutorial="tutorial"
       :tutorialTasks="tutorialTasks"
-      @created="handleTaskComponentCreated"
+      :key="group.groupId"
     />
 
     <v-dialog v-model="nextDialog" max-width="600" persistent>