Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

Adding sort order for filters

Browse Source
This commit is contained in:
Jarosław Sadziński
2024-10-09 11:13:31 +02:00
parent 4cde2202b5
commit 1315cc366f
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/client/models/entities/ColumnRec.ts
View File

@@ -230,9 +230,14 @@ export function formatterForRec(
return func(args);
}
export function labelsOrder(a: ColumnRec, b: ColumnRec): number {
const left = a.label.peek().toLowerCase();
const right = b.label.peek().toLowerCase();
type ColumnInfo = {label: string}|{label: ko.Observable<string>};
function peekLabel(info: ColumnInfo): string {
return typeof info.label === 'string' ? info.label : info.label.peek();
}
export function labelsOrder(a: ColumnInfo, b: ColumnInfo): number {
const left = peekLabel(a).toLowerCase();
const right = peekLabel(b).toLowerCase();
// Order is as follows:
// - First columns with normal labels starting with a letter.

2
app/client/models/entities/ViewSectionRec.ts
View File

@@ -521,7 +521,7 @@ export function createViewSectionRec(this: ViewSectionRec, docModel: DocModel):
const savedFiltersByColRef = new Map(this._savedFilters().all().map(f => [f.colRef(), f]));
const viewFieldsByColRef = new Map(this.viewFields().all().map(f => [f.origCol().getRowId(), f]));
return this.columns().map(column => {
return [...this.columns()].sort(labelsOrder).map(column => {
const savedFilter = savedFiltersByColRef.get(column.origColRef());
// Initialize with a saved filter, if one exists. Otherwise, use a blank filter.
const filter = modelUtil.customComputed({