Merge pull request #184 from SpeciesFileGroup/development

Update type designation panel
sfg-taxonpages · Oct 30, 2023 · 383c6f2 · 383c6f2
2 parents b9c4a0d + 23830d1
commit 383c6f2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/src/modules/otus/components/Panel/PanelTypeDesignation/PanelTypeDesignation.vue b/src/modules/otus/components/Panel/PanelTypeDesignation/PanelTypeDesignation.vue
@@ -11,10 +11,9 @@
 </template>
 
 <script setup>
-import { ref, watch, computed } from 'vue'
-import { useOtuPageRequest } from '@/modules/otus/helpers/useOtuPageRequest'
+import { computed } from 'vue'
+import { useOtuStore } from '@/modules/otus/store/store'
 import PanelDropdown from '../PanelDropdown.vue'
-import TaxonWorks from '../../../services/TaxonWorks'
 
 const props = defineProps({
   taxonId: {
@@ -23,27 +22,16 @@ const props = defineProps({
   }
 })
 
-const typeDesignation = ref({})
+const store = useOtuStore()
+
+const typeDesignation = computed(
+  () => store.taxon?.type_taxon_name_relationship || {}
+)
 const typeDesignationLabel = computed(() =>
   [
     typeDesignation.value.subject_object_tag || '',
     typeDesignation.value.subject_status_tag || '',
     typeDesignation.value.object_object_tag || ''
   ].join(' ')
 )
-
-watch(
-  () => props.taxonId,
-  async () => {
-    if (!props.taxonId) {
-      return
-    }
-    useOtuPageRequest('panel:type', () =>
-      TaxonWorks.getTaxonTypeDesignation(props.taxonId)
-    ).then(({ data }) => {
-      typeDesignation.value = data.type_taxon_name_relationship || {}
-    })
-  },
-  { immediate: true }
-)
 </script>
diff --git a/src/modules/otus/store/actions/index.js b/src/modules/otus/store/actions/index.js
diff --git a/src/modules/otus/store/store.js b/src/modules/otus/store/store.js
@@ -23,11 +23,14 @@ export const useOtuStore = defineStore('otuStore', {
   },
   actions: {
     async loadTaxon(id, { signal }) {
-      const taxon = await useOtuPageRequest('summary', () =>
-        TaxonWorks.summary(id, { signal })
-      )
+      const responses = await Promise.all([
+        TaxonWorks.getTaxon(id, {
+          params: { extend: ['type_taxon_name_relationship'] }
+        }),
+        useOtuPageRequest('summary', () => TaxonWorks.summary(id, { signal }))
+      ])
 
-      this.taxon = taxon.data
+      this.taxon = Object.assign({}, ...responses.map((r) => r.data))
     },
     async loadOtu(id, { signal }) {
       const otu = await TaxonWorks.getOtu(id, { signal })