From c44e4e1dd6de6b9abc9a109e505fd85aa8f135ea Mon Sep 17 00:00:00 2001
From: dmeidlin <14339308+dmeidlin@users.noreply.github.com>
Date: Thu, 16 Sep 2021 15:58:36 -0400
Subject: [PATCH 1/8] [BI-982] resolve merge conflicts after rebase

---
 src/views/trait/TraitsImport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trait/TraitsImport.vue b/src/views/trait/TraitsImport.vue
index a45f76214..1bc3ebedc 100644
--- a/src/views/trait/TraitsImport.vue
+++ b/src/views/trait/TraitsImport.vue
@@ -48,7 +48,7 @@
     <template v-if="state === ImportState.CHOOSE_FILE || state === ImportState.FILE_CHOSEN">
       <h1 class="title" v-if="showTitle">Import Traits</h1>
       <ImportInfoTemplateMessageBox v-bind:import-type-name="'Trait'"
-                                    v-bind:template-url="'https://cornell.box.com/shared/static/8sp0qvccpjotosiv8576tczeg09nnvao.xls'"
+                                    v-bind:template-url="'https://cornell.box.com/shared/static/u9vuob3vvu2cgwyoe26b2722u41b8f6o.xls'"
                                     class="mb-5">
         <strong>Before You Import...</strong>
         <br/>Prepare ontology information for import using the provided template.

From 1efcf6179b299396fc03330ba3c7aca27f823513 Mon Sep 17 00:00:00 2001
From: rob-ouser-bi <bidevteam@cornell.edu>
Date: Thu, 16 Sep 2021 20:03:17 +0000
Subject: [PATCH 2/8] [autocommit] bumping build number

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d32e94028..716097c45 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bi-web",
-  "version": "v0.4.0+150",
+  "version": "v0.4.0+152",
   "private": true,
   "scripts": {
     "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none",
@@ -85,5 +85,5 @@
     "vue-cli-plugin-axios": "0.0.4",
     "vue-template-compiler": "^2.6.10"
   },
-  "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/df5d79f07fa717c123ca895aa9877bc6aee4eca8"
+  "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/c44e4e1dd6de6b9abc9a109e505fd85aa8f135ea"
 }

From d723fa65dd21d555879d22e41280d0e9e8980a96 Mon Sep 17 00:00:00 2001
From: HMS17 <84345306+HMS17@users.noreply.github.com>
Date: Fri, 17 Sep 2021 09:12:28 -0400
Subject: [PATCH 3/8] [BI-997 BI-1061] Import Ontology Changes (clean redo)

---
 src/components/trait/TraitsImportTable.vue | 15 ++++++++++-----
 src/views/trait/TraitsImport.vue           |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/trait/TraitsImportTable.vue b/src/components/trait/TraitsImportTable.vue
index 30e9ceed2..587ba3de4 100644
--- a/src/components/trait/TraitsImportTable.vue
+++ b/src/components/trait/TraitsImportTable.vue
@@ -37,17 +37,22 @@
       -->
       <template v-slot:columns="data">
         <TableColumn name="name" v-bind:label="'Name'">
-          {{ data.traitName }}
+          {{ data.observationVariableName }}
         </TableColumn>
-        <TableColumn name="level" v-bind:label="'Level'" v-bind:visible="!collapseColumns">
-          {{ data.programObservationLevel.name }}
+        <TableColumn name="trait" v-bind:label="'Trait'" v-bind:visible="!collapseColumns">
+          {{ StringFormatters.toStartCase(data.traitDescription) }}
         </TableColumn>
         <TableColumn name="method" v-bind:label="'Method'" v-bind:visible="!collapseColumns">
-          {{ StringFormatters.toStartCase(data.method.methodClass) }}
+          {{ data.method.description + " " + StringFormatters.toStartCase(data.method.methodClass) }}
         </TableColumn>
-        <TableColumn name="scale" v-bind:label="'Scale'" v-bind:visible="!collapseColumns">
+        <TableColumn name="scaleClass" v-bind:label="'Scale Class'" v-bind:visible="!collapseColumns">
           {{ TraitStringFormatters.getScaleTypeString(data.scale) }}
         </TableColumn>
+        <TableColumn name="unit" v-bind:label="'Unit'" v-bind:visible="!traitSidePanelState.collapseColumns">
+          <template v-if="data.scale.dataType==='NUMERICAL'">
+            {{ data.scale.scaleName }}
+          </template>
+        </TableColumn>
       </template>
 
       <!-- 
diff --git a/src/views/trait/TraitsImport.vue b/src/views/trait/TraitsImport.vue
index a45f76214..4f6401b0d 100644
--- a/src/views/trait/TraitsImport.vue
+++ b/src/views/trait/TraitsImport.vue
@@ -46,8 +46,8 @@
     </WarningModal>
 
     <template v-if="state === ImportState.CHOOSE_FILE || state === ImportState.FILE_CHOSEN">
-      <h1 class="title" v-if="showTitle">Import Traits</h1>
-      <ImportInfoTemplateMessageBox v-bind:import-type-name="'Trait'"
+      <h1 class="title" v-if="showTitle">Import Ontology</h1>
+      <ImportInfoTemplateMessageBox v-bind:import-type-name="'Ontology'"
                                     v-bind:template-url="'https://cornell.box.com/shared/static/8sp0qvccpjotosiv8576tczeg09nnvao.xls'"
                                     class="mb-5">
         <strong>Before You Import...</strong>
@@ -67,7 +67,7 @@
     
     <template v-if="state === ImportState.LOADING || state === ImportState.CURATE">
       <template v-if="tableLoaded">
-        <h1 class="title">Curate and Confirm New Traits</h1>
+        <h1 class="title">Confirm New Ontology Term</h1>
         <ConfirmImportMessageBox v-bind:num-traits="numTraits"
                                     v-on:abort="showAbortModal = true" 
                                     v-on:confirm="importService.send(ImportEvent.CONFIRMED)"

From 3573dbc0653bba89094f06373867a4d6d8c62299 Mon Sep 17 00:00:00 2001
From: HMS17 <84345306+HMS17@users.noreply.github.com>
Date: Fri, 17 Sep 2021 09:31:23 -0400
Subject: [PATCH 4/8] [BI-997 BI-1061] Modal and banner wording fix

---
 src/views/trait/TraitsImport.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/trait/TraitsImport.vue b/src/views/trait/TraitsImport.vue
index 4f6401b0d..f46e46722 100644
--- a/src/views/trait/TraitsImport.vue
+++ b/src/views/trait/TraitsImport.vue
@@ -24,7 +24,7 @@
     >
       <section>
         <p class="has-text-dark" :class="this.$modalTextClass">
-          No traits will be added, and the import in progress will be completely removed.
+          No ontology terms will be added, and the import in progress will be completely removed.
         </p>
       </section>
       <div class="columns">
@@ -322,7 +322,7 @@ export default class TraitsImport extends ProgramsBase {
       await TraitUploadService.confirmUpload(this.activeProgram!.id!, upload!.id!);
 
       // show all program traits
-      this.$emit('show-success-notification', `Imported traits have been added to ${name}.`);
+      this.$emit('show-success-notification', `Imported ontology terms have been added to ${name}.`);
       this.$router.push({
         name: 'traits-list',
         params: {
@@ -330,7 +330,7 @@ export default class TraitsImport extends ProgramsBase {
         },
       });
     } catch(err) {
-      const note = err.message ? err.message : `Error: Imported traits were not added to ${name}.`;
+      const note = err.message ? err.message : `Error: Imported ontology terms were not added to ${name}.`;
       this.$emit('show-error-notification', `${note}`);
       Vue.$log.error(err);
     }

From d33623aadda412d15f9b0d9ffb26cc10905a9d8a Mon Sep 17 00:00:00 2001
From: HMS17 <84345306+HMS17@users.noreply.github.com>
Date: Fri, 17 Sep 2021 10:13:30 -0400
Subject: [PATCH 5/8] [BI-997 BI-1061] Fixing unit test

---
 tests/unit/components/tables/SidePanelTable.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/components/tables/SidePanelTable.spec.ts b/tests/unit/components/tables/SidePanelTable.spec.ts
index 203317934..3f19ab4a6 100644
--- a/tests/unit/components/tables/SidePanelTable.spec.ts
+++ b/tests/unit/components/tables/SidePanelTable.spec.ts
@@ -42,7 +42,7 @@ function setup() {
   const scale = new Scale('Test Scale', 'Number', undefined, 3, 0, 999);
   const level = new ProgramObservationLevel('Plant');
   const range = [...Array(200).keys()];
-  traits = range.map((i:number) => new Trait(i.toString(), `Trait${i}`, undefined, level, undefined, undefined, undefined, method, scale));
+  traits = range.map((i:number) => new Trait(i.toString(), `Trait${i}`, `Trait${i}`, level, undefined, undefined, undefined, method, scale));
 
   const response = DaoUtils.formatBiResponse(traits);
 

From 571cd05a8fc79a0b7134cc85a4d011a367d1824d Mon Sep 17 00:00:00 2001
From: HMS17 <84345306+HMS17@users.noreply.github.com>
Date: Fri, 17 Sep 2021 14:03:57 -0400
Subject: [PATCH 6/8] [BI-994] code review fixes

---
 src/breeding-insight/service/TraitUploadService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/breeding-insight/service/TraitUploadService.ts b/src/breeding-insight/service/TraitUploadService.ts
index 79210b680..b44548f1e 100644
--- a/src/breeding-insight/service/TraitUploadService.ts
+++ b/src/breeding-insight/service/TraitUploadService.ts
@@ -28,7 +28,7 @@ export class TraitUploadService {
 
   static errorContactingServer: string = "Unknown error when contacting server. Please try again.";
   static errorUnknown: string = "Unable to determine reason for failure upload. Please check file and try again.";
-  static forbiddenUploadingFile: string = "You do not have permission to upload traits";
+  static forbiddenUploadingFile: string = "You do not have permission to upload ontology terms";
 
   static async deleteTraits(programId: string): Promise<void|Error> {
     try {
@@ -114,7 +114,7 @@ export class TraitUploadService {
       await TraitUploadDAO.confirmUpload(programId, traitUploadId);
       return;
     } catch (error) {
-      throw 'Error saving traits';
+      throw 'Error saving ontology terms';
     }
   }
 

From f45fc7576a12839f5217b9eae606fe9d7a9a7eca Mon Sep 17 00:00:00 2001
From: HMS17 <84345306+HMS17@users.noreply.github.com>
Date: Fri, 17 Sep 2021 14:16:20 -0400
Subject: [PATCH 7/8] Restore ontology import template link

---
 src/views/trait/TraitsImport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trait/TraitsImport.vue b/src/views/trait/TraitsImport.vue
index f46e46722..b3cc44f6c 100644
--- a/src/views/trait/TraitsImport.vue
+++ b/src/views/trait/TraitsImport.vue
@@ -48,7 +48,7 @@
     <template v-if="state === ImportState.CHOOSE_FILE || state === ImportState.FILE_CHOSEN">
       <h1 class="title" v-if="showTitle">Import Ontology</h1>
       <ImportInfoTemplateMessageBox v-bind:import-type-name="'Ontology'"
-                                    v-bind:template-url="'https://cornell.box.com/shared/static/8sp0qvccpjotosiv8576tczeg09nnvao.xls'"
+                                    v-bind:template-url="'https://cornell.box.com/shared/static/u9vuob3vvu2cgwyoe26b2722u41b8f6o.xls'"
                                     class="mb-5">
         <strong>Before You Import...</strong>
         <br/>Prepare ontology information for import using the provided template.

From 2393d1d025d7a0d6046975b7c1ec7b9487346cdc Mon Sep 17 00:00:00 2001
From: rob-ouser-bi <bidevteam@cornell.edu>
Date: Fri, 17 Sep 2021 18:32:28 +0000
Subject: [PATCH 8/8] [autocommit] bumping build number

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 716097c45..6dec766df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bi-web",
-  "version": "v0.4.0+152",
+  "version": "v0.4.0+154",
   "private": true,
   "scripts": {
     "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none",
@@ -85,5 +85,5 @@
     "vue-cli-plugin-axios": "0.0.4",
     "vue-template-compiler": "^2.6.10"
   },
-  "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/c44e4e1dd6de6b9abc9a109e505fd85aa8f135ea"
+  "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/c844a2adadf300738dde3ee777a648613416e1c2"
 }