mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-09-28 16:20:48 +00:00
3c72639e25
Summary: Adding sort options for columns. - Sort menu has a new option "More sort options" that opens up Sort left menu - Each sort entry has an additional menu with 3 options -- Order by choice index (for the Choice column, orders by choice position) -- Empty last (puts empty values last in ascending order, first in descending order) -- Natural sort (for Text column, compares strings with numbers as numbers) Updated also CSV/Excel export and api sorting. Most of the changes in this diff is a sort expression refactoring. Pulling out all the methods that works on sortExpression array into a single namespace. Test Plan: Browser tests Reviewers: alexmojaki Reviewed By: alexmojaki Subscribers: dsagal, alexmojaki Differential Revision: https://phab.getgrist.com/D3077
55 lines
1.9 KiB
TypeScript
55 lines
1.9 KiB
TypeScript
import { ColumnGetter, ColumnGetters } from 'app/common/ColumnGetters';
|
|
import * as gristTypes from 'app/common/gristTypes';
|
|
import { safeJsonParse } from 'app/common/gutil';
|
|
import { choiceGetter } from 'app/common/SortFunc';
|
|
import { Sort } from 'app/common/SortSpec';
|
|
|
|
/**
|
|
*
|
|
* An implementation of ColumnGetters for the server, currently
|
|
* drawing on the data and metadata prepared for CSV export.
|
|
*
|
|
*/
|
|
export class ServerColumnGetters implements ColumnGetters {
|
|
private _rowIndices: Map<number, number>;
|
|
private _colIndices: Map<number, string>;
|
|
|
|
constructor(rowIds: number[], private _dataByColId: {[colId: string]: any}, private _columns: any[]) {
|
|
this._rowIndices = new Map<number, number>(rowIds.map((rowId, index) => [rowId, index] as [number, number]));
|
|
this._colIndices = new Map<number, string>(_columns.map(col => [col.id, col.colId] as [number, string]));
|
|
}
|
|
|
|
public getColGetter(colSpec: Sort.ColSpec): ColumnGetter | null {
|
|
const colRef = Sort.getColRef(colSpec);
|
|
const colId = this._colIndices.get(colRef);
|
|
if (colId === undefined) {
|
|
return null;
|
|
}
|
|
const col = this._dataByColId[colId];
|
|
let getter = (rowId: number) => {
|
|
const idx = this._rowIndices.get(rowId);
|
|
if (idx === undefined) {
|
|
return null;
|
|
}
|
|
return col[idx];
|
|
};
|
|
const details = Sort.specToDetails(colSpec);
|
|
if (details.orderByChoice) {
|
|
const rowModel = this._columns.find(c => c.id == colRef);
|
|
if (rowModel?.type === 'Choice') {
|
|
const choices: string[] = safeJsonParse(rowModel.widgetOptions, {}).choices || [];
|
|
getter = choiceGetter(getter, choices);
|
|
}
|
|
}
|
|
return getter;
|
|
}
|
|
|
|
public getManualSortGetter(): ((rowId: number) => any) | null {
|
|
const manualSortCol = this._columns.find(c => c.colId === gristTypes.MANUALSORT);
|
|
if (!manualSortCol) {
|
|
return null;
|
|
}
|
|
return this.getColGetter(manualSortCol.id);
|
|
}
|
|
}
|