Skip to content

Re-enable entry number sorting/filtering #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jloux-brapi merged 2 commits into from
Oct 23, 2026
Merged

Re-enable entry number sorting/filtering #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aeb9b3
Re-enable entry number sorting/filtering
jloux-brapi Oct 19, 2026
047331f
Replace importEntryNumber with listEntryNumber
jloux-brapi Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/breeding-insight/model/Sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export class ProgramSort {

// germplasm
export enum GermplasmSortField {
ImportEntryNumber = "importEntryNumber",
ListEntryNumber = "listEntryNumber",
AccessionNumber = "accessionNumber",
DefaultDisplayName = "defaultDisplayName",
BreedingMethod = "breedingMethod",
Expand Down
6 changes: 3 additions & 3 deletions src/components/germplasm/GermplasmTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/store/sorting/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading