Show only current name citations for invalid names

wbbaker · Nov 8, 2022 · 4970ed3 · 4970ed3
1 parent 5083505
commit 4970ed3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/src/modules/otus/components/Panel/PanelCitation/PanelCitation.vue b/src/modules/otus/components/Panel/PanelCitation/PanelCitation.vue
@@ -17,8 +17,8 @@
       <CitationRow
         v-for="citation in citationList.first"
         :key="citation.id"
-        :citation="citation"
         ref="rowRefs"
+        :citation="citation"
       />
 
       <CitationRowShowMore
@@ -31,17 +31,17 @@
           <CitationRow
             v-for="citation in citationList.middle"
             :key="citation.id"
-            :citation="citation"
             ref="rowRefs"
+            :citation="citation"
           />
         </div>
       </AnimationOpacity>
 
       <CitationRow
         v-for="citation in citationList.last"
         :key="citation.id"
-        :citation="citation"
         ref="rowRefs"
+        :citation="citation"
         class="last:border-b-0"
       />
     </div>
@@ -60,6 +60,11 @@ const props = defineProps({
   otuId: {
     type: [Number, String],
     required: true
+  },
+
+  taxon: {
+    type: Object,
+    required: true
   }
 })
 
@@ -100,12 +105,13 @@ watch(
   () => props.otuId,
   async () => {
     if (!props.otuId) { return }
+    const list = (await TaxonWorks.getTaxonNameCitations(props.otuId)).data
 
-    citations.value = (await TaxonWorks.getTaxonNameCitations(props.otuId)).data
+    citations.value = !props.taxon.is_valid
+      ? list.filter(c => c.names.includes(props.taxon.full_name_tag))
+      : list
   },
-  {
-    immediate: true
-  }
+  { immediate: true }
 )
 
 const changeRowExpandedState = value => {

diff --git a/src/modules/otus/constants/overviewLayout.js b/src/modules/otus/constants/overviewLayout.js
@@ -10,8 +10,8 @@ import PanelStatus from '../components/Panel/PanelStatus/PanelStatus.vue'
 
 export const overviewLayout = {
   left: [
-    { component: PanelGallery },
     { component: PanelStatus },
+    { component: PanelGallery },
     {
       component: PanelTypeSpecimen,
       available: [SPECIES_GROUP]

diff --git a/src/modules/otus/views/Index.vue b/src/modules/otus/views/Index.vue
@@ -71,6 +71,7 @@
           v-if="taxon.id && otu.id"
           :key="route.fullPath"
           :taxon-id="taxon.id"
+          :taxon="taxon"
           :taxon-rank="taxon.rank_string"
           :otu-id="otu.id"
         />

diff --git a/src/modules/otus/views/Overview.vue b/src/modules/otus/views/Overview.vue
@@ -11,6 +11,7 @@
             v-if="!available || isComponentForRank(available, taxonRank)"
             :otu-id="otuId"
             :taxon-id="taxonId"
+            :taxon="taxon"
           />
         </template>
       </div>
@@ -24,6 +25,7 @@
             v-if="!available || isComponentForRank(available, taxonRank)"
             :otu-id="otuId"
             :taxon-id="taxonId"
+            :taxon="taxon"
           />
         </template>
       </div>
@@ -48,6 +50,11 @@ defineProps({
   otuId: {
     type: [Number, String],
     required: true
+  },
+
+  taxon: {
+    type: Object,
+    required: true
   }
 })