Merge pull request #501 from Breeding-Insight/feature/BI-3089

Re-enable entry number sorting/filtering

Author: jloux-brapi

package-lock.json

@@ -160,7 +160,7 @@ export class ProgramSort {
 
 // germplasm
 export enum GermplasmSortField {
-  ImportEntryNumber = "importEntryNumber",
+  ListEntryNumber = "listEntryNumber",
   AccessionNumber = "accessionNumber",
   DefaultDisplayName = "defaultDisplayName",
   BreedingMethod = "breedingMethod",

src/breeding-insight/model/Sort.ts

@@ -7,13 +7,13 @@
         v-on:show-error-notification="$emit('show-error-notification', $event)"
         backend-sorting
         backend-filtering
-        v-bind:default-sort="entryNumberVisible ? [fieldMap['importEntryNumber'], 'ASC'] : [fieldMap['accessionNumber'], 'DESC']"
+        v-bind:default-sort="entryNumberVisible ? [fieldMap['listEntryNumber'], 'ASC'] : [fieldMap['accessionNumber'], 'DESC']"
         v-on:sort="setSort"
         v-on:search="initSearch"
         v-bind:search-debounce="400"
         v-bind:is-show-all-enabled="false"
     >
-      <b-table-column v-if="entryNumberVisible" field="importEntryNumber" label="Entry Number" v-slot="props" :th-attrs="(column) => ({scope:'col'})">
+      <b-table-column v-if="entryNumberVisible" field="listEntryNumber" label="Entry Number" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
         {{ GermplasmUtils.getEntryNumber(props.row.data, referenceId) }}
       </b-table-column>
       <b-table-column field="accessionNumber" label="GID" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
@@ -127,7 +127,7 @@ export default class GermplasmTable extends Vue {
   private germplasmCallStack?: CallStack;
 
   private fieldMap: any = {
-    'importEntryNumber': GermplasmSortField.ImportEntryNumber,
+    'listEntryNumber': GermplasmSortField.ListEntryNumber,
     'accessionNumber': GermplasmSortField.AccessionNumber,
     'defaultDisplayName' : GermplasmSortField.DefaultDisplayName,
     'breedingMethod': GermplasmSortField.BreedingMethod,

src/components/germplasm/GermplasmTable.vue

@@ -67,7 +67,7 @@ state = {
     germplasmSort: new GermplasmSort(GermplasmSortField.AccessionNumber, SortOrder.Descending),
 
     // germplasm (by list) table
-    germplasmByListSort: new GermplasmSort(GermplasmSortField.ImportEntryNumber, SortOrder.Ascending),
+    germplasmByListSort: new GermplasmSort(GermplasmSortField.ListEntryNumber, SortOrder.Ascending),
 
     // germplasm list table
     germplasmListSort: new GermplasmListSort(GermplasmListSortField.CreatedDate, SortOrder.Descending),