mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-10-27 20:44:07 +00:00
c470c4041b
Summary: Some things (like rendering cells) use the `visibleCol` for `createFormatter`, while other things (like `CopySelection`) used the `displayCol`. For references, the display column has type Any and doesn't know about the original formatting. This resulted in formatting being lost when copying from reference columns even though formatting was preserved when copying from the original (visible) column which looked identical. This diff fixes this and ensures that `createFormatter` is always used with the `visibleCol`. This was agreed on in https://grist.slack.com/archives/C0234CPPXPA/p1639571321043000 Additionally: - Replaces the functions `createVisibleColFormatter` computed properties `visibleColFormatter` as suggested by a `TODO`. - Extracts common code from `createVisibleColFormatter` in `ColumnRec` and `ViewFieldRec` Test Plan: Fixed a test in CopyPaste which displayed the previous inconsistent behaviour. Reviewers: jarek Reviewed By: jarek Differential Revision: https://phab.getgrist.com/D3189
132 lines
6.4 KiB
TypeScript
132 lines
6.4 KiB
TypeScript
import {KoArray} from 'app/client/lib/koArray';
|
|
import {DocModel, IRowModel, recordSet, refRecord, TableRec, ViewFieldRec} from 'app/client/models/DocModel';
|
|
import {jsonObservable, ObjObservable} from 'app/client/models/modelUtil';
|
|
import * as gristTypes from 'app/common/gristTypes';
|
|
import {getReferencedTableId} from 'app/common/gristTypes';
|
|
import {BaseFormatter, createFormatter} from 'app/common/ValueFormatter';
|
|
import * as ko from 'knockout';
|
|
|
|
// Represents a column in a user-defined table.
|
|
export interface ColumnRec extends IRowModel<"_grist_Tables_column"> {
|
|
table: ko.Computed<TableRec>;
|
|
widgetOptionsJson: ObjObservable<any>;
|
|
viewFields: ko.Computed<KoArray<ViewFieldRec>>;
|
|
summarySource: ko.Computed<ColumnRec>;
|
|
|
|
// Is an empty column (undecided if formula or data); denoted by an empty formula.
|
|
isEmpty: ko.Computed<boolean>;
|
|
|
|
// Is a real formula column (not an empty column; i.e. contains a non-empty formula).
|
|
isRealFormula: ko.Computed<boolean>;
|
|
|
|
// Is a trigger formula column (not formula, but contains non-empty formula)
|
|
hasTriggerFormula: ko.Computed<boolean>;
|
|
|
|
// Used for transforming a column.
|
|
// Reference to the original column for a transform column, or to itself for a non-transforming column.
|
|
origColRef: ko.Observable<number>;
|
|
origCol: ko.Computed<ColumnRec>;
|
|
// Indicates whether a column is transforming. Manually set, but should be true in both the original
|
|
// column being transformed and that column's transform column.
|
|
isTransforming: ko.Observable<boolean>;
|
|
|
|
// Convenience observable to obtain and set the type with no suffix
|
|
pureType: ko.Computed<string>;
|
|
|
|
// The column's display column
|
|
_displayColModel: ko.Computed<ColumnRec>;
|
|
|
|
// Display col ref to use for the column, defaulting to the plain column itself.
|
|
displayColRef: ko.Computed<number>;
|
|
|
|
// The display column to use for the column, or the column itself when no displayCol is set.
|
|
displayColModel: ko.Computed<ColumnRec>;
|
|
visibleColModel: ko.Computed<ColumnRec>;
|
|
|
|
disableModifyBase: ko.Computed<boolean>; // True if column config can't be modified (name, type, etc.)
|
|
disableModify: ko.Computed<boolean>; // True if column can't be modified or is being transformed.
|
|
disableEditData: ko.Computed<boolean>; // True to disable editing of the data in this column.
|
|
|
|
isHiddenCol: ko.Computed<boolean>;
|
|
|
|
// Returns the rowModel for the referenced table, or null, if is not a reference column.
|
|
refTable: ko.Computed<TableRec|null>;
|
|
|
|
// Helper for Reference/ReferenceList columns, which returns a formatter according
|
|
// to the visibleCol associated with column.
|
|
visibleColFormatter: ko.Computed<BaseFormatter>;
|
|
|
|
// Helper which adds/removes/updates column's displayCol to match the formula.
|
|
saveDisplayFormula(formula: string): Promise<void>|undefined;
|
|
}
|
|
|
|
export function createColumnRec(this: ColumnRec, docModel: DocModel): void {
|
|
this.table = refRecord(docModel.tables, this.parentId);
|
|
this.widgetOptionsJson = jsonObservable(this.widgetOptions);
|
|
this.viewFields = recordSet(this, docModel.viewFields, 'colRef');
|
|
this.summarySource = refRecord(docModel.columns, this.summarySourceCol);
|
|
|
|
// Is this an empty column (undecided if formula or data); denoted by an empty formula.
|
|
this.isEmpty = ko.pureComputed(() => this.isFormula() && this.formula() === '');
|
|
|
|
// Is this a real formula column (not an empty column; i.e. contains a non-empty formula).
|
|
this.isRealFormula = ko.pureComputed(() => this.isFormula() && this.formula() !== '');
|
|
// If this column has a trigger formula defined
|
|
this.hasTriggerFormula = ko.pureComputed(() => !this.isFormula() && this.formula() !== '');
|
|
|
|
// Used for transforming a column.
|
|
// Reference to the original column for a transform column, or to itself for a non-transforming column.
|
|
this.origColRef = ko.observable(this.getRowId());
|
|
this.origCol = refRecord(docModel.columns, this.origColRef);
|
|
// Indicates whether a column is transforming. Manually set, but should be true in both the original
|
|
// column being transformed and that column's transform column.
|
|
this.isTransforming = ko.observable(false);
|
|
|
|
// Convenience observable to obtain and set the type with no suffix
|
|
this.pureType = ko.pureComputed(() => gristTypes.extractTypeFromColType(this.type()));
|
|
|
|
// The column's display column
|
|
this._displayColModel = refRecord(docModel.columns, this.displayCol);
|
|
|
|
// Helper which adds/removes/updates this column's displayCol to match the formula.
|
|
this.saveDisplayFormula = function(formula) {
|
|
if (formula !== (this._displayColModel().formula() || '')) {
|
|
return docModel.docData.sendAction(["SetDisplayFormula", this.table().tableId(),
|
|
null, this.getRowId(), formula]);
|
|
}
|
|
};
|
|
|
|
// Display col ref to use for the column, defaulting to the plain column itself.
|
|
this.displayColRef = ko.pureComputed(() => this.displayCol() || this.origColRef());
|
|
|
|
// The display column to use for the column, or the column itself when no displayCol is set.
|
|
this.displayColModel = refRecord(docModel.columns, this.displayColRef);
|
|
this.visibleColModel = refRecord(docModel.columns, this.visibleCol);
|
|
|
|
this.disableModifyBase = ko.pureComputed(() => Boolean(this.summarySourceCol()));
|
|
this.disableModify = ko.pureComputed(() => this.disableModifyBase() || this.isTransforming());
|
|
this.disableEditData = ko.pureComputed(() => Boolean(this.summarySourceCol()));
|
|
|
|
this.isHiddenCol = ko.pureComputed(() => gristTypes.isHiddenCol(this.colId()));
|
|
|
|
// Returns the rowModel for the referenced table, or null, if this is not a reference column.
|
|
this.refTable = ko.pureComputed(() => {
|
|
const refTableId = getReferencedTableId(this.type() || "");
|
|
return refTableId ? docModel.allTables.all().find(t => t.tableId() === refTableId) || null : null;
|
|
});
|
|
|
|
// Helper for Reference/ReferenceList columns, which returns a formatter according to the visibleCol
|
|
// associated with this column. If no visible column available, return formatting for the column itself.
|
|
this.visibleColFormatter = ko.pureComputed(() => visibleColFormatterForRec(this, this, docModel));
|
|
}
|
|
|
|
export function visibleColFormatterForRec(
|
|
rec: ColumnRec | ViewFieldRec, colRec: ColumnRec, docModel: DocModel
|
|
): BaseFormatter {
|
|
const vcol = rec.visibleColModel();
|
|
const documentSettings = docModel.docInfoRow.documentSettingsJson();
|
|
return (vcol.getRowId() !== 0) ?
|
|
createFormatter(vcol.type(), vcol.widgetOptionsJson(), documentSettings) :
|
|
createFormatter(colRec.type(), rec.widgetOptionsJson(), documentSettings);
|
|
}
|