Fix #4026

SpeciesFileGroup · Oct 11, 2024 · 000daca · 000daca
1 parent 497e7bc
commit 000daca
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - Unify objects task [#970]
 - Attribution to ObservationMatrix
+- New biological association task [#4026]
 
 ### Changed
 
@@ -21,6 +22,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - New dichotomous key: Radial annotator is not loading the correct data [#4076]
 
 [#970]: https://github.com/SpeciesFileGroup/taxonworks/issues/4074
+[#4026]: https://github.com/SpeciesFileGroup/taxonworks/issues/4026
 [#4074]: https://github.com/SpeciesFileGroup/taxonworks/issues/4074
 [#4076]: https://github.com/SpeciesFileGroup/taxonworks/issues/4076
 

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -111,4 +111,4 @@ import '../vue/tasks/observation_matrices/import_nexus/main.js'
 import '../vue/tasks/dwc_occurrences/filter/main.js'
 import '../vue/tasks/unify/objects/main.js'
 import '../vue/tasks/images/new_filename_depicting_image/main.js'
-import '../vue/tasks/biological_associations/new_biological_association/main.js'
+import '../vue/tasks/biological_associations/new/main.js'
diff --git a/...ations/new_biological_association/app.vue → ...tasks/biological_associations/new/app.vue b/...ations/new_biological_association/app.vue → ...tasks/biological_associations/new/app.vue
@@ -17,13 +17,6 @@
           <span v-else>New record</span>
         </div>
         <div class="horizontal-center-content middle gap-small">
-          <label class="middle">
-            <input
-              v-model="store.autosave"
-              type="checkbox"
-            />
-            Autosave
-          </label>
           <VBtn
             medium
             color="create"
@@ -61,7 +54,10 @@
       />
       <PanelCitation />
     </div>
-    <TableResults :list="store.biologicalAssociations" />
+    <TableResults
+      :list="store.biologicalAssociations"
+      @select="store.setBiologicalAssociation"
+    />
   </div>
 </template>
 

diff --git a/...iation/components/Panel/PanelCitation.vue → ...ns/new/components/Panel/PanelCitation.vue b/...iation/components/Panel/PanelCitation.vue → ...ns/new/components/Panel/PanelCitation.vue
diff --git a/...ociation/components/Panel/PanelObject.vue → ...ions/new/components/Panel/PanelObject.vue b/...ociation/components/Panel/PanelObject.vue → ...ions/new/components/Panel/PanelObject.vue
diff --git a/...on/components/Panel/PanelRelationship.vue → ...ew/components/Panel/PanelRelationship.vue b/...on/components/Panel/PanelRelationship.vue → ...ew/components/Panel/PanelRelationship.vue
diff --git a/...l_association/components/TableResults.vue → ...ociations/new/components/TableResults.vue b/...l_association/components/TableResults.vue → ...ociations/new/components/TableResults.vue
@@ -6,17 +6,20 @@
           <th>Subject</th>
           <th>Relationship</th>
           <th>Object</th>
+          <th>Citation</th>
           <th class="w-2" />
         </tr>
       </thead>
       <tbody>
         <tr
           v-for="item in list"
           :key="item.id"
+          @click="() => emit('select', item)"
         >
           <td v-html="item.subject.object_tag" />
           <td v-html="item.relationship.object_tag" />
           <td v-html="item.object.object_tag" />
+          <td v-html="item.citation.object_label" />
           <td>
             <div>
               <VBtn
@@ -46,4 +49,6 @@ defineProps({
     default: () => []
   }
 })
+
+const emit = defineEmits(['select'])
 </script>
diff --git a/...ations/new_biological_association/main.js → ...tasks/biological_associations/new/main.js b/...ations/new_biological_association/main.js → ...tasks/biological_associations/new/main.js
diff --git a/...new_biological_association/store/store.js → ...iological_associations/new/store/store.js b/...new_biological_association/store/store.js → ...iological_associations/new/store/store.js
@@ -28,7 +28,8 @@ function makeBiologicalAssociationItem(item) {
     relationship: {
       id: item.biological_relationship_id,
       object_tag: item.biological_relationship.object_tag
-    }
+    },
+    citation: item.citations?.[0] || makeCitation()
   }
 }
 
@@ -72,8 +73,7 @@ export const useStore = defineStore('NewBiologicalAssociation', {
     object: null,
     subject: null,
     relationship: null,
-    isLoading: false,
-    autosave: true
+    isLoading: false
   }),
 
   getters: {
@@ -88,6 +88,14 @@ export const useStore = defineStore('NewBiologicalAssociation', {
   },
 
   actions: {
+    setBiologicalAssociation(ad) {
+      this.biologicalAssociation = makeBiologicalAssociation(ad)
+      this.object = ad.object
+      this.subject = ad.subject
+      this.relationship = ad.relationship
+      this.citation = ad.citation
+    },
+
     async loadRecentBiologicalAssociations() {
       BiologicalAssociation.where({
         recent: true,