diff --git a/package-lock.json b/package-lock.json index 494aa6ebf..aaab0b835 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bi-web", - "version": "v1.0.0+789", + "version": "v1.3.0+925", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bi-web", - "version": "v1.0.0+789", + "version": "v1.3.0+925", "hasInstallScript": true, "dependencies": { "@casl/ability": "~4.0.0", diff --git a/src/breeding-insight/model/Sort.ts b/src/breeding-insight/model/Sort.ts index 08e81aa2d..6b3f08d25 100644 --- a/src/breeding-insight/model/Sort.ts +++ b/src/breeding-insight/model/Sort.ts @@ -160,7 +160,7 @@ export class ProgramSort { // germplasm export enum GermplasmSortField { - ImportEntryNumber = "importEntryNumber", + ListEntryNumber = "listEntryNumber", AccessionNumber = "accessionNumber", DefaultDisplayName = "defaultDisplayName", BreedingMethod = "breedingMethod", diff --git a/src/components/germplasm/GermplasmTable.vue b/src/components/germplasm/GermplasmTable.vue index ed666f0be..ab615c032 100644 --- a/src/components/germplasm/GermplasmTable.vue +++ b/src/components/germplasm/GermplasmTable.vue @@ -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" > - + {{ GermplasmUtils.getEntryNumber(props.row.data, referenceId) }} @@ -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, diff --git a/src/store/sorting/index.ts b/src/store/sorting/index.ts index bc07d7f46..0cb4d0f05 100644 --- a/src/store/sorting/index.ts +++ b/src/store/sorting/index.ts @@ -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),