Archives
/
gristlabs_grist-core
mirror of https://github.com/gristlabs/grist-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

(core) discount indirect changes for access control purposes

Browse Source 
Summary:
This diff discounts indirect changes for access control purposes.  A UserAction that updates a cell A, which in turn causes changes in other dependent cells, will be considered a change to cell A for access control purposes.

The `engine.apply_user_actions` method now returns a `direct` array, with a boolean for each `stored` action, set to `true` if the action is attributed to the user or `false` if it is attributed to the engine.  `GranularAccess` ignores actions attributed to the engine when checking for edit rights.

Subtleties:
 * Removal of references to a removed row are considered direct changes.
 * Doesn't play well with undos as yet.  An action that indirectly modifies a cell the user doesn't have rights to may succeed, but it will not be reversible.

Test Plan: added tests, updated tests

Reviewers: dsagal

Reviewed By: dsagal

Differential Revision: https://phab.getgrist.com/D2806
pull/23/head
Paul Fitzpatrick 3 years ago
parent 8d62a857e1
commit d0d3d3d0c9
14 changed files with 175 additions and 48 deletions
Show Stats Download Patch File Download Diff File

1
app/common/ActionBundle.ts
Unescape View File

@ -57,6 +57,7 @@ export interface UserActionBundle {
export interface SandboxActionBundle {
envelopes: Envelope[];
stored: Array<EnvContent<DocAction>>;
direct: Array<EnvContent<boolean>>;
calc: Array<EnvContent<DocAction>>;
undo: Array<EnvContent<DocAction>>; // Inverse actions for all 'stored' actions.
retValues: any[]; // Contains retValue for each of userActions.

83
app/gen-server/lib/Usage.ts
Unescape View File

@ -14,49 +14,66 @@ const USAGE_PERIOD_MS = 1 * 60 * 60 * 1000; // log every 1 hour
*/
export class Usage {
private _interval: NodeJS.Timeout;
private _currentOperation?: Promise<void>;
public constructor(private _dbManager: HomeDBManager) {
this._interval = setInterval(() => this.apply().catch(log.warn.bind(log)), USAGE_PERIOD_MS);
this._interval = setInterval(() => this.apply(), USAGE_PERIOD_MS);
// Log once at beginning, in case we roll over servers faster than
// the logging period for an extended length of time,
// and to raise the visibility of this logging step so if it gets
// slow devs notice.
this.apply().catch(log.warn.bind(log));
this.apply();
}
public close() {
/**
* Remove any scheduled operation, and wait for the current one to complete
* (if one is in progress).
*/
public async close() {
clearInterval(this._interval);
await this._currentOperation;
}
public async apply() {
const manager = this._dbManager.connection.manager;
// raw count of users
const userCount = await manager.count(User);
// users who have logged in at least once
const userWithLoginCount = await manager.createQueryBuilder()
.from(User, 'users')
.where('first_login_at is not null')
.getCount();
// raw count of organizations (excluding personal orgs)
const orgCount = await manager.createQueryBuilder()
.from(Organization, 'orgs')
.where('owner_id is null')
.getCount();
// organizations with subscriptions that are in a non-terminated state
const orgInGoodStandingCount = await manager.createQueryBuilder()
.from(Organization, 'orgs')
.leftJoin('orgs.billingAccount', 'billing_accounts')
.where('owner_id is null')
.andWhere('billing_accounts.in_good_standing = true')
.getCount();
// raw count of documents
const docCount = await manager.count(Document);
log.rawInfo('activity', {
docCount,
orgCount,
orgInGoodStandingCount,
userCount,
userWithLoginCount,
});
public apply() {
if (!this._currentOperation) {
this._currentOperation = this._apply()
.finally(() => this._currentOperation = undefined);
}
}
private async _apply(): Promise<void> {
try {
const manager = this._dbManager.connection.manager;
// raw count of users
const userCount = await manager.count(User);
// users who have logged in at least once
const userWithLoginCount = await manager.createQueryBuilder()
.from(User, 'users')
.where('first_login_at is not null')
.getCount();
// raw count of organizations (excluding personal orgs)
const orgCount = await manager.createQueryBuilder()
.from(Organization, 'orgs')
.where('owner_id is null')
.getCount();
// organizations with subscriptions that are in a non-terminated state
const orgInGoodStandingCount = await manager.createQueryBuilder()
.from(Organization, 'orgs')
.leftJoin('orgs.billingAccount', 'billing_accounts')
.where('owner_id is null')
.andWhere('billing_accounts.in_good_standing = true')
.getCount();
// raw count of documents
const docCount = await manager.count(Document);
log.rawInfo('activity', {
docCount,
orgCount,
orgInGoodStandingCount,
userCount,
userWithLoginCount,
});
} catch (e) {
log.warn("Error in Usage._apply", e);
}
}
}

6
app/server/lib/ActiveDoc.ts
Unescape View File

@ -1015,6 +1015,7 @@ export class ActiveDoc extends EventEmitter {
// Note: onDemand stored/undo actions are arbitrarily processed/added after normal actions
// and do not support access control.
sandboxActionBundle.stored.push(...stored.map(a => [allIndex, a] as [number, DocAction]));
sandboxActionBundle.direct.push(...stored.map(a => [allIndex, true] as [number, boolean]));
sandboxActionBundle.undo.push(...undo.map(a => [allIndex, a] as [number, DocAction]));
sandboxActionBundle.retValues.push(retValues);
}
@ -1078,8 +1079,8 @@ export class ActiveDoc extends EventEmitter {
* granular access rules.
*/
public getGranularAccessForBundle(docSession: OptDocSession, docActions: DocAction[], undo: DocAction[],
userActions: UserAction[]): GranularAccessForBundle {
this._granularAccess.getGranularAccessForBundle(docSession, docActions, undo, userActions);
userActions: UserAction[], isDirect: boolean[]): GranularAccessForBundle {
this._granularAccess.getGranularAccessForBundle(docSession, docActions, undo, userActions, isDirect);
return this._granularAccess;
}
@ -1411,6 +1412,7 @@ function createEmptySandboxActionBundle(): SandboxActionBundle {
return {
envelopes: [],
stored: [],
direct: [],
calc: [],
undo: [],
retValues: []

2
app/server/lib/FlexServer.ts
Unescape View File

@ -531,6 +531,7 @@ export class FlexServer implements GristServer {
}
public async close() {
if (this.usage) { await this.usage.close(); }
if (this._hosts) { this._hosts.close(); }
if (this.dbManager) {
this.dbManager.removeAllListeners();
@ -538,7 +539,6 @@ export class FlexServer implements GristServer {
}
if (this.server) { this.server.close(); }
if (this.httpsServer) { this.httpsServer.close(); }
if (this.usage) { this.usage.close(); }
if (this.housekeeper) { await this.housekeeper.stop(); }
await this._shutdown();
// Do this after _shutdown, since DocWorkerMap is used during shutdown.

13
app/server/lib/GranularAccess.ts
Unescape View File

@ -142,6 +142,7 @@ export class GranularAccess implements GranularAccessForBundle {
docSession: OptDocSession,
userActions: UserAction[],
docActions: DocAction[],
isDirect: boolean[],
undo: DocAction[],
// Flag tracking whether a set of actions have been applied to the database or not.
applied: boolean,
@ -163,10 +164,10 @@ export class GranularAccess implements GranularAccessForBundle {
}
public getGranularAccessForBundle(docSession: OptDocSession, docActions: DocAction[], undo: DocAction[],
userActions: UserAction[]): void {
userActions: UserAction[], isDirect: boolean[]): void {
if (this._activeBundle) { throw new Error('Cannot start a bundle while one is already in progress'); }
this._activeBundle = {
docSession, docActions, undo, userActions,
docSession, docActions, undo, userActions, isDirect,
applied: false, hasDeliberateRuleChange: false, hasAnyRuleChange: false
};
this._activeBundle.hasDeliberateRuleChange =
@ -211,13 +212,17 @@ export class GranularAccess implements GranularAccessForBundle {
*/
public async canApplyBundle() {
if (!this._activeBundle) { throw new Error('no active bundle'); }
const {docActions, docSession} = this._activeBundle;
const {docActions, docSession, isDirect} = this._activeBundle;
if (this._activeBundle.hasDeliberateRuleChange && !await this.isOwner(docSession)) {
throw new ErrorWithCode('ACL_DENY', 'Only owners can modify access rules');
}
if (this._ruler.haveRules()) {
await Promise.all(
docActions.map((action, actionIdx) => this._checkIncomingDocAction({docSession, action, actionIdx})));
docActions.map((action, actionIdx) => {
if (isDirect[actionIdx]) {
return this._checkIncomingDocAction({docSession, action, actionIdx});
}
}));
}
if (this._recoveryMode) {

3
app/server/lib/Sharing.ts
Unescape View File

@ -373,9 +373,10 @@ export class Sharing {
const undo = getEnvContent(sandboxActionBundle.undo);
const docActions = getEnvContent(sandboxActionBundle.stored).concat(
getEnvContent(sandboxActionBundle.calc));
const isDirect = getEnvContent(sandboxActionBundle.direct);
const accessControl = this._activeDoc.getGranularAccessForBundle(
docSession || makeExceptionalDocSession('share'), docActions, undo, userActions
docSession || makeExceptionalDocSession('share'), docActions, undo, userActions, isDirect
);
try {
// TODO: see if any of the code paths that have no docSession are relevant outside

1
sandbox/grist/acl.py
Unescape View File

@ -40,6 +40,7 @@ def acl_read_split(action_group):
bundle = action_obj.ActionBundle()
bundle.envelopes.append(action_obj.Envelope(ALL_SET))
bundle.stored.extend((0, da) for da in action_group.stored)
bundle.direct.extend((0, flag) for flag in action_group.direct)
bundle.calc.extend((0, da) for da in action_group.calc)
bundle.undo.extend((0, da) for da in action_group.undo)
bundle.retValues = action_group.retValues

14
sandbox/grist/action_obj.py
Unescape View File

@ -23,6 +23,7 @@ class ActionGroup(object):
def __init__(self):
self.calc = []
self.stored = []
self.direct = []
self.undo = []
self.retValues = []
self.summary = ActionSummary()
@ -31,7 +32,10 @@ class ActionGroup(object):
"""
Merge the changes from self.summary into self.stored and self.undo, and clear the summary.
"""
length_before = len(self.stored)
self.summary.convert_deltas_to_actions(self.stored, self.undo)
count = len(self.stored) - length_before
self.direct += [False] * count
self.summary = ActionSummary()
def flush_calc_changes_for_column(self, table_id, col_id):
@ -39,13 +43,21 @@ class ActionGroup(object):
Merge the changes for the given column from self.summary into self.stored and self.undo, and
remove that column from the summary.
"""
length_before = len(self.stored)
self.summary.pop_column_delta_as_actions(table_id, col_id, self.stored, self.undo)
count = len(self.stored) - length_before
self.direct += [False] * count
def check_sanity(self):
if len(self.stored) != len(self.direct):
raise AssertionError("failed to track origin of actions")
def get_repr(self):
return {
"calc": map(actions.get_action_repr, self.calc),
"stored": map(actions.get_action_repr, self.stored),
"undo": map(actions.get_action_repr, self.undo),
"direct": self.direct,
"retValues": self.retValues
}
@ -77,6 +89,7 @@ class ActionBundle(object):
def __init__(self):
self.envelopes = []
self.stored = [] # Pairs of (envIndex, docAction)
self.direct = [] # Pairs of (envIndex, boolean)
self.calc = [] # Pairs of (envIndex, docAction)
self.undo = [] # Pairs of (envIndex, docAction)
self.retValues = []
@ -86,6 +99,7 @@ class ActionBundle(object):
return {
"envelopes": [e.to_json_obj() for e in self.envelopes],
"stored": [(env, actions.get_action_repr(a)) for (env, a) in self.stored],
"direct": self.direct,
"calc": [(env, actions.get_action_repr(a)) for (env, a) in self.calc],
"undo": [(env, actions.get_action_repr(a)) for (env, a) in self.undo],
"retValues": self.retValues,

2
sandbox/grist/engine.py
Unescape View File

@ -1125,6 +1125,7 @@ class Engine(object):
self._bring_all_up_to_date()
self.out_actions.flush_calc_changes()
self.out_actions.check_sanity()
return self.out_actions
def acl_split(self, action_group):
@ -1247,6 +1248,7 @@ class Engine(object):
self.user_actions.ApplyUndoActions(map(actions.get_action_repr, undo_actions))
del self.out_actions.calc[len_calc:]
del self.out_actions.stored[len_stored:]
del self.out_actions.direct[len_stored:]
del self.out_actions.undo[len_undo:]
del self.out_actions.retValues[len_ret:]

1
sandbox/grist/test_display_cols.py
Unescape View File

@ -370,6 +370,7 @@ class TestUserActions(test_engine.EngineTestCase):
["RemoveRecord", "_grist_Tables_column", 28],
["RemoveColumn", "People", "gristHelper_Display2"],
],
"direct": [True, True, True, True, True, True],
"undo": [
["BulkUpdateRecord", "People", [1, 2, 3], {"gristHelper_Display2": ["Netflix", "HBO", "NBC"]}],
["BulkUpdateRecord", "People", [1, 2, 3], {"gristHelper_Display": ["Narcos", "Game of Thrones", "Today"]}],

14
sandbox/grist/test_engine.py
Unescape View File

@ -123,7 +123,7 @@ class EngineTestCase(unittest.TestCase):
self.assertEqualDocData({table_name: observed}, {table_name: expected})
action_group_action_fields = ("stored", "undo", "calc")
action_group_action_fields = ("stored", "undo", "calc", "direct")
@classmethod
def _formatActionGroup(cls, action_group, use_repr=False):
@ -149,13 +149,12 @@ class EngineTestCase(unittest.TestCase):
# Do some clean up on the observed data.
observed = testutil.replace_nans(observed)
# Convert expected actions into a comparable form.
# Convert observed and expected actions into a comparable form.
for k in self.action_group_action_fields:
if k in observed:
observed[k] = map(actions.get_action_repr, observed[k])
observed[k] = map(get_comparable_repr, observed[k])
if k in expected:
expected[k] = [actions.get_action_repr(a) if not isinstance(a, list) else a
for a in expected[k]]
expected[k] = map(get_comparable_repr, expected[k])
if observed != expected:
o_lines = self._formatActionGroup(observed)
@ -552,6 +551,11 @@ def create_test_case(name, body):
self._run_test_body(name, body)
setattr(TestEngine, name, run)
# Convert observed/expected action into a comparable form.
def get_comparable_repr(a):
if isinstance(a, (list, int)):
return a
return actions.get_action_repr(a)
# Parse and create test cases on module load. This way the python unittest feature to run only
# particular test cases can apply to these cases too.

4
sandbox/grist/test_formula_undo.py
Unescape View File

@ -44,6 +44,7 @@ return '#%s %s' % (table.my_counter, $schoolName)
["UpdateRecord", "Students", 6, {"schoolCities": ["L", 1, 2]}],
["UpdateRecord", "Students", 6, {"schoolIds": "1:2"}],
],
"direct": [True, False, False, False],
"undo": [
["UpdateRecord", "Students", 6, {"schoolName": "Yale"}],
["UpdateRecord", "Students", 6, {"counter": "#6 Yale"}],
@ -67,6 +68,7 @@ return '#%s %s' % (table.my_counter, $schoolName)
["UpdateRecord", "Students", 6, {"schoolName": "Yale"}],
["UpdateRecord", "Students", 6, {"counter": "#8 Yale"}],
],
"direct": [True, True, True, True, False], # undos currently fully direct; formula update is indirect.
"undo": [
["UpdateRecord", "Students", 6, {"schoolIds": "1:2"}],
["UpdateRecord", "Students", 6, {"schoolCities": ["L", 1, 2]}],
@ -113,6 +115,7 @@ return '#%s %s' % (table.my_counter, $schoolName)
["UpdateRecord", "_grist_Tables_column", 22, {"isFormula": False}],
["UpdateRecord", "Students", 6, {"newCol": "Boo!"}],
],
"direct": [True, True, True, False, True, True],
"undo": [
["ModifyColumn", "Students", "newCol", {"type": "Any"}],
["UpdateRecord", "_grist_Tables_column", 22, {"type": "Any"}],
@ -144,6 +147,7 @@ return '#%s %s' % (table.my_counter, $schoolName)
["UpdateRecord", "_grist_Tables_column", 22, {"type": "Any"}],
["ModifyColumn", "Students", "newCol", {"type": "Any"}],
],
"direct": [True, True, True, True, True, True], # undos are currently fully direct.
"undo": [
["UpdateRecord", "Students", 6, {"newCol": "Boo!"}],
["UpdateRecord", "_grist_Tables_column", 22, {"isFormula": False}],

74
sandbox/grist/testscript.json
Unescape View File

@ -100,6 +100,7 @@
}],
["UpdateRecord", "Address", 11, {"region": "North America"}]
],
"direct": [true, false],
"undo": [["RemoveRecord", "Address", 11]],
"retValue": [ 11 ]
},
@ -118,6 +119,7 @@
"name": "Georgetown University",
"address": 11
}]],
"direct": [true],
"undo": [["RemoveRecord", "Schools", 9]],
"retValue": [9]
}
@ -131,6 +133,7 @@
["UpdateRecord", "Students", 3, {"schoolRegion": "DC"}],
["UpdateRecord", "Students", 3, {"schoolShort": "Georgetown"}]
],
"direct": [true, false, false],
"undo": [
["UpdateRecord", "Students", 3, {"school": 6}],
["UpdateRecord", "Students", 3, {"schoolRegion": "Europe"}],
@ -188,6 +191,7 @@
["AddRecord", "Schools", 11, {"name": "Amherst College"}],
["UpdateRecord", "Schools", 10, {"name": "Williams College, Eureka"}]
],
"direct": [true, true, true, true, false],
"undo": [
["ModifyColumn", "Schools", "name", {"formula": ""}],
["UpdateRecord", "_grist_Tables_column", 10, {"formula": ""}],
@ -209,6 +213,7 @@
// This tests that the formula for 'name' does NOT get recomputed
// As it would, if default formulas created dependencies
"stored" : [["UpdateRecord", "Schools", 10, { "address": 3}]],
"direct" : [true],
"undo" : [["UpdateRecord", "Schools", 10, { "address": 2}]]
}
}],
@ -226,6 +231,7 @@
["AddRecord", "Schools", 12, {"address": 70}],
["UpdateRecord", "Schools", 12, {"name": "12$\\$$'\\'"}]
],
"direct": [true, true, true, false],
"undo": [
["ModifyColumn", "Schools", "name", {"formula": "'Williams College, ' + $address.city"}],
["UpdateRecord", "_grist_Tables_column", 10, {"formula": "'Williams College, ' + $address.city"}],
@ -268,6 +274,9 @@
["AddRecord", "Schools", 16, {"numStudents": "@+Infinity"}],
["BulkUpdateRecord", "Schools", [14, 15, 16], {"name": ["14$\\$$'\\'", "15$\\$$'\\'", "16$\\$$'\\'"]}]
],
"direct": [true, true, true, true, true,
true, false, true,
true, false],
"undo" : [
["RemoveColumn", "Schools", "numStudents"],
["RemoveRecord", "_grist_Tables_column", 30],
@ -343,6 +352,7 @@
"region": ["North America", "North America"]
}]
],
"direct": [true, false, false],
"undo": [["BulkRemoveRecord", "Address", [11, 12]]],
"retValue": [ [11, 12] ]
},
@ -378,6 +388,7 @@
["UpdateRecord", "Address", 10, {"region": "N/A"}],
["UpdateRecord", "Students", 3, {"schoolRegion": "N/A"}]
],
"direct": [true, false, false],
"undo": [
["UpdateRecord", "Address", 10, {"country": "UK"}],
["UpdateRecord", "Address", 10, {"region": "Europe"}],
@ -399,6 +410,7 @@
["BulkUpdateRecord", "Students", [1, 2, 4, 5],
{"schoolShort": ["columbia", "yale", "yale", "eureka"]}]
],
"direct": [true, false],
"undo": [["BulkUpdateRecord", "Schools", [1, 2, 8],
{"name": ["Eureka College", "Columbia University", "Yale University"]}],
["BulkUpdateRecord", "Students", [1, 2, 4, 5],
@ -457,6 +469,7 @@
["BulkUpdateRecord", "Students", [1, 2, 3, 4, 5, 6, 8],
{"fullName": ["BARACK Obama", "GEORGE W Bush", "BILL Clinton", "GEORGE H Bush", "RONALD Reagan", "JIMMY Carter", "GERALD Ford"]}]
],
"direct": [true, true, true, true, false],
"undo": [
["ModifyColumn", "Students", "fullName",
{"formula": "rec.firstName + ' ' + rec.lastName"}],
@ -484,6 +497,7 @@
["UpdateRecord", "Students", 2, {"firstName" : "Richard", "lastName" : "Nixon"}],
["UpdateRecord", "Students", 2, {"fullName" : "RICHARD Nixon"}]
],
"direct": [true, false],
"undo" : [
["UpdateRecord", "Students", 2, {"firstName" : "George W", "lastName" : "Bush"}],
["UpdateRecord", "Students", 2, {"fullName": "GEORGE W Bush"}]
@ -540,6 +554,7 @@
["BulkUpdateRecord", "Schools", [7, 8], {"address": [0, 0]}],
["BulkUpdateRecord", "Students", [2, 4, 8], {"schoolRegion": [null, null, null]}]
],
"direct": [true, true, false],
"undo": [
["AddRecord", "Address", 4, {"city": "New Haven", "country": "US", "region": "North America", "state": "CT"}],
["BulkUpdateRecord", "Schools", [7, 8], {"address": [4, 4]}],
@ -560,6 +575,7 @@
["UpdateRecord", "Students", 6, {"schoolRegion": null}],
["UpdateRecord", "Students", 6, {"schoolShort": ""}]
],
"direct": [true, true, false, false],
"undo": [
["AddRecord", "Schools", 5, {"name": "U.S. Naval Academy", "address": 3}],
["UpdateRecord", "Students", 6, {"school": 5}],
@ -576,6 +592,7 @@
"USER_ACTION": ["RemoveRecord", "Students", 1],
"ACTIONS": {
"stored": [["RemoveRecord", "Students", 1]],
"direct": [true],
"undo": [["AddRecord", "Students", 1,
{"firstName": "Barack", "fullName": "Barack Obama", "fullNameLen": 12, "lastName": "Obama", "school": 2, "schoolRegion": "NY", "schoolShort": "Columbia"}]
]
@ -619,6 +636,7 @@
"USER_ACTION": ["BulkRemoveRecord", "Students", [2, 5, 6, 8]],
"ACTIONS": {
"stored": [["BulkRemoveRecord", "Students", [2, 5, 6, 8]]],
"direct": [true],
"undo": [["BulkAddRecord", "Students", [2, 5, 6, 8], {
"firstName": ["George W", "Ronald", "Jimmy", "Gerald"],
"lastName": ["Bush", "Reagan", "Carter", "Ford"],
@ -641,6 +659,7 @@
["BulkUpdateRecord", "Students", [3, 4], {"schoolRegion": [null, null]}],
["BulkUpdateRecord", "Students", [3, 4], {"schoolShort": ["", ""]}]
],
"direct": [true, true, false, false],
"undo": [
["BulkAddRecord", "Schools", [6, 8], {
"name": ["Oxford University", "Yale University"],
@ -707,6 +726,7 @@
"widgetOptions": ""
}]
],
"direct": [true, true],
"undo": [
["RemoveColumn", "Address", "zip"],
["RemoveRecord", "_grist_Tables_column", 30]
@ -735,6 +755,7 @@
"ACTIONS": {
"stored": [["BulkUpdateRecord", "Address", [2, 4, 7],
{"zip": ["61530-0001", "06520-0002", "10027-0003"]}]],
"direct": [true],
"undo": [["BulkUpdateRecord", "Address", [2, 4, 7],
{"zip": ["", "", ""]}]]
}
@ -775,6 +796,7 @@
["BulkUpdateRecord", "Address", [2, 3, 4, 7, 10],
{"zip5": ["61530", "", "06520", "10027", ""]}]
],
"direct": [true, true, false],
"undo": [
["RemoveColumn", "Address", "zip5"],
["RemoveRecord", "_grist_Tables_column", 31]
@ -819,6 +841,7 @@
["BulkUpdateRecord", "Schools", [1,2,5,6,7,8],
{"zip": ["61530", "10027", "", "", "06520", "06520"]}]
],
"direct": [true, true, false],
"undo": [
["RemoveColumn", "Schools", "zip"],
["RemoveRecord", "_grist_Tables_column", 32]
@ -902,6 +925,9 @@
"isFormula": true, "label": "world", "widgetOptions": ""}],
["AddRecord", "_grist_Views_section_field", 2, {"colRef": 35, "parentId": 1, "parentPos": 2.0}]
],
"direct": [true, true,
true, true, true, true, true, true, true,
true, true, true],
"undo": [
["RemoveTable", "Bar"],
["RemoveRecord", "_grist_Tables", 4],
@ -964,6 +990,7 @@
"USER_ACTION": ["UpdateRecord", "Address", 3, {"city": ""}],
"ACTIONS": {
"stored": [["UpdateRecord", "Address", 3, {"city": ""}]],
"direct": [true],
"undo": [["UpdateRecord", "Address", 3, {"city": "Annapolis"}]]
}
}],
@ -975,6 +1002,7 @@
"stored": [
["RemoveRecord", "_grist_Tables_column", 21],
["RemoveColumn", "Address", "city"]],
"direct": [true, true],
"undo": [
["AddRecord", "_grist_Tables_column", 21, {
"parentId": 3,
@ -1013,6 +1041,7 @@
["RemoveRecord", "_grist_Tables_column", 4],
["RemoveColumn", "Students", "fullNameLen"]
],
"direct": [true, true],
"undo": [
["BulkUpdateRecord", "Students", [1, 2, 3, 4, 5, 6, 8], {"fullNameLen": [12, 13, 12, 13, 13, 12, 11]}],
["AddRecord", "_grist_Tables_column", 4, {
@ -1067,6 +1096,7 @@
["E","AttributeError"]]
}]
],
"direct": [true, true, false],
"undo": [
["AddRecord", "_grist_Tables_column", 27, {
"parentId": 3,
@ -1130,6 +1160,7 @@
["UpdateRecord", "Students", 3,
{"schoolRegion": ["E","AttributeError"]}]
],
"direct": [true, true, true, true, true, true, false],
"undo": [
["BulkUpdateRecord", "Students", [1, 2, 3, 4, 5, 6, 8], {"schoolShort": ["Columbia", "Yale", "Oxford", "Yale", "Eureka", "U.S.", "Yale"]}],
["AddRecord", "_grist_Tables_column", 5, {"parentPos": 5.0, "parentId": 1,
@ -1224,6 +1255,8 @@
["RemoveColumn", "ViewTest", "hello"]
],
"direct": [true, true, true, true, true, true, true, true, true,
true, true, true],
"undo": [
["RemoveTable", "ViewTest"],
["RemoveRecord", "_grist_Tables", 4],
@ -1267,6 +1300,7 @@
["UpdateRecord", "_grist_Tables_column", 4, {"colId": "nameLen"}],
["UpdateRecord", "Address", 10, {"town": "Ox-ford"}]
],
"direct": [true, true, true, true, true],
"undo": [
["RenameColumn", "Address", "town", "city"],
["UpdateRecord", "_grist_Tables_column", 21, {"colId": "city"}],
@ -1330,6 +1364,7 @@
["BulkUpdateRecord", "Students", [2, 4, 5], {"schoolRegion": [null, null, null]}],
["BulkUpdateRecord", "Students", [2, 4, 5], {"schoolShort": ["", "", ""]}]
],
"direct": [true, true, true, true, true, true, true, true, false, false],
"undo": [
["RenameColumn", "Students", "university", "school"],
["ModifyColumn", "Students", "schoolShort",
@ -1395,6 +1430,7 @@
["UpdateRecord", "_grist_Tables_column", 27, {"type": "Int"}],
["UpdateRecord", "Address", 2, {"state": 73}]
],
"direct": [true, true, true],
"undo": [
["ModifyColumn", "Address", "state", {"type": "Text"}],
["UpdateRecord", "_grist_Tables_column", 27, {"type": "Text"}],
@ -1447,6 +1483,7 @@
["ModifyColumn", "Address", "stateName", {"type": "Numeric"}],
["UpdateRecord", "_grist_Tables_column", 27, {"type": "Numeric"}]
],
"direct": [true, true, true, true, true],
"undo": [
["RenameColumn", "Address", "stateName", "state"],
["ModifyColumn", "Students", "schoolRegion", { "formula":
@ -1513,6 +1550,7 @@
["RenameColumn", "Students", "schoolShort", "short"],
["UpdateRecord", "_grist_Tables_column", 6, {"colId": "short"}]
],
"direct": [true, true],
"undo": [
["RenameColumn", "Students", "short", "schoolShort"],
["UpdateRecord", "_grist_Tables_column", 6, {"colId": "schoolShort"}]
@ -1528,6 +1566,7 @@
["RenameColumn", "Students", "short", "school2"],
["UpdateRecord", "_grist_Tables_column", 6, {"colId": "school2"}]
],
"direct": [true, true],
"undo": [
["RenameColumn", "Students", "school2", "short"],
["UpdateRecord", "_grist_Tables_column", 6, {"colId": "short"}]
@ -1564,6 +1603,7 @@
["ModifyColumn", "Address", "city", {"formula": "'Anytown'"}],
["UpdateRecord", "_grist_Tables_column", 21, {"formula": "'Anytown'"}]
],
"direct": [true, true],
"undo": [
["ModifyColumn", "Address", "city", {"formula": ""}],
["UpdateRecord", "_grist_Tables_column", 21, {"formula": ""}]
@ -1597,6 +1637,7 @@
"fullNameLen": [14,15,14,15,15,14,13]
}]
],
"direct": [true, true, false, false],
"undo": [
["ModifyColumn", "Students", "fullName",
{"formula": "rec.firstName + ' ' + rec.lastName"}],
@ -1628,6 +1669,7 @@
["UpdateRecord", "Students", 2, {"fullName": "Bush - G.W."}],
["UpdateRecord", "Students", 2, {"fullNameLen": 11}]
],
"direct": [true, true, false, false, false, false],
"undo": [
["UpdateRecord", "Students", 2, {"firstName": "George W"}],
["RemoveRecord", "Address", 11],
@ -1664,6 +1706,7 @@
["UpdateRecord", "_grist_Tables_column", 4,
{"type": "Any"}]
],
"direct": [true, true, true, true, true, true],
"undo": [
["ModifyColumn", "Students", "fullNameLen",
{"type": "Any"}],
@ -1707,6 +1750,7 @@
{"fullNameLen": [13, 10, 13, 14, 14, 13, 12]}],
["UpdateRecord", "_grist_Tables_column", 4, {"isFormula": false}]
],
"direct": [true, true, true, true, true, false, true],
"undo": [
["ModifyColumn", "Students", "fullNameLen",
{"isFormula": true, "type": "Any"}],
@ -1763,6 +1807,7 @@
["UpdateRecord", "Address", 2, {"city" : 567}],
["UpdateRecord", "_grist_Tables_column", 21, {"type" : "Int"}]
],
"direct": [true, true, false, true],
"undo" : [
["UpdateRecord", "Address", 2, {"city": "Eureka"}],
["UpdateRecord", "Address", 2, {"city" : "567"}],
@ -1780,6 +1825,7 @@
],
"ACTIONS": {
"stored": [["UpdateRecord", "Address", 2, {"city": "Eureka"}]],
"direct": [true],
"undo" : [["UpdateRecord", "Address", 2, {"city" : 567}]]
}
}],
@ -1801,6 +1847,7 @@
["UpdateRecord", "_grist_Tables_column", 21, {"type": "Int"}]
],
"direct": [true, true, true, true, false, true],
"undo": [
["ModifyColumn", "Address", "city", {"type": "Int"}],
["UpdateRecord", "_grist_Tables_column", 21, {"type": "Int"}],
@ -1845,7 +1892,7 @@
["BulkUpdateRecord", "Address", [2, 3, 4, 7, 10, 11], {"state": [null, null, null, null, null, null]}],
["BulkUpdateRecord", "Students", [1, 2, 4, 5, 6, 8], {"schoolRegion": [null, null, null, null, null, null]}]
],
"direct": [true, true, false, false],
"undo" : [
["ModifyColumn", "Address", "state", {"isFormula": false, "type": "Text"}],
["UpdateRecord", "_grist_Tables_column", 27, {"isFormula": false, "type": "Text"}],
@ -1865,6 +1912,7 @@
"USER_ACTION": ["UpdateRecord", "Students", 1, {"fullNameLen" : "Fourteen"}],
"ACTIONS" : {
"stored" : [["UpdateRecord", "Students", 1, {"fullNameLen": "Fourteen"}]],
"direct": [true],
"undo" : [["UpdateRecord", "Students", 1, {"fullNameLen": 13}]]
}
}],
@ -1890,6 +1938,7 @@
["BulkUpdateRecord", "Students", [1, 2, 3, 4, 5, 6, 8],
{"schoolRegion": [["E", "TypeError"], 2, 1, 2, 2, 1, 2]}]
],
"direct": [true, true, true, true, false, false],
"undo" : [
["ModifyColumn", "Students", "fullName", {"formula": "rec.lastName + ' - ' + rec.firstName"}],
["UpdateRecord", "_grist_Tables_column", 3, {"formula": "rec.lastName + ' - ' + rec.firstName"}],
@ -1920,6 +1969,7 @@
["BulkUpdateRecord", "Students", [1, 2, 3, 4, 5, 6, 8],
{"fullName": ["Barack", "G.W.", "Bill", "George H", "Ronald", "Jimmy", "Gerald"]}]
],
"direct": [true, true, false],
"undo" : [
["ModifyColumn", "Students", "fullName", {"formula": "!#@%&T#$UDSAIKVFsdhifzsk"}],
["UpdateRecord", "_grist_Tables_column", 3, {"formula": "!#@%&T#$UDSAIKVFsdhifzsk"}],
@ -1972,6 +2022,7 @@
"formula": ["$firstName", "len($Entire_Name) - 1"]
}]
],
"direct": [true, true, true],
"undo" : [
["RenameColumn", "Students", "Entire_Name", "fullName"],
["ModifyColumn", "Students", "fullNameLen", {
@ -2010,6 +2061,7 @@
"parentPos": 2.0, "type": "DateTime", "widgetOptions": ""}
]
],
"direct": [true, true],
"undo": [
["RemoveColumn", "foo", "c_date"],
["RemoveRecord", "_grist_Tables_column", 2]
@ -2033,6 +2085,7 @@
["ModifyColumn", "foo", "c_date", {"type": "Int"}],
["UpdateRecord", "_grist_Tables_column", 2, {"type": "Int"}]
],
"direct": [true, true],
"undo": [
["ModifyColumn", "foo", "c_date", {"type": "DateTime"}],
["UpdateRecord", "_grist_Tables_column", 2, {"type": "DateTime"}]
@ -2056,6 +2109,7 @@
["ModifyColumn", "foo", "c_date", {"type": "Numeric"}],
["UpdateRecord", "_grist_Tables_column", 2, {"type": "Numeric"}]
],
"direct": [true, true],
"undo": [
["ModifyColumn", "foo", "c_date", {"type": "Int"}],
["UpdateRecord", "_grist_Tables_column", 2, {"type": "Int"}]
@ -2080,6 +2134,7 @@
["ModifyColumn", "foo", "c_date", {"type": "DateTime"}],
["UpdateRecord", "_grist_Tables_column", 2, {"type": "DateTime"}]
],
"direct": [true, true],
"undo": [
["ModifyColumn", "foo", "c_date", {"type": "Numeric"}],
["UpdateRecord", "_grist_Tables_column", 2, {"type": "Numeric"}]
@ -2169,6 +2224,9 @@
["AddRecord", "Bar", 3, {"foo": 1, "hello": "c", "manualSort": 3.0}],
["BulkUpdateRecord", "Bar", [1, 2, 3], {"world": ["A", "B", "C"]}]
],
"direct": [true, true, true, true, true, true, true, true,
true, true, true, true, true, true, true, true, true,
true, true, true, false],
"undo": [
["RemoveTable", "Foo"],
["RemoveRecord", "_grist_Tables", 4],
@ -2260,6 +2318,7 @@
// As part of adding a table, we also set the primaryViewId.
["UpdateRecord", "_grist_Tables", 4, {"primaryViewId": 1}]
],
"direct": [true, true, true, true, true, true, true, true],
"undo": [
["RemoveTable", "Foo"],
["RemoveRecord", "_grist_Tables", 4],
@ -2290,6 +2349,7 @@
["RemoveRecord", "_grist_Tables", 4],
["RemoveTable", "Foo"]
],
"direct": [true, true, true, true, true, true, true, true],
"undo": [
["AddRecord", "_grist_Views_section", 1,
{"tableRef": 4, "defaultWidth": 100, "borderWidth": 1,
@ -2335,6 +2395,7 @@
["E","AttributeError"], ["E","AttributeError"]]
}]
],
"direct": [true, true, true, true, true, false, false],
"undo": [
["AddRecord", "_grist_Tables_column", 5,
{"parentPos": 5.0, "parentId": 1,
@ -2392,6 +2453,7 @@
["RemoveRecord", "_grist_Tables", 1],
["RemoveTable", "Students"]
],
"direct": [true, true, true],
"undo": [
["BulkAddRecord", "_grist_Tables_column", [1, 2, 3, 4, 6, 9], {
"colId": ["firstName", "lastName", "fullName", "fullNameLen", "schoolShort",
@ -2466,6 +2528,7 @@
["ModifyColumn", "People", "school", {"type": "Ref:School"}],
["UpdateRecord", "_grist_Tables_column", 5, {"type": "Ref:School"}]
],
"direct": [true, true, true, true, true, true, true],
"undo": [
["RenameTable", "People", "Students"],
["UpdateRecord", "_grist_Tables", 1, {"tableId": "Students"}],
@ -2495,6 +2558,7 @@
["RenameTable", "PEOPLE", "People"],
["UpdateRecord", "_grist_Tables", 1, {"tableId": "People"}]
],
"direct": [true, true, true, true],
"undo": [
["RenameTable", "PEOPLE", "People"],
["UpdateRecord", "_grist_Tables", 1, {"tableId": "People"}],
@ -2514,6 +2578,7 @@
["BulkUpdateRecord", "People", [2, 4], {"schoolRegion": [null, null]}],
["BulkUpdateRecord", "People", [2, 4], {"schoolShort": ["", ""]}]
],
"direct": [true, true, false ,false],
"undo": [
["AddRecord", "School", 8, {"name": "Yale University", "address": 4}],
["BulkUpdateRecord", "People", [2, 4], {"school": [8, 8]}],
@ -2577,6 +2642,7 @@
["ModifyColumn", "People", "school", {"type": "Ref:School"}],
["UpdateRecord", "_grist_Tables_column", 5, {"type": "Ref:School"}]
],
"direct": [true, true, true, true, true, true, true],
"undo": [
["RenameTable", "People", "Students"],
["UpdateRecord", "_grist_Tables", 1, {"tableId": "Students"}],
@ -2602,6 +2668,7 @@
["BulkUpdateRecord", "People", [2, 4], {"schoolRegion": [null, null]}],
["BulkUpdateRecord", "People", [2, 4], {"schoolShort": ["", ""]}]
],
"direct": [true, true, false, false],
"undo": [
["AddRecord", "School", 8, {"name": "Yale University", "address": 4}],
["BulkUpdateRecord", "People", [2, 4], {"school": [8, 8]}],
@ -2682,6 +2749,7 @@
["AddRecord", "_grist_REPL_Hist", 5,
{"code": "foo(10)", "errorText": "", "outputText": "100\n"}]
],
"direct": [true, true, true, true, true, true, true],
"undo" : [
["RemoveRecord", "_grist_REPL_Hist", 1],
["RemoveRecord", "_grist_REPL_Hist", 2],
@ -2731,6 +2799,7 @@
["E","TypeError"], ["E","TypeError"], ["E","TypeError"], ["E","TypeError"]]
}]
],
"direct": [true, true, true, false, true, true, true, false, false],
"undo": [
["RemoveRecord", "_grist_REPL_Hist", 6],
@ -2789,6 +2858,7 @@
["AddRecord", "_grist_REPL_Hist", 14,
{"code": "setattr(sys.stderr, 'close', foo)", "errorText": "", "outputText": ""}]
],
"direct": [true, true, true, true, true, true, true, true],
"undo": [
["RemoveRecord", "_grist_REPL_Hist", 7],
["RemoveRecord", "_grist_REPL_Hist", 8],
@ -2846,6 +2916,7 @@
false, "label": "table", "parentId": 1, "parentPos": 7.0, "type": "Text", "widgetOptions":
""}]
],
"direct": [true, true, true, true, true, true, true, true, true, true, true, true],
"undo": [
["RemoveColumn", "foo", "on"],
["RemoveRecord", "_grist_Tables_column", 2],
@ -2895,6 +2966,7 @@
["RenameColumn", "foo", "table", "transaction"],
["UpdateRecord", "_grist_Tables_column", 7, {"colId": "transaction"}]
],
"direct": [true, true, true, true, true, true, true, true, true, true, true, true],
"undo": [
["RenameColumn", "foo", "select", "on"],
["UpdateRecord", "_grist_Tables_column", 2, {"colId": "on"}],

5
sandbox/grist/useractions.py
Unescape View File

@ -156,6 +156,7 @@ class UserActions(object):
action = action.simplify()
if action:
self._engine.out_actions.stored.append(action)
self._engine.out_actions.direct.append(True)
self._engine.apply_doc_action(action)
def _bulk_action_iter(self, table_id, row_ids, col_values=None):
@ -190,7 +191,9 @@ class UserActions(object):
@useraction
def InitNewDoc(self, timezone):
self._engine.out_actions.stored.extend(schema.schema_create_actions())
creation_actions = schema.schema_create_actions()
self._engine.out_actions.stored.extend(creation_actions)
self._engine.out_actions.direct += [True] * len(creation_actions)
self._do_doc_action(actions.AddRecord("_grist_DocInfo", 1,
{'schemaVersion': schema.SCHEMA_VERSION,
'timezone': timezone}))

Write Preview
Loading…
Cancel
Save