mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-09-28 11:10:46 +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
59 lines
2.2 KiB
TypeScript
59 lines
2.2 KiB
TypeScript
import * as DataTableModel from 'app/client/models/DataTableModel';
|
|
import { ColumnGetter, ColumnGetters } from 'app/common/ColumnGetters';
|
|
import * as gristTypes from 'app/common/gristTypes';
|
|
import { choiceGetter } from 'app/common/SortFunc';
|
|
import { Sort } from 'app/common/SortSpec';
|
|
|
|
/**
|
|
*
|
|
* An implementation of ColumnGetters for the client, drawing
|
|
* on the observables and models available in that context.
|
|
*
|
|
*/
|
|
export class ClientColumnGetters implements ColumnGetters {
|
|
|
|
// If the "unversioned" option is set, then cells with multiple
|
|
// versions will be read as a single version - the first version
|
|
// available of parent, local, or remote. This can make sense for
|
|
// sorting, so cells appear in a reasonably sensible place.
|
|
constructor(private _tableModel: DataTableModel, private _options: {
|
|
unversioned?: boolean} = {}) {
|
|
}
|
|
|
|
public getColGetter(colSpec: Sort.ColSpec): ColumnGetter | null {
|
|
const rowModel = this._tableModel.docModel.columns.getRowModel(Sort.getColRef(colSpec));
|
|
const colId = rowModel.colId();
|
|
let getter: ColumnGetter|undefined = this._tableModel.tableData.getRowPropFunc(colId);
|
|
if (!getter) { return null; }
|
|
if (this._options.unversioned && this._tableModel.tableData.mayHaveVersions()) {
|
|
const valueGetter = getter;
|
|
getter = (rowId) => {
|
|
const value = valueGetter(rowId);
|
|
if (value && gristTypes.isVersions(value)) {
|
|
const versions = value[1];
|
|
return ('parent' in versions) ? versions.parent :
|
|
('local' in versions) ? versions.local : versions.remote;
|
|
}
|
|
return value;
|
|
};
|
|
}
|
|
const details = Sort.specToDetails(colSpec);
|
|
if (details.orderByChoice) {
|
|
if (rowModel.pureType() === 'Choice') {
|
|
const choices: string[] = rowModel.widgetOptionsJson.peek()?.choices || [];
|
|
getter = choiceGetter(getter, choices);
|
|
}
|
|
}
|
|
return getter;
|
|
}
|
|
|
|
public getManualSortGetter(): ((rowId: number) => any) | null {
|
|
const manualSortCol = this._tableModel.tableMetaRow.columns().peek().find(
|
|
(c: any) => c.colId() === gristTypes.MANUALSORT);
|
|
if (!manualSortCol) {
|
|
return null;
|
|
}
|
|
return this.getColGetter(manualSortCol.getRowId());
|
|
}
|
|
}
|