From 7b28a0430d63b19b8a1bc72630ee7787575601f4 Mon Sep 17 00:00:00 2001
From: HMS17 <hms243@cornell.edu>
Date: Tue, 9 Jan 2024 11:57:48 -0500
Subject: [PATCH] [BI-1868] - Ontology: Display full name in table and details
 pane

---
 src/breeding-insight/model/Sort.ts          |  6 ++++--
 src/breeding-insight/model/TraitSelector.ts |  3 ++-
 src/components/ontology/OntologyTable.vue   |  3 +++
 src/components/trait/TraitDetailPanel.vue   |  9 +++++++++
 src/components/trait/TraitsImportTable.vue  | 14 ++++++++++++++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/breeding-insight/model/Sort.ts b/src/breeding-insight/model/Sort.ts
index 771116f7c..08e81aa2d 100644
--- a/src/breeding-insight/model/Sort.ts
+++ b/src/breeding-insight/model/Sort.ts
@@ -48,7 +48,8 @@ export enum TraitSortField {
   Name = 'name',
   MethodDescription = 'methodDescription',
   ScaleClass = 'scaleClass',
-  ScaleName = 'scaleName'
+  ScaleName = 'scaleName',
+  FullName = 'fullName'
 }
 
 // ontology
@@ -58,7 +59,8 @@ export enum OntologySortField {
   ScaleClass = 'scaleClass',
   ScaleName = 'scaleName',
   entityAttributeSortLabel = 'entityAttribute',
-  TermType = 'termType'
+  TermType = 'termType',
+  FullName = 'fullName'
 }
 
 export class OntologySort {
diff --git a/src/breeding-insight/model/TraitSelector.ts b/src/breeding-insight/model/TraitSelector.ts
index 9f4ce8569..5a01633a1 100644
--- a/src/breeding-insight/model/TraitSelector.ts
+++ b/src/breeding-insight/model/TraitSelector.ts
@@ -23,7 +23,8 @@ export enum TraitField {
   UPDATED_BY_USER_ID = 'updatedByUserId',
   UPDATED_BY_USER_NAME = 'updatedByUserName',
   TERM_TYPE = 'termType',
-  ENTITY_ATTRIBUTE = 'entityAttribute'
+  ENTITY_ATTRIBUTE = 'entityAttribute',
+  FULL_NAME = 'fullName'
 }
 
 export enum TermType {
diff --git a/src/components/ontology/OntologyTable.vue b/src/components/ontology/OntologyTable.vue
index 65af15899..1d34d29d0 100644
--- a/src/components/ontology/OntologyTable.vue
+++ b/src/components/ontology/OntologyTable.vue
@@ -109,6 +109,9 @@
       <b-table-column :field="traitField.NAME" label="Name" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
         {{ props.row.data.observationVariableName }}
       </b-table-column>
+      <b-table-column :field="traitField.FULL_NAME" label="Full Name" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
+        {{ props.row.data.fullName }}
+      </b-table-column>
       <b-table-column :field="traitField.TERM_TYPE" label="Term Type" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
         {{ TraitStringFormatters.getTermTypeString(props.row.data.termType) }}
       </b-table-column>
diff --git a/src/components/trait/TraitDetailPanel.vue b/src/components/trait/TraitDetailPanel.vue
index 5c5e81a7a..ee11a0cb5 100644
--- a/src/components/trait/TraitDetailPanel.vue
+++ b/src/components/trait/TraitDetailPanel.vue
@@ -23,6 +23,15 @@
         <span v-if="!data.active" class="tag is-link is-normal ml-1">Archived</span>
       </p><br>
 
+      <div v-if="data.fullName" class="columns is-desktop pt-1 pl-3">
+        <div class="column is-one-third pt-0 pb-0 has-text-right-desktop">
+          <span class="has-text-weight-bold">Full Name</span>
+        </div>
+        <div class="column pt-0 pb-0">
+          <span class="is-size-7 mb-0">{{data.fullName}}</span>
+        </div>
+      </div>
+
       <div v-if="data.traitDescription" class="columns is-desktop pt-1 pl-3">
         <div class="column is-one-third pt-0 pb-0 has-text-right-desktop">
           <span class="has-text-weight-bold">Description</span>
diff --git a/src/components/trait/TraitsImportTable.vue b/src/components/trait/TraitsImportTable.vue
index 3b01d8dbe..201009026 100644
--- a/src/components/trait/TraitsImportTable.vue
+++ b/src/components/trait/TraitsImportTable.vue
@@ -54,6 +54,19 @@
             </AlertTriangleIcon>
           {{ data.observationVariableName }}
         </TableColumn>
+        <TableColumn
+            name="fullName"
+            v-bind:label="'Full Name'"
+            v-bind:visible="!collapseColumns"
+            v-bind:sortField="importPreviewOntologySort.field"
+            v-bind:sortFieldLabel="fullNameSortLabel"
+            v-bind:sortable="true"
+            v-bind:sortOrder="importPreviewOntologySort.order"
+            v-on:newSortColumn="newSortColumn"
+            v-on:toggleSortOrder="toggleSortOrder"
+        >
+          {{ data.fullName }}
+        </TableColumn>
         <TableColumn
             name="termType"
             v-bind:label="'Term Type'"
@@ -233,6 +246,7 @@ export default class TraitsImportTable extends Vue {
   private unitSortLabel: string = OntologySortField.ScaleName;
   private entityAttributeSortLabel: string = OntologySortField.entityAttributeSortLabel;
   private termTypeSortLabel: string = OntologySortField.TermType;
+  private fullNameSortLabel: string = OntologySortField.FullName;
 
   mounted() {
     this.updatePagination();