Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) Don't include adding attachment metadata in undo stack

Browse Source 
Summary: Mark actions adding attachment metadata as 'internal' (not part of undo stack) which previously was only for the Calculate action.

Test Plan: Extended nbrowser attachments test

Reviewers: dsagal

Reviewed By: dsagal

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D3380
This commit is contained in:
Alex Hall 2022-04-22 15:21:25 +02:00
parent bedb19f9c7
commit 890c550fc3
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/server/lib/Sharing.ts
View File

@ -215,16 +215,20 @@ export class Sharing {
try { try {
// A trivial action does not merit allocating an actionNum,
// logging, and sharing. Since we currently don't store
// calculated values in the database, it is best not to log the
// action that initializes them when the document is opened cold
// (without cached ActiveDoc) - otherwise we'll end up with spam
// log entries for each time the document is opened cold.
const isCalculate = (userActions.length === 1 && const isCalculate = (userActions.length === 1 &&
userActions[0][0] === 'Calculate'); userActions[0][0] === 'Calculate');
const trivial = isCalculate && sandboxActionBundle.stored.length === 0; // `internal` is true if users shouldn't be able to undo the actions. Applies to:
// - Calculate because it's not considered as performed by a particular client.
// - Adding attachment metadata when uploading attachments,
// because then the attachment file may get hard-deleted and redo won't work properly.
const internal = isCalculate || userActions.every(a => a[0] === "AddRecord" && a[1] === "_grist_Attachments");
// A trivial action does not merit allocating an actionNum,
// logging, and sharing. It's best not to log the
// action that calculates formula values when the document is opened cold
// (without cached ActiveDoc) if it doesn't change anything - otherwise we'll end up with spam
// log entries for each time the document is opened cold.
const trivial = internal && sandboxActionBundle.stored.length === 0;
const actionNum = trivial ? 0 : const actionNum = trivial ? 0 :
(branch === Branch.Shared ? this._actionHistory.getNextHubActionNum() : (branch === Branch.Shared ? this._actionHistory.getNextHubActionNum() :
@ -289,9 +293,7 @@ export class Sharing {
// be shared. Once sharing is enabled, we would share a snapshot at that time. // be shared. Once sharing is enabled, we would share a snapshot at that time.
await this._actionHistory.recordNextShared(localActionBundle); await this._actionHistory.recordNextShared(localActionBundle);
} }
// Check isCalculate because that's not an action we should allow undo/redo for (it's not if (client && client.clientId && !internal) {
// considered as performed by a particular client).
if (client && client.clientId && !isCalculate) {
this._actionHistory.setActionUndoInfo( this._actionHistory.setActionUndoInfo(
localActionBundle.actionHash!, localActionBundle.actionHash!,
getActionUndoInfo(localActionBundle, client.clientId, sandboxActionBundle.retValues)); getActionUndoInfo(localActionBundle, client.clientId, sandboxActionBundle.retValues));
@ -308,9 +310,7 @@ export class Sharing {
const actionGroup = asActionGroup(this._actionHistory, localActionBundle, { const actionGroup = asActionGroup(this._actionHistory, localActionBundle, {
clientId: client?.clientId, clientId: client?.clientId,
retValues: sandboxActionBundle.retValues, retValues: sandboxActionBundle.retValues,
// Mark the on-open Calculate action as internal. In future, synchronizing fields to today's internal,
// date and other changes from external values may count as internal.
internal: isCalculate,
}); });
actionGroup.actionSummary = actionSummary; actionGroup.actionSummary = actionSummary;
actionGroup.rowCount = sandboxActionBundle.rowCount; actionGroup.rowCount = sandboxActionBundle.rowCount;