From 599602e03f01cbb9b020752e4c409d45f5ada602 Mon Sep 17 00:00:00 2001
From: Stefan Peters <stefandesu@exo.pm>
Date: Tue, 1 Mar 2022 11:22:11 +0100
Subject: [PATCH] ConceptList: Also watch list of ancestors to fix race
 condition (#670)

---
 src/components/ConceptList.vue | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/ConceptList.vue b/src/components/ConceptList.vue
index 45416af2..68e783ad 100644
--- a/src/components/ConceptList.vue
+++ b/src/components/ConceptList.vue
@@ -147,6 +147,18 @@ export default {
     otherScheme() {
       return getItem(this.selected.scheme[!this.isLeft])
     },
+    ancestors() {
+      const ancestors = this.conceptSelectedFromStore && this.conceptSelectedFromStore.ancestors
+      if (!ancestors) {
+        return null
+      }
+      return ancestors.map(ancestor => {
+        if (!ancestor) {
+          return ancestor
+        }
+        return getItem(ancestor)
+      })
+    },
   },
   watch: {
     conceptSelectedFromStore: {
@@ -155,6 +167,13 @@ export default {
       },
       deep: true,
     },
+    // We need to watch ancestors as well because the previous watcher does not cover ancestors more than one step away.
+    ancestors: {
+      handler() {
+        this.conceptSelectedUpdated()
+      },
+      deep: true,
+    },
     shown() {
       this.conceptSelectedUpdated()
     },
@@ -272,10 +291,9 @@ export default {
       }
       if (this.$jskos.isConcept(concept)) {
         // Check if concept is fully loaded
-        if (!this.showChildren || (concept.ancestors && !concept.ancestors.includes(null))) {
+        if (!this.showChildren || (this.ancestors && !this.ancestors.includes(null))) {
           let fullyLoaded = true
-          for (let ancestor of concept.ancestors || []) {
-            ancestor = getItem(ancestor)
+          for (let ancestor of this.ancestors || []) {
             if (this.showChildren && (!ancestor.narrower || ancestor.narrower.includes(null))) {
               fullyLoaded = false
             }
@@ -284,7 +302,7 @@ export default {
             this.shouldScroll = false
             // Open ancestors
             if (this.showChildren) {
-              for (let ancestor of concept.ancestors || []) {
+              for (let ancestor of this.ancestors || []) {
                 this.open(ancestor, this.isLeft, true)
               }
             }