From 5197891427f6a44869993913a18fb7e0569507fb Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Mon, 13 Nov 2023 22:59:23 +0200
Subject: [PATCH] (core) Remove transform columns on shutdown

Summary: Call a new user action `RemoveTransformColumns` in ActiveDoc shutdown.

Test Plan: Added nbrowser test

Reviewers: georgegevoian, paulfitz

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4107
---
 app/common/DocActions.ts                      |  18 ++++++++-
 app/server/lib/ActiveDoc.ts                   |   8 ++++
 app/server/lib/Sharing.ts                     |   4 +-
 sandbox/grist/useractions.py                  |  31 +++++++++-------
 .../docs/RemoveTransformColumns.grist         | Bin 0 -> 163840 bytes
 test/nbrowser/RemoveTransformColumns.ts       |  35 ++++++++++++++++++
 test/server/testUtils.ts                      |  10 +++--
 7 files changed, 84 insertions(+), 22 deletions(-)
 create mode 100644 test/fixtures/docs/RemoveTransformColumns.grist
 create mode 100644 test/nbrowser/RemoveTransformColumns.ts

diff --git a/app/common/DocActions.ts b/app/common/DocActions.ts
index 1a64afea..b89246e7 100644
--- a/app/common/DocActions.ts
+++ b/app/common/DocActions.ts
@@ -145,8 +145,22 @@ export interface TableRecordValue {
 
 export type UserAction = Array<string|number|object|boolean|null|undefined>;
 
-// Actions that trigger formula calculations in the data engine
-export const CALCULATING_USER_ACTIONS = new Set(['Calculate', 'UpdateCurrentTime', 'RespondToRequests']);
+// Actions that are performed automatically by the server
+// for things like regular maintenance or triggering formula calculations in the data engine.
+// Typically applied using `makeExceptionalDocSession("system")`.
+// They're also 'non-essential' in the sense that we don't need to worry about storing them
+// in action/undo history if they don't change anything (which they often won't)
+// and we can dismiss their result if the document is shutting down.
+export const SYSTEM_ACTIONS = new Set([
+  // Initial dummy action performed when the document laods.
+  'Calculate',
+  // Called automatically at regular intervals, again to trigger formula calculations.
+  'UpdateCurrentTime',
+  // Part of the formula calculation process for formulas that use the `REQUEST` function.
+  'RespondToRequests',
+  // Performed at shutdown to clean up temporary helper columns.
+  'RemoveTransformColumns'
+]);
 
 export function getNumRows(action: DocAction): number {
   return !isDataAction(action) ? 0
diff --git a/app/server/lib/ActiveDoc.ts b/app/server/lib/ActiveDoc.ts
index f7f5c882..041129a2 100644
--- a/app/server/lib/ActiveDoc.ts
+++ b/app/server/lib/ActiveDoc.ts
@@ -1994,6 +1994,14 @@ export class ActiveDoc extends EventEmitter {
         // even if the doc is only ever opened briefly, without having to slow down startup.
         await safeCallAndWait("removeUnusedAttachments", () => this.removeUnusedAttachments(true, usageOptions));
 
+        if (this._dataEngine && this._fullyLoaded) {
+          // Note that this must happen before `this._shuttingDown = true` because of this line in Sharing.ts:
+          //     if (this._activeDoc.isShuttingDown && isCalculate) {
+          await safeCallAndWait("removeTransformColumns",
+            () => this.applyUserActions(docSession, [["RemoveTransformColumns"]])
+          );
+        }
+
         // Update data size; we'll be syncing both it and attachments size to the database soon.
         await safeCallAndWait("_updateDataSize", () => this._updateDataSize(usageOptions));
       }
diff --git a/app/server/lib/Sharing.ts b/app/server/lib/Sharing.ts
index da48477e..77743e63 100644
--- a/app/server/lib/Sharing.ts
+++ b/app/server/lib/Sharing.ts
@@ -8,7 +8,7 @@ import {
   UserActionBundle
 } from 'app/common/ActionBundle';
 import {ApplyUAExtendedOptions} from 'app/common/ActiveDocAPI';
-import {CALCULATING_USER_ACTIONS, DocAction, getNumRows, UserAction} from 'app/common/DocActions';
+import {DocAction, getNumRows, SYSTEM_ACTIONS, UserAction} from 'app/common/DocActions';
 import {allToken} from 'app/common/sharing';
 import {GranularAccessForBundle} from 'app/server/lib/GranularAccess';
 import log from 'app/server/lib/log';
@@ -246,7 +246,7 @@ export class Sharing {
 
     try {
 
-      const isCalculate = (userActions.length === 1 && CALCULATING_USER_ACTIONS.has(userActions[0][0] as string));
+      const isCalculate = (userActions.length === 1 && SYSTEM_ACTIONS.has(userActions[0][0] as string));
       // `internal` is true if users shouldn't be able to undo the actions. Applies to:
       // - Calculate/UpdateCurrentTime because it's not considered as performed by a particular client.
       // - Adding attachment metadata when uploading attachments,
diff --git a/sandbox/grist/useractions.py b/sandbox/grist/useractions.py
index 30868a8e..21f4c31e 100644
--- a/sandbox/grist/useractions.py
+++ b/sandbox/grist/useractions.py
@@ -1246,10 +1246,7 @@ class UserActions(object):
     # Remove also all autogenereted formula columns for conditional styles.
     # But not from transform columns, as those columns borrow rules from original columns
     more_removals.update([rule
-                          for col in col_recs if not col.colId.startswith((
-                            'gristHelper_Transform',
-                            'gristHelper_Converted',
-                          ))
+                          for col in col_recs if not _is_transform_col(col.colId)
                           for rule in col.rules])
 
     # Add any extra removals after removing the requested columns in the requested order.
@@ -1353,10 +1350,7 @@ class UserActions(object):
 
     transform = (
         col_id is not None and
-        col_id.startswith((
-          'gristHelper_Transform',
-          'gristHelper_Converted',
-        ))
+        _is_transform_col(col_id)
     )
 
     ret = self.doAddColumn(table_id, col_id, col_info)
@@ -1387,11 +1381,8 @@ class UserActions(object):
     table_rec = self._docmodel.get_table_rec(table_id)
 
     transform = (
-      col_id is not None and
-      col_id.startswith((
-        'gristHelper_Transform',
-        'gristHelper_Converted',
-      ))
+        col_id is not None and
+        _is_transform_col(col_id)
     )
 
     # Add a field for this column to the view(s) for this table.
@@ -1404,7 +1395,6 @@ class UserActions(object):
           self._docmodel.insert(section.fields, col_info.get('_position'), colRef=ret['colRef'])
     return ret
 
-
   @classmethod
   def _pick_col_name(cls, table_rec, col_id, old_col_id=None, avoid_extra=None):
     avoid_set = set(c.colId for c in table_rec.columns)
@@ -1490,6 +1480,12 @@ class UserActions(object):
         # Update the col's displayCol ref
         self._docmodel.update([col_rec], displayCol=display_col_ref)
 
+  @useraction
+  def RemoveTransformColumns(self):
+    self._docmodel.remove([
+      col for col in self._docmodel.columns.all if _is_transform_col(col.colId)
+    ])
+
   # Helper function to get a helper column with the given formula, or to add one if none
   # currently exist.
   def _add_or_update_helper_col(self, table_rec, display_col_rec, formula):
@@ -2208,3 +2204,10 @@ class UserActions(object):
   def GenImporterView(self, source_table_id, dest_table_id, transform_rule=None, options=None):
     return self._import_actions.DoGenImporterView(
         source_table_id, dest_table_id, transform_rule, options or {})
+
+
+def _is_transform_col(col_id):
+  return col_id.startswith((
+    'gristHelper_Transform',
+    'gristHelper_Converted',
+  ))
diff --git a/test/fixtures/docs/RemoveTransformColumns.grist b/test/fixtures/docs/RemoveTransformColumns.grist
new file mode 100644
index 0000000000000000000000000000000000000000..2ec267a4288f27630f302fe66b5bf4416740a0e5
GIT binary patch
literal 163840
zcmeI5?{6DNddInzEK-sw+HoAlNt|q$%gL;*M6@j1Iybmb5^eJ=%ZfxLF^rU6aYxdg
zm%GgVu&e||E6L8KFM9t#fxhgU7We)dq`;x*i+j^+-xNg;Xo~`OZ?5QFTj1_+1+IN&
zmRv5$S=v75hhuyRo8rzh^UO1!=h@lWo#Alhtp&ql>bmXJHBX&N984%m;!RaeBoYJk
z|2X|`z4p<E!PWu&Rp@^zaxD8eka(?@*iVvunO}1G%bEYp{Bq>k(I2P2JN#+#lOeW$
zdGM0*lgzJWg^~6d5x9FJoy<;8D<9W9ZOvrW4aac3YK4Dxt2Nv7>y|8SY;L(!td!JB
zadx4k=44rN>TyF?%ZruL#nQ66v|PSYT)w7WE?qmR<{FyAEU&ERLiv2@LUDDWqE3d=
zCELxZi>p^k%jG$>B`&a;nHkDLmhsY+(z}&VHa<=QZ@a-{>05@r!Mv*t&#*1h+gs3Z
zFHoTSrj}D@uU=g!6&FLr+$Me&2w`tYQ(I%EOr_4;nq!D6Wn$m*3^vCba>23d3xO6{
z-L7A+YtHtH?K?GIKu%3J+=i)b$I5RRu0dXnl{-GUyvxqT)rAFWyu)gmS$k)bS@Nm_
z`8;dL%I9~J2a?(Gab@p{B*dcemhKZ&{h~>zm4`#aF*v%n4Ym~*Z5?z);L96nTl1{0
zSrm0LA353<uVjVQc!Vvpb%~Pv?!nPyHlJ7au187C+qJT_Za2@N=FtHui>9z244t$|
z&x{6RPPc!=DYK@zH<>sYdt=+JZBnD(rjpbuNt5^)XVlpTwk195$QZv)XZi~BJj2@P
ztv<iIG9vn)yX6QHciXKlnf``h&1;?(fay#d?Z6|;p&lPmo3FTTNQfsU)Fo3hEY+|)
zw!s{=Au3jNs#!JkP)U$n)`PBN@oI(oCVq0Xm2i8bC2q29Y35c5Z<DE%C#>O?X8KH>
zUAQ_M_B`X`fqqpbGkN|XkLJ2|&Cooit6PS*DI`%%`JJWVWVTRHb}x5Py<nKE9c-Lw
zD`g~xXiI)yp6cAC(%fay>A#^)=1+$05)s+c<A!2;%VJL1ay`weu@>J}e?LCn%$MIi
znM`IcUR3tp>1t9@oN<@vvSmBlvkqz5Y{!E{n2KqrB<p?K+;l(p&LRc6W7O0&VS!qn
z4;yG{brv*#b+P=`YN=Hy44uGemFEi!X{~-Fyh64jf&ZoY7Rddsrv~{{+iF(a!gVb*
zl&xP>5{9L-+wS`&jpVAD@7dzG+80o@&{sUX_vZd&_WXI}qijD<#ON4$5c&_pz4PR4
z;waCn$8#aVT)qqICC%NGd4#YQ1$ULYz1mH>GK2+#5exO}Eq`=)kqS~LW3Q`0HvY-m
zG~A|lLM4Gk6e)2^=o&6g19hE71gc}(o>1j5M%`0Wn;WWIv-Rzuzlg?0>oeI@v#C$B
zgpQ!<X3_kWp`omH{vo3yHZGETV}r@;*|W;M^U{c@x*ltE$Ad`R-!~dWmixy-$RjeW
z?C3=&+kH`UeApqTi(p#?KMCmy-`NRA<f4K60vn&D#)outsf*9y*fbjHn?v;TeRF)<
z<rn0xI$HkSy*7}{PE06wncN{_)Wv)MAlwK0y5V6w5Jq^HX&o-00Ye|L?=q)L+~FZU
zs_rMZ={o83cqnRsX;?S=X6Vay=OrbXJ#j+W@w?daE2Y~Gb8)yYhO7`i1Xx4o=dl={
zH7_Dz$cljqkAqf9{*8S@*|$#I|LhJ7j`a3Cf$l4x%F^4xbei8{9^`L$fdB}A00@8p
z2!H?xfB*=900@8p2t26-MtH+;|No@A7wrN85C8!X009sH0T2KI5C8!X00BV&^Zy70
z5C8!X009sH0T2KI5C8!X009tq@(JMn|H=0;S_lFl00JNY0w4eaAOHd&00JNY0{s48
zIdCOG|L_6<5C8!X009sH0T2KI5CDM(C-9xg8>z%jT2cPw-Sx9mXP9<w>dfg{Vg2;X
zbYW&jD@^IynQ2`=HC>yYIki?}Y-(nDMn8RKTC1JX^|h(mG&@^cJ2%Z{PE~Jw==1L;
z2Yb!&y&U~F>F`n2`op14+M&_7K}SB{)0}U8e4YL#L<VNvVy4|-?sdM$d0+@_e{3`i
z+Mq2+6s2A%E-XxnPX_Jnd!28PZg3?ZiZs55-C|SfdZIPH<uY%=pnXvNA<7r*QD;=?
zqo1U==B{=^hbYLm-Q7t1{n)bd{oAu5g>Rha^Ig~L+i%jQy@omI^KWklTT%ua{e`g3
z)Yhj8x^|kK)~7U%dFo8<%&GNr>}=uOq+ZYpr`9y>tUi5CpFDSNtuR&7&Q595rzX#=
zt*=co?X<9w@3_iz(YAI2uXASp0eV|)(AIQpnbmAZ7x^oESMh=ofP02=h;0ZjF|)y(
z>YPnv9oo|Nl*lmo=o%}u6RXSj?QUueAX$3gjYqe0aq@T7(Y9=H(jVo#$aR5-f)KjS
zUG5*Ew<Z?8Lpbf+O}nv2Ncx;)(T^u7BB!}Atv^ngKg<RDpy$4ktFYVNtbIFoGN+lw
zhQ)Vjrc{%yd$~Iz$|m_areyvqLI3aq0T2KI5C8!X009sH0T2KI5C8!Xc<cz22I)!L
zqdpJ2!RP-6GCxXW{wMSA^an2x009sH0T2KI5C8!X009sH0T2Lz$DhEVfx*P9ifPk&
zmMULtVtF?*`vwy)H<Luds4|#1s<@l<^X&Q!KL0<E`Nu@&zcT+ufA9hU5C8!X009sH
z0T2KI5C8!X009vA$`BYHI655M;2#|5d>k+^HV}OnuupvdKl7Ue{lg0cKmY_l00ck)
z1V8`;KmY_l00cnbi6bzW7)+$o{Qf_|caXpf1V8`;KmY_l00ck)1V8`;KmY_l;E5#=
z%>RFy$b9<5HW3X20T2KI5C8!X009sH0T2KI5CDO%Hi4p&;#2s_)H~zFb;qb_uYb$l
z)GUj+YreDbVNUD=z-Y&RW=*WF(60b6Ys0X3LSx(8w5_S!o#6ie=ZVbEzuG8ZJqUmR
z2!H?xfB*=900@8p2!H?xfIvtfGmxac|57O>_?gCmB)|VprE7`I4>KQSo*VnWu}{YS
zApM_|fENgW00@8p2!H?xfB*=900@A<!xGp@9egUGC^OGrA1=<MQ}jxt5(5V}9K-c4
zF|)y(YUH=#{W_zW+z0#(cZbzpi|T3qkUY~*MN`|_txVIBRJv_RCYracq4|^Y4`_*8
z$MrE@-`OMS;cuP|TRs-e8`{Qysy?<k(h{@jrt(y}tvnsg8a9S2mkN#^;5ssg)5GaZ
zXyAdlqP0Eu?a@Hw4wu`a(OD8b7?P8@Ek|qQzTr7OyHgdlSH)eoTdmoqU$<V<O!GDR
zSk`BYBciS&*HaNQMvC0*2dnH(aeA1mczHaXO1~VoWVo(bzGkl2j&~*ev}C*OWPJbs
zVNYk|2LTWO0T2KI5C8!X009sH0T2LzuO5MP=GTd|@{>d+oB4kFlLNmu^6co3Q{Nr_
zH2KL8+rK<`iA3L`ED!L?{95_bY(B5tyXk3bCTl+NDAybG@WJgo%FHd7ij|UDDb6mG
z)Lf@9rye(SwY*p<T`VoDOUvae#pP@2<<hm2YEEcgX6w07K3}>}TwSQBlO(krW8;Eh
zvPG@Va%!dYZbfa0$Hz(D&>WXtu${VZYBIUbOrvgi%#jLhpIY_4Z+oPB_UhGzQgJa<
z&ueFHO>3|k{j8#_xF{GWbZ;6B!!kTWGu?((i>tt@*}7qE$kcCY?j@$_%yA{g<?r4|
zC$rPj%Ez^+YdRiA$sSORN!`>@te>+8H~s!(S(iI2kkYfLoVvJrrL<h03uzYE%*+fC
z70<?Gt@XAWQU`At`Udl^Hax?&NN;Zh7;fl(nG4tBW5d+em?=}KliwXfR4EhtmS?az
z{*dp2W7ih~EwZ{@zh2jz?G@X1YP^7)nr^raQ`?S}-!fc-!ZcRy_$KQnv$(pjK(y)M
zt7g{T*<_Zy>Oelv8nW{F-Q<B}c6?mfyCMm(=)=!+pP=d&O+qaXre3c$9D}2K+hAL9
z(bhp%M6kS(wl&Y_;V4xj^O2)%@k&-$jYpWgAIk3@98L0maPNAQ#JpWATkCf7G;1Cm
zkg{kB`@zsjn;ZobT|h6RHO;-r#L3tzb8DN_=(njPwMx##GwSREo4z_G!B57}q=n_J
zFwdjzsXIKz$Md@@BclJgTaF-cx83TJ>C+d|<~2_Xz;vdKcHoiaP>+wO%~#wtLx?9P
z)Fo3hEY+|)w!s{=Au3jNs#!JkP)U$n)`M0qUae5y#7~a45^is_#7(v>&D<*CZ8DYe
zgf-mKOrNQ<3s+~u?rwZM(66dwCeI(_(OlQA8Jfp*b<6NJg(Rvezq2%)%oYmD?&U73
z{2JH}HqNw_G7>|yCBH9Eb?#DW?y|T-zoAa%PloLh5!n+Qq1fKCm{Yb~PqS*Q#kYNN
zZsyDHo=hgQ7cVM%?{qb(D9*S`G-GBv+p`X7*=)yyM3{<cs3hxs+uU?N_fB(8OkEQe
zsO9;vffkK9g66L-mfu<}wF-ry6Bw=Xd|@H2)sKY3nN}q5zf|7>x!?8FAfIYm&5B#N
zuBC>u^@~cvuyl6Yecz<9OI7ndTO3#W0;(4Jiih{!+@H*zKd*e0?dORY9YYU7|6#ay
zp1e&Q<$3jZE<~8icVWGxxtlVN5Z0pLu2Q#GyGd7uuwXDIp?<yPj}9+VLF#1ebv4Mw
zKY5#m+w@MTB(R7gB~A%l!^LT!uG5G>b!^)csvO3sdunQPLv?Gmz8&-z(b#BxCYx$D
z^=X#S5menQn!hqMl-15ZWOT&FMRIR!Fqu7jR=Iax8WC03V~y^35Q+QyMuW(5|5yll
z@KJnoSlQ8wPPY4^TrfWD5Yr7nTLnJ}=?dT32}k6jf&2m+pQXl!babhU&*9iK8tI!u
z^z(gleB0$0<gPke{@uMckjzd@D0i9MA!5|Ud;cKZ2m89=VLT8<c$aA%E}#KJAF=Q9
zyR5E;MLfVq)&1l)T_>F$4@C_y4eMs#41L+|yrd+vCr&6keivJQrEK2Kwl1vhz8JD1
z??Zq!bbcO-@mcdC5{9f8sBm1Zl>8g}hO%#+xc}K57#!*CMZy5x(5LuKJ?8%(;L!%M
zfB*=900@8p2!H?xfB*=900@A<SDZk4_$P^x#GS+#OZ{!~zmp3?e>rq;|LWjh>^qdW
zGxpJe-;Vxh<h7BnfA)<O4<GgpWs})rQMoq}dCF4dQ*3V44JO&D>jpFR;JKnq@?6KW
zm)24OiHd&HY3)aftz`$TsR=%@A4u;vQ!Sqjq~bIw?QP0u)$TiA{ixHu>xLP#oFQ%^
zIDaqujF_wY<G12{63pjzKt6hZKlJl}s4EuXgZSq%+m=mEdWL7pXD$2B+v{vy^G)xa
zc;~Iz4z0K7lYt&l%GaUT@e36A3K6dov%G;O{%zk|p+zRLmIl6#le)ADhgJm;;@<gL
z3R3>Gbj7Llo!M?@3lzy?nro_P4z0uJmy6Zcm@c2fj*ZNn@gvFXtFJ1%hk7G35|Piw
zM`FJS4CVxSC&%N~n)Go-e&^iNfu&PXOP92b)}!O9_?(qmDn$J(y+!?F?5V=1{wz=9
z>l5VuX^<81eOZ3z=wY#rW9R*-=@o5lR&$!YaB%R9)c8R5J6lh6_OtESQ^7;|ZrjQp
ztGAYzkp<%LNSu8_+Rs8V!ep_4<LT#jUOAM^zW#dWq(ShVzo4&-tb-8=PsiD4G9mwb
ztXw)M=J9sFDH_^zYUwszC@jsa#wQ+@TH9Ihcej|&aL^)^c<{ooMcLB6{O++#GW*6G
zU5k%G%UY_to7zf0)W2b^Z2j7{X}g}RQ|5~w<>w)v0gLN%bXo{V!ylQ#wlTe36<-`d
zXLnDrd?GRUM~}2LbLiNR7y|CS_<}eC@6il)dyQvtZef|PD{Jy?9lj*R+LHF8=`dF;
zgOih^FHF}Bm#<Z#OPO@Q<``DZXwYKH9u#y9(`sh82(XtSN$I*p-_Dh*ZWmtSi%DbF
zV1@SaFYwB2;MchLj*g7v(NXj~$5``e1&B;Voz?B0bXq|3yl~LnOw>UYS{O^Ko>~rS
z9lj`aP)pj+K|*<K7s+nXC5R7Vx(#oxG&J00TC2(zF~+J0rkK0Si&ea_D>0=+h$XXl
ztjd=3<@feKCzep%n~vfl@LFw?FKKHLi=-TrLW^YR$Bo8lwEBq@_jr!%<U(ox)|AB!
z3wgN};{!VHWhVodQcozWkXB7@uuII?*d(#6tjN%BgiDkB^UP$lMlGk#(~9m&`AR8V
z*VgnlEgjr@c1$dZ#L{q?8@|+~;h6vb?4NBwBM5*12!H?xfB*=900@8p2!H?xJZ=PV
z|Nppo1onUc2!H?xfB*=900@8p2!H?xfWT)@0Qdi&JyU1|0T2KI5C8!X009sH0T2KI
z5CDP4jR3#@S7?L(2ixQSakC!wfB*=900@8p2!H?xfB*=900@8p2=pT`G%%P@l!1ZZ
z{{L5r%&+?8h71Hi00ck)1V8`;KmY_l00ck)1VG>`NFX_|KcS?;`~ROMGC%tYwgM)D
z00@8p2!H?xfB*=900@8p2!H?xbQ3sC_xwkXr7Qf`Fba;gRpq}W!{`6^Wqy#z{42fT
z1p*)d0w4eaAOHd&00JNY0w4eaAn<q+cp>>T&Ey|Vr<LKfc%@RQbYj3^HTr#W{iPw2
zDsAbZK-v;te~;h)4`u!=k@-dDUowA}`RmO0=m0Me009sH0T2KI5C8!X009sH0T2Lz
zFOb04kx{yRS5j$yPoF$;VC?DW@zbMYhoi@bN5-Ct91lHp;NT%~yib%LIy9>MVC-Nt
z$H5VP|DQPc1vUv)fdB}A00@8p2!H?xfB*=900@8p2z=oLaR2{>BS(cG00JNY0w4ea
zAOHd&00JNY0wC~(6Ttod7mgeif&d7B00@8p2!H?xfB*=900@A<7fyiR|0|h4PtZTS
zKmY_l00ck)1V8`;KmY_l00ck)1in-P?<ymS)XS-z^pSMxdd_dq&iyR+-t`Z2-gblK
zzLDEvYn!%xGj}p)=ya&BpF71)O-)V|rcSR<oIbm@KCxC<U!P#p1$OStsnb)1(=2!A
zJ&(CwaR2|)MCPYoY6DR@2!H?xfB*=900@8p2!H?xfB*=9z#|iQRymLuRt~3A>2xxk
z{^s?<dw=+gKxuIQ|C>bSH;-Hi6o3E-fB*=900@8p2!H?xfB*=900=yG1O}DC1pQzj
z*_9qBCo;vcj}H8H^hYDF4S$^aIQh@XefxhnXbt=WiSPme5V#+Ko&8@+W=jQS=Vimv
z+3o6vW4K<m=y_Ugv(7Bft*#p;E9>;JS9W}Exm2u_)biqd>0Px~-Y%<NU6ja=hr07S
z&%Kh&UY=HViV-{9ZMV8)`WuEduX$S4w~Y6FR=vr#gQ_~k<4t2$7t3$0cG}dLF``Gc
zt)^L>S&lbEt!4eBO10&8-_0enM~^D^Mm=rKWEK8a2;RTmthG{{T_~x!ATg&NH*}&>
zDP1frt4qt}E5+q&>gCe4lWMN6S-xhj*p8P|7gw*8mdkVMeCa}Qb)ljb*v!lf<tgUW
zO6lE7m_9yEiL*I%cH!!5n7FvQut3Rk@?_!1OU!IAr#fd_x0vHGU8XjgvEpc!yKX!6
z`(+F@p6YGHBpD@DD$ASSJ@axh`|7L8-PZ-$W(>_S({!VsU+u&k74?HHbS|^?T<DAz
zYHnrCHe+Ruy;UY&EgwdUIkru{o4tB<p;TN9-N6+$G>6WUxN>6An^a@Xwmd2*qwc%R
z5k__eM1E&gO=k0XWtT<4T`)|KIW2U}qpwNfHHH1~-7?tL3afdBZN-A>2a!&1vPRad
zhGAJe9(yR}cTT*N%$_}~?D)}k73UVNu=*M`ZPRG9n%9~5inNuTdHOXraGu=dwN1m6
zMMHk)&Wp+H^t7^ftjpRZ$FOQfLkq*03~8t3;%tp%>C=Y<k<=9t6n{KeN_EXJWyra3
zQL8hVY{RkrMx4;FTu-xVbP?z&n%{ZlSTZ{`rR>zZ+P}<P+jnX#;;S%8jca|Fqo1Ed
zMG{+r6S}Osy;knM_(C#!;)HUK8bV!nv-cp6Ec<4Mh5YcPSnIg7pJh(7&GHzcp15wf
zE}cuHMAok~!jS1{0kuu5nHQ*M_DwBDI%k`H-IA+r7hcjFSAHRg*jHh<rJa#O1eR<v
zKkmZCV~oZQj<M#`DqWeObyl}~((}6~pBE0gn~6H8;usqn?cS_)_@dN7Eonao3FWap
z8M{S&aD`STcN^Zk(i-kE)AViP9IHYTePwrfarrj2H6}eTr9{Z#%;K>s?IZX0KbOoF
z3d+6dD6Z(Bt!Ef_ObRVhq#rlx$AckYkLSovE{y9sxQr8xE4N~NKr-3Mz)P0oQE1e)
z4R(nc8=DlQva%w>JBIFU%H^I>XY<TtVnj4g1K3LWN-4aMH@(d>tu{<s)430%x$-;b
zjwZ7c6Uy!@Q9mq~mKLg)_%J%~LU{aw)CZxsp9gBTE`@0OUc>j|&R6C*wj&khcYgm_
z5kj4&zpa@DEz;+GRMYrK%JWk5BN_TNfR8F;`YtQxqSWVX&GY;J!OZs(ng7WAQ|52z
z1708i0w4eaAOHd&00JNY0w4eaAOHeiGJ(T`$wW4tem*UpGrvu<3iMR(@IW-Nq#K^?
zxKHg9iARH+MZHcBpPy2qX;-%_D$MWy69>QKW}$iz009sH0T2KI5C8!X009sH0T2Lz
z&y@h~|36o}P!0kh00JNY0w4eaAOHd&00JNY0*?g&-2XooZh#RW00JNY0w4eaAOHd&
z00JNY0wD0Y65#j$N~V&ae|Uia2!H?xfB*=900@8p2!H?xfB*<Q1c9BrGMX5EcK2K&
zlNlcN6)IY|K1}c8<AOgzAKSZEi^QUMpB3+O{t?O$-T67(CAvovZZz#b6IbR`k0>m3
zs!-sz;QRj^0$v~h0w4eaAOHd&00JNY0w4eaAn@c8!2SP|>sz!81V8`;KmY_l00ck)
O1V8`;KmY_<1pXiW+5lVt

literal 0
HcmV?d00001

diff --git a/test/nbrowser/RemoveTransformColumns.ts b/test/nbrowser/RemoveTransformColumns.ts
new file mode 100644
index 00000000..a84c974b
--- /dev/null
+++ b/test/nbrowser/RemoveTransformColumns.ts
@@ -0,0 +1,35 @@
+import {assert, driver} from 'mocha-webdriver';
+
+import * as gu from 'test/nbrowser/gristUtils';
+import {server, setupTestSuite} from "test/nbrowser/testUtils";
+
+describe('RemoveTransformColumns', function () {
+  this.timeout(4000);
+  setupTestSuite();
+
+  it('should remove transform columns when the doc shuts down', async function () {
+    await server.simulateLogin("Chimpy", "chimpy@getgrist.com", 'nasa');
+    const doc = await gu.importFixturesDoc('chimpy', 'nasa', 'Horizon', 'RemoveTransformColumns.grist', false);
+    await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
+    await gu.waitForDocToLoad();
+
+    assert.deepEqual(await gu.getVisibleGridCells({col: 'B', rowNums: [1]}), [
+      'manualSort, A, B, C, ' +
+      'gristHelper_Converted, gristHelper_Transform, ' +
+      'gristHelper_Converted2, gristHelper_Transform2'
+    ]);
+
+    const userAPI = gu.createHomeApi('chimpy', 'nasa');
+    await userAPI.applyUserActions(doc.id, [["Calculate"]]);  // finish loading fully
+    await userAPI.getDocAPI(doc.id).forceReload();
+    await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
+    await gu.waitForDocToLoad();
+
+    assert.deepEqual(await gu.getVisibleGridCells({col: 'B', rowNums: [1]}), [
+      'manualSort, A, B, C'
+    ]);
+
+    await gu.checkForErrors();
+  });
+
+});
diff --git a/test/server/testUtils.ts b/test/server/testUtils.ts
index 5975511b..3f0a5cb6 100644
--- a/test/server/testUtils.ts
+++ b/test/server/testUtils.ts
@@ -67,7 +67,7 @@ class CaptureTransport extends winston.Transport {
   private _captureFunc: (level: string, msg: string, meta: any) => void;
 
   public constructor(options: any) {
-    super();
+    super(options);
     this._captureFunc = options.captureFunc;
     if (options.name) {
       this.name = options.name;
@@ -125,7 +125,8 @@ export function setTmpLogLevel(level: string, optCaptureFunc?: (level: string, m
  * strings. These may be tested using testUtils.assertMatchArray(). Callback may return a promise.
  */
 export async function captureLog(
-  minLevel: string, callback: (messages: string[]) => void|Promise<void>
+  minLevel: string, callback: (messages: string[]) => void|Promise<void>,
+  options: {timestamp: boolean} = {timestamp: false}
 ): Promise<string[]> {
   const messages: string[] = [];
   const prevLogLevel = log.transports.file.level;
@@ -133,14 +134,15 @@ export async function captureLog(
 
   function capture(level: string, msg: string, meta: any) {
     if ((log as any).levels[level] <= (log as any).levels[minLevel]) {  // winston types are off?
-      messages.push(level + ': ' + msg + (meta ? ' ' + serialize(meta) : ''));
+      const timePrefix = options.timestamp ? new Date().toISOString() + ' ' : '';
+      messages.push(`${timePrefix}${level}: ${msg}${meta ? ' ' + serialize(meta) : ''}`);
     }
   }
 
   if (!process.env.VERBOSE) {
     log.transports.file.level = -1 as any;   // Suppress all log output.
   }
-  log.add(CaptureTransport as any, { captureFunc: capture, name });  // types are off.
+  log.add(CaptureTransport as any, { captureFunc: capture, name, level: minLevel});  // types are off.
   try {
     await callback(messages);
   } finally {