From dccb62aab913ae3f0448b9d6b11f5e1cfef1a903 Mon Sep 17 00:00:00 2001
From: HMS17 <84345306+HMS17@users.noreply.github.com>
Date: Wed, 14 Sep 2022 14:20:14 -0400
Subject: [PATCH 1/6] [BI-1473] - Allow user to append existing germplasm with
 optional details

---
 src/views/import/ImportGermplasm.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/import/ImportGermplasm.vue b/src/views/import/ImportGermplasm.vue
index c7712c145..63d5fff5d 100644
--- a/src/views/import/ImportGermplasm.vue
+++ b/src/views/import/ImportGermplasm.vue
@@ -96,13 +96,18 @@
             v-bind:rowClasses="constructRowClasses(previewData.import)"
             v-on:show-error-notification="$emit('show-error-notification', $event)"
         >
-          <b-table-column field="defaultDisplayName" label="Name" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
+          <b-table-column v-slot="props" :th-attrs="(column) => ({scope:'col'})">
             <AlertTriangleIcon
                 size="1x"
                 class="has-vertical-align-middle"
                 v-if="props.row.data.state === ImportObjectState.EXISTING"
             >
             </AlertTriangleIcon>
+          </b-table-column>
+          <b-table-column field="gid" label="GID" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
+            {{ props.row.data.brAPIObject.gid }}
+          </b-table-column>
+          <b-table-column field="defaultDisplayName" label="Name" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
             {{ props.row.data.brAPIObject.defaultDisplayName }}
           </b-table-column>
           <b-table-column field="breedingMethod" label="Breeding Method" v-slot="props" :th-attrs="(column) => ({scope:'col'})">

From c69ea6d5396981d36576e4e4e13a4dc002cfed1e Mon Sep 17 00:00:00 2001
From: HMS17 <84345306+HMS17@users.noreply.github.com>
Date: Wed, 14 Sep 2022 15:58:24 -0400
Subject: [PATCH 2/6] Update download link and test files

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

diff --git a/src/views/import/ImportGermplasm.vue b/src/views/import/ImportGermplasm.vue
index 63d5fff5d..01098d06d 100644
--- a/src/views/import/ImportGermplasm.vue
+++ b/src/views/import/ImportGermplasm.vue
@@ -30,7 +30,7 @@
 
       <template v-slot:importInfoTemplateMessageBox>
         <ImportInfoTemplateMessageBox v-bind:import-type-name="'Germplasm'"
-                                      v-bind:template-url="'https://cornell.box.com/shared/static/j69qww8j18aqcl2yns5y1yrwkg6ysbg9.xls'"
+                                      v-bind:template-url="'https://cornell.box.com/shared/static/7ct5k3tljr20uzo2wt2qlc5jgi46sopg.xls'"
                                       class="mb-5">
           <strong>Before You Import...</strong>
           <br/>

From 9c81644027e4b44f727e63422a1511902803c1e5 Mon Sep 17 00:00:00 2001
From: Nick Palladino <np398@cornell.edu>
Date: Fri, 24 Feb 2023 11:31:57 -0500
Subject: [PATCH 3/6] Remove trailing space at end of system user email address

---
 src/components/admin/AdminUsersTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/admin/AdminUsersTable.vue b/src/components/admin/AdminUsersTable.vue
index 80f571185..0999aa5de 100644
--- a/src/components/admin/AdminUsersTable.vue
+++ b/src/components/admin/AdminUsersTable.vue
@@ -159,9 +159,9 @@
         <b-table-column field="data.name" label="Name"  sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
           {{ props.row.data.name }}
         </b-table-column>
-         <b-table-column field="data.email" label="Email" v-bind:visible="!isMobile"  sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
-          {{ props.row.data.email }}
-        </b-table-column>
+         <b-table-column field="data.email" label="Email" v-bind:visible="!isMobile" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
+           {{ props.row.data.email }}<!--
+      --></b-table-column>
         <b-table-column field="data.roleName" label="Role" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
           <template v-if="rolesMap.size > 0">
             {{ getRoleName(props.row.data.roleId) }}

From cfec8e80374a4163350eee3e6cf4fb818d83a4d2 Mon Sep 17 00:00:00 2001
From: Nick Palladino <np398@cornell.edu>
Date: Fri, 24 Feb 2023 11:45:24 -0500
Subject: [PATCH 4/6] Remove leading space in system user email address

---
 src/components/admin/AdminUsersTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/AdminUsersTable.vue b/src/components/admin/AdminUsersTable.vue
index 0999aa5de..388ee82f7 100644
--- a/src/components/admin/AdminUsersTable.vue
+++ b/src/components/admin/AdminUsersTable.vue
@@ -159,8 +159,8 @@
         <b-table-column field="data.name" label="Name"  sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
           {{ props.row.data.name }}
         </b-table-column>
-         <b-table-column field="data.email" label="Email" v-bind:visible="!isMobile" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
-           {{ props.row.data.email }}<!--
+         <b-table-column field="data.email" label="Email" v-bind:visible="!isMobile" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})"><!--
+        -->{{ props.row.data.email }}<!--
       --></b-table-column>
         <b-table-column field="data.roleName" label="Role" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
           <template v-if="rolesMap.size > 0">

From 666509a0418b0ca011e4ec6f1eeaed6cd9c14e6d Mon Sep 17 00:00:00 2001
From: Nick Palladino <np398@cornell.edu>
Date: Wed, 1 Mar 2023 11:57:32 -0500
Subject: [PATCH 5/6] Updated for new gid field name

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

diff --git a/src/views/import/ImportGermplasm.vue b/src/views/import/ImportGermplasm.vue
index 01098d06d..465f38dff 100644
--- a/src/views/import/ImportGermplasm.vue
+++ b/src/views/import/ImportGermplasm.vue
@@ -105,7 +105,7 @@
             </AlertTriangleIcon>
           </b-table-column>
           <b-table-column field="gid" label="GID" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
-            {{ props.row.data.brAPIObject.gid }}
+            {{ props.row.data.brAPIObject.germplasmDbId }}
           </b-table-column>
           <b-table-column field="defaultDisplayName" label="Name" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
             {{ props.row.data.brAPIObject.defaultDisplayName }}

From 66b259dac11f43475d786dfb4fe8df50ddc6b163 Mon Sep 17 00:00:00 2001
From: Nick Palladino <np398@cornell.edu>
Date: Thu, 16 Mar 2023 11:33:45 -0400
Subject: [PATCH 6/6] Update gid display

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

diff --git a/src/views/import/ImportGermplasm.vue b/src/views/import/ImportGermplasm.vue
index 465f38dff..2d575734b 100644
--- a/src/views/import/ImportGermplasm.vue
+++ b/src/views/import/ImportGermplasm.vue
@@ -105,7 +105,7 @@
             </AlertTriangleIcon>
           </b-table-column>
           <b-table-column field="gid" label="GID" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
-            {{ props.row.data.brAPIObject.germplasmDbId }}
+            {{ props.row.data.brAPIObject.accessionNumber }}
           </b-table-column>
           <b-table-column field="defaultDisplayName" label="Name" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
             {{ props.row.data.brAPIObject.defaultDisplayName }}