Merge pull request #265 from Breeding-Insight/feature/BI-1473

[BI-1473] - Append existing germplasm with optional details
Breeding-Insight · Apr 19, 2023 · 46b3a61 · 46b3a61
2 parents 9293a4b + a85b58f
commit 46b3a61
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/components/admin/AdminUsersTable.vue b/src/components/admin/AdminUsersTable.vue
@@ -156,9 +156,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) }}

diff --git 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.accessionNumber }}
+          </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'})">