From b505d21e79cb85bd56c7ff90a025acbb01b453d6 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Fri, 29 Mar 2024 15:20:02 -0700
Subject: [PATCH 01/45] (core) Disable headers shortcut in summary tables

Summary: Summary tables have restrictions on which columns can be renamed.

Test Plan: Browser tests.

Reviewers: jarek

Reviewed By: jarek

Subscribers: jarek

Differential Revision: https://phab.getgrist.com/D4222
---
 app/client/components/GridView.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/client/components/GridView.js b/app/client/components/GridView.js
index 73970b2b..184f7375 100644
--- a/app/client/components/GridView.js
+++ b/app/client/components/GridView.js
@@ -2008,8 +2008,11 @@ GridView.prototype._getCellContextMenuOptions = function() {
       this.viewSection.disableAddRemoveRows() ||
       this.getSelection().onlyAddRowSelected()
     ),
-    disableMakeHeadersFromRow: Boolean (
-      this.gristDoc.isReadonly.get() || this.getSelection().rowIds.length !== 1 || this.getSelection().onlyAddRowSelected()
+    disableMakeHeadersFromRow: Boolean(
+      this.gristDoc.isReadonly.get() ||
+      this.getSelection().rowIds.length !== 1 ||
+      this.getSelection().onlyAddRowSelected() ||
+      this.viewSection.table().summarySourceTable() !== 0
     ),
     isViewSorted: this.viewSection.activeSortSpec.peek().length > 0,
     numRows: this.getSelection().rowIds.length,

From c87d83553301a41f53ed35a2253a34f4b4af0a6d Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Tue, 2 Apr 2024 22:24:50 -0700
Subject: [PATCH 02/45] (core) Update WS deps after grist-core sync

Summary:
Some WS-related code was touched in a recent PR to grist-core. This extends
those changes to the rest of the codebase so that builds work again.

Test Plan: N/A

Reviewers: dsagal

Reviewed By: dsagal

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D4224
---
 app/client/components/GristClientSocket.ts |  9 ++++--
 app/client/components/GristWSConnection.ts | 32 +++++++++++++++-------
 app/server/lib/GristSocketServer.ts        |  2 +-
 app/server/lib/requestUtils.ts             |  2 +-
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/app/client/components/GristClientSocket.ts b/app/client/components/GristClientSocket.ts
index b7eb27da..ed2d2d6f 100644
--- a/app/client/components/GristClientSocket.ts
+++ b/app/client/components/GristClientSocket.ts
@@ -56,7 +56,8 @@ export class GristClientSocket {
     }
   }
 
-  // pause() and resume() are used for tests and assume a WS.WebSocket transport
+  // pause(), resume(), and isOpen() are only used by tests and assume
+  // a WS.WebSocket transport.
   public pause() {
     (this._wsSocket as WS.WebSocket)?.pause();
   }
@@ -65,6 +66,10 @@ export class GristClientSocket {
     (this._wsSocket as WS.WebSocket)?.resume();
   }
 
+  public isOpen() {
+    return (this._wsSocket as WS.WebSocket)?.readyState === WS.OPEN;
+  }
+
   private _createWSSocket() {
     if (typeof WebSocket !== 'undefined') {
       this._wsSocket = new WebSocket(this._url);
@@ -149,4 +154,4 @@ export class GristClientSocket {
   private _onEIOClose() {
     this._closeHandler?.();
   }
-}
\ No newline at end of file
+}
diff --git a/app/client/components/GristWSConnection.ts b/app/client/components/GristWSConnection.ts
index f1d77732..912cd336 100644
--- a/app/client/components/GristWSConnection.ts
+++ b/app/client/components/GristWSConnection.ts
@@ -330,6 +330,15 @@ export class GristWSConnection extends Disposable {
       this._reconnectAttempts++;
     }
 
+    let url: string;
+    try {
+      url = this._buildWebsocketUrl(isReconnecting, timezone);
+    } catch (e) {
+      this._warn('Failed to get the URL for the worker serving the document');
+      this._scheduleReconnect(isReconnecting);
+      return;
+    }
+
     // Note that if a WebSocket can't establish a connection it will trigger onclose()
     // As per http://dev.w3.org/html5/websockets/
     // "If the establish a WebSocket connection algorithm fails,
@@ -337,7 +346,6 @@ export class GristWSConnection extends Disposable {
     // which then invokes the close the WebSocket connection algorithm,
     // which then establishes that the WebSocket connection is closed,
     // which fires the close event."
-    const url = this._buildWebsocketUrl(isReconnecting, timezone);
     this._log("GristWSConnection connecting to: " + url);
     this._ws = this._settings.makeWebSocket(url);
 
@@ -367,18 +375,22 @@ export class GristWSConnection extends Disposable {
       this.trigger('connectState', false);
 
       if (!this._wantReconnect) { return; }
-      const reconnectTimeout = gutil.getReconnectTimeout(this._reconnectAttempts, reconnectInterval);
-      this._log("Trying to reconnect in", reconnectTimeout, "ms");
-      this.trigger('connectionStatus', 'Trying to reconnect...', 'WARNING');
-      this._reconnectTimeout = setTimeout(async () => {
-        this._reconnectTimeout = null;
-        // Make sure we've gotten through all lazy-loading.
-        await this._initialConnection;
-        await this.connect(true);
-      }, reconnectTimeout);
+      this._scheduleReconnect(true);
     };
   }
 
+  private _scheduleReconnect(isReconnecting: boolean) {
+    const reconnectTimeout = gutil.getReconnectTimeout(this._reconnectAttempts, reconnectInterval);
+    this._log('Trying to reconnect in', reconnectTimeout, 'ms');
+    this.trigger('connectionStatus', 'Trying to reconnect...', 'WARNING');
+    this._reconnectTimeout = setTimeout(async () => {
+      this._reconnectTimeout = null;
+      // Make sure we've gotten through all lazy-loading.
+      await this._initialConnection;
+      await this.connect(isReconnecting);
+    }, reconnectTimeout);
+  }
+
   private _buildWebsocketUrl(isReconnecting: boolean, timezone: any): string {
     const url = new URL(this.docWorkerUrl);
     url.protocol = (url.protocol === 'https:') ? 'wss:' : 'ws:';
diff --git a/app/server/lib/GristSocketServer.ts b/app/server/lib/GristSocketServer.ts
index aab417d6..5a098f06 100644
--- a/app/server/lib/GristSocketServer.ts
+++ b/app/server/lib/GristSocketServer.ts
@@ -108,4 +108,4 @@ export class GristSocketServer {
     (socket as any).request = null; // Free initial request as recommended in the Engine.IO documentation
     this._connectionHandler?.(new GristServerSocketEIO(socket), req);
   }
-}
\ No newline at end of file
+}
diff --git a/app/server/lib/requestUtils.ts b/app/server/lib/requestUtils.ts
index 0b928f93..e7cd3a10 100644
--- a/app/server/lib/requestUtils.ts
+++ b/app/server/lib/requestUtils.ts
@@ -350,7 +350,7 @@ export function getEndUserProtocol(req: IncomingMessage) {
   }
   // TODO we shouldn't blindly trust X-Forwarded-Proto. See the Express approach:
   // https://expressjs.com/en/5x/api.html#trust.proxy.options.table
-  return req.headers["x-forwarded-proto"] || ((req.socket as TLSSocket).encrypted ? 'https' : 'http');
+  return req.headers["x-forwarded-proto"] || ((req.socket as TLSSocket)?.encrypted ? 'https' : 'http');
 }
 
 /**

From 03ead0d1ca0e7a94eb37bf953ec90cb4793543a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?=
 <jaroslaw.sadzinski@gmail.com>
Date: Tue, 2 Apr 2024 13:22:58 +0200
Subject: [PATCH 03/45] (core) Adding a flag for the UI to check if emails are
 enabled

Summary:
Front-end code can now test if emails are enabled
and hide some parts of UI based on it.

Test Plan:
Only secondery text was hidden on add users dialog.
Tested manually.

Reviewers: georgegevoian

Reviewed By: georgegevoian

Subscribers: georgegevoian

Differential Revision: https://phab.getgrist.com/D4221
---
 app/client/lib/ACUserManager.ts | 8 ++++----
 app/common/gristUrls.ts         | 3 +++
 app/server/lib/FlexServer.ts    | 4 ++--
 app/server/lib/GristServer.ts   | 2 ++
 app/server/lib/ICreate.ts       | 8 ++------
 app/server/lib/INotifier.ts     | 9 +++++++++
 app/server/lib/sendAppPage.ts   | 1 +
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/client/lib/ACUserManager.ts b/app/client/lib/ACUserManager.ts
index fb746a56..ca35d4b7 100644
--- a/app/client/lib/ACUserManager.ts
+++ b/app/client/lib/ACUserManager.ts
@@ -16,6 +16,7 @@ import {
   cssMemberText,
 } from "app/client/ui/UserItem";
 import {createUserImage, cssUserImage} from "app/client/ui/UserImage";
+import {getGristConfig} from 'app/common/urlUtils';
 import {Computed, computed, dom, DomElementArg, Holder, IDisposableOwner, Observable, styled} from "grainjs";
 import {cssMenuItem} from "popweasel";
 
@@ -111,10 +112,9 @@ export function buildACMemberEmail(
         )),
       cssMemberText(
         cssMemberPrimaryPlus(t("Invite new member")),
-        cssMemberSecondaryPlus(
-          // dom.text(use => `We'll email an invite to ${use(emailObs)}`)
-          dom.text(use => t("We'll email an invite to {{email}}", {email: use(emailObs)})) // TODO i18next
-        )
+        getGristConfig().notifierEnabled ? cssMemberSecondaryPlus(
+          dom.text(use => t("We'll email an invite to {{email}}", {email: use(emailObs)}))
+        ) : null,
       ),
       testId("um-add-email")
     )
diff --git a/app/common/gristUrls.ts b/app/common/gristUrls.ts
index a7708354..69f2fa2a 100644
--- a/app/common/gristUrls.ts
+++ b/app/common/gristUrls.ts
@@ -786,6 +786,9 @@ export interface GristLoadConfig {
   canCloseAccount?: boolean;
 
   experimentalPlugins?: boolean;
+
+  // If backend has an email service for sending notifications.
+  notifierEnabled?: boolean;
 }
 
 export const Features = StringUnion(
diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts
index 728adee8..020e70ae 100644
--- a/app/server/lib/FlexServer.ts
+++ b/app/server/lib/FlexServer.ts
@@ -47,7 +47,7 @@ import {initGristSessions, SessionStore} from 'app/server/lib/gristSessions';
 import {HostedStorageManager} from 'app/server/lib/HostedStorageManager';
 import {IBilling} from 'app/server/lib/IBilling';
 import {IDocStorageManager} from 'app/server/lib/IDocStorageManager';
-import {INotifier} from 'app/server/lib/INotifier';
+import {EmptyNotifier, INotifier} from 'app/server/lib/INotifier';
 import {InstallAdmin} from 'app/server/lib/InstallAdmin';
 import log from 'app/server/lib/log';
 import {getLoginSystem} from 'app/server/lib/logins';
@@ -384,7 +384,7 @@ export class FlexServer implements GristServer {
   }
 
   public hasNotifier(): boolean {
-    return Boolean(this._notifier);
+    return Boolean(this._notifier) && this._notifier !== EmptyNotifier;
   }
 
   public getNotifier(): INotifier {
diff --git a/app/server/lib/GristServer.ts b/app/server/lib/GristServer.ts
index a1fd8dac..b72b3ed5 100644
--- a/app/server/lib/GristServer.ts
+++ b/app/server/lib/GristServer.ts
@@ -52,6 +52,7 @@ export interface GristServer {
   getHomeDBManager(): HomeDBManager;
   getStorageManager(): IDocStorageManager;
   getTelemetry(): ITelemetry;
+  hasNotifier(): boolean;
   getNotifier(): INotifier;
   getDocTemplate(): Promise<DocTemplate>;
   getTag(): string;
@@ -142,6 +143,7 @@ export function createDummyGristServer(): GristServer {
     getStorageManager() { throw new Error('no storage manager'); },
     getTelemetry() { return createDummyTelemetry(); },
     getNotifier() { throw new Error('no notifier'); },
+    hasNotifier() { return false; },
     getDocTemplate() { throw new Error('no doc template'); },
     getTag() { return 'tag'; },
     sendAppPage() { return Promise.resolve(); },
diff --git a/app/server/lib/ICreate.ts b/app/server/lib/ICreate.ts
index 8f3ab17c..8d76d030 100644
--- a/app/server/lib/ICreate.ts
+++ b/app/server/lib/ICreate.ts
@@ -5,7 +5,7 @@ import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager';
 import {ExternalStorage} from 'app/server/lib/ExternalStorage';
 import {createDummyTelemetry, GristServer} from 'app/server/lib/GristServer';
 import {IBilling} from 'app/server/lib/IBilling';
-import {INotifier} from 'app/server/lib/INotifier';
+import {EmptyNotifier, INotifier} from 'app/server/lib/INotifier';
 import {InstallAdmin, SimpleInstallAdmin} from 'app/server/lib/InstallAdmin';
 import {ISandbox, ISandboxCreationOptions} from 'app/server/lib/ISandbox';
 import {IShell} from 'app/server/lib/IShell';
@@ -99,11 +99,7 @@ export function makeSimpleCreator(opts: {
       };
     },
     Notifier(dbManager, gristConfig) {
-      return notifier?.create(dbManager, gristConfig) ?? {
-        get testPending() { return false; },
-        async deleteUser()      { /* do nothing */ },
-        testSetSendMessageCallback() { return undefined; },
-      };
+      return notifier?.create(dbManager, gristConfig) ?? EmptyNotifier;
     },
     ExternalStorage(purpose, extraPrefix) {
       for (const s of storage || []) {
diff --git a/app/server/lib/INotifier.ts b/app/server/lib/INotifier.ts
index 34740b1a..9c3e0364 100644
--- a/app/server/lib/INotifier.ts
+++ b/app/server/lib/INotifier.ts
@@ -10,3 +10,12 @@ export interface INotifier {
   // Return undefined if no notification system is available.
   testSetSendMessageCallback(op: (body: SendGridMail, description: string) => Promise<void>): SendGridConfig|undefined;
 }
+
+/**
+ * A notifier that does nothing. Used when no email notifications are configured.
+ */
+export const EmptyNotifier: INotifier = {
+  get testPending() { return false; },
+  async deleteUser()      { /* do nothing */ },
+  testSetSendMessageCallback() { return undefined; },
+} as const;
diff --git a/app/server/lib/sendAppPage.ts b/app/server/lib/sendAppPage.ts
index 98aff5fb..8c5ebf92 100644
--- a/app/server/lib/sendAppPage.ts
+++ b/app/server/lib/sendAppPage.ts
@@ -97,6 +97,7 @@ export function makeGristConfig(options: MakeGristConfigOptions): GristLoadConfi
     templateOrg: getTemplateOrg(),
     canCloseAccount: isAffirmative(process.env.GRIST_ACCOUNT_CLOSE),
     experimentalPlugins: isAffirmative(process.env.GRIST_EXPERIMENTAL_PLUGINS),
+    notifierEnabled: server?.hasNotifier(),
     ...extra,
   };
 }

From ddc28e327bfb924626b45631e1ade068f6e34582 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Mon, 8 Apr 2024 10:20:50 -0700
Subject: [PATCH 04/45] (core) Use login email to match billing profile

Summary:
The login email was being used for the "email" parameter of a billing endpoint, but
the endpoint was checking it against the non-login email when looking for a matching
profile.

Test Plan: Manual.

Reviewers: dsagal

Reviewed By: dsagal

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D4226
---
 test/nbrowser/homeUtil.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/nbrowser/homeUtil.ts b/test/nbrowser/homeUtil.ts
index 31690a8c..f19bfc58 100644
--- a/test/nbrowser/homeUtil.ts
+++ b/test/nbrowser/homeUtil.ts
@@ -9,6 +9,7 @@ import fetch from 'node-fetch';
 import {authenticator} from 'otplib';
 import * as path from 'path';
 
+import {normalizeEmail} from 'app/common/emails';
 import {UserProfile} from 'app/common/LoginSessionAPI';
 import {BehavioralPrompt, UserPrefs, WelcomePopup} from 'app/common/Prefs';
 import {DocWorkerAPI, UserAPI, UserAPIImpl} from 'app/common/UserAPI';
@@ -105,7 +106,11 @@ export class HomeUtil {
       const testingHooks = await this.server.getTestingHooks();
       const sid = await this.getGristSid();
       if (!sid) { throw new Error('no session available'); }
-      await testingHooks.setLoginSessionProfile(sid, {name, email, loginMethod}, org);
+      await testingHooks.setLoginSessionProfile(
+        sid,
+        {name, email, loginEmail: normalizeEmail(email), loginMethod},
+        org
+      );
     } else {
       if (loginMethod && loginMethod !== 'Email + Password') {
         throw new Error('only Email + Password logins supported for external server tests');

From bddbcddbef2d2416bf2984e95e7b06ba4b32e1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?=
 <jaroslaw.sadzinski@gmail.com>
Date: Fri, 5 Apr 2024 10:54:53 +0200
Subject: [PATCH 05/45] (core) Endpoint to report on the latest version of
 stable grist-core image

Summary:
New endpoint `/api/version` that returns latest version of stable docker image in format:
```
{"latestVersion":"1.1.12","
  updatedAt":"2024-03-06T06:28:25.752337Z","
  isCritical":false,
 "updateURL":"https://hub.docker.com/r/gristlabs/grist"
}
```

It connects to docker hub API and reads the version from the tag lists endpoint.
Stores telemetry passed from the client such us: current version, deployment type, installationId and others.

Test Plan: Added new test

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4220
---
 app/common/SortFunc.ts          |   2 +-
 app/common/Telemetry.ts         |  20 +-
 app/server/lib/FlexServer.ts    |  18 ++
 app/server/lib/UpdateManager.ts | 263 ++++++++++++++++++++++++
 app/server/mergedServerMain.ts  |   1 +
 test/gen-server/UpdateChecks.ts | 347 ++++++++++++++++++++++++++++++++
 test/server/testUtils.ts        |  17 +-
 7 files changed, 665 insertions(+), 3 deletions(-)
 create mode 100644 app/server/lib/UpdateManager.ts
 create mode 100644 test/gen-server/UpdateChecks.ts

diff --git a/app/common/SortFunc.ts b/app/common/SortFunc.ts
index 36fb7598..4306443e 100644
--- a/app/common/SortFunc.ts
+++ b/app/common/SortFunc.ts
@@ -28,7 +28,7 @@ type Comparator = (val1: any, val2: any) => number;
  * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare
  */
 const collator = new Intl.Collator(undefined, {numeric: true});
-function naturalCompare(val1: any, val2: any) {
+export function naturalCompare(val1: any, val2: any) {
   if (typeof val1 === 'string' && typeof val2 === 'string') {
     return collator.compare(val1, val2);
   }
diff --git a/app/common/Telemetry.ts b/app/common/Telemetry.ts
index f2be644e..328a3c7e 100644
--- a/app/common/Telemetry.ts
+++ b/app/common/Telemetry.ts
@@ -1740,6 +1740,22 @@ export const TelemetryContracts: TelemetryContracts = {
       },
     },
   },
+  checkedUpdateAPI: {
+    category: "SelfHosted",
+    description: 'Triggered when the app checks for updates.',
+    minimumTelemetryLevel: Level.limited,
+    retentionPeriod: 'indefinitely',
+    metadataContracts: {
+      installationId: {
+        description: 'The installation id of the client.',
+        dataType: 'string',
+      },
+      deploymentType: {
+        description: 'The deployment type of the client.',
+        dataType: 'string',
+      },
+    },
+  }
 };
 
 type TelemetryContracts = Record<TelemetryEvent, TelemetryEventContract>;
@@ -1810,6 +1826,7 @@ export const TelemetryEvents = StringUnion(
   'visitedForm',
   'submittedForm',
   'changedAccessRules',
+  'checkedUpdateAPI'
 );
 export type TelemetryEvent = typeof TelemetryEvents.type;
 
@@ -1824,7 +1841,8 @@ type TelemetryEventCategory =
   | 'TeamSite'
   | 'ProductVisits'
   | 'AccessRules'
-  | 'WidgetUsage';
+  | 'WidgetUsage'
+  | 'SelfHosted';
 
 interface TelemetryEventContract {
   description: string;
diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts
index 020e70ae..33a10c20 100644
--- a/app/server/lib/FlexServer.ts
+++ b/app/server/lib/FlexServer.ts
@@ -67,6 +67,7 @@ import {TagChecker} from 'app/server/lib/TagChecker';
 import {getTelemetryPrefs, ITelemetry} from 'app/server/lib/Telemetry';
 import {startTestingHooks} from 'app/server/lib/TestingHooks';
 import {getTestLoginSystem} from 'app/server/lib/TestLogin';
+import {UpdateManager} from 'app/server/lib/UpdateManager';
 import {addUploadRoute} from 'app/server/lib/uploads';
 import {buildWidgetRepository, getWidgetsInPlugins, IWidgetRepository} from 'app/server/lib/WidgetRepository';
 import {setupLocale} from 'app/server/localization';
@@ -179,6 +180,7 @@ export class FlexServer implements GristServer {
   // Set once ready() is called
   private _isReady: boolean = false;
   private _probes: BootProbes;
+  private _updateManager: UpdateManager;
 
   constructor(public port: number, public name: string = 'flexServer',
               public readonly options: FlexServerOptions = {}) {
@@ -405,6 +407,11 @@ export class FlexServer implements GristServer {
     return this._accessTokens;
   }
 
+  public getUpdateManager() {
+    if (!this._updateManager) { throw new Error('no UpdateManager available'); }
+    return this._updateManager;
+  }
+
   public sendAppPage(req: express.Request, resp: express.Response, options: ISendAppPageOptions): Promise<void> {
     if (!this._sendAppPage) { throw new Error('no _sendAppPage method available'); }
     return this._sendAppPage(req, resp, options);
@@ -880,6 +887,7 @@ export class FlexServer implements GristServer {
 
   public async close() {
     this._processMonitorStop?.();
+    await this._updateManager?.clear();
     if (this.usage)  { await this.usage.close(); }
     if (this._hosts) { this._hosts.close(); }
     if (this._dbManager) {
@@ -1863,6 +1871,16 @@ export class FlexServer implements GristServer {
     return process.env.GRIST_TEST_LOGIN ? getTestLoginSystem() : (this._getLoginSystem?.() || getLoginSystem());
   }
 
+  public addUpdatesCheck() {
+    if (this._check('update')) { return; }
+
+    // For now we only are active for sass deployments.
+    if (this._deploymentType !== 'saas') { return; }
+
+    this._updateManager = new UpdateManager(this.app, this);
+    this._updateManager.addEndpoints();
+  }
+
   // Adds endpoints that support imports and exports.
   private _addSupportPaths(docAccessMiddleware: express.RequestHandler[]) {
     if (!this._docWorker) { throw new Error("need DocWorker"); }
diff --git a/app/server/lib/UpdateManager.ts b/app/server/lib/UpdateManager.ts
new file mode 100644
index 00000000..d96b7090
--- /dev/null
+++ b/app/server/lib/UpdateManager.ts
@@ -0,0 +1,263 @@
+import { ApiError } from "app/common/ApiError";
+import { MapWithTTL } from "app/common/AsyncCreate";
+import { GristDeploymentType } from "app/common/gristUrls";
+import { naturalCompare } from "app/common/SortFunc";
+import { RequestWithLogin } from "app/server/lib/Authorizer";
+import { GristServer } from "app/server/lib/GristServer";
+import { optIntegerParam, optStringParam } from "app/server/lib/requestUtils";
+import { AbortController, AbortSignal } from 'node-abort-controller';
+import type * as express from "express";
+import fetch from "node-fetch";
+import {expressWrap} from 'app/server/lib/expressWrap';
+
+
+// URL to show to the client where the new version for docker based deployments can be found.
+const DOCKER_IMAGE_SITE = "https://hub.docker.com/r/gristlabs/grist";
+
+// URL to show to the client where the new version for docker based deployments can be found.
+const DOCKER_ENDPOINT = process.env.GRIST_TEST_UPDATE_DOCKER_HUB_URL ||
+                          "https://hub.docker.com/v2/namespaces/gristlabs/repositories/grist/tags";
+// Timeout for the request to the external resource.
+const REQUEST_TIMEOUT = optIntegerParam(process.env.GRIST_TEST_UPDATE_REQUEST_TIMEOUT, '') ?? 10000; // 10s
+// Delay between retries in case of rate limiting.
+const RETRY_TIMEOUT = optIntegerParam(process.env.GRIST_TEST_UPDATE_RETRY_TIMEOUT, '') ?? 4000; // 4s
+// We cache the good result for an hour.
+const GOOD_RESULT_TTL = optIntegerParam(process.env.GRIST_TEST_UPDATE_CHECK_TTL, '') ?? 60 * 60 * 1000; // 1h
+// We cache the bad result errors from external resources for a minute.
+const BAD_RESULT_TTL = optIntegerParam(process.env.GRIST_TEST_UPDATE_ERROR_TTL, '') ?? 60 * 1000; // 1m
+
+// A hook for tests to override the default values.
+export const Deps = {
+  DOCKER_IMAGE_SITE,
+  DOCKER_ENDPOINT,
+  REQUEST_TIMEOUT,
+  RETRY_TIMEOUT,
+  GOOD_RESULT_TTL,
+  BAD_RESULT_TTL,
+};
+
+export class UpdateManager {
+
+  // Cache for the latest version of the client.
+  private _latestVersion: MapWithTTL<
+    GristDeploymentType,
+    // We cache the promise, so that we can wait for the first request.
+    // This promise will always resolves, but can be resolved with an error.
+    Promise<ApiError|LatestVersion>
+  >;
+
+  private _abortController = new AbortController();
+
+  public constructor(
+    private _app: express.Application,
+    private _server: GristServer
+  ) {
+    this._latestVersion = new MapWithTTL<GristDeploymentType, Promise<ApiError|LatestVersion>>(Deps.GOOD_RESULT_TTL);
+  }
+
+  public addEndpoints() {
+    // Make sure that config is ok, so that we are not surprised when client asks as about that.
+    if (Deps.DOCKER_ENDPOINT) {
+      try {
+        new URL(Deps.DOCKER_ENDPOINT);
+      } catch (err) {
+        throw new Error(
+          `Invalid value for GRIST_UPDATE_DOCKER_URL, expected URL: ${Deps.DOCKER_ENDPOINT}`
+        );
+      }
+    }
+
+    // Support both POST and GET requests.
+    this._app.use("/api/version", expressWrap(async (req, res) => {
+      // Get some telemetry from the body request.
+      const payload = (name: string) => req.body?.[name] ?? req.query[name];
+
+      // This is the most interesting part for us, to track installation ids and match them
+      // with the version of the client. Won't be send without telemetry opt in.
+      const installationId = optStringParam(
+        payload("installationId"),
+        "installationId"
+      );
+
+      // Current version of grist-core part of the client. Currently not used and not
+      // passed from the client.
+
+      // Deployment type of the client (we expect this to be 'core' for most of the cases).
+      const deploymentType = optStringParam(
+        payload("deploymentType"),
+        "deploymentType"
+      ) as GristDeploymentType|undefined;
+
+      this._server
+        .getTelemetry()
+        .logEvent(req as RequestWithLogin, "checkedUpdateAPI", {
+          full: {
+            installationId,
+            deploymentType,
+          },
+        });
+
+      // For now we will just check the latest tag of docker stable image, assuming
+      // that this is what the client wants. In the future we might have different
+      // implementation based on the client deployment type.
+      const deploymentToCheck = 'core';
+      const versionChecker: VersionChecker = getLatestStableDockerVersion;
+
+      // To not spam the docker hub with requests, we will cache the good result for an hour.
+      // We are actually caching the promise, so subsequent requests will wait for the first one.
+      if (!this._latestVersion.has(deploymentToCheck)) {
+        const task = versionChecker(this._abortController.signal).catch(err => err);
+        this._latestVersion.set(deploymentToCheck, task);
+      }
+      const resData = await this._latestVersion.get(deploymentToCheck)!;
+      if (resData instanceof ApiError) {
+        // If the request has failed for any reason, we will throw the error to the client,
+        // but shorten the TTL to 1 minute, so that the next client will try after that time.
+        this._latestVersion.setWithCustomTTL(deploymentToCheck, Promise.resolve(resData), Deps.BAD_RESULT_TTL);
+        throw resData;
+      }
+      res.json(resData);
+    }));
+  }
+
+  public async clear() {
+    this._abortController.abort();
+    for (const task of this._latestVersion.values()) {
+      await task.catch(() => {});
+    }
+    this._latestVersion.clear();
+
+    // This function just clears cache and state, we should end with a fine state.
+    this._abortController = new AbortController();
+  }
+}
+
+/**
+ * JSON returned to the client (exported for tests).
+ */
+export interface LatestVersion {
+  /**
+   * Latest version of core component of the client.
+   */
+  latestVersion: string;
+  /**
+   * If there were any critical updates after client's version. Undefined if
+   * we don't know client version or couldn't figure this out for some other reason.
+   */
+  isCritical?: boolean;
+  /**
+   * Url where the client can download the latest version (if applicable)
+   */
+  updateURL?: string;
+
+  /**
+   * When the latest version was updated (in ISO format).
+   */
+  updatedAt?: string;
+}
+
+type VersionChecker = (signal: AbortSignal) => Promise<LatestVersion>;
+
+/**
+ * Get the latest stable version of docker image from the hub.
+ */
+export async function getLatestStableDockerVersion(signal: AbortSignal): Promise<LatestVersion> {
+  try {
+    // Find stable tag.
+    const tags = await listRepositoryTags(signal);
+    const stableTag = tags.find((tag) => tag.name === "stable");
+    if (!stableTag) {
+      throw new ApiError("No stable tag found", 404);
+    }
+
+    // Now find all tags with the same image.
+    const up = tags
+      // Filter by digest.
+      .filter((tag) => tag.digest === stableTag.digest)
+      // Name should be a version number in a correct format (should start with a number or v and number).
+      .filter(tag => /^v?\d+/.test(tag.name))
+      // And sort it in natural order (so that 1.1.10 is after 1.1.9).
+      .sort(compare("name"));
+
+    const last = up[up.length - 1];
+    // Panic if we don't have any tags that looks like version numbers.
+    if (!last) {
+      throw new ApiError("No stable image found", 404);
+    }
+    return {
+      latestVersion: last.name,
+      updatedAt: last.tag_last_pushed,
+      isCritical: false,
+      updateURL: Deps.DOCKER_IMAGE_SITE
+    };
+  } catch (err) {
+    // Make sure to throw only ApiErrors (cache depends on that).
+    if (err instanceof ApiError) {
+      throw err;
+    }
+    throw new ApiError(err.message, 500);
+  }
+}
+
+// Shape of the data from the Docker Hub API.
+interface DockerTag {
+  name: string;
+  digest: string;
+  tag_last_pushed: string;
+}
+
+interface DockerResponse {
+  results: DockerTag[];
+  next: string|null;
+}
+
+// https://docs.docker.com/docker-hub/api/latest/#tag/repositories/
+// paths/~1v2~1namespaces~1%7Bnamespace%7D~1repositories~1%7Brepository%7D~1tags/get
+async function listRepositoryTags(signal: AbortSignal): Promise<DockerTag[]>{
+  const tags: DockerTag[] = [];
+
+  // In case of rate limiting, we will retry the request 20 times.
+  // This is for all pages, so we might hit the limit multiple times.
+  let MAX_RETRIES = 20;
+
+  const url = new URL(Deps.DOCKER_ENDPOINT);
+  url.searchParams.set("page_size", "100");
+  let next: string|null = url.toString();
+
+  // We assume have a maximum of 100 000 tags, if that is not enough, we will have to change this.
+  let MAX_LOOPS = 1000;
+
+  while (next && MAX_LOOPS-- > 0) {
+    const response = await fetch(next, {signal, timeout: Deps.REQUEST_TIMEOUT});
+    if (response.status === 429) {
+      // We hit the rate limit, let's wait a bit and try again.
+      await new Promise((resolve) => setTimeout(resolve, Deps.RETRY_TIMEOUT));
+      if (signal.aborted) {
+        throw new Error("Aborted");
+      }
+      if (MAX_RETRIES-- <= 0) {
+        throw new Error("Too many retries");
+      }
+      continue;
+    }
+    if (response.status !== 200) {
+      throw new ApiError(await response.text(), response.status);
+    }
+    const json: DockerResponse = await response.json();
+    tags.push(...json.results);
+    next = json.next;
+  }
+  if (MAX_LOOPS <= 0) {
+    throw new Error("Too many tags found");
+  }
+  return tags;
+}
+
+/**
+ * Helper for sorting in natural order (1.1.10 is after 1.1.9).
+ */
+function compare<T>(prop: keyof T) {
+  return (a: T, b: T) => {
+    return naturalCompare(a[prop], b[prop]);
+  };
+}
diff --git a/app/server/mergedServerMain.ts b/app/server/mergedServerMain.ts
index 3a8ea22f..0c62010d 100644
--- a/app/server/mergedServerMain.ts
+++ b/app/server/mergedServerMain.ts
@@ -106,6 +106,7 @@ export async function main(port: number, serverTypes: ServerType[],
   server.addHealthCheck();
   if (includeHome || includeApp) {
     server.addBootPage();
+    server.addUpdatesCheck();
   }
   server.denyRequestsIfNotReady();
 
diff --git a/test/gen-server/UpdateChecks.ts b/test/gen-server/UpdateChecks.ts
new file mode 100644
index 00000000..3633a401
--- /dev/null
+++ b/test/gen-server/UpdateChecks.ts
@@ -0,0 +1,347 @@
+import axios from "axios";
+import * as chai from "chai";
+import * as sinon from 'sinon';
+
+import { configForUser } from "test/gen-server/testUtils";
+import * as testUtils from "test/server/testUtils";
+import { serveSomething, Serving } from "test/server/customUtil";
+import { Deps, LatestVersion } from "app/server/lib/UpdateManager";
+import { TestServer } from "test/gen-server/apiUtils";
+import { delay } from "app/common/delay";
+
+const assert = chai.assert;
+
+let testServer: TestServer;
+
+const stop = async () => {
+  await testServer?.stop();
+  testServer = null as any;
+};
+
+let homeUrl: string;
+let dockerHub: Serving & { signal: () => Defer };
+
+const chimpy = configForUser("Chimpy");
+
+// Tests specific complex scenarios that may have previously resulted in wrong behavior.
+describe("UpdateChecks", function () {
+  testUtils.setTmpLogLevel("error");
+
+  this.timeout("20s");
+
+  const sandbox = sinon.createSandbox();
+
+  before(async function () {
+    testUtils.EnvironmentSnapshot.push();
+    dockerHub = await dummyDockerHub();
+    assert.equal((await fetch(dockerHub.url + "/tags")).status, 200);
+
+    // Start the server with correct configuration.
+    Object.assign(process.env, {
+      GRIST_TEST_SERVER_DEPLOYMENT_TYPE: "saas",
+    });
+    sandbox.stub(Deps, "REQUEST_TIMEOUT").value(300);
+    sandbox.stub(Deps, "RETRY_TIMEOUT").value(400);
+    sandbox.stub(Deps, "GOOD_RESULT_TTL").value(500);
+    sandbox.stub(Deps, "BAD_RESULT_TTL").value(200);
+    sandbox.stub(Deps, "DOCKER_ENDPOINT").value(dockerHub.url + "/tags");
+
+    await startInProcess(this);
+  });
+
+  after(async function () {
+    sandbox.restore();
+    await dockerHub.shutdown();
+    await stop();
+    testUtils.EnvironmentSnapshot.pop();
+  });
+
+  afterEach(async function () {
+    await testServer.server.getUpdateManager().clear();
+  });
+
+  it("should read latest version as anonymous user in happy path", async function () {
+    setEndpoint(dockerHub.url + "/tags");
+    const resp = await axios.get(`${homeUrl}/api/version`);
+    assert.equal(resp.status, 200, `${homeUrl}/api/version`);
+    const result: LatestVersion = resp.data;
+    assert.equal(result.latestVersion, "10");
+
+    // Also works in post method.
+    const resp2 = await axios.post(`${homeUrl}/api/version`);
+    assert.equal(resp2.status, 200);
+    assert.deepEqual(resp2.data, result);
+  });
+
+  it("should read latest version as existing user", async function () {
+    setEndpoint(dockerHub.url + "/tags");
+    const resp = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(resp.status, 200);
+    const result: LatestVersion = resp.data;
+    assert.equal(result.latestVersion, "10");
+  });
+
+  it("passes errors to client", async function () {
+    setEndpoint(dockerHub.url + "/404");
+    const resp = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(resp.status, 404);
+    assert.deepEqual(resp.data, { error: "Not Found" });
+  });
+
+  it("retries on 429", async function () {
+    setEndpoint(dockerHub.url + "/429");
+
+    // First make sure that mock works.
+    assert.equal((await fetch(dockerHub.url + "/429")).status, 200);
+    assert.equal((await fetch(dockerHub.url + "/429")).status, 429);
+    assert.equal((await fetch(dockerHub.url + "/429")).status, 200);
+    assert.equal((await fetch(dockerHub.url + "/429")).status, 429);
+
+    // Now make sure that 4 subsequent requests are successful.
+    const check = async () => {
+      const resp = await axios.get(`${homeUrl}/api/version`, chimpy);
+      assert.equal(resp.status, 200);
+      const result: LatestVersion = resp.data;
+      assert.equal(result.latestVersion, "10");
+    };
+
+    await check();
+    await check();
+    await check();
+    await check();
+  });
+
+  it("throws when receives html", async function () {
+    setEndpoint(dockerHub.url + "/html");
+    const resp = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(resp.status, 500);
+  });
+
+  it("caches data end errors", async function () {
+    setEndpoint(dockerHub.url + "/error");
+    const r1 = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(r1.status, 500);
+    assert.equal(r1.data.error, "1");
+
+    const r2 = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(r2.status, 500);
+    assert.equal(r2.data.error, "1"); // since errors are cached for 200ms.
+
+    await delay(300); // error is cached for 200ms
+
+    const r3 = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(r3.status, 500);
+    assert.equal(r3.data.error, "2"); // second error is different, but still cached for 200ms.
+
+    const r4 = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(r4.status, 500);
+    assert.equal(r4.data.error, "2");
+
+    await delay(300);
+
+    // Now we should get correct result, but it will be cached for 500ms.
+
+    const r5 = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(r5.status, 200);
+    assert.equal(r5.data.latestVersion, "3"); // first successful response is cached for 2 seconds.
+
+    const r6 = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(r6.status, 200);
+    assert.equal(r6.data.latestVersion, "3");
+
+    await delay(700);
+
+    const r7 = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(r7.status, 200);
+    assert.equal(r7.data.latestVersion, "4");
+  });
+
+  it("can stop server when hangs", async function () {
+    setEndpoint(dockerHub.url + "/hang");
+    const handCalled = dockerHub.signal();
+    const resp = axios
+      .get(`${homeUrl}/api/version`, chimpy)
+      .catch((err) => ({ status: 999, data: null }));
+    await handCalled;
+    await stop();
+    const result = await resp;
+    assert.equal(result.status, 500);
+    assert.match(result.data.error, /aborted/);
+    // Start server again, and make sure it works.
+    await startInProcess(this);
+  });
+
+  it("dosent starts for non saas deployment", async function () {
+    try {
+      testUtils.EnvironmentSnapshot.push();
+      Object.assign(process.env, {
+        GRIST_TEST_SERVER_DEPLOYMENT_TYPE: "core",
+      });
+      await stop();
+      await startInProcess(this);
+      const resp = await axios.get(`${homeUrl}/api/version`, chimpy);
+      assert.equal(resp.status, 404);
+    } finally {
+      testUtils.EnvironmentSnapshot.pop();
+    }
+
+    // Start normal one again.
+    await stop();
+    await startInProcess(this);
+  });
+
+  it("reports error when timeout happens", async function () {
+    setEndpoint(dockerHub.url + "/timeout");
+    const resp = await axios.get(`${homeUrl}/api/version`, chimpy);
+    assert.equal(resp.status, 500);
+    assert.match(resp.data.error, /timeout/);
+  });
+});
+
+async function dummyDockerHub() {
+  let odds = 0;
+
+  // We offer a way to signal when request is received.
+  // Test can add a dummy promise using signal() method, and it is resolved
+  // when any request is received.
+  const signals: Defer[] = [];
+  let errorCount = 0;
+
+  const tempServer = await serveSomething((app) => {
+    app.use((req, res, next) => {
+      signals.forEach((p) => p.resolve());
+      signals.length = 0;
+      next();
+    });
+    app.get("/404", (_, res) => res.status(404).send("Not Found").end());
+    app.get("/429", (_, res) => {
+      if (odds++ % 2) {
+        res.status(429).send("Too Many Requests");
+      } else {
+        res.json(SECOND_PAGE);
+      }
+    });
+    app.get("/timeout", (_, res) => {
+      setTimeout(() => res.status(200).json(SECOND_PAGE), 500);
+    });
+
+    app.get("/error", (_, res) => {
+      errorCount++;
+      // First 2 calls will return error, next will return numbers (3, 4, 5, 6, 7, 8, 9, 10)
+      if (errorCount <= 2) {
+        res.status(500).send(String(errorCount));
+      } else {
+        res.json(VERSION(errorCount));
+      }
+    });
+
+    app.get("/html", (_, res) => {
+      res.status(200).send("<html></html>");
+    });
+    app.get("/hang", () => {});
+    app.get("/tags", (_, res) => {
+      res.status(200).json(FIRST_PAGE(tempServer));
+    });
+    app.get("/next", (_, res) => {
+      res.status(200).json(SECOND_PAGE);
+    });
+  });
+
+  return Object.assign(tempServer, {
+    signal() {
+      const p = defer();
+      signals.push(p);
+      return p;
+    },
+  });
+}
+
+function setEndpoint(endpoint: string) {
+  sinon.stub(Deps, "DOCKER_ENDPOINT").value(endpoint);
+}
+
+async function startInProcess(context: Mocha.Context) {
+  testServer = new TestServer(context);
+  await testServer.start(["home"]);
+  homeUrl = testServer.serverUrl;
+}
+
+const VERSION = (i: number) => ({
+  results: [
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: "stable",
+      digest: "stable",
+    },
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: i.toString(),
+      digest: "stable",
+    },
+  ],
+  count: 2,
+  next: null,
+});
+
+const SECOND_PAGE = {
+  results: [
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: "stable",
+      digest: "stable",
+    },
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: "latest",
+      digest: "latest",
+    },
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: "1",
+      digest: "latest",
+    },
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: "1",
+      digest: "stable",
+    },
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: "9",
+      digest: "stable",
+    },
+    {
+      tag_last_pushed: "2024-03-26T07:11:01.272113Z",
+      name: "10",
+      digest: "stable",
+    },
+  ],
+  count: 6,
+  next: null,
+};
+
+const FIRST_PAGE = (tempServer: Serving) => ({
+  results: [],
+  count: 0,
+  next: tempServer.url + "/next",
+});
+
+interface Defer {
+  then: Promise<void>["then"];
+  resolve: () => void;
+  reject: () => void;
+}
+
+const defer = () => {
+  let resolve: () => void;
+  let reject: () => void;
+  const promise = new Promise<void>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  }).catch(() => {});
+  return {
+    then: promise.then.bind(promise),
+    resolve: resolve!,
+    reject: reject!,
+  };
+};
diff --git a/test/server/testUtils.ts b/test/server/testUtils.ts
index a394a005..d91c71ba 100644
--- a/test/server/testUtils.ts
+++ b/test/server/testUtils.ts
@@ -302,11 +302,26 @@ export async function readFixtureDoc(docName: string) {
 // a class to store a snapshot of environment variables, can be reverted to by
 // calling .restore()
 export class EnvironmentSnapshot {
+
+  public static push() {
+    this._stack.push(new EnvironmentSnapshot());
+  }
+
+  public static pop() {
+    const snapshot = this._stack.pop();
+    if (!snapshot) {
+      throw new Error("EnvironmentSnapshot stack is empty");
+    }
+    snapshot.restore();
+  }
+
+  private static _stack: EnvironmentSnapshot[] = [];
+
   private _oldEnv: NodeJS.ProcessEnv;
+
   public constructor() {
     this._oldEnv = clone(process.env);
   }
-
   // Reset environment variables.
   public restore() {
     Object.assign(process.env, this._oldEnv);

From 661f1c1804da0d2aa2f660ee2a374922fda6936b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?=
 <jaroslaw.sadzinski@gmail.com>
Date: Wed, 10 Apr 2024 09:31:10 +0200
Subject: [PATCH 06/45] (core) DuplicatePage function didn't duplicated
 collapsed widgets

Summary:
When one of 2 widget was collapsed, the resulting widget can become a root section. Then,
when a page was duplicated, the layout was duplicated incorrectly (with wrong collapsed
section). This resulted in a bug, when the root section was deleted, as it was the last
section in the saved layout, but not the last section on the visible layout.

Test Plan: Added 2 tests

Reviewers: dsagal

Reviewed By: dsagal

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D4227
---
 app/client/components/ViewLayout.ts    |  7 ++-
 app/client/components/duplicatePage.ts | 17 ++++--
 test/nbrowser/ViewLayoutCollapse.ts    | 79 +++++++++++++++++++++++++-
 test/nbrowser/gristUtils.ts            | 21 +++++++
 4 files changed, 116 insertions(+), 8 deletions(-)

diff --git a/app/client/components/ViewLayout.ts b/app/client/components/ViewLayout.ts
index 12efaa90..f017f992 100644
--- a/app/client/components/ViewLayout.ts
+++ b/app/client/components/ViewLayout.ts
@@ -334,7 +334,12 @@ export class ViewLayout extends DisposableWithEvents implements IDomComponent {
 
     function addToSpec(leafId: number) {
       const newBox = tmpLayout.buildLayoutBox({ leaf: leafId });
-      const rows = tmpLayout.rootBox()!.childBoxes.peek();
+      const root = tmpLayout.rootBox();
+      if (!root || root.isDisposed()) {
+        tmpLayout.setRoot(newBox);
+        return newBox;
+      }
+      const rows = root.childBoxes.peek();
       const lastRow = rows[rows.length - 1];
       if (rows.length >= 1 && lastRow.isLeaf()) {
         // Add a new child to the last row.
diff --git a/app/client/components/duplicatePage.ts b/app/client/components/duplicatePage.ts
index a4e01775..c8e996f4 100644
--- a/app/client/components/duplicatePage.ts
+++ b/app/client/components/duplicatePage.ts
@@ -199,13 +199,20 @@ function newViewSectionAction(widget: IPageWidget, viewId: number) {
 /**
  * Replaces each `leaf` id in layoutSpec by its corresponding id in mapIds. Leave unchanged if id is
  * missing from mapIds.
+ * LayoutSpec is a tree structure with leaves (that have `leaf` property) or containers of leaves. The root
+ * container (or leaf) also includes a list of collapsed leaves in `collapsed` property.
+ *
+ * Example use:
+ *   patchLayoutSpec({
+ *     leaf: 1,
+*      collapsed: [{leaf: 2}]
+ *   }, {1: 10, 2: 20})
  */
 export function patchLayoutSpec(layoutSpec: any, mapIds: {[id: number]: number}) {
-  return cloneDeepWith(layoutSpec, (val) => {
-    if (typeof val === 'object' && val !== null) {
-      if (mapIds[val.leaf]) {
-        return {...val, leaf: mapIds[val.leaf]};
-      }
+  const cloned = cloneDeepWith(layoutSpec, (val, key) => {
+    if (key === 'leaf' && mapIds[val]) {
+      return mapIds[val];
     }
   });
+  return cloned;
 }
diff --git a/test/nbrowser/ViewLayoutCollapse.ts b/test/nbrowser/ViewLayoutCollapse.ts
index b1643e66..d157bc6b 100644
--- a/test/nbrowser/ViewLayoutCollapse.ts
+++ b/test/nbrowser/ViewLayoutCollapse.ts
@@ -16,11 +16,86 @@ describe("ViewLayoutCollapse", function() {
 
   before(async () => {
     session = await gu.session().login();
-    await session.tempDoc(cleanup, 'Investment Research.grist');
-    await gu.openPage("Overview");
+    await session.tempNewDoc(cleanup);
+  });
+
+  it('fix:copies collapsed sections properly', async function() {
+    // When one of 2 widget was collapsed, the resulting widget can become a root section. Then,
+    // when a page was duplicated, the layout was duplicated incorrectly (with wrong collapsed
+    // section). This resulted in a bug, when the root section was deleted, as it was the last
+    // section in the saved layout, but not the last section on the visible layout.
+
+    // Add new page with new table.
+    await gu.addNewPage('Table', 'New Table', {
+      tableName: 'Broken'
+    });
+
+    await gu.renameActiveSection('Collapsed');
+
+    // Add section here (with the same table).
+    await gu.addNewSection('Table', 'Broken');
+
+    // Rename it so that it is easier to find.
+    await gu.renameActiveSection('NotCollapsed');
+
+    // Now store the layout, by amending it (so move the collapsed widget below).
+    const {height} = await gu.getSection('NotCollapsed').getRect();
+    await dragMain('Collapsed');
+    await move(gu.getSection('NotCollapsed'), { x: 50, y: height / 2 });
+    await driver.sleep(300);
+    await move(gu.getSection('NotCollapsed'), { x: 100, y: height / 2 });
+    await driver.sleep(300);
+    await driver.withActions(actions => actions.release());
+    // Wait for the debounced save.
+    await driver.sleep(1500);
+    await gu.waitForServer();
+
+    // Now collapse it.
+    await collapseByMenu('Collapsed');
+
+    // Now duplicate the page.
+    await gu.duplicatePage('Broken', 'Broken2');
+
+    // Now on this page we saw two uncollapsed sections (make sure this is not the case).
+    assert.deepEqual(await gu.getSectionTitles(), ['NotCollapsed']);
+  });
+
+  it('fix:can delete root section', async function() {
+    // But even if the layout spec was corrupted, we still should be able to delete the root section
+    // when replacing it with new one.
+
+    // Break the spec.
+    const specJson: string = await driver.executeScript(
+      'return gristDocPageModel.gristDoc.get().docModel.views.rowModels[3].layoutSpec()'
+    );
+
+    // To break the spec, we will replace id of the collapsed section, then viewLayout will try to fix it,
+    // by rendering the missing section without patching the layout spec (which is good, because this could
+    // happen on readonly doc or a snapshot).
+    const spec = JSON.parse(specJson);
+    spec.collapsed[0].leaf = -10;
+
+    await driver.executeScript(
+      `gristDocPageModel.gristDoc.get().docModel.views.rowModels[3].layoutSpec.setAndSave('${JSON.stringify(spec)}')`
+    );
+
+    await gu.waitForServer();
+
+    // We now should see two sections.
+    assert.deepEqual(await gu.getSectionTitles(), ['NotCollapsed', 'Collapsed']);
+
+    // And we should be able to delete the top one (NotCollapsed).
+    await gu.openSectionMenu('viewLayout', 'NotCollapsed');
+    await driver.findContent('.test-cmd-name', 'Delete widget').click();
+    await gu.waitForServer();
+
+    await gu.checkForErrors();
   });
 
   it('fix: custom widget should restart when added back after collapsing', async function() {
+    await session.tempDoc(cleanup, 'Investment Research.grist');
+    await gu.openPage("Overview");
+
     const revert = await gu.begin();
 
     // Add custom section.
diff --git a/test/nbrowser/gristUtils.ts b/test/nbrowser/gristUtils.ts
index 96fce930..b53faa3a 100644
--- a/test/nbrowser/gristUtils.ts
+++ b/test/nbrowser/gristUtils.ts
@@ -1186,6 +1186,27 @@ export async function addNewPage(
   await driver.wait(async () => (await driver.getCurrentUrl()) !== url, 2000);
 }
 
+export async function duplicatePage(name: string|RegExp, newName?: string) {
+  await openPageMenu(name);
+  await driver.find('.test-docpage-duplicate').click();
+
+  if (newName) {
+    // Input will select text on focus, which can alter the text we enter,
+    // so make sure we type correct value.
+    await waitToPass(async () => {
+      const input = driver.find('.test-modal-dialog input');
+      await input.click();
+      await selectAll();
+      await driver.sendKeys(newName);
+      assert.equal(await input.value(), newName);
+    });
+  }
+
+  await driver.find('.test-modal-confirm').click();
+  await driver.findContentWait('.test-docpage-label', newName ?? /copy/, 6000);
+  await waitForServer();
+}
+
 export async function openAddWidgetToPage() {
   await driver.findWait('.test-dp-add-new', 2000).doClick();
   await driver.findWait('.test-dp-add-widget-to-page', 2000).doClick();

From 86062a8c28b377faf881fa9475e3c6b8f4ee539b Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Wed, 10 Apr 2024 23:50:30 -0700
Subject: [PATCH 07/45] (core) New Grist Forms styling and field options

Summary:
 - New styling for forms.
 - New field options for various field types (spinner, checkbox, radio buttons, alignment, sort).
 - Improved alignment of form fields in columns.
 - Support for additional select input keyboard shortcuts (Enter and Backspace).
 - Prevent submitting form on Enter if an input has focus.
 - Fix for changing form field type causing the field to disappear.

Test Plan: Browser tests.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D4223
---
 app/client/components/FormRenderer.ts     | 388 +++++++++++++++++++---
 app/client/components/FormRendererCss.ts  | 164 +++++++--
 app/client/components/Forms/Columns.ts    |  15 +-
 app/client/components/Forms/Field.ts      | 334 +++++++++++++++----
 app/client/components/Forms/FormConfig.ts | 108 +++++-
 app/client/components/Forms/FormView.ts   | 116 +++----
 app/client/components/Forms/Model.ts      |  14 +-
 app/client/components/Forms/Section.ts    |   1 -
 app/client/components/Forms/Submit.ts     |  11 +-
 app/client/components/Forms/styles.ts     | 179 +++++-----
 app/client/components/GristDoc.ts         |  76 +++--
 app/client/ui/FormAPI.ts                  |  47 ++-
 app/client/ui/FormContainer.ts            | 156 +++++++--
 app/client/ui/FormErrorPage.ts            |  31 +-
 app/client/ui/FormPage.ts                 |  70 ++--
 app/client/ui/FormPagesCss.ts             | 139 --------
 app/client/ui/FormSuccessPage.ts          |  33 +-
 app/client/ui/RightPanelStyles.ts         |   5 +
 app/client/ui2018/checkbox.ts             |   1 +
 app/client/ui2018/radio.ts                |  25 ++
 app/client/widgets/ChoiceListCell.ts      |  16 +-
 app/client/widgets/ChoiceTextBox.ts       |  17 +-
 app/client/widgets/DateTextBox.js         |   4 +-
 app/client/widgets/FieldBuilder.ts        |  16 +-
 app/client/widgets/NTextBox.ts            |  46 ++-
 app/client/widgets/NumericSpinner.ts      | 172 ++++++++++
 app/client/widgets/NumericTextBox.ts      | 174 ++++------
 app/client/widgets/Reference.ts           |   9 +-
 app/client/widgets/ReferenceList.ts       |  14 +
 app/client/widgets/Toggle.ts              |  35 +-
 app/client/widgets/UserType.ts            |   1 +
 app/client/widgets/UserTypeImpl.ts        |   6 +
 app/common/gutil.ts                       |  15 +
 app/server/lib/DocApi.ts                  |  45 ++-
 test/nbrowser/FormView.ts                 | 270 +++++++++++++--
 35 files changed, 2037 insertions(+), 716 deletions(-)
 delete mode 100644 app/client/ui/FormPagesCss.ts
 create mode 100644 app/client/ui2018/radio.ts
 create mode 100644 app/client/widgets/NumericSpinner.ts

diff --git a/app/client/components/FormRenderer.ts b/app/client/components/FormRenderer.ts
index 857067a5..b9ff7e62 100644
--- a/app/client/components/FormRenderer.ts
+++ b/app/client/components/FormRenderer.ts
@@ -149,10 +149,14 @@ class SectionRenderer extends FormRenderer {
 class ColumnsRenderer extends FormRenderer {
   public render() {
     return css.columns(
-      {style: `--grist-columns-count: ${this.children.length || 1}`},
+      {style: `--grist-columns-count: ${this._getColumnsCount()}`},
       this.children.map((child) => child.render()),
     );
   }
+
+  private _getColumnsCount() {
+    return this.children.length || 1;
+  }
 }
 
 class SubmitRenderer extends FormRenderer {
@@ -180,22 +184,7 @@ class SubmitRenderer extends FormRenderer {
               type: 'submit',
               value: this.context.rootLayoutNode.submitText || 'Submit',
             },
-            dom.on('click', () => {
-              // Make sure that all choice or reference lists that are required have at least one option selected.
-              const lists = document.querySelectorAll('.grist-checkbox-list.required:not(:has(input:checked))');
-              Array.from(lists).forEach(function(list) {
-                // If the form has at least one checkbox, make it required.
-                const firstCheckbox = list.querySelector('input[type="checkbox"]');
-                firstCheckbox?.setAttribute('required', 'required');
-              });
-
-              // All other required choice or reference lists with at least one option selected are no longer required.
-              const checkedLists = document.querySelectorAll('.grist-checkbox-list.required:has(input:checked)');
-              Array.from(checkedLists).forEach(function(list) {
-                const firstCheckbox = list.querySelector('input[type="checkbox"]');
-                firstCheckbox?.removeAttribute('required');
-              });
-            }),
+            dom.on('click', () => validateRequiredLists()),
           )
         ),
       ),
@@ -228,7 +217,7 @@ class FieldRenderer extends FormRenderer {
   }
 
   public render() {
-    return css.field(this.renderer.render());
+    return this.renderer.render();
   }
 
   public reset() {
@@ -267,41 +256,120 @@ abstract class BaseFieldRenderer extends Disposable {
 }
 
 class TextRenderer extends BaseFieldRenderer {
-  protected type = 'text';
-  private _value = Observable.create(this, '');
+  protected inputType = 'text';
+
+  private _format = this.field.options.formTextFormat ?? 'singleline';
+  private _lineCount = String(this.field.options.formTextLineCount || 3);
+  private _value = Observable.create<string>(this, '');
 
   public input() {
-    return dom('input',
+    if (this._format === 'singleline') {
+      return this._renderSingleLineInput();
+    } else {
+      return this._renderMultiLineInput();
+    }
+  }
+
+  public resetInput(): void {
+    this._value.setAndTrigger('');
+  }
+
+  private _renderSingleLineInput() {
+    return css.textInput(
       {
-        type: this.type,
+        type: this.inputType,
         name: this.name(),
         required: this.field.options.formRequired,
       },
       dom.prop('value', this._value),
+      preventSubmitOnEnter(),
+    );
+  }
+
+  private _renderMultiLineInput() {
+    return css.textarea(
+      {
+        name: this.name(),
+        required: this.field.options.formRequired,
+        rows: this._lineCount,
+      },
+      dom.prop('value', this._value),
       dom.on('input', (_e, elem) => this._value.set(elem.value)),
     );
   }
+}
+
+class NumericRenderer extends BaseFieldRenderer {
+  protected inputType = 'text';
+
+  private _format = this.field.options.formNumberFormat ?? 'text';
+  private _value = Observable.create<string>(this, '');
+  private _spinnerValue = Observable.create<number|''>(this, '');
+
+  public input() {
+    if (this._format === 'text') {
+      return this._renderTextInput();
+    } else {
+      return this._renderSpinnerInput();
+    }
+  }
 
   public resetInput(): void {
-    this._value.set('');
+    this._value.setAndTrigger('');
+    this._spinnerValue.setAndTrigger('');
+  }
+
+  private _renderTextInput() {
+    return css.textInput(
+      {
+        type: this.inputType,
+        name: this.name(),
+        required: this.field.options.formRequired,
+      },
+      dom.prop('value', this._value),
+      preventSubmitOnEnter(),
+    );
+  }
+
+  private _renderSpinnerInput() {
+    return css.spinner(
+      this._spinnerValue,
+      {
+        setValueOnInput: true,
+        inputArgs: [
+          {
+            name: this.name(),
+            required: this.field.options.formRequired,
+          },
+          preventSubmitOnEnter(),
+        ],
+      }
+    );
   }
 }
 
 class DateRenderer extends TextRenderer {
-  protected type = 'date';
+  protected inputType = 'date';
 }
 
 class DateTimeRenderer extends TextRenderer {
-  protected type = 'datetime-local';
+  protected inputType = 'datetime-local';
 }
 
 export const SELECT_PLACEHOLDER = 'Select...';
 
 class ChoiceRenderer extends BaseFieldRenderer  {
-  protected value = Observable.create<string>(this, '');
+  protected value: Observable<string>;
+
   private _choices: string[];
   private _selectElement: HTMLElement;
   private _ctl?: PopupControl<IPopupOptions>;
+  private _format = this.field.options.formSelectFormat ?? 'select';
+  private _alignment = this.field.options.formOptionsAlignment ?? 'vertical';
+  private _radioButtons: MutableObsArray<{
+    label: string;
+    checked: Observable<string|null>
+  }> = this.autoDispose(obsArray());
 
   public constructor(field: FormField, context: FormRendererContext) {
     super(field, context);
@@ -310,24 +378,59 @@ class ChoiceRenderer extends BaseFieldRenderer  {
     if (!Array.isArray(choices) || choices.some((choice) => typeof choice !== 'string')) {
       this._choices = [];
     } else {
+      const sortOrder = this.field.options.formOptionsSortOrder ?? 'default';
+      if (sortOrder !== 'default') {
+        choices.sort((a, b) => String(a).localeCompare(String(b)));
+        if (sortOrder === 'descending') {
+          choices.reverse();
+        }
+      }
       // Support for 1000 choices. TODO: make limit dynamic.
       this._choices = choices.slice(0, 1000);
     }
+
+    this.value = Observable.create<string>(this, '');
+
+    this._radioButtons.set(this._choices.map(choice => ({
+      label: String(choice),
+      checked: Observable.create(this, null),
+    })));
   }
 
   public input() {
+    if (this._format === 'select') {
+      return this._renderSelectInput();
+    } else {
+      return this._renderRadioInput();
+    }
+  }
+
+  public resetInput() {
+    this.value.set('');
+    this._radioButtons.get().forEach(radioButton => {
+      radioButton.checked.set(null);
+    });
+  }
+
+  private _renderSelectInput() {
     return css.hybridSelect(
       this._selectElement = css.select(
         {name: this.name(), required: this.field.options.formRequired},
-        dom.prop('value', this.value),
         dom.on('input', (_e, elem) => this.value.set(elem.value)),
         dom('option', {value: ''}, SELECT_PLACEHOLDER),
-        this._choices.map((choice) => dom('option', {value: choice}, choice)),
+        this._choices.map((choice) => dom('option',
+          {value: choice},
+          dom.prop('selected', use => use(this.value) === choice),
+          choice
+        )),
         dom.onKeyDown({
+          Enter$: (ev) => this._maybeOpenSearchSelect(ev),
           ' $': (ev) => this._maybeOpenSearchSelect(ev),
           ArrowUp$: (ev) => this._maybeOpenSearchSelect(ev),
           ArrowDown$: (ev) => this._maybeOpenSearchSelect(ev),
+          Backspace$: () => this.value.set(''),
         }),
+        preventSubmitOnEnter(),
       ),
       dom.maybe(use => !use(isXSmallScreenObs()), () =>
         css.searchSelect(
@@ -359,8 +462,29 @@ class ChoiceRenderer extends BaseFieldRenderer  {
     );
   }
 
-  public resetInput(): void {
-    this.value.set('');
+  private _renderRadioInput() {
+    const required = this.field.options.formRequired;
+    return css.radioList(
+      css.radioList.cls('-horizontal', this._alignment === 'horizontal'),
+      dom.cls('grist-radio-list'),
+      dom.cls('required', Boolean(required)),
+      {name: this.name(), required},
+      dom.forEach(this._radioButtons, (radioButton) =>
+        css.radio(
+          dom('input',
+            dom.prop('checked', radioButton.checked),
+            dom.on('change', (_e, elem) => radioButton.checked.set(elem.value)),
+            {
+              type: 'radio',
+              name: `${this.name()}`,
+              value: radioButton.label,
+            },
+            preventSubmitOnEnter(),
+          ),
+          dom('span', radioButton.label),
+        )
+      ),
+    );
   }
 
   private _maybeOpenSearchSelect(ev: KeyboardEvent) {
@@ -375,8 +499,11 @@ class ChoiceRenderer extends BaseFieldRenderer  {
 }
 
 class BoolRenderer extends BaseFieldRenderer {
+  protected inputType = 'checkbox';
   protected checked = Observable.create<boolean>(this, false);
 
+  private _format = this.field.options.formToggleFormat ?? 'switch';
+
   public render() {
     return css.field(
       dom('div', this.input()),
@@ -384,16 +511,29 @@ class BoolRenderer extends BaseFieldRenderer {
   }
 
   public input() {
-    return css.toggle(
+    if (this._format === 'switch') {
+      return this._renderSwitchInput();
+    } else {
+      return this._renderCheckboxInput();
+    }
+  }
+
+  public resetInput(): void {
+    this.checked.set(false);
+  }
+
+  private _renderSwitchInput() {
+    return css.toggleSwitch(
       dom('input',
         dom.prop('checked', this.checked),
+        dom.prop('value', use => use(this.checked) ? '1' : '0'),
         dom.on('change', (_e, elem) => this.checked.set(elem.checked)),
         {
-          type: 'checkbox',
+          type: this.inputType,
           name: this.name(),
-          value: '1',
           required: this.field.options.formRequired,
         },
+        preventSubmitOnEnter(),
       ),
       css.gristSwitch(
         css.gristSwitchSlider(),
@@ -406,8 +546,24 @@ class BoolRenderer extends BaseFieldRenderer {
     );
   }
 
-  public resetInput(): void {
-    this.checked.set(false);
+  private _renderCheckboxInput() {
+    return css.toggle(
+      dom('input',
+        dom.prop('checked', this.checked),
+        dom.prop('value', use => use(this.checked) ? '1' : '0'),
+        dom.on('change', (_e, elem) => this.checked.set(elem.checked)),
+        {
+          type: this.inputType,
+          name: this.name(),
+          required: this.field.options.formRequired,
+        },
+        preventSubmitOnEnter(),
+      ),
+      css.toggleLabel(
+        css.label.cls('-required', Boolean(this.field.options.formRequired)),
+        this.field.question,
+      ),
+    );
   }
 }
 
@@ -417,6 +573,8 @@ class ChoiceListRenderer extends BaseFieldRenderer  {
     checked: Observable<string|null>
   }> = this.autoDispose(obsArray());
 
+  private _alignment = this.field.options.formOptionsAlignment ?? 'vertical';
+
   public constructor(field: FormField, context: FormRendererContext) {
     super(field, context);
 
@@ -424,6 +582,13 @@ class ChoiceListRenderer extends BaseFieldRenderer  {
     if (!Array.isArray(choices) || choices.some((choice) => typeof choice !== 'string')) {
       choices = [];
     } else {
+      const sortOrder = this.field.options.formOptionsSortOrder ?? 'default';
+      if (sortOrder !== 'default') {
+        choices.sort((a, b) => String(a).localeCompare(String(b)));
+        if (sortOrder === 'descending') {
+          choices.reverse();
+        }
+      }
       // Support for 30 choices. TODO: make limit dynamic.
       choices = choices.slice(0, 30);
     }
@@ -437,6 +602,7 @@ class ChoiceListRenderer extends BaseFieldRenderer  {
   public input() {
     const required = this.field.options.formRequired;
     return css.checkboxList(
+      css.checkboxList.cls('-horizontal', this._alignment === 'horizontal'),
       dom.cls('grist-checkbox-list'),
       dom.cls('required', Boolean(required)),
       {name: this.name(), required},
@@ -449,7 +615,8 @@ class ChoiceListRenderer extends BaseFieldRenderer  {
               type: 'checkbox',
               name: `${this.name()}[]`,
               value: checkbox.label,
-            }
+            },
+            preventSubmitOnEnter(),
           ),
           dom('span', checkbox.label),
         )
@@ -471,12 +638,20 @@ class RefListRenderer extends BaseFieldRenderer {
     checked: Observable<string|null>
   }> = this.autoDispose(obsArray());
 
+  private _alignment = this.field.options.formOptionsAlignment ?? 'vertical';
+
   public constructor(field: FormField, context: FormRendererContext) {
     super(field, context);
 
     const references = this.field.refValues ?? [];
-    // Sort by the second value, which is the display value.
-    references.sort((a, b) => String(a[1]).localeCompare(String(b[1])));
+    const sortOrder = this.field.options.formOptionsSortOrder;
+    if (sortOrder !== 'default') {
+      // Sort by the second value, which is the display value.
+      references.sort((a, b) => String(a[1]).localeCompare(String(b[1])));
+      if (sortOrder === 'descending') {
+        references.reverse();
+      }
+    }
     // Support for 30 choices. TODO: make limit dynamic.
     references.splice(30);
     this.checkboxes.set(references.map(reference => ({
@@ -488,6 +663,7 @@ class RefListRenderer extends BaseFieldRenderer {
   public input() {
     const required = this.field.options.formRequired;
     return css.checkboxList(
+      css.checkboxList.cls('-horizontal', this._alignment === 'horizontal'),
       dom.cls('grist-checkbox-list'),
       dom.cls('required', Boolean(required)),
       {name: this.name(), required},
@@ -501,7 +677,8 @@ class RefListRenderer extends BaseFieldRenderer {
               'data-grist-type': this.field.type,
               name: `${this.name()}[]`,
               value: checkbox.value,
-            }
+            },
+            preventSubmitOnEnter(),
           ),
           dom('span', checkbox.label),
         )
@@ -518,15 +695,58 @@ class RefListRenderer extends BaseFieldRenderer {
 
 class RefRenderer extends BaseFieldRenderer {
   protected value = Observable.create(this, '');
+
+  private _format = this.field.options.formSelectFormat ?? 'select';
+  private _alignment = this.field.options.formOptionsAlignment ?? 'vertical';
+  private _choices: [number|string, CellValue][];
   private _selectElement: HTMLElement;
   private _ctl?: PopupControl<IPopupOptions>;
+  private _radioButtons: MutableObsArray<{
+    label: string;
+    value: string;
+    checked: Observable<string|null>
+  }> = this.autoDispose(obsArray());
+
+  public constructor(field: FormField, context: FormRendererContext) {
+    super(field, context);
+
+    const choices: [number|string, CellValue][] = this.field.refValues ?? [];
+    const sortOrder = this.field.options.formOptionsSortOrder ?? 'default';
+    if (sortOrder !== 'default') {
+      // Sort by the second value, which is the display value.
+      choices.sort((a, b) => String(a[1]).localeCompare(String(b[1])));
+      if (sortOrder === 'descending') {
+        choices.reverse();
+      }
+    }
+    // Support for 1000 choices. TODO: make limit dynamic.
+    this._choices = choices.slice(0, 1000);
+
+    this.value = Observable.create<string>(this, '');
+
+    this._radioButtons.set(this._choices.map(reference => ({
+      label: String(reference[1]),
+      value: String(reference[0]),
+      checked: Observable.create(this, null),
+    })));
+  }
 
   public input() {
-    const choices: [number|string, CellValue][] = this.field.refValues ?? [];
-    // Sort by the second value, which is the display value.
-    choices.sort((a, b) => String(a[1]).localeCompare(String(b[1])));
-    // Support for 1000 choices. TODO: make limit dynamic.
-    choices.splice(1000);
+    if (this._format === 'select') {
+      return this._renderSelectInput();
+    } else {
+      return this._renderRadioInput();
+    }
+  }
+
+  public resetInput(): void {
+    this.value.set('');
+    this._radioButtons.get().forEach(radioButton => {
+      radioButton.checked.set(null);
+    });
+  }
+
+  private _renderSelectInput() {
     return css.hybridSelect(
       this._selectElement = css.select(
         {
@@ -534,27 +754,37 @@ class RefRenderer extends BaseFieldRenderer {
           'data-grist-type': this.field.type,
           required: this.field.options.formRequired,
         },
-        dom.prop('value', this.value),
         dom.on('input', (_e, elem) => this.value.set(elem.value)),
-        dom('option', {value: ''}, SELECT_PLACEHOLDER),
-        choices.map((choice) => dom('option', {value: String(choice[0])}, String(choice[1]))),
+        dom('option',
+          {value: ''},
+          SELECT_PLACEHOLDER,
+          dom.prop('selected', use => use(this.value) === ''),
+        ),
+        this._choices.map((choice) => dom('option',
+          {value: String(choice[0])},
+          String(choice[1]),
+          dom.prop('selected', use => use(this.value) === String(choice[0])),
+        )),
         dom.onKeyDown({
+          Enter$: (ev) => this._maybeOpenSearchSelect(ev),
           ' $': (ev) => this._maybeOpenSearchSelect(ev),
           ArrowUp$: (ev) => this._maybeOpenSearchSelect(ev),
           ArrowDown$: (ev) => this._maybeOpenSearchSelect(ev),
+          Backspace$: () => this.value.set(''),
         }),
+        preventSubmitOnEnter(),
       ),
       dom.maybe(use => !use(isXSmallScreenObs()), () =>
         css.searchSelect(
           dom('div', dom.text(use => {
-            const choice = choices.find((c) => String(c[0]) === use(this.value));
+            const choice = this._choices.find((c) => String(c[0]) === use(this.value));
             return String(choice?.[1] || SELECT_PLACEHOLDER);
           })),
           dropdownWithSearch<string>({
             action: (value) => this.value.set(value),
             options: () => [
               {label: SELECT_PLACEHOLDER, value: '', placeholder: true},
-              ...choices.map((choice) => ({
+              ...this._choices.map((choice) => ({
                 label: String(choice[1]),
                 value: String(choice[0]),
               }),
@@ -577,8 +807,29 @@ class RefRenderer extends BaseFieldRenderer {
     );
   }
 
-  public resetInput(): void {
-    this.value.set('');
+  private _renderRadioInput() {
+    const required = this.field.options.formRequired;
+    return css.radioList(
+      css.radioList.cls('-horizontal', this._alignment === 'horizontal'),
+      dom.cls('grist-radio-list'),
+      dom.cls('required', Boolean(required)),
+      {name: this.name(), required, 'data-grist-type': this.field.type},
+      dom.forEach(this._radioButtons, (radioButton) =>
+        css.radio(
+          dom('input',
+            dom.prop('checked', radioButton.checked),
+            dom.on('change', (_e, elem) => radioButton.checked.set(elem.value)),
+            {
+              type: 'radio',
+              name: `${this.name()}`,
+              value: radioButton.value,
+            },
+            preventSubmitOnEnter(),
+          ),
+          dom('span', radioButton.label),
+        )
+      ),
+    );
   }
 
   private _maybeOpenSearchSelect(ev: KeyboardEvent) {
@@ -594,6 +845,8 @@ class RefRenderer extends BaseFieldRenderer {
 
 const FieldRenderers = {
   'Text': TextRenderer,
+  'Numeric': NumericRenderer,
+  'Int': NumericRenderer,
   'Choice': ChoiceRenderer,
   'Bool': BoolRenderer,
   'ChoiceList': ChoiceListRenderer,
@@ -616,3 +869,36 @@ const FormRenderers = {
   'Separator': ParagraphRenderer,
   'Header': ParagraphRenderer,
 };
+
+function preventSubmitOnEnter() {
+  return dom.onKeyDown({Enter$: (ev) => ev.preventDefault()});
+}
+
+/**
+ * Validates the required attribute of checkbox and radio lists, such as those
+ * used by Choice, Choice List, Reference, and Reference List fields.
+ *
+ * Since lists of checkboxes and radios don't natively support a required attribute, we
+ * simulate it by marking the first checkbox/radio of each required list as being a
+ * required input. Then, we make another pass and unmark all required checkbox/radio
+ * inputs if they belong to a list where at least one checkbox/radio is checked. If any
+ * inputs in a required are left as required, HTML validations that are triggered when
+ * submitting a form will catch them and prevent the submission.
+ */
+function validateRequiredLists() {
+  for (const type of ['checkbox', 'radio']) {
+    const requiredLists = document
+      .querySelectorAll(`.grist-${type}-list.required:not(:has(input:checked))`);
+    Array.from(requiredLists).forEach(function(list) {
+      const firstOption = list.querySelector(`input[type="${type}"]`);
+      firstOption?.setAttribute('required', 'required');
+    });
+
+    const requiredListsWithCheckedOption = document
+      .querySelectorAll(`.grist-${type}-list.required:has(input:checked`);
+    Array.from(requiredListsWithCheckedOption).forEach(function(list) {
+      const firstOption = list.querySelector(`input[type="${type}"]`);
+      firstOption?.removeAttribute('required');
+    });
+  }
+}
diff --git a/app/client/components/FormRendererCss.ts b/app/client/components/FormRendererCss.ts
index dc776819..461ddff9 100644
--- a/app/client/components/FormRendererCss.ts
+++ b/app/client/components/FormRendererCss.ts
@@ -1,5 +1,6 @@
 import {colors, mediaXSmall, vars} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
+import {numericSpinner} from 'app/client/widgets/NumericSpinner';
 import {styled} from 'grainjs';
 
 export const label = styled('div', `
@@ -26,20 +27,23 @@ export const section = styled('div', `
   border-radius: 3px;
   border: 1px solid ${colors.darkGrey};
   padding: 24px;
-  margin-top: 24px;
+  margin-top: 12px;
+  margin-bottom: 24px;
 
   & > div + div {
-    margin-top: 16px;
+    margin-top: 8px;
+    margin-bottom: 12px;
   }
 `);
 
 export const columns = styled('div', `
   display: grid;
   grid-template-columns: repeat(var(--grist-columns-count), 1fr);
-  gap: 4px;
+  gap: 16px;
 `);
 
 export const submitButtons = styled('div', `
+  margin-top: 16px;
   display: flex;
   justify-content: center;
   column-gap: 8px;
@@ -100,32 +104,13 @@ export const submitButton = styled('div', `
 export const field = styled('div', `
   display: flex;
   flex-direction: column;
+  height: 100%;
+  justify-content: space-between;
 
-  & input[type="text"],
-  & input[type="date"],
-  & input[type="datetime-local"],
-  & input[type="number"] {
-    height: 27px;
-    padding: 4px 8px;
-    border: 1px solid ${colors.darkGrey};
-    border-radius: 3px;
-    outline-color: ${vars.primaryBgHover};
-  }
-  & input[type="text"] {
-    font-size: 13px;
-    line-height: inherit;
-    width: 100%;
-    color: ${colors.dark};
-    background-color: ${colors.light};
-  }
-  & input[type="datetime-local"],
-  & input[type="date"] {
-    width: 100%;
-    line-height: inherit;
-  }
   & input[type="checkbox"] {
     -webkit-appearance: none;
     -moz-appearance: none;
+    margin: 0;
     padding: 0;
     flex-shrink: 0;
     display: inline-block;
@@ -195,19 +180,80 @@ export const field = styled('div', `
 `);
 
 export const error = styled('div', `
+  margin-top: 16px;
   text-align: center;
   color: ${colors.error};
   min-height: 22px;
 `);
 
+export const textInput = styled('input', `
+  color: ${colors.dark};
+  background-color: ${colors.light};
+  height: 29px;
+  width: 100%;
+  font-size: 13px;
+  line-height: inherit;
+  padding: 4px 8px;
+  border: 1px solid ${colors.darkGrey};
+  border-radius: 3px;
+  outline-color: ${vars.primaryBgHover};
+`);
+
+export const textarea = styled('textarea', `
+  display: block;
+  color: ${colors.dark};
+  background-color: ${colors.light};
+  min-height: 29px;
+  width: 100%;
+  font-size: 13px;
+  line-height: inherit;
+  padding: 4px 8px;
+  border: 1px solid ${colors.darkGrey};
+  border-radius: 3px;
+  outline-color: ${vars.primaryBgHover};
+  resize: none;
+`);
+
+export const spinner = styled(numericSpinner, `
+  & input {
+    height: 29px;
+    border: none;
+    font-size: 13px;
+    line-height: inherit;
+  }
+
+  &:focus-within {
+    outline: 2px solid ${vars.primaryBgHover};
+  }
+`);
+
 export const toggle = styled('label', `
   position: relative;
-  cursor: pointer;
   display: inline-flex;
-  align-items: center;
+  margin-top: 8px;
+
+  &:hover {
+    --color: ${colors.hover};
+  }
+`);
+
+export const toggleSwitch = styled(toggle, `
+  cursor: pointer;
 
   & input[type='checkbox'] {
+    margin: 0;
     position: absolute;
+    top: 1px;
+    left: 4px;
+  }
+  & input[type='checkbox'],
+  & input[type='checkbox']::before,
+  & input[type='checkbox']::after {
+    height: 1px;
+    width: 1px;
+  }
+  & input[type='checkbox']:focus {
+    outline: none;
   }
   & input[type='checkbox']:focus {
     outline: none;
@@ -220,6 +266,8 @@ export const toggle = styled('label', `
 export const toggleLabel = styled('span', `
   font-size: 13px;
   font-weight: 700;
+  line-height: 16px;
+  overflow-wrap: anywhere;
 `);
 
 export const gristSwitchSlider = styled('div', `
@@ -233,10 +281,6 @@ export const gristSwitchSlider = styled('div', `
   border-radius: 17px;
   -webkit-transition: background-color .4s;
   transition: background-color .4s;
-
-  &:hover {
-    box-shadow: 0 0 1px #2196F3;
-  }
 `);
 
 export const gristSwitchCircle = styled('div', `
@@ -277,19 +321,67 @@ export const gristSwitch = styled('div', `
 `);
 
 export const checkboxList = styled('div', `
-  display: flex;
+  display: inline-flex;
   flex-direction: column;
-  gap: 4px;
+  gap: 8px;
+
+  &-horizontal {
+    flex-direction: row;
+    flex-wrap: wrap;
+    column-gap: 16px;
+  }
 `);
 
 export const checkbox = styled('label', `
   display: flex;
+  font-size: 13px;
+  line-height: 16px;
+  gap: 8px;
+  overflow-wrap: anywhere;
 
+  & input {
+    margin: 0px !important;
+  }
   &:hover {
     --color: ${colors.hover};
   }
 `);
 
+export const radioList = checkboxList;
+
+export const radio = styled('label', `
+  position: relative;
+  display: inline-flex;
+  gap: 8px;
+  font-size: 13px;
+  line-height: 16px;
+  font-weight: normal;
+  min-width: 0px;
+  outline-color: ${vars.primaryBgHover};
+  overflow-wrap: anywhere;
+
+  & input {
+    flex-shrink: 0;
+    appearance: none;
+    width: 16px;
+    height: 16px;
+    margin: 0px;
+    border-radius: 50%;
+    background-clip: content-box;
+    border: 1px solid ${colors.darkGrey};
+    background-color: transparent;
+    outline-color: ${vars.primaryBgHover};
+  }
+  & input:hover {
+    border: 1px solid ${colors.hover};
+  }
+  & input:checked {
+    padding: 2px;
+    background-color: ${vars.primaryBg};
+    border: 1px solid ${vars.primaryBg};
+  }
+`);
+
 export const hybridSelect = styled('div', `
   position: relative;
 `);
@@ -303,7 +395,7 @@ export const select = styled('select', `
   outline: none;
   background: white;
   line-height: inherit;
-  height: 27px;
+  height: 29px;
   flex: auto;
   width: 100%;
 
@@ -323,11 +415,11 @@ export const searchSelect = styled('div', `
   position: relative;
   padding: 4px 8px;
   border-radius: 3px;
-  border: 1px solid ${colors.darkGrey};
+  outline: 1px solid ${colors.darkGrey};
   font-size: 13px;
   background: white;
   line-height: inherit;
-  height: 27px;
+  height: 29px;
   flex: auto;
   width: 100%;
 
diff --git a/app/client/components/Forms/Columns.ts b/app/client/components/Forms/Columns.ts
index eda80299..8232e760 100644
--- a/app/client/components/Forms/Columns.ts
+++ b/app/client/components/Forms/Columns.ts
@@ -5,6 +5,7 @@ import {buildMenu} from 'app/client/components/Forms/Menu';
 import {BoxModel} from 'app/client/components/Forms/Model';
 import * as style from 'app/client/components/Forms/styles';
 import {makeTestId} from 'app/client/lib/domUtils';
+import {makeT} from 'app/client/lib/localization';
 import {icon} from 'app/client/ui2018/icons';
 import * as menus from 'app/client/ui2018/menus';
 import {inlineStyle, not} from 'app/common/gutil';
@@ -13,6 +14,8 @@ import {v4 as uuidv4} from 'uuid';
 
 const testId = makeTestId('test-forms-');
 
+const t = makeT('FormView');
+
 export class ColumnsModel extends BoxModel {
   private _columnCount = Computed.create(this, use => use(this.children).length);
 
@@ -64,7 +67,11 @@ export class ColumnsModel extends BoxModel {
       cssPlaceholder(
         testId('add'),
         icon('Plus'),
-        dom.on('click', () => this.placeAfterListChild()(Placeholder())),
+        dom.on('click', async () => {
+          await this.save(() => {
+            this.placeAfterListChild()(Placeholder());
+          });
+        }),
         style.cssColumn.cls('-add-button'),
         style.cssColumn.cls('-drag-over', dragHover),
 
@@ -152,7 +159,7 @@ export class PlaceholderModel extends BoxModel {
       buildMenu({
         box: this,
         insertBox,
-        customItems: [menus.menuItem(removeColumn, menus.menuIcon('Remove'), 'Remove Column')],
+        customItems: [menus.menuItem(removeColumn, menus.menuIcon('Remove'), t('Remove Column'))],
       }),
 
       dom.on('contextmenu', (ev) => {
@@ -219,8 +226,8 @@ export class PlaceholderModel extends BoxModel {
       return box.parent.replace(box, childBox);
     }
 
-    function removeColumn() {
-      box.removeSelf();
+    async function removeColumn() {
+      await box.deleteSelf();
     }
   }
 }
diff --git a/app/client/components/Forms/Field.ts b/app/client/components/Forms/Field.ts
index d1eb0bcf..5d1864c3 100644
--- a/app/client/components/Forms/Field.ts
+++ b/app/client/components/Forms/Field.ts
@@ -4,10 +4,20 @@ import {FormView} from 'app/client/components/Forms/FormView';
 import {BoxModel, ignoreClick} from 'app/client/components/Forms/Model';
 import * as css from 'app/client/components/Forms/styles';
 import {stopEvent} from 'app/client/lib/domUtils';
+import {makeT} from 'app/client/lib/localization';
 import {refRecord} from 'app/client/models/DocModel';
+import {
+  FormNumberFormat,
+  FormOptionsAlignment,
+  FormOptionsSortOrder,
+  FormSelectFormat,
+  FormTextFormat,
+  FormToggleFormat,
+} from 'app/client/ui/FormAPI';
 import {autoGrow} from 'app/client/ui/forms';
-import {squareCheckbox} from 'app/client/ui2018/checkbox';
+import {cssCheckboxSquare, cssLabel, squareCheckbox} from 'app/client/ui2018/checkbox';
 import {colors} from 'app/client/ui2018/cssVars';
+import {cssRadioInput} from 'app/client/ui2018/radio';
 import {isBlankValue} from 'app/common/gristTypes';
 import {Constructor, not} from 'app/common/gutil';
 import {
@@ -22,13 +32,14 @@ import {
   MultiHolder,
   observable,
   Observable,
-  styled,
-  toKo
+  toKo,
 } from 'grainjs';
 import * as ko from 'knockout';
 
 const testId = makeTestId('test-forms-');
 
+const t = makeT('FormView');
+
 /**
  * Container class for all fields.
  */
@@ -86,9 +97,6 @@ export class FieldModel extends BoxModel {
       const field = use(this.field);
       return Boolean(use(field.widgetOptionsJson.prop('formRequired')));
     });
-    this.required.onWrite(value => {
-      this.field.peek().widgetOptionsJson.prop('formRequired').setAndSave(value).catch(reportError);
-    });
 
     this.question.onWrite(value => {
       this.field.peek().question.setAndSave(value).catch(reportError);
@@ -152,6 +160,8 @@ export class FieldModel extends BoxModel {
 }
 
 export abstract class Question extends Disposable {
+  protected field = this.model.field;
+
   constructor(public model: FieldModel) {
     super();
   }
@@ -164,7 +174,7 @@ export abstract class Question extends Disposable {
     return css.cssQuestion(
       testId('question'),
       testType(this.model.colType),
-      this.renderLabel(props, dom.style('margin-bottom', '5px')),
+      this.renderLabel(props),
       this.renderInput(),
       css.cssQuestion.cls('-required', this.model.required),
       ...args
@@ -223,7 +233,7 @@ export abstract class Question extends Disposable {
       css.cssRequiredWrapper(
         testId('label'),
         // When in edit - hide * and change display from grid to display
-        css.cssRequiredWrapper.cls('-required', use => Boolean(use(this.model.required) && !use(this.model.edit))),
+        css.cssRequiredWrapper.cls('-required', use => use(this.model.required) && !use(this.model.edit)),
         dom.maybe(props.edit, () => [
           element = css.cssEditableLabel(
             controller,
@@ -264,36 +274,156 @@ export abstract class Question extends Disposable {
 
 
 class TextModel extends Question {
+  private _format = Computed.create<FormTextFormat>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formTextFormat')) ?? 'singleline';
+  });
+
+  private _rowCount = Computed.create<number>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formTextLineCount')) || 3;
+  });
+
   public renderInput() {
+    return dom.domComputed(this._format, (format) => {
+      switch (format) {
+        case 'singleline': {
+          return this._renderSingleLineInput();
+        }
+        case 'multiline': {
+          return this._renderMultiLineInput();
+        }
+      }
+    });
+  }
+
+  private _renderSingleLineInput() {
     return css.cssInput(
-      dom.prop('name', u => u(u(this.model.field).colId)),
-      {disabled: true},
+      dom.prop('name', u => u(u(this.field).colId)),
       {type: 'text', tabIndex: "-1"},
     );
   }
+
+  private _renderMultiLineInput() {
+    return css.cssTextArea(
+      dom.prop('name', u => u(u(this.field).colId)),
+      dom.prop('rows', this._rowCount),
+      {tabIndex: "-1"},
+    );
+  }
 }
 
-class ChoiceModel extends Question {
-  protected choices: Computed<string[]> = Computed.create(this, use => {
-    // Read choices from field.
-    const choices = use(use(this.model.field).widgetOptionsJson.prop('choices'));
-
-    // Make sure it is an array of strings.
-    if (!Array.isArray(choices) || choices.some((choice) => typeof choice !== 'string')) {
-      return [];
-    } else {
-      return choices;
-    }
+class NumericModel extends Question {
+  private _format = Computed.create<FormNumberFormat>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formNumberFormat')) ?? 'text';
   });
 
-  public renderInput(): HTMLElement {
-    const field = this.model.field;
+  public renderInput() {
+    return dom.domComputed(this._format, (format) => {
+      switch (format) {
+        case 'text': {
+          return this._renderTextInput();
+        }
+        case 'spinner': {
+          return this._renderSpinnerInput();
+        }
+      }
+    });
+  }
+
+  private _renderTextInput() {
+    return css.cssInput(
+      dom.prop('name', u => u(u(this.field).colId)),
+      {type: 'text', tabIndex: "-1"},
+    );
+  }
+
+  private _renderSpinnerInput() {
+    return css.cssSpinner(observable(''), {});
+  }
+}
+
+class ChoiceModel extends Question {
+  protected choices: Computed<string[]>;
+
+  protected alignment = Computed.create<FormOptionsAlignment>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formOptionsAlignment')) ?? 'vertical';
+  });
+
+  private _format = Computed.create<FormSelectFormat>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formSelectFormat')) ?? 'select';
+  });
+
+  private _sortOrder = Computed.create<FormOptionsSortOrder>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formOptionsSortOrder')) ?? 'default';
+  });
+
+  constructor(model: FieldModel) {
+    super(model);
+    this.choices = Computed.create(this, use => {
+      // Read choices from field.
+      const field = use(this.field);
+      const choices = use(field.widgetOptionsJson.prop('choices'))?.slice() ?? [];
+
+      // Make sure it is an array of strings.
+      if (!Array.isArray(choices) || choices.some((choice) => typeof choice !== 'string')) {
+        return [];
+      } else {
+        const sort = use(this._sortOrder);
+        if (sort !== 'default') {
+          choices.sort((a, b) => a.localeCompare(b));
+          if (sort === 'descending') {
+            choices.reverse();
+          }
+        }
+        return choices;
+      }
+    });
+  }
+
+  public renderInput() {
+    return dom('div',
+      dom.domComputed(this._format, (format) => {
+        if (format === 'select') {
+          return this._renderSelectInput();
+        } else {
+          return this._renderRadioInput();
+        }
+      }),
+      dom.maybe(use => use(this.choices).length === 0, () => [
+        css.cssWarningMessage(css.cssWarningIcon('Warning'), t('No choices configured')),
+      ]),
+    );
+  }
+
+  private _renderSelectInput() {
     return css.cssSelect(
       {tabIndex: "-1"},
       ignoreClick,
-      dom.prop('name', use => use(use(field).colId)),
-      dom('option', SELECT_PLACEHOLDER, {value: ''}),
-      dom.forEach(this.choices, (choice) => dom('option', choice, {value: choice})),
+      dom.prop('name', use => use(use(this.field).colId)),
+      dom('option',
+        SELECT_PLACEHOLDER,
+        {value: ''},
+      ),
+      dom.forEach(this.choices, (choice) => dom('option',
+        choice,
+        {value: choice},
+      )),
+    );
+  }
+
+  private _renderRadioInput() {
+    return css.cssRadioList(
+      css.cssRadioList.cls('-horizontal', use => use(this.alignment) === 'horizontal'),
+      dom.prop('name', use => use(use(this.field).colId)),
+      dom.forEach(this.choices, (choice) => css.cssRadioLabel(
+        cssRadioInput({type: 'radio'}),
+        choice,
+      )),
     );
   }
 }
@@ -305,21 +435,28 @@ class ChoiceListModel extends ChoiceModel {
   });
 
   public renderInput() {
-    const field = this.model.field;
-    return dom('div',
+    const field = this.field;
+    return css.cssCheckboxList(
+      css.cssCheckboxList.cls('-horizontal', use => use(this.alignment) === 'horizontal'),
       dom.prop('name', use => use(use(field).colId)),
       dom.forEach(this._choices, (choice) => css.cssCheckboxLabel(
-        squareCheckbox(observable(false)),
-        choice
+        css.cssCheckboxLabel.cls('-horizontal', use => use(this.alignment) === 'horizontal'),
+        cssCheckboxSquare({type: 'checkbox'}),
+        choice,
       )),
       dom.maybe(use => use(this._choices).length === 0, () => [
-        dom('div', 'No choices defined'),
+        css.cssWarningMessage(css.cssWarningIcon('Warning'), t('No choices configured')),
       ]),
     );
   }
 }
 
 class BoolModel extends Question {
+  private _format = Computed.create<FormToggleFormat>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formToggleFormat')) ?? 'switch';
+  });
+
   public override buildDom(props: {
     edit: Observable<boolean>,
     overlay: Observable<boolean>,
@@ -329,22 +466,37 @@ class BoolModel extends Question {
     return css.cssQuestion(
       testId('question'),
       testType(this.model.colType),
-      cssToggle(
+      css.cssToggle(
         this.renderInput(),
         this.renderLabel(props, css.cssLabelInline.cls('')),
       ),
     );
   }
+
   public override renderInput() {
-    const value = Observable.create(this, true);
-    return dom('div.widget_switch',
+    return dom.domComputed(this._format, (format) => {
+      if (format === 'switch') {
+        return this._renderSwitchInput();
+      } else {
+        return this._renderCheckboxInput();
+      }
+    });
+  }
+
+  private _renderSwitchInput() {
+    return css.cssWidgetSwitch(
       dom.style('--grist-actual-cell-color', colors.lightGreen.toString()),
-      dom.cls('switch_on', value),
-      dom.cls('switch_transition', true),
+      dom.cls('switch_transition'),
       dom('div.switch_slider'),
       dom('div.switch_circle'),
     );
   }
+
+  private _renderCheckboxInput() {
+    return cssLabel(
+      cssCheckboxSquare({type: 'checkbox'}),
+    );
+  }
 }
 
 class DateModel extends Question {
@@ -352,8 +504,8 @@ class DateModel extends Question {
     return dom('div',
       css.cssInput(
         dom.prop('name', this.model.colId),
-        {type: 'date', style: 'margin-right: 5px; width: 100%;'
-      }),
+        {type: 'date', style: 'margin-right: 5px;'},
+      ),
     );
   }
 }
@@ -363,7 +515,7 @@ class DateTimeModel extends Question {
     return dom('div',
       css.cssInput(
         dom.prop('name', this.model.colId),
-        {type: 'datetime-local', style: 'margin-right: 5px; width: 100%;'}
+        {type: 'datetime-local', style: 'margin-right: 5px;'},
       ),
       dom.style('width', '100%'),
     );
@@ -371,19 +523,38 @@ class DateTimeModel extends Question {
 }
 
 class RefListModel extends Question {
-  protected options = this._getOptions();
+  protected options: Computed<{label: string, value: string}[]>;
+
+  protected alignment = Computed.create<FormOptionsAlignment>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formOptionsAlignment')) ?? 'vertical';
+  });
+
+  private _sortOrder = Computed.create<FormOptionsSortOrder>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formOptionsSortOrder')) ?? 'default';
+  });
+
+  constructor(model: FieldModel) {
+    super(model);
+    this.options = this._getOptions();
+  }
 
   public renderInput() {
-    return dom('div',
+    return css.cssCheckboxList(
+      css.cssCheckboxList.cls('-horizontal', use => use(this.alignment) === 'horizontal'),
       dom.prop('name', this.model.colId),
       dom.forEach(this.options, (option) => css.cssCheckboxLabel(
         squareCheckbox(observable(false)),
         option.label,
       )),
       dom.maybe(use => use(this.options).length === 0, () => [
-        dom('div', 'No values in show column of referenced table'),
+        css.cssWarningMessage(
+          css.cssWarningIcon('Warning'),
+          t('No values in show column of referenced table'),
+        ),
       ]),
-    ) as HTMLElement;
+    );
   }
 
   private _getOptions() {
@@ -394,39 +565,83 @@ class RefListModel extends Question {
 
     const colId = Computed.create(this, use => {
       const dispColumnIdObs = use(use(this.model.column).visibleColModel);
-      return use(dispColumnIdObs.colId);
+      return use(dispColumnIdObs.colId) || 'id';
     });
 
     const observer = this.model.view.gristDoc.columnObserver(this, tableId, colId);
 
     return Computed.create(this, use => {
-      return use(observer)
+      const sort = use(this._sortOrder);
+      const values = use(observer)
         .filter(([_id, value]) => !isBlankValue(value))
-        .map(([id, value]) => ({label: String(value), value: String(id)}))
-        .sort((a, b) => a.label.localeCompare(b.label))
-        .slice(0, 30); // TODO: make limit dynamic.
+        .map(([id, value]) => ({label: String(value), value: String(id)}));
+      if (sort !== 'default') {
+        values.sort((a, b) => a.label.localeCompare(b.label));
+        if (sort === 'descending') {
+          values.reverse();
+        }
+      }
+      return values.slice(0, 30);
     });
   }
 }
 
 class RefModel extends RefListModel {
+  private _format = Computed.create<FormSelectFormat>(this, (use) => {
+    const field = use(this.field);
+    return use(field.widgetOptionsJson.prop('formSelectFormat')) ?? 'select';
+  });
+
   public renderInput() {
+    return dom('div',
+      dom.domComputed(this._format, (format) => {
+        if (format === 'select') {
+          return this._renderSelectInput();
+        } else {
+          return this._renderRadioInput();
+        }
+      }),
+      dom.maybe(use => use(this.options).length === 0, () => [
+        css.cssWarningMessage(
+          css.cssWarningIcon('Warning'),
+          t('No values in show column of referenced table'),
+        ),
+      ]),
+    );
+  }
+
+  private _renderSelectInput() {
     return css.cssSelect(
       {tabIndex: "-1"},
       ignoreClick,
       dom.prop('name', this.model.colId),
-      dom('option', SELECT_PLACEHOLDER, {value: ''}),
-      dom.forEach(this.options, ({label, value}) => dom('option', label, {value})),
+      dom('option',
+        SELECT_PLACEHOLDER,
+        {value: ''},
+      ),
+      dom.forEach(this.options, ({label, value}) => dom('option',
+        label,
+        {value},
+      )),
+    );
+  }
+
+  private _renderRadioInput() {
+    return css.cssRadioList(
+      css.cssRadioList.cls('-horizontal', use => use(this.alignment) === 'horizontal'),
+      dom.prop('name', use => use(use(this.field).colId)),
+      dom.forEach(this.options, ({label, value}) => css.cssRadioLabel(
+        cssRadioInput({type: 'radio'}),
+        label,
+      )),
     );
   }
 }
 
-// TODO: decide which one we need and implement rest.
 const AnyModel = TextModel;
-const NumericModel = TextModel;
-const IntModel = TextModel;
-const AttachmentsModel = TextModel;
 
+// Attachments are not currently supported.
+const AttachmentsModel = TextModel;
 
 function fieldConstructor(type: string): Constructor<Question> {
   switch (type) {
@@ -436,7 +651,7 @@ function fieldConstructor(type: string): Constructor<Question> {
     case 'ChoiceList': return ChoiceListModel;
     case 'Date': return DateModel;
     case 'DateTime': return DateTimeModel;
-    case 'Int': return IntModel;
+    case 'Int': return NumericModel;
     case 'Numeric': return NumericModel;
     case 'Ref': return RefModel;
     case 'RefList': return RefListModel;
@@ -451,12 +666,3 @@ function fieldConstructor(type: string): Constructor<Question> {
 function testType(value: BindableValue<string>) {
   return dom('input', {type: 'hidden'}, dom.prop('value', value), testId('type'));
 }
-
-const cssToggle = styled('div', `
-  display: grid;
-  align-items: center;
-  grid-template-columns: auto 1fr;
-  gap: 8px;
-  padding: 4px 0px;
-  --grist-actual-cell-color: ${colors.lightGreen};
-`);
diff --git a/app/client/components/Forms/FormConfig.ts b/app/client/components/Forms/FormConfig.ts
index 31c32db7..832a8558 100644
--- a/app/client/components/Forms/FormConfig.ts
+++ b/app/client/components/Forms/FormConfig.ts
@@ -1,25 +1,119 @@
 import {fromKoSave} from 'app/client/lib/fromKoSave';
 import {makeT} from 'app/client/lib/localization';
 import {ViewFieldRec} from 'app/client/models/DocModel';
-import {KoSaveableObservable} from 'app/client/models/modelUtil';
-import {cssLabel, cssRow, cssSeparator} from 'app/client/ui/RightPanelStyles';
+import {fieldWithDefault} from 'app/client/models/modelUtil';
+import {FormOptionsAlignment, FormOptionsSortOrder, FormSelectFormat} from 'app/client/ui/FormAPI';
+import {
+  cssLabel,
+  cssRow,
+  cssSeparator,
+} from 'app/client/ui/RightPanelStyles';
+import {buttonSelect} from 'app/client/ui2018/buttonSelect';
 import {labeledSquareCheckbox} from 'app/client/ui2018/checkbox';
-import {testId} from 'app/client/ui2018/cssVars';
-import {Disposable} from 'grainjs';
+import {select} from 'app/client/ui2018/menus';
+import {Disposable, dom, makeTestId} from 'grainjs';
 
 const t = makeT('FormConfig');
 
-export class FieldRulesConfig extends Disposable {
+const testId = makeTestId('test-form-');
+
+export class FormSelectConfig extends Disposable {
   constructor(private _field: ViewFieldRec) {
     super();
   }
 
   public buildDom() {
-    const requiredField: KoSaveableObservable<boolean> = this._field.widgetOptionsJson.prop('formRequired');
+    const format = fieldWithDefault<FormSelectFormat>(
+      this._field.widgetOptionsJson.prop('formSelectFormat'),
+      'select'
+    );
+
+    return [
+      cssLabel(t('Field Format')),
+      cssRow(
+        buttonSelect(
+          fromKoSave(format),
+          [
+            {value: 'select', label: t('Select')},
+            {value: 'radio', label: t('Radio')},
+          ],
+          testId('field-format'),
+        ),
+      ),
+      dom.maybe(use => use(format) === 'radio', () => dom.create(FormOptionsAlignmentConfig, this._field)),
+    ];
+  }
+}
+
+export class FormOptionsAlignmentConfig extends Disposable {
+  constructor(private _field: ViewFieldRec) {
+    super();
+  }
+
+  public buildDom() {
+    const alignment = fieldWithDefault<FormOptionsAlignment>(
+      this._field.widgetOptionsJson.prop('formOptionsAlignment'),
+      'vertical'
+    );
+
+    return [
+      cssLabel(t('Options Alignment')),
+      cssRow(
+        select(
+          fromKoSave(alignment),
+          [
+            {value: 'vertical', label: t('Vertical')},
+            {value: 'horizontal', label: t('Horizontal')},
+          ],
+          {defaultLabel: t('Vertical')}
+        ),
+      ),
+    ];
+  }
+}
+
+export class FormOptionsSortConfig extends Disposable {
+  constructor(private _field: ViewFieldRec) {
+    super();
+  }
+
+  public buildDom() {
+    const optionsSortOrder = fieldWithDefault<FormOptionsSortOrder>(
+      this._field.widgetOptionsJson.prop('formOptionsSortOrder'),
+      'default'
+    );
+
+    return [
+      cssLabel(t('Options Sort Order')),
+      cssRow(
+        select(
+          fromKoSave(optionsSortOrder),
+          [
+            {value: 'default', label: t('Default')},
+            {value: 'ascending', label: t('Ascending')},
+            {value: 'descending', label: t('Descending')},
+          ],
+          {defaultLabel: t('Default')}
+        ),
+      ),
+    ];
+  }
+}
+
+export class FormFieldRulesConfig extends Disposable {
+  constructor(private _field: ViewFieldRec) {
+    super();
+  }
+
+  public buildDom() {
+    const requiredField = fieldWithDefault<boolean>(
+      this._field.widgetOptionsJson.prop('formRequired'),
+      false
+    );
 
     return [
       cssSeparator(),
-      cssLabel(t('Field rules')),
+      cssLabel(t('Field Rules')),
       cssRow(labeledSquareCheckbox(
         fromKoSave(requiredField),
         t('Required field'),
diff --git a/app/client/components/Forms/FormView.ts b/app/client/components/Forms/FormView.ts
index e53b21c5..6de4ac3a 100644
--- a/app/client/components/Forms/FormView.ts
+++ b/app/client/components/Forms/FormView.ts
@@ -16,6 +16,7 @@ import {logTelemetryEvent} from 'app/client/lib/telemetry';
 import DataTableModel from 'app/client/models/DataTableModel';
 import {ViewFieldRec, ViewSectionRec} from 'app/client/models/DocModel';
 import {reportError} from 'app/client/models/errors';
+import {jsonObservable, SaveableObjObservable} from 'app/client/models/modelUtil';
 import {ShareRec} from 'app/client/models/entities/ShareRec';
 import {InsertColOptions} from 'app/client/models/entities/ViewSectionRec';
 import {docUrl, urlState} from 'app/client/models/gristUrlState';
@@ -55,7 +56,8 @@ export class FormView extends Disposable {
   protected bundle: (clb: () => Promise<void>) => Promise<void>;
 
   private _formFields: Computed<ViewFieldRec[]>;
-  private _autoLayout: Computed<FormLayoutNode>;
+  private _layoutSpec: SaveableObjObservable<FormLayoutNode>;
+  private _layout: Computed<FormLayoutNode>;
   private _root: BoxModel;
   private _savedLayout: any;
   private _saving: boolean = false;
@@ -67,7 +69,7 @@ export class FormView extends Disposable {
   private _showPublishedMessage: Observable<boolean>;
   private _isOwner: boolean;
   private _openingForm: Observable<boolean>;
-  private _formElement: HTMLElement;
+  private _formEditorBodyElement: HTMLElement;
 
   public create(gristDoc: GristDoc, viewSectionModel: ViewSectionRec) {
     BaseView.call(this as any, gristDoc, viewSectionModel, {'addNewRow': false});
@@ -134,28 +136,30 @@ export class FormView extends Disposable {
 
     this._formFields = Computed.create(this, use => {
       const fields = use(use(this.viewSection.viewFields).getObservable());
-      return fields.filter(f => use(use(f.column).isFormCol));
+      return fields.filter(f => {
+        const column = use(f.column);
+        return (
+          use(column.pureType) !== 'Attachments' &&
+          !(use(column.isRealFormula) && !use(column.colId).startsWith('gristHelper_Transform'))
+        );
+      });
     });
 
-    this._autoLayout = Computed.create(this, use => {
+    this._layoutSpec = jsonObservable(this.viewSection.layoutSpec, (layoutSpec: FormLayoutNode|null) => {
+      return layoutSpec ?? buildDefaultFormLayout(this._formFields.get());
+    });
+
+    this._layout = Computed.create(this, use => {
       const fields = use(this._formFields);
-      const layout = use(this.viewSection.layoutSpecObj);
-      if (!layout || !layout.id) {
-        return this._formTemplate(fields);
-      } else {
-        const patchedLayout = patchLayoutSpec(layout, new Set(fields.map(f => f.id())));
-        if (!patchedLayout) { throw new Error('Invalid form layout spec'); }
+      const layoutSpec = use(this._layoutSpec);
+      const patchedLayout = patchLayoutSpec(layoutSpec, new Set(fields.map(f => f.id())));
+      if (!patchedLayout) { throw new Error('Invalid form layout spec'); }
 
-        return patchedLayout;
-      }
+      return patchedLayout;
     });
 
-    this._root = this.autoDispose(new LayoutModel(this._autoLayout.get(), null, async (clb?: () => Promise<void>) => {
+    this._root = this.autoDispose(new LayoutModel(this._layout.get(), null, async (clb?: () => Promise<void>) => {
       await this.bundle(async () => {
-        // If the box is autogenerated we need to save it first.
-        if (!this.viewSection.layoutSpecObj.peek()?.id) {
-          await this.save();
-        }
         if (clb) {
           await clb();
         }
@@ -163,7 +167,7 @@ export class FormView extends Disposable {
       });
     }, this));
 
-    this._autoLayout.addListener((v) => {
+    this._layout.addListener((v) => {
       if (this._saving) {
         console.warn('Layout changed while saving');
         return;
@@ -421,9 +425,9 @@ export class FormView extends Disposable {
   public buildDom() {
     return style.cssFormView(
       testId('editor'),
-      style.cssFormEditBody(
+      this._formEditorBodyElement = style.cssFormEditBody(
         style.cssFormContainer(
-          this._formElement = dom('div', dom.forEach(this._root.children, (child) => {
+          dom('div', dom.forEach(this._root.children, (child) => {
             if (!child) {
               return dom('div', 'Empty node');
             }
@@ -433,9 +437,9 @@ export class FormView extends Disposable {
             }
             return element;
           })),
-          this._buildPublisher(),
         ),
       ),
+      this._buildPublisher(),
       dom.on('click', () => this.selectedBox.set(null)),
       dom.maybe(this.gristDoc.docPageModel.isReadonly, () => style.cssFormDisabledOverlay()),
     );
@@ -481,7 +485,7 @@ export class FormView extends Disposable {
       // If nothing has changed, don't bother.
       if (isEqual(newVersion, this._savedLayout)) { return; }
       this._savedLayout = newVersion;
-      await this.viewSection.layoutSpecObj.setAndSave(newVersion);
+      await this._layoutSpec.setAndSave(newVersion);
     } finally {
       this._saving = false;
     }
@@ -861,17 +865,17 @@ export class FormView extends Disposable {
     );
   }
 
+  private _getSectionCount() {
+    return [...this._root.filter(box => box.type === 'Section')].length;
+  }
+
   private _getEstimatedFormHeightPx() {
     return (
-      // Form content height.
-      this._formElement.scrollHeight +
-      // Plus top/bottom page padding.
-      (2 * 52) +
-      // Plus top/bottom form padding.
-      (2 * 20) +
-      // Plus minimum form error height.
-      38 +
-      // Plus form footer height.
+      // Form height.
+      this._formEditorBodyElement.scrollHeight +
+      // Minus "+" button height in each section.
+      (-32 * this._getSectionCount()) +
+      // Plus form footer height (visible only in the preview and published form).
       64
     );
   }
@@ -902,30 +906,6 @@ export class FormView extends Disposable {
     });
   }
 
-  /**
-   * Generates a form template based on the fields in the view section.
-   */
-  private _formTemplate(fields: ViewFieldRec[]): FormLayoutNode {
-    const boxes: FormLayoutNode[] = fields.map(f => {
-      return {
-        id: uuidv4(),
-        type: 'Field',
-        leaf: f.id(),
-      };
-    });
-    const section = components.Section(...boxes);
-    return {
-      id: uuidv4(),
-      type: 'Layout',
-      children: [
-        {id: uuidv4(), type: 'Paragraph', text: FORM_TITLE, alignment: 'center', },
-        {id: uuidv4(), type: 'Paragraph', text: FORM_DESC, alignment: 'center', },
-        section,
-        {id: uuidv4(), type: 'Submit'},
-      ],
-    };
-  }
-
   private async _resetForm() {
     this.selectedBox.set(null);
     await this.gristDoc.docData.bundleActions('Reset form', async () => {
@@ -951,11 +931,35 @@ export class FormView extends Disposable {
       ]);
 
       const fields = this.viewSection.viewFields().all().slice(0, 9);
-      await this.viewSection.layoutSpecObj.setAndSave(this._formTemplate(fields));
+      await this._layoutSpec.setAndSave(buildDefaultFormLayout(fields));
     });
   }
 }
 
+/**
+ * Generates a default form layout based on the fields in the view section.
+ */
+export function buildDefaultFormLayout(fields: ViewFieldRec[]): FormLayoutNode {
+  const boxes: FormLayoutNode[] = fields.map(f => {
+    return {
+      id: uuidv4(),
+      type: 'Field',
+      leaf: f.id(),
+    };
+  });
+  const section = components.Section(...boxes);
+  return {
+    id: uuidv4(),
+    type: 'Layout',
+    children: [
+      {id: uuidv4(), type: 'Paragraph', text: FORM_TITLE, alignment: 'center', },
+      {id: uuidv4(), type: 'Paragraph', text: FORM_DESC, alignment: 'center', },
+      section,
+      {id: uuidv4(), type: 'Submit'},
+    ],
+  };
+}
+
 // Getting an ES6 class to work with old-style multiple base classes takes a little hacking. Credits: ./ChartView.ts
 defaults(FormView.prototype, BaseView.prototype);
 Object.assign(FormView.prototype, BackboneEvents);
diff --git a/app/client/components/Forms/Model.ts b/app/client/components/Forms/Model.ts
index 2f24d456..c7531472 100644
--- a/app/client/components/Forms/Model.ts
+++ b/app/client/components/Forms/Model.ts
@@ -1,7 +1,17 @@
 import {FormLayoutNode, FormLayoutNodeType} from 'app/client/components/FormRenderer';
 import * as elements from 'app/client/components/Forms/elements';
 import {FormView} from 'app/client/components/Forms/FormView';
-import {bundleChanges, Computed, Disposable, dom, IDomArgs, MutableObsArray, obsArray, Observable} from 'grainjs';
+import {MaybePromise} from 'app/plugin/gutil';
+import {
+  bundleChanges,
+  Computed,
+  Disposable,
+  dom,
+  IDomArgs,
+  MutableObsArray,
+  obsArray,
+  Observable,
+} from 'grainjs';
 
 type Callback = () => Promise<void>;
 
@@ -186,7 +196,7 @@ export abstract class BoxModel extends Disposable {
     return this._props.hasOwnProperty(name);
   }
 
-  public async save(before?: () => Promise<void>): Promise<void> {
+  public async save(before?: () => MaybePromise<void>): Promise<void> {
     if (!this.parent) { throw new Error('Cannot save detached box'); }
     return this.parent.save(before);
   }
diff --git a/app/client/components/Forms/Section.ts b/app/client/components/Forms/Section.ts
index 9d0f0106..24c2ba0d 100644
--- a/app/client/components/Forms/Section.ts
+++ b/app/client/components/Forms/Section.ts
@@ -62,7 +62,6 @@ export class SectionModel extends BoxModel {
           ),
         )
       )},
-      style.cssSectionEditor.cls(''),
     );
   }
 
diff --git a/app/client/components/Forms/Submit.ts b/app/client/components/Forms/Submit.ts
index 9989d8c4..be81eaff 100644
--- a/app/client/components/Forms/Submit.ts
+++ b/app/client/components/Forms/Submit.ts
@@ -1,3 +1,4 @@
+import * as css from "app/client/components/FormRendererCss";
 import { BoxModel } from "app/client/components/Forms/Model";
 import { makeTestId } from "app/client/lib/domUtils";
 import { bigPrimaryButton } from "app/client/ui2018/buttons";
@@ -9,8 +10,14 @@ export class SubmitModel extends BoxModel {
     const text = this.view.viewSection.layoutSpecObj.prop('submitText');
     return dom(
       "div",
-      { style: "text-align: center; margin-top: 20px;" },
-      bigPrimaryButton(dom.text(use => use(text) || 'Submit'), testId("submit"))
+      css.error(testId("error")),
+      css.submitButtons(
+        bigPrimaryButton(
+          dom.text(use => use(text) || 'Submit'),
+          { disabled: true },
+          testId("submit"),
+        ),
+      ),
     );
   }
 }
diff --git a/app/client/components/Forms/styles.ts b/app/client/components/Forms/styles.ts
index f6b921f9..6b5fa8d0 100644
--- a/app/client/components/Forms/styles.ts
+++ b/app/client/components/Forms/styles.ts
@@ -1,8 +1,10 @@
 import {textarea} from 'app/client/ui/inputs';
 import {sanitizeHTML} from 'app/client/ui/sanitizeHTML';
 import {basicButton, basicButtonLink, textButton} from 'app/client/ui2018/buttons';
+import {cssLabel} from 'app/client/ui2018/checkbox';
 import {colors, theme} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
+import {numericSpinner} from 'app/client/widgets/NumericSpinner';
 import {BindableValue, dom, DomElementArg, IDomArgs, Observable, styled, subscribeBindable} from 'grainjs';
 import {marked} from 'marked';
 
@@ -14,7 +16,6 @@ export const cssFormView = styled('div.flexauto.flexvbox', `
   align-items: center;
   justify-content: space-between;
   position: relative;
-  background-color: ${theme.leftPanelBg};
   overflow: auto;
   min-height: 100%;
   width: 100%;
@@ -22,7 +23,6 @@ export const cssFormView = styled('div.flexauto.flexvbox', `
 
 export const cssFormContainer = styled('div', `
   background-color: ${theme.mainPanelBg};
-  border: 1px solid ${theme.modalBorderDark};
   color: ${theme.text};
   width: 600px;
   align-self: center;
@@ -31,10 +31,8 @@ export const cssFormContainer = styled('div', `
   display: flex;
   flex-direction: column;
   max-width: calc(100% - 32px);
-  padding-top: 20px;
-  padding-left: 48px;
-  padding-right: 48px;
   gap: 8px;
+  line-height: 1.42857143;
 `);
 
 export const cssFieldEditor = styled('div.hover_border.field_editor', `
@@ -47,6 +45,11 @@ export const cssFieldEditor = styled('div.hover_border.field_editor', `
   margin-bottom: 4px;
   --hover-visible: hidden;
   transition: transform 0.2s ease-in-out;
+  &-Section {
+    outline: 1px solid ${theme.modalBorderDark};
+    margin-bottom: 24px;
+    padding: 16px;
+  }
   &:hover:not(:has(.hover_border:hover),&-cut) {
     --hover-visible: visible;
     outline: 1px solid ${theme.controlPrimaryBg};
@@ -78,37 +81,40 @@ export const cssFieldEditor = styled('div.hover_border.field_editor', `
   }
 `);
 
-export const cssSectionEditor = styled('div', `
-  border-radius: 3px;
-  padding: 16px;
-  border: 1px solid ${theme.modalBorderDark};
-`);
-
-
 export const cssSection = styled('div', `
   position: relative;
   color: ${theme.text};
   margin: 0px auto;
   min-height: 50px;
-  .${cssFormView.className}-preview & {
-    background: transparent;
-    border-radius: unset;
-    padding: 0px;
-    min-height: auto;
+`);
+
+export const cssCheckboxList = styled('div', `
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  &-horizontal {
+    flex-direction: row;
+    flex-wrap: wrap;
+    column-gap: 16px;
   }
 `);
 
-export const cssCheckboxLabel = styled('label', `
-  font-size: 15px;
+export const cssCheckboxLabel = styled(cssLabel, `
+  font-size: 13px;
+  line-height: 16px;
   font-weight: normal;
   user-select: none;
   display: flex;
-  align-items: center;
   gap: 8px;
   margin: 0px;
-  margin-bottom: 8px;
+  overflow-wrap: anywhere;
 `);
 
+export const cssRadioList = cssCheckboxList;
+
+export const cssRadioLabel = cssCheckboxLabel;
+
 export function textbox(obs: Observable<string|undefined>, ...args: DomElementArg[]): HTMLInputElement {
   return dom('input',
     dom.prop('value', u => u(obs) || ''),
@@ -118,11 +124,14 @@ export function textbox(obs: Observable<string|undefined>, ...args: DomElementAr
 }
 
 export const cssQuestion = styled('div', `
-
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
 `);
 
 export const cssRequiredWrapper = styled('div', `
-  margin-bottom: 8px;
+  margin: 8px 0px;
   min-height: 16px;
   &-required {
     display: grid;
@@ -148,7 +157,7 @@ export const cssRenderedLabel = styled('div', `
   min-height: 16px;
 
   color: ${theme.mediumText};
-  font-size: 11px;
+  font-size: 13px;
   line-height: 16px;
   font-weight: 700;
   white-space: pre-wrap;
@@ -186,17 +195,9 @@ export const cssEditableLabel = styled(textarea, `
 `);
 
 export const cssLabelInline = styled('div', `
-  margin-bottom: 0px;
-  & .${cssRenderedLabel.className} {
-    color: ${theme.mediumText};
-    font-size: 15px;
-    font-weight: normal;
-  }
-  & .${cssEditableLabel.className} {
-    color: ${colors.darkText};
-    font-size: 15px;
-    font-weight: normal;
-  }
+  line-height: 16px;
+  margin: 0px;
+  overflow-wrap: anywhere;
 `);
 
 export const cssDesc = styled('div', `
@@ -211,15 +212,19 @@ export const cssDesc = styled('div', `
 `);
 
 export const cssInput = styled('input', `
-  background-color: ${theme.inputDisabledBg};
+  background-color: ${theme.inputBg};
   font-size: inherit;
-  height: 27px;
+  height: 29px;
   padding: 4px 8px;
   border: 1px solid ${theme.inputBorder};
   border-radius: 3px;
   outline: none;
   pointer-events: none;
 
+  &:disabled {
+    color: ${theme.inputDisabledFg};
+    background-color: ${theme.inputDisabledBg};
+  }
   &-invalid {
     color: ${theme.inputInvalid};
   }
@@ -228,10 +233,37 @@ export const cssInput = styled('input', `
   }
 `);
 
+export const cssTextArea = styled('textarea', `
+  background-color: ${theme.inputBg};
+  font-size: inherit;
+  min-height: 29px;
+  padding: 4px 8px;
+  border: 1px solid ${theme.inputBorder};
+  border-radius: 3px;
+  outline: none;
+  pointer-events: none;
+  resize: none;
+  width: 100%;
+
+  &:disabled {
+    color: ${theme.inputDisabledFg};
+    background-color: ${theme.inputDisabledBg};
+  }
+`);
+
+export const cssSpinner = styled(numericSpinner, `
+  height: 29px;
+
+  &-hidden {
+    color: ${theme.inputDisabledFg};
+    background-color: ${theme.inputDisabledBg};
+  }
+`);
+
 export const cssSelect = styled('select', `
   flex: auto;
   width: 100%;
-  background-color: ${theme.inputDisabledBg};
+  background-color: ${theme.inputBg};
   font-size: inherit;
   height: 27px;
   padding: 4px 8px;
@@ -241,8 +273,34 @@ export const cssSelect = styled('select', `
   pointer-events: none;
 `);
 
-export const cssFieldEditorContent = styled('div', `
+export const cssToggle = styled('div', `
+  display: grid;
+  grid-template-columns: auto 1fr;
+  margin-top: 12px;
+  gap: 8px;
+  --grist-actual-cell-color: ${colors.lightGreen};
+`);
 
+export const cssWidgetSwitch = styled('div.widget_switch', `
+  &-hidden {
+    opacity: 0.6;
+  }
+`);
+
+export const cssWarningMessage = styled('div', `
+  margin-top: 8px;
+  display: flex;
+  align-items: center;
+  column-gap: 8px;
+`);
+
+export const cssWarningIcon = styled(icon, `
+  --icon-color: ${colors.warning};
+  flex-shrink: 0;
+`);
+
+export const cssFieldEditorContent = styled('div', `
+  height: 100%;
 `);
 
 export const cssSelectedOverlay = styled('div._cssSelectedOverlay', `
@@ -253,10 +311,6 @@ export const cssSelectedOverlay = styled('div._cssSelectedOverlay', `
   .${cssFieldEditor.className}-selected > & {
     opacity: 1;
   }
-
-  .${cssFormView.className}-preview & {
-    display: none;
-  }
 `);
 
 export const cssPlusButton = styled('div', `
@@ -288,22 +342,12 @@ export const cssPlusIcon = styled(icon, `
 
 
 export const cssColumns = styled('div', `
-  --css-columns-count: 2;
   display: grid;
   grid-template-columns: repeat(var(--css-columns-count), 1fr) 32px;
   gap: 8px;
   padding: 8px 4px;
-
-  .${cssFormView.className}-preview & {
-    background: transparent;
-    border-radius: unset;
-    padding: 0px;
-    grid-template-columns: repeat(var(--css-columns-count), 1fr);
-    min-height: auto;
-  }
 `);
 
-
 export const cssColumn = styled('div', `
   position: relative;
   &-empty, &-add-button {
@@ -336,21 +380,6 @@ export const cssColumn = styled('div', `
   &-drag-over {
     outline: 2px dashed ${theme.controlPrimaryBg};
   }
-
-  &-add-button {
-  }
-
-  .${cssFormView.className}-preview &-add-button {
-    display: none;
-  }
-
-  .${cssFormView.className}-preview &-empty {
-    background: transparent;
-    border-radius: unset;
-    padding: 0px;
-    min-height: auto;
-    border: 0px;
-  }
 `);
 
 export const cssButtonGroup = styled('div', `
@@ -511,16 +540,13 @@ export const cssPreview = styled('iframe', `
 `);
 
 export const cssSwitcher = styled('div', `
-  flex-shrink: 0;
-  margin-top: 24px;
-  border-top: 1px solid ${theme.modalBorder};
-  margin-left: -48px;
-  margin-right: -48px;
+  border-top: 1px solid ${theme.menuBorder};
+  width: 100%;
 `);
 
 export const cssSwitcherMessage = styled('div', `
   display: flex;
-  padding: 0px 16px 0px 16px;
+  padding: 8px 16px;
 `);
 
 export const cssSwitcherMessageBody = styled('div', `
@@ -528,7 +554,7 @@ export const cssSwitcherMessageBody = styled('div', `
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 10px 32px;
+  padding: 8px 16px;
 `);
 
 export const cssSwitcherMessageDismissButton = styled('div', `
@@ -551,8 +577,7 @@ export const cssParagraph = styled('div', `
 export const cssFormEditBody = styled('div', `
   width: 100%;
   overflow: auto;
-  padding-top: 52px;
-  padding-bottom: 24px;
+  padding: 20px;
 `);
 
 export const cssRemoveButton = styled('div', `
diff --git a/app/client/components/GristDoc.ts b/app/client/components/GristDoc.ts
index a2d08077..89e08d36 100644
--- a/app/client/components/GristDoc.ts
+++ b/app/client/components/GristDoc.ts
@@ -14,6 +14,7 @@ import {DocComm} from 'app/client/components/DocComm';
 import * as DocConfigTab from 'app/client/components/DocConfigTab';
 import {Drafts} from "app/client/components/Drafts";
 import {EditorMonitor} from "app/client/components/EditorMonitor";
+import {buildDefaultFormLayout} from 'app/client/components/Forms/FormView';
 import GridView from 'app/client/components/GridView';
 import {importFromFile, selectAndImport} from 'app/client/components/Importer';
 import {RawDataPage, RawDataPopup} from 'app/client/components/RawDataPage';
@@ -946,6 +947,9 @@ export class GristDoc extends DisposableWithEvents {
     if (val.type === 'chart') {
       await this._ensureOneNumericSeries(result.sectionRef);
     }
+    if (val.type === 'form') {
+      await this._setDefaultFormLayoutSpec(result.sectionRef);
+    }
     await this.saveLink(val.link, result.sectionRef);
     return result;
   }
@@ -962,42 +966,48 @@ export class GristDoc extends DisposableWithEvents {
       },
     });
 
-    if (val.table === 'New Table') {
-      const name = await this._promptForName();
-      if (name === undefined) {
-        return;
-      }
-      let newViewId: IDocPage;
-      if (val.type === WidgetType.Table) {
-        const result = await this.docData.sendAction(['AddEmptyTable', name]);
-        newViewId = result.views[0].id;
+    let viewRef: IDocPage;
+    let sectionRef: number | undefined;
+    await this.docData.bundleActions('Add new page', async () => {
+      if (val.table === 'New Table') {
+        const name = await this._promptForName();
+        if (name === undefined) {
+          return;
+        }
+        if (val.type === WidgetType.Table) {
+          const result = await this.docData.sendAction(['AddEmptyTable', name]);
+          viewRef = result.views[0].id;
+        } else {
+          // This will create a new table and page.
+          const result = await this.docData.sendAction(
+            ['CreateViewSection', /* new table */0, 0, val.type, null, name]
+          );
+          [viewRef, sectionRef] = [result.viewRef, result.sectionRef];
+        }
       } else {
-        // This will create a new table and page.
         const result = await this.docData.sendAction(
-          ['CreateViewSection', /* new table */0, 0, val.type, null, name]
-        );
-        newViewId = result.viewRef;
-      }
-      await this.openDocPage(newViewId);
-    } else {
-      let result: any;
-      await this.docData.bundleActions(`Add new page`, async () => {
-        result = await this.docData.sendAction(
           ['CreateViewSection', val.table, 0, val.type, val.summarize ? val.columns : null, null]
         );
+        [viewRef, sectionRef] = [result.viewRef, result.sectionRef];
         if (val.type === 'chart') {
-          await this._ensureOneNumericSeries(result.sectionRef);
+          await this._ensureOneNumericSeries(sectionRef!);
         }
-      });
-      await this.openDocPage(result.viewRef);
-      // The newly-added section should be given focus.
-      this.viewModel.activeSectionId(result.sectionRef);
-
-      this._maybeShowEditCardLayoutTip(val.type).catch(reportError);
-
-      if (AttachedCustomWidgets.guard(val.type)) {
-        this._handleNewAttachedCustomWidget(val.type).catch(reportError);
       }
+      if (val.type === 'form') {
+        await this._setDefaultFormLayoutSpec(sectionRef!);
+      }
+    });
+
+    await this.openDocPage(viewRef!);
+    if (sectionRef) {
+      // The newly-added section should be given focus.
+      this.viewModel.activeSectionId(sectionRef);
+    }
+
+    this._maybeShowEditCardLayoutTip(val.type).catch(reportError);
+
+    if (AttachedCustomWidgets.guard(val.type)) {
+      this._handleNewAttachedCustomWidget(val.type).catch(reportError);
     }
   }
 
@@ -1425,6 +1435,8 @@ export class GristDoc extends DisposableWithEvents {
     const toggle = () => !refreshed.isDisposed() && refreshed.set(refreshed.get() + 1);
     const holder = Holder.create(owner);
     const listener = (tab: TableModel) => {
+      if (tab.tableData.tableId === '') { return; }
+
       // Now subscribe to any data change in that table.
       const subs = MultiHolder.create(holder);
       subs.autoDispose(tab.tableData.dataLoadedEmitter.addListener(toggle));
@@ -1921,6 +1933,12 @@ export class GristDoc extends DisposableWithEvents {
     }
   }
 
+  private async _setDefaultFormLayoutSpec(viewSectionId: number) {
+    const viewSection = this.docModel.viewSections.getRowModel(viewSectionId);
+    const viewFields = viewSection.viewFields.peek().peek();
+    await viewSection.layoutSpecObj.setAndSave(buildDefaultFormLayout(viewFields));
+  }
+
   private _handleTriggerQueueOverflowMessage() {
     this.listenTo(this, 'webhookOverflowError', (err: any) => {
       this.app.topAppModel.notifier.createNotification({
diff --git a/app/client/ui/FormAPI.ts b/app/client/ui/FormAPI.ts
index 51bd2c15..88de27d5 100644
--- a/app/client/ui/FormAPI.ts
+++ b/app/client/ui/FormAPI.ts
@@ -41,13 +41,52 @@ export interface FormField {
   refValues: [number, CellValue][] | null;
 }
 
-interface FormFieldOptions {
-  /** True if the field is required to submit the form. */
-  formRequired?: boolean;
-  /** Populated with a list of options. Only set if the field `type` is a Choice/Reference Liste. */
+export interface FormFieldOptions {
+  /** Choices for a Choice or Choice List field. */
   choices?: string[];
+  /** Text or Any field format. Defaults to `"singleline"`. */
+  formTextFormat?: FormTextFormat;
+  /** Number of lines/rows for the `"multiline"` option of `formTextFormat`. Defaults to `3`. */
+  formTextLineCount?: number;
+  /** Numeric or Int field format. Defaults to `"text"`. */
+  formNumberFormat?: FormNumberFormat;
+  /** Toggle field format. Defaults to `"switch"`. */
+  formToggleFormat?: FormToggleFormat;
+  /** Choice or Reference field format. Defaults to `"select"`. */
+  formSelectFormat?: FormSelectFormat;
+  /**
+   * Field options alignment.
+   *
+   * Only applicable to Choice List and Reference List fields, and Choice and Reference fields
+   * when `formSelectFormat` is `"radio"`.
+   *
+   * Defaults to `"vertical"`.
+   */
+  formOptionsAlignment?: FormOptionsAlignment;
+  /**
+   * Field options sort order.
+   *
+   * Only applicable to Choice, Choice List, Reference, and Reference List fields.
+   *
+   * Defaults to `"default"`.
+   */
+  formOptionsSortOrder?: FormOptionsSortOrder;
+  /** True if the field is required. Defaults to `false`. */
+  formRequired?: boolean;
 }
 
+export type FormTextFormat = 'singleline' | 'multiline';
+
+export type FormNumberFormat = 'text' | 'spinner';
+
+export type FormToggleFormat = 'switch' | 'checkbox';
+
+export type FormSelectFormat = 'select' | 'radio';
+
+export type FormOptionsAlignment = 'vertical' | 'horizontal';
+
+export type FormOptionsSortOrder = 'default' | 'ascending' | 'descending';
+
 export interface FormAPI {
   getForm(options: GetFormOptions): Promise<Form>;
   createRecord(options: CreateRecordOptions): Promise<void>;
diff --git a/app/client/ui/FormContainer.ts b/app/client/ui/FormContainer.ts
index 4ed7ee9b..80da4c82 100644
--- a/app/client/ui/FormContainer.ts
+++ b/app/client/ui/FormContainer.ts
@@ -1,36 +1,144 @@
 import {makeT} from 'app/client/lib/localization';
-import * as css from 'app/client/ui/FormPagesCss';
+import {colors, mediaSmall} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
 import {commonUrls} from 'app/common/gristUrls';
-import {DomContents, makeTestId} from 'grainjs';
+import {DomContents, DomElementArg, styled} from 'grainjs';
 
 const t = makeT('FormContainer');
 
-const testId = makeTestId('test-form-');
-
-export function buildFormContainer(buildBody: () => DomContents) {
-  return css.formContainer(
-    css.form(
-      css.formBody(
+export function buildFormMessagePage(buildBody: () => DomContents, ...args: DomElementArg[]) {
+  return cssFormMessagePage(
+    cssFormMessage(
+      cssFormMessageBody(
         buildBody(),
       ),
-      css.formFooter(
-        css.poweredByGrist(
-          css.poweredByGristLink(
-            {href: commonUrls.forms, target: '_blank'},
-            t('Powered by'),
-            css.gristLogo(),
-          )
-        ),
-        css.buildForm(
-          css.buildFormLink(
-            {href: commonUrls.forms, target: '_blank'},
-            t('Build your own form'),
-            icon('Expand'),
-          ),
-        ),
+      cssFormMessageFooter(
+        buildFormFooter(),
       ),
     ),
-    testId('container'),
+    ...args,
   );
 }
+
+export function buildFormFooter() {
+  return [
+    cssPoweredByGrist(
+      cssPoweredByGristLink(
+        {href: commonUrls.forms, target: '_blank'},
+        t('Powered by'),
+        cssGristLogo(),
+      )
+    ),
+    cssBuildForm(
+      cssBuildFormLink(
+        {href: commonUrls.forms, target: '_blank'},
+        t('Build your own form'),
+        icon('Expand'),
+      ),
+    ),
+  ];
+}
+
+export const cssFormMessageImageContainer = styled('div', `
+  margin-top: 28px;
+  display: flex;
+  justify-content: center;
+`);
+
+export const cssFormMessageImage = styled('img', `
+  height: 100%;
+  width: 100%;
+`);
+
+export const cssFormMessageText = styled('div', `
+  color: ${colors.dark};
+  text-align: center;
+  font-weight: 600;
+  font-size: 16px;
+  line-height: 24px;
+  margin-top: 32px;
+  margin-bottom: 24px;
+`);
+
+const cssFormMessagePage = styled('div', `
+  padding: 16px;
+`);
+
+const cssFormMessage = styled('div', `
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: white;
+  border: 1px solid ${colors.darkGrey};
+  border-radius: 3px;
+  max-width: 600px;
+  margin: 0px auto;
+`);
+
+const cssFormMessageBody = styled('div', `
+  width: 100%;
+  padding: 20px 48px 20px 48px;
+
+  @media ${mediaSmall} {
+    & {
+      padding: 20px;
+    }
+  }
+`);
+
+const cssFormMessageFooter = styled('div', `
+  border-top: 1px solid ${colors.darkGrey};
+  padding: 8px 16px;
+  width: 100%;
+`);
+
+const cssPoweredByGrist = styled('div', `
+  color: ${colors.darkText};
+  font-size: 13px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0px 10px;
+`);
+
+const cssPoweredByGristLink = styled('a', `
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  color: ${colors.darkText};
+  text-decoration: none;
+`);
+
+const cssGristLogo = styled('div', `
+  width: 58px;
+  height: 20.416px;
+  flex-shrink: 0;
+  background: url(img/logo-grist.png);
+  background-position: 0 0;
+  background-size: contain;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  margin-top: 3px;
+`);
+
+const cssBuildForm = styled('div', `
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 8px;
+`);
+
+const cssBuildFormLink = styled('a', `
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 11px;
+  line-height: 16px;
+  text-decoration-line: underline;
+  color: ${colors.darkGreen};
+  --icon-color: ${colors.darkGreen};
+`);
diff --git a/app/client/ui/FormErrorPage.ts b/app/client/ui/FormErrorPage.ts
index 2bc87333..e7786b0f 100644
--- a/app/client/ui/FormErrorPage.ts
+++ b/app/client/ui/FormErrorPage.ts
@@ -1,9 +1,13 @@
 import {makeT} from 'app/client/lib/localization';
-import {buildFormContainer} from 'app/client/ui/FormContainer';
-import * as css from 'app/client/ui/FormPagesCss';
+import {
+  buildFormMessagePage,
+  cssFormMessageImage,
+  cssFormMessageImageContainer,
+  cssFormMessageText,
+} from 'app/client/ui/FormContainer';
 import {getPageTitleSuffix} from 'app/common/gristUrls';
 import {getGristConfig} from 'app/common/urlUtils';
-import {Disposable, makeTestId} from 'grainjs';
+import {Disposable, makeTestId, styled} from 'grainjs';
 
 const testId = makeTestId('test-form-');
 
@@ -16,11 +20,20 @@ export class FormErrorPage extends Disposable {
   }
 
   public buildDom() {
-    return buildFormContainer(() => [
-      css.formErrorMessageImageContainer(css.formErrorMessageImage({
-        src: 'img/form-error.svg',
-      })),
-      css.formMessageText(this._message, testId('error-text')),
-    ]);
+    return buildFormMessagePage(() => [
+      cssFormErrorMessageImageContainer(
+        cssFormErrorMessageImage({src: 'img/form-error.svg'}),
+      ),
+      cssFormMessageText(this._message, testId('error-page-text')),
+    ], testId('error-page'));
   }
 }
+
+const cssFormErrorMessageImageContainer = styled(cssFormMessageImageContainer, `
+  height: 281px;
+`);
+
+const cssFormErrorMessageImage = styled(cssFormMessageImage, `
+  max-height: 281px;
+  max-width: 250px;
+`);
diff --git a/app/client/ui/FormPage.ts b/app/client/ui/FormPage.ts
index 97d233ca..ead02922 100644
--- a/app/client/ui/FormPage.ts
+++ b/app/client/ui/FormPage.ts
@@ -2,18 +2,19 @@ import {FormRenderer} from 'app/client/components/FormRenderer';
 import {handleSubmit, TypedFormData} from 'app/client/lib/formUtils';
 import {makeT} from 'app/client/lib/localization';
 import {FormModel, FormModelImpl} from 'app/client/models/FormModel';
-import {buildFormContainer} from 'app/client/ui/FormContainer';
+import {buildFormFooter} from 'app/client/ui/FormContainer';
 import {FormErrorPage} from 'app/client/ui/FormErrorPage';
-import * as css from 'app/client/ui/FormPagesCss';
 import {FormSuccessPage} from 'app/client/ui/FormSuccessPage';
 import {colors} from 'app/client/ui2018/cssVars';
 import {ApiError} from 'app/common/ApiError';
 import {getPageTitleSuffix} from 'app/common/gristUrls';
 import {getGristConfig} from 'app/common/urlUtils';
-import {Disposable, dom, Observable, styled, subscribe} from 'grainjs';
+import {Disposable, dom, makeTestId, Observable, styled, subscribe} from 'grainjs';
 
 const t = makeT('FormPage');
 
+const testId = makeTestId('test-form-');
+
 export class FormPage extends Disposable {
   private readonly _model: FormModel = new FormModelImpl();
   private readonly _error = Observable.create<string|null>(this, null);
@@ -30,7 +31,7 @@ export class FormPage extends Disposable {
   }
 
   public buildDom() {
-    return css.pageContainer(
+    return cssPageContainer(
       dom.domComputed(use => {
         const error = use(this._model.error);
         if (error) { return dom.create(FormErrorPage, error); }
@@ -38,12 +39,12 @@ export class FormPage extends Disposable {
         const submitted = use(this._model.submitted);
         if (submitted) { return dom.create(FormSuccessPage, this._model); }
 
-        return this._buildFormDom();
+        return this._buildFormPageDom();
       }),
     );
   }
 
-  private _buildFormDom() {
+  private _buildFormPageDom() {
     return dom.domComputed(use => {
       const form = use(this._model.form);
       const rootLayoutNode = use(this._model.formLayout);
@@ -56,16 +57,24 @@ export class FormPage extends Disposable {
         error: this._error,
       });
 
-      return buildFormContainer(() =>
+      return dom('div',
         cssForm(
-          dom.autoDispose(formRenderer),
-          formRenderer.render(),
-          handleSubmit(this._model.submitting,
-            (_formData, formElement) => this._handleFormSubmit(formElement),
-            () => this._handleFormSubmitSuccess(),
-            (e) => this._handleFormError(e),
+          cssFormBody(
+            cssFormContent(
+              dom.autoDispose(formRenderer),
+              formRenderer.render(),
+              handleSubmit(this._model.submitting,
+                (_formData, formElement) => this._handleFormSubmit(formElement),
+                () => this._handleFormSubmitSuccess(),
+                (e) => this._handleFormError(e),
+              ),
+            ),
+          ),
+          cssFormFooter(
+            buildFormFooter(),
           ),
         ),
+        testId('page'),
       );
     });
   }
@@ -101,22 +110,40 @@ export class FormPage extends Disposable {
   }
 }
 
-// TODO: see if we can move the rest of this to `FormRenderer.ts`.
-const cssForm = styled('form', `
+const cssPageContainer = styled('div', `
+  height: 100%;
+  width: 100%;
+  padding: 20px;
+  overflow: auto;
+`);
+
+const cssForm = styled('div', `
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: white;
+  border-radius: 3px;
+  max-width: 600px;
+  margin: 0px auto;
+`);
+
+const cssFormBody = styled('div', `
+  width: 100%;
+`);
+
+// TODO: break up and move to `FormRendererCss.ts`.
+const cssFormContent = styled('form', `
   color: ${colors.dark};
   font-size: 15px;
   line-height: 1.42857143;
 
-  & > div + div {
-    margin-top: 16px;
-  }
   & h1,
   & h2,
   & h3,
   & h4,
   & h5,
   & h6 {
-    margin: 4px 0px;
+    margin: 8px 0px 12px 0px;
     font-weight: normal;
   }
   & h1 {
@@ -149,3 +176,8 @@ const cssForm = styled('form', `
     margin: 4px 0px;
   }
 `);
+
+const cssFormFooter = styled('div', `
+  padding: 8px 16px;
+  width: 100%;
+`);
diff --git a/app/client/ui/FormPagesCss.ts b/app/client/ui/FormPagesCss.ts
deleted file mode 100644
index 1f8311b3..00000000
--- a/app/client/ui/FormPagesCss.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import {colors, mediaSmall} from 'app/client/ui2018/cssVars';
-import {styled} from 'grainjs';
-
-export const pageContainer = styled('div', `
-  background-color: ${colors.lightGrey};
-  height: 100%;
-  width: 100%;
-  padding: 52px 0px 52px 0px;
-  overflow: auto;
-
-  @media ${mediaSmall} {
-    & {
-      padding: 20px 0px 20px 0px;
-    }
-  }
-`);
-
-export const formContainer = styled('div', `
-  padding-left: 16px;
-  padding-right: 16px;
-`);
-
-export const form = styled('div', `
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  background-color: white;
-  border: 1px solid ${colors.darkGrey};
-  border-radius: 3px;
-  max-width: 600px;
-  margin: 0px auto;
-`);
-
-export const formBody = styled('div', `
-  width: 100%;
-  padding: 20px 48px 20px 48px;
-
-  @media ${mediaSmall} {
-    & {
-      padding: 20px;
-    }
-  }
-`);
-
-const formMessageImageContainer = styled('div', `
-  margin-top: 28px;
-  display: flex;
-  justify-content: center;
-`);
-
-export const formErrorMessageImageContainer = styled(formMessageImageContainer, `
-  height: 281px;
-`);
-
-export const formSuccessMessageImageContainer = styled(formMessageImageContainer, `
-  height: 215px;
-`);
-
-export const formMessageImage = styled('img', `
-  height: 100%;
-  width: 100%;
-`);
-
-export const formErrorMessageImage = styled(formMessageImage, `
-  max-height: 281px;
-  max-width: 250px;
-`);
-
-export const formSuccessMessageImage = styled(formMessageImage, `
-  max-height: 215px;
-  max-width: 250px;
-`);
-
-export const formMessageText = styled('div', `
-  color: ${colors.dark};
-  text-align: center;
-  font-weight: 600;
-  font-size: 16px;
-  line-height: 24px;
-  margin-top: 32px;
-  margin-bottom: 24px;
-`);
-
-export const formFooter = styled('div', `
-  border-top: 1px solid ${colors.darkGrey};
-  padding: 8px 16px;
-  width: 100%;
-`);
-
-export const poweredByGrist = styled('div', `
-  color: ${colors.darkText};
-  font-size: 13px;
-  font-style: normal;
-  font-weight: 600;
-  line-height: 16px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0px 10px;
-`);
-
-export const poweredByGristLink = styled('a', `
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  color: ${colors.darkText};
-  text-decoration: none;
-`);
-
-export const buildForm = styled('div', `
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 8px;
-`);
-
-export const buildFormLink = styled('a', `
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 11px;
-  line-height: 16px;
-  text-decoration-line: underline;
-  color: ${colors.darkGreen};
-  --icon-color: ${colors.darkGreen};
-`);
-
-export const gristLogo = styled('div', `
-  width: 58px;
-  height: 20.416px;
-  flex-shrink: 0;
-  background: url(img/logo-grist.png);
-  background-position: 0 0;
-  background-size: contain;
-  background-color: transparent;
-  background-repeat: no-repeat;
-  margin-top: 3px;
-`);
diff --git a/app/client/ui/FormSuccessPage.ts b/app/client/ui/FormSuccessPage.ts
index fa168fd3..f7163abd 100644
--- a/app/client/ui/FormSuccessPage.ts
+++ b/app/client/ui/FormSuccessPage.ts
@@ -1,7 +1,11 @@
 import {makeT} from 'app/client/lib/localization';
-import {FormModel } from 'app/client/models/FormModel';
-import {buildFormContainer} from 'app/client/ui/FormContainer';
-import * as css from 'app/client/ui/FormPagesCss';
+import {FormModel} from 'app/client/models/FormModel';
+import {
+  buildFormMessagePage,
+  cssFormMessageImage,
+  cssFormMessageImageContainer,
+  cssFormMessageText,
+} from 'app/client/ui/FormContainer';
 import {vars} from 'app/client/ui2018/cssVars';
 import {getPageTitleSuffix} from 'app/common/gristUrls';
 import {getGristConfig} from 'app/common/urlUtils';
@@ -28,20 +32,20 @@ export class FormSuccessPage extends Disposable {
   }
 
   public buildDom() {
-    return buildFormContainer(() => [
-      css.formSuccessMessageImageContainer(css.formSuccessMessageImage({
-        src: 'img/form-success.svg',
-      })),
-      css.formMessageText(dom.text(this._successText), testId('success-text')),
+    return buildFormMessagePage(() => [
+      cssFormSuccessMessageImageContainer(
+        cssFormSuccessMessageImage({src: 'img/form-success.svg'}),
+      ),
+      cssFormMessageText(dom.text(this._successText), testId('success-page-text')),
       dom.maybe(this._showNewResponseButton, () =>
         cssFormButtons(
           cssFormNewResponseButton(
-            'Submit new response',
+            t('Submit new response'),
             dom.on('click', () => this._handleClickNewResponseButton()),
           ),
         )
       ),
-    ]);
+    ], testId('success-page'));
   }
 
   private async _handleClickNewResponseButton() {
@@ -49,6 +53,15 @@ export class FormSuccessPage extends Disposable {
   }
 }
 
+const cssFormSuccessMessageImageContainer = styled(cssFormMessageImageContainer, `
+  height: 215px;
+`);
+
+const cssFormSuccessMessageImage = styled(cssFormMessageImage, `
+  max-height: 215px;
+  max-width: 250px;
+`);
+
 const cssFormButtons = styled('div', `
   display: flex;
   justify-content: center;
diff --git a/app/client/ui/RightPanelStyles.ts b/app/client/ui/RightPanelStyles.ts
index fac081e5..b6ec7c0f 100644
--- a/app/client/ui/RightPanelStyles.ts
+++ b/app/client/ui/RightPanelStyles.ts
@@ -1,5 +1,6 @@
 import {theme, vars} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
+import {numericSpinner} from 'app/client/widgets/NumericSpinner';
 import {styled} from 'grainjs';
 
 export const cssIcon = styled(icon, `
@@ -89,3 +90,7 @@ export const cssPinButton = styled('div', `
     background-color: ${theme.hover};
   }
 `);
+
+export const cssNumericSpinner = styled(numericSpinner, `
+  height: 28px;
+`);
diff --git a/app/client/ui2018/checkbox.ts b/app/client/ui2018/checkbox.ts
index 35f09c77..5ede5ef9 100644
--- a/app/client/ui2018/checkbox.ts
+++ b/app/client/ui2018/checkbox.ts
@@ -23,6 +23,7 @@ export const cssLabel = styled('label', `
   display: inline-flex;
   min-width: 0px;
   margin-bottom: 0px;
+  flex-shrink: 0;
 
   outline: none;
   user-select: none;
diff --git a/app/client/ui2018/radio.ts b/app/client/ui2018/radio.ts
new file mode 100644
index 00000000..fc15be3b
--- /dev/null
+++ b/app/client/ui2018/radio.ts
@@ -0,0 +1,25 @@
+import {theme} from 'app/client/ui2018/cssVars';
+import {styled} from 'grainjs';
+
+export const cssRadioInput = styled('input', `
+  appearance: none;
+  width: 16px;
+  height: 16px;
+  margin: 0px !important;
+  border-radius: 50%;
+  background-clip: content-box;
+  border: 1px solid ${theme.checkboxBorder};
+  background-color: ${theme.checkboxBg};
+  flex-shrink: 0;
+  &:hover {
+    border: 1px solid ${theme.checkboxBorderHover};
+  }
+  &:disabled {
+    background-color: 1px solid ${theme.checkboxDisabledBg};
+  }
+  &:checked {
+    padding: 2px;
+    background-color: ${theme.controlPrimaryBg};
+    border: 1px solid ${theme.controlPrimaryBg};
+  }
+`);
diff --git a/app/client/widgets/ChoiceListCell.ts b/app/client/widgets/ChoiceListCell.ts
index dd33f47a..1269cf20 100644
--- a/app/client/widgets/ChoiceListCell.ts
+++ b/app/client/widgets/ChoiceListCell.ts
@@ -1,13 +1,18 @@
+import {
+  FormFieldRulesConfig,
+  FormOptionsAlignmentConfig,
+  FormOptionsSortConfig,
+} from 'app/client/components/Forms/FormConfig';
 import {DataRowModel} from 'app/client/models/DataRowModel';
 import {testId} from 'app/client/ui2018/cssVars';
 import {
   ChoiceOptionsByName,
   ChoiceTextBox,
 } from 'app/client/widgets/ChoiceTextBox';
+import {choiceToken} from 'app/client/widgets/ChoiceToken';
 import {CellValue} from 'app/common/DocActions';
 import {decodeObject} from 'app/plugin/objtypes';
 import {dom, styled} from 'grainjs';
-import {choiceToken} from 'app/client/widgets/ChoiceToken';
 
 /**
  * ChoiceListCell - A cell that renders a list of choice tokens.
@@ -49,6 +54,15 @@ export class ChoiceListCell extends ChoiceTextBox {
       }),
     );
   }
+
+  public buildFormConfigDom() {
+    return [
+      this.buildChoicesConfigDom(),
+      dom.create(FormOptionsAlignmentConfig, this.field),
+      dom.create(FormOptionsSortConfig, this.field),
+      dom.create(FormFieldRulesConfig, this.field),
+    ];
+  }
 }
 
 export const cssChoiceList = styled('div', `
diff --git a/app/client/widgets/ChoiceTextBox.ts b/app/client/widgets/ChoiceTextBox.ts
index e41753e1..f5a4208d 100644
--- a/app/client/widgets/ChoiceTextBox.ts
+++ b/app/client/widgets/ChoiceTextBox.ts
@@ -1,3 +1,8 @@
+import {
+  FormFieldRulesConfig,
+  FormOptionsSortConfig,
+  FormSelectConfig,
+} from 'app/client/components/Forms/FormConfig';
 import {makeT} from 'app/client/lib/localization';
 import {DataRowModel} from 'app/client/models/DataRowModel';
 import {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec';
@@ -76,7 +81,7 @@ export class ChoiceTextBox extends NTextBox {
   public buildConfigDom() {
     return [
       super.buildConfigDom(),
-      this._buildChoicesConfigDom(),
+      this.buildChoicesConfigDom(),
     ];
   }
 
@@ -86,14 +91,16 @@ export class ChoiceTextBox extends NTextBox {
 
   public buildFormConfigDom() {
     return [
-      this._buildChoicesConfigDom(),
-      super.buildFormConfigDom(),
+      this.buildChoicesConfigDom(),
+      dom.create(FormSelectConfig, this.field),
+      dom.create(FormOptionsSortConfig, this.field),
+      dom.create(FormFieldRulesConfig, this.field),
     ];
   }
 
   public buildFormTransformConfigDom() {
     return [
-      this._buildChoicesConfigDom(),
+      this.buildChoicesConfigDom(),
     ];
   }
 
@@ -113,7 +120,7 @@ export class ChoiceTextBox extends NTextBox {
     return this.field.config.updateChoices(renames, options);
   }
 
-  private _buildChoicesConfigDom() {
+  protected buildChoicesConfigDom() {
     const disabled = Computed.create(null,
       use => use(this.field.disableModify)
         || use(use(this.field.column).disableEditData)
diff --git a/app/client/widgets/DateTextBox.js b/app/client/widgets/DateTextBox.js
index a378a0f4..ebceb506 100644
--- a/app/client/widgets/DateTextBox.js
+++ b/app/client/widgets/DateTextBox.js
@@ -6,7 +6,7 @@ var kd = require('../lib/koDom');
 var kf = require('../lib/koForm');
 var AbstractWidget = require('./AbstractWidget');
 
-const {FieldRulesConfig} = require('app/client/components/Forms/FormConfig');
+const {FormFieldRulesConfig} = require('app/client/components/Forms/FormConfig');
 const {fromKoSave} = require('app/client/lib/fromKoSave');
 const {alignmentSelect, cssButtonSelect} = require('app/client/ui2018/buttonSelect');
 const {cssLabel, cssRow} = require('app/client/ui/RightPanelStyles');
@@ -82,7 +82,7 @@ DateTextBox.prototype.buildTransformConfigDom = function() {
 
 DateTextBox.prototype.buildFormConfigDom = function() {
   return [
-    gdom.create(FieldRulesConfig, this.field),
+    gdom.create(FormFieldRulesConfig, this.field),
   ];
 };
 
diff --git a/app/client/widgets/FieldBuilder.ts b/app/client/widgets/FieldBuilder.ts
index ef41d1a8..1e4511fa 100644
--- a/app/client/widgets/FieldBuilder.ts
+++ b/app/client/widgets/FieldBuilder.ts
@@ -108,12 +108,11 @@ export class FieldBuilder extends Disposable {
   private readonly _widgetCons: ko.Computed<{create: (...args: any[]) => NewAbstractWidget}>;
   private readonly _docModel: DocModel;
   private readonly _readonly: Computed<boolean>;
+  private readonly _isForm: ko.Computed<boolean>;
   private readonly _comments: ko.Computed<boolean>;
   private readonly _showRefConfigPopup: ko.Observable<boolean>;
   private readonly _isEditorActive = Observable.create(this, false);
 
-
-
   public constructor(public readonly gristDoc: GristDoc, public readonly field: ViewFieldRec,
                      private _cursor: Cursor, private _options: { isPreview?: boolean } = {}) {
     super();
@@ -128,9 +127,13 @@ export class FieldBuilder extends Disposable {
     this._readonly = Computed.create(this, (use) =>
       use(gristDoc.isReadonly) || use(field.disableEditData) || Boolean(this._options.isPreview));
 
+    this._isForm = this.autoDispose(ko.computed(() => {
+      return this.field.viewSection().widgetType() === WidgetType.Form;
+    }));
+
     // Observable with a list of available types.
     this._availableTypes = Computed.create(this, (use) => {
-      const isForm = use(use(this.field.viewSection).widgetType) === WidgetType.Form;
+      const isForm = use(this._isForm);
       const isFormula = use(this.origColumn.isFormula);
       const types: Array<IOptionFull<string>> = [];
       _.each(UserType.typeDefs, (def: any, key: string|number) => {
@@ -201,8 +204,11 @@ export class FieldBuilder extends Disposable {
 
     // Returns the constructor for the widget, and only notifies subscribers on changes.
     this._widgetCons = this.autoDispose(koUtil.withKoUtils(ko.computed(() => {
-      return UserTypeImpl.getWidgetConstructor(this.options().widget,
-                                               this._readOnlyPureType());
+      if (this._isForm()) {
+        return UserTypeImpl.getFormWidgetConstructor(this.options().widget, this._readOnlyPureType());
+      } else {
+        return UserTypeImpl.getWidgetConstructor(this.options().widget, this._readOnlyPureType());
+      }
     })).onlyNotifyUnequal());
 
     // Computed builder for the widget.
diff --git a/app/client/widgets/NTextBox.ts b/app/client/widgets/NTextBox.ts
index c756ef0b..e939c315 100644
--- a/app/client/widgets/NTextBox.ts
+++ b/app/client/widgets/NTextBox.ts
@@ -1,14 +1,16 @@
-import { FieldRulesConfig } from 'app/client/components/Forms/FormConfig';
+import { FormFieldRulesConfig } from 'app/client/components/Forms/FormConfig';
 import { fromKoSave } from 'app/client/lib/fromKoSave';
+import { makeT } from 'app/client/lib/localization';
 import { DataRowModel } from 'app/client/models/DataRowModel';
 import { ViewFieldRec } from 'app/client/models/entities/ViewFieldRec';
-import { cssRow } from 'app/client/ui/RightPanelStyles';
-import { alignmentSelect, cssButtonSelect, makeButtonSelect } from 'app/client/ui2018/buttonSelect';
+import { fieldWithDefault } from 'app/client/models/modelUtil';
+import { FormTextFormat } from 'app/client/ui/FormAPI';
+import { cssLabel, cssNumericSpinner, cssRow } from 'app/client/ui/RightPanelStyles';
+import { alignmentSelect, buttonSelect, cssButtonSelect, makeButtonSelect } from 'app/client/ui2018/buttonSelect';
 import { testId } from 'app/client/ui2018/cssVars';
 import { makeLinks } from 'app/client/ui2018/links';
 import { NewAbstractWidget, Options } from 'app/client/widgets/NewAbstractWidget';
 import { Computed, dom, DomContents, fromKo, Observable } from 'grainjs';
-import { makeT } from 'app/client/lib/localization';
 
 const t = makeT('NTextBox');
 
@@ -60,8 +62,42 @@ export class NTextBox extends NewAbstractWidget {
   }
 
   public buildFormConfigDom(): DomContents {
+    const format = fieldWithDefault<FormTextFormat>(
+      this.field.widgetOptionsJson.prop('formTextFormat'),
+      'singleline'
+    );
+    const lineCount = fieldWithDefault<number|"">(
+      this.field.widgetOptionsJson.prop('formTextLineCount'),
+      ''
+    );
+
     return [
-      dom.create(FieldRulesConfig, this.field),
+      cssLabel(t('Field Format')),
+      cssRow(
+        buttonSelect(
+          fromKoSave(format),
+          [
+            {value: 'singleline', label: t('Single line')},
+            {value: 'multiline', label: t('Multi line')},
+          ],
+          testId('tb-form-field-format'),
+        ),
+      ),
+      dom.maybe(use => use(format) === 'multiline', () =>
+        cssRow(
+          cssNumericSpinner(
+            fromKo(lineCount),
+            {
+              label: t('Lines'),
+              defaultValue: 3,
+              minValue: 1,
+              maxValue: 99,
+              save: async (val) => lineCount.setAndSave((val && Math.floor(val)) ?? ''),
+            },
+          ),
+        ),
+      ),
+      dom.create(FormFieldRulesConfig, this.field),
     ];
   }
 
diff --git a/app/client/widgets/NumericSpinner.ts b/app/client/widgets/NumericSpinner.ts
new file mode 100644
index 00000000..f5eb79c3
--- /dev/null
+++ b/app/client/widgets/NumericSpinner.ts
@@ -0,0 +1,172 @@
+import {theme} from 'app/client/ui2018/cssVars';
+import {icon} from 'app/client/ui2018/icons';
+import {clamp, numberOrDefault} from 'app/common/gutil';
+import {MaybePromise} from 'app/plugin/gutil';
+import {BindableValue, dom, DomElementArg, IDomArgs, makeTestId, Observable, styled} from 'grainjs';
+
+const testId = makeTestId('test-numeric-spinner-');
+
+export interface NumericSpinnerOptions {
+  /** Defaults to `false`. */
+  setValueOnInput?: boolean;
+  label?: string;
+  defaultValue?: number | Observable<number>;
+  /** No minimum if unset. */
+  minValue?: number;
+  /** No maximum if unset. */
+  maxValue?: number;
+  disabled?: BindableValue<boolean>;
+  inputArgs?: IDomArgs<HTMLInputElement>;
+  /** Called on blur and spinner button click. */
+  save?: (val?: number) => MaybePromise<void>,
+}
+
+export function numericSpinner(
+  value: Observable<number | ''>,
+  options: NumericSpinnerOptions = {},
+  ...args: DomElementArg[]
+) {
+  const {
+    setValueOnInput = false,
+    label,
+    defaultValue,
+    minValue = Number.NEGATIVE_INFINITY,
+    maxValue = Number.POSITIVE_INFINITY,
+    disabled,
+    inputArgs = [],
+    save,
+  } = options;
+
+  const getDefaultValue = () => {
+    if (defaultValue === undefined) {
+      return 0;
+    } else if (typeof defaultValue === 'number') {
+      return defaultValue;
+    } else {
+      return defaultValue.get();
+    }
+  };
+
+  let inputElement: HTMLInputElement;
+
+  const shiftValue = async (delta: 1 | -1, opts: {saveValue?: boolean} = {}) => {
+    const {saveValue} = opts;
+    const currentValue = numberOrDefault(inputElement.value, getDefaultValue());
+    const newValue = clamp(Math.floor(currentValue + delta), minValue, maxValue);
+    if (setValueOnInput) { value.set(newValue); }
+    if (saveValue) { await save?.(newValue); }
+    return newValue;
+  };
+  const incrementValue = (opts: {saveValue?: boolean} = {}) => shiftValue(1, opts);
+  const decrementValue = (opts: {saveValue?: boolean} = {}) => shiftValue(-1, opts);
+
+  return cssNumericSpinner(
+    disabled ? cssNumericSpinner.cls('-disabled', disabled) : null,
+    label ? cssNumLabel(label) : null,
+    inputElement = cssNumInput(
+      {type: 'number'},
+      dom.prop('value', value),
+      defaultValue !== undefined ? dom.prop('placeholder', defaultValue) : null,
+      dom.onKeyDown({
+        ArrowUp: async (_ev, elem) => { elem.value = String(await incrementValue()); },
+        ArrowDown: async (_ev, elem) => { elem.value = String(await decrementValue()); },
+        Enter$: async (_ev, elem) => save && elem.blur(),
+      }),
+      !setValueOnInput ? null : dom.on('input', (_ev, elem) => {
+        value.set(Number.parseFloat(elem.value));
+      }),
+      !save ? null : dom.on('blur', async () => {
+        let newValue = numberOrDefault(inputElement.value, undefined);
+        if (newValue !== undefined) { newValue = clamp(newValue, minValue, maxValue); }
+        await save(newValue);
+      }),
+      dom.on('focus', (_ev, elem) => elem.select()),
+      ...inputArgs,
+    ),
+    cssSpinner(
+      cssSpinnerBtn(
+        cssSpinnerTop('DropdownUp'),
+        dom.on('click', async () => incrementValue({saveValue: true})),
+        testId('increment'),
+      ),
+      cssSpinnerBtn(
+        cssSpinnerBottom('Dropdown'),
+        dom.on('click', async () => decrementValue({saveValue: true})),
+        testId('decrement'),
+      ),
+    ),
+    ...args
+  );
+}
+
+const cssNumericSpinner = styled('div', `
+  position: relative;
+  flex: auto;
+  font-weight: normal;
+  display: flex;
+  align-items: center;
+  outline: 1px solid ${theme.inputBorder};
+  background-color: ${theme.inputBg};
+  border-radius: 3px;
+  &-disabled {
+    opacity: 0.4;
+    pointer-events: none;
+  }
+`);
+
+const cssNumLabel = styled('div', `
+  color: ${theme.lightText};
+  flex-shrink: 0;
+  padding-left: 8px;
+  pointer-events: none;
+`);
+
+const cssNumInput = styled('input', `
+  flex-grow: 1;
+  padding: 4px 32px 4px 8px;
+  width: 100%;
+  text-align: right;
+  appearance: none;
+  color: ${theme.inputFg};
+  background-color: transparent;
+  border: none;
+  outline: none;
+  -moz-appearance: textfield;
+
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+`);
+
+const cssSpinner = styled('div', `
+  position: absolute;
+  right: 8px;
+  width: 16px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+`);
+
+const cssSpinnerBtn = styled('div', `
+  --icon-color: ${theme.controlSecondaryFg};
+  flex: 1 1 0px;
+  min-height: 0px;
+  position: relative;
+  cursor: pointer;
+  overflow: hidden;
+  &:hover {
+    --icon-color: ${theme.controlSecondaryHoverFg};
+  }
+`);
+
+const cssSpinnerTop = styled(icon, `
+  position: absolute;
+  top: 0px;
+`);
+
+const cssSpinnerBottom = styled(icon, `
+  position: absolute;
+  bottom: 0px;
+`);
diff --git a/app/client/widgets/NumericTextBox.ts b/app/client/widgets/NumericTextBox.ts
index 48a3b342..04470433 100644
--- a/app/client/widgets/NumericTextBox.ts
+++ b/app/client/widgets/NumericTextBox.ts
@@ -1,23 +1,25 @@
 /**
  * See app/common/NumberFormat for description of options we support.
  */
+import {FormFieldRulesConfig} from 'app/client/components/Forms/FormConfig';
+import {fromKoSave} from 'app/client/lib/fromKoSave';
 import {makeT} from 'app/client/lib/localization';
 import {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec';
 import {reportError} from 'app/client/models/errors';
-import {cssLabel, cssRow} from 'app/client/ui/RightPanelStyles';
-import {cssButtonSelect, ISelectorOption, makeButtonSelect} from 'app/client/ui2018/buttonSelect';
+import {fieldWithDefault} from 'app/client/models/modelUtil';
+import {FormNumberFormat} from 'app/client/ui/FormAPI';
+import {cssLabel, cssNumericSpinner, cssRow} from 'app/client/ui/RightPanelStyles';
+import {buttonSelect, cssButtonSelect, ISelectorOption, makeButtonSelect} from 'app/client/ui2018/buttonSelect';
 import {testId, theme} from 'app/client/ui2018/cssVars';
-import {icon} from 'app/client/ui2018/icons';
 import {buildCurrencyPicker} from 'app/client/widgets/CurrencyPicker';
 import {NTextBox} from 'app/client/widgets/NTextBox';
-import {clamp} from 'app/common/gutil';
+import {numberOrDefault} from 'app/common/gutil';
 import {buildNumberFormat, NumberFormatOptions, NumMode, NumSign} from 'app/common/NumberFormat';
-import {BindableValue, Computed, dom, DomContents, DomElementArg,
-        fromKo, MultiHolder, Observable, styled} from 'grainjs';
+import {Computed, dom, DomContents, fromKo, MultiHolder, styled} from 'grainjs';
 import * as LocaleCurrency from 'locale-currency';
 
-
 const t = makeT('NumericTextBox');
+
 const modeOptions: Array<ISelectorOption<NumMode>> = [
   {value: 'currency', label: '$'},
   {value: 'decimal', label: ','},
@@ -75,9 +77,10 @@ export class NumericTextBox extends NTextBox {
     };
 
     // Prepare setters for the UI elements.
-    // Min/max fraction digits may range from 0 to 20; other values are invalid.
-    const setMinDecimals = (val?: number) => setSave('decimals', val && clamp(val, 0, 20));
-    const setMaxDecimals = (val?: number) => setSave('maxDecimals', val && clamp(val, 0, 20));
+    // If defined, `val` will be a floating point number between 0 and 20; make sure it's
+    // saved as an integer.
+    const setMinDecimals = (val?: number) => setSave('decimals', val && Math.floor(val));
+    const setMaxDecimals = (val?: number) => setSave('maxDecimals', val && Math.floor(val));
     // Mode and Sign behave as toggles: clicking a selected on deselects it.
     const setMode = (val: NumMode) => setSave('numMode', val !== numMode.get() ? val : undefined);
     const setSign = (val: NumSign) => setSave('numSign', val !== numSign.get() ? val : undefined);
@@ -105,16 +108,56 @@ export class NumericTextBox extends NTextBox {
       ]),
       cssLabel(t('Decimals')),
       cssRow(
-        decimals('min', minDecimals, defaultMin, setMinDecimals, disabled, testId('numeric-min-decimals')),
-        decimals('max', maxDecimals, defaultMax, setMaxDecimals, disabled, testId('numeric-max-decimals')),
+        cssNumericSpinner(
+          minDecimals,
+          {
+            label: t('min'),
+            minValue: 0,
+            maxValue: 20,
+            defaultValue: defaultMin,
+            disabled,
+            save: setMinDecimals,
+          },
+          testId('numeric-min-decimals'),
+        ),
+        cssNumericSpinner(
+          maxDecimals,
+          {
+            label: t('max'),
+            minValue: 0,
+            maxValue: 20,
+            defaultValue: defaultMax,
+            disabled,
+            save: setMaxDecimals,
+          },
+          testId('numeric-max-decimals'),
+        ),
       ),
     ];
   }
-}
 
 
-function numberOrDefault<T>(value: unknown, def: T): number | T {
-  return value !== null && value !== undefined ? Number(value) : def;
+  public buildFormConfigDom(): DomContents {
+    const format = fieldWithDefault<FormNumberFormat>(
+      this.field.widgetOptionsJson.prop('formNumberFormat'),
+      'text'
+    );
+
+    return [
+      cssLabel(t('Field Format')),
+      cssRow(
+        buttonSelect(
+          fromKoSave(format),
+          [
+            {value: 'text', label: t('Text')},
+            {value: 'spinner', label: t('Spinner')},
+          ],
+          testId('numeric-form-field-format'),
+        ),
+      ),
+      dom.create(FormFieldRulesConfig, this.field),
+    ];
+  }
 }
 
 // Helper used by setSave() above to reset some properties when switching modes.
@@ -126,107 +169,6 @@ function updateOptions(prop: keyof NumberFormatOptions, value: unknown): Partial
   return {};
 }
 
-function decimals(
-  label: string,
-  value: Observable<number | ''>,
-  defaultValue: Observable<number>,
-  setFunc: (val?: number) => void,
-  disabled: BindableValue<boolean>,
-  ...args: DomElementArg[]
-) {
-  return cssDecimalsBox(
-    cssDecimalsBox.cls('-disabled', disabled),
-    cssNumLabel(label),
-    cssNumInput({type: 'text', size: '2', min: '0'},
-      dom.prop('value', value),
-      dom.prop('placeholder', defaultValue),
-      dom.on('change', (ev, elem) => {
-        const newVal = parseInt(elem.value, 10);
-        // Set value explicitly before its updated via setFunc; this way the value reflects the
-        // observable in the case the observable is left unchanged (e.g. because of clamping).
-        elem.value = String(value.get());
-        setFunc(Number.isNaN(newVal) ? undefined : newVal);
-        elem.blur();
-      }),
-      dom.on('focus', (ev, elem) => elem.select()),
-    ),
-    cssSpinner(
-      cssSpinnerBtn(cssSpinnerTop('DropdownUp'),
-        dom.on('click', () => setFunc(numberOrDefault(value.get(), defaultValue.get()) + 1))),
-      cssSpinnerBtn(cssSpinnerBottom('Dropdown'),
-        dom.on('click', () => setFunc(numberOrDefault(value.get(), defaultValue.get()) - 1))),
-    ),
-    ...args
-  );
-}
-
-const cssDecimalsBox = styled('div', `
-  position: relative;
-  flex: auto;
-  --icon-color: ${theme.lightText};
-  color: ${theme.lightText};
-  font-weight: normal;
-  display: flex;
-  align-items: center;
-  &:first-child {
-    margin-right: 16px;
-  }
-  &-disabled {
-    opacity: 0.4;
-    pointer-events: none;
-  }
-`);
-
-const cssNumLabel = styled('div', `
-  position: absolute;
-  padding-left: 8px;
-  pointer-events: none;
-`);
-
-const cssNumInput = styled('input', `
-  padding: 4px 32px 4px 40px;
-  border: 1px solid ${theme.inputBorder};
-  border-radius: 3px;
-  background-color: ${theme.inputBg};
-  color: ${theme.inputFg};
-  width: 100%;
-  text-align: right;
-  appearance: none;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-`);
-
-const cssSpinner = styled('div', `
-  position: absolute;
-  right: 8px;
-  width: 16px;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-`);
-
-const cssSpinnerBtn = styled('div', `
-  --icon-color: ${theme.controlSecondaryFg};
-  flex: 1 1 0px;
-  min-height: 0px;
-  position: relative;
-  cursor: pointer;
-  overflow: hidden;
-  &:hover {
-    --icon-color: ${theme.controlSecondaryHoverFg};
-  }
-`);
-
-const cssSpinnerTop = styled(icon, `
-  position: absolute;
-  top: 0px;
-`);
-
-const cssSpinnerBottom = styled(icon, `
-  position: absolute;
-  bottom: 0px;
-`);
-
 const cssModeSelect = styled(makeButtonSelect, `
   flex: 4 4 0px;
   background-color: ${theme.inputBg};
diff --git a/app/client/widgets/Reference.ts b/app/client/widgets/Reference.ts
index 38529bf8..282388ac 100644
--- a/app/client/widgets/Reference.ts
+++ b/app/client/widgets/Reference.ts
@@ -1,3 +1,8 @@
+import {
+  FormFieldRulesConfig,
+  FormOptionsSortConfig,
+  FormSelectConfig
+} from 'app/client/components/Forms/FormConfig';
 import {makeT} from 'app/client/lib/localization';
 import {DataRowModel} from 'app/client/models/DataRowModel';
 import {TableRec} from 'app/client/models/DocModel';
@@ -72,7 +77,9 @@ export class Reference extends NTextBox {
   public buildFormConfigDom() {
     return [
       this.buildTransformConfigDom(),
-      super.buildFormConfigDom(),
+      dom.create(FormSelectConfig, this.field),
+      dom.create(FormOptionsSortConfig, this.field),
+      dom.create(FormFieldRulesConfig, this.field),
     ];
   }
 
diff --git a/app/client/widgets/ReferenceList.ts b/app/client/widgets/ReferenceList.ts
index bddff202..0429b7c3 100644
--- a/app/client/widgets/ReferenceList.ts
+++ b/app/client/widgets/ReferenceList.ts
@@ -1,3 +1,8 @@
+import {
+  FormFieldRulesConfig,
+  FormOptionsAlignmentConfig,
+  FormOptionsSortConfig,
+} from 'app/client/components/Forms/FormConfig';
 import {DataRowModel} from 'app/client/models/DataRowModel';
 import {urlState} from 'app/client/models/gristUrlState';
 import {testId, theme} from 'app/client/ui2018/cssVars';
@@ -103,6 +108,15 @@ export class ReferenceList extends Reference {
       }),
     );
   }
+
+  public buildFormConfigDom() {
+    return [
+      this.buildTransformConfigDom(),
+      dom.create(FormOptionsAlignmentConfig, this.field),
+      dom.create(FormOptionsSortConfig, this.field),
+      dom.create(FormFieldRulesConfig, this.field),
+    ];
+  }
 }
 
 const cssRefIcon = styled(icon, `
diff --git a/app/client/widgets/Toggle.ts b/app/client/widgets/Toggle.ts
index 5a6f440d..4ad16f6f 100644
--- a/app/client/widgets/Toggle.ts
+++ b/app/client/widgets/Toggle.ts
@@ -1,19 +1,44 @@
 import * as commands from 'app/client/components/commands';
-import { FieldRulesConfig } from 'app/client/components/Forms/FormConfig';
+import { FormFieldRulesConfig } from 'app/client/components/Forms/FormConfig';
+import { fromKoSave } from 'app/client/lib/fromKoSave';
+import { makeT } from 'app/client/lib/localization';
 import { DataRowModel } from 'app/client/models/DataRowModel';
 import { ViewFieldRec } from 'app/client/models/entities/ViewFieldRec';
-import { KoSaveableObservable } from 'app/client/models/modelUtil';
-import { NewAbstractWidget, Options } from 'app/client/widgets/NewAbstractWidget';
+import { fieldWithDefault, KoSaveableObservable } from 'app/client/models/modelUtil';
+import { FormToggleFormat } from 'app/client/ui/FormAPI';
+import { cssLabel, cssRow } from 'app/client/ui/RightPanelStyles';
+import { buttonSelect } from 'app/client/ui2018/buttonSelect';
 import { theme } from 'app/client/ui2018/cssVars';
-import { dom, DomContents } from 'grainjs';
+import { NewAbstractWidget, Options } from 'app/client/widgets/NewAbstractWidget';
+import { dom, DomContents, makeTestId } from 'grainjs';
+
+const t = makeT('Toggle');
+
+const testId = makeTestId('test-toggle-');
 
 /**
  * ToggleBase - The base class for toggle widgets, such as a checkbox or a switch.
  */
 abstract class ToggleBase extends NewAbstractWidget {
   public buildFormConfigDom(): DomContents {
+    const format = fieldWithDefault<FormToggleFormat>(
+      this.field.widgetOptionsJson.prop('formToggleFormat'),
+      'switch'
+    );
+
     return [
-      dom.create(FieldRulesConfig, this.field),
+      cssLabel(t('Field Format')),
+      cssRow(
+        buttonSelect(
+          fromKoSave(format),
+          [
+            {value: 'switch', label: t('Switch')},
+            {value: 'checkbox', label: t('Checkbox')},
+          ],
+          testId('form-field-format'),
+        ),
+      ),
+      dom.create(FormFieldRulesConfig, this.field),
     ];
   }
 
diff --git a/app/client/widgets/UserType.ts b/app/client/widgets/UserType.ts
index c1a1fb20..06586c53 100644
--- a/app/client/widgets/UserType.ts
+++ b/app/client/widgets/UserType.ts
@@ -154,6 +154,7 @@ export const typeDefs: any = {
     widgets: {
       TextBox: {
         cons: 'TextBox',
+        formCons: 'Switch',
         editCons: 'TextEditor',
         icon: 'FieldTextbox',
         options: {
diff --git a/app/client/widgets/UserTypeImpl.ts b/app/client/widgets/UserTypeImpl.ts
index e9c5b25e..e2907595 100644
--- a/app/client/widgets/UserTypeImpl.ts
+++ b/app/client/widgets/UserTypeImpl.ts
@@ -65,6 +65,12 @@ export function getWidgetConstructor(widget: string, type: string): WidgetConstr
   return nameToWidget[config.cons as keyof typeof nameToWidget] as any;
 }
 
+/** return a good class to instantiate for viewing a form widget/type combination */
+export function getFormWidgetConstructor(widget: string, type: string): WidgetConstructor {
+  const {config} = getWidgetConfiguration(widget, type as GristType);
+  return nameToWidget[(config.formCons || config.cons) as keyof typeof nameToWidget] as any;
+}
+
 /** return a good class to instantiate for editing a widget/type combination */
 export function getEditorConstructor(widget: string, type: string): typeof NewBaseEditor {
   const {config} = getWidgetConfiguration(widget, type as GristType);
diff --git a/app/common/gutil.ts b/app/common/gutil.ts
index 2ff8f3b5..bea94bf1 100644
--- a/app/common/gutil.ts
+++ b/app/common/gutil.ts
@@ -175,6 +175,21 @@ export async function firstDefined<T>(...list: Array<() => Promise<T>>): Promise
   return undefined;
 }
 
+/**
+ * Returns the number repesentation of `value`, or `defaultVal` if it cannot
+ * be represented as a valid number.
+ */
+export function numberOrDefault<T>(value: unknown, defaultVal: T): number | T {
+  if (typeof value === 'number') {
+    return !Number.isNaN(value) ? value : defaultVal;
+  } else if (typeof value === 'string') {
+    const maybeNumber = Number.parseFloat(value);
+    return !Number.isNaN(maybeNumber) ? maybeNumber : defaultVal;
+  } else {
+    return defaultVal;
+  }
+}
+
 /**
  * Parses json and returns the result, or returns defaultVal if parsing fails.
  */
diff --git a/app/server/lib/DocApi.ts b/app/server/lib/DocApi.ts
index 350fc8a4..8f01df16 100644
--- a/app/server/lib/DocApi.ts
+++ b/app/server/lib/DocApi.ts
@@ -12,7 +12,13 @@ import {
   UserAction
 } from 'app/common/DocActions';
 import {DocData} from 'app/common/DocData';
-import {extractTypeFromColType, isBlankValue, isFullReferencingType, isRaisedException} from "app/common/gristTypes";
+import {
+  extractTypeFromColType,
+  getReferencedTableId,
+  isBlankValue,
+  isFullReferencingType,
+  isRaisedException,
+} from "app/common/gristTypes";
 import {INITIAL_FIELDS_COUNT} from "app/common/Forms";
 import {buildUrlId, parseUrlId, SHARE_KEY_PREFIX} from "app/common/gristUrls";
 import {isAffirmative, safeJsonParse, timeoutReached} from "app/common/gutil";
@@ -260,9 +266,15 @@ export class DocWorkerApi {
     }
 
     function asRecords(
-      columnData: TableColValues, opts?: { optTableId?: string; includeHidden?: boolean }): TableRecordValue[] {
+      columnData: TableColValues,
+      opts?: {
+        optTableId?: string;
+        includeHidden?: boolean;
+        includeId?: boolean;
+      }
+    ): TableRecordValue[] {
       const fieldNames = Object.keys(columnData).filter((k) => {
-        if (k === "id") {
+        if (!opts?.includeId && k === "id") {
           return false;
         }
         if (
@@ -1451,9 +1463,8 @@ export class DocWorkerApi {
         }
 
         // Cache the table reads based on tableId. We are caching only the promise, not the result.
-        const table = _.memoize(
-          (tableId: string) => readTable(req, activeDoc, tableId, {}, {}).then(r => asRecords(r))
-        );
+        const table = _.memoize((tableId: string) =>
+          readTable(req, activeDoc, tableId, {}, {}).then(r => asRecords(r, {includeId: true})));
 
         const getTableValues = async (tableId: string, colId: string) => {
           const records = await table(tableId);
@@ -1463,19 +1474,17 @@ export class DocWorkerApi {
         const Tables = activeDoc.docData.getMetaTable('_grist_Tables');
 
         const getRefTableValues = async (col: MetaRowRecord<'_grist_Tables_column'>) => {
-          const refId = col.visibleCol;
-          if (!refId) { return [] as any; }
+          const refTableId = getReferencedTableId(col.type);
+          let refColId: string;
+          if (col.visibleCol) {
+            const refCol = Tables_column.getRecord(col.visibleCol);
+            if (!refCol) { return []; }
 
-          const refCol = Tables_column.getRecord(refId);
-          if (!refCol) { return []; }
-
-          const refTable = Tables.getRecord(refCol.parentId);
-          if (!refTable) { return []; }
-
-          const refTableId = refTable.tableId as string;
-          const refColId = refCol.colId as string;
-          if (!refTableId || !refColId) { return () => []; }
-          if (typeof refTableId !== 'string' || typeof refColId !== 'string') { return []; }
+            refColId = refCol.colId as string;
+          } else {
+            refColId = 'id';
+          }
+          if (!refTableId || typeof refTableId !== 'string' || !refColId) { return []; }
 
           const values = await getTableValues(refTableId, refColId);
           return values.filter(([_id, value]) => !isBlankValue(value));
diff --git a/test/nbrowser/FormView.ts b/test/nbrowser/FormView.ts
index 1aeb71dc..bfcb970b 100644
--- a/test/nbrowser/FormView.ts
+++ b/test/nbrowser/FormView.ts
@@ -5,7 +5,7 @@ import * as gu from 'test/nbrowser/gristUtils';
 import {setupTestSuite} from 'test/nbrowser/testUtils';
 
 describe('FormView', function() {
-  this.timeout('90s');
+  this.timeout('2m');
   gu.bigScreen();
 
   let api: UserAPI;
@@ -80,9 +80,9 @@ describe('FormView', function() {
   async function waitForConfirm() {
     await gu.waitForServer();
     await gu.waitToPass(async () => {
-      assert.isTrue(await driver.findWait('.test-form-container', 2000).isDisplayed());
+      assert.isTrue(await driver.findWait('.test-form-success-page', 2000).isDisplayed());
       assert.equal(
-        await driver.find('.test-form-success-text').getText(),
+        await driver.find('.test-form-success-page-text').getText(),
         'Thank you! Your response has been recorded.'
       );
     });
@@ -96,6 +96,12 @@ describe('FormView', function() {
     assert.deepEqual(await api.getTable(docId, 'Table1').then(t => t.D), values);
   }
 
+  async function assertSubmitOnEnterIsDisabled() {
+    await gu.sendKeys(Key.ENTER);
+    await gu.waitForServer();
+    assert.isFalse(await driver.find('.test-form-success-page').isPresent());
+  }
+
   describe('on personal site', async function() {
     before(async function() {
       const session = await gu.session().login();
@@ -157,7 +163,7 @@ describe('FormView', function() {
       await removeForm();
     });
 
-    it('can submit a form with Text field', async function() {
+    it('can submit a form with single-line Text field', async function() {
       const formUrl = await createFormWith('Text');
       // We are in a new window.
       await gu.onNewTab(async () => {
@@ -170,6 +176,7 @@ describe('FormView', function() {
         assert.equal(await driver.find('input[name="D"]').value(), '');
         await driver.find('input[name="D"]').click();
         await gu.sendKeys('Hello World');
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -178,7 +185,32 @@ describe('FormView', function() {
       await removeForm();
     });
 
-    it('can submit a form with Numeric field', async function() {
+    it('can submit a form with multi-line Text field', async function() {
+      const formUrl = await createFormWith('Text');
+      await gu.openColumnPanel();
+      await gu.waitForSidePanel();
+      await driver.findContent('.test-tb-form-field-format .test-select-button', /Multi line/).click();
+      await gu.waitForServer();
+      // We are in a new window.
+      await gu.onNewTab(async () => {
+        await driver.get(formUrl);
+        await driver.findWait('textarea[name="D"]', 2000).click();
+        await gu.sendKeys('Hello');
+        assert.equal(await driver.find('textarea[name="D"]').value(), 'Hello');
+        await driver.find('.test-form-reset').click();
+        await driver.find('.test-modal-confirm').click();
+        assert.equal(await driver.find('textarea[name="D"]').value(), '');
+        await driver.find('textarea[name="D"]').click();
+        await gu.sendKeys('Hello,', Key.ENTER, 'World');
+        await driver.find('input[type="submit"]').click();
+        await waitForConfirm();
+      });
+      // Make sure we see the new record.
+      await expectSingle('Hello,\nWorld');
+      await removeForm();
+    });
+
+    it('can submit a form with text Numeric field', async function() {
       const formUrl = await createFormWith('Numeric');
       // We are in a new window.
       await gu.onNewTab(async () => {
@@ -191,6 +223,38 @@ describe('FormView', function() {
         assert.equal(await driver.find('input[name="D"]').value(), '');
         await driver.find('input[name="D"]').click();
         await gu.sendKeys('1984');
+        await assertSubmitOnEnterIsDisabled();
+        await driver.find('input[type="submit"]').click();
+        await waitForConfirm();
+      });
+      // Make sure we see the new record.
+      await expectSingle(1984);
+      await removeForm();
+    });
+
+    it('can submit a form with spinner Numeric field', async function() {
+      const formUrl = await createFormWith('Numeric');
+      await driver.findContent('.test-numeric-form-field-format .test-select-button', /Spinner/).click();
+      await gu.waitForServer();
+      // We are in a new window.
+      await gu.onNewTab(async () => {
+        await driver.get(formUrl);
+        await driver.findWait('input[name="D"]', 2000).click();
+        await gu.sendKeys('1983');
+        assert.equal(await driver.find('input[name="D"]').value(), '1983');
+        await driver.find('.test-form-reset').click();
+        await driver.find('.test-modal-confirm').click();
+        assert.equal(await driver.find('input[name="D"]').value(), '');
+        await driver.find('input[name="D"]').click();
+        await gu.sendKeys('1984', Key.ARROW_UP);
+        assert.equal(await driver.find('input[name="D"]').value(), '1985');
+        await gu.sendKeys(Key.ARROW_DOWN);
+        assert.equal(await driver.find('input[name="D"]').value(), '1984');
+        await driver.find('.test-numeric-spinner-increment').click();
+        assert.equal(await driver.find('input[name="D"]').value(), '1985');
+        await driver.find('.test-numeric-spinner-decrement').click();
+        assert.equal(await driver.find('input[name="D"]').value(), '1984');
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -212,6 +276,7 @@ describe('FormView', function() {
         assert.equal(await driver.find('input[name="D"]').getAttribute('value'), '');
         await driver.find('input[name="D"]').click();
         await gu.sendKeys('01012000');
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -220,17 +285,14 @@ describe('FormView', function() {
       await removeForm();
     });
 
-    it('can submit a form with Choice field', async function() {
+    it('can submit a form with select Choice field', async function() {
       const formUrl = await createFormWith('Choice');
       // Add some options.
-      await gu.openColumnPanel();
-
       await gu.choicesEditor.edit();
       await gu.choicesEditor.add('Foo');
       await gu.choicesEditor.add('Bar');
       await gu.choicesEditor.add('Baz');
       await gu.choicesEditor.save();
-      await gu.toggleSidePanel('right', 'close');
 
       // We need to press view, as form is not saved yet.
       await gu.scrollActiveViewTop();
@@ -256,6 +318,12 @@ describe('FormView', function() {
         assert.equal(await driver.find('select[name="D"]').value(), '');
         await driver.find('.test-form-search-select').click();
         await driver.findContent('.test-sd-searchable-list-item', 'Bar').click();
+        // Check keyboard shortcuts work.
+        assert.equal(await driver.find('.test-form-search-select').getText(), 'Bar');
+        await gu.sendKeys(Key.BACK_SPACE);
+        assert.equal(await driver.find('.test-form-search-select').getText(), 'Select...');
+        await gu.sendKeys(Key.ENTER);
+        await driver.findContent('.test-sd-searchable-list-item', 'Bar').click();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -263,7 +331,41 @@ describe('FormView', function() {
       await removeForm();
     });
 
-    it('can submit a form with Integer field', async function() {
+    it('can submit a form with radio Choice field', async function() {
+      const formUrl = await createFormWith('Choice');
+      await driver.findContent('.test-form-field-format .test-select-button', /Radio/).click();
+      await gu.waitForServer();
+      await gu.choicesEditor.edit();
+      await gu.choicesEditor.add('Foo');
+      await gu.choicesEditor.add('Bar');
+      await gu.choicesEditor.add('Baz');
+      await gu.choicesEditor.save();
+      await gu.scrollActiveViewTop();
+      await gu.waitToPass(async () => {
+        assert.isTrue(await driver.find('.test-forms-view').isDisplayed());
+      });
+      // We are in a new window.
+      await gu.onNewTab(async () => {
+        await driver.get(formUrl);
+        await driver.findWait('input[name="D"]', 2000);
+        assert.deepEqual(
+          await driver.findAll('label:has(input[name="D"])', e => e.getText()), ['Foo', 'Bar', 'Baz']
+        );
+        await driver.find('input[name="D"][value="Baz"]').click();
+        assert.equal(await driver.find('input[name="D"][value="Baz"]').getAttribute('checked'), 'true');
+        await driver.find('.test-form-reset').click();
+        await driver.find('.test-modal-confirm').click();
+        assert.equal(await driver.find('input[name="D"][value="Baz"]').getAttribute('checked'), null);
+        await driver.find('input[name="D"][value="Bar"]').click();
+        await assertSubmitOnEnterIsDisabled();
+        await driver.find('input[type="submit"]').click();
+        await waitForConfirm();
+      });
+      await expectSingle('Bar');
+      await removeForm();
+    });
+
+    it('can submit a form with text Integer field', async function() {
       const formUrl = await createFormWith('Integer', true);
       // We are in a new window.
       await gu.onNewTab(async () => {
@@ -276,6 +378,7 @@ describe('FormView', function() {
         assert.equal(await driver.find('input[name="D"]').value(), '');
         await driver.find('input[name="D"]').click();
         await gu.sendKeys('1984');
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -284,7 +387,38 @@ describe('FormView', function() {
       await removeForm();
     });
 
-    it('can submit a form with Toggle field', async function() {
+    it('can submit a form with spinner Integer field', async function() {
+      const formUrl = await createFormWith('Integer', true);
+      await driver.findContent('.test-numeric-form-field-format .test-select-button', /Spinner/).click();
+      await gu.waitForServer();
+      // We are in a new window.
+      await gu.onNewTab(async () => {
+        await driver.get(formUrl);
+        await driver.findWait('input[name="D"]', 2000).click();
+        await gu.sendKeys('1983');
+        assert.equal(await driver.find('input[name="D"]').value(), '1983');
+        await driver.find('.test-form-reset').click();
+        await driver.find('.test-modal-confirm').click();
+        assert.equal(await driver.find('input[name="D"]').value(), '');
+        await driver.find('input[name="D"]').click();
+        await gu.sendKeys('1984', Key.ARROW_UP);
+        assert.equal(await driver.find('input[name="D"]').value(), '1985');
+        await gu.sendKeys(Key.ARROW_DOWN);
+        assert.equal(await driver.find('input[name="D"]').value(), '1984');
+        await driver.find('.test-numeric-spinner-increment').click();
+        assert.equal(await driver.find('input[name="D"]').value(), '1985');
+        await driver.find('.test-numeric-spinner-decrement').click();
+        assert.equal(await driver.find('input[name="D"]').value(), '1984');
+        await assertSubmitOnEnterIsDisabled();
+        await driver.find('input[type="submit"]').click();
+        await waitForConfirm();
+      });
+      // Make sure we see the new record.
+      await expectSingle(1984);
+      await removeForm();
+    });
+
+    it('can submit a form with switch Toggle field', async function() {
       const formUrl = await createFormWith('Toggle', true);
       // We are in a new window.
       await gu.onNewTab(async () => {
@@ -295,6 +429,39 @@ describe('FormView', function() {
         await driver.find('.test-modal-confirm').click();
         assert.equal(await driver.find('input[name="D"]').getAttribute('checked'), null);
         await driver.find('input[name="D"]').findClosest("label").click();
+        await assertSubmitOnEnterIsDisabled();
+        await driver.find('input[type="submit"]').click();
+        await waitForConfirm();
+      });
+      await expectSingle(true);
+      await gu.onNewTab(async () => {
+        await driver.get(formUrl);
+        await driver.findWait('input[type="submit"]', 2000).click();
+        await waitForConfirm();
+      });
+      await expectInD([true, false]);
+
+      // Remove the additional record added just now.
+      await gu.sendActions([
+        ['RemoveRecord', 'Table1', 2],
+      ]);
+      await removeForm();
+    });
+
+    it('can submit a form with checkbox Toggle field', async function() {
+      const formUrl = await createFormWith('Toggle', true);
+      await driver.findContent('.test-toggle-form-field-format .test-select-button', /Checkbox/).click();
+      await gu.waitForServer();
+      // We are in a new window.
+      await gu.onNewTab(async () => {
+        await driver.get(formUrl);
+        await driver.findWait('input[name="D"]', 2000).findClosest("label").click();
+        assert.equal(await driver.find('input[name="D"]').getAttribute('checked'), 'true');
+        await driver.find('.test-form-reset').click();
+        await driver.find('.test-modal-confirm').click();
+        assert.equal(await driver.find('input[name="D"]').getAttribute('checked'), null);
+        await driver.find('input[name="D"]').findClosest("label").click();
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -334,6 +501,7 @@ describe('FormView', function() {
         assert.equal(await driver.find('input[name="D[]"][value="Bar"]').getAttribute('checked'), null);
         await driver.find('input[name="D[]"][value="Foo"]').click();
         await driver.find('input[name="D[]"][value="Baz"]').click();
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -342,7 +510,7 @@ describe('FormView', function() {
       await removeForm();
     });
 
-    it('can submit a form with Ref field', async function() {
+    it('can submit a form with select Ref field', async function() {
       const formUrl = await createFormWith('Reference', true);
       // Add some options.
       await gu.openColumnPanel();
@@ -353,22 +521,21 @@ describe('FormView', function() {
         ['AddRecord', 'Table1', null, {A: 'Bar'}], // id 2
         ['AddRecord', 'Table1', null, {A: 'Baz'}], // id 3
       ]);
-      await gu.toggleSidePanel('right', 'close');
       // We are in a new window.
       await gu.onNewTab(async () => {
         await driver.get(formUrl);
         await driver.findWait('select[name="D"]', 2000);
         assert.deepEqual(
           await driver.findAll('select[name="D"] option', e => e.getText()),
-          ['Select...', ...['Bar', 'Baz', 'Foo']]
+          ['Select...', 'Foo', 'Bar', 'Baz']
         );
         assert.deepEqual(
           await driver.findAll('select[name="D"] option', e => e.value()),
-          ['', ...['2', '3', '1']]
+          ['', '1', '2', '3']
         );
         await driver.find('.test-form-search-select').click();
         assert.deepEqual(
-          await driver.findAll('.test-sd-searchable-list-item', e => e.getText()), ['Select...', 'Bar', 'Baz', 'Foo']
+          await driver.findAll('.test-sd-searchable-list-item', e => e.getText()), ['Select...', 'Foo', 'Bar', 'Baz']
         );
         await gu.sendKeys('Baz', Key.ENTER);
         assert.equal(await driver.find('select[name="D"]').value(), '3');
@@ -377,6 +544,51 @@ describe('FormView', function() {
         assert.equal(await driver.find('select[name="D"]').value(), '');
         await driver.find('.test-form-search-select').click();
         await driver.findContent('.test-sd-searchable-list-item', 'Bar').click();
+        // Check keyboard shortcuts work.
+        assert.equal(await driver.find('.test-form-search-select').getText(), 'Bar');
+        await gu.sendKeys(Key.BACK_SPACE);
+        assert.equal(await driver.find('.test-form-search-select').getText(), 'Select...');
+        await gu.sendKeys(Key.ENTER);
+        await driver.findContent('.test-sd-searchable-list-item', 'Bar').click();
+        await driver.find('input[type="submit"]').click();
+        await waitForConfirm();
+      });
+      await expectInD([0, 0, 0, 2]);
+
+      // Remove 3 records.
+      await gu.sendActions([
+        ['BulkRemoveRecord', 'Table1', [1, 2, 3, 4]],
+      ]);
+
+      await removeForm();
+    });
+
+    it('can submit a form with radio Ref field', async function() {
+      const formUrl = await createFormWith('Reference', true);
+      await driver.findContent('.test-form-field-format .test-select-button', /Radio/).click();
+      await gu.waitForServer();
+      await gu.setRefShowColumn('A');
+      await gu.sendActions([
+        ['AddRecord', 'Table1', null, {A: 'Foo'}],
+        ['AddRecord', 'Table1', null, {A: 'Bar'}],
+        ['AddRecord', 'Table1', null, {A: 'Baz'}],
+      ]);
+      // We are in a new window.
+      await gu.onNewTab(async () => {
+        await driver.get(formUrl);
+        await driver.findWait('input[name="D"]', 2000);
+        assert.deepEqual(
+          await driver.findAll('label:has(input[name="D"])', e => e.getText()), ['Foo', 'Bar', 'Baz']
+        );
+        assert.equal(await driver.find('label:has(input[name="D"][value="3"])').getText(), 'Baz');
+        await driver.find('input[name="D"][value="3"]').click();
+        assert.equal(await driver.find('input[name="D"][value="3"]').getAttribute('checked'), 'true');
+        await driver.find('.test-form-reset').click();
+        await driver.find('.test-modal-confirm').click();
+        assert.equal(await driver.find('input[name="D"][value="3"]').getAttribute('checked'), null);
+        assert.equal(await driver.find('label:has(input[name="D"][value="2"])').getText(), 'Bar');
+        await driver.find('input[name="D"][value="2"]').click();
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -393,8 +605,6 @@ describe('FormView', function() {
     it('can submit a form with RefList field', async function() {
       const formUrl = await createFormWith('Reference List', true);
       // Add some options.
-      await gu.openColumnPanel();
-
       await gu.setRefShowColumn('A');
       // Add 3 records to this table (it is now empty).
       await gu.sendActions([
@@ -416,6 +626,7 @@ describe('FormView', function() {
         assert.equal(await driver.find('input[name="D[]"][value="1"]').getAttribute('checked'), null);
         await driver.find('input[name="D[]"][value="1"]').click();
         await driver.find('input[name="D[]"][value="2"]').click();
+        await assertSubmitOnEnterIsDisabled();
         await driver.find('input[type="submit"]').click();
         await waitForConfirm();
       });
@@ -542,9 +753,9 @@ describe('FormView', function() {
       await gu.waitForServer();
       await gu.onNewTab(async () => {
         await driver.get(formUrl);
-        assert.isTrue(await driver.findWait('.test-form-container', 2000).isDisplayed());
+        assert.isTrue(await driver.findWait('.test-form-error-page', 2000).isDisplayed());
         assert.equal(
-          await driver.find('.test-form-error-text').getText(),
+          await driver.find('.test-form-error-page-text').getText(),
           'Oops! This form is no longer published.'
         );
       });
@@ -739,8 +950,8 @@ describe('FormView', function() {
       // Now B is selected.
       assert.equal(await selectedLabel(), 'B');
 
-      // Click on the edit button.
-      await driver.find('.test-forms-submit').click();
+      // Click the blank space above the submit button.
+      await driver.find('.test-forms-error').click();
 
       // Now nothing is selected.
       assert.isFalse(await isSelected(), 'Something is selected');
@@ -825,7 +1036,6 @@ describe('FormView', function() {
       assert.deepEqual(await hiddenColumns(), []);
 
       // Now hide it using Delete key.
-      await driver.find('.test-forms-submit').click();
       await question('Choice').click();
       await gu.sendKeys(Key.DELETE);
       await gu.waitForServer();
@@ -833,8 +1043,20 @@ describe('FormView', function() {
       // It should be hidden again.
       assert.deepEqual(await hiddenColumns(), ['Choice']);
       assert.deepEqual(await readLabels(), ['A', 'B', 'C']);
+    });
 
-
+    it('changing field types works', async function() {
+      await gu.openColumnPanel();
+      assert.equal(await questionType('A'), 'Any');
+      await question('A').click();
+      await gu.setType('Text');
+      assert.equal(await questionType('A'), 'Text');
+      await gu.sendActions([['AddRecord', 'Form', null, {A: 'Foo'}]]);
+      await question('A').click();
+      await gu.setType('Numeric', {apply: true});
+      assert.equal(await questionType('A'), 'Numeric');
+      await gu.sendActions([['RemoveRecord', 'Form', 1]]);
+      await gu.undo(2);
       await gu.toggleSidePanel('right', 'close');
     });
 

From 8c53585bd708e73e6eb14c8887b4e7007ce8a571 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Fri, 12 Apr 2024 10:00:05 -0700
Subject: [PATCH 08/45] (core) Break overflowing text

Summary: Text could overflow its container in a few instances.

Test Plan: Manual.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D4231
---
 app/client/components/FormRendererCss.ts | 3 +++
 app/client/components/Forms/styles.ts    | 4 ++++
 app/client/ui2018/modals.ts              | 1 +
 3 files changed, 8 insertions(+)

diff --git a/app/client/components/FormRendererCss.ts b/app/client/components/FormRendererCss.ts
index 461ddff9..3dcccf34 100644
--- a/app/client/components/FormRendererCss.ts
+++ b/app/client/components/FormRendererCss.ts
@@ -12,6 +12,8 @@ export const label = styled('div', `
 `);
 
 export const paragraph = styled('div', `
+  overflow-wrap: break-word;
+
   &-alignment-left {
     text-align: left;
   }
@@ -176,6 +178,7 @@ export const field = styled('div', `
     margin-top: 8px;
     margin-bottom: 8px;
     display: block;
+    overflow-wrap: break-word;
   }
 `);
 
diff --git a/app/client/components/Forms/styles.ts b/app/client/components/Forms/styles.ts
index 6b5fa8d0..e75578bd 100644
--- a/app/client/components/Forms/styles.ts
+++ b/app/client/components/Forms/styles.ts
@@ -133,6 +133,8 @@ export const cssQuestion = styled('div', `
 export const cssRequiredWrapper = styled('div', `
   margin: 8px 0px;
   min-height: 16px;
+  overflow-wrap: break-word;
+
   &-required {
     display: grid;
     grid-template-columns: auto 1fr;
@@ -426,6 +428,8 @@ export const cssSmallButton = styled(basicButton, `
 export const cssMarkdownRendered = styled('div', `
   min-height: 1.5rem;
   font-size: 15px;
+  overflow-wrap: break-word;
+
   & textarea {
     font-size: 15px;
   }
diff --git a/app/client/ui2018/modals.ts b/app/client/ui2018/modals.ts
index 4ed74ab6..f0bb242d 100644
--- a/app/client/ui2018/modals.ts
+++ b/app/client/ui2018/modals.ts
@@ -618,6 +618,7 @@ export const cssModalTitle = styled('div', `
 export const cssModalBody = styled('div', `
   color: ${theme.text};
   margin: 16px 0;
+  overflow-wrap: break-word;
 `);
 
 export const cssModalButtons = styled('div', `

From 013040944717018f590fab6fe52ae77f54afb498 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Fri, 5 Apr 2024 12:37:15 -0700
Subject: [PATCH 09/45] (core) Fix null references in form fields bug

Summary:
Shares and documents would both produce a rule set for the same column
if the document rule set was for multiple columns. In this case, it was causing
one of the rules to be overwritten by the other (specifically, the rule granting
access to form references was not being applied in shares). The symptom was
`null` values in place of the referenced table's values.

We address this by splitting any rule sets for multiple columns that are also
affected by shares, so that they can be overridden by shares without causing a
conflicting rule set to be created (i.e. 2 column rule sets containing the same column).

Test Plan: Server tests.

Reviewers: dsagal, paulfitz

Reviewed By: dsagal, paulfitz

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D4208
---
 app/common/ACLRuleCollection.ts   |  45 +--
 app/common/ACLRulesReader.ts      | 454 ++++++++++++++++++++++++++++++
 app/common/ACLShareRules.ts       | 296 -------------------
 test/server/lib/ACLRulesReader.ts | 443 +++++++++++++++++++++++++++++
 4 files changed, 904 insertions(+), 334 deletions(-)
 create mode 100644 app/common/ACLRulesReader.ts
 delete mode 100644 app/common/ACLShareRules.ts
 create mode 100644 test/server/lib/ACLRulesReader.ts

diff --git a/app/common/ACLRuleCollection.ts b/app/common/ACLRuleCollection.ts
index 434dc151..f2f004dd 100644
--- a/app/common/ACLRuleCollection.ts
+++ b/app/common/ACLRuleCollection.ts
@@ -1,14 +1,12 @@
 import {parsePermissions, permissionSetToText, splitSchemaEditPermissionSet} from 'app/common/ACLPermissions';
 import {AVAILABLE_BITS_COLUMNS, AVAILABLE_BITS_TABLES, trimPermissions} from 'app/common/ACLPermissions';
-import {ACLShareRules, TableWithOverlay} from 'app/common/ACLShareRules';
+import {ACLRulesReader} from 'app/common/ACLRulesReader';
 import {AclRuleProblem} from 'app/common/ActiveDocAPI';
 import {DocData} from 'app/common/DocData';
 import {AclMatchFunc, ParsedAclFormula, RulePart, RuleSet, UserAttributeRule} from 'app/common/GranularAccessClause';
 import {getSetMapValue, isNonNullish} from 'app/common/gutil';
-import {ShareOptions} from 'app/common/ShareOptions';
 import {MetaRowRecord} from 'app/common/TableData';
 import {decodeObject} from 'app/plugin/objtypes';
-import sortBy = require('lodash/sortBy');
 
 export type ILogger = Pick<Console, 'log'|'debug'|'info'|'warn'|'error'>;
 
@@ -463,39 +461,16 @@ function getHelperCols(docData: DocData, tableId: string, colIds: string[], log:
  * UserAttributeRules. This is used by both client-side code and server-side.
  */
 function readAclRules(docData: DocData, {log, compile, enrichRulesForImplementation}: ReadAclOptions): ReadAclResults {
-  // Wrap resources and rules tables so we can have "virtual" rules
-  // to implement special shares.
-  const resourcesTable = new TableWithOverlay(docData.getMetaTable('_grist_ACLResources'));
-  const rulesTable = new TableWithOverlay(docData.getMetaTable('_grist_ACLRules'));
-  const sharesTable = docData.getMetaTable('_grist_Shares');
-
   const ruleSets: RuleSet[] = [];
   const userAttributes: UserAttributeRule[] = [];
 
-  let hasShares: boolean = false;
-  const shares = sharesTable.getRecords();
-  // ACLShareRules is used to edit resourcesTable and rulesTable in place.
-  const shareRules = new ACLShareRules(docData, resourcesTable, rulesTable);
-  // Add virtual rules to implement shares, if there are any.
-  // Add the virtual rules only when implementing/interpreting them, as
-  // opposed to accessing them for presentation or manipulation in the UI.
-  if (enrichRulesForImplementation && shares.length > 0) {
-    for (const share of shares) {
-      const options: ShareOptions = JSON.parse(share.options || '{}');
-      shareRules.addRulesForShare(share.id, options);
-    }
-    shareRules.addDefaultRulesForShares();
-    hasShares = true;
-  }
+  const aclRulesReader = new ACLRulesReader(docData, {
+    addShareRules: enrichRulesForImplementation,
+  });
 
   // Group rules by resource first, ordering by rulePos. Each group will become a RuleSet.
-  const rulesByResource = new Map<number, Array<MetaRowRecord<'_grist_ACLRules'>>>();
-  for (const ruleRecord of sortBy(rulesTable.getRecords(), 'rulePos')) {
-    getSetMapValue(rulesByResource, ruleRecord.resource, () => []).push(ruleRecord);
-  }
-
-  for (const [resourceId, rules] of rulesByResource.entries()) {
-    const resourceRec = resourcesTable.getRecord(resourceId);
+  for (const [resourceId, rules] of aclRulesReader.entries()) {
+    const resourceRec = aclRulesReader.getResourceById(resourceId);
     if (!resourceRec) {
       throw new Error(`ACLRule ${rules[0].id} refers to an invalid ACLResource ${resourceId}`);
     }
@@ -531,13 +506,7 @@ function readAclRules(docData: DocData, {log, compile, enrichRulesForImplementat
       } else if (rule.aclFormula && !rule.aclFormulaParsed) {
         throw new Error(`ACLRule ${rule.id} invalid because missing its parsed formula`);
       } else {
-        let aclFormulaParsed = rule.aclFormula && JSON.parse(String(rule.aclFormulaParsed));
-        // If we have "virtual" rules to implement shares, then regular
-        // rules need to be tweaked so that they don't apply when the
-        // share is active.
-        if (hasShares && rule.id >= 0) {
-          aclFormulaParsed = shareRules.transformNonShareRules({rule, aclFormulaParsed});
-        }
+        const aclFormulaParsed = rule.aclFormula && JSON.parse(String(rule.aclFormulaParsed));
         let permissions = parsePermissions(String(rule.permissionsText));
         if (tableId !== '*' && tableId !== SPECIAL_RULES_TABLE_ID) {
           const availableBits = (colIds === '*') ? AVAILABLE_BITS_TABLES : AVAILABLE_BITS_COLUMNS;
diff --git a/app/common/ACLRulesReader.ts b/app/common/ACLRulesReader.ts
new file mode 100644
index 00000000..ed4154ce
--- /dev/null
+++ b/app/common/ACLRulesReader.ts
@@ -0,0 +1,454 @@
+import { DocData } from 'app/common/DocData';
+import { getSetMapValue } from 'app/common/gutil';
+import { SchemaTypes } from 'app/common/schema';
+import { ShareOptions } from 'app/common/ShareOptions';
+import { MetaRowRecord, MetaTableData } from 'app/common/TableData';
+import { isEqual, sortBy } from 'lodash';
+
+/**
+ * For special shares, we need to refer to resources that may not
+ * be listed in the _grist_ACLResources table, and have rules that
+ * aren't backed by storage in _grist_ACLRules. So we implement
+ * a small helper to add an overlay of extra resources and rules.
+ * They are distinguishable from real, stored resources and rules
+ * by having negative IDs.
+ */
+export class TableWithOverlay<T extends keyof SchemaTypes> {
+  private _extraRecords = new Array<MetaRowRecord<T>>();
+  private _extraRecordsById = new Map<number, MetaRowRecord<T>>();
+  private _excludedRecordIds = new Set<number>();
+  private _nextFreeVirtualId: number = -1;
+
+  public constructor(private _originalTable: MetaTableData<T>) {}
+
+  // Add a record to the table, but only as an overlay - no
+  // persistent changes are made. Uses negative row IDs.
+  // Returns the ID assigned to the record. The passed in
+  // record is expected to have an ID of zero.
+  public addRecord(rec: MetaRowRecord<T>): number {
+    if (rec.id !== 0) { throw new Error('Expected a zero ID'); }
+    const id = this._nextFreeVirtualId;
+    const recWithCorrectId: MetaRowRecord<T> = {...rec, id};
+    this._extraRecords.push({...rec, id});
+    this._extraRecordsById.set(id, recWithCorrectId);
+    this._nextFreeVirtualId--;
+    return id;
+  }
+
+  public excludeRecord(id: number) {
+    this._excludedRecordIds.add(id);
+  }
+
+  // Support the few MetaTableData methods we actually use
+  // in ACLRulesReader.
+
+  public getRecord(id: number) {
+    if (this._excludedRecordIds.has(id)) { return undefined; }
+
+    if (id < 0) {
+      // Reroute negative IDs to our local stash of records.
+      return this._extraRecordsById.get(id);
+    } else {
+      // Everything else, we just pass along.
+      return this._originalTable.getRecord(id);
+    }
+  }
+
+  public getRecords() {
+    return this._filterExcludedRecords([
+      ...this._originalTable.getRecords(),
+      ...this._extraRecords,
+    ]);
+  }
+
+  public filterRecords(properties: Partial<MetaRowRecord<T>>): Array<MetaRowRecord<T>> {
+    const originalRecords = this._originalTable.filterRecords(properties);
+    const extraRecords = this._extraRecords.filter((rec) => Object.keys(properties)
+      .every((p) => isEqual((rec as any)[p], (properties as any)[p])));
+    return this._filterExcludedRecords([...originalRecords, ...extraRecords]);
+  }
+
+  public findMatchingRowId(properties: Partial<MetaRowRecord<T>>): number {
+    const rowId = (
+      this._originalTable.findMatchingRowId(properties) ||
+      this._extraRecords.find((rec) => Object.keys(properties).every((p) =>
+        isEqual((rec as any)[p], (properties as any)[p]))
+      )?.id
+    );
+    return rowId && !this._excludedRecordIds.has(rowId) ? rowId : 0;
+  }
+
+  private _filterExcludedRecords(records: MetaRowRecord<T>[]) {
+    return records.filter(({id}) => !this._excludedRecordIds.has(id));
+  }
+}
+
+export interface ACLRulesReaderOptions {
+  /**
+   * Adds virtual rules for all shares in the document.
+   *
+   * If set to `true` and there are shares in the document, regular rules are
+   * modified so that they don't apply when a document is being accessed through
+   * a share, and new rules are added to grant access to the resources specified by
+   * the shares.
+   *
+   * This will also "split" any resources (and their rules) if they apply to multiple
+   * resources. Splitting produces copies of the original resource and rules
+   * rules, but with modifications in place so that each copy applies to a single
+   * resource. Normalizing the original rules in this way allows for a simpler mechanism
+   * to override the original rules/resources with share rules, for situations where a
+   * share needs to grant access to a resource that is protected by access rules (shares
+   * and access rules are mutually exclusive at this time).
+   *
+   * Note: a value of `true` will *not* cause any persistent modifications to be made to
+   * rules; all changes are "virtual" in the sense that they are applied on top of the
+   * persisted rules to enable shares.
+   *
+   * Defaults to `false`.
+   */
+  addShareRules?: boolean;
+}
+
+/**
+ * Helper class for reading ACL rules from DocData.
+ */
+export class ACLRulesReader {
+  private _resourcesTable = new TableWithOverlay(this.docData.getMetaTable('_grist_ACLResources'));
+  private _rulesTable = new TableWithOverlay(this.docData.getMetaTable('_grist_ACLRules'));
+  private _sharesTable = this.docData.getMetaTable('_grist_Shares');
+  private _hasShares = this._options.addShareRules && this._sharesTable.numRecords() > 0;
+  /** Maps 'tableId:colId' to the comma-separated list of column IDs from the associated resource. */
+  private _resourceColIdsByTableAndColId: Map<string, string> = new Map();
+
+  public constructor(public docData: DocData, private _options: ACLRulesReaderOptions = {}) {
+    this._addOriginalRules();
+    this._maybeAddShareRules();
+  }
+
+  public entries() {
+    const rulesByResourceId = new Map<number, Array<MetaRowRecord<'_grist_ACLRules'>>>();
+    for (const rule of sortBy(this._rulesTable.getRecords(), 'rulePos')) {
+      // If we have "virtual" rules to implement shares, then regular
+      // rules need to be tweaked so that they don't apply when the
+      // share is active.
+      if (this._hasShares && rule.id >= 0) {
+        disableRuleInShare(rule);
+      }
+
+      getSetMapValue(rulesByResourceId, rule.resource, () => []).push(rule);
+    }
+    return rulesByResourceId.entries();
+  }
+
+  public getResourceById(id: number) {
+    return this._resourcesTable.getRecord(id);
+  }
+
+  private _addOriginalRules() {
+    for (const rule of sortBy(this._rulesTable.getRecords(), 'rulePos')) {
+      const resource = this.getResourceById(rule.resource);
+      if (!resource) {
+        throw new Error(`ACLRule ${rule.id} refers to an invalid ACLResource ${rule.resource}`);
+      }
+
+      if (resource.tableId !== '*' && resource.colIds !== '*') {
+        const colIds = resource.colIds.split(',');
+        if (colIds.length === 1) { continue; }
+
+        for (const colId of colIds) {
+          this._resourceColIdsByTableAndColId.set(`${resource.tableId}:${colId}`, resource.colIds);
+        }
+      }
+    }
+  }
+
+  private _maybeAddShareRules() {
+    if (!this._hasShares) { return; }
+
+    for (const share of this._sharesTable.getRecords()) {
+      this._addRulesForShare(share);
+    }
+    this._addDefaultShareRules();
+  }
+
+  /**
+   * Add any rules needed for the specified share.
+   *
+   * The only kind of share we support for now is form endpoint
+   * sharing.
+   */
+  private _addRulesForShare(share: MetaRowRecord<'_grist_Shares'>) {
+    // TODO: Unpublished shares could and should be blocked earlier,
+    // by home server
+    const {publish}: ShareOptions = JSON.parse(share.options || '{}');
+    if (!publish) {
+      this._blockShare(share.id);
+      return;
+    }
+
+    // Let's go looking for sections related to the share.
+    // It was decided that the relationship between sections and
+    // shares is via pages. Every section on a given page can belong
+    // to at most one share.
+    // Ignore sections which do not have `publish` set to `true` in
+    // `shareOptions`.
+    const pages = this.docData.getMetaTable('_grist_Pages').filterRecords({
+      shareRef: share.id,
+    });
+    const parentViews = new Set(pages.map(page => page.viewRef));
+    const sections = this.docData.getMetaTable('_grist_Views_section').getRecords().filter(
+      section => {
+        if (!parentViews.has(section.parentId)) { return false; }
+        const options = JSON.parse(section.shareOptions || '{}');
+        return Boolean(options.publish) && Boolean(options.form);
+      }
+    );
+
+    const tableRefs = new Set(sections.map(section => section.tableRef));
+    const tables = this.docData.getMetaTable('_grist_Tables').getRecords().filter(
+      table => tableRefs.has(table.id)
+    );
+
+    // For tables associated with forms, allow creation of records,
+    // and reading of referenced columns.
+    // TODO: should probably be limiting to a set of columns associated
+    // with section - but for form widget that could potentially be very
+    // confusing since it may not be easy to see that certain columns
+    // haven't been made visible for it? For now, just working at table
+    // level.
+    for (const table of tables) {
+      this._shareTableForForm(table, share.id);
+    }
+  }
+
+  /**
+   * When accessing a document via a share, by default no user tables are
+   * accessible. Everything added to the share gives additional
+   * access, and never reduces access, making it easy to grant
+   * access to multiple parts of the document.
+   *
+   * We do leave access unchanged for metadata tables, since they are
+   * censored via an alternative mechanism.
+   */
+  private _addDefaultShareRules() {
+    // Block access to each table.
+    const tableIds = this.docData.getMetaTable('_grist_Tables').getRecords()
+      .map(table => table.tableId)
+      .filter(tableId => !tableId.startsWith('_grist_'))
+      .sort();
+    for (const tableId of tableIds) {
+      this._addShareRule(this._findOrAddResource({tableId, colIds: '*'}), '-CRUDS');
+    }
+
+    // Block schema access at the default level.
+    this._addShareRule(this._findOrAddResource({tableId: '*', colIds: '*'}), '-S');
+  }
+
+  /**
+   * Allow creating records in a table.
+   */
+  private _shareTableForForm(table: MetaRowRecord<'_grist_Tables'>,
+                             shareRef: number) {
+    const resource = this._findOrAddResource({
+      tableId: table.tableId,
+      colIds: '*',
+    });
+    let aclFormula = `user.ShareRef == ${shareRef}`;
+    let aclFormulaParsed = JSON.stringify([
+      'Eq',
+      [ 'Attr', [ "Name", "user" ], "ShareRef" ],
+      [ 'Const', shareRef ] ]);
+    this._rulesTable.addRecord(this._makeRule({
+      resource, aclFormula, aclFormulaParsed, permissionsText: '+C',
+    }));
+
+    // This is a hack to grant read schema access, needed for forms -
+    // Should not be needed once forms are actually available, but
+    // until them is very handy to allow using the web client to
+    // submit records.
+    aclFormula = `user.ShareRef == ${shareRef} and rec.id == 0`;
+    aclFormulaParsed = JSON.stringify(
+      [ 'And',
+        [ 'Eq',
+          [ 'Attr', [ "Name", "user" ], "ShareRef" ],
+          ['Const', shareRef] ],
+        [ 'Eq', [ 'Attr', ['Name', 'rec'], 'id'], ['Const', 0]]]);
+    this._rulesTable.addRecord(this._makeRule({
+      resource, aclFormula, aclFormulaParsed, permissionsText: '+R',
+    }));
+
+    this._shareTableReferencesForForm(table, shareRef);
+  }
+
+  /**
+   * Give read access to referenced columns.
+   */
+  private _shareTableReferencesForForm(table: MetaRowRecord<'_grist_Tables'>,
+                                       shareRef: number) {
+    const tables = this.docData.getMetaTable('_grist_Tables');
+    const columns = this.docData.getMetaTable('_grist_Tables_column');
+    const tableColumns = columns.filterRecords({
+      parentId: table.id,
+    }).filter(c => c.type.startsWith('Ref:') || c.type.startsWith('RefList:'));
+    for (const column of tableColumns) {
+      const visibleColRef = column.visibleCol;
+      // This could be blank in tests, not sure about real life.
+      if (!visibleColRef) { continue; }
+      const visibleCol = columns.getRecord(visibleColRef);
+      if (!visibleCol) { continue; }
+      const referencedTable = tables.getRecord(visibleCol.parentId);
+      if (!referencedTable) { continue; }
+
+      const tableId = referencedTable.tableId;
+      const colId = visibleCol.colId;
+      const resourceColIds = this._resourceColIdsByTableAndColId.get(`${tableId}:${colId}`) ?? colId;
+      const maybeResourceId = this._resourcesTable.findMatchingRowId({tableId, colIds: resourceColIds});
+      if (maybeResourceId !== 0) {
+        this._maybeSplitResourceForShares(maybeResourceId);
+      }
+      const resource = this._findOrAddResource({tableId, colIds: colId});
+      const aclFormula = `user.ShareRef == ${shareRef}`;
+      const aclFormulaParsed = JSON.stringify(
+        [ 'Eq',
+          [ 'Attr', [ "Name", "user" ], "ShareRef" ],
+          ['Const', shareRef] ]);
+      this._rulesTable.addRecord(this._makeRule({
+        resource, aclFormula, aclFormulaParsed, permissionsText: '+R',
+      }));
+    }
+  }
+
+  /**
+   * Splits a resource into multiple resources that are suitable for being
+   * overridden by shares. Rules are copied to each resource, with modifications
+   * that disable them in shares.
+   *
+   * Ignores resources for single columns, and resources created for shares
+   * (i.e. those with a negative ID); the former can already be overridden
+   * by shares without any additional work, and the latter are guaranteed to
+   * only be for single columns.
+   *
+   * The motivation for this method is to normalize document access rules so
+   * that rule sets apply to at most a single column. Document shares may
+   * automatically grant limited access to parts of a document, such as columns
+   * that are referenced from a form field. But for this to happen, extra rules
+   * first need to be added to the original or new resource, which requires looking
+   * up the resource by column ID to see if it exists. This lookup only works if
+   * the rule set of the resource is for a single column; otherwise, the lookup
+   * will fail and cause a new resource to be created, which consequently causes
+   * 2 resources to exist that both contain the same column. Since this is an
+   * unsupported scenario with ambiguous evaluation semantics, we pre-emptively call
+   * this method to avoid such scenarios altogether.
+   */
+  private _maybeSplitResourceForShares(resourceId: number) {
+    if (resourceId < 0) { return; }
+
+    const resource = this.getResourceById(resourceId);
+    if (!resource) {
+      throw new Error(`Unable to find ACLResource with ID ${resourceId}`);
+    }
+
+    const {tableId} = resource;
+    const colIds = resource.colIds.split(',');
+    if (colIds.length === 1) { return; }
+
+    const rules = sortBy(this._rulesTable.filterRecords({resource: resourceId}), 'rulePos')
+      .map(r => disableRuleInShare(r));
+    // Prepare a new resource for each column, with copies of the original resource's rules.
+    for (const colId of colIds) {
+      const newResourceId = this._resourcesTable.addRecord({id: 0, tableId, colIds: colId});
+      for (const rule of rules) {
+        this._rulesTable.addRecord({...rule, id: 0, resource: newResourceId});
+      }
+    }
+    // Exclude the original resource and rules.
+    this._resourcesTable.excludeRecord(resourceId);
+    for (const rule of rules) {
+      this._rulesTable.excludeRecord(rule.id);
+    }
+  }
+
+  /**
+   * Find a resource we need, and return its rowId. The resource is
+   * added if it is not already present.
+   */
+  private _findOrAddResource(properties: {
+    tableId: string,
+    colIds: string,
+  }): number {
+    const resource = this._resourcesTable.findMatchingRowId(properties);
+    if (resource !== 0) { return resource; }
+    return this._resourcesTable.addRecord({
+      id: 0,
+      ...properties,
+    });
+  }
+
+  private _addShareRule(resourceRef: number, permissionsText: string) {
+    const aclFormula = 'user.ShareRef is not None';
+    const aclFormulaParsed = JSON.stringify([
+      'NotEq',
+      ['Attr', ['Name', 'user'], 'ShareRef'],
+      ['Const', null],
+    ]);
+    this._rulesTable.addRecord(this._makeRule({
+      resource: resourceRef, aclFormula, aclFormulaParsed, permissionsText,
+    }));
+  }
+
+  private _blockShare(shareRef: number) {
+    const resource = this._findOrAddResource({
+      tableId: '*', colIds: '*',
+    });
+    const aclFormula = `user.ShareRef == ${shareRef}`;
+    const aclFormulaParsed = JSON.stringify(
+      [ 'Eq',
+        [ 'Attr', [ "Name", "user" ], "ShareRef" ],
+        ['Const', shareRef] ]);
+    this._rulesTable.addRecord(this._makeRule({
+      resource, aclFormula, aclFormulaParsed, permissionsText: '-CRUDS',
+    }));
+  }
+
+  private _makeRule(options: {
+    resource: number,
+    aclFormula: string,
+    aclFormulaParsed: string,
+    permissionsText: string,
+  }): MetaRowRecord<'_grist_ACLRules'> {
+    const {resource, aclFormula, aclFormulaParsed, permissionsText} = options;
+    return {
+      id: 0,
+      resource,
+      aclFormula,
+      aclFormulaParsed,
+      memo: '',
+      permissionsText,
+      userAttributes: '',
+      rulePos: 0,
+
+      // The following fields are unused and deprecated.
+      aclColumn: 0,
+      permissions: 0,
+      principals: '',
+    };
+  }
+}
+
+/**
+ * Updates the ACL formula of `rule` such that it's disabled if a document is being
+ * accessed via a share.
+ *
+ * Modifies `rule` in place.
+ */
+function disableRuleInShare(rule: MetaRowRecord<'_grist_ACLRules'>) {
+  const aclFormulaParsed = rule.aclFormula && JSON.parse(String(rule.aclFormulaParsed));
+  const newAclFormulaParsed = [
+    'And',
+    [ 'Eq', [ 'Attr', [ 'Name', 'user' ], 'ShareRef' ], ['Const', null] ],
+    aclFormulaParsed || [ 'Const', true ]
+  ];
+  rule.aclFormula = 'user.ShareRef is None and (' + String(rule.aclFormula || 'True') + ')';
+  rule.aclFormulaParsed = JSON.stringify(newAclFormulaParsed);
+  return rule;
+}
diff --git a/app/common/ACLShareRules.ts b/app/common/ACLShareRules.ts
deleted file mode 100644
index 24e3c2ea..00000000
--- a/app/common/ACLShareRules.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-import { DocData } from 'app/common/DocData';
-import { SchemaTypes } from 'app/common/schema';
-import { ShareOptions } from 'app/common/ShareOptions';
-import { MetaRowRecord, MetaTableData } from 'app/common/TableData';
-import { isEqual } from 'lodash';
-
-/**
- * For special shares, we need to refer to resources that may not
- * be listed in the _grist_ACLResources table, and have rules that
- * aren't backed by storage in _grist_ACLRules. So we implement
- * a small helper to add an overlay of extra resources and rules.
- * They are distinguishable from real, stored resources and rules
- * by having negative IDs.
- */
-export class TableWithOverlay<T extends keyof SchemaTypes> {
-  private _extraRecords = new Array<MetaRowRecord<T>>();
-  private _extraRecordsById = new Map<number, MetaRowRecord<T>>();
-  private _nextFreeVirtualId: number = -1;
-
-  public constructor(private _originalTable: MetaTableData<T>) {}
-
-  // Add a record to the table, but only as an overlay - no
-  // persistent changes are made. Uses negative row IDs.
-  // Returns the ID assigned to the record. The passed in
-  // record is expected to have an ID of zero.
-  public addRecord(rec: MetaRowRecord<T>): number {
-    if (rec.id !== 0) { throw new Error('Expected a zero ID'); }
-    const id = this._nextFreeVirtualId;
-    const recWithCorrectId: MetaRowRecord<T> = {...rec, id};
-    this._extraRecords.push({...rec, id});
-    this._extraRecordsById.set(id, recWithCorrectId);
-    this._nextFreeVirtualId--;
-    return id;
-  }
-
-  // Support the few MetaTableData methods we actually use
-  // in ACLRuleCollection and ACLShareRules.
-
-  public getRecord(resourceId: number) {
-    // Reroute negative IDs to our local stash of records.
-    if (resourceId < 0) {
-      return this._extraRecordsById.get(resourceId);
-    }
-    // Everything else, we just pass along.
-    return this._originalTable.getRecord(resourceId);
-  }
-
-  public getRecords() {
-    return [...this._originalTable.getRecords(), ...this._extraRecords];
-  }
-
-  public findMatchingRowId(properties: Partial<MetaRowRecord<T>>): number {
-    // Check stored records.
-    const rowId = this._originalTable.findMatchingRowId(properties);
-    if (rowId) { return rowId; }
-    // Check overlay.
-    return this._extraRecords.find((rec) =>
-        Object.keys(properties).every((p) => isEqual(
-          (rec as any)[p],
-          (properties as any)[p])))?.id || 0;
-  }
-}
-
-/**
- * Helper for managing special share rules.
- */
-export class ACLShareRules {
-
-  public constructor(
-    public docData: DocData,
-    public resourcesTable: TableWithOverlay<'_grist_ACLResources'>,
-    public rulesTable: TableWithOverlay<'_grist_ACLRules'>,
-  ) {}
-
-  /**
-   * Add any rules needed for the specified share.
-   *
-   * The only kind of share we support for now is form endpoint
-   * sharing.
-   */
-  public addRulesForShare(shareRef: number, shareOptions: ShareOptions) {
-    // TODO: Unpublished shares could and should be blocked earlier,
-    // by home server
-    if (!shareOptions.publish) {
-      this._blockShare(shareRef);
-      return;
-    }
-
-    // Let's go looking for sections related to the share.
-    // It was decided that the relationship between sections and
-    // shares is via pages. Every section on a given page can belong
-    // to at most one share.
-    // Ignore sections which do not have `publish` set to `true` in
-    // `shareOptions`.
-    const pages = this.docData.getMetaTable('_grist_Pages').filterRecords({
-      shareRef,
-    });
-    const parentViews = new Set(pages.map(page => page.viewRef));
-    const sections = this.docData.getMetaTable('_grist_Views_section').getRecords().filter(
-      section => {
-        if (!parentViews.has(section.parentId)) { return false; }
-        const options = JSON.parse(section.shareOptions || '{}');
-        return Boolean(options.publish) && Boolean(options.form);
-      }
-    );
-
-    const tableRefs = new Set(sections.map(section => section.tableRef));
-    const tables = this.docData.getMetaTable('_grist_Tables').getRecords().filter(
-      table => tableRefs.has(table.id)
-    );
-
-    // For tables associated with forms, allow creation of records,
-    // and reading of referenced columns.
-    // TODO: should probably be limiting to a set of columns associated
-    // with section - but for form widget that could potentially be very
-    // confusing since it may not be easy to see that certain columns
-    // haven't been made visible for it? For now, just working at table
-    // level.
-    for (const table of tables) {
-      this._shareTableForForm(table, shareRef);
-    }
-  }
-
-  /**
-   * When accessing a document via a share, by default no user tables are
-   * accessible. Everything added to the share gives additional
-   * access, and never reduces access, making it easy to grant
-   * access to multiple parts of the document.
-   *
-   * We do leave access unchanged for metadata tables, since they are
-   * censored via an alternative mechanism.
-   */
-  public addDefaultRulesForShares() {
-    const tableIds = this.docData.getMetaTable('_grist_Tables').getRecords()
-      .map(table => table.tableId)
-      .filter(tableId => !tableId.startsWith('_grist_'))
-      .sort();
-    for (const tableId of tableIds) {
-      const resource = this._findOrAddResource({
-        tableId, colIds: '*',
-      });
-      const aclFormula = `user.ShareRef is not None`;
-      const aclFormulaParsed = JSON.stringify([
-        'NotEq',
-        [ 'Attr', [ "Name", "user" ], "ShareRef" ],
-        ['Const', null] ]);
-      this.rulesTable.addRecord(this._makeRule({
-        resource, aclFormula, aclFormulaParsed, permissionsText: '-CRUDS',
-      }));
-    }
-  }
-
-  /**
-   * When accessing a document via a share, any regular granular access
-   * rules should not apply. This requires an extra conditional.
-   */
-  public transformNonShareRules(state: {
-    rule: MetaRowRecord<'_grist_ACLRules'>,
-    aclFormulaParsed: object,
-  }) {
-    state.rule.aclFormula = 'user.ShareRef is None and (' + String(state.rule.aclFormula || 'True') + ')';
-    state.aclFormulaParsed = [
-      'And',
-      [ 'Eq', [ 'Attr', [ 'Name', 'user' ], 'ShareRef' ], ['Const', null] ],
-      state.aclFormulaParsed || [ 'Const', true ]
-    ];
-    state.rule.aclFormulaParsed = JSON.stringify(state.aclFormulaParsed);
-    return state.aclFormulaParsed;
-  }
-
-  /**
-   * Allow creating records in a table.
-   */
-  private _shareTableForForm(table: MetaRowRecord<'_grist_Tables'>,
-                             shareRef: number) {
-    const resource = this._findOrAddResource({
-      tableId: table.tableId,
-      colIds: '*',
-    });
-    let aclFormula = `user.ShareRef == ${shareRef}`;
-    let aclFormulaParsed = JSON.stringify([
-      'Eq',
-      [ 'Attr', [ "Name", "user" ], "ShareRef" ],
-      [ 'Const', shareRef ] ]);
-    this.rulesTable.addRecord(this._makeRule({
-      resource, aclFormula, aclFormulaParsed, permissionsText: '+C',
-    }));
-
-    // This is a hack to grant read schema access, needed for forms -
-    // Should not be needed once forms are actually available, but
-    // until them is very handy to allow using the web client to
-    // submit records.
-    aclFormula = `user.ShareRef == ${shareRef} and rec.id == 0`;
-    aclFormulaParsed = JSON.stringify(
-      [ 'And',
-        [ 'Eq',
-          [ 'Attr', [ "Name", "user" ], "ShareRef" ],
-          ['Const', shareRef] ],
-        [ 'Eq', [ 'Attr', ['Name', 'rec'], 'id'], ['Const', 0]]]);
-    this.rulesTable.addRecord(this._makeRule({
-      resource, aclFormula, aclFormulaParsed, permissionsText: '+R',
-    }));
-
-    this._shareTableReferencesForForm(table, shareRef);
-  }
-
-  /**
-   * Give read access to referenced columns.
-   */
-  private _shareTableReferencesForForm(table: MetaRowRecord<'_grist_Tables'>,
-                                       shareRef: number) {
-    const tables = this.docData.getMetaTable('_grist_Tables');
-    const columns = this.docData.getMetaTable('_grist_Tables_column');
-    const tableColumns = columns.filterRecords({
-      parentId: table.id,
-    }).filter(c => c.type.startsWith('Ref:') || c.type.startsWith('RefList:'));
-    for (const column of tableColumns) {
-      const visibleColRef = column.visibleCol;
-      // This could be blank in tests, not sure about real life.
-      if (!visibleColRef) { continue; }
-      const visibleCol = columns.getRecord(visibleColRef);
-      if (!visibleCol) { continue; }
-      const referencedTable = tables.getRecord(visibleCol.parentId);
-      if (!referencedTable) { continue; }
-
-      const tableId = referencedTable.tableId;
-      const colId = visibleCol.colId;
-      const resource = this._findOrAddResource({
-        tableId: tableId,
-        colIds: colId,
-      });
-      const aclFormula = `user.ShareRef == ${shareRef}`;
-      const aclFormulaParsed = JSON.stringify(
-        [ 'Eq',
-          [ 'Attr', [ "Name", "user" ], "ShareRef" ],
-          ['Const', shareRef] ]);
-      this.rulesTable.addRecord(this._makeRule({
-        resource, aclFormula, aclFormulaParsed, permissionsText: '+R',
-      }));
-    }
-  }
-
-  /**
-   * Find a resource we need, and return its rowId. The resource is
-   * added if it is not already present.
-   */
-  private _findOrAddResource(properties: {
-                               tableId: string,
-                               colIds: string,
-                             }): number {
-    const resource = this.resourcesTable.findMatchingRowId(properties);
-    if (resource !== 0) { return resource; }
-    return this.resourcesTable.addRecord({
-      id: 0,
-      ...properties,
-    });
-  }
-
-  private _blockShare(shareRef: number) {
-    const resource = this._findOrAddResource({
-      tableId: '*', colIds: '*',
-    });
-    const aclFormula = `user.ShareRef == ${shareRef}`;
-    const aclFormulaParsed = JSON.stringify(
-      [ 'Eq',
-        [ 'Attr', [ "Name", "user" ], "ShareRef" ],
-        ['Const', shareRef] ]);
-    this.rulesTable.addRecord(this._makeRule({
-      resource, aclFormula, aclFormulaParsed, permissionsText: '-CRUDS',
-    }));
-  }
-
-  private _makeRule(options: {
-    resource: number,
-    aclFormula: string,
-    aclFormulaParsed: string,
-    permissionsText: string,
-  }): MetaRowRecord<'_grist_ACLRules'> {
-    const {resource, aclFormula, aclFormulaParsed, permissionsText} = options;
-    return {
-      id: 0,
-      resource,
-      aclFormula,
-      aclFormulaParsed,
-      memo: '',
-      permissionsText,
-      userAttributes: '',
-      rulePos: 0,
-
-      // The following fields are unused and deprecated.
-      aclColumn: 0,
-      permissions: 0,
-      principals: '',
-    };
-  }
-}
diff --git a/test/server/lib/ACLRulesReader.ts b/test/server/lib/ACLRulesReader.ts
new file mode 100644
index 00000000..7d91a359
--- /dev/null
+++ b/test/server/lib/ACLRulesReader.ts
@@ -0,0 +1,443 @@
+import {ACLRulesReader} from 'app/common/ACLRulesReader';
+import {DocData} from 'app/common/DocData';
+import {MetaRowRecord} from 'app/common/TableData';
+import {CellValue} from 'app/plugin/GristData';
+import {ActiveDoc} from 'app/server/lib/ActiveDoc';
+import {makeExceptionalDocSession} from 'app/server/lib/DocSession';
+import {assert} from 'chai';
+import * as sinon from 'sinon';
+import {createDocTools} from 'test/server/docTools';
+
+describe('ACLRulesReader', function() {
+  this.timeout(10000);
+
+  const docTools = createDocTools({persistAcrossCases: true});
+  const fakeSession = makeExceptionalDocSession('system');
+
+  let activeDoc: ActiveDoc;
+  let docData: DocData;
+
+  before(async function () {
+    activeDoc = await docTools.createDoc('ACLRulesReader');
+    docData = activeDoc.docData!;
+  });
+
+  describe('without shares', function() {
+    it('entries', async function() {
+      // Check output of reading the resources and rules of an empty document.
+      for (const options of [undefined, {addShareRules: true}]) {
+        assertResourcesAndRules(new ACLRulesReader(docData, options), [
+          DEFAULT_UNUSED_RESOURCE_AND_RULE,
+        ]);
+      }
+
+      // Add some table and default rules and re-check output.
+      await activeDoc.applyUserActions(fakeSession, [
+        ['AddTable', 'Private', [{id: 'A'}]],
+        ['AddTable', 'PartialPrivate', [{id: 'A'}]],
+        ['AddRecord', 'PartialPrivate', null, { A: 0 }],
+        ['AddRecord', 'PartialPrivate', null, { A: 1 }],
+        ['AddRecord', '_grist_ACLResources', -1, {tableId: 'Private', colIds: '*'}],
+        ['AddRecord', '_grist_ACLResources', -2, {tableId: '*', colIds: '*'}],
+        ['AddRecord', '_grist_ACLResources', -3, {tableId: 'PartialPrivate', colIds: '*'}],
+        ['AddRecord', '_grist_ACLRules', null, {
+          resource: -1,
+          aclFormula: 'user.Access == "owners"',
+          permissionsText: 'all',
+          memo: 'owner check',
+        }],
+        ['AddRecord', '_grist_ACLRules', null, {
+          resource: -1, aclFormula: '', permissionsText: 'none',
+        }],
+        ['AddRecord', '_grist_ACLRules', null, {
+          resource: -2, aclFormula: 'user.Access != "owners"', permissionsText: '-S',
+        }],
+        ['AddRecord', '_grist_ACLRules', null, {
+          resource: -3, aclFormula: 'user.Access != "owners" and rec.A > 0', permissionsText: 'none',
+        }],
+        ['AddTable', 'Public', [{id: 'A'}]],
+      ]);
+      for (const options of [undefined, {addShareRules: true}]) {
+        assertResourcesAndRules(new ACLRulesReader(docData, options), [
+          {
+            resource: {id: 2, tableId: 'Private', colIds: '*'},
+            rules: [
+              {
+                aclFormula: 'user.Access == "owners"',
+                permissionsText: 'all',
+              },
+              {
+                aclFormula: '',
+                permissionsText: 'none',
+              },
+            ],
+          },
+          {
+            resource: {id: 3, tableId: '*', colIds: '*'},
+            rules: [
+              {
+                aclFormula: 'user.Access != "owners"',
+                permissionsText: '-S',
+              },
+            ],
+          },
+          {
+            resource: {id: 4, tableId: 'PartialPrivate', colIds: '*'},
+            rules: [
+              {
+                aclFormula: 'user.Access != "owners" and rec.A > 0',
+                permissionsText: 'none',
+              },
+            ],
+          },
+          DEFAULT_UNUSED_RESOURCE_AND_RULE,
+        ]);
+      }
+    });
+
+    it('getResourceById', async function() {
+      for (const options of [undefined, {addShareRules: true}]) {
+        // Check output of valid resource ids.
+        assert.deepEqual(
+          new ACLRulesReader(docData, options).getResourceById(1),
+          {id: 1, tableId: '', colIds: ''}
+        );
+        assert.deepEqual(
+          new ACLRulesReader(docData, options).getResourceById(2),
+          {id: 2, tableId: 'Private', colIds: '*'}
+        );
+        assert.deepEqual(
+          new ACLRulesReader(docData, options).getResourceById(3),
+          {id: 3, tableId: '*', colIds: '*'}
+        );
+        assert.deepEqual(
+          new ACLRulesReader(docData, options).getResourceById(4),
+          {id: 4, tableId: 'PartialPrivate', colIds: '*'}
+        );
+
+        // Check output of non-existent resource ids.
+        assert.isUndefined(new ACLRulesReader(docData, options).getResourceById(5));
+        assert.isUndefined(new ACLRulesReader(docData, options).getResourceById(0));
+        assert.isUndefined(new ACLRulesReader(docData, options).getResourceById(-1));
+      }
+    });
+  });
+
+  describe('with shares', function() {
+    before(async function() {
+      sinon.stub(ActiveDoc.prototype as any, '_getHomeDbManagerOrFail').returns({
+        syncShares: () => Promise.resolve(),
+      });
+      activeDoc = await docTools.loadFixtureDoc('FilmsWithImages.grist');
+      docData = activeDoc.docData!;
+      await activeDoc.applyUserActions(fakeSession, [
+        ['AddRecord', '_grist_Shares', null, {
+          linkId: 'x',
+          options: '{"publish": true}'
+        }],
+      ]);
+    });
+
+    after(function() {
+      sinon.restore();
+    });
+
+    it('entries', async function() {
+      // Check output of reading the resources and rules of an empty document.
+      assertResourcesAndRules(new ACLRulesReader(docData), [
+        DEFAULT_UNUSED_RESOURCE_AND_RULE,
+      ]);
+
+      // Check output of reading the resources and rules of an empty document, with share rules.
+      assertResourcesAndRules(new ACLRulesReader(docData, {addShareRules: true}), [
+        {
+          resource: {id: -1, tableId: 'Films', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-CRUDS',
+            },
+          ],
+        },
+        {
+          resource: {id: -2, tableId: 'Friends', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-CRUDS',
+            },
+          ],
+        },
+        {
+          resource: {id: -3, tableId: 'Performances', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-CRUDS',
+            },
+          ],
+        },
+        {
+          resource: {id: -4, tableId: '*', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-S',
+            },
+          ],
+        },
+        {
+          resource: {id: 1, tableId: '', colIds: ''},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is None and (True)',
+              permissionsText: '',
+            },
+          ],
+        },
+      ]);
+
+      // Add some default, table, and column rules.
+      await activeDoc.applyUserActions(fakeSession, [
+        ['UpdateRecord', '_grist_Views_section', 7,
+         {shareOptions: '{"publish": true, "form": true}'}],
+        ['UpdateRecord', '_grist_Pages', 2, {shareRef: 1}],
+        ['AddRecord', '_grist_ACLResources', -1, {tableId: 'Films', colIds: 'Title,Poster,PosterDup'}],
+        ['AddRecord', '_grist_ACLResources', -2, {tableId: 'Films', colIds: '*'}],
+        ['AddRecord', '_grist_ACLResources', -3, {tableId: '*', colIds: '*'}],
+        ['AddRecord', '_grist_ACLRules', null, {
+          resource: -1, aclFormula: 'user.access != OWNER', permissionsText: '-R',
+        }],
+        ['AddRecord', '_grist_ACLRules', null, {
+          resource: -2, aclFormula: 'True', permissionsText: 'all',
+        }],
+        ['AddRecord', '_grist_ACLRules', null, {
+          resource: -3, aclFormula: 'True', permissionsText: 'all',
+        }],
+      ]);
+
+      // Re-check output without share rules.
+      assertResourcesAndRules(new ACLRulesReader(docData), [
+        {
+          resource: {id: 2, tableId: 'Films', colIds: 'Title,Poster,PosterDup'},
+          rules: [
+            {
+              aclFormula: 'user.access != OWNER',
+              permissionsText: '-R',
+            },
+          ],
+        },
+        {
+          resource: {id: 3, tableId: 'Films', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'True',
+              permissionsText: 'all',
+            },
+          ],
+        },
+        {
+          resource: {id: 4, tableId: '*', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'True',
+              permissionsText: 'all',
+            },
+          ],
+        },
+        DEFAULT_UNUSED_RESOURCE_AND_RULE,
+      ]);
+
+      // Re-check output with share rules.
+      assertResourcesAndRules(new ACLRulesReader(docData, {addShareRules: true}), [
+        {
+          resource: {id: -1, tableId: 'Friends', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef == 1',
+              permissionsText: '+C',
+            },
+            {
+              aclFormula: 'user.ShareRef == 1 and rec.id == 0',
+              permissionsText: '+R',
+            },
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-CRUDS',
+            },
+          ],
+        },
+        // Resource -2, -3, and -4, were split from resource 2.
+        {
+          resource: {id: -2, tableId: 'Films', colIds: 'Title'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef == 1',
+              permissionsText: '+R',
+            },
+            {
+              aclFormula: 'user.ShareRef is None and (user.access != OWNER)',
+              permissionsText: '-R',
+            },
+          ],
+        },
+        {
+          resource: {id: 3, tableId: 'Films', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-CRUDS',
+            },
+            {
+              aclFormula: 'user.ShareRef is None and (True)',
+              permissionsText: 'all',
+            },
+          ],
+        },
+        {
+          resource: {id: -5, tableId: 'Performances', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-CRUDS',
+            },
+          ],
+        },
+        {
+          resource: {id: 4, tableId: '*', colIds: '*'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is not None',
+              permissionsText: '-S',
+            },
+            {
+              aclFormula: 'user.ShareRef is None and (True)',
+              permissionsText: 'all',
+            },
+          ],
+        },
+        // Resource -3 and -4 were split from resource 2.
+        {
+          resource: {id: -3, tableId: 'Films', colIds: 'Poster'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is None and (user.access != OWNER)',
+              permissionsText: '-R',
+            },
+          ],
+        },
+        {
+          resource: {id: -4, tableId: 'Films', colIds: 'PosterDup'},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is None and (user.access != OWNER)',
+              permissionsText: '-R',
+            },
+          ],
+        },
+        {
+          resource: {id: 1, tableId: '', colIds: ''},
+          rules: [
+            {
+              aclFormula: 'user.ShareRef is None and (True)',
+              permissionsText: '',
+            },
+          ],
+        },
+      ]);
+    });
+
+    it('getResourceById', async function() {
+      // Check output of valid resource ids.
+      assert.deepEqual(
+        new ACLRulesReader(docData).getResourceById(1),
+        {id: 1, tableId: '', colIds: ''}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData).getResourceById(2),
+        {id: 2, tableId: 'Films', colIds: 'Title,Poster,PosterDup'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData).getResourceById(3),
+        {id: 3, tableId: 'Films', colIds: '*'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData).getResourceById(4),
+        {id: 4, tableId: '*', colIds: '*'}
+      );
+
+      // Check output of non-existent resource ids.
+      assert.isUndefined(new ACLRulesReader(docData).getResourceById(5));
+      assert.isUndefined(new ACLRulesReader(docData).getResourceById(0));
+      assert.isUndefined(new ACLRulesReader(docData).getResourceById(-1));
+
+      // Check output of valid resource ids (with share rules).
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(1),
+        {id: 1, tableId: '', colIds: ''}
+      );
+      assert.isUndefined(new ACLRulesReader(docData, {addShareRules: true}).getResourceById(2));
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(3),
+        {id: 3, tableId: 'Films', colIds: '*'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(4),
+        {id: 4, tableId: '*', colIds: '*'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(-1),
+        {id: -1, tableId: 'Friends', colIds: '*'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(-2),
+        {id: -2, tableId: 'Films', colIds: 'Title'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(-3),
+        {id: -3, tableId: 'Films', colIds: 'Poster'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(-4),
+        {id: -4, tableId: 'Films', colIds: 'PosterDup'}
+      );
+      assert.deepEqual(
+        new ACLRulesReader(docData, {addShareRules: true}).getResourceById(-5),
+        {id: -5, tableId: 'Performances', colIds: '*'}
+      );
+
+      // Check output of non-existent resource ids (with share rules).
+      assert.isUndefined(new ACLRulesReader(docData, {addShareRules: true}).getResourceById(5));
+      assert.isUndefined(new ACLRulesReader(docData, {addShareRules: true}).getResourceById(0));
+      assert.isUndefined(new ACLRulesReader(docData, {addShareRules: true}).getResourceById(-6));
+    });
+  });
+});
+
+interface ACLResourceAndRules {
+  resource: MetaRowRecord<'_grist_ACLResources'>|undefined;
+  rules: {aclFormula: CellValue, permissionsText: CellValue}[];
+}
+
+function assertResourcesAndRules(
+  aclRulesReader: ACLRulesReader,
+  expected: ACLResourceAndRules[]
+) {
+  const actual: ACLResourceAndRules[] = [...aclRulesReader.entries()].map(([resourceId, rules]) => {
+    return {
+      resource: aclRulesReader.getResourceById(resourceId),
+      rules: rules.map(({aclFormula, permissionsText}) => ({aclFormula, permissionsText})),
+    };
+  });
+  assert.deepEqual(actual, expected);
+}
+
+/**
+ * An unused resource and rule that's automatically included in every Grist document.
+ *
+ * See comment in `UserActions.InitNewDoc` (from `useractions.py`) for context.
+ */
+const DEFAULT_UNUSED_RESOURCE_AND_RULE: ACLResourceAndRules = {
+  resource: {id: 1, tableId: '', colIds: ''},
+  rules: [{aclFormula: '', permissionsText: ''}],
+};

From 6f3cd1ec2f98075a2d3b1431273c0947d627211f Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Thu, 11 Apr 2024 11:24:38 -0700
Subject: [PATCH 10/45] (core) Remove forms popup

Summary: The forms announcement popup should no longer be shown.

Test Plan: N/A

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D4229
---
 app/client/models/DocPageModel.ts  |  5 -----
 app/client/ui/GristTooltips.ts     | 27 ---------------------------
 app/common/Prefs.ts                |  4 +++-
 test/nbrowser/BehavioralPrompts.ts |  5 -----
 4 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/app/client/models/DocPageModel.ts b/app/client/models/DocPageModel.ts
index 8034bd57..2fb0a91f 100644
--- a/app/client/models/DocPageModel.ts
+++ b/app/client/models/DocPageModel.ts
@@ -221,11 +221,6 @@ export class DocPageModelImpl extends Disposable implements DocPageModel {
             // "Add New" menu should have the same width as the "Add New" button that opens it.
             stretchToSelector: `.${cssAddNewButton.className}`
           }),
-          activeDoc.behavioralPromptsManager.attachPopup('formsAreHere', {
-            popupOptions: {
-              placement: 'right',
-            },
-          }),
           testId('dp-add-new'),
           dom.cls('tour-add-new'),
         ),
diff --git a/app/client/ui/GristTooltips.ts b/app/client/ui/GristTooltips.ts
index 3421ffb0..8f26142d 100644
--- a/app/client/ui/GristTooltips.ts
+++ b/app/client/ui/GristTooltips.ts
@@ -1,7 +1,6 @@
 import * as commands from 'app/client/components/commands';
 import {makeT} from 'app/client/lib/localization';
 import {ShortcutKey, ShortcutKeyContent} from 'app/client/ui/ShortcutKey';
-import {basicButtonLink} from 'app/client/ui2018/buttons';
 import {icon} from 'app/client/ui2018/icons';
 import {cssLink} from 'app/client/ui2018/links';
 import {commonUrls, GristDeploymentType} from 'app/common/gristUrls';
@@ -29,17 +28,6 @@ const cssIcon = styled(icon, `
   width: 18px;
 `);
 
-const cssNewsPopupLearnMoreButton = styled(basicButtonLink, `
-  color: white;
-  border: 1px solid white;
-  padding: 3px;
-
-  &:hover, &:focus, &:visited {
-    color: white;
-    border-color: white;
-  }
-`);
-
 export type Tooltip =
   | 'dataSize'
   | 'setTriggerFormula'
@@ -321,19 +309,4 @@ data.")),
     ),
     deploymentTypes: ['saas', 'core', 'enterprise', 'electron'],
   },
-  formsAreHere: {
-    popupType: 'news',
-    audience: 'signed-in-users',
-    title: () => t('Forms are here!'),
-    content: (...args: DomElementArg[]) => cssTooltipContent(
-      dom('div', t('Build simple forms right in Grist and share in a click with our new widget. {{learnMoreButton}}', {
-        learnMoreButton: cssNewsPopupLearnMoreButton(t('Learn more'), {
-          href: commonUrls.forms,
-          target: '_blank',
-        }),
-      })),
-      ...args,
-    ),
-    deploymentTypes: ['saas', 'core', 'enterprise'],
-  },
 };
diff --git a/app/common/Prefs.ts b/app/common/Prefs.ts
index ab1f1da2..3c6c3786 100644
--- a/app/common/Prefs.ts
+++ b/app/common/Prefs.ts
@@ -88,7 +88,9 @@ export const BehavioralPrompt = StringUnion(
   'rickRow',
   'customURL',
   'calendarConfig',
-  'formsAreHere',
+
+  // The following were used in the past and should not be re-used.
+  // 'formsAreHere',
 );
 export type BehavioralPrompt = typeof BehavioralPrompt.type;
 
diff --git a/test/nbrowser/BehavioralPrompts.ts b/test/nbrowser/BehavioralPrompts.ts
index d340a776..b8bda15a 100644
--- a/test/nbrowser/BehavioralPrompts.ts
+++ b/test/nbrowser/BehavioralPrompts.ts
@@ -39,11 +39,6 @@ describe('BehavioralPrompts', function() {
     });
   });
 
-  it('should show an announcement for forms', async function() {
-    await assertPromptTitle('Forms are here!');
-    await gu.dismissBehavioralPrompts();
-  });
-
   describe('when anonymous', function() {
     before(async () => {
       const anonymousSession = await gu.session().anon.login({

From 192e2f36ba77ec67069c58035d35205978b9215e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 10:56:04 -0400
Subject: [PATCH 11/45] automated update to translation keys (#936)

Co-authored-by: Paul's Grist Bot <paul+bot@getgrist.com>
---
 static/locales/en.client.json | 41 +++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/static/locales/en.client.json b/static/locales/en.client.json
index e3570a0d..d20814e8 100644
--- a/static/locales/en.client.json
+++ b/static/locales/en.client.json
@@ -941,7 +941,11 @@
     },
     "NTextBox": {
         "false": "false",
-        "true": "true"
+        "true": "true",
+        "Field Format": "Field Format",
+        "Lines": "Lines",
+        "Multi line": "Multi line",
+        "Single line": "Single line"
     },
     "ACLUsers": {
         "Example Users": "Example Users",
@@ -1044,7 +1048,12 @@
         "Currency": "Currency",
         "Decimals": "Decimals",
         "Default currency ({{defaultCurrency}})": "Default currency ({{defaultCurrency}})",
-        "Number Format": "Number Format"
+        "Number Format": "Number Format",
+        "Field Format": "Field Format",
+        "Spinner": "Spinner",
+        "Text": "Text",
+        "max": "max",
+        "min": "min"
     },
     "Reference": {
         "CELL FORMAT": "CELL FORMAT",
@@ -1393,7 +1402,18 @@
     },
     "FormConfig": {
         "Field rules": "Field rules",
-        "Required field": "Required field"
+        "Required field": "Required field",
+        "Ascending": "Ascending",
+        "Default": "Default",
+        "Descending": "Descending",
+        "Field Format": "Field Format",
+        "Field Rules": "Field Rules",
+        "Horizontal": "Horizontal",
+        "Options Alignment": "Options Alignment",
+        "Options Sort Order": "Options Sort Order",
+        "Radio": "Radio",
+        "Select": "Select",
+        "Vertical": "Vertical"
     },
     "CustomView": {
         "Some required columns aren't mapped": "Some required columns aren't mapped",
@@ -1417,7 +1437,8 @@
     },
     "FormSuccessPage": {
         "Form Submitted": "Form Submitted",
-        "Thank you! Your response has been recorded.": "Thank you! Your response has been recorded."
+        "Thank you! Your response has been recorded.": "Thank you! Your response has been recorded.",
+        "Submit new response": "Submit new response"
     },
     "DateRangeOptions": {
         "Last 30 days": "Last 30 days",
@@ -1466,5 +1487,17 @@
         "Support Grist Labs on GitHub": "Support Grist Labs on GitHub",
         "Telemetry": "Telemetry",
         "Version": "Version"
+    },
+    "Columns": {
+        "Remove Column": "Remove Column"
+    },
+    "Field": {
+        "No choices configured": "No choices configured",
+        "No values in show column of referenced table": "No values in show column of referenced table"
+    },
+    "Toggle": {
+        "Checkbox": "Checkbox",
+        "Field Format": "Field Format",
+        "Switch": "Switch"
     }
 }

From 5753d07980f4670ec4d25dc60bf84ff9ae76e0fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Guti=C3=A9rrez=20Hermoso?= <jordigh@octave.org>
Date: Mon, 15 Apr 2024 13:39:09 -0400
Subject: [PATCH 12/45] v1.1.13

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 371f14a8..417abef8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grist-core",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "license": "Apache-2.0",
   "description": "Grist is the evolution of spreadsheets",
   "homepage": "https://github.com/gristlabs/grist-core",

From d4a7660a21c0f3b994cd82274dc471ab1a73c949 Mon Sep 17 00:00:00 2001
From: Paul Fitzpatrick <paulfitz@alum.mit.edu>
Date: Mon, 15 Apr 2024 11:03:53 -0400
Subject: [PATCH 13/45] (core) update grist-saas after team site and redis
 changes

Summary:
Stop maintaining a copy of redis stubs. Bring back product stub
for grist-ee.

Test Plan: existing tests should pass

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4232
---
 test/fixtures/docs/Hello.grist | Bin 62464 -> 62464 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/fixtures/docs/Hello.grist b/test/fixtures/docs/Hello.grist
index 6db956dc00545afb18909d98527711755944bedd..d1a809824ebd48c269e195ddfdc50fce41f3bb09 100644
GIT binary patch
delta 111
zcmZp8!QAkId4jZ{Bm)D3EfB+i!bBZoM#+r{wc?Cgo9~HhOyKfjVBF2%#njE5JaM8G
zS5uw>ySTPCW2^Ay+pAO<MRXLD$`ebHGg4EW^K*hy(|j_EOC~3*7MuL;tpuay=AIR<
JOpDfd000W1AkhE-

delta 83
zcmZp8!QAkId4jZ{1Oo$uEfB+i+(aE?Mv09Hwc?DLo9~HhOyKHaVCZ4G$QZ+9GFgzN
gX7lcqu1s7_ItuLK+S-gQ{F_5os4#B+znakl04gvQq5uE@


From d8e222ef9ffd89e4462803458244f409a174bc01 Mon Sep 17 00:00:00 2001
From: Camille L <camille.legeron@beta.gouv.fr>
Date: Mon, 15 Apr 2024 08:09:21 +0000
Subject: [PATCH 14/45] Translated using Weblate (French)

Currently translated at 98.7% (1167 of 1182 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/fr/
---
 static/locales/fr.client.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/static/locales/fr.client.json b/static/locales/fr.client.json
index 1c37d97b..163ab625 100644
--- a/static/locales/fr.client.json
+++ b/static/locales/fr.client.json
@@ -1168,7 +1168,21 @@
     },
     "WebhookPage": {
         "Clear Queue": "Effacer la file d'attente",
-        "Webhook Settings": "Paramètres des points d’ancrage Web"
+        "Webhook Settings": "Paramètres des points d’ancrage Web",
+        "Cleared webhook queue.": "Effacement de la file d'attente du point d'ancrage Web.",
+        "Columns to check when update (separated by ;)": "Colonnes à vérifier lors de la mise à jour (séparées par des ;)",
+        "Event Types": "Types d'événements",
+        "Memo": "Mémo",
+        "Ready Column": "Colonne de déclenchement",
+        "Removed webhook.": "Suppression du webhook.",
+        "Filter for changes in these columns (semicolon-separated ids)": "Filtrer les changements dans ces colonnes (identifiants séparés par des points-virgules)",
+        "Status": "Statut",
+        "URL": "URL",
+        "Webhook Id": "Id du point d'ancrage Web",
+        "Table": "Table",
+        "Enabled": "Activé",
+        "Name": "Nom",
+        "Sorry, not all fields can be edited.": "Désolé, tous les champs ne peuvent pas être modifiés."
     },
     "FormulaAssistant": {
         "Grist's AI Formula Assistance. ": "Assistance des formules de l'IA de Grist ",

From a0b5ba90812f9170bfa8b3e732f3720f71fe29d5 Mon Sep 17 00:00:00 2001
From: Dmitry <dsagal+git@gmail.com>
Date: Thu, 18 Apr 2024 11:41:30 -0400
Subject: [PATCH 15/45] Move CONTRIBUTING.md to the repository's root to be
 more visible. (#940)

---
 .github/CONTRIBUTING.md => CONTRIBUTING.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/CONTRIBUTING.md => CONTRIBUTING.md (100%)

diff --git a/.github/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 100%
rename from .github/CONTRIBUTING.md
rename to CONTRIBUTING.md

From 33c34afd3a9fcc244527ed1c1e39e0aa7b8a3298 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 18 Apr 2024 07:36:17 +0000
Subject: [PATCH 16/45] Translated using Weblate (Spanish)

Currently translated at 100.0% (1223 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/es/
---
 static/locales/es.client.json | 83 ++++++++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 10 deletions(-)

diff --git a/static/locales/es.client.json b/static/locales/es.client.json
index 38da408c..3c074613 100644
--- a/static/locales/es.client.json
+++ b/static/locales/es.client.json
@@ -69,7 +69,7 @@
         "Sign Out": "Cerrar Sesión",
         "Sign in": "Iniciar Sesión",
         "Switch Accounts": "Cambiar de Cuenta",
-        "Toggle Mobile Mode": "Alternar Modo Móvil",
+        "Toggle Mobile Mode": "Alternar con el modo móvil",
         "Activation": "Activación",
         "Billing Account": "Cuenta de facturación",
         "Support Grist": "Soporte Grist",
@@ -429,7 +429,8 @@
         "Welcome to {{- orgName}}": "Bienvenido a {{- orgName}}",
         "Visit our {{link}} to learn more about Grist.": "Visita nuestra {{link}} para obtener más información sobre Grist.",
         "Sign in": "Iniciar sesión",
-        "To use Grist, please either sign up or sign in.": "Para utilizar Grist, regístrate o inicia sesión."
+        "To use Grist, please either sign up or sign in.": "Para utilizar Grist, regístrate o inicia sesión.",
+        "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Obtenga más información en nuestro {{helpCenterLink}}, o busque un experto a través de nuestro {{sproutsProgram}}."
     },
     "HomeLeftPane": {
         "Access Details": "Detalles de Acceso",
@@ -482,7 +483,11 @@
     },
     "NTextBox": {
         "false": "falso",
-        "true": "verdadero"
+        "true": "verdadero",
+        "Field Format": "Formato del campo",
+        "Lines": "Líneas",
+        "Multi line": "Línea múltiple",
+        "Single line": "Una sola línea"
     },
     "NotifyUI": {
         "Ask for help": "Solicitar ayuda",
@@ -965,7 +970,7 @@
         "Reference List": "Lista de referencia",
         "Attachment": "Adjunto",
         "Any": "Cualquiera",
-        "Toggle": "Cambiar",
+        "Toggle": "Alternar",
         "Search columns": "Búsqueda por columnas"
     },
     "modals": {
@@ -1079,7 +1084,7 @@
         "Flying higher": "Volando más alto",
         "Reference": "Referencia",
         "Start with {{equal}} to enter a formula.": "Comience con {{equal}} para introducir una fórmula.",
-        "Toggle the {{creatorPanel}} to format columns, ": "Active {{creatorPanel}} para dar formato a las columnas, ",
+        "Toggle the {{creatorPanel}} to format columns, ": "Alternar el {{creatorPanel}} para dar formato a las columnas, ",
         "Welcome to Grist!": "¡Bienvenido a Grist!",
         "template library": "biblioteca de plantillas",
         "creator panel": "panel creador",
@@ -1105,7 +1110,12 @@
         "Currency": "Moneda",
         "Default currency ({{defaultCurrency}})": "Moneda predeterminada ({{defaultCurrency}})",
         "Number Format": "Formato de número",
-        "Decimals": "Decimales"
+        "Decimals": "Decimales",
+        "Field Format": "Formato del campo",
+        "Spinner": "Spinner",
+        "Text": "Texto",
+        "min": "mín.",
+        "max": "Máx."
     },
     "ChoiceTextBox": {
         "CHOICES": "OPCIONES"
@@ -1223,7 +1233,21 @@
     },
     "WebhookPage": {
         "Clear Queue": "Borrar la cola",
-        "Webhook Settings": "Ajustes del gancho web"
+        "Webhook Settings": "Ajustes del gancho web",
+        "Cleared webhook queue.": "Cola de webhooks vacía.",
+        "Columns to check when update (separated by ;)": "Columnas a comprobar al actualizar (separadas por ;)",
+        "Removed webhook.": "Webhook eliminado.",
+        "Sorry, not all fields can be edited.": "Lo sentimos, no se pueden editar todos los campos.",
+        "Status": "Situación",
+        "URL": "URL",
+        "Webhook Id": "Id. del webhook",
+        "Ready Column": "Columna lista",
+        "Filter for changes in these columns (semicolon-separated ids)": "Filtrar los cambios en estas columnas (identificadores separados por punto y coma)",
+        "Table": "Tabla",
+        "Enabled": "Activado",
+        "Event Types": "Tipos de eventos",
+        "Memo": "Memorándum",
+        "Name": "Nombre"
     },
     "FormulaAssistant": {
         "Regenerate": "Regenerar",
@@ -1279,7 +1303,8 @@
         "Support Grist page": "Página de soporte de Grist",
         "Close": "Cerrar",
         "Contribute": "Contribuir",
-        "Admin Panel": "Panel de control"
+        "Admin Panel": "Panel de control",
+        "Thank you! Your trust and support is greatly appreciated. Opt out any time from the {{link}} in the user menu.": "¡Muchas gracias!. Su confianza y apoyo son muy apreciados. Puedes darte de baja en cualquier momento desde el {{link}} del menú de usuario."
     },
     "SupportGristPage": {
         "GitHub": "GitHub",
@@ -1431,7 +1456,18 @@
     },
     "FormConfig": {
         "Field rules": "Reglas del campo",
-        "Required field": "Campo obligatorio"
+        "Required field": "Campo obligatorio",
+        "Ascending": "Ascendente",
+        "Default": "Por defecto",
+        "Descending": "Descendente",
+        "Field Format": "Formato del campo",
+        "Field Rules": "Reglas del campo",
+        "Horizontal": "Horizontal",
+        "Options Alignment": "Alineación de las opciones",
+        "Options Sort Order": "Orden de clasificación de las opciones",
+        "Radio": "Radio",
+        "Select": "Seleccionar",
+        "Vertical": "Vertical"
     },
     "CustomView": {
         "Some required columns aren't mapped": "Algunas columnas obligatorias no están asignadas",
@@ -1455,7 +1491,8 @@
     },
     "FormSuccessPage": {
         "Form Submitted": "Formulario enviado",
-        "Thank you! Your response has been recorded.": "¡Muchas gracias! Su respuesta ha quedado registrada."
+        "Thank you! Your response has been recorded.": "¡Muchas gracias! Su respuesta ha quedado registrada.",
+        "Submit new response": "Enviar una nueva respuesta"
     },
     "DateRangeOptions": {
         "Last 30 days": "Últimos 30 días",
@@ -1490,5 +1527,31 @@
         "Current version of Grist": "Versión actual de Grist",
         "Admin Panel": "Panel de control",
         "Support Grist Labs on GitHub": "Apoya a Grist Labs en GitHub"
+    },
+    "CreateTeamModal": {
+        "Cancel": "Cancelar",
+        "Choose a name and url for your team site": "Elija un nombre y una url para la página web de su equipo",
+        "Create site": "Crear página web",
+        "Domain name is invalid": "El dominio no es válido",
+        "Domain name is required": "Nombre del dominio obligatorio",
+        "Go to your site": "Ir a su página web",
+        "Team name": "Nombre del equipo",
+        "Team name is required": "Nombre del equipo obligatorio",
+        "Team site created": "Creada una página web para el equipo",
+        "Team url": "URL del equipo",
+        "Work as a Team": "Trabajar en equipo",
+        "Billing is not supported in grist-core": "La facturación no es compatible con grist-core"
+    },
+    "Columns": {
+        "Remove Column": "Quitar columna"
+    },
+    "Field": {
+        "No choices configured": "Sin opciones configuradas",
+        "No values in show column of referenced table": "No hay valores en la columna Mostrar de la tabla referenciada"
+    },
+    "Toggle": {
+        "Checkbox": "Casilla de verificación",
+        "Field Format": "Formato del campo",
+        "Switch": "Cambiar"
     }
 }

From 8087a46866831e372dcd7be4e8d35242cda507f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=92?=
 <vakukh@gmail.com>
Date: Thu, 18 Apr 2024 19:29:48 +0000
Subject: [PATCH 17/45] Translated using Weblate (Russian)

Currently translated at 96.4% (1180 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/ru/
---
 static/locales/ru.client.json | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/static/locales/ru.client.json b/static/locales/ru.client.json
index d46da98e..777ae14d 100644
--- a/static/locales/ru.client.json
+++ b/static/locales/ru.client.json
@@ -507,7 +507,8 @@
         "Welcome to {{- orgName}}": "Добро пожаловать в {{- orgName}}",
         "Visit our {{link}} to learn more about Grist.": "Посетите наш {{link}} чтобы узнать больше о Grist.",
         "Sign in": "Вход",
-        "To use Grist, please either sign up or sign in.": "Для использования Grist, зарегистрируйтесь или войдите в систему."
+        "To use Grist, please either sign up or sign in.": "Для использования Grist, зарегистрируйтесь или войдите в систему.",
+        "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Узнайте больше в {{helpCenterLink}}, или найдите специалиста с {{sproutsProgram}}."
     },
     "HomeLeftPane": {
         "Import Document": "Импорт документа",
@@ -900,7 +901,12 @@
         "Number Format": "Числовой формат",
         "Currency": "Валюта",
         "Default currency ({{defaultCurrency}})": "Валюта по умолчанию ({{defaultCurrency}})",
-        "Decimals": "Десятичные"
+        "Decimals": "Десятичные",
+        "Text": "Текст",
+        "max": "максимум",
+        "min": "минимум",
+        "Spinner": "Спиннер",
+        "Field Format": "Формат поля"
     },
     "WelcomeTour": {
         "convert to card view, select data, and more.": "преобразовать в представление карточки, выбрать данные, и более.",
@@ -1017,7 +1023,11 @@
     },
     "NTextBox": {
         "false": "ложь",
-        "true": "истина"
+        "true": "истина",
+        "Field Format": "Формат поля",
+        "Lines": "Линейность",
+        "Multi line": "Многострочный",
+        "Single line": "Однострочный"
     },
     "pages": {
         "Duplicate Page": "Дублировать страницу",
@@ -1169,7 +1179,14 @@
     },
     "WebhookPage": {
         "Clear Queue": "Очистить очередь",
-        "Webhook Settings": "Настройки вебхука"
+        "Webhook Settings": "Настройки вебхука",
+        "Cleared webhook queue.": "Очистка очереди вебхуков.",
+        "Enabled": "Активировано",
+        "Columns to check when update (separated by ;)": "Столбцы для проверки при обновлении (разделитель ;)",
+        "Event Types": "Типы событий",
+        "Ready Column": "Триггерный столбец",
+        "Memo": "Заметка",
+        "Name": "Название"
     },
     "FormulaAssistant": {
         "Ask the bot.": "Спроси у бота.",

From f2c5684ab1ff7b5287f38028ad50426fdfafce54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=92?=
 <vakukh@gmail.com>
Date: Fri, 19 Apr 2024 19:42:55 +0000
Subject: [PATCH 18/45] Translated using Weblate (Russian)

Currently translated at 99.5% (1218 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/ru/
---
 static/locales/ru.client.json | 54 ++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/static/locales/ru.client.json b/static/locales/ru.client.json
index 777ae14d..563eae00 100644
--- a/static/locales/ru.client.json
+++ b/static/locales/ru.client.json
@@ -1186,7 +1186,14 @@
         "Event Types": "Типы событий",
         "Ready Column": "Триггерный столбец",
         "Memo": "Заметка",
-        "Name": "Название"
+        "Name": "Название",
+        "Filter for changes in these columns (semicolon-separated ids)": "Фильтрация изменений в этих столбцах (идентификаторы, разделенные точкой с запятой)",
+        "Removed webhook.": "Удаленный вебхук.",
+        "Sorry, not all fields can be edited.": "К сожалению, не все поля можно редактировать.",
+        "Status": "Статус",
+        "URL": "URL",
+        "Webhook Id": "Вебхук Id",
+        "Table": "Таблица"
     },
     "FormulaAssistant": {
         "Ask the bot.": "Спроси у бота.",
@@ -1287,7 +1294,8 @@
         "Support Grist page": "Страница поддержки Grist",
         "Contribute": "Участвовать",
         "Opted In": "Подключено",
-        "Admin Panel": "Панель администратора"
+        "Admin Panel": "Панель администратора",
+        "Thank you! Your trust and support is greatly appreciated. Opt out any time from the {{link}} in the user menu.": "Спасибо! Ваше доверие и поддержка очень ценны. Откажитесь в любой момент с помощью {{link}} в меню пользователя."
     },
     "SupportGristPage": {
         "GitHub": "GitHub",
@@ -1394,7 +1402,18 @@
     },
     "FormConfig": {
         "Field rules": "Правила полей",
-        "Required field": "Обязательное поле"
+        "Required field": "Обязательное поле",
+        "Ascending": "Восходящий",
+        "Default": "По умолчанию",
+        "Descending": "Нисходящий",
+        "Field Format": "Формат поля",
+        "Field Rules": "Правила поля",
+        "Horizontal": "Горизонтальный",
+        "Options Alignment": "Выравнивание параметров",
+        "Options Sort Order": "Параметры Порядка Сортировки",
+        "Radio": "Радио",
+        "Select": "Выбрать",
+        "Vertical": "Вертикальный"
     },
     "CustomView": {
         "Some required columns aren't mapped": "Некоторые обязательные столбцы не сопоставлены",
@@ -1418,7 +1437,8 @@
     },
     "FormSuccessPage": {
         "Form Submitted": "Форма отправлена",
-        "Thank you! Your response has been recorded.": "Спасибо! Ваш ответ учтен."
+        "Thank you! Your response has been recorded.": "Спасибо! Ваш ответ учтен.",
+        "Submit new response": "Отправить новый ответ"
     },
     "DateRangeOptions": {
         "Today": "Сегодня",
@@ -1453,5 +1473,31 @@
         "Version": "Версия",
         "Admin Panel": "Панель администратора",
         "Telemetry": "Телеметрия"
+    },
+    "CreateTeamModal": {
+        "Billing is not supported in grist-core": "Выставление счетов в grist-core не поддерживается",
+        "Cancel": "Отменить",
+        "Choose a name and url for your team site": "Выберите название и URL-адрес для сайта вашей команды",
+        "Create site": "Создать сайт",
+        "Domain name is invalid": "Доменное имя недействительно",
+        "Domain name is required": "Требуется доменное имя",
+        "Go to your site": "Перейдите на ваш сайт",
+        "Team name": "Название команды",
+        "Team name is required": "Требуется указать название команды",
+        "Team site created": "Создан сайт команды",
+        "Team url": "URL-адрес команды",
+        "Work as a Team": "Работайте в команде"
+    },
+    "Field": {
+        "No choices configured": "Опции отсутствуют",
+        "No values in show column of referenced table": "No values in show column of referenced table"
+    },
+    "Columns": {
+        "Remove Column": "Удалить столбец"
+    },
+    "Toggle": {
+        "Checkbox": "Флажок",
+        "Field Format": "Формат поля",
+        "Switch": "Тумблер"
     }
 }

From e0c3934ad434ed2acea6873d625bbfdbe70739ed Mon Sep 17 00:00:00 2001
From: Riccardo Polignieri <ric.pol@libero.it>
Date: Fri, 19 Apr 2024 16:48:02 +0000
Subject: [PATCH 19/45] Translated using Weblate (Italian)

Currently translated at 100.0% (1223 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/it/
---
 static/locales/it.client.json | 192 +++++++++++++++++++++++++++++++---
 1 file changed, 178 insertions(+), 14 deletions(-)

diff --git a/static/locales/it.client.json b/static/locales/it.client.json
index bc75e100..3af9cb55 100644
--- a/static/locales/it.client.json
+++ b/static/locales/it.client.json
@@ -24,7 +24,8 @@
         "Welcome to {{- orgName}}": "Benvenuto, {{- orgName}}",
         "Visit our {{link}} to learn more about Grist.": "Vai a {{link}} per saperne di più su Grist.",
         "Sign in": "Accedi",
-        "To use Grist, please either sign up or sign in.": "Per usare Grist, iscriviti o accedi."
+        "To use Grist, please either sign up or sign in.": "Per usare Grist, iscriviti o accedi.",
+        "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Approfondisci nel nostro {{helpCenterLink}}, o trova un esperto con il nostro {{sproutsProgram}}."
     },
     "HomeLeftPane": {
         "Manage Users": "Gestisci gli utenti",
@@ -68,7 +69,9 @@
         "You do not have write access to this site": "Non hai accesso in scrittura a questo sito",
         "Remove all data but keep the structure to use as a template": "Rimuovi tutti i dati, mantieni la struttura per usarla come template",
         "Remove document history (can significantly reduce file size)": "Rimuovi la storia del documento (può ridurre molto le dimensioni del file)",
-        "Download full document and history": "Scarica tutto il documento e la storia"
+        "Download full document and history": "Scarica tutto il documento e la storia",
+        "Download": "Scarica",
+        "Download document": "Scarica documento"
     },
     "Importer": {
         "Update existing records": "Aggiorna i record esistenti",
@@ -163,7 +166,9 @@
         "Enter redirect URL": "Inserisci URL di re-indirizzamento",
         "Configuration": "Configurazione",
         "Default field value": "Valore di default del campo",
-        "Field rules": "Regole per il campo"
+        "Field rules": "Regole per il campo",
+        "Select a field in the form widget to configure.": "Seleziona un campo nel widget del modulo per configurarlo.",
+        "No field selected": "Nessun campo selezionato"
     },
     "RowContextMenu": {
         "Copy anchor link": "Copia link",
@@ -173,7 +178,8 @@
         "Insert row": "Inserisci riga",
         "Insert row above": "Inserisci riga sopra",
         "Insert row below": "Inserisci riga sotto",
-        "View as card": "Vedi come scheda"
+        "View as card": "Vedi come scheda",
+        "Use as table headers": "Usa come intestazioni di tabella"
     },
     "SortFilterConfig": {
         "Save": "Salva",
@@ -360,7 +366,12 @@
         "Decimals": "Decimali",
         "Default currency ({{defaultCurrency}})": "Valuta di default ({{defaultCurrency}})",
         "Currency": "Valuta",
-        "Number Format": "Formato numerico"
+        "Number Format": "Formato numerico",
+        "Field Format": "Formato del campo",
+        "Text": "Testo",
+        "min": "min",
+        "Spinner": "Spinner",
+        "max": "max"
     },
     "HyperLinkEditor": {
         "[link label] url": "[testo link] URL"
@@ -507,7 +518,8 @@
         "Seed rules": "Regole pre-inserite",
         "When adding table rules, automatically add a rule to grant OWNER full access.": "Quando si mettono regole per la tabella, inserire sempre una che dà pieno accesso a OWNER.",
         "This default should be changed if editors' access is to be limited. ": "Questo valore di default può essere cambiato se si vuole limitare l'accesso agli editor. ",
-        "Allow editors to edit structure (e.g. modify and delete tables, columns, layouts), and to write formulas, which give access to all data regardless of read restrictions.": "Permette agli editor di modificare la struttura (es., modificare ed eliminare tabelle, colonne, viste) e scrivere formule, cosa che permette l'accesso ai dati indipendentemente dalle restrizioni in lettura."
+        "Allow editors to edit structure (e.g. modify and delete tables, columns, layouts), and to write formulas, which give access to all data regardless of read restrictions.": "Permette agli editor di modificare la struttura (es., modificare ed eliminare tabelle, colonne, viste) e scrivere formule, cosa che permette l'accesso ai dati indipendentemente dalle restrizioni in lettura.",
+        "Add Table-wide Rule": "Aggiungi regola per tutta la tabella"
     },
     "ACUserManager": {
         "Enter email address": "Inserisci indirizzo e-mail",
@@ -612,7 +624,8 @@
         "Snapshots": "Snapshot",
         "Snapshots are unavailable.": "Le snapshot non sono disponibili.",
         "Activity": "Attvità",
-        "Beta": "Beta"
+        "Beta": "Beta",
+        "Only owners have access to snapshots for documents with access rules.": "Solo i proprietari hanno accesso agli snapshot per i documenti con regole di accesso."
     },
     "DocMenu": {
         "(The organization needs a paid plan)": "(L'organizzazione deve avere un piano a pagamento)",
@@ -900,7 +913,12 @@
         "Unsaved": "Non salvato",
         "Work on a Copy": "Lavora su una copia",
         "Share": "Condividi",
-        "Download...": "Scarica..."
+        "Download...": "Scarica...",
+        "DOO Separated Values (.dsv)": "Valori separati da delimitatore (.dsv)",
+        "Microsoft Excel (.xlsx)": "Microsoft Excel (.xlsx)",
+        "Tab Separated Values (.tsv)": "Valori separati da tabulazione (.tsv)",
+        "Comma Separated Values (.csv)": "Valori separati da virgola (.csv)",
+        "Export as...": "Esporta come..."
     },
     "SiteSwitcher": {
         "Create new team site": "Crea un nuovo sito per il team",
@@ -1043,7 +1061,11 @@
     },
     "NTextBox": {
         "false": "falso",
-        "true": "vero"
+        "true": "vero",
+        "Field Format": "Formato del campo",
+        "Lines": "Righe",
+        "Multi line": "Multiriga",
+        "Single line": "Riga singola"
     },
     "ACLUsers": {
         "Example Users": "Utenti di esempio",
@@ -1119,7 +1141,11 @@
         "Can't find the right columns? Click 'Change Widget' to select the table with events data.": "Non trovi la colonna giusta? Fai clic su \"Cambia widget\" per selezionare la tabella con i dati degli eventi.",
         "Use reference columns to relate data in different tables.": "Usa colonne di riferimenti per collegare dati da altre tabelle.",
         "Formulas support many Excel functions, full Python syntax, and include a helpful AI Assistant.": "Le formule supportano molte funzioni di Excel, la sintassi completa di Python, e includono un utile assistente AI.",
-        "You can choose from widgets available to you in the dropdown, or embed your own by providing its full URL.": "Puoi scegliere tra i widget disponibili nella lista, o incorporare il tuo fornendo la sua URL completa."
+        "You can choose from widgets available to you in the dropdown, or embed your own by providing its full URL.": "Puoi scegliere tra i widget disponibili nella lista, o incorporare il tuo fornendo la sua URL completa.",
+        "These rules are applied after all column rules have been processed, if applicable.": "Queste regole sono applicate dopo che tutte le regole delle colonne sono state applicate, se possibile.",
+        "Build simple forms right in Grist and share in a click with our new widget. {{learnMoreButton}}": "Costruisci del semplici moduli e condividili rapidamente con il nostro nuovo widget. {{learnMoreButton}}",
+        "Forms are here!": "Sono arrivati i moduli!",
+        "Learn more": "Approfondisci"
     },
     "DescriptionConfig": {
         "DESCRIPTION": "DESCRIZIONE"
@@ -1149,7 +1175,21 @@
     },
     "WebhookPage": {
         "Clear Queue": "Pulisci la coda",
-        "Webhook Settings": "Impostazioni web hook"
+        "Webhook Settings": "Impostazioni web hook",
+        "Ready Column": "Colonna Ready",
+        "Removed webhook.": "Webhook rimosso.",
+        "Cleared webhook queue.": "Svuotata la coda dei webhook.",
+        "Enabled": "Abilitato",
+        "Columns to check when update (separated by ;)": "Colonne da controllare quando si aggiorna (separate da ;)",
+        "Event Types": "Tipi di evento",
+        "Memo": "Memo",
+        "Name": "Nome",
+        "Webhook Id": "Id Webhook",
+        "Table": "Tabella",
+        "Sorry, not all fields can be edited.": "Spiacente, non tutti i campi possono essere modificati.",
+        "Status": "Status",
+        "URL": "URL",
+        "Filter for changes in these columns (semicolon-separated ids)": "FIltrare i cambiamenti in queste colonne (id separati da ;)"
     },
     "Clipboard": {
         "Unavailable Command": "Comando non disponibile",
@@ -1208,7 +1248,9 @@
         "Help Center": "Centro Aiuto",
         "Opt in to Telemetry": "Accetta la telemetria",
         "Opted In": "Accettato",
-        "Support Grist": "Sostieni Grist"
+        "Support Grist": "Sostieni Grist",
+        "Thank you! Your trust and support is greatly appreciated. Opt out any time from the {{link}} in the user menu.": "Grazie! Apprezziamo molto la tua fiducia e il tuo supporto. Puoi disdire in qualsiasi momento con {{link}} nel menu utente.",
+        "Admin Panel": "Pannello di amministrazione"
     },
     "SupportGristPage": {
         "GitHub": "GitHub",
@@ -1226,7 +1268,8 @@
         "You have opted out of telemetry.": "Hai disattivato la telemetria.",
         "GitHub Sponsors page": "Pagina Sponsor GitHub",
         "Opt in to Telemetry": "Accetta la telemetria",
-        "We only collect usage statistics, as detailed in our {{link}}, never document contents.": "Raccogliamo solo statistiche di utilizzo, mai contenuti dei documenti, come spiegato in {{link}}."
+        "We only collect usage statistics, as detailed in our {{link}}, never document contents.": "Raccogliamo solo statistiche di utilizzo, mai contenuti dei documenti, come spiegato in {{link}}.",
+        "Sponsor": "Sponsor"
     },
     "buildViewSectionDom": {
         "No row selected in {{title}}": "Nessuna riga selezionata in {{title}}",
@@ -1323,7 +1366,21 @@
         "Unpublish": "Non pubblicare",
         "Publish": "Pubblica",
         "Publish your form?": "Pubblicare il modulo?",
-        "Unpublish your form?": "Ritirare la pubblicazione del modulo?"
+        "Unpublish your form?": "Ritirare la pubblicazione del modulo?",
+        "Anyone with the link below can see the empty form and submit a response.": "Tutti quelli che hanno il link sottostante possono vedere il modulo vuoto e inviare una risposta.",
+        "Preview": "Anteprima",
+        "Embed this form": "Incorpora questo modulo",
+        "Copy code": "Copia codice",
+        "Copy link": "Copia link",
+        "Reset form": "Resetta il modulo",
+        "Reset": "Reset",
+        "Save your document to publish this form.": "Salva il tuo documento per pubblicare questo modulo.",
+        "Share": "Condividi",
+        "Share this form": "Condividi questo modulo",
+        "Are you sure you want to reset your form?": "Sei sicuro di voler resettare il tuo modulo?",
+        "Code copied to clipboard": "Codice copiato negli Appunti",
+        "Link copied to clipboard": "Link copiato negli Appunti",
+        "View": "Vedi"
     },
     "UnmappedFieldsConfig": {
         "Clear": "Pulisci",
@@ -1335,5 +1392,112 @@
     },
     "Editor": {
         "Delete": "Elimina"
+    },
+    "FormContainer": {
+        "Build your own form": "Costruisci il tuo modulo",
+        "Powered by": "Fatto con"
+    },
+    "FormModel": {
+        "There was a problem loading the form.": "C'è stato un problema nel caricamento del modulo.",
+        "Oops! The form you're looking for doesn't exist.": "Ops! Il modulo che cerchi non esiste.",
+        "You don't have access to this form.": "Non hai accesso a questo modulo.",
+        "Oops! This form is no longer published.": "Ops! Questo modulo non è più pubblico."
+    },
+    "FormPage": {
+        "There was an error submitting your form. Please try again.": "C'è stato un errore nell'invio del modulo. Per favore prova di nuovo."
+    },
+    "AdminPanel": {
+        "Admin Panel": "Pannello di amministrazione",
+        "Current version of Grist": "Versione attuale di Grist",
+        "Home": "Inizio",
+        "Help us make Grist better": "Aiutaci a migliorare Grist",
+        "Support Grist": "Supporta Grist",
+        "Support Grist Labs on GitHub": "Supporta Grist Labs su GitHub",
+        "Sponsor": "Sponsor",
+        "Current": "Attuale",
+        "Telemetry": "Telemetria",
+        "Version": "Versione"
+    },
+    "WelcomeCoachingCall": {
+        "Maybe Later": "Forse più tardi",
+        "free coaching call": "chiamata di assistenza gratuita",
+        "On the call, we'll take the time to understand your needs and tailor the call to you. We can show you the Grist basics, or start working with your data right away to build the dashboards you need.": "Durante la chiamata, ci prendiamo del tempo per capire i tuoi bisogni e adattarci a quelli. Possiamo spiegarti i fondamenti di Grist, o iniziare a lavorare subito con i tuoi dati e creare le dashboard che ti servono.",
+        "Schedule Call": "Prenota una chiamata",
+        "Schedule your {{freeCoachingCall}} with a member of our team.": "Prenota la tua {{freeCoachingCall}} con un membro del nostro team."
+    },
+    "FormConfig": {
+        "Field rules": "Regole del campo",
+        "Ascending": "Ascendente",
+        "Field Format": "Formato campo",
+        "Default": "Default",
+        "Field Rules": "Regole campo",
+        "Descending": "Discendente",
+        "Horizontal": "Orizzontale",
+        "Options Sort Order": "Opzioni ordinamento",
+        "Select": "Seleziona",
+        "Options Alignment": "Opzioni allineamento",
+        "Radio": "Radio",
+        "Vertical": "Verticale",
+        "Required field": "Campo obbligatorio"
+    },
+    "CustomView": {
+        "Some required columns aren't mapped": "Alcune colonne necessarie non sono mappate",
+        "To use this widget, please map all non-optional columns from the creator panel on the right.": "Per usare questo widget, mappare tutte le colonne non opzionali dal pannello di creazione a destra."
+    },
+    "CreateTeamModal": {
+        "Domain name is required": "Il nome di dominio è obbligatorio",
+        "Go to your site": "Vai al tuo sito",
+        "Team name": "Nome del team",
+        "Team name is required": "Il nome del team è obbligatorio",
+        "Team site created": "Il sito del team è stato creato",
+        "Team url": "Url del team",
+        "Work as a Team": "Lavora come un team",
+        "Cancel": "Annulla",
+        "Choose a name and url for your team site": "Scegli un nome e una url per il sito del tuo team",
+        "Create site": "Crea un sito",
+        "Domain name is invalid": "Il nome di dominio non è valido",
+        "Billing is not supported in grist-core": "La fatturazione non è supportata in grist-core"
+    },
+    "Toggle": {
+        "Checkbox": "Checkbox",
+        "Switch": "Cambia",
+        "Field Format": "Formato campo"
+    },
+    "FormSuccessPage": {
+        "Thank you! Your response has been recorded.": "Grazie! La tua risposta è stata registrata.",
+        "Form Submitted": "Modulo inviato",
+        "Submit new response": "Invia una nuova risposta"
+    },
+    "DateRangeOptions": {
+        "Next 7 days": "Prossimi 7 giorni",
+        "This month": "Questo mese",
+        "This week": "Questa settimana",
+        "This year": "Quest'anno",
+        "Today": "Oggi",
+        "Last 30 days": "Ultimi 30 giorni",
+        "Last 7 days": "Ultimi 7 giorni",
+        "Last Week": "Ultima settimana"
+    },
+    "MappedFieldsConfig": {
+        "Clear": "Svuota",
+        "Unmap fields": "Rimuovi mappatura campi",
+        "Unmapped": "Mappatura rimossa",
+        "Map fields": "Mappa i campi",
+        "Mapped": "Mappato",
+        "Select All": "Seleziona tutto"
+    },
+    "Section": {
+        "Insert section above": "Inserisci una sezione sopra",
+        "Insert section below": "Inserisci una sezione sotto"
+    },
+    "Columns": {
+        "Remove Column": "Rimuovi colonna"
+    },
+    "Field": {
+        "No choices configured": "Nessuna scelta configurata",
+        "No values in show column of referenced table": "Nessun valore nella colonna da mostrare nella tabella collegata"
+    },
+    "FormErrorPage": {
+        "Error": "Errore"
     }
 }

From 45b7058156badca63c5b995d9b4980f0218f763f Mon Sep 17 00:00:00 2001
From: Ettore Atalan <atalanttore@googlemail.com>
Date: Sat, 20 Apr 2024 19:20:03 +0000
Subject: [PATCH 20/45] Translated using Weblate (German)

Currently translated at 98.3% (1203 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/de/
---
 static/locales/de.client.json | 58 +++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 6 deletions(-)

diff --git a/static/locales/de.client.json b/static/locales/de.client.json
index eb08d570..aac00997 100644
--- a/static/locales/de.client.json
+++ b/static/locales/de.client.json
@@ -513,7 +513,8 @@
         "Welcome to {{- orgName}}": "Willkommen bei {{-orgName}}",
         "Visit our {{link}} to learn more about Grist.": "Besuchen Sie unsere {{link}}, um mehr über Grist zu erfahren.",
         "Sign in": "Anmelden",
-        "To use Grist, please either sign up or sign in.": "Um Grist zu nutzen, melden Sie sich bitte an oder registrieren Sie sich."
+        "To use Grist, please either sign up or sign in.": "Um Grist zu nutzen, melden Sie sich bitte an oder registrieren Sie sich.",
+        "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Erfahren Sie mehr in unserem {{helpCenterLink}}, oder finden Sie einen Experten über unser {{sproutsProgram}}."
     },
     "HomeLeftPane": {
         "Access Details": "Zugangsdetails",
@@ -586,7 +587,11 @@
     },
     "NTextBox": {
         "false": "falsch",
-        "true": "wahr"
+        "true": "wahr",
+        "Lines": "Linien",
+        "Field Format": "Feldformat",
+        "Multi line": "Mehrere Linien",
+        "Single line": "Einzelne Linie"
     },
     "NotifyUI": {
         "Ask for help": "Bitte um Hilfe",
@@ -1134,7 +1139,11 @@
         "Currency": "Währung",
         "Decimals": "Dezimalstellen",
         "Default currency ({{defaultCurrency}})": "Standardwährung ({{defaultCurrency}})",
-        "Number Format": "Zahlenformat"
+        "Number Format": "Zahlenformat",
+        "min": "min.",
+        "Text": "Text",
+        "max": "max.",
+        "Field Format": "Feldformat"
     },
     "FieldEditor": {
         "It should be impossible to save a plain data value into a formula column": "Es sollte unmöglich sein, einen einfachen Datenwert in eine Formelspalte zu speichern",
@@ -1233,7 +1242,15 @@
     },
     "WebhookPage": {
         "Clear Queue": "Warteschlange löschen",
-        "Webhook Settings": "Webhaken Einstellungen"
+        "Webhook Settings": "Webhaken Einstellungen",
+        "Enabled": "Aktiviert",
+        "Event Types": "Ereignisarten",
+        "Memo": "Memo",
+        "Name": "Name",
+        "Sorry, not all fields can be edited.": "Leider können nicht alle Felder bearbeitet werden.",
+        "Status": "Status",
+        "URL": "URL",
+        "Table": "Tabelle"
     },
     "FormulaAssistant": {
         "Ask the bot.": "Fragen Sie den Bot.",
@@ -1454,7 +1471,17 @@
     },
     "FormConfig": {
         "Field rules": "Feldregeln",
-        "Required field": "Erforderliches Feld"
+        "Required field": "Erforderliches Feld",
+        "Options Sort Order": "Sortierreihenfolge der Optionen",
+        "Options Alignment": "Ausrichtung der Optionen",
+        "Select": "Auswählen",
+        "Vertical": "Vertikal",
+        "Ascending": "Aufsteigend",
+        "Default": "Standard",
+        "Descending": "Absteigend",
+        "Field Format": "Feldformat",
+        "Field Rules": "Feldregeln",
+        "Horizontal": "Horizontal"
     },
     "CustomView": {
         "Some required columns aren't mapped": "Einige erforderliche Spalten sind nicht zugeordnet",
@@ -1462,7 +1489,8 @@
     },
     "FormSuccessPage": {
         "Form Submitted": "Formular eingereicht",
-        "Thank you! Your response has been recorded.": "Danke! Ihre Antwort wurde aufgezeichnet."
+        "Thank you! Your response has been recorded.": "Danke! Ihre Antwort wurde aufgezeichnet.",
+        "Submit new response": "Neue Antwort absenden"
     },
     "FormPage": {
         "There was an error submitting your form. Please try again.": "Beim Absenden Ihres Formulars ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut."
@@ -1500,5 +1528,23 @@
     "Section": {
         "Insert section above": "Abschnitt oben einfügen",
         "Insert section below": "Abschnitt unten einfügen"
+    },
+    "CreateTeamModal": {
+        "Cancel": "Abbrechen",
+        "Create site": "Seite erstellen",
+        "Domain name is required": "Domainname ist erforderlich",
+        "Domain name is invalid": "Domainname ist ungültig",
+        "Work as a Team": "Als Team arbeiten"
+    },
+    "Columns": {
+        "Remove Column": "Spalte entfernen"
+    },
+    "Field": {
+        "No choices configured": "Keine Auswahlmöglichkeiten konfiguriert"
+    },
+    "Toggle": {
+        "Checkbox": "Kontrollkästchen",
+        "Field Format": "Feldformat",
+        "Switch": "Schalter"
     }
 }

From 65966e4cfd0da65343b5cbaaa42aceca4e6b39a2 Mon Sep 17 00:00:00 2001
From: Paul Fitzpatrick <paulfitz@alum.mit.edu>
Date: Fri, 19 Apr 2024 13:59:32 -0400
Subject: [PATCH 21/45] (core) use visibility information when sharing
 referenced columns with forms

Summary:
This tightens down the set of referenced columns made available to
forms for dropdowns. Previous access to columns was computed at the
level of shared tables. Now it is calculated at the level of shared
sections. That means that we can now refrain from following hidden
references, and make the referred data unavailable to forms, since
they should not need it.

Test Plan: extended test

Reviewers: jarek, dsagal

Reviewed By: jarek, dsagal

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D4234
---
 app/common/ACLRulesReader.ts             |  48 +++++++++++++++++------
 app/common/DocActions.ts                 |   9 ++++-
 app/common/UserAPI.ts                    |  18 ++++++++-
 test/fixtures/docs/FilmsWithImages.grist | Bin 92160 -> 93184 bytes
 4 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/app/common/ACLRulesReader.ts b/app/common/ACLRulesReader.ts
index ed4154ce..741a719e 100644
--- a/app/common/ACLRulesReader.ts
+++ b/app/common/ACLRulesReader.ts
@@ -109,6 +109,12 @@ export interface ACLRulesReaderOptions {
   addShareRules?: boolean;
 }
 
+interface ShareContext {
+  shareRef: number;
+  sections: MetaRowRecord<"_grist_Views_section">[];
+  columns: MetaRowRecord<"_grist_Tables_column">[];
+}
+
 /**
  * Helper class for reading ACL rules from DocData.
  */
@@ -204,6 +210,19 @@ export class ACLRulesReader {
       }
     );
 
+    const sectionIds = new Set(sections.map(section => section.id));
+    const fields = this.docData.getMetaTable('_grist_Views_section_field').getRecords().filter(
+      field => {
+        return sectionIds.has(field.parentId);
+      }
+    );
+    const columnIds = new Set(fields.map(field => field.colRef));
+    const columns = this.docData.getMetaTable('_grist_Tables_column').getRecords().filter(
+      column => {
+        return columnIds.has(column.id);
+      }
+    );
+
     const tableRefs = new Set(sections.map(section => section.tableRef));
     const tables = this.docData.getMetaTable('_grist_Tables').getRecords().filter(
       table => tableRefs.has(table.id)
@@ -211,13 +230,12 @@ export class ACLRulesReader {
 
     // For tables associated with forms, allow creation of records,
     // and reading of referenced columns.
-    // TODO: should probably be limiting to a set of columns associated
-    // with section - but for form widget that could potentially be very
-    // confusing since it may not be easy to see that certain columns
-    // haven't been made visible for it? For now, just working at table
-    // level.
+    // TODO: tighten access control on creation since it may be broader
+    // than users expect - hidden columns could be written.
     for (const table of tables) {
-      this._shareTableForForm(table, share.id);
+      this._shareTableForForm(table, {
+        shareRef: share.id, sections, columns,
+      });
     }
   }
 
@@ -248,10 +266,12 @@ export class ACLRulesReader {
    * Allow creating records in a table.
    */
   private _shareTableForForm(table: MetaRowRecord<'_grist_Tables'>,
-                             shareRef: number) {
+                             shareContext: ShareContext) {
+    const { shareRef } = shareContext;
     const resource = this._findOrAddResource({
       tableId: table.tableId,
-      colIds: '*',
+      colIds: '*',  // At creation, allow all columns to be
+                    // initialized.
     });
     let aclFormula = `user.ShareRef == ${shareRef}`;
     let aclFormulaParsed = JSON.stringify([
@@ -277,19 +297,21 @@ export class ACLRulesReader {
       resource, aclFormula, aclFormulaParsed, permissionsText: '+R',
     }));
 
-    this._shareTableReferencesForForm(table, shareRef);
+    this._shareTableReferencesForForm(table, shareContext);
   }
 
   /**
    * Give read access to referenced columns.
    */
   private _shareTableReferencesForForm(table: MetaRowRecord<'_grist_Tables'>,
-                                       shareRef: number) {
+                                       shareContext: ShareContext) {
+    const { shareRef } = shareContext;
+
     const tables = this.docData.getMetaTable('_grist_Tables');
     const columns = this.docData.getMetaTable('_grist_Tables_column');
-    const tableColumns = columns.filterRecords({
-      parentId: table.id,
-    }).filter(c => c.type.startsWith('Ref:') || c.type.startsWith('RefList:'));
+    const tableColumns = shareContext.columns.filter(c =>
+        c.parentId === table.id &&
+        (c.type.startsWith('Ref:') || c.type.startsWith('RefList:')));
     for (const column of tableColumns) {
       const visibleColRef = column.visibleCol;
       // This could be blank in tests, not sure about real life.
diff --git a/app/common/DocActions.ts b/app/common/DocActions.ts
index b89246e7..8770f67d 100644
--- a/app/common/DocActions.ts
+++ b/app/common/DocActions.ts
@@ -133,8 +133,15 @@ export interface TableRecordValues {
   records: TableRecordValue[];
 }
 
-export interface TableRecordValue {
+export interface TableRecordValuesWithoutIds {
+  records: TableRecordValueWithoutId[];
+}
+
+export interface TableRecordValue extends TableRecordValueWithoutId {
   id: number | string;
+}
+
+export interface TableRecordValueWithoutId {
   fields: {
     [colId: string]: CellValue
   };
diff --git a/app/common/UserAPI.ts b/app/common/UserAPI.ts
index 9b1cccdb..df4d0788 100644
--- a/app/common/UserAPI.ts
+++ b/app/common/UserAPI.ts
@@ -5,7 +5,8 @@ import {BaseAPI, IOptions} from 'app/common/BaseAPI';
 import {BillingAPI, BillingAPIImpl} from 'app/common/BillingAPI';
 import {BrowserSettings} from 'app/common/BrowserSettings';
 import {ICustomWidget} from 'app/common/CustomWidget';
-import {BulkColValues, TableColValues, TableRecordValue, TableRecordValues, UserAction} from 'app/common/DocActions';
+import {BulkColValues, TableColValues, TableRecordValue, TableRecordValues,
+        TableRecordValuesWithoutIds, UserAction} from 'app/common/DocActions';
 import {DocCreationInfo, OpenDocMode} from 'app/common/DocListAPI';
 import {OrgUsageSummary} from 'app/common/DocUsage';
 import {Product} from 'app/common/Features';
@@ -441,6 +442,10 @@ interface GetRowsParams {
   immediate?: boolean;
 }
 
+interface SqlResult extends TableRecordValuesWithoutIds {
+  statement: string;
+}
+
 /**
  * Collect endpoints related to the content of a single document that we've been thinking
  * of as the (restful) "Doc API".  A few endpoints that could be here are not, for historical
@@ -452,6 +457,7 @@ export interface DocAPI {
   // opening a document are irrelevant.
   getRows(tableId: string, options?: GetRowsParams): Promise<TableColValues>;
   getRecords(tableId: string, options?: GetRowsParams): Promise<TableRecordValue[]>;
+  sql(sql: string, args?: any[]): Promise<SqlResult>;
   updateRows(tableId: string, changes: TableColValues): Promise<number[]>;
   addRows(tableId: string, additions: BulkColValues): Promise<number[]>;
   removeRows(tableId: string, removals: number[]): Promise<number[]>;
@@ -925,6 +931,16 @@ export class DocAPIImpl extends BaseAPI implements DocAPI {
     return response.records;
   }
 
+  public async sql(sql: string, args?: any[]): Promise<SqlResult> {
+    return this.requestJson(`${this._url}/sql`, {
+      body: JSON.stringify({
+        sql,
+        ...(args ? { args } : {}),
+      }),
+      method: 'POST',
+    });
+  }
+
   public async updateRows(tableId: string, changes: TableColValues): Promise<number[]> {
     return this.requestJson(`${this._url}/tables/${tableId}/data`, {
       body: JSON.stringify(changes),
diff --git a/test/fixtures/docs/FilmsWithImages.grist b/test/fixtures/docs/FilmsWithImages.grist
index 3881b6cf3a87d56acc2ae6382e43f5fa217bc9d8..2fdb578616d165f9ffa17eb5716c7aa7034347fc 100644
GIT binary patch
delta 2829
zcmaJ@eNa`$72mVF&wF{i4;~1Y4<qkAczlQ=2&jZ8JOLGgfPf!Jfl}U8-;}Su_iXA%
zL_X{^)0z<%xh9jbjkRN~&Q!fMueDBV?LX9{!P?B!#%OBOw6)r)PCBX9WazmMj9Am|
zoqNunbAG#L_w4T3-E-Nr=c;LciYJy3(t`h^auX~3k$@cVmq$kCW<V^-?Ib1?&FpOh
zkk1~nkJ&wThy8{9kzHq3*>Bm~!j-q_^o`rJ+#gcgI}nxQMv{?=#FdOBMM08aIE}L*
zv00Er%Shx|NF;9b&)7YrWSwr|mjRyDubUJaz1px;FeK&rq;$g$>Eecx=3w`6wATqM
zW<Q}$a-H25F8=1}>vyR5{aB*#rzi>7!swq^@uzTy(7SMlM(Zy52ABt7mZW56!jM;Z
z-Kh{II^1WZ`A&DB<AwEFUllkZThDaGfX&K&gTp#S*hO}WozfkaBdkA$NhAei8CC}T
zYL72yvRgqSN|d4TcXbDi`6VLYkvW!{hzI0)HJ(aFMTUAcu(>zT-O<yj23d?TL0}J&
zk`3%3eU*055_kY_!U5=kWOARJBpXN;AqyNf5+x;RFO@=;$WQ;JCKbc`;RnS)sRP@t
zcSL4N$_Oc=BO@b)=HXgNQi_V;8>KkQII+z6H~sD+JCqm`-PWZB-Oi@UjZMyq%9Y-A
zHBHXibu~3;@~OejfWI%~@9p_7KxSsP*pZh57U4~d*MFLq3ui1`mN~gX=m#`GSn_&A
z9&ZF$yX}P>a2POc{t9>%Vlcpo+WRYDAJ`+>!E)HGeb4}<U^V3M(nc8PXO?m~(M<Od
z_8}W*C)iHb$g=2tdX=7~`*7jDLi;mfVhPAe9*D9UMV4i&l?K$#-hgjrP<<|Y1eY=s
z$EI-8%i^1BizQKVk}?xAjWAZxmurn707(T?b_cqmlCYHjJ1L%!c)HVAu1Fc~v`$6Y
zFMeLR0AeG-p({UyjQ<no>>+BC6t5Td+Obu#=&eYF*^!n<D`FtB6>){c?Sdqh4t+ve
zU64Sd;S=~X{0_$99GrmH;AQBCKHbHg&~Gg<<5)qq;upir)@NskG|EzpV$`%%wk~~a
zv@@G^$qbQNEsGyx?G|g%W2247S_@~0jL$AWQNn)bp<7$oboOvq7tKIXX30l!+PjVF
zN!7PZ&y3;WO(pOyq|)z@R5}KB1&LX4xnQVSl-4Ifl4!0!oA!D8v%WVNQUev+`lfcL
z$X~k*6eDzEc<phBkJQQ=zUnX=;T>)sY;{OVem)GVVxl1%5+in7<2?_qPRQS_R;XQS
zNcFj$72c-Grm8iSPn-vRvXRP0)|y4{5%vx{%672^=A^oVw*hYUf5F#9al6+*c%>YP
z&&Nu)<dJxsSl;e_Ccm}C$fMf~QiFeyl(S%#Od<e>C~bGy5Yd`vLKQZSbBN*gblW0S
zWpPv`p(;)!x24z%T3eR1W-!z#5!hSp$+kj-<<jZS;zV1UtFoxIWohd?KwYW<E4_;@
zu{8B=cQ%H41KZ1%Pbu=wY$Yv=vAvNoX0bxTuCep%HMWhdWrdjJoJ=%#9usn>=YVez
zQX?Td<Qo(tTarY9x)bJzAF6+aWN~Qo12O1J5XZJ`a$!$aSVQnO_#O+eCG=A|PWRJI
zG#PHeSr~#fxKndL-|gQ>h2k&JuYNf<#&VG`LN}3%WQYu50uR9k@$0b?^H6-Uq~zql
z-VTwuD-F^j1Nh>u9YTBYqH#95)$U%gdiN@DPg}S+zWZfx8j`-I|7SAW#2%u*EYKIf
zG)|#epZq4}akLh%u~!V2ry)ewlUL|*bh=l&R0{>7PD|9{>tMeaJy->qqFz(PrGs%o
z9@}i>bGdsJkmk9wl<rkxVr-%IZXI|q3;$}YHrg}rVv3}cl)#Wf`~!F4<%5zqH>%)0
zHPwezd^~#CW<;8?3Bo?YJ97eK{0k=D6Y17y;3NrxTRQ@(j~+Q>@mN^}j_?AZUx3%i
z1r*Y-<&%X~h`FO>uu!y*7HQX>2M-%)b8DBXU>+>MM4O;RSHri#rJbmTbeL}hMf<QC
z`kCsK#2l?aw2jJQgLd3Fuje&8&K7bbpqeV!`9=kBu5-&L(vhS5z)?P1rrQadV24>Z
zdyZM?HTna(9dmI971zukfg}z`cYrJ=qKhn?Tq5KW>!jD<2*&lCd0<_dq-1BqpsK}J
zf$OoC9WpLrpTDO^6_f7xtii<@lH&2e@WN2Xm%7yUEdhTp)LyQ3bp>bETZ}<+L#;Wg
zp+pl^Fvk?=eWA)HUayRcF|uuMZ^-RjQCC+}>8%wvE8^&s&Db-c?R~0&)Am<^$<z~4
zdqM)-v-`IN)j)%~`RS`}z~qsX%6u4b`Fnio*QQ6}4TU;7w{~OeVEbl&ms;h+>eIHo
z@`g&xC(f$cipq`7r|qA$%?LT`YCi{%^;zfH1Ig)<aE>mYvEati73lo?lMD)VeiB)c
z&QBp*tn(isTcYzHBU`HT^T>*IeqmCA5;6DQxAgtvK?cw1{4F#r)A?m&%XR(^+RJqQ
z9!g%F{{h(wo&V`-l<^AtyPLwIGj}JMsTAF=)NXQ!)0KbTVX#W)_m7#ODtwYcBbX}D
zT#Zh4gm-h;%i#GimjOFo6Xr31UDk&AY=hT@d7{DV!+egx*M{*9L*5YP=>~5M<H<$d
z6z22cVRUAVad_<b1j1LrcUkWLdLe0hN+JJ=hmlO9uqCi7gk8ZSH_o&xrI7o^MwpC-
IjYll}Kic8SJOBUy

delta 2357
zcmZ`)dr*|u6~E`6yZe3YgNHmm9(CDWSeKVX<Q+vo4I&UF6|jKQDZveF!y^NRnc9iL
z)wG>SI{_~V(LP6;5hc@({c1LuPU|GrRy$5hX#T)7m}(w19cCmmHX|V&dhQZ+`$z7~
zcg}sB^E>C>d+zTWowJP2SjIAZag4DJ`tG$E>WF&-(m<a!KJLnaI96DF%|b&vUQq^n
za2Y?tD>#Rr;sX8)Z{j@u75^?hV(+>61-^|;oH~hhYe}@YNwmh0aHo?<H%KI}A+aWw
z#A6N;F;)_qP!SM6CCPS~4lx5zY|dK@Zm(4<RY+p9xuRW<gEV>F$Wq{feZ+7SYk3ZJ
zl4*k4jFFoQA-UxG6Xc$o-^b+}8P&29M`N9|i1;?cJNQq0+e~m=#C9iISO(~IL&3nn
z{$a}+Zec#qn*&2n3=Z{o4Ri;F(FPV~#OQUwzW!k+CNU0v27X@7+$!4tH%#J&QCbS$
zZ<Gx=|1}p~@nAdLVbu)3A40?Ov$dI^%jU9VneY0kJ(qkJRI*2$@^jaXjk#)@fXfQ9
z8JGD9-o-b;$M8Bl3!Ur^n`Pf)MQZVWlY6r-#s-{D2AV&!TX*_(UFP~qvkSZ<!QtTJ
zeSvL*ecp$?Ex`kQ0q-+)T_b}-!2<!e+Dg0}@I4>9Cr0@uE8k@D)z=kde1$K$#F?Ac
zT?D>6{x=Sx>zo~A@CiF89VG*DJTD*YYGdYXULn|yCTZI0F_;ZG4lY+3EvH0<BSGVL
z8GeM9aT>pidoYK~gw(6%2HoK1-MU!N8yTEujjVfoyvi2piPenSS~%J+Gwajk&l@r!
zF>-Wqr55vAgB|R-N9&!DFh3|Jll72rf4QgrF36Q57EI%5Qfn$UJ^K4#rtSK~68{?2
zOf`egp_*S})%^G4<LhN+OB$rg%9it4Tbp)ob#H&9uC}$Q#l5Swsj0y2Z5|vx5E$D2
z^iy89T9yf|Rge-1wZHWYBt?2zZ6hghl&v*Ul`><YiUiFlDuSaK@@!i!7;<qmMgF^O
z(OlWf^+f(NX65mWU*j$K7LUh+SV|dw0k*9|XIh#j3JT=D?u=YcNKdP0*c4R7-x)R5
zXk5?9+843@RktVFS`|{XwR()0!8S#(L1DY2uoSk2$Cy>itO0_|BuKBk-tDT0GE)2M
zRJp7sM4j|VY`rFx`qWx_1Mb?9z`!=E&SdcMT3elku<|2VdEME4QCO-Qg|!*U&`^do
zDp6{+ee@h_vR4NQ(+#81n^7DU<?Y1v%t{ET;|+WhPv8i))7!qo<v)6S1!P;GB}0Pu
zUYd_~4SffTDjxtelgYY>i7e?keXKVm$Dd4*FZYJvYmuwn5Ih7K^4Gyz#5ym3dkNM?
zW=}ua;eiI`1cT!o7<dYMv5+tEH~I6tk*CwE{Vg0KLi~?>Ww2P0Uy0@epI5f^d$ccO
zn+^S)oQ}er8!U|XyvvaB4)!iYQ!@E6s50{N;b^|RI+_JuDx?=|p=Z)HHThi8>ZG|i
z`WVReP#JjSSm?A2^`@E4M}DVcJ1(0ZkppJgk1lighPm<r7fzfd7QDpp65hu5=%m7E
z*g>!~81C&F3hY;xWAnxI4R&|Qzx_Dd<>UjD+5}@0{0dC4H!v0BRbHy`E7CVr19|d^
zsnTPURgfjOOui)#ytos5@((YLSuvG$_V17vGQ9H8OB=y2&%LzEqOSFp{MOlG$R#5~
zPM<w~@+XdyuM2gt1*Z7p3c`9*Tqad$imRj^GQ|w34W@X9RFNs>NNqI5dn+20OuC%#
zLv!rIVT4js+@h5-Q!J1wH^m|uRGQ*0jUG0|7o;|w7cdtC#o_rF@N&q1%>gTDsi4T!
zlQ-Ou7&hWz0ih-=lHjxrwuWDI!5*+|A%kry(!uZ{H#~>1JuI?;(CfmYfDm9uSZq+b
zJ}gR<-We7ZN;ibXW~Cd$qDJYau-LBjqhV1G%l3_rIEmO}iPnh}Pf-P}a{kgP=Y#eY
zoSz6Ev&09S4_L#PO!vK?NNLjiJw69c^Wmjd(77GYF^(aIA)KW<A3>Ru{g8*uJu#4J
zICW>HuIu7H)$Q!>>Iu+ja<&r+SAU#vn_)3O4!4P_Zh)LE@k4y%Da4hYkh{xL<b~2P
zh@}~MtU{a;uL_3%JHu{11%IZ0gGVfj!<E^Zte^HnhkR;!3=e-ZOJ1DHgSH3^p7{lp
z_b<<6!`CC@>t~+DbdM(eQ(Gbh*70Q;HyOUd{{lBDjdzI3&XzwYBYAwH7;+*-_2I;r
zwcTYk9#o&*um1nQKVbX=I)Q847D|uNjH)U)vO~J*m(0uE;Gobhv$p(#7;hF~v5&3@
J_MUWz{{cwCHd6oq


From 6e451fa6e7acbd84a4de6f7bfc7efc2efd716056 Mon Sep 17 00:00:00 2001
From: Camille L <camille.legeron@beta.gouv.fr>
Date: Tue, 23 Apr 2024 10:01:37 +0000
Subject: [PATCH 22/45] Translated using Weblate (French)

Currently translated at 96.8% (1185 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/fr/
---
 static/locales/fr.client.json | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/static/locales/fr.client.json b/static/locales/fr.client.json
index 163ab625..828246d1 100644
--- a/static/locales/fr.client.json
+++ b/static/locales/fr.client.json
@@ -478,7 +478,8 @@
         "Welcome to {{- orgName}}": "Bienvenue sur {{- orgName}}",
         "Visit our {{link}} to learn more about Grist.": "Visitez notre {{link}} pour en savoir plus sur Grist.",
         "Sign in": "Connexion",
-        "To use Grist, please either sign up or sign in.": "Pour utiliser Grist, connectez-vous ou créez-vous un compte."
+        "To use Grist, please either sign up or sign in.": "Pour utiliser Grist, connectez-vous ou créez-vous un compte.",
+        "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Pour en savoir plus, consultez notre {{helpCenterLink}}, ou trouvez un expert via notre {{sproutsProgram}}."
     },
     "HomeLeftPane": {
         "All Documents": "Tous les documents",
@@ -694,7 +695,10 @@
         "Share": "Partager",
         "Download...": "Télécharger...",
         "Microsoft Excel (.xlsx)": "Microsoft Excel (.xlsx)",
-        "Export as...": "Exporter en tant que..."
+        "Export as...": "Exporter en tant que...",
+        "Comma Separated Values (.csv)": "Comma Separated Values (.csv)",
+        "DOO Separated Values (.dsv)": "DOO Separated Values (.dsv)",
+        "Tab Separated Values (.tsv)": "Tab Separated Values (.tsv)"
     },
     "SiteSwitcher": {
         "Switch Sites": "Changer d’espace",
@@ -931,7 +935,10 @@
     },
     "NTextBox": {
         "false": "faux",
-        "true": "vrai"
+        "true": "vrai",
+        "Single line": "Ligne unique",
+        "Multi line": "Multi-lignes",
+        "Lines": "Lignes"
     },
     "ViewAsDropdown": {
         "View As": "Voir en tant que",
@@ -1065,7 +1072,10 @@
         "Decimals": "Décimales",
         "Currency": "Devise",
         "Default currency ({{defaultCurrency}})": "Devise par défaut ({{defaultCurrency}})",
-        "Number Format": "Format de nombre"
+        "Number Format": "Format de nombre",
+        "min": "min",
+        "Text": "Texte",
+        "max": "max"
     },
     "LanguageMenu": {
         "Language": "Langue"
@@ -1230,7 +1240,8 @@
         "Opt in to Telemetry": "S'inscrire à l'envoi de données de télémétrie",
         "Opted In": "Accepté",
         "Support Grist page": "Soutenir Grist",
-        "Admin Panel": "Panneau d'administration"
+        "Admin Panel": "Panneau d'administration",
+        "Thank you! Your trust and support is greatly appreciated. Opt out any time from the {{link}} in the user menu.": "Nous vous remercions ! Votre confiance et votre soutien sont très appréciés. Vous pouvez vous désinscrire à tout moment en cliquant sur le {{link}} dans le menu utilisateur."
     },
     "GridView": {
         "Click to insert": "Cliquer pour insérer"
@@ -1387,7 +1398,14 @@
     },
     "FormConfig": {
         "Field rules": "Règles du champ",
-        "Required field": "Champ obligatoire"
+        "Required field": "Champ obligatoire",
+        "Ascending": "Croissant",
+        "Default": "Par défaut",
+        "Descending": "Décroissant",
+        "Field Format": "Format du champ",
+        "Field Rules": "Règles du champ",
+        "Horizontal": "Horizontale",
+        "Options Alignment": "Option d'alignement"
     },
     "Editor": {
         "Delete": "Supprimer"
@@ -1449,5 +1467,8 @@
         "Sponsor": "Parrainage",
         "Support Grist": "Soutenir Grist",
         "Version": "Version"
+    },
+    "Field": {
+        "No choices configured": "Aucun choix configuré"
     }
 }

From c2768b3e25b37a6212d49ba052a3cae2055cc779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=92?=
 <vakukh@gmail.com>
Date: Mon, 22 Apr 2024 18:22:14 +0000
Subject: [PATCH 23/45] Translated using Weblate (Russian)

Currently translated at 99.5% (1218 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/ru/
---
 static/locales/ru.client.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.client.json b/static/locales/ru.client.json
index 563eae00..9c508257 100644
--- a/static/locales/ru.client.json
+++ b/static/locales/ru.client.json
@@ -1274,7 +1274,7 @@
         "User inherits permissions from {{parent}}. To remove, set 'Inherit access' option to 'None'.": "Пользователь наследует разрешения от {{parent}}. Чтобы удалить, установите для параметра 'Наследовать доступ' значение 'None'.",
         "Allow anyone with the link to open.": "Разрешить открывать всем, у кого есть ссылка.",
         "Grist support": "Grist поддержка",
-        "Invite people to {{resourceType}}": "Пригласите людей в {{resourceType}}",
+        "Invite people to {{resourceType}}": "Пригласите людей к {{resourceType}}",
         "Create a team to share with more people": "Создайте команду, чтобы поделиться с большим количеством людей",
         "Link copied to clipboard": "Ссылка скопирована в буфер обмена",
         "No default access allows access to be         granted to individual documents or workspaces, rather than the full team site.": "Отсутствие доступа по умолчанию позволяет         предоставлять доступ к отдельным документам или рабочим областям, а не ко всему групповому сайту.",

From dc70cf59d305ee878fe8242c25b7ca3112dff475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Guti=C3=A9rrez=20Hermoso?= <jordigh@octave.org>
Date: Tue, 23 Apr 2024 11:42:12 -0400
Subject: [PATCH 24/45] docs: better explain GRIST_DATA_DIR

This little variable has unexpected complexity: it defaults to being
relative to the working directory, which usually is the same as the
app directory.

However, in practice we instruct people to explicitly set this to
`/persist/docs`, so we should mention this common use case.

Some day I would like to simplify some of the logic around this
variable.

closes: #931
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1509f475..774b1205 100644
--- a/README.md
+++ b/README.md
@@ -246,7 +246,6 @@ GRIST_ADAPT_DOMAIN  | set to "true" to support multiple base domains (careful, h
 GRIST_APP_ROOT      | directory containing Grist sandbox and assets (specifically the sandbox and static subdirectories).
 GRIST_BACKUP_DELAY_SECS | wait this long after a doc change before making a backup
 GRIST_BOOT_KEY | if set, offer diagnostics at /boot/GRIST_BOOT_KEY
-GRIST_DATA_DIR      | directory in which to store document caches.
 GRIST_DEFAULT_EMAIL | if set, login as this user if no other credentials presented
 GRIST_DEFAULT_PRODUCT  | if set, this controls enabled features and limits of new sites. See names of PRODUCTS in Product.ts.
 GRIST_DEFAULT_LOCALE  | Locale to use as fallback when Grist cannot honour the browser locale.
@@ -299,6 +298,7 @@ GRIST_SKIP_REDIS_CHECKSUM_MISMATCH | Experimental. If set, only warn if the chec
 GRIST_SNAPSHOT_TIME_CAP       | optional. Define the caps for tracking buckets. Usage: {"hour": 25, "day": 32, "isoWeek": 12, "month": 96, "year": 1000}
 GRIST_SNAPSHOT_KEEP           | optional. Number of recent snapshots to retain unconditionally for a document, regardless of when they were made
 GRIST_PROMCLIENT_PORT         | optional. If set, serve the Prometheus metrics on the specified port number. ⚠️ Be sure to use a port which is not publicly exposed ⚠️.
+| GRIST_DATA_DIR                     | Directory in which to store documents. Defaults to `docs/` relative to the Grist application directory. In Grist's default Docker image, its default value is /persist/docs so that it will be used as a mounted volume.                                                                                                                                      |
 
 #### AI Formula Assistant related variables (all optional):
 

From 5fad8a2baa7ae9be16111ba5440c174f55c09b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Guti=C3=A9rrez=20Hermoso?= <jordigh@octave.org>
Date: Tue, 23 Apr 2024 11:42:58 -0400
Subject: [PATCH 25/45] (docs) README.md: reformat envvars table

This is just a source-level reformatting to realign it.
---
 README.md | 130 +++++++++++++++++++++++++++---------------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/README.md b/README.md
index 774b1205..c950d741 100644
--- a/README.md
+++ b/README.md
@@ -233,72 +233,72 @@ For more on Grist Labs' history and principles, see our [About Us](https://www.g
 
 Grist can be configured in many ways. Here are the main environment variables it is sensitive to:
 
-Variable | Purpose
--------- | -------
-ALLOWED_WEBHOOK_DOMAINS | comma-separated list of permitted domains to use in webhooks (e.g. webhook.site,zapier.com). You can set this to `*` to allow all domains, but if doing so, we recommend using a carefully locked-down proxy (see `GRIST_HTTPS_PROXY`) if you do not entirely trust users. Otherwise services on your internal network may become vulnerable to manipulation.
-APP_DOC_URL | doc worker url, set when starting an individual doc worker (other servers will find doc worker urls via redis)
-APP_DOC_INTERNAL_URL | like `APP_DOC_URL` but used by the home server to reach the server using an internal domain name resolution (like in a docker environment). Defaults to `APP_DOC_URL`
-APP_HOME_URL | url prefix for home api (home and doc servers need this)
-APP_STATIC_URL | url prefix for static resources
-APP_STATIC_INCLUDE_CUSTOM_CSS | set to "true" to include custom.css (from APP_STATIC_URL) in static pages
-APP_UNTRUSTED_URL   | URL at which to serve/expect plugin content.
-GRIST_ADAPT_DOMAIN  | set to "true" to support multiple base domains (careful, host header should be trustworthy)
-GRIST_APP_ROOT      | directory containing Grist sandbox and assets (specifically the sandbox and static subdirectories).
-GRIST_BACKUP_DELAY_SECS | wait this long after a doc change before making a backup
-GRIST_BOOT_KEY | if set, offer diagnostics at /boot/GRIST_BOOT_KEY
-GRIST_DEFAULT_EMAIL | if set, login as this user if no other credentials presented
-GRIST_DEFAULT_PRODUCT  | if set, this controls enabled features and limits of new sites. See names of PRODUCTS in Product.ts.
-GRIST_DEFAULT_LOCALE  | Locale to use as fallback when Grist cannot honour the browser locale.
-GRIST_DOMAIN        | in hosted Grist, Grist is served from subdomains of this domain.  Defaults to "getgrist.com".
-GRIST_EXPERIMENTAL_PLUGINS | enables experimental plugins
-GRIST_ENABLE_REQUEST_FUNCTION | enables the REQUEST function. This function performs HTTP requests in a similar way to `requests.request`. This function presents a significant security risk, since it can let users call internal endpoints when Grist is available publicly. This function can also cause performance issues. Unset by default.
-GRIST_HIDE_UI_ELEMENTS | comma-separated list of UI features to disable. Allowed names of parts: `helpCenter,billing,templates,createSite,multiSite,multiAccounts,sendToDrive,tutorials,supportGrist`. If a part also exists in GRIST_UI_FEATURES, it will still be disabled.
-GRIST_HOST          | hostname to use when listening on a port.
-GRIST_HTTPS_PROXY   | if set, use this proxy for webhook payload delivery.
-GRIST_ID_PREFIX | for subdomains of form o-*, expect or produce o-${GRIST_ID_PREFIX}*.
-GRIST_IGNORE_SESSION | if set, Grist will not use a session for authentication.
-GRIST_INCLUDE_CUSTOM_SCRIPT_URL | if set, will load the referenced URL in a `<script>` tag on all app pages.
-GRIST_INST_DIR      | path to Grist instance configuration files, for Grist server.
-GRIST_LIST_PUBLIC_SITES | if set to true, sites shared with the public will be listed for anonymous users. Defaults to false.
-GRIST_MANAGED_WORKERS | if set, Grist can assume that if a url targeted at a doc worker returns a 404, that worker is gone
-GRIST_MAX_UPLOAD_ATTACHMENT_MB | max allowed size for attachments (0 or empty for unlimited).
-GRIST_MAX_UPLOAD_IMPORT_MB | max allowed size for imports (except .grist files) (0 or empty for unlimited).
-GRIST_OFFER_ALL_LANGUAGES | if set, all translated langauages are offered to the user (by default, only languages with a special 'good enough' key set are offered to user).
-GRIST_ORG_IN_PATH | if true, encode org in path rather than domain
-GRIST_PAGE_TITLE_SUFFIX | a string to append to the end of the `<title>` in HTML documents. Defaults to `" - Grist"`. Set to `_blank` for no suffix at all.
-~GRIST_PROXY_AUTH_HEADER~ | Deprecated, and interpreted as a synonym for GRIST_FORWARD_AUTH_HEADER.
-GRIST_ROUTER_URL | optional url for an api that allows servers to be (un)registered with a load balancer
-GRIST_SERVE_SAME_ORIGIN | set to "true" to access home server and doc workers on the same protocol-host-port as the top-level page, same as for custom domains (careful, host header should be trustworthy)
-GRIST_SERVERS | the types of server to setup. Comma separated values which may contain "home", "docs", static" and/or "app". Defaults to "home,docs,static".
-GRIST_SESSION_COOKIE | if set, overrides the name of Grist's cookie
-GRIST_SESSION_DOMAIN | if set, associates the cookie with the given domain - otherwise defaults to GRIST_DOMAIN
-GRIST_SESSION_SECRET | a key used to encode sessions
-GRIST_SKIP_BUNDLED_WIDGETS | if set, Grist will ignore any bundled widgets included via NPM packages.
-GRIST_ANON_PLAYGROUND    | When set to 'false' deny anonymous users access to the home page
-GRIST_FORCE_LOGIN    | Much like GRIST_ANON_PLAYGROUND but don't support anonymous access at all (features like sharing docs publicly requires authentication)
-GRIST_SINGLE_ORG | set to an org "domain" to pin client to that org
-GRIST_TEMPLATE_ORG | set to an org "domain" to show public docs from that org
-GRIST_HELP_CENTER | set the help center link ref
-FREE_COACHING_CALL_URL | set the link to the human help (example: email adress or meeting scheduling tool)
-GRIST_CONTACT_SUPPORT_URL | set the link to contact support on error pages (example: email adress or online form)
-GRIST_SUPPORT_ANON | if set to 'true', show UI for anonymous access (not shown by default)
-GRIST_SUPPORT_EMAIL | if set, give a user with the specified email support powers. The main extra power is the ability to share sites, workspaces, and docs with all users in a listed way.
-GRIST_TELEMETRY_LEVEL | the telemetry level. Can be set to: `off` (default), `limited`, or `full`.
-GRIST_THROTTLE_CPU | if set, CPU throttling is enabled
-GRIST_TRUST_PLUGINS | if set, plugins are expect to be served from the same host as the rest of the Grist app, rather than from a distinct host. Ordinarily, plugins are served from a distinct host so that the cookies used by the Grist app are not automatically available to them. Enable this only if you understand the security implications.
-GRIST_USER_ROOT     | an extra path to look for plugins in - Grist will scan for plugins in `$GRIST_USER_ROOT/plugins`.
-GRIST_UI_FEATURES | comma-separated list of UI features to enable. Allowed names of parts: `helpCenter,billing,templates,createSite,multiSite,multiAccounts,sendToDrive,tutorials,supportGrist`. If a part also exists in GRIST_HIDE_UI_ELEMENTS, it won't be enabled.
-GRIST_UNTRUSTED_PORT | if set, plugins will be served from the given port. This is an alternative to setting APP_UNTRUSTED_URL.
-GRIST_WIDGET_LIST_URL | a url pointing to a widget manifest, by default `https://github.com/gristlabs/grist-widget/releases/download/latest/manifest.json` is used
-COOKIE_MAX_AGE      | session cookie max age, defaults to 90 days; can be set to "none" to make it a session cookie
-HOME_PORT           | port number to listen on for REST API server; if set to "share", add API endpoints to regular grist port.
-PORT                | port number to listen on for Grist server
-REDIS_URL           | optional redis server for browser sessions and db query caching
-GRIST_SKIP_REDIS_CHECKSUM_MISMATCH | Experimental. If set, only warn if the checksum in Redis differs with the one in your S3 backend storage. You may turn it on if your backend storage implements the [read-after-write consistency](https://aws.amazon.com/fr/blogs/aws/amazon-s3-update-strong-read-after-write-consistency/). Defaults to false.
-GRIST_SNAPSHOT_TIME_CAP       | optional. Define the caps for tracking buckets. Usage: {"hour": 25, "day": 32, "isoWeek": 12, "month": 96, "year": 1000}
-GRIST_SNAPSHOT_KEEP           | optional. Number of recent snapshots to retain unconditionally for a document, regardless of when they were made
-GRIST_PROMCLIENT_PORT         | optional. If set, serve the Prometheus metrics on the specified port number. ⚠️ Be sure to use a port which is not publicly exposed ⚠️.
+| Variable                           | Purpose                                                                                                                                                                                                                                                                                                                                                       |
+|------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ALLOWED_WEBHOOK_DOMAINS            | comma-separated list of permitted domains to use in webhooks (e.g. webhook.site,zapier.com). You can set this to `*` to allow all domains, but if doing so, we recommend using a carefully locked-down proxy (see `GRIST_HTTPS_PROXY`) if you do not entirely trust users. Otherwise services on your internal network may become vulnerable to manipulation. |
+| APP_DOC_URL                        | doc worker url, set when starting an individual doc worker (other servers will find doc worker urls via redis)                                                                                                                                                                                                                                                |
+| APP_DOC_INTERNAL_URL               | like `APP_DOC_URL` but used by the home server to reach the server using an internal domain name resolution (like in a docker environment). Defaults to `APP_DOC_URL`                                                                                                                                                                                         |
+| APP_HOME_URL                       | url prefix for home api (home and doc servers need this)                                                                                                                                                                                                                                                                                                      |
+| APP_STATIC_URL                     | url prefix for static resources                                                                                                                                                                                                                                                                                                                               |
+| APP_STATIC_INCLUDE_CUSTOM_CSS      | set to "true" to include custom.css (from APP_STATIC_URL) in static pages                                                                                                                                                                                                                                                                                     |
+| APP_UNTRUSTED_URL                  | URL at which to serve/expect plugin content.                                                                                                                                                                                                                                                                                                                  |
+| GRIST_ADAPT_DOMAIN                 | set to "true" to support multiple base domains (careful, host header should be trustworthy)                                                                                                                                                                                                                                                                   |
+| GRIST_APP_ROOT                     | directory containing Grist sandbox and assets (specifically the sandbox and static subdirectories).                                                                                                                                                                                                                                                           |
+| GRIST_BACKUP_DELAY_SECS            | wait this long after a doc change before making a backup                                                                                                                                                                                                                                                                                                      |
+| GRIST_BOOT_KEY                     | if set, offer diagnostics at /boot/GRIST_BOOT_KEY                                                                                                                                                                                                                                                                                                             |
 | GRIST_DATA_DIR                     | Directory in which to store documents. Defaults to `docs/` relative to the Grist application directory. In Grist's default Docker image, its default value is /persist/docs so that it will be used as a mounted volume.                                                                                                                                      |
+| GRIST_DEFAULT_EMAIL                | if set, login as this user if no other credentials presented                                                                                                                                                                                                                                                                                                  |
+| GRIST_DEFAULT_PRODUCT              | if set, this controls enabled features and limits of new sites. See names of PRODUCTS in Product.ts.                                                                                                                                                                                                                                                          |
+| GRIST_DEFAULT_LOCALE               | Locale to use as fallback when Grist cannot honour the browser locale.                                                                                                                                                                                                                                                                                        |
+| GRIST_DOMAIN                       | in hosted Grist, Grist is served from subdomains of this domain.  Defaults to "getgrist.com".                                                                                                                                                                                                                                                                 |
+| GRIST_EXPERIMENTAL_PLUGINS         | enables experimental plugins                                                                                                                                                                                                                                                                                                                                  |
+| GRIST_ENABLE_REQUEST_FUNCTION      | enables the REQUEST function. This function performs HTTP requests in a similar way to `requests.request`. This function presents a significant security risk, since it can let users call internal endpoints when Grist is available publicly. This function can also cause performance issues. Unset by default.                                            |
+| GRIST_HIDE_UI_ELEMENTS             | comma-separated list of UI features to disable. Allowed names of parts: `helpCenter,billing,templates,createSite,multiSite,multiAccounts,sendToDrive,tutorials,supportGrist`. If a part also exists in GRIST_UI_FEATURES, it will still be disabled.                                                                                                          |
+| GRIST_HOST                         | hostname to use when listening on a port.                                                                                                                                                                                                                                                                                                                     |
+| GRIST_HTTPS_PROXY                  | if set, use this proxy for webhook payload delivery.                                                                                                                                                                                                                                                                                                          |
+| GRIST_ID_PREFIX                    | for subdomains of form o-*, expect or produce o-${GRIST_ID_PREFIX}*.                                                                                                                                                                                                                                                                                          |
+| GRIST_IGNORE_SESSION               | if set, Grist will not use a session for authentication.                                                                                                                                                                                                                                                                                                      |
+| GRIST_INCLUDE_CUSTOM_SCRIPT_URL    | if set, will load the referenced URL in a `<script>` tag on all app pages.                                                                                                                                                                                                                                                                                    |
+| GRIST_INST_DIR                     | path to Grist instance configuration files, for Grist server.                                                                                                                                                                                                                                                                                                 |
+| GRIST_LIST_PUBLIC_SITES            | if set to true, sites shared with the public will be listed for anonymous users. Defaults to false.                                                                                                                                                                                                                                                           |
+| GRIST_MANAGED_WORKERS              | if set, Grist can assume that if a url targeted at a doc worker returns a 404, that worker is gone                                                                                                                                                                                                                                                            |
+| GRIST_MAX_UPLOAD_ATTACHMENT_MB     | max allowed size for attachments (0 or empty for unlimited).                                                                                                                                                                                                                                                                                                  |
+| GRIST_MAX_UPLOAD_IMPORT_MB         | max allowed size for imports (except .grist files) (0 or empty for unlimited).                                                                                                                                                                                                                                                                                |
+| GRIST_OFFER_ALL_LANGUAGES          | if set, all translated langauages are offered to the user (by default, only languages with a special 'good enough' key set are offered to user).                                                                                                                                                                                                              |
+| GRIST_ORG_IN_PATH                  | if true, encode org in path rather than domain                                                                                                                                                                                                                                                                                                                |
+| GRIST_PAGE_TITLE_SUFFIX            | a string to append to the end of the `<title>` in HTML documents. Defaults to `" - Grist"`. Set to `_blank` for no suffix at all.                                                                                                                                                                                                                             |
+| ~GRIST_PROXY_AUTH_HEADER~          | Deprecated, and interpreted as a synonym for GRIST_FORWARD_AUTH_HEADER.                                                                                                                                                                                                                                                                                       |
+| GRIST_ROUTER_URL                   | optional url for an api that allows servers to be (un)registered with a load balancer                                                                                                                                                                                                                                                                         |
+| GRIST_SERVE_SAME_ORIGIN            | set to "true" to access home server and doc workers on the same protocol-host-port as the top-level page, same as for custom domains (careful, host header should be trustworthy)                                                                                                                                                                             |
+| GRIST_SERVERS                      | the types of server to setup. Comma separated values which may contain "home", "docs", static" and/or "app". Defaults to "home,docs,static".                                                                                                                                                                                                                  |
+| GRIST_SESSION_COOKIE               | if set, overrides the name of Grist's cookie                                                                                                                                                                                                                                                                                                                  |
+| GRIST_SESSION_DOMAIN               | if set, associates the cookie with the given domain - otherwise defaults to GRIST_DOMAIN                                                                                                                                                                                                                                                                      |
+| GRIST_SESSION_SECRET               | a key used to encode sessions                                                                                                                                                                                                                                                                                                                                 |
+| GRIST_SKIP_BUNDLED_WIDGETS         | if set, Grist will ignore any bundled widgets included via NPM packages.                                                                                                                                                                                                                                                                                      |
+| GRIST_ANON_PLAYGROUND              | When set to 'false' deny anonymous users access to the home page                                                                                                                                                                                                                                                                                              |
+| GRIST_FORCE_LOGIN                  | Much like GRIST_ANON_PLAYGROUND but don't support anonymous access at all (features like sharing docs publicly requires authentication)                                                                                                                                                                                                                       |
+| GRIST_SINGLE_ORG                   | set to an org "domain" to pin client to that org                                                                                                                                                                                                                                                                                                              |
+| GRIST_TEMPLATE_ORG                 | set to an org "domain" to show public docs from that org                                                                                                                                                                                                                                                                                                      |
+| GRIST_HELP_CENTER                  | set the help center link ref                                                                                                                                                                                                                                                                                                                                  |
+| FREE_COACHING_CALL_URL             | set the link to the human help (example: email adress or meeting scheduling tool)                                                                                                                                                                                                                                                                             |
+| GRIST_CONTACT_SUPPORT_URL          | set the link to contact support on error pages (example: email adress or online form)                                                                                                                                                                                                                                                                         |
+| GRIST_SUPPORT_ANON                 | if set to 'true', show UI for anonymous access (not shown by default)                                                                                                                                                                                                                                                                                         |
+| GRIST_SUPPORT_EMAIL                | if set, give a user with the specified email support powers. The main extra power is the ability to share sites, workspaces, and docs with all users in a listed way.                                                                                                                                                                                         |
+| GRIST_TELEMETRY_LEVEL              | the telemetry level. Can be set to: `off` (default), `limited`, or `full`.                                                                                                                                                                                                                                                                                    |
+| GRIST_THROTTLE_CPU                 | if set, CPU throttling is enabled                                                                                                                                                                                                                                                                                                                             |
+| GRIST_TRUST_PLUGINS                | if set, plugins are expect to be served from the same host as the rest of the Grist app, rather than from a distinct host. Ordinarily, plugins are served from a distinct host so that the cookies used by the Grist app are not automatically available to them. Enable this only if you understand the security implications.                               |
+| GRIST_USER_ROOT                    | an extra path to look for plugins in - Grist will scan for plugins in `$GRIST_USER_ROOT/plugins`.                                                                                                                                                                                                                                                             |
+| GRIST_UI_FEATURES                  | comma-separated list of UI features to enable. Allowed names of parts: `helpCenter,billing,templates,createSite,multiSite,multiAccounts,sendToDrive,tutorials,supportGrist`. If a part also exists in GRIST_HIDE_UI_ELEMENTS, it won't be enabled.                                                                                                            |
+| GRIST_UNTRUSTED_PORT               | if set, plugins will be served from the given port. This is an alternative to setting APP_UNTRUSTED_URL.                                                                                                                                                                                                                                                      |
+| GRIST_WIDGET_LIST_URL              | a url pointing to a widget manifest, by default `https://github.com/gristlabs/grist-widget/releases/download/latest/manifest.json` is used                                                                                                                                                                                                                    |
+| COOKIE_MAX_AGE                     | session cookie max age, defaults to 90 days; can be set to "none" to make it a session cookie                                                                                                                                                                                                                                                                 |
+| HOME_PORT                          | port number to listen on for REST API server; if set to "share", add API endpoints to regular grist port.                                                                                                                                                                                                                                                     |
+| PORT                               | port number to listen on for Grist server                                                                                                                                                                                                                                                                                                                     |
+| REDIS_URL                          | optional redis server for browser sessions and db query caching                                                                                                                                                                                                                                                                                               |
+| GRIST_SKIP_REDIS_CHECKSUM_MISMATCH | Experimental. If set, only warn if the checksum in Redis differs with the one in your S3 backend storage. You may turn it on if your backend storage implements the [read-after-write consistency](https://aws.amazon.com/fr/blogs/aws/amazon-s3-update-strong-read-after-write-consistency/). Defaults to false.                                             |
+| GRIST_SNAPSHOT_TIME_CAP            | optional. Define the caps for tracking buckets. Usage: {"hour": 25, "day": 32, "isoWeek": 12, "month": 96, "year": 1000}                                                                                                                                                                                                                                      |
+| GRIST_SNAPSHOT_KEEP                | optional. Number of recent snapshots to retain unconditionally for a document, regardless of when they were made                                                                                                                                                                                                                                              |
+| GRIST_PROMCLIENT_PORT              | optional. If set, serve the Prometheus metrics on the specified port number. ⚠️ Be sure to use a port which is not publicly exposed ⚠️.                                                                                                                                                                                                                         |
 
 #### AI Formula Assistant related variables (all optional):
 

From bd07e9c026a757223d351a08ead72de3141353c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?=
 <jaroslaw.sadzinski@gmail.com>
Date: Thu, 18 Apr 2024 14:13:16 +0200
Subject: [PATCH 26/45] (core) New API to collect timing information from
 formula evaluation.

Summary:
- /timing/start endpoint to start collecting information
- /timing/stop endpoint to stop collecting
- /timing to retrive data gatherd so far

Timings are collected for all columns (including hidden/helpers/system)

Test Plan: Added new

Reviewers: paulfitz

Reviewed By: paulfitz

Differential Revision: https://phab.getgrist.com/D4230
---
 app/client/components/DocComm.ts      |   2 +
 app/common/ActiveDocAPI.ts            |  57 ++++++++-
 app/common/UserAPI.ts                 |  22 ++++
 app/gen-server/lib/DocApiForwarder.ts |   3 +
 app/server/lib/ActiveDoc.ts           |  49 +++++++-
 app/server/lib/DocApi.ts              |  34 ++++++
 app/server/lib/DocManager.ts          |  24 +++-
 app/server/lib/DocWorker.ts           |   2 +
 sandbox/grist/engine.py               |  83 +++++++------
 sandbox/grist/main.py                 |  16 +++
 sandbox/grist/timing.py               | 115 ++++++++++++++++++
 test/server/lib/DocApi2.ts            | 169 +++++++++++++++++++++++++-
 12 files changed, 530 insertions(+), 46 deletions(-)
 create mode 100644 sandbox/grist/timing.py

diff --git a/app/client/components/DocComm.ts b/app/client/components/DocComm.ts
index 444773b9..0e225b32 100644
--- a/app/client/components/DocComm.ts
+++ b/app/client/components/DocComm.ts
@@ -48,6 +48,8 @@ export class DocComm extends Disposable implements ActiveDocAPI {
   public getUsersForViewAs = this._wrapMethod("getUsersForViewAs");
   public getAccessToken = this._wrapMethod("getAccessToken");
   public getShare = this._wrapMethod("getShare");
+  public startTiming = this._wrapMethod("startTiming");
+  public stopTiming = this._wrapMethod("stopTiming");
 
   public changeUrlIdEmitter = this.autoDispose(new Emitter());
 
diff --git a/app/common/ActiveDocAPI.ts b/app/common/ActiveDocAPI.ts
index 0962f99a..f10a5804 100644
--- a/app/common/ActiveDocAPI.ts
+++ b/app/common/ActiveDocAPI.ts
@@ -288,6 +288,48 @@ export interface RemoteShareInfo {
   key: string;
 }
 
+/**
+ * Metrics gathered during formula calculations.
+ */
+export interface TimingInfo {
+  /**
+   * Total time spend evaluating a formula.
+   */
+  total: number;
+  /**
+   * Number of times the formula was evaluated (for all rows).
+   */
+  count: number;
+  average: number;
+  max: number;
+}
+
+/**
+ * Metrics attached to a particular column in a table. Contains also marks if they were gathered.
+ * Currently we only mark the `OrderError` exception (so when formula calculation was restarted due to
+ * order dependency).
+ */
+export interface FormulaTimingInfo extends TimingInfo {
+  tableId: string;
+  colId: string;
+  marks?: Array<TimingInfo & {name: string}>;
+}
+
+/*
+ * Status of timing info collection. Contains intermediate results if engine is not busy at the moment.
+ */
+export interface TimingStatus {
+  /**
+   * If true, timing info is being collected.
+   */
+  status: boolean;
+  /**
+   * Will be undefined if we can't get the timing info (e.g. if the document is locked by other call).
+   * Otherwise, contains the intermediate results gathered so far.
+   */
+  timing?: FormulaTimingInfo[];
+}
+
 export interface ActiveDocAPI {
   /**
    * Closes a document, and unsubscribes from its userAction events.
@@ -449,5 +491,18 @@ export interface ActiveDocAPI {
    */
   getUsersForViewAs(): Promise<PermissionDataWithExtraUsers>;
 
-  getShare(linkId: string): Promise<RemoteShareInfo>;
+  /**
+   * Get a share info associated with the document.
+   */
+  getShare(linkId: string): Promise<RemoteShareInfo|null>;
+
+  /**
+   * Starts collecting timing information from formula evaluations.
+   */
+  startTiming(): Promise<void>;
+
+  /**
+   * Stops collecting timing information and returns the collected data.
+   */
+  stopTiming(): Promise<TimingInfo[]>;
 }
diff --git a/app/common/UserAPI.ts b/app/common/UserAPI.ts
index df4d0788..32e4f068 100644
--- a/app/common/UserAPI.ts
+++ b/app/common/UserAPI.ts
@@ -507,6 +507,16 @@ export interface DocAPI {
   flushWebhook(webhookId: string): Promise<void>;
 
   getAssistance(params: AssistanceRequest): Promise<AssistanceResponse>;
+  /**
+   * Check if the document is currently in timing mode.
+   */
+  timing(): Promise<{status: boolean}>;
+  /**
+   * Starts recording timing information for the document. Throws exception if timing is already
+   * in progress or you don't have permission to start timing.
+   */
+  startTiming(): Promise<void>;
+  stopTiming(): Promise<void>;
 }
 
 // Operations that are supported by a doc worker.
@@ -1121,6 +1131,18 @@ export class DocAPIImpl extends BaseAPI implements DocAPI {
     });
   }
 
+  public async timing(): Promise<{status: boolean}> {
+    return this.requestJson(`${this._url}/timing`);
+  }
+
+  public async startTiming(): Promise<void> {
+    await this.request(`${this._url}/timing/start`, {method: 'POST'});
+  }
+
+  public async stopTiming(): Promise<void> {
+    await this.request(`${this._url}/timing/stop`, {method: 'POST'});
+  }
+
   private _getRecords(tableId: string, endpoint: 'data' | 'records', options?: GetRowsParams): Promise<any> {
     const url = new URL(`${this._url}/tables/${tableId}/${endpoint}`);
     if (options?.filters) {
diff --git a/app/gen-server/lib/DocApiForwarder.ts b/app/gen-server/lib/DocApiForwarder.ts
index 3c74c966..4be608af 100644
--- a/app/gen-server/lib/DocApiForwarder.ts
+++ b/app/gen-server/lib/DocApiForwarder.ts
@@ -70,6 +70,9 @@ export class DocApiForwarder {
     app.use('/api/docs/:docId/webhooks', withDoc);
     app.use('/api/docs/:docId/assistant', withDoc);
     app.use('/api/docs/:docId/sql', withDoc);
+    app.use('/api/docs/:docId/timing', withDoc);
+    app.use('/api/docs/:docId/timing/start', withDoc);
+    app.use('/api/docs/:docId/timing/stop', withDoc);
     app.use('/api/docs/:docId/forms/:vsId', withDoc);
     app.use('^/api/docs$', withoutDoc);
   }
diff --git a/app/server/lib/ActiveDoc.ts b/app/server/lib/ActiveDoc.ts
index 8f23ba12..41acb51a 100644
--- a/app/server/lib/ActiveDoc.ts
+++ b/app/server/lib/ActiveDoc.ts
@@ -22,6 +22,7 @@ import {
   ApplyUAResult,
   DataSourceTransformed,
   ForkResult,
+  FormulaTimingInfo,
   ImportOptions,
   ImportResult,
   ISuggestionWithValue,
@@ -220,6 +221,7 @@ export class ActiveDoc extends EventEmitter {
   public docData: DocData|null = null;
   // Used by DocApi to only allow one webhook-related endpoint to run at a time.
   public readonly triggersLock: Mutex = new Mutex();
+  public isTimingOn = false;
 
   protected _actionHistory: ActionHistory;
   protected _docManager: DocManager;
@@ -1366,6 +1368,7 @@ export class ActiveDoc extends EventEmitter {
    */
   public async reloadDoc(docSession?: DocSession) {
     this._log.debug(docSession || null, 'ActiveDoc.reloadDoc starting shutdown');
+    this._docManager.restoreTimingOn(this.docName, this.isTimingOn);
     return this.shutdown();
   }
 
@@ -1870,6 +1873,40 @@ export class ActiveDoc extends EventEmitter {
     return await this._getHomeDbManagerOrFail().getShareByLinkId(this.docName, linkId);
   }
 
+  public async startTiming(): Promise<void> {
+    // Set the flag to indicate that timing is on.
+    this.isTimingOn = true;
+
+    try {
+      // Call the data engine to start timing.
+      await this._doStartTiming();
+    } catch (e) {
+      this.isTimingOn = false;
+      throw e;
+    }
+
+    // Mark self as in timing mode, in case we get reloaded.
+    this._docManager.restoreTimingOn(this.docName, true);
+  }
+
+  public async stopTiming(): Promise<FormulaTimingInfo[]> {
+    // First call the data engine to stop timing, and gather results.
+    const timingResults = await this._pyCall('stop_timing');
+
+    // Toggle the flag and clear the reminder.
+    this.isTimingOn = false;
+    this._docManager.restoreTimingOn(this.docName, false);
+
+    return timingResults;
+  }
+
+  public async getTimings(): Promise<FormulaTimingInfo[]|void>  {
+    if (this._modificationLock.isLocked()) {
+      return;
+    }
+    return await this._pyCall('get_timings');
+  }
+
   /**
    * Loads an open document from DocStorage.  Returns a list of the tables it contains.
    */
@@ -2377,6 +2414,10 @@ export class ActiveDoc extends EventEmitter {
         });
         await this._pyCall('initialize', this._options?.docUrl);
 
+        if (this.isTimingOn) {
+          await this._doStartTiming();
+        }
+
         // Calculations are not associated specifically with the user opening the document.
         // TODO: be careful with which users can create formulas.
         await this._applyUserActions(makeExceptionalDocSession('system'), [['Calculate']]);
@@ -2686,7 +2727,9 @@ export class ActiveDoc extends EventEmitter {
   }
 
   private async _getEngine(): Promise<ISandbox> {
-    if (this._shuttingDown) { throw new Error('shutting down, data engine unavailable'); }
+    if (this._shuttingDown) {
+      throw new Error('shutting down, data engine unavailable');
+    }
     if (this._dataEngine) { return this._dataEngine; }
 
     this._dataEngine = this._isSnapshot ? this._makeNullEngine() : this._makeEngine();
@@ -2830,6 +2873,10 @@ export class ActiveDoc extends EventEmitter {
     return dbManager;
   }
 
+  private _doStartTiming() {
+    return  this._pyCall('start_timing');
+  }
+
 }
 
 // Helper to initialize a sandbox action bundle with no values.
diff --git a/app/server/lib/DocApi.ts b/app/server/lib/DocApi.ts
index 5d6c01c5..95d54540 100644
--- a/app/server/lib/DocApi.ts
+++ b/app/server/lib/DocApi.ts
@@ -1556,6 +1556,40 @@ export class DocWorkerApi {
         });
       })
     );
+
+    // GET /api/docs/:docId/timings
+    // Checks if timing is on for the document.
+    this._app.get('/api/docs/:docId/timing', isOwner, withDoc(async (activeDoc, req, res) => {
+      if (!activeDoc.isTimingOn) {
+        res.json({status: 'disabled'});
+      } else {
+        const timing =  await activeDoc.getTimings();
+        const status = timing ? 'active' : 'pending';
+        res.json({status, timing});
+      }
+    }));
+
+    // POST /api/docs/:docId/timings/start
+    // Start a timing for the document.
+    this._app.post('/api/docs/:docId/timing/start', isOwner, withDoc(async (activeDoc, req, res) => {
+      if (activeDoc.isTimingOn) {
+        res.status(400).json({error:`Timing already started for ${activeDoc.docName}`});
+        return;
+      }
+      // isTimingOn flag is switched synchronously.
+      await activeDoc.startTiming();
+      res.sendStatus(200);
+    }));
+
+    // POST /api/docs/:docId/timings/stop
+    // Stop a timing for the document.
+    this._app.post('/api/docs/:docId/timing/stop', isOwner, withDoc(async (activeDoc, req, res) => {
+      if (!activeDoc.isTimingOn) {
+        res.status(400).json({error:`Timing not started for ${activeDoc.docName}`});
+        return;
+      }
+      res.json(await activeDoc.stopTiming());
+    }));
   }
 
   /**
diff --git a/app/server/lib/DocManager.ts b/app/server/lib/DocManager.ts
index 8e4f6c66..54545587 100644
--- a/app/server/lib/DocManager.ts
+++ b/app/server/lib/DocManager.ts
@@ -43,7 +43,10 @@ export const DEFAULT_CACHE_TTL = 10000;
 
 // How long to remember that a document has been explicitly set in a
 // recovery mode.
-export const RECOVERY_CACHE_TTL = 30000;
+export const RECOVERY_CACHE_TTL = 30000; // 30 seconds
+
+// How long to remember the timing mode of a document.
+export const TIMING_ON_CACHE_TTL = 30000; // 30 seconds
 
 /**
  * DocManager keeps track of "active" Grist documents, i.e. those loaded
@@ -56,6 +59,9 @@ export class DocManager extends EventEmitter {
   // Remember recovery mode of documents.
   private _inRecovery = new MapWithTTL<string, boolean>(RECOVERY_CACHE_TTL);
 
+  // Remember timing mode of documents, when document is recreated it is put in the same mode.
+  private _inTimingOn = new MapWithTTL<string, boolean>(TIMING_ON_CACHE_TTL);
+
   constructor(
     public readonly storageManager: IDocStorageManager,
     public readonly pluginManager: PluginManager|null,
@@ -69,6 +75,13 @@ export class DocManager extends EventEmitter {
     this._inRecovery.set(docId, recovery);
   }
 
+  /**
+   * Will restore timing on a document when it is reloaded.
+   */
+  public restoreTimingOn(docId: string, timingOn: boolean) {
+    this._inTimingOn.set(docId, timingOn);
+  }
+
   // attach a home database to the DocManager.  During some tests, it
   // is awkward to have this set up at the point of construction.
   public testSetHomeDbManager(dbManager: HomeDBManager) {
@@ -437,6 +450,10 @@ export class DocManager extends EventEmitter {
       log.error('DocManager had problem shutting down storage: %s', err.message);
     }
 
+    // Clear any timeouts we might have.
+    this._inRecovery.clear();
+    this._inTimingOn.clear();
+
     // Clear the setInterval that the pidusage module sets up internally.
     pidusage.clear();
   }
@@ -601,7 +618,10 @@ export class DocManager extends EventEmitter {
     const doc = await this._getDoc(docSession, docName);
     // Get URL for document for use with SELF_HYPERLINK().
     const docUrls = doc && await this._getDocUrls(doc);
-    return new ActiveDoc(this, docName, {...docUrls, safeMode, doc});
+    const activeDoc = new ActiveDoc(this, docName, {...docUrls, safeMode, doc});
+    // Restore the timing mode of the document.
+    activeDoc.isTimingOn = this._inTimingOn.get(docName) || false;
+    return activeDoc;
   }
 
   /**
diff --git a/app/server/lib/DocWorker.ts b/app/server/lib/DocWorker.ts
index 66e250e1..7bb8d8e6 100644
--- a/app/server/lib/DocWorker.ts
+++ b/app/server/lib/DocWorker.ts
@@ -132,6 +132,8 @@ export class DocWorker {
       getUsersForViewAs:        activeDocMethod.bind(null, 'viewers', 'getUsersForViewAs'),
       getAccessToken:           activeDocMethod.bind(null, 'viewers', 'getAccessToken'),
       getShare:                 activeDocMethod.bind(null, 'owners', 'getShare'),
+      startTiming:              activeDocMethod.bind(null, 'owners', 'startTiming'),
+      stopTiming:               activeDocMethod.bind(null, 'owners', 'stopTiming'),
     });
   }
 
diff --git a/sandbox/grist/engine.py b/sandbox/grist/engine.py
index b9cf0b21..8fb37f7e 100644
--- a/sandbox/grist/engine.py
+++ b/sandbox/grist/engine.py
@@ -36,6 +36,7 @@ import sandbox
 import schema
 from schema import RecalcWhen
 import table as table_module
+from timing import DummyTiming
 from user import User # pylint:disable=wrong-import-order
 import useractions
 import column
@@ -263,6 +264,8 @@ class Engine(object):
     # make multiple different requests without needing to keep all the responses in memory.
     self._cached_request_keys = set()
 
+    self._timing = DummyTiming()
+
   @property
   def autocomplete_context(self):
     # See the comment on _autocomplete_context in __init__ above.
@@ -969,51 +972,53 @@ class Engine(object):
       assert not cycle
       record = AttributeRecorder(record, "rec", record_attributes)
     value = None
-    try:
-      if cycle:
-        raise depend.CircularRefError("Circular Reference")
-      if not col.is_formula():
-        value = col.get_cell_value(int(record), restore=True)
-        with FakeStdStreams():
-          result = col.method(record, table.user_table, value, self._user)
-      else:
-        with FakeStdStreams():
-          result = col.method(record, table.user_table)
-      if self._cell_required_error:
-        raise self._cell_required_error  # pylint: disable=raising-bad-type
-      self.formula_tracer(col, record)
-      return result
-    except MemoryError:
-      # Don't try to wrap memory errors.
-      raise
-    except:  # pylint: disable=bare-except
-      # Since col.method runs untrusted user code, we use a bare except to catch all
-      # exceptions (even those not derived from BaseException).
+    with self._timing.measure(col.node):
+      try:
+        if cycle:
+          raise depend.CircularRefError("Circular Reference")
+        if not col.is_formula():
+          value = col.get_cell_value(int(record), restore=True)
+          with FakeStdStreams():
+            result = col.method(record, table.user_table, value, self._user)
+        else:
+          with FakeStdStreams():
+            result = col.method(record, table.user_table)
+        if self._cell_required_error:
+          raise self._cell_required_error  # pylint: disable=raising-bad-type
+        self.formula_tracer(col, record)
+        return result
+      except MemoryError:
+        # Don't try to wrap memory errors.
+        raise
+      except:  # pylint: disable=bare-except
+        # Since col.method runs untrusted user code, we use a bare except to catch all
+        # exceptions (even those not derived from BaseException).
 
-      # Before storing the exception value, make sure there isn't an OrderError pending.
-      # If there is, we will raise it after undoing any side effects.
-      order_error = self._cell_required_error
+        # Before storing the exception value, make sure there isn't an OrderError pending.
+        # If there is, we will raise it after undoing any side effects.
+        order_error = self._cell_required_error
 
-      # Otherwise, we use sys.exc_info to recover the raised exception object.
-      regular_error = sys.exc_info()[1] if not order_error else None
+        # Otherwise, we use sys.exc_info to recover the raised exception object.
+        regular_error = sys.exc_info()[1] if not order_error else None
 
-      # It is possible for formula evaluation to have side-effects that produce DocActions (e.g.
-      # lookupOrAddDerived() creates those). If there is an error, undo any such side-effects.
-      self._undo_to_checkpoint(checkpoint)
+        # It is possible for formula evaluation to have side-effects that produce DocActions (e.g.
+        # lookupOrAddDerived() creates those). If there is an error, undo any such side-effects.
+        self._undo_to_checkpoint(checkpoint)
 
-      # Now we can raise the order error, if there was one.  Cell evaluation will be reordered
-      # in response.
-      if order_error:
-        self._cell_required_error = None
-        raise order_error  # pylint: disable=raising-bad-type
+        # Now we can raise the order error, if there was one.  Cell evaluation will be reordered
+        # in response.
+        if order_error:
+          self._timing.mark("order_error")
+          self._cell_required_error = None
+          raise order_error  # pylint: disable=raising-bad-type
 
-      self.formula_tracer(col, record)
+        self.formula_tracer(col, record)
 
-      include_details = (node not in self._is_node_exception_reported) if node else True
-      if not col.is_formula():
-        return objtypes.RaisedException(regular_error, include_details, user_input=value)
-      else:
-        return objtypes.RaisedException(regular_error, include_details)
+        include_details = (node not in self._is_node_exception_reported) if node else True
+        if not col.is_formula():
+          return objtypes.RaisedException(regular_error, include_details, user_input=value)
+        else:
+          return objtypes.RaisedException(regular_error, include_details)
 
   def convert_action_values(self, action):
     """
diff --git a/sandbox/grist/main.py b/sandbox/grist/main.py
index ab87952b..2929183f 100644
--- a/sandbox/grist/main.py
+++ b/sandbox/grist/main.py
@@ -5,6 +5,8 @@ and starts the grist sandbox. See engine.py for the API documentation.
 import os
 import random
 import sys
+
+from timing import DummyTiming, Timing
 sys.path.append('thirdparty')
 # pylint: disable=wrong-import-position
 
@@ -158,6 +160,20 @@ def run(sandbox):
   def evaluate_formula(table_id, col_id, row_id):
     return formula_prompt.evaluate_formula(eng, table_id, col_id, row_id)
 
+  @export
+  def start_timing():
+    eng._timing = Timing()
+
+  @export
+  def stop_timing():
+    stats = eng._timing.get()
+    eng._timing = DummyTiming()
+    return stats
+
+  @export
+  def get_timings():
+    return eng._timing.get()
+
   export(parse_acl_formula)
   export(eng.load_empty)
   export(eng.load_done)
diff --git a/sandbox/grist/timing.py b/sandbox/grist/timing.py
new file mode 100644
index 00000000..d1d633bc
--- /dev/null
+++ b/sandbox/grist/timing.py
@@ -0,0 +1,115 @@
+import contextlib
+import time
+import six
+
+
+class Timing(object):
+  def __init__(self):
+    self._items = {}
+    self._marks_stack = []
+
+  @contextlib.contextmanager
+  def measure(self, key):
+    start = time.time()
+    stack_start_len = len(self._marks_stack)
+    try:
+      yield
+    finally:
+      end = time.time()
+      self._record_time(key, end - start)
+
+      # Handle the marks added while in this invocation.
+      n = len(self._marks_stack) - stack_start_len
+      if n > 0:
+        next_mark = ("end", end)
+        while n > 0:
+          mark = self._marks_stack.pop()
+          self._record_time("{}@{}={}:{}".format(key, n, mark[0], next_mark[0]),
+              next_mark[1] - mark[1])
+          next_mark = mark
+          n -= 1
+        self._record_time("{}@{}={}:{}".format(key, n, "start", next_mark[0]), next_mark[1] - start)
+
+  def mark(self, mark_name):
+    self._marks_stack.append((mark_name, time.time()))
+
+  def get(self, clear = True):
+    # Copy it and clear immediately if requested.
+    timing_log = self._items.copy()
+    if clear:
+      self.clear()
+    # Stats will contain a json like structure with table_id, col_id, sum, count, average, max
+    # and optionally a array of marks (in similar format)
+    stats = []
+    for key, t in sorted(timing_log.items(), key=lambda x: str(x[0])):
+      # Key can be either a node (tuple with table_id and col_id) or a string with a mark.
+      # The list is sorted so, we always first get the stats for the node and then the marks.
+      # We will add marks to the last node.
+      if isinstance(key, tuple):
+        stats.append({"tableId": key[0], "colId": key[1], "sum": t.sum, "count": t.count,
+                      "average": t.average, "max": t.max})
+      else:
+        # Create a marks array for the last node or append to the existing one.
+        if stats:
+          prev = stats[-1].get("marks", [])
+          stats[-1]["marks"] = prev + [{
+            "name": key, "sum": t.sum,
+            "count": t.count, "average": t.average,
+            "max": t.max
+          }]
+    return stats
+
+  def dump(self):
+    out = []
+    for key, t in sorted(self._items.items(), key=lambda x: str(x[0])):
+      out.append("%6d, %10f, %10f, %10f, %s" % (t.count, t.average, t.max, t.sum, key))
+    print("Timing\n" + "\n".join(out))
+    self.clear()
+
+  def _record_time(self, key, time_sec):
+    t = self._items.get(key)
+    if not t:
+      t = self._items[key] = TimingStats()
+    t.add(time_sec)
+
+  def clear(self):
+    self._items.clear()
+
+
+
+# An implementation that adds minimal overhead.
+class DummyTiming(object):
+  # pylint: disable=no-self-use,unused-argument,no-member
+  def measure(self, key):
+    if six.PY2:
+      return contextlib.nested()
+    return contextlib.nullcontext()
+
+  def mark(self, mark_name):
+    pass
+
+  def dump(self):
+    pass
+
+  def get(self, clear = True):
+    return []
+
+  def clear(self):
+    pass
+
+
+class TimingStats(object):
+  def __init__(self):
+    self.count = 0
+    self.sum = 0
+    self.max = 0
+
+  @property
+  def average(self):
+    return self.sum / self.count if self.count > 0 else 0
+
+  def add(self, value):
+    self.count += 1
+    self.sum += value
+    if value > self.max:
+      self.max = value
diff --git a/test/server/lib/DocApi2.ts b/test/server/lib/DocApi2.ts
index 29345282..f3bda756 100644
--- a/test/server/lib/DocApi2.ts
+++ b/test/server/lib/DocApi2.ts
@@ -9,11 +9,12 @@ import {openClient} from 'test/server/gristClient';
 import * as testUtils from 'test/server/testUtils';
 
 const chimpy = configForUser('Chimpy');
+const kiwi = configForUser('Kiwi');
 
 describe('DocApi2', function() {
   this.timeout(40000);
   let server: TestServer;
-  let serverUrl: string;
+  let homeUrl: string;
   let owner: UserAPI;
   let wsId: number;
   testUtils.setTmpLogLevel('error');
@@ -30,7 +31,7 @@ describe('DocApi2', function() {
     }
 
     server = new TestServer(this);
-    serverUrl = await server.start(['home', 'docs']);
+    homeUrl = await server.start(['home', 'docs']);
     const api = await server.createHomeApi('chimpy', 'docs', true);
     await api.newOrg({name: 'testy', domain: 'testy'});
     owner = await server.createHomeApi('chimpy', 'testy', true);
@@ -63,7 +64,7 @@ describe('DocApi2', function() {
       assert.equal(await fse.pathExists(forkPath2), true);
 
       // Delete the trunk via API.
-      const deleteDocResponse = await axios.delete(`${serverUrl}/api/docs/${docId}`, chimpy);
+      const deleteDocResponse = await axios.delete(`${homeUrl}/api/docs/${docId}`, chimpy);
       assert.equal(deleteDocResponse.status, 200);
 
       // Check that files for the trunk and forks were deleted.
@@ -72,4 +73,166 @@ describe('DocApi2', function() {
       assert.equal(await fse.pathExists(forkPath2), false);
     });
   });
+
+  describe('/docs/{did}/timing', async () => {
+    let docId: string;
+    before(async function() {
+      docId = await owner.newDoc({name: 'doc2'}, wsId);
+    });
+
+    after(async function() {
+      await owner.deleteDoc(docId);
+    });
+
+    // There are two endpoints here /timing/start and /timing/stop.
+    // Here we just test that it is operational, available only for owners
+    // and that it returns sane results. Exact tests are done in python.
+
+    // Smoke test.
+    it('POST /docs/{did}/timing smoke tests', async function() {
+      // We are disabled.
+      let resp = await axios.get(`${homeUrl}/api/docs/${docId}/timing`, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, {status: 'disabled'});
+
+      // Start it.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/start`, {}, chimpy);
+      assert.equal(resp.status, 200);
+
+      // Stop it.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, []);
+    });
+
+    it('POST /docs/{did}/timing/start', async function() {
+      // Start timing as non owner, should fail.
+      let resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/start`, {}, kiwi);
+      assert.equal(resp.status, 403);
+
+      // Query status as non owner, should fail.
+      resp = await axios.get(`${homeUrl}/api/docs/${docId}/timing`, kiwi);
+      assert.equal(resp.status, 403);
+
+      // Check as owner.
+      resp = await axios.get(`${homeUrl}/api/docs/${docId}/timing`, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, {status: 'disabled'});
+
+      // Start timing as owner.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/start`, {}, chimpy);
+      assert.equal(resp.status, 200);
+
+      // Check we are started.
+      resp = await axios.get(`${homeUrl}/api/docs/${docId}/timing`, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, {status: 'active', timing: []});
+
+      // Starting timing again works as expected, returns 400 as this is already.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/start`, {}, chimpy);
+      assert.equal(resp.status, 400);
+
+      // As non owner
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, kiwi);
+      assert.equal(resp.status, 403);
+    });
+
+    it('POST /docs/{did}/timing/stop', async function() {
+      // Timings are turned on, so we can stop them.
+      // First as non owner, we should fail.
+      let resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, kiwi);
+      assert.equal(resp.status, 403);
+
+      // Next as owner.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, chimpy);
+      assert.equal(resp.status, 200);
+
+      // Now do it once again, we should got 400, as we are not timing.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, chimpy);
+      assert.equal(resp.status, 400);
+    });
+
+    it('GET /docs/{did}/timing', async function() {
+      // Now we can check the results. Start timing and check that we got [] in response.
+      let resp =  await axios.post(`${homeUrl}/api/docs/${docId}/timing/start`, {}, chimpy);
+      assert.equal(resp.status, 200);
+
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, []);
+
+      // Now create a table with a formula column and make sure we see it in the results.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/apply`, [
+        ['AddTable', 'Timings', [
+          {id: 'A', formula: '$id' }
+        ]],
+      ], chimpy);
+      assert.equal(resp.status, 200);
+
+      // Now start it again,
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/start`, {}, chimpy);
+      assert.equal(resp.status, 200);
+
+      // Make sure we see that it is active and we have some intermediate results
+      resp = await axios.get(`${homeUrl}/api/docs/${docId}/timing`, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, {status: 'active', timing: []});
+
+      // And trigger some formula calculations.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/apply`, [
+        ['BulkAddRecord', 'Timings', [null, null], {}],
+      ], chimpy);
+      assert.equal(resp.status, 200, JSON.stringify(resp.data));
+
+      // Make sure we can't stop it as non owner.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, kiwi);
+      assert.equal(resp.status, 403);
+
+      // Now stop it as owner and make sure the result is sane.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/stop`, {}, chimpy);
+      assert.equal(resp.status, 200, JSON.stringify(resp.data));
+      const data = resp.data as Array<{
+        tableId: string;
+        colId: string;
+        sum: number;
+        count: number;
+        average: number;
+        max: number;
+        markers?: Array<{
+          name: string;
+          sum: number;
+          count: number;
+          average: number;
+          max: number;
+        }>
+      }>;
+
+      assert.isAbove(data.length, 0);
+      assert.equal(data[0].tableId, 'Timings');
+      assert.isTrue(typeof data[0].sum === 'number');
+      assert.isTrue(typeof data[0].count === 'number');
+      assert.isTrue(typeof data[0].average === 'number');
+      assert.isTrue(typeof data[0].max === 'number');
+    });
+
+    it('POST /docs/{did}/timing/start remembers state after reload', async function() {
+      // Make sure we are off.
+      let resp = await axios.get(`${homeUrl}/api/docs/${docId}/timing`, chimpy);
+      assert.equal(resp.status, 200);
+      assert.deepEqual(resp.data, {status: 'disabled'});
+
+      // Now start it.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/timing/start`, {}, chimpy);
+      assert.equal(resp.status, 200);
+
+      // Now reload document.
+      resp = await axios.post(`${homeUrl}/api/docs/${docId}/force-reload`, {}, chimpy);
+      assert.equal(resp.status, 200);
+
+      // And check that we are still on.
+      resp = await axios.get(`${homeUrl}/api/docs/${docId}/timing`, chimpy);
+      assert.equal(resp.status, 200, JSON.stringify(resp.data));
+      assert.deepEqual(resp.data, {status: 'active', timing: []});
+    });
+  });
 });

From 34c85757f1166add3257f4745e8a7692fba9c2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?=
 <jaroslaw.sadzinski@gmail.com>
Date: Wed, 24 Apr 2024 11:15:23 +0200
Subject: [PATCH 27/45] (core) Fix for ReferenceList conversion during table
 rename

Summary:
Renaming table after converting Ref column to RefList didn't work. During table rename, all Refs columns
are converted briefly to Int columns which treats values stored in RefList columns as errors, and stores its
`repr` strings. This could be recovered back if the value stored in RefList column was a plain list, but if we had there
a RecordList object, the RefList column didn't know how to parse that.

Test Plan: Added test

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4233
---
 sandbox/grist/column.py        | 17 ++++++++++++++--
 sandbox/grist/objtypes.py      | 15 +++++++++++++-
 sandbox/grist/usertypes.py     | 20 +++++++++++++-----
 test/nbrowser/ReferenceList.ts | 37 ++++++++++++++++++++++++++++++++--
 4 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/sandbox/grist/column.py b/sandbox/grist/column.py
index d9625dff..d116ffd0 100644
--- a/sandbox/grist/column.py
+++ b/sandbox/grist/column.py
@@ -524,11 +524,24 @@ class ReferenceListColumn(BaseReferenceColumn):
   Accessing them yields RecordSets.
   """
   def set(self, row_id, value):
-    if isinstance(value, six.string_types) and value.startswith(u'['):
+    if isinstance(value, six.string_types):
+      # This is second part of a "hack" we have to do when we rename tables. During
+      # the rename, we briefly change all Ref columns to Int columns (to lose the table
+      # part), and then back to Ref columns. The values during this change are stored
+      # as serialized strings, which we expect to understand when the column is back to
+      # being a Ref column. We can either end up with a list of ints, or a RecordList
+      # serialized as a string.
+      # TODO: explain why we need to do this and why we have chosen the Int column
       try:
-        value = json.loads(value)
+        # If it's a string that looks like JSON, try to parse it as such.
+        if value.startswith('['):
+          value = json.loads(value)
+        else:
+        # Else try to parse it as a RecordList
+          value = objtypes.RecordList.from_repr(value)
       except Exception:
         pass
+
     super(ReferenceListColumn, self).set(row_id, value)
 
   def _update_references(self, row_id, old_list, new_list):
diff --git a/sandbox/grist/objtypes.py b/sandbox/grist/objtypes.py
index d19894e5..1c298f6f 100644
--- a/sandbox/grist/objtypes.py
+++ b/sandbox/grist/objtypes.py
@@ -361,6 +361,20 @@ class CellError(Exception):
 
 
 class RecordList(list):
+  """
+  A static method to recreate a RecordList from the output of __repr__.
+  It only restores the row_ids. The group_by and sort_by attributes are not restored.
+  """
+  @staticmethod
+  def from_repr(repr_str):
+    if not repr_str.startswith('RecordList(['):
+      raise ValueError("Invalid RecordList representation")
+    # This is a string representation of a RecordList, which we can parse.
+    # > RecordList([1,2,3], group_by=%r, sort_by=%r)
+    # Match only rows, as group_by and sort_by are not used and can be stale.
+    numbers = repr_str.split('[')[1].split(']')[0].split(',')
+    return RecordList([int(v) for v in numbers])
+
   """
   Just like list but allows setting custom attributes, which we use for remembering _group_by and
   _sort_by attributes when storing RecordSet as usertypes.ReferenceList type.
@@ -375,7 +389,6 @@ class RecordList(list):
       list.__repr__(self), self._group_by, self._sort_by)
 
 
-
 # We don't currently have a good way to convert an incoming marshalled record to a proper Record
 # object for an appropriate table. We don't expect incoming marshalled records at all, but if such
 # a thing happens, we'll construct this RecordStub.
diff --git a/sandbox/grist/usertypes.py b/sandbox/grist/usertypes.py
index 28f60a56..d617b927 100644
--- a/sandbox/grist/usertypes.py
+++ b/sandbox/grist/usertypes.py
@@ -431,12 +431,22 @@ class ReferenceList(BaseColumnType):
 
   def do_convert(self, value):
     if isinstance(value, six.string_types):
-      # If it's a string that looks like JSON, try to parse it as such.
-      if value.startswith('['):
-        try:
+      # This is second part of a "hack" we have to do when we rename tables. During
+      # the rename, we briefly change all Ref columns to Int columns (to lose the table
+      # part), and then back to Ref columns. The values during this change are stored
+      # as serialized strings, which we expect to understand when the column is back to
+      # being a Ref column. We can either end up with a list of ints, or a RecordList
+      # serialized as a string.
+      # TODO: explain why we need to do this and why we have chosen the Int column
+      try:
+        # If it's a string that looks like JSON, try to parse it as such.
+        if value.startswith('['):
           value = json.loads(value)
-        except Exception:
-          pass
+        else:
+        # Else try to parse it as a RecordList
+          value = objtypes.RecordList.from_repr(value)
+      except Exception:
+        pass
 
     if isinstance(value, RecordSet):
       assert value._table.table_id == self.table_id
diff --git a/test/nbrowser/ReferenceList.ts b/test/nbrowser/ReferenceList.ts
index 16e1f2f1..7757b8e8 100644
--- a/test/nbrowser/ReferenceList.ts
+++ b/test/nbrowser/ReferenceList.ts
@@ -13,7 +13,40 @@ describe('ReferenceList', function() {
   });
 
   describe('other', function() {
-    it('allows to delete document with self reference', async function() {
+    it('fix: doesnt break when table is renamed', async function() {
+      // There was a bug in this scenario:
+      // 1. Create a Ref column that targets itself
+      // 2. Fill it up
+      // 3. Change it to RefList
+      // 4. Rename the table
+      // Previously, this would cause an error, cells were displaying Errors instead of values.
+
+      // Create a table with a Ref column that targets itself.
+      await session.tempNewDoc(cleanup);
+      await gu.sendActions([
+        ['ModifyColumn', 'Table1', 'B', {type: 'Ref:Table1'}],
+        ['AddRecord', 'Table1', null, {A: 'a', B: 1}],
+        ['AddRecord', 'Table1', null, {A: 'b', B: 2}],
+        ['AddRecord', 'Table1', null, {A: 'c', B: 3}],
+      ]);
+      await gu.openColumnPanel();
+      await gu.getCell('B', 1).doClick();
+      await gu.setRefShowColumn('A');
+
+      // Now convert it to RefList.
+      await gu.setType('Reference List', {apply: true});
+
+      // Make sure we see the values.
+      assert.deepEqual(await gu.getVisibleGridCells('B', [1, 2, 3]), ['a', 'b', 'c']);
+
+      // Rename the table using widget in the section.
+      await gu.renameTable('Table1', 'Table2');
+
+      // Make sure we still see the values.
+      assert.deepEqual(await gu.getVisibleGridCells('B', [1, 2, 3]), ['a', 'b', 'c']);
+    });
+
+    it('fix: allows to delete document with self reference', async function() {
       const docId = await session.tempNewDoc(cleanup);
       await gu.sendActions([
         ['AddEmptyTable', 'Table2'],
@@ -39,7 +72,7 @@ describe('ReferenceList', function() {
 
     before(async function() {
       await session.tempDoc(cleanup, 'Favorite_Films.grist');
-      await gu.toggleSidePanel('right');
+      await gu.toggleSidePanel('right', 'open');
       await driver.find(".test-right-tab-pagewidget").click();
       await driver.find('.test-config-data').click();
     });

From 513e13e6ab57c918c0e396b1d56686e45644ee1a Mon Sep 17 00:00:00 2001
From: Camille L <camille.legeron@beta.gouv.fr>
Date: Wed, 24 Apr 2024 13:12:55 +0000
Subject: [PATCH 28/45] Translated using Weblate (French)

Currently translated at 97.8% (1197 of 1223 strings)

Translation: Grist/client
Translate-URL: https://hosted.weblate.org/projects/grist/client/fr/
---
 static/locales/fr.client.json | 67 ++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/static/locales/fr.client.json b/static/locales/fr.client.json
index 828246d1..19bfda34 100644
--- a/static/locales/fr.client.json
+++ b/static/locales/fr.client.json
@@ -207,12 +207,12 @@
         "Duplicate Table": "Dupliquer la table",
         "You do not have edit access to this document": "Vous n’avez pas accès en écriture à ce document",
         "Delete {{formattedTableName}} data, and remove it from all pages?": "Supprimer les données de {{formattedTableName}} et les supprimer de toutes les pages ?",
-        "Edit Record Card": "Modifier la vue carte",
+        "Edit Record Card": "Modifier la vue fiche",
         "Rename Table": "Renommer la table",
-        "{{action}} Record Card": "{{action}} la vue carte",
-        "Record Card": "Vue carte",
+        "{{action}} Record Card": "{{action}} la vue fiche",
+        "Record Card": "Vue fiche",
         "Remove Table": "Supprimer la table",
-        "Record Card Disabled": "Vue carte désactivée"
+        "Record Card Disabled": "Vue fiche désactivée"
     },
     "DocHistory": {
         "Activity": "Activité",
@@ -666,7 +666,7 @@
         "Duplicate rows_other": "Dupliquer les lignes",
         "Delete": "Supprimer",
         "Copy anchor link": "Copier l'ancre",
-        "View as card": "Voir en carte",
+        "View as card": "Voir en fiche",
         "Use as table headers": "Utiliser en tant qu'en-têtes de table"
     },
     "SelectionSummary": {
@@ -780,7 +780,7 @@
         "Form": "Formulaire",
         "Compact": "Compact",
         "Blocks": "Blocs",
-        "Edit Card Layout": "Disposition de la carte",
+        "Edit Card Layout": "Disposition de la fiche",
         "Plugin: ": "Plugin : ",
         "Section: ": "Section : "
     },
@@ -791,7 +791,7 @@
         "Print widget": "Imprimer la vue",
         "Download as CSV": "Télécharger en CSV",
         "Download as XLSX": "Télécharger en XLSX",
-        "Edit Card Layout": "Disposition de la carte",
+        "Edit Card Layout": "Disposition de la fiche",
         "Widget options": "Options de la vue",
         "Advanced Sort & Filter": "Tri et filtre avancés",
         "Data selection": "Sélection des données",
@@ -938,7 +938,8 @@
         "true": "vrai",
         "Single line": "Ligne unique",
         "Multi line": "Multi-lignes",
-        "Lines": "Lignes"
+        "Lines": "Lignes",
+        "Field Format": "Format du champ"
     },
     "ViewAsDropdown": {
         "View As": "Voir en tant que",
@@ -1009,7 +1010,7 @@
         "Make it relational! Use the {{ref}} type to link tables. ": "Rendez-le relationnel ! Utilisez le type {{ref}} pour lier les tableaux. ",
         "Toggle the {{creatorPanel}} to format columns, ": "Ouvrez le {{creatorPanel}} pour formater les colonnes ",
         "Use {{addNew}} to add widgets, pages, or import more data. ": "Cliquez sur {{addNew}} pour ajouter des vues, des pages ou importer plus de données. ",
-        "convert to card view, select data, and more.": "convertir en vue carte, sélectionner des données et plus.",
+        "convert to card view, select data, and more.": "convertir en vue fiche, sélectionner des données et plus.",
         "Set formatting options, formulas, or column types, such as dates, choices, or attachments. ": "Définissez des options de formatage de la colonne, des formules ou bien les types de la colonne (dates, liste à choix unique, pièce jointe etc.) ",
         "Use {{helpCenter}} for documentation or questions.": "Cliquez sur {{helpCenter}} pour voir la documentation et poser vos questions.",
         "creator panel": "menu latéral"
@@ -1075,7 +1076,8 @@
         "Number Format": "Format de nombre",
         "min": "min",
         "Text": "Texte",
-        "max": "max"
+        "max": "max",
+        "Field Format": "Format du champ"
     },
     "LanguageMenu": {
         "Language": "Langue"
@@ -1102,12 +1104,12 @@
         "Only those rows will appear which match all of the filters.": "Seules les lignes qui correspondent à tous les filtres apparaîtront.",
         "Select the table to link to.": "Sélectionnez la table vers laquelle vous souhaitez établir un lien.",
         "Selecting Data": "Sélection de données",
-        "Rearrange the fields in your card by dragging and resizing cells.": "Réorganisez les champs de votre vue carte en faisant glisser et en redimensionnant les cellules.",
+        "Rearrange the fields in your card by dragging and resizing cells.": "Réorganisez les champs de votre vue fiche en faisant glisser et en redimensionnant les cellules.",
         "The Raw Data page lists all data tables in your document, including summary tables and tables not included in page layouts.": "La page des données sources liste toutes les tables de votre document, y compris les tables récapitulatives et les tables non-inclues dans les mises en page.",
         "The total size of all data in this document, excluding attachments.": "La taille totale de toutes les données de ce document, à l'exclusion des pièces jointes.",
         "Click the Add New button to create new documents or workspaces, or import data.": "Cliquez sur le bouton Nouveau pour créer de nouveaux documents dans votre espace de travail ou importer des données.",
         "Clicking {{EyeHideIcon}} in each cell hides the field from this view without deleting it.": "En cliquant sur {{EyeHideIcon}} dans chaque cellule, vous masquez le champ de cette vue sans le supprimer.",
-        "Editing Card Layout": "Modification de la mise en page de la carte",
+        "Editing Card Layout": "Modification de la mise en page de la fiche",
         "Linking Widgets": "Lier les vues",
         "Nested Filtering": "Filtrage imbriqué",
         "Pinned filters are displayed as buttons above the widget.": "Les filtres épinglés sont affichés sous forme de boutons au-dessus de la vue.",
@@ -1338,12 +1340,12 @@
         "You have access to the following Grist sites.": "Vous avez accès aux espaces Grist suivants."
     },
     "CardContextMenu": {
-        "Insert card above": "Insérer une carte au dessus",
-        "Duplicate card": "Dupliquer la carte",
-        "Insert card below": "Insérer une carte en dessous",
-        "Delete card": "Supprimer la carte",
+        "Insert card above": "Insérer une fiche au dessus",
+        "Duplicate card": "Dupliquer la fiche",
+        "Insert card below": "Insérer une fiche en dessous",
+        "Delete card": "Supprimer la fiche",
         "Copy anchor link": "Copier le lien d'ancrage",
-        "Insert card": "Insérer une carte"
+        "Insert card": "Insérer une fiche"
     },
     "WelcomeCoachingCall": {
         "Maybe Later": "Peut-être plus tard",
@@ -1405,7 +1407,10 @@
         "Field Format": "Format du champ",
         "Field Rules": "Règles du champ",
         "Horizontal": "Horizontale",
-        "Options Alignment": "Option d'alignement"
+        "Options Alignment": "Option d'alignement",
+        "Options Sort Order": "Option d'ordonnancement",
+        "Vertical": "Verticale",
+        "Radio": "Radio"
     },
     "Editor": {
         "Delete": "Supprimer"
@@ -1432,7 +1437,8 @@
     },
     "FormSuccessPage": {
         "Form Submitted": "Formulaire envoyé",
-        "Thank you! Your response has been recorded.": "Nous vous remercions. Votre réponse a été enregistrée."
+        "Thank you! Your response has been recorded.": "Nous vous remercions. Votre réponse a été enregistrée.",
+        "Submit new response": "Soumettre une nouvelle réponse"
     },
     "DateRangeOptions": {
         "Last 30 days": "30 derniers jours",
@@ -1469,6 +1475,27 @@
         "Version": "Version"
     },
     "Field": {
-        "No choices configured": "Aucun choix configuré"
+        "No choices configured": "Aucun choix configuré",
+        "No values in show column of referenced table": "Pas de valeurs dans la colonne montrée de la table de référence"
+    },
+    "CreateTeamModal": {
+        "Cancel": "Annuler",
+        "Choose a name and url for your team site": "Choisissez un nom et une adresse URL pour votre espace d'équipe",
+        "Create site": "Créer",
+        "Domain name is invalid": "Le nom de domaine n'est pas valide",
+        "Domain name is required": "Le nom de domaine est requis",
+        "Go to your site": "Aller vers votre espace d'équipe",
+        "Team name": "Nom de l'espace d'équipe",
+        "Team site created": "L'espace d'équipe a été créé",
+        "Team url": "Url de l'espace d'équipe",
+        "Work as a Team": "Travailler en équipe",
+        "Billing is not supported in grist-core": "La facturation n'est pas prise en charge dans un Grist auto hébergé",
+        "Team name is required": "Le nom de l'espace d'équipe est requis"
+    },
+    "Toggle": {
+        "Field Format": "Format du champ"
+    },
+    "Columns": {
+        "Remove Column": "Supprimer la colonne"
     }
 }

From 3112433a58b08d17c2583c1107eda9f074bfab95 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Fri, 26 Apr 2024 16:34:16 -0400
Subject: [PATCH 29/45] (core) Add dropdown conditions

Summary:
Dropdown conditions let you specify a predicate formula that's used to filter
choices and references in their respective autocomplete dropdown menus.

Test Plan: Python and browser tests (WIP).

Reviewers: jarek, paulfitz

Reviewed By: jarek

Subscribers: dsagal, paulfitz

Differential Revision: https://phab.getgrist.com/D4235
---
 app/client/aclui/ACLFormulaEditor.ts          |   23 +-
 app/client/aclui/AccessRules.ts               |   16 +-
 app/client/components/AceEditor.js            |   38 +-
 app/client/components/ChartView.ts            |    6 +-
 app/client/components/ColumnTransform.ts      |    2 +-
 app/client/components/CustomView.ts           |    2 +-
 .../components/DropdownConditionConfig.ts     |  197 ++++
 .../components/DropdownConditionEditor.ts     |  234 ++++
 app/client/components/GristDoc.ts             |    3 -
 app/client/components/Importer.ts             |    7 +-
 app/client/components/Printing.ts             |    8 +-
 app/client/components/WidgetFrame.ts          |    8 +-
 app/client/lib/ACIndex.ts                     |    7 +-
 app/client/lib/ACUserManager.ts               |    2 +-
 app/client/lib/DocPluginManager.ts            |    5 -
 app/client/lib/HomePluginManager.ts           |    6 +-
 app/client/lib/ReferenceUtils.ts              |  102 +-
 app/client/lib/SafeBrowser.ts                 |   20 +-
 app/client/lib/autocomplete.ts                |   54 +-
 app/client/lib/imports.d.ts                   |    5 +-
 app/client/lib/imports.js                     |   11 +
 app/client/lib/nameUtils.ts                   |   14 +
 app/client/lib/timeUtils.ts                   |   21 +
 app/client/models/AppModel.ts                 |   65 +-
 app/client/models/ColumnACIndexes.ts          |   25 +-
 app/client/models/HomeModel.ts                |   20 -
 app/client/models/entities/ViewFieldRec.ts    |   25 +-
 app/client/ui/AccountPage.ts                  |   18 +-
 app/client/ui/App.ts                          |    2 +
 app/client/ui/AppUI.ts                        |    6 +-
 app/client/ui/CodeHighlight.ts                |  153 ++-
 app/client/ui/DocHistory.ts                   |    2 +-
 app/client/ui/DocMenu.ts                      |    3 +-
 app/client/ui/FieldConfig.ts                  |   61 +-
 app/client/ui/GristTooltips.ts                |   26 +-
 app/client/ui/PinnedDocs.ts                   |    3 +-
 app/client/ui/RightPanelStyles.ts             |   15 +
 app/client/ui/ThemeConfig.ts                  |    8 +-
 app/client/ui/createAppPage.ts                |   11 +-
 app/client/ui/createPage.ts                   |    5 +-
 app/client/ui/searchDropdown.ts               |   15 +-
 app/client/ui/tooltips.ts                     |    2 +-
 app/client/ui2018/cssVars.ts                  |  143 +--
 app/client/ui2018/theme.ts                    |  191 ++++
 app/client/widgets/ChoiceEditor.js            |  103 +-
 app/client/widgets/ChoiceListEditor.ts        |   94 +-
 app/client/widgets/ChoiceListEntry.ts         |    1 -
 app/client/widgets/ChoiceTextBox.ts           |    7 +-
 app/client/widgets/ConditionalStyle.ts        |    8 +-
 app/client/widgets/EditorButtons.ts           |    4 +-
 app/client/widgets/FormulaAssistant.ts        |   18 +-
 app/client/widgets/FormulaEditor.ts           |   29 +-
 app/client/widgets/Reference.ts               |    2 +
 app/client/widgets/ReferenceEditor.ts         |   15 +-
 app/client/widgets/ReferenceListEditor.ts     |   31 +-
 app/common/ACLRuleCollection.ts               |   19 +-
 app/common/ACLRulesReader.ts                  |    3 +-
 app/common/ActiveDocAPI.ts                    |    6 +-
 app/common/ColumnFilterFunc.ts                |    2 +-
 app/common/DropdownCondition.ts               |   20 +
 app/common/GranularAccessClause.ts            |   76 +-
 app/common/PredicateFormula.ts                |  223 ++++
 app/common/RelativeDates.ts                   |    7 +-
 app/server/lib/ACLFormula.ts                  |  109 --
 app/server/lib/ActiveDoc.ts                   |   21 +-
 app/server/lib/GranularAccess.ts              |   34 +-
 app/server/lib/PermissionInfo.ts              |   11 +-
 sandbox/grist/acl.py                          |    5 +-
 sandbox/grist/acl_formula.py                  |  124 +-
 sandbox/grist/dropdown_condition.py           |   43 +
 sandbox/grist/main.py                         |    4 +-
 sandbox/grist/predicate_formula.py            |  118 ++
 sandbox/grist/test_acl_formula.py             |  143 ---
 sandbox/grist/test_dropdown_condition.py      |  108 ++
 sandbox/grist/test_predicate_formula.py       |  154 +++
 sandbox/grist/useractions.py                  |   17 +-
 test/client/lib/ACIndex.ts                    |    9 +-
 test/client/lib/SafeBrowser.ts                |    3 -
 .../{ui/AccountPage.ts => lib/nameUtils.ts}   |    6 +-
 .../{models/HomeModel.ts => lib/timeUtils.ts} |    6 +-
 test/fixtures/docs/DropdownCondition.grist    |  Bin 0 -> 167936 bytes
 test/nbrowser/DropdownConditionEditor.ts      |  272 +++++
 test/nbrowser/Importer.ts                     | 1008 +++++++++++++++++
 test/nbrowser/Importer2.ts                    |  818 +++++++++++++
 test/nbrowser/importerTestUtils.ts            |    2 +-
 test/server/lib/ACLFormula.ts                 |    8 +-
 86 files changed, 4221 insertions(+), 1060 deletions(-)
 create mode 100644 app/client/components/DropdownConditionConfig.ts
 create mode 100644 app/client/components/DropdownConditionEditor.ts
 create mode 100644 app/client/lib/nameUtils.ts
 create mode 100644 app/client/lib/timeUtils.ts
 create mode 100644 app/client/ui2018/theme.ts
 create mode 100644 app/common/DropdownCondition.ts
 create mode 100644 app/common/PredicateFormula.ts
 delete mode 100644 app/server/lib/ACLFormula.ts
 create mode 100644 sandbox/grist/dropdown_condition.py
 create mode 100644 sandbox/grist/predicate_formula.py
 create mode 100644 sandbox/grist/test_dropdown_condition.py
 create mode 100644 sandbox/grist/test_predicate_formula.py
 rename test/client/{ui/AccountPage.ts => lib/nameUtils.ts} (91%)
 rename test/client/{models/HomeModel.ts => lib/timeUtils.ts} (87%)
 create mode 100644 test/fixtures/docs/DropdownCondition.grist
 create mode 100644 test/nbrowser/DropdownConditionEditor.ts
 create mode 100644 test/nbrowser/Importer.ts
 create mode 100644 test/nbrowser/Importer2.ts

diff --git a/app/client/aclui/ACLFormulaEditor.ts b/app/client/aclui/ACLFormulaEditor.ts
index 849b19dd..a99bc9ee 100644
--- a/app/client/aclui/ACLFormulaEditor.ts
+++ b/app/client/aclui/ACLFormulaEditor.ts
@@ -1,13 +1,12 @@
 import ace, {Ace} from 'ace-builds';
 import {setupAceEditorCompletions} from 'app/client/components/AceEditorCompletions';
 import {theme} from 'app/client/ui2018/cssVars';
+import {gristThemeObs} from 'app/client/ui2018/theme';
 import {Theme} from 'app/common/ThemePrefs';
-import {getGristConfig} from 'app/common/urlUtils';
-import {Computed, dom, DomArg, Listener, Observable, styled} from 'grainjs';
+import {dom, DomArg, Observable, styled} from 'grainjs';
 import debounce from 'lodash/debounce';
 
 export interface ACLFormulaOptions {
-  gristTheme: Computed<Theme>;
   initialValue: string;
   readOnly: boolean;
   placeholder: DomArg;
@@ -22,19 +21,15 @@ export function aclFormulaEditor(options: ACLFormulaOptions) {
   const editor: Ace.Editor = ace.edit(editorElem);
 
   // Set various editor options.
-  function setAceTheme(gristTheme: Theme) {
-    const {enableCustomCss} = getGristConfig();
-    const gristAppearance = gristTheme.appearance;
-    const aceTheme = gristAppearance === 'dark' && !enableCustomCss ? 'dracula' : 'chrome';
+  function setAceTheme(newTheme: Theme) {
+    const {appearance} = newTheme;
+    const aceTheme = appearance === 'dark' ? 'dracula' : 'chrome';
     editor.setTheme(`ace/theme/${aceTheme}`);
   }
-  setAceTheme(options.gristTheme.get());
-  let themeListener: Listener | undefined;
-  if (!getGristConfig().enableCustomCss) {
-    themeListener = options.gristTheme.addListener((gristTheme) => {
-      setAceTheme(gristTheme);
-    });
-  }
+  setAceTheme(gristThemeObs().get());
+  const themeListener = gristThemeObs().addListener((newTheme) => {
+    setAceTheme(newTheme);
+  });
   // ACE editor resizes automatically when maxLines is set.
   editor.setOptions({enableLiveAutocompletion: true, maxLines: 10});
   editor.renderer.setShowGutter(false);       // Default line numbers to hidden
diff --git a/app/client/aclui/AccessRules.ts b/app/client/aclui/AccessRules.ts
index 010d05b1..167f27df 100644
--- a/app/client/aclui/AccessRules.ts
+++ b/app/client/aclui/AccessRules.ts
@@ -36,14 +36,13 @@ import {ACLRuleCollection, isSchemaEditResource, SPECIAL_RULES_TABLE_ID} from 'a
 import {AclRuleProblem, AclTableDescription, getTableTitle} from 'app/common/ActiveDocAPI';
 import {BulkColValues, getColValues, RowRecord, UserAction} from 'app/common/DocActions';
 import {
-  FormulaProperties,
-  getFormulaProperties,
   RulePart,
   RuleSet,
   UserAttributeRule
 } from 'app/common/GranularAccessClause';
 import {isHiddenCol} from 'app/common/gristTypes';
 import {isNonNullish, unwrap} from 'app/common/gutil';
+import {getPredicateFormulaProperties, PredicateFormulaProperties} from 'app/common/PredicateFormula';
 import {SchemaTypes} from 'app/common/schema';
 import {MetaRowRecord} from 'app/common/TableData';
 import {
@@ -496,7 +495,7 @@ export class AccessRules extends Disposable {
     removeItem(this._userAttrRules, userAttr);
   }
 
-  public async checkAclFormula(text: string): Promise<FormulaProperties> {
+  public async checkAclFormula(text: string): Promise<PredicateFormulaProperties> {
     if (text) {
       return this.gristDoc.docComm.checkAclFormula(text);
     }
@@ -1465,7 +1464,6 @@ class ObsUserAttributeRule extends Disposable {
         cssColumnGroup(
           cssCell1(
             aclFormulaEditor({
-              gristTheme: this._accessRules.gristDoc.currentTheme,
               initialValue: this._charId.get(),
               readOnly: false,
               setValue: (text) => this._setUserAttr(text),
@@ -1598,7 +1596,8 @@ class ObsRulePart extends Disposable {
   // If the formula failed validation, the error message to show. Blank if valid.
   private _formulaError = Observable.create(this, '');
 
-  private _formulaProperties = Observable.create<FormulaProperties>(this, getAclFormulaProperties(this._rulePart));
+  private _formulaProperties = Observable.create<PredicateFormulaProperties>(this,
+    getAclFormulaProperties(this._rulePart));
 
   // Error message if any validation failed.
   private _error: Computed<string>;
@@ -1618,7 +1617,7 @@ class ObsRulePart extends Disposable {
 
     this._error = Computed.create(this, (use) => {
       return use(this._formulaError) ||
-        this._warnInvalidColIds(use(this._formulaProperties).usedColIds) ||
+        this._warnInvalidColIds(use(this._formulaProperties).recColIds) ||
         ( !this._ruleSet.isLastCondition(use, this) &&
           use(this._aclFormula) === '' &&
           permissionSetToText(use(this._permissions)) !== '' ?
@@ -1690,7 +1689,6 @@ class ObsRulePart extends Disposable {
         cssCell2(
           wide ? cssCell4.cls('') : null,
           aclFormulaEditor({
-            gristTheme: this._ruleSet.accessRules.gristDoc.currentTheme,
             initialValue: this._aclFormula.get(),
             readOnly: this.isBuiltIn(),
             setValue: (value) => this._setAclFormula(value),
@@ -1913,9 +1911,9 @@ function getChangedStatus(value: boolean): RuleStatus {
   return value ? RuleStatus.ChangedValid : RuleStatus.Unchanged;
 }
 
-function getAclFormulaProperties(part?: RulePart): FormulaProperties {
+function getAclFormulaProperties(part?: RulePart): PredicateFormulaProperties {
   const aclFormulaParsed = part?.origRecord?.aclFormulaParsed;
-  return aclFormulaParsed ? getFormulaProperties(JSON.parse(String(aclFormulaParsed))) : {};
+  return aclFormulaParsed ? getPredicateFormulaProperties(JSON.parse(String(aclFormulaParsed))) : {};
 }
 
 // Return a rule set if it applies to one of the specified columns.
diff --git a/app/client/components/AceEditor.js b/app/client/components/AceEditor.js
index afac581b..59f31fe2 100644
--- a/app/client/components/AceEditor.js
+++ b/app/client/components/AceEditor.js
@@ -7,10 +7,10 @@ require('ace-builds/src-noconflict/theme-chrome');
 require('ace-builds/src-noconflict/theme-dracula');
 require('ace-builds/src-noconflict/ext-language_tools');
 var {setupAceEditorCompletions} = require('./AceEditorCompletions');
-var {getGristConfig} = require('../../common/urlUtils');
 var dom = require('../lib/dom');
 var dispose = require('../lib/dispose');
 var modelUtil = require('../models/modelUtil');
+var {gristThemeObs} = require('../ui2018/theme');
 
 /**
  * A class to help set up the ace editor with standard formatting and convenience functions
@@ -28,10 +28,9 @@ function AceEditor(options) {
   this.observable = options.observable || null;
   this.saveValueOnBlurEvent = !(options.saveValueOnBlurEvent === false);
   this.calcSize = options.calcSize || ((_elem, size) => size);
-  this.gristDoc = options.gristDoc || null;
-  this.column = options.column || null;
   this.editorState = options.editorState || null;
   this._readonly = options.readonly || false;
+  this._getSuggestions = options.getSuggestions || null;
 
   this.editor = null;
   this.editorDom = null;
@@ -185,19 +184,8 @@ AceEditor.prototype.setFontSize = function(pxVal) {
 AceEditor.prototype._setup = function() {
   // Standard editor setup
   this.editor = this.autoDisposeWith('destroy', ace.edit(this.editorDom));
-  if (this.gristDoc && this.column) {
-    const getSuggestions = (prefix) => {
-      const section = this.gristDoc.viewModel.activeSection();
-      // If section is disposed or is pointing to an empty row, don't try to autocomplete.
-      if (!section?.getRowId()) {
-        return [];
-      }
-      const tableId = section.table().tableId();
-      const columnId = this.column.colId();
-      const rowId = section.activeRowId();
-      return this.gristDoc.docComm.autocomplete(prefix, tableId, columnId, rowId);
-    };
-    setupAceEditorCompletions(this.editor, {getSuggestions});
+  if (this._getSuggestions) {
+    setupAceEditorCompletions(this.editor, {getSuggestions: this._getSuggestions});
   }
   this.editor.setOptions({
     enableLiveAutocompletion: true,   // use autocompletion without needing special activation.
@@ -205,13 +193,10 @@ AceEditor.prototype._setup = function() {
   this.session = this.editor.getSession();
   this.session.setMode('ace/mode/python');
 
-  const gristTheme = this.gristDoc?.currentTheme;
-  this._setAceTheme(gristTheme?.get());
-  if (!getGristConfig().enableCustomCss && gristTheme) {
-    this.autoDispose(gristTheme.addListener((theme) => {
-      this._setAceTheme(theme);
-    }));
-  }
+  this._setAceTheme(gristThemeObs().get());
+  this.autoDispose(gristThemeObs().addListener((newTheme) => {
+    this._setAceTheme(newTheme);
+  }));
 
   // Default line numbers to hidden
   this.editor.renderer.setShowGutter(false);
@@ -283,10 +268,9 @@ AceEditor.prototype._getContentHeight = function() {
   return Math.max(1, this.session.getScreenLength()) * this.editor.renderer.lineHeight;
 };
 
-AceEditor.prototype._setAceTheme = function(gristTheme) {
-  const {enableCustomCss} = getGristConfig();
-  const gristAppearance = gristTheme?.appearance;
-  const aceTheme = gristAppearance === 'dark' && !enableCustomCss ? 'dracula' : 'chrome';
+AceEditor.prototype._setAceTheme = function(newTheme) {
+  const {appearance} = newTheme;
+  const aceTheme = appearance === 'dark' ? 'dracula' : 'chrome';
   this.editor.setTheme(`ace/theme/${aceTheme}`);
 };
 
diff --git a/app/client/components/ChartView.ts b/app/client/components/ChartView.ts
index 7b33169b..3c49e2dd 100644
--- a/app/client/components/ChartView.ts
+++ b/app/client/components/ChartView.ts
@@ -17,6 +17,7 @@ import {cssFieldEntry, cssFieldLabel, IField, VisibleFieldsConfig } from 'app/cl
 import {IconName} from 'app/client/ui2018/IconList';
 import {squareCheckbox} from 'app/client/ui2018/checkbox';
 import {theme, vars} from 'app/client/ui2018/cssVars';
+import {gristThemeObs} from 'app/client/ui2018/theme';
 import {cssDragger} from 'app/client/ui2018/draggableList';
 import {icon} from 'app/client/ui2018/icons';
 import {IOptionFull, linkSelect, menu, menuItem, menuText, select} from 'app/client/ui2018/menus';
@@ -229,7 +230,7 @@ export class ChartView extends Disposable {
     this.listenTo(this.sortedRows, 'rowNotify', this._update);
     this.autoDispose(this.sortedRows.getKoArray().subscribe(this._update));
     this.autoDispose(this._formatterComp.subscribe(this._update));
-    this.autoDispose(this.gristDoc.currentTheme.addListener(() => this._update()));
+    this.autoDispose(gristThemeObs().addListener(() => this._update()));
   }
 
   public prepareToPrint(onOff: boolean) {
@@ -387,8 +388,7 @@ export class ChartView extends Disposable {
   }
 
   private _getPlotlyTheme(): Partial<Layout> {
-    const appModel = this.gristDoc.docPageModel.appModel;
-    const {colors} = appModel.currentTheme.get();
+    const {colors} = gristThemeObs().get();
     return {
       paper_bgcolor: colors['chart-bg'],
       plot_bgcolor: colors['chart-bg'],
diff --git a/app/client/components/ColumnTransform.ts b/app/client/components/ColumnTransform.ts
index 127caae2..3e2881a7 100644
--- a/app/client/components/ColumnTransform.ts
+++ b/app/client/components/ColumnTransform.ts
@@ -91,9 +91,9 @@ export class ColumnTransform extends Disposable {
   protected buildEditorDom(optInit?: string) {
     if (!this.editor) {
       this.editor = this.autoDispose(AceEditor.create({
-        gristDoc: this.gristDoc,
         observable: this.transformColumn.formula,
         saveValueOnBlurEvent: false,
+        // TODO: set `getSuggestions` (see `FormulaEditor.ts` for an example).
       }));
     }
     return this.editor.buildDom((aceObj: any) => {
diff --git a/app/client/components/CustomView.ts b/app/client/components/CustomView.ts
index 8c05db3c..168aea10 100644
--- a/app/client/components/CustomView.ts
+++ b/app/client/components/CustomView.ts
@@ -321,7 +321,7 @@ export class CustomView extends Disposable {
           }),
           new MinimumLevel(AccessLevel.none)); // none access is enough
         frame.useEvents(
-          ThemeNotifier.create(frame, this.gristDoc.currentTheme),
+          ThemeNotifier.create(frame),
           new MinimumLevel(AccessLevel.none));
       },
       onElem: (iframe) => onFrameFocus(iframe, () => {
diff --git a/app/client/components/DropdownConditionConfig.ts b/app/client/components/DropdownConditionConfig.ts
new file mode 100644
index 00000000..c3cb2e08
--- /dev/null
+++ b/app/client/components/DropdownConditionConfig.ts
@@ -0,0 +1,197 @@
+import {buildDropdownConditionEditor} from 'app/client/components/DropdownConditionEditor';
+import {makeT} from 'app/client/lib/localization';
+import {ViewFieldRec} from 'app/client/models/DocModel';
+import {cssLabel, cssRow} from 'app/client/ui/RightPanelStyles';
+import {withInfoTooltip} from 'app/client/ui/tooltips';
+import {textButton } from 'app/client/ui2018/buttons';
+import {testId, theme} from 'app/client/ui2018/cssVars';
+import {ISuggestionWithValue} from 'app/common/ActiveDocAPI';
+import {getPredicateFormulaProperties} from 'app/common/PredicateFormula';
+import {Computed, Disposable, dom, Observable, styled} from 'grainjs';
+
+const t = makeT('DropdownConditionConfig');
+
+/**
+ * Right panel configuration for dropdown conditions.
+ *
+ * Contains an instance of `DropdownConditionEditor`, the class responsible
+ * for setting dropdown conditions.
+ */
+export class DropdownConditionConfig extends Disposable {
+  private _text = Computed.create(this, use => {
+    const dropdownCondition = use(this._field.dropdownCondition);
+    if (!dropdownCondition) { return ''; }
+
+    return dropdownCondition.text;
+  });
+
+  private _saveError = Observable.create<string | null>(this, null);
+
+  private _properties = Computed.create(this, use => {
+    const dropdownCondition = use(this._field.dropdownCondition);
+    if (!dropdownCondition?.parsed) { return null; }
+
+    return getPredicateFormulaProperties(JSON.parse(dropdownCondition.parsed));
+  });
+
+  private _column = Computed.create(this, use => use(this._field.column));
+
+  private _columns = Computed.create(this, use => use(use(use(this._column).table).visibleColumns));
+
+  private _refColumns = Computed.create(this, use => {
+    const refTable = use(use(this._column).refTable);
+    if (!refTable) { return null; }
+
+    return use(refTable.visibleColumns);
+  });
+
+  private _propertiesError = Computed.create<string | null>(this, use => {
+    const properties = use(this._properties);
+    if (!properties) { return null; }
+
+    const {recColIds = [], choiceColIds = []} = properties;
+    const columns = use(this._columns);
+    const validRecColIds = new Set(columns.map((({colId}) => use(colId))));
+    const invalidRecColIds = recColIds.filter(colId => !validRecColIds.has(colId));
+    if (invalidRecColIds.length > 0) {
+      return t('Invalid columns: {{colIds}}', {colIds: invalidRecColIds.join(', ')});
+    }
+
+    const refColumns = use(this._refColumns);
+    if (refColumns) {
+      const validChoiceColIds = new Set(['id', ...refColumns.map((({colId}) => use(colId)))]);
+      const invalidChoiceColIds = choiceColIds.filter(colId => !validChoiceColIds.has(colId));
+      if (invalidChoiceColIds.length > 0) {
+        return t('Invalid columns: {{colIds}}', {colIds: invalidChoiceColIds.join(', ')});
+      }
+    }
+
+    return null;
+  });
+
+  private _error = Computed.create<string | null>(this, (use) => {
+    const maybeSaveError = use(this._saveError);
+    if (maybeSaveError) { return maybeSaveError; }
+
+    const maybeCompiled = use(this._field.dropdownConditionCompiled);
+    if (maybeCompiled?.kind === 'failure') { return maybeCompiled.error; }
+
+    const maybePropertiesError = use(this._propertiesError);
+    if (maybePropertiesError) { return maybePropertiesError; }
+
+    return null;
+  });
+
+  private _disabled = Computed.create(this, use =>
+    use(this._field.disableModify) ||
+    use(use(this._column).disableEditData) ||
+    use(this._field.config.multiselect)
+  );
+
+  private _isEditingCondition = Observable.create(this, false);
+
+  private _isRefField = Computed.create(this, (use) =>
+    ['Ref', 'RefList'].includes(use(use(this._column).pureType)));
+
+  private _tooltip = Computed.create(this, use => use(this._isRefField)
+    ? 'setRefDropdownCondition'
+    : 'setChoiceDropdownCondition');
+
+  private _editorElement: HTMLElement;
+
+  constructor(private _field: ViewFieldRec) {
+    super();
+
+    this.autoDispose(this._text.addListener(() => {
+      this._saveError.set('');
+    }));
+  }
+
+  public buildDom() {
+    return [
+      dom.maybe((use) => !(use(this._isEditingCondition) || Boolean(use(this._text))), () => [
+        cssSetDropdownConditionRow(
+          dom.domComputed(use => withInfoTooltip(
+            textButton(
+              t('Set dropdown condition'),
+              dom.on('click', () => {
+                this._isEditingCondition.set(true);
+                setTimeout(() => this._editorElement.focus(), 0);
+              }),
+              dom.prop('disabled', this._disabled),
+              testId('field-set-dropdown-condition'),
+            ),
+            use(this._tooltip),
+          )),
+        ),
+      ]),
+      dom.maybe((use) => use(this._isEditingCondition) || Boolean(use(this._text)), () => [
+        cssLabel(t('Dropdown Condition')),
+        cssRow(
+          dom.create(buildDropdownConditionEditor,
+            {
+              value: this._text,
+              disabled: this._disabled,
+              getAutocompleteSuggestions: () => this._getAutocompleteSuggestions(),
+              onSave: async (value) => {
+                try {
+                  const widgetOptions = this._field.widgetOptionsJson.peek();
+                  if (value.trim() === '') {
+                    delete widgetOptions.dropdownCondition;
+                  } else {
+                    widgetOptions.dropdownCondition = {text: value};
+                  }
+                  await this._field.widgetOptionsJson.setAndSave(widgetOptions);
+                } catch (e) {
+                  if (e?.code === 'ACL_DENY') {
+                    reportError(e);
+                  } else {
+                    this._saveError.set(e.message.replace(/^\[Sandbox\]/, '').trim());
+                  }
+                }
+              },
+              onDispose: () => {
+                this._isEditingCondition.set(false);
+              },
+            },
+            (el) => { this._editorElement = el; },
+            testId('field-dropdown-condition'),
+          ),
+        ),
+        dom.maybe(this._error, (error) => cssRow(
+          cssDropdownConditionError(error), testId('field-dropdown-condition-error')),
+        ),
+      ]),
+    ];
+  }
+
+  private _getAutocompleteSuggestions(): ISuggestionWithValue[] {
+    const variables = ['choice'];
+    const refColumns = this._refColumns.get();
+    if (refColumns) {
+      variables.push('choice.id', ...refColumns.map(({colId}) => `choice.${colId.peek()}`));
+    }
+    const columns = this._columns.get();
+    variables.push(
+      ...columns.map(({colId}) => `$${colId.peek()}`),
+      ...columns.map(({colId}) => `rec.${colId.peek()}`),
+    );
+
+    const suggestions = [
+      'and', 'or', 'not', 'in', 'is', 'True', 'False', 'None',
+      'OWNER', 'EDITOR', 'VIEWER',
+      ...variables,
+    ];
+    return suggestions.map(suggestion => [suggestion, null]);
+  }
+}
+
+const cssSetDropdownConditionRow = styled(cssRow, `
+  margin-top: 16px;
+`);
+
+const cssDropdownConditionError = styled('div', `
+  color: ${theme.errorText};
+  margin-top: 4px;
+  width: 100%;
+`);
diff --git a/app/client/components/DropdownConditionEditor.ts b/app/client/components/DropdownConditionEditor.ts
new file mode 100644
index 00000000..1091ae44
--- /dev/null
+++ b/app/client/components/DropdownConditionEditor.ts
@@ -0,0 +1,234 @@
+import * as AceEditor from 'app/client/components/AceEditor';
+import {createGroup} from 'app/client/components/commands';
+import {makeT} from 'app/client/lib/localization';
+import {buildHighlightedCode} from 'app/client/ui/CodeHighlight';
+import {theme} from 'app/client/ui2018/cssVars';
+import {createMobileButtons, getButtonMargins} from 'app/client/widgets/EditorButtons';
+import {EditorPlacement, ISize} from 'app/client/widgets/EditorPlacement';
+import {initializeAceOptions} from 'app/client/widgets/FormulaEditor';
+import {IEditorCommandGroup} from 'app/client/widgets/NewBaseEditor';
+import {ISuggestionWithValue} from 'app/common/ActiveDocAPI';
+import {
+  Computed,
+  Disposable,
+  dom,
+  DomElementArg,
+  Holder,
+  IDisposableOwner,
+  Observable,
+  styled,
+} from 'grainjs';
+
+const t = makeT('DropdownConditionEditor');
+
+interface BuildDropdownConditionEditorOptions {
+  value: Computed<string>;
+  disabled: Computed<boolean>;
+  onSave(value: string): Promise<void>;
+  onDispose(): void;
+  getAutocompleteSuggestions(prefix: string): ISuggestionWithValue[];
+}
+
+/**
+ * Builds an editor for dropdown conditions.
+ *
+ * Dropdown conditions are client-evaluated predicate formulas used to filter
+ * items shown in autocomplete dropdowns for Choice and Reference type columns.
+ *
+ * Unlike Python formulas, dropdown conditions only support a very limited set of
+ * features. They are a close relative of ACL formulas, sharing the same underlying
+ * parser and compiler.
+ *
+ * See `sandbox/grist/predicate_formula.py` and `app/common/PredicateFormula.ts` for
+ * more details on parsing and compiling, respectively.
+ */
+export function buildDropdownConditionEditor(
+  owner: IDisposableOwner,
+  options: BuildDropdownConditionEditorOptions,
+  ...args: DomElementArg[]
+) {
+  const {value, disabled, onSave, onDispose, getAutocompleteSuggestions} = options;
+  return dom.create(buildHighlightedCode,
+    value,
+    {maxLines: 1},
+    dom.cls(cssDropdownConditionField.className),
+    dom.cls('disabled'),
+    cssDropdownConditionField.cls('-disabled', disabled),
+    {tabIndex: '-1'},
+    dom.on('focus', (_, refElem) => openDropdownConditionEditor(owner, {
+      refElem,
+      value,
+      onSave,
+      onDispose,
+      getAutocompleteSuggestions,
+    })),
+    ...args,
+  );
+}
+
+function openDropdownConditionEditor(owner: IDisposableOwner, options: {
+  refElem: Element;
+  value: Computed<string>;
+  onSave: (value: string) => Promise<void>;
+  onDispose: () => void;
+  getAutocompleteSuggestions(prefix: string): ISuggestionWithValue[];
+}) {
+  const {refElem, value, onSave, onDispose, getAutocompleteSuggestions} = options;
+
+  const saveAndDispose = async () => {
+    const editorValue = editor.getValue();
+    if (editorValue !== value.get()) {
+      await onSave(editorValue);
+    }
+    if (editor.isDisposed()) { return; }
+
+    editor.dispose();
+  };
+
+  const commands: IEditorCommandGroup = {
+    fieldEditCancel: () => editor.dispose(),
+    fieldEditSaveHere: () => editor.blur(),
+    fieldEditSave: () => editor.blur(),
+  };
+
+  const editor = DropdownConditionEditor.create(owner, {
+    editValue: value.get(),
+    commands,
+    onBlur: saveAndDispose,
+    getAutocompleteSuggestions,
+  });
+  editor.attach(refElem);
+  editor.onDispose(() => onDispose());
+}
+
+interface DropdownConditionEditorOptions {
+  editValue: string;
+  commands: IEditorCommandGroup;
+  onBlur(): Promise<void>;
+  getAutocompleteSuggestions(prefix: string): ISuggestionWithValue[];
+}
+
+class DropdownConditionEditor extends Disposable {
+  private _aceEditor: any;
+  private _dom: HTMLElement;
+  private _editorPlacement!: EditorPlacement;
+  private _placementHolder = Holder.create(this);
+  private _isEmpty: Computed<boolean>;
+
+  constructor(private _options: DropdownConditionEditorOptions) {
+    super();
+
+    const initialValue = _options.editValue;
+    const editorState = Observable.create(this, initialValue);
+
+    this._aceEditor = this.autoDispose(AceEditor.create({
+      calcSize: this._calcSize.bind(this),
+      editorState,
+      getSuggestions: _options.getAutocompleteSuggestions,
+    }));
+
+    this._isEmpty = Computed.create(this, editorState, (_use, state) => state === '');
+    this.autoDispose(this._isEmpty.addListener(() => this._updateEditorPlaceholder()));
+
+    const commandGroup = this.autoDispose(createGroup({
+      ..._options.commands,
+    }, this, true));
+
+    this._dom = cssDropdownConditionEditorWrapper(
+      cssDropdownConditionEditor(
+        createMobileButtons(_options.commands),
+        this._aceEditor.buildDom((aceObj: any) => {
+          initializeAceOptions(aceObj);
+          const val = initialValue;
+          const pos = val.length;
+          this._aceEditor.setValue(val, pos);
+          this._aceEditor.attachCommandGroup(commandGroup);
+          if (val === '') {
+            this._updateEditorPlaceholder();
+          }
+        })
+      ),
+    );
+  }
+
+  public attach(cellElem: Element): void {
+    this._editorPlacement = EditorPlacement.create(this._placementHolder, this._dom, cellElem, {
+      margins: getButtonMargins(),
+    });
+    this.autoDispose(this._editorPlacement.onReposition.addListener(this._aceEditor.resize, this._aceEditor));
+    this._aceEditor.onAttach();
+    this._updateEditorPlaceholder();
+    this._aceEditor.resize();
+    this._aceEditor.getEditor().focus();
+    this._aceEditor.getEditor().on('blur', () => this._options.onBlur());
+  }
+
+  public getValue(): string {
+    return this._aceEditor.getValue();
+  }
+
+  public blur() {
+    this._aceEditor.getEditor().blur();
+  }
+
+  private _updateEditorPlaceholder() {
+    const editor = this._aceEditor.getEditor();
+    const shouldShowPlaceholder = editor.session.getValue().length === 0;
+    if (editor.renderer.emptyMessageNode) {
+      // Remove the current placeholder if one is present.
+      editor.renderer.scroller.removeChild(editor.renderer.emptyMessageNode);
+    }
+    if (!shouldShowPlaceholder) {
+      editor.renderer.emptyMessageNode = null;
+    } else {
+      editor.renderer.emptyMessageNode = cssDropdownConditionPlaceholder(t('Enter condition.'));
+      editor.renderer.scroller.appendChild(editor.renderer.emptyMessageNode);
+    }
+  }
+
+  private _calcSize(elem: HTMLElement, desiredElemSize: ISize) {
+    const placeholder: HTMLElement | undefined = this._aceEditor.getEditor().renderer.emptyMessageNode;
+    if (placeholder) {
+      return this._editorPlacement.calcSizeWithPadding(elem, {
+        width: placeholder.scrollWidth,
+        height: placeholder.scrollHeight,
+      });
+    } else {
+      return this._editorPlacement.calcSizeWithPadding(elem, {
+        width: desiredElemSize.width,
+        height: desiredElemSize.height,
+      });
+    }
+  }
+}
+
+const cssDropdownConditionField = styled('div', `
+  flex: auto;
+  cursor: pointer;
+  margin-top: 4px;
+
+  &-disabled {
+    opacity: 0.4;
+    pointer-events: none;
+  }
+`);
+
+const cssDropdownConditionEditorWrapper = styled('div.default_editor.formula_editor_wrapper', `
+  border-radius: 3px;
+`);
+
+const cssDropdownConditionEditor = styled('div', `
+  background-color: ${theme.aceEditorBg};
+  padding: 5px;
+  z-index: 10;
+  overflow: hidden;
+  flex: none;
+  min-height: 22px;
+  border-radius: 3px;
+`);
+
+const cssDropdownConditionPlaceholder = styled('div', `
+  color: ${theme.lightText};
+  font-style: italic;
+  white-space: nowrap;
+`);
diff --git a/app/client/components/GristDoc.ts b/app/client/components/GristDoc.ts
index 89e08d36..bbbab48b 100644
--- a/app/client/components/GristDoc.ts
+++ b/app/client/components/GristDoc.ts
@@ -192,8 +192,6 @@ export class GristDoc extends DisposableWithEvents {
   // Holder for the popped up formula editor.
   public readonly formulaPopup = Holder.create(this);
 
-  public readonly currentTheme = this.docPageModel.appModel.currentTheme;
-
   public get docApi() {
     return this.docPageModel.appModel.api.getDocAPI(this.docPageModel.currentDocId.get()!);
   }
@@ -238,7 +236,6 @@ export class GristDoc extends DisposableWithEvents {
       untrustedContentOrigin: app.topAppModel.getUntrustedContentOrigin(),
       docComm: this.docComm,
       clientScope: app.clientScope,
-      theme: this.currentTheme,
     });
 
     // Maintain the MetaRowModel for the global document info, including docId and peers.
diff --git a/app/client/components/Importer.ts b/app/client/components/Importer.ts
index da779d6c..5e450d58 100644
--- a/app/client/components/Importer.ts
+++ b/app/client/components/Importer.ts
@@ -1345,8 +1345,9 @@ export class Importer extends DisposableWithEvents {
       const column = use(field.column);
       return use(column.formula);
     });
-    const codeOptions = {gristTheme: this._gristDoc.currentTheme, placeholder: 'Skip', maxLines: 1};
-    return cssFieldFormula(formula, codeOptions,
+    const codeOptions = {placeholder: 'Skip', maxLines: 1};
+    return dom.create(buildHighlightedCode, formula, codeOptions,
+      dom.cls(cssFieldFormula.className),
       dom.cls('disabled'),
       dom.cls('formula_field_sidepane'),
       {tabIndex: '-1'},
@@ -1701,7 +1702,7 @@ const cssColumnMatchRow = styled('div', `
   }
 `);
 
-const cssFieldFormula = styled(buildHighlightedCode, `
+const cssFieldFormula = styled('div', `
   flex: auto;
   cursor: pointer;
   margin-top: 1px;
diff --git a/app/client/components/Printing.ts b/app/client/components/Printing.ts
index 3dccfff1..7835d90e 100644
--- a/app/client/components/Printing.ts
+++ b/app/client/components/Printing.ts
@@ -2,7 +2,7 @@ import {CustomView} from 'app/client/components/CustomView';
 import {DataRowModel} from 'app/client/models/DataRowModel';
 import DataTableModel from 'app/client/models/DataTableModel';
 import {ViewSectionRec} from 'app/client/models/DocModel';
-import {prefersDarkMode, prefersDarkModeObs} from 'app/client/ui2018/cssVars';
+import {prefersColorSchemeDark, prefersColorSchemeDarkObs} from 'app/client/ui2018/theme';
 import {dom} from 'grainjs';
 
 type RowId = number|'new';
@@ -45,7 +45,7 @@ export async function printViewSection(layout: any, viewSection: ViewSectionRec)
     // is Grist temporarily reverting to the light theme until the print dialog is dismissed.
     // As a workaround, we'll temporarily pause our listener, and unpause after the print dialog
     // is dismissed.
-    prefersDarkModeObs().pause();
+    prefersColorSchemeDarkObs().pause();
 
     // Hide all layout boxes that do NOT contain the section to be printed.
     layout?.forEachBox((box: any) => {
@@ -87,10 +87,10 @@ export async function printViewSection(layout: any, viewSection: ViewSectionRec)
       prepareToPrint(false);
     }
     delete (window as any).afterPrintCallback;
-    prefersDarkModeObs().pause(false);
+    prefersColorSchemeDarkObs().pause(false);
 
     // This may have changed while window.print() was blocking.
-    prefersDarkModeObs().set(prefersDarkMode());
+    prefersColorSchemeDarkObs().set(prefersColorSchemeDark());
   });
 
   // Running print on a timeout makes it possible to test printing using selenium, and doesn't
diff --git a/app/client/components/WidgetFrame.ts b/app/client/components/WidgetFrame.ts
index bc6228cb..8a2b1bb8 100644
--- a/app/client/components/WidgetFrame.ts
+++ b/app/client/components/WidgetFrame.ts
@@ -7,11 +7,11 @@ import {get as getBrowserGlobals} from 'app/client/lib/browserGlobals';
 import {makeTestId} from 'app/client/lib/domUtils';
 import {ColumnRec, ViewSectionRec} from 'app/client/models/DocModel';
 import {reportError} from 'app/client/models/errors';
+import {gristThemeObs} from 'app/client/ui2018/theme';
 import {AccessLevel, ICustomWidget, isSatisfied, matchWidget} from 'app/common/CustomWidget';
 import {DisposableWithEvents} from 'app/common/DisposableWithEvents';
 import {BulkColValues, fromTableDataAction, RowRecord} from 'app/common/DocActions';
 import {extractInfoFromColType, reencodeAsAny} from 'app/common/gristTypes';
-import {Theme} from 'app/common/ThemePrefs';
 import {getGristConfig} from 'app/common/urlUtils';
 import {
   AccessTokenOptions, CursorPos, CustomSectionAPI, FetchSelectedOptions, GristDocAPI, GristView,
@@ -696,10 +696,10 @@ export class ConfigNotifier extends BaseEventSource {
  * Notifies about theme changes. Exposed in the API as `onThemeChange`.
  */
 export class ThemeNotifier extends BaseEventSource {
-  constructor(private _theme: Computed<Theme>) {
+  constructor() {
     super();
     this.autoDispose(
-      this._theme.addListener((newTheme, oldTheme) => {
+      gristThemeObs().addListener((newTheme, oldTheme) => {
         if (isEqual(newTheme, oldTheme)) { return; }
 
         this._update();
@@ -715,7 +715,7 @@ export class ThemeNotifier extends BaseEventSource {
     if (this.isDisposed()) { return; }
 
     this._notify({
-      theme: this._theme.get(),
+      theme: gristThemeObs().get(),
       fromReady,
     });
   }
diff --git a/app/client/lib/ACIndex.ts b/app/client/lib/ACIndex.ts
index 96adb4c5..b8bd65c8 100644
--- a/app/client/lib/ACIndex.ts
+++ b/app/client/lib/ACIndex.ts
@@ -51,6 +51,9 @@ export interface ACResults<Item extends ACItem> {
   // Matching items in order from best match to worst.
   items: Item[];
 
+  // Additional items to show (e.g. the "Add New" item, for Choice and Reference fields).
+  extraItems: Item[];
+
   // May be used to highlight matches using buildHighlightedDom().
   highlightFunc: HighlightFunc;
 
@@ -159,7 +162,7 @@ export class ACIndexImpl<Item extends ACItem> implements ACIndex<Item> {
 
     if (!cleanedSearchText) {
       // In this case we are just returning the first few items.
-      return {items, highlightFunc: highlightNone, selectIndex: -1};
+      return {items, extraItems: [], highlightFunc: highlightNone, selectIndex: -1};
     }
 
     const highlightFunc = highlightMatches.bind(null, searchWords);
@@ -170,7 +173,7 @@ export class ACIndexImpl<Item extends ACItem> implements ACIndex<Item> {
     if (selectIndex >= 0 && !startsWithText(items[selectIndex], cleanedSearchText, searchWords)) {
       selectIndex = -1;
     }
-    return {items, highlightFunc, selectIndex};
+    return {items, extraItems: [], highlightFunc, selectIndex};
   }
 
   /**
diff --git a/app/client/lib/ACUserManager.ts b/app/client/lib/ACUserManager.ts
index ca35d4b7..af873d69 100644
--- a/app/client/lib/ACUserManager.ts
+++ b/app/client/lib/ACUserManager.ts
@@ -98,7 +98,7 @@ export function buildACMemberEmail(
         label: text,
         id: 0,
       };
-      results.items.push(newObject);
+      results.extraItems.push(newObject);
     }
     return results;
   };
diff --git a/app/client/lib/DocPluginManager.ts b/app/client/lib/DocPluginManager.ts
index a43edef5..45012116 100644
--- a/app/client/lib/DocPluginManager.ts
+++ b/app/client/lib/DocPluginManager.ts
@@ -4,8 +4,6 @@ import {SafeBrowser} from 'app/client/lib/SafeBrowser';
 import {ActiveDocAPI} from 'app/common/ActiveDocAPI';
 import {LocalPlugin} from 'app/common/plugin';
 import {createRpcLogger, PluginInstance} from 'app/common/PluginInstance';
-import {Theme} from 'app/common/ThemePrefs';
-import {Computed} from 'grainjs';
 import {Rpc} from 'grain-rpc';
 
 /**
@@ -18,7 +16,6 @@ export class DocPluginManager {
   private _clientScope = this._options.clientScope;
   private _docComm = this._options.docComm;
   private _localPlugins = this._options.plugins;
-  private _theme = this._options.theme;
   private _untrustedContentOrigin = this._options.untrustedContentOrigin;
 
   constructor(private _options: {
@@ -26,7 +23,6 @@ export class DocPluginManager {
     untrustedContentOrigin: string,
     docComm: ActiveDocAPI,
     clientScope: ClientScope,
-    theme: Computed<Theme>,
   }) {
     this.pluginsList = [];
     for (const plugin of this._localPlugins) {
@@ -38,7 +34,6 @@ export class DocPluginManager {
           clientScope: this._clientScope,
           untrustedContentOrigin: this._untrustedContentOrigin,
           mainPath: components.safeBrowser,
-          theme: this._theme,
         });
         if (components.safeBrowser) {
           pluginInstance.rpc.registerForwarder(components.safeBrowser, safeBrowser);
diff --git a/app/client/lib/HomePluginManager.ts b/app/client/lib/HomePluginManager.ts
index 0f5f31b7..28e6bac1 100644
--- a/app/client/lib/HomePluginManager.ts
+++ b/app/client/lib/HomePluginManager.ts
@@ -2,8 +2,6 @@ import {ClientScope} from 'app/client/components/ClientScope';
 import {SafeBrowser} from 'app/client/lib/SafeBrowser';
 import {LocalPlugin} from 'app/common/plugin';
 import {createRpcLogger, PluginInstance} from 'app/common/PluginInstance';
-import {Theme} from 'app/common/ThemePrefs';
-import {Computed} from 'grainjs';
 
 /**
  * Home plugins are all plugins that contributes to a general Grist management tasks.
@@ -19,9 +17,8 @@ export class HomePluginManager {
     localPlugins: LocalPlugin[],
     untrustedContentOrigin: string,
     clientScope: ClientScope,
-    theme: Computed<Theme>,
   }) {
-    const {localPlugins, untrustedContentOrigin, clientScope, theme} = options;
+    const {localPlugins, untrustedContentOrigin, clientScope} = options;
     this.pluginsList = [];
     for (const plugin of localPlugins) {
       try {
@@ -41,7 +38,6 @@ export class HomePluginManager {
           clientScope,
           untrustedContentOrigin,
           mainPath: components.safeBrowser,
-          theme,
         });
         if (components.safeBrowser) {
           pluginInstance.rpc.registerForwarder(components.safeBrowser, safeBrowser);
diff --git a/app/client/lib/ReferenceUtils.ts b/app/client/lib/ReferenceUtils.ts
index 5b393ccd..04bf6716 100644
--- a/app/client/lib/ReferenceUtils.ts
+++ b/app/client/lib/ReferenceUtils.ts
@@ -1,22 +1,36 @@
+import {ACIndex, ACResults} from 'app/client/lib/ACIndex';
+import {makeT} from 'app/client/lib/localization';
+import {ICellItem} from 'app/client/models/ColumnACIndexes';
+import {ColumnCache} from 'app/client/models/ColumnCache';
 import {DocData} from 'app/client/models/DocData';
 import {ColumnRec} from 'app/client/models/entities/ColumnRec';
 import {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec';
 import {TableData} from 'app/client/models/TableData';
 import {getReferencedTableId, isRefListType} from 'app/common/gristTypes';
+import {EmptyRecordView} from 'app/common/PredicateFormula';
 import {BaseFormatter} from 'app/common/ValueFormatter';
+import {Disposable, dom, Observable} from 'grainjs';
+
+const t = makeT('ReferenceUtils');
 
 /**
  * Utilities for common operations involving Ref[List] fields.
  */
-export class ReferenceUtils {
+export class ReferenceUtils extends Disposable {
   public readonly refTableId: string;
   public readonly tableData: TableData;
   public readonly visibleColFormatter: BaseFormatter;
   public readonly visibleColModel: ColumnRec;
   public readonly visibleColId: string;
   public readonly isRefList: boolean;
+  public readonly hasDropdownCondition = Boolean(this.field.dropdownCondition.peek()?.text);
+
+  private readonly _columnCache: ColumnCache<ACIndex<ICellItem>>;
+  private _dropdownConditionError = Observable.create<string | null>(this, null);
+
+  constructor(public readonly field: ViewFieldRec, private readonly _docData: DocData) {
+    super();
 
-  constructor(public readonly field: ViewFieldRec, docData: DocData) {
     const colType = field.column().type();
     const refTableId = getReferencedTableId(colType);
     if (!refTableId) {
@@ -24,7 +38,7 @@ export class ReferenceUtils {
     }
     this.refTableId = refTableId;
 
-    const tableData = docData.getTable(refTableId);
+    const tableData = _docData.getTable(refTableId);
     if (!tableData) {
       throw new Error("Invalid referenced table " + refTableId);
     }
@@ -34,6 +48,8 @@ export class ReferenceUtils {
     this.visibleColModel = field.visibleColModel();
     this.visibleColId = this.visibleColModel.colId() || 'id';
     this.isRefList = isRefListType(colType);
+
+    this._columnCache = new ColumnCache<ACIndex<ICellItem>>(this.tableData);
   }
 
   public idToText(value: unknown) {
@@ -43,10 +59,86 @@ export class ReferenceUtils {
     return String(value || '');
   }
 
-  public autocompleteSearch(text: string) {
-    const acIndex = this.tableData.columnACIndexes.getColACIndex(this.visibleColId, this.visibleColFormatter);
+  /**
+   * Searches the autocomplete index for the given `text`, returning
+   * all matching results and related metadata.
+   *
+   * If a dropdown condition is set, results are dependent on the `rowId`
+   * that the autocomplete dropdown is open in. Otherwise, `rowId` has no
+   * effect.
+   */
+  public autocompleteSearch(text: string, rowId: number): ACResults<ICellItem> {
+    let acIndex: ACIndex<ICellItem>;
+    if (this.hasDropdownCondition) {
+      try {
+        acIndex = this._getDropdownConditionACIndex(rowId);
+      } catch (e) {
+        this._dropdownConditionError?.set(e);
+        return {items: [], extraItems: [], highlightFunc: () => [], selectIndex: -1};
+      }
+    } else {
+      acIndex = this.tableData.columnACIndexes.getColACIndex(
+        this.visibleColId,
+        this.visibleColFormatter,
+      );
+    }
     return acIndex.search(text);
   }
+
+  public buildNoItemsMessage() {
+    return dom.domComputed(use => {
+      const error = use(this._dropdownConditionError);
+      if (error) { return t('Error in dropdown condition'); }
+
+      return this.hasDropdownCondition
+        ? t('No choices matching condition')
+        : t('No choices to select');
+    });
+  }
+
+  /**
+   * Returns a column index for the visible column, filtering the items in the
+   * index according to the set dropdown condition.
+   *
+   * This method is similar to `this.tableData.columnACIndexes.getColACIndex`,
+   * but whereas that method caches indexes globally, this method does so
+   * locally (as a new instances of this class is created each time a Reference
+   * or Reference List editor is created).
+   *
+   * It's important that this method be used when a dropdown condition is set,
+   * as items in indexes that don't satisfy the dropdown condition need to be
+   * filtered.
+   */
+  private _getDropdownConditionACIndex(rowId: number) {
+    return this._columnCache.getValue(
+      this.visibleColId,
+      () => this.tableData.columnACIndexes.buildColACIndex(
+        this.visibleColId,
+        this.visibleColFormatter,
+        this._buildDropdownConditionACFilter(rowId)
+      )
+    );
+  }
+
+  private _buildDropdownConditionACFilter(rowId: number) {
+    const dropdownConditionCompiled = this.field.dropdownConditionCompiled.get();
+    if (dropdownConditionCompiled?.kind !== 'success') {
+      throw new Error('Dropdown condition is not compiled');
+    }
+
+    const tableId = this.field.tableId.peek();
+    const table = this._docData.getTable(tableId);
+    if (!table) { throw new Error(`Table ${tableId} not found`); }
+
+    const {result: predicate} = dropdownConditionCompiled;
+    const rec = table.getRecord(rowId) || new EmptyRecordView();
+    return (item: ICellItem) => {
+      const choice = item.rowId === 'new' ? new EmptyRecordView() : this.tableData.getRecord(item.rowId);
+      if (!choice) { throw new Error(`Reference ${item.rowId} not found`); }
+
+      return predicate({rec, choice});
+    };
+  }
 }
 
 export function nocaseEqual(a: string, b: string) {
diff --git a/app/client/lib/SafeBrowser.ts b/app/client/lib/SafeBrowser.ts
index 35182cb9..602d2bc2 100644
--- a/app/client/lib/SafeBrowser.ts
+++ b/app/client/lib/SafeBrowser.ts
@@ -33,6 +33,7 @@ import { ClientScope } from 'app/client/components/ClientScope';
 import { get as getBrowserGlobals } from 'app/client/lib/browserGlobals';
 import dom from 'app/client/lib/dom';
 import * as Mousetrap from 'app/client/lib/Mousetrap';
+import { gristThemeObs } from 'app/client/ui2018/theme';
 import { ActionRouter } from 'app/common/ActionRouter';
 import { BaseComponent, BaseLogger, createRpcLogger, PluginInstance, warnIfNotReady } from 'app/common/PluginInstance';
 import { tbind } from 'app/common/tbind';
@@ -41,7 +42,7 @@ import { getOriginUrl } from 'app/common/urlUtils';
 import { GristAPI, RPC_GRISTAPI_INTERFACE } from 'app/plugin/GristAPI';
 import { RenderOptions, RenderTarget } from 'app/plugin/RenderOptions';
 import { checkers } from 'app/plugin/TypeCheckers';
-import { Computed, dom as grainjsDom, Observable } from 'grainjs';
+import { dom as grainjsDom, Observable } from 'grainjs';
 import { IMsgCustom, IMsgRpcCall, IRpcLogger, MsgType, Rpc } from 'grain-rpc';
 import { Disposable } from './dispose';
 import isEqual from 'lodash/isEqual';
@@ -73,8 +74,6 @@ export class SafeBrowser extends BaseComponent {
       new IframeProcess(safeBrowser, rpc, src);
   }
 
-  public theme = this._options.theme;
-
   // All view processes. This is not used anymore to dispose all processes on deactivation (this is
   // now achieved using `this._mainProcess.autoDispose(...)`) but rather to be able to dispatch
   // events to all processes (such as doc actions which will need soon).
@@ -94,7 +93,6 @@ export class SafeBrowser extends BaseComponent {
     pluginInstance: PluginInstance,
     clientScope: ClientScope,
     untrustedContentOrigin: string,
-    theme: Computed<Theme>,
     mainPath?: string,
     baseLogger?: BaseLogger,
     rpcLogger?: IRpcLogger,
@@ -312,7 +310,7 @@ class IframeProcess extends ViewProcess {
     const listener = async (event: MessageEvent) => {
       if (event.source === iframe.contentWindow) {
         if (event.data.mtype === MsgType.Ready) {
-          await this._sendTheme({theme: safeBrowser.theme.get(), fromReady: true});
+          await this._sendTheme({theme: gristThemeObs().get(), fromReady: true});
         }
 
         if (event.data.data?.message === 'themeInitialized') {
@@ -328,15 +326,11 @@ class IframeProcess extends ViewProcess {
     });
     this.rpc.setSendMessage(msg => iframe.contentWindow!.postMessage(msg, '*'));
 
-    if (safeBrowser.theme) {
-      this.autoDispose(
-        safeBrowser.theme.addListener(async (newTheme, oldTheme) => {
-          if (isEqual(newTheme, oldTheme)) { return; }
+    this.autoDispose(gristThemeObs().addListener(async (newTheme, oldTheme) => {
+      if (isEqual(newTheme, oldTheme)) { return; }
 
-          await this._sendTheme({theme: newTheme});
-        })
-      );
-    }
+      await this._sendTheme({theme: newTheme});
+    }));
   }
 
   private async _sendTheme({theme, fromReady = false}: {theme: Theme, fromReady?: boolean}) {
diff --git a/app/client/lib/autocomplete.ts b/app/client/lib/autocomplete.ts
index 8ad4a828..9f5871d3 100644
--- a/app/client/lib/autocomplete.ts
+++ b/app/client/lib/autocomplete.ts
@@ -4,7 +4,8 @@
 import {createPopper, Modifier, Instance as Popper, Options as PopperOptions} from '@popperjs/core';
 import {ACItem, ACResults, HighlightFunc} from 'app/client/lib/ACIndex';
 import {reportError} from 'app/client/models/errors';
-import {Disposable, dom, EventCB, IDisposable} from 'grainjs';
+import {testId, theme} from 'app/client/ui2018/cssVars';
+import {Disposable, dom, DomContents, EventCB, IDisposable} from 'grainjs';
 import {obsArray, onKeyElem, styled} from 'grainjs';
 import merge = require('lodash/merge');
 import maxSize from 'popper-max-size-modifier';
@@ -26,6 +27,9 @@ export interface IAutocompleteOptions<Item extends ACItem> {
   // Defaults to the document body.
   attach?: Element|string|null;
 
+  // If provided, builds and shows the message when there are no items (excluding any extra items).
+  buildNoItemsMessage?: () => DomContents;
+
   // Given a search term, return the list of Items to render.
   search(searchText: string): Promise<ACResults<Item>>;
 
@@ -46,7 +50,7 @@ export class Autocomplete<Item extends ACItem> extends Disposable {
   // The UL element containing the actual menu items.
   protected _menuContent: HTMLElement;
 
-  // Index into _items as well as into _menuContent, -1 if nothing selected.
+  // Index into _menuContent, -1 if nothing selected.
   protected _selectedIndex: number = -1;
 
   // Currently selected element.
@@ -56,6 +60,7 @@ export class Autocomplete<Item extends ACItem> extends Disposable {
   private _mouseOver: {reset(): void};
   private _lastAsTyped: string;
   private _items = this.autoDispose(obsArray<Item>([]));
+  private _extraItems = this.autoDispose(obsArray<Item>([]));
   private _highlightFunc: HighlightFunc;
 
   constructor(
@@ -65,14 +70,19 @@ export class Autocomplete<Item extends ACItem> extends Disposable {
     super();
 
     const content = cssMenuWrap(
-      this._menuContent = cssMenu({class: _options.menuCssClass || ''},
-        dom.forEach(this._items, (item) => _options.renderItem(item, this._highlightFunc)),
+      cssMenu(
+        {class: _options.menuCssClass || ''},
         dom.style('min-width', _triggerElem.getBoundingClientRect().width + 'px'),
-        dom.on('mouseleave', (ev) => this._setSelected(-1, true)),
-        dom.on('click', (ev) => {
-          this._setSelected(this._findTargetItem(ev.target), true);
-          if (_options.onClick) { _options.onClick(); }
-        })
+        this._maybeShowNoItemsMessage(),
+        this._menuContent = dom('div',
+          dom.forEach(this._items, (item) => _options.renderItem(item, this._highlightFunc)),
+          dom.forEach(this._extraItems, (item) => _options.renderItem(item, this._highlightFunc)),
+          dom.on('mouseleave', (ev) => this._setSelected(-1, true)),
+          dom.on('click', (ev) => {
+            this._setSelected(this._findTargetItem(ev.target), true);
+            if (_options.onClick) { _options.onClick(); }
+          }),
+        ),
       ),
       // Prevent trigger element from being blurred on click.
       dom.on('mousedown', (ev) => ev.preventDefault()),
@@ -104,7 +114,7 @@ export class Autocomplete<Item extends ACItem> extends Disposable {
   }
 
   public getSelectedItem(): Item|undefined {
-    return this._items.get()[this._selectedIndex];
+    return this._allItems[this._selectedIndex];
   }
 
   public search(findMatch?: (items: Item[]) => number) {
@@ -145,7 +155,7 @@ export class Autocomplete<Item extends ACItem> extends Disposable {
 
   private _getNext(step: 1 | -1): number {
     // Pretend there is an extra element at the end to mean "nothing selected".
-    const xsize = this._items.get().length + 1;
+    const xsize = this._allItems.length + 1;
     const next = (this._selectedIndex + step + xsize) % xsize;
     return (next === xsize - 1) ? -1 : next;
   }
@@ -157,6 +167,7 @@ export class Autocomplete<Item extends ACItem> extends Disposable {
     const acResults = await this._options.search(inputVal);
     this._highlightFunc = acResults.highlightFunc;
     this._items.set(acResults.items);
+    this._extraItems.set(acResults.extraItems);
 
     // Plain update() (which is deferred) may be better, but if _setSelected() causes scrolling
     // before the positions are updated, it causes the entire page to scroll horizontally.
@@ -166,12 +177,24 @@ export class Autocomplete<Item extends ACItem> extends Disposable {
 
     let index: number;
     if (findMatch) {
-      index = findMatch(this._items.get());
+      index = findMatch(this._allItems);
     } else {
       index = inputVal ? acResults.selectIndex : -1;
     }
     this._setSelected(index, false);
   }
+
+  private get _allItems() {
+    return [...this._items.get(), ...this._extraItems.get()];
+  }
+
+  private _maybeShowNoItemsMessage() {
+    const {buildNoItemsMessage} = this._options;
+    if (!buildNoItemsMessage) { return null; }
+
+    return dom.maybe(use => use(this._items).length === 0, () =>
+      cssNoItemsMessage(buildNoItemsMessage(), testId('autocomplete-no-items-message')));
+  }
 }
 
 
@@ -253,3 +276,10 @@ const cssMenuWrap = styled('div', `
   flex-direction: column;
   outline: none;
 `);
+
+const cssNoItemsMessage = styled('div', `
+  color: ${theme.lightText};
+  padding: var(--weaseljs-menu-item-padding, 8px 24px);
+  text-align: center;
+  user-select: none;
+`);
diff --git a/app/client/lib/imports.d.ts b/app/client/lib/imports.d.ts
index 7dd719d8..942d224c 100644
--- a/app/client/lib/imports.d.ts
+++ b/app/client/lib/imports.d.ts
@@ -6,17 +6,20 @@ import * as GristDocModule from 'app/client/components/GristDoc';
 import * as ViewPane from 'app/client/components/ViewPane';
 import * as UserManagerModule from 'app/client/ui/UserManager';
 import * as searchModule from 'app/client/ui2018/search';
+import * as ace from 'ace-builds';
 import * as momentTimezone from 'moment-timezone';
 import * as plotly from 'plotly.js';
 
-export type PlotlyType = typeof plotly;
+export type Ace = typeof ace;
 export type MomentTimezone = typeof momentTimezone;
+export type PlotlyType = typeof plotly;
 
 export function loadAccountPage(): Promise<typeof AccountPageModule>;
 export function loadActivationPage(): Promise<typeof ActivationPageModule>;
 export function loadBillingPage(): Promise<typeof BillingPageModule>;
 export function loadAdminPanel(): Promise<typeof AdminPanelModule>;
 export function loadGristDoc(): Promise<typeof GristDocModule>;
+export function loadAce(): Promise<Ace>;
 export function loadMomentTimezone(): Promise<MomentTimezone>;
 export function loadPlotly(): Promise<PlotlyType>;
 export function loadSearch(): Promise<typeof searchModule>;
diff --git a/app/client/lib/imports.js b/app/client/lib/imports.js
index 7747d77d..5218aa27 100644
--- a/app/client/lib/imports.js
+++ b/app/client/lib/imports.js
@@ -13,6 +13,17 @@ exports.loadAdminPanel = () => import('app/client/ui/AdminPanel' /* webpackChunk
 exports.loadGristDoc = () => import('app/client/components/GristDoc' /* webpackChunkName: "GristDoc" */);
 // When importing this way, the module is under the "default" member, not sure why (maybe
 // esbuild-loader's doing).
+exports.loadAce = () => import('ace-builds')
+  .then(async (m) => {
+    await Promise.all([
+      import('ace-builds/src-noconflict/ext-static_highlight'),
+      import('ace-builds/src-noconflict/mode-python'),
+      import('ace-builds/src-noconflict/theme-chrome'),
+      import('ace-builds/src-noconflict/theme-dracula'),
+    ]);
+
+    return m.default;
+  });
 exports.loadMomentTimezone = () => import('moment-timezone').then(m => m.default);
 exports.loadPlotly = () => import('plotly.js-basic-dist' /* webpackChunkName: "plotly" */);
 exports.loadSearch = () => import('app/client/ui2018/search' /* webpackChunkName: "search" */);
diff --git a/app/client/lib/nameUtils.ts b/app/client/lib/nameUtils.ts
new file mode 100644
index 00000000..86037d27
--- /dev/null
+++ b/app/client/lib/nameUtils.ts
@@ -0,0 +1,14 @@
+/**
+ * We allow alphanumeric characters and certain common whitelisted characters (except at the start),
+ * plus everything non-ASCII (for non-English alphabets, which we want to allow but it's hard to be
+ * more precise about what exactly to allow).
+ */
+// eslint-disable-next-line no-control-regex
+const VALID_NAME_REGEXP = /^(\w|[^\u0000-\u007F])(\w|[- ./'"()]|[^\u0000-\u007F])*$/;
+
+/**
+ * Test name against various rules to check if it is a valid username.
+ */
+export function checkName(name: string): boolean {
+  return VALID_NAME_REGEXP.test(name);
+}
diff --git a/app/client/lib/timeUtils.ts b/app/client/lib/timeUtils.ts
new file mode 100644
index 00000000..637b2a97
--- /dev/null
+++ b/app/client/lib/timeUtils.ts
@@ -0,0 +1,21 @@
+import moment from 'moment';
+
+/**
+ * Given a UTC Date ISO 8601 string (the doc updatedAt string), gives a reader-friendly
+ * relative time to now - e.g. 'yesterday', '2 days ago'.
+ */
+export function getTimeFromNow(utcDateISO: string): string {
+  const time = moment.utc(utcDateISO);
+  const now = moment();
+  const diff = now.diff(time, 's');
+  if (diff < 0 && diff > -60) {
+    // If the time appears to be in the future, but less than a minute
+    // in the future, chalk it up to a difference in time
+    // synchronization and don't claim the resource will be changed in
+    // the future.  For larger differences, just report them
+    // literally, there's a more serious problem or lack of
+    // synchronization.
+    return now.fromNow();
+  }
+  return time.fromNow();
+}
diff --git a/app/client/models/AppModel.ts b/app/client/models/AppModel.ts
index a2c12811..30ea4799 100644
--- a/app/client/models/AppModel.ts
+++ b/app/client/models/AppModel.ts
@@ -10,7 +10,7 @@ import {Notifier} from 'app/client/models/NotifyModel';
 import {getFlavor, ProductFlavor} from 'app/client/ui/CustomThemes';
 import {buildNewSiteModal, buildUpgradeModal} from 'app/client/ui/ProductUpgrades';
 import {SupportGristNudge} from 'app/client/ui/SupportGristNudge';
-import {prefersDarkModeObs} from 'app/client/ui2018/cssVars';
+import {gristThemePrefs} from 'app/client/ui2018/theme';
 import {AsyncCreate} from 'app/common/AsyncCreate';
 import {ICustomWidget} from 'app/common/CustomWidget';
 import {OrgUsageSummary} from 'app/common/DocUsage';
@@ -21,9 +21,7 @@ import {LocalPlugin} from 'app/common/plugin';
 import {DismissedPopup, DismissedReminder, UserPrefs} from 'app/common/Prefs';
 import {isOwner, isOwnerOrEditor} from 'app/common/roles';
 import {getTagManagerScript} from 'app/common/tagManager';
-import {getDefaultThemePrefs, Theme, ThemeColors, ThemePrefs,
-        ThemePrefsChecker} from 'app/common/ThemePrefs';
-import {getThemeColors} from 'app/common/Themes';
+import {getDefaultThemePrefs, ThemePrefs, ThemePrefsChecker} from 'app/common/ThemePrefs';
 import {getGristConfig} from 'app/common/urlUtils';
 import {ExtendedUser} from 'app/common/UserAPI';
 import {getOrgName, isTemplatesOrg, Organization, OrgError, UserAPI, UserAPIImpl} from 'app/common/UserAPI';
@@ -118,7 +116,6 @@ export interface AppModel {
 
   userPrefsObs: Observable<UserPrefs>;
   themePrefs: Observable<ThemePrefs>;
-  currentTheme: Computed<Theme>;
   /**
    * Popups that user has seen.
    */
@@ -170,8 +167,9 @@ export class TopAppModelImpl extends Disposable implements TopAppModel {
   private readonly _widgets: AsyncCreate<ICustomWidget[]>;
 
   constructor(window: {gristConfig?: GristLoadConfig},
-              public readonly api: UserAPI = newUserAPIImpl(),
-              public readonly options: TopAppModelOptions = {}) {
+    public readonly api: UserAPI = newUserAPIImpl(),
+    public readonly options: TopAppModelOptions = {}
+  ) {
     super();
     setErrorNotifier(this.notifier);
     this.isSingleOrg = Boolean(window.gristConfig && window.gristConfig.singleOrg);
@@ -307,7 +305,6 @@ export class AppModelImpl extends Disposable implements AppModel {
     defaultValue: getDefaultThemePrefs(),
     checker: ThemePrefsChecker,
   }) as Observable<ThemePrefs>;
-  public readonly currentTheme = this._getCurrentThemeObs();
 
   public readonly dismissedPopups = getUserPrefObs(this.userPrefsObs, 'dismissedPopups',
     { defaultValue: [] }) as Observable<DismissedPopup[]>;
@@ -359,6 +356,11 @@ export class AppModelImpl extends Disposable implements AppModel {
     public readonly orgError?: OrgError,
   ) {
     super();
+
+    // Whenever theme preferences change, update the global `gristThemePrefs` observable; this triggers
+    // an automatic update to the global `gristThemeObs` computed observable.
+    this.autoDispose(subscribe(this.themePrefs, (_use, themePrefs) => gristThemePrefs.set(themePrefs)));
+
     this._recordSignUpIfIsNewUser();
 
     const state = urlState().state.get();
@@ -493,41 +495,14 @@ export class AppModelImpl extends Disposable implements AppModel {
     dataLayer.push({event: 'new-sign-up'});
     getUserPrefObs(this.userPrefsObs, 'recordSignUpEvent').set(undefined);
   }
+}
 
-  private _getCurrentThemeObs() {
-    return Computed.create(this, this.themePrefs, prefersDarkModeObs(),
-      (_use, themePrefs, prefersDarkMode) => {
-        let {appearance, syncWithOS} = themePrefs;
-
-        const urlParams = urlState().state.get().params;
-        if (urlParams?.themeAppearance) {
-          appearance = urlParams?.themeAppearance;
-        }
-
-        if (urlParams?.themeSyncWithOs !== undefined) {
-          syncWithOS = urlParams?.themeSyncWithOs;
-        }
-
-        if (syncWithOS) {
-          appearance = prefersDarkMode ? 'dark' : 'light';
-        }
-
-        let nameOrColors = themePrefs.colors[appearance];
-        if (urlParams?.themeName) {
-          nameOrColors = urlParams?.themeName;
-        }
-
-        let colors: ThemeColors;
-        if (typeof nameOrColors === 'string') {
-          colors = getThemeColors(nameOrColors);
-        } else {
-          colors = nameOrColors;
-        }
-
-        return {appearance, colors};
-      },
-    );
+export function getOrgNameOrGuest(org: Organization|null, user: FullUser|null) {
+  if (!org) { return ''; }
+  if (user && user.anonymous && org.owner && org.owner.id === user.id) {
+    return "@Guest";
   }
+  return getOrgName(org);
 }
 
 export function getHomeUrl(): string {
@@ -541,11 +516,3 @@ export function newUserAPIImpl(): UserAPIImpl {
     fetch: hooks.fetch,
   });
 }
-
-export function getOrgNameOrGuest(org: Organization|null, user: FullUser|null) {
-  if (!org) { return ''; }
-  if (user && user.anonymous && org.owner && org.owner.id === user.id) {
-    return "@Guest";
-  }
-  return getOrgName(org);
-}
diff --git a/app/client/models/ColumnACIndexes.ts b/app/client/models/ColumnACIndexes.ts
index bd323a1e..3df7431d 100644
--- a/app/client/models/ColumnACIndexes.ts
+++ b/app/client/models/ColumnACIndexes.ts
@@ -21,7 +21,6 @@ export interface ICellItem {
   cleanText: string;      // Trimmed lowercase text for searching.
 }
 
-
 export class ColumnACIndexes {
   private _columnCache = new ColumnCache<ACIndex<ICellItem>>(this._tableData);
 
@@ -33,22 +32,28 @@ export class ColumnACIndexes {
    * getColACIndex() is called for the same column with the the same formatter.
    */
   public getColACIndex(colId: string, formatter: BaseFormatter): ACIndex<ICellItem> {
-    return this._columnCache.getValue(colId, () => this._buildColACIndex(colId, formatter));
+    return this._columnCache.getValue(colId, () => this.buildColACIndex(colId, formatter));
   }
 
-  private _buildColACIndex(colId: string, formatter: BaseFormatter): ACIndex<ICellItem> {
+  public buildColACIndex(
+    colId: string,
+    formatter: BaseFormatter,
+    filter?: (item: ICellItem) => boolean
+  ): ACIndex<ICellItem> {
     const rowIds = this._tableData.getRowIds();
     const valColumn = this._tableData.getColValues(colId);
     if (!valColumn) {
       throw new UserError(`Invalid column ${this._tableData.tableId}.${colId}`);
     }
-    const items: ICellItem[] = valColumn.map((val, i) => {
-      const rowId = rowIds[i];
-      const text = formatter.formatAny(val);
-      const cleanText = normalizeText(text);
-      return {rowId, text, cleanText};
-    });
-    items.sort(itemCompare);
+    const items: ICellItem[] = valColumn
+      .map((val, i) => {
+        const rowId = rowIds[i];
+        const text = formatter.formatAny(val);
+        const cleanText = normalizeText(text);
+        return {rowId, text, cleanText};
+      })
+      .filter((item) => filter?.(item) ?? true)
+      .sort(itemCompare);
     return new ACIndexImpl(items);
   }
 }
diff --git a/app/client/models/HomeModel.ts b/app/client/models/HomeModel.ts
index ee62e38e..ba4bd1d7 100644
--- a/app/client/models/HomeModel.ts
+++ b/app/client/models/HomeModel.ts
@@ -14,30 +14,11 @@ import * as roles from 'app/common/roles';
 import {getGristConfig} from 'app/common/urlUtils';
 import {Document, Organization, Workspace} from 'app/common/UserAPI';
 import {bundleChanges, Computed, Disposable, Observable, subscribe} from 'grainjs';
-import moment from 'moment';
 import flatten = require('lodash/flatten');
 import sortBy = require('lodash/sortBy');
 
 const DELAY_BEFORE_SPINNER_MS = 500;
 
-// Given a UTC Date ISO 8601 string (the doc updatedAt string), gives a reader-friendly
-// relative time to now - e.g. 'yesterday', '2 days ago'.
-export function getTimeFromNow(utcDateISO: string): string {
-  const time = moment.utc(utcDateISO);
-  const now = moment();
-  const diff = now.diff(time, 's');
-  if (diff < 0 && diff > -60) {
-    // If the time appears to be in the future, but less than a minute
-    // in the future, chalk it up to a difference in time
-    // synchronization and don't claim the resource will be changed in
-    // the future.  For larger differences, just report them
-    // literally, there's a more serious problem or lack of
-    // synchronization.
-    return now.fromNow();
-  }
-  return time.fromNow();
-}
-
 export interface HomeModel {
   // PageType value, one of the discriminated union values used by AppModel.
   pageType: "home";
@@ -190,7 +171,6 @@ export class HomeModelImpl extends Disposable implements HomeModel, ViewSettings
       localPlugins: _app.topAppModel.plugins,
       untrustedContentOrigin: _app.topAppModel.getUntrustedContentOrigin()!,
       clientScope,
-      theme: _app.currentTheme,
     });
     const importSources = ImportSourceElement.fromArray(pluginManager.pluginsList);
     this.importSources.set(importSources);
diff --git a/app/client/models/entities/ViewFieldRec.ts b/app/client/models/entities/ViewFieldRec.ts
index 5f0c045a..fed7d80d 100644
--- a/app/client/models/entities/ViewFieldRec.ts
+++ b/app/client/models/entities/ViewFieldRec.ts
@@ -2,12 +2,15 @@ import {ColumnRec, DocModel, IRowModel, refListRecords, refRecord, ViewSectionRe
 import {formatterForRec} from 'app/client/models/entities/ColumnRec';
 import * as modelUtil from 'app/client/models/modelUtil';
 import {removeRule, RuleOwner} from 'app/client/models/RuleOwner';
-import { HeaderStyle, Style } from 'app/client/models/Styles';
+import {HeaderStyle, Style} from 'app/client/models/Styles';
 import {ViewFieldConfig} from 'app/client/models/ViewFieldConfig';
 import * as UserType from 'app/client/widgets/UserType';
 import {DocumentSettings} from 'app/common/DocumentSettings';
+import {DropdownCondition, DropdownConditionCompilationResult} from 'app/common/DropdownCondition';
+import {compilePredicateFormula} from 'app/common/PredicateFormula';
 import {BaseFormatter} from 'app/common/ValueFormatter';
 import {createParser} from 'app/common/ValueParser';
+import {Computed} from 'grainjs';
 import * as ko from 'knockout';
 
 // Represents a page entry in the tree of pages.
@@ -106,6 +109,9 @@ export interface ViewFieldRec extends IRowModel<"_grist_Views_section_field">, R
   /** Label in FormView. By default FormView uses label, use this to override it. */
   question: modelUtil.KoSaveableObservable<string|undefined>;
 
+  dropdownCondition: modelUtil.KoSaveableObservable<DropdownCondition|undefined>;
+  dropdownConditionCompiled: Computed<DropdownConditionCompilationResult|null>;
+
   createValueParser(): (value: string) => any;
 
   // Helper which adds/removes/updates field's displayCol to match the formula.
@@ -316,4 +322,21 @@ export function createViewFieldRec(this: ViewFieldRec, docModel: DocModel): void
 
   this.disableModify = this.autoDispose(ko.pureComputed(() => this.column().disableModify()));
   this.disableEditData = this.autoDispose(ko.pureComputed(() => this.column().disableEditData()));
+
+  this.dropdownCondition = this.widgetOptionsJson.prop('dropdownCondition');
+  this.dropdownConditionCompiled = Computed.create(this, use => {
+    const dropdownCondition = use(this.dropdownCondition);
+    if (!dropdownCondition?.parsed) { return null; }
+
+    try {
+      return {
+        kind: 'success',
+        result: compilePredicateFormula(JSON.parse(dropdownCondition.parsed), {
+          variant: 'dropdown-condition',
+        }),
+      };
+    } catch (e) {
+      return {kind: 'failure', error: e.message};
+    }
+  });
 }
diff --git a/app/client/ui/AccountPage.ts b/app/client/ui/AccountPage.ts
index 5eaafeb9..e68be43e 100644
--- a/app/client/ui/AccountPage.ts
+++ b/app/client/ui/AccountPage.ts
@@ -1,4 +1,5 @@
 import {detectCurrentLang, makeT} from 'app/client/lib/localization';
+import {checkName} from 'app/client/lib/nameUtils';
 import {AppModel, reportError} from 'app/client/models/AppModel';
 import {urlState} from 'app/client/models/gristUrlState';
 import * as css from 'app/client/ui/AccountPageCss';
@@ -249,23 +250,6 @@ designed to ensure that you're the only person who can access your account, even
   }
 }
 
-/**
- * We allow alphanumeric characters and certain common whitelisted characters (except at the start),
- * plus everything non-ASCII (for non-English alphabets, which we want to allow but it's hard to be
- * more precise about what exactly to allow).
- */
-// eslint-disable-next-line no-control-regex
-const VALID_NAME_REGEXP = /^(\w|[^\u0000-\u007F])(\w|[- ./'"()]|[^\u0000-\u007F])*$/;
-
-/**
- * Test name against various rules to check if it is a valid username.
- */
-export function checkName(name: string): boolean {
-  return VALID_NAME_REGEXP.test(name);
-}
-
-
-
 const cssWarnings = styled(css.warning, `
   margin: -8px 0 0 110px;
 `);
diff --git a/app/client/ui/App.ts b/app/client/ui/App.ts
index 322c2fd6..2b2b1484 100644
--- a/app/client/ui/App.ts
+++ b/app/client/ui/App.ts
@@ -14,6 +14,7 @@ import {setUpErrorHandling} from 'app/client/models/errors';
 import {createAppUI} from 'app/client/ui/AppUI';
 import {addViewportTag} from 'app/client/ui/viewport';
 import {attachCssRootVars} from 'app/client/ui2018/cssVars';
+import {attachTheme} from 'app/client/ui2018/theme';
 import {BaseAPI} from 'app/common/BaseAPI';
 import {CommDocError} from 'app/common/CommTypes';
 import {DisposableWithEvents} from 'app/common/DisposableWithEvents';
@@ -183,6 +184,7 @@ export class App extends DisposableWithEvents {
 
     // Add the cssRootVars class to enable the variables in cssVars.
     attachCssRootVars(this.topAppModel.productFlavor);
+    attachTheme();
     addViewportTag();
     this.autoDispose(createAppUI(this.topAppModel, this));
   }
diff --git a/app/client/ui/AppUI.ts b/app/client/ui/AppUI.ts
index ccbe272b..10e7b840 100644
--- a/app/client/ui/AppUI.ts
+++ b/app/client/ui/AppUI.ts
@@ -17,7 +17,7 @@ import {pagePanels} from 'app/client/ui/PagePanels';
 import {RightPanel} from 'app/client/ui/RightPanel';
 import {createTopBarDoc, createTopBarHome} from 'app/client/ui/TopBar';
 import {WelcomePage} from 'app/client/ui/WelcomePage';
-import {attachTheme, testId} from 'app/client/ui2018/cssVars';
+import {testId} from 'app/client/ui2018/cssVars';
 import {getPageTitleSuffix} from 'app/common/gristUrls';
 import {getGristConfig} from 'app/common/urlUtils';
 import {Computed, dom, IDisposable, IDisposableOwner, Observable, replaceContent, subscribe} from 'grainjs';
@@ -27,9 +27,7 @@ import {Computed, dom, IDisposable, IDisposableOwner, Observable, replaceContent
 // TODO once #newui is gone, we don't need to worry about this being disposable.
 // appObj is the App object from app/client/ui/App.ts
 export function createAppUI(topAppModel: TopAppModel, appObj: App): IDisposable {
-  const content = dom.maybeOwned(topAppModel.appObs, (owner, appModel) => {
-    owner.autoDispose(attachTheme(appModel.currentTheme));
-
+  const content = dom.maybe(topAppModel.appObs, (appModel) => {
     return [
       createMainPage(appModel, appObj),
       buildSnackbarDom(appModel.notifier, appModel),
diff --git a/app/client/ui/CodeHighlight.ts b/app/client/ui/CodeHighlight.ts
index f80a4907..09aa21f8 100644
--- a/app/client/ui/CodeHighlight.ts
+++ b/app/client/ui/CodeHighlight.ts
@@ -1,45 +1,112 @@
-import * as ace from 'ace-builds';
+import {Ace, loadAce} from 'app/client/lib/imports';
 import {theme, vars} from 'app/client/ui2018/cssVars';
-import {Theme} from 'app/common/ThemePrefs';
-import {getGristConfig} from 'app/common/urlUtils';
-import {BindableValue, Computed, dom, DomElementArg, Observable, styled, subscribeElem} from 'grainjs';
+import {gristThemeObs} from 'app/client/ui2018/theme';
+import {
+  BindableValue,
+  Disposable,
+  DomElementArg,
+  Observable,
+  styled,
+  subscribeElem,
+} from 'grainjs';
 
-// ace-builds also has a minified build (src-min-noconflict), but we don't
-// use it since webpack already handles minification.
-require('ace-builds/src-noconflict/ext-static_highlight');
-require('ace-builds/src-noconflict/mode-python');
-require('ace-builds/src-noconflict/theme-chrome');
-require('ace-builds/src-noconflict/theme-dracula');
-
-export interface ICodeOptions {
-  gristTheme: Computed<Theme>;
-  placeholder?: string;
+interface BuildCodeHighlighterOptions {
   maxLines?: number;
 }
 
+let _ace: Ace;
+let _highlighter: any;
+let _PythonMode: any;
+let _aceDom: any;
+let _chrome: any;
+let _dracula: any;
+let _mode: any;
+
+async function fetchAceModules() {
+  return {
+    ace: _ace || (_ace = await loadAce()),
+    highlighter: _highlighter || (_highlighter = _ace.require('ace/ext/static_highlight')),
+    PythonMode: _PythonMode || (_PythonMode = _ace.require('ace/mode/python').Mode),
+    aceDom: _aceDom || (_aceDom = _ace.require('ace/lib/dom')),
+    chrome: _chrome || (_chrome = _ace.require('ace/theme/chrome')),
+    dracula: _dracula || (_dracula = _ace.require('ace/theme/dracula')),
+    mode: _mode || (_mode = new _PythonMode()),
+  };
+}
+
+/**
+ * Returns a function that accepts a string of text representing code and returns
+ * a highlighted version of it as an HTML string.
+ *
+ * This is useful for scenarios where highlighted code needs to be displayed outside of
+ * grainjs. For example, when using `marked`'s `highlight` option to highlight code
+ * blocks in a Markdown string.
+ */
+export async function buildCodeHighlighter(options: BuildCodeHighlighterOptions = {}) {
+  const {maxLines} = options;
+  const {highlighter, aceDom, chrome, dracula, mode} = await fetchAceModules();
+
+  return (code: string) => {
+    if (maxLines) {
+      // If requested, trim to maxLines, and add an ellipsis at the end.
+      // (Long lines are also truncated with an ellpsis via text-overflow style.)
+      const lines = code.split(/\n/);
+      if (lines.length > maxLines) {
+        code = lines.slice(0, maxLines).join("\n") + " \u2026";  // Ellipsis
+      }
+    }
+
+    let aceThemeName: 'chrome' | 'dracula';
+    let aceTheme: any;
+    if (gristThemeObs().get().appearance === 'dark') {
+      aceThemeName = 'dracula';
+      aceTheme = dracula;
+    } else {
+      aceThemeName = 'chrome';
+      aceTheme = chrome;
+    }
+
+    // Rendering highlighted code gives you back the HTML to insert into the DOM, as well
+    // as the CSS styles needed to apply the theme. The latter typically isn't included in
+    // the document until an Ace editor is opened, so we explicitly import it here to avoid
+    // leaving highlighted code blocks without a theme applied.
+    const {html, css} = highlighter.render(code, mode, aceTheme, 1, true);
+    aceDom.importCssString(css, `${aceThemeName}-highlighted-code`);
+    return html;
+  };
+}
+
+interface BuildHighlightedCodeOptions extends BuildCodeHighlighterOptions {
+  placeholder?: string;
+}
+
+/**
+ * Builds a block of highlighted `code`.
+ *
+ * Highlighting applies an appropriate Ace theme (Chrome or Dracula) based on
+ * the current Grist theme, and automatically re-applies it whenever the Grist
+ * theme changes.
+ */
 export function buildHighlightedCode(
-  code: BindableValue<string>, options: ICodeOptions, ...args: DomElementArg[]
+  owner: Disposable,
+  code: BindableValue<string>,
+  options: BuildHighlightedCodeOptions,
+  ...args: DomElementArg[]
 ): HTMLElement {
-  const {gristTheme, placeholder, maxLines} = options;
-  const {enableCustomCss} = getGristConfig();
+  const {placeholder, maxLines} = options;
+  const codeText = Observable.create(owner, '');
+  const codeTheme = Observable.create(owner, gristThemeObs().get());
 
-  const highlighter = ace.require('ace/ext/static_highlight');
-  const PythonMode = ace.require('ace/mode/python').Mode;
-  const aceDom = ace.require('ace/lib/dom');
-  const chrome = ace.require('ace/theme/chrome');
-  const dracula = ace.require('ace/theme/dracula');
-  const mode = new PythonMode();
-
-  const codeText = Observable.create(null, '');
-  const codeTheme = Observable.create(null, gristTheme.get());
-
-  function updateHighlightedCode(elem: HTMLElement) {
+  async function updateHighlightedCode(elem: HTMLElement) {
     let text = codeText.get();
     if (!text) {
       elem.textContent = placeholder || '';
       return;
     }
 
+    const {highlighter, aceDom, chrome, dracula, mode} = await fetchAceModules();
+    if (owner.isDisposed()) { return; }
+
     if (maxLines) {
       // If requested, trim to maxLines, and add an ellipsis at the end.
       // (Long lines are also truncated with an ellpsis via text-overflow style.)
@@ -51,7 +118,7 @@ export function buildHighlightedCode(
 
     let aceThemeName: 'chrome' | 'dracula';
     let aceTheme: any;
-    if (codeTheme.get().appearance === 'dark' && !enableCustomCss) {
+    if (codeTheme.get().appearance === 'dark') {
       aceThemeName = 'dracula';
       aceTheme = dracula;
     } else {
@@ -69,15 +136,13 @@ export function buildHighlightedCode(
   }
 
   return cssHighlightedCode(
-    dom.autoDispose(codeText),
-    dom.autoDispose(codeTheme),
-    elem => subscribeElem(elem, code, (newCodeText) => {
+    elem => subscribeElem(elem, code, async (newCodeText) => {
       codeText.set(newCodeText);
-      updateHighlightedCode(elem);
+      await updateHighlightedCode(elem);
       }),
-    elem => subscribeElem(elem, gristTheme, (newCodeTheme) => {
+    elem => subscribeElem(elem, gristThemeObs(), async (newCodeTheme) => {
       codeTheme.set(newCodeTheme);
-      updateHighlightedCode(elem);
+      await updateHighlightedCode(elem);
     }),
     ...args,
   );
@@ -95,9 +160,7 @@ export const cssCodeBlock = styled('div', `
 
 const cssHighlightedCode = styled(cssCodeBlock, `
   position: relative;
-  white-space: pre;
   overflow: hidden;
-  text-overflow: ellipsis;
   border: 1px solid ${theme.highlightedCodeBorder};
   border-radius: 3px;
   min-height: 28px;
@@ -110,20 +173,6 @@ const cssHighlightedCode = styled(cssCodeBlock, `
   & .ace_line {
     overflow: hidden;
     text-overflow: ellipsis;
-  }
-`);
-
-export const cssFieldFormula = styled(buildHighlightedCode, `
-  flex: auto;
-  cursor: pointer;
-  margin-top: 4px;
-  padding-left: 24px;
-  --icon-color: ${theme.accentIcon};
-
-  &-disabled-icon.formula_field_sidepane::before {
-    --icon-color: ${theme.iconDisabled};
-  }
-  &-disabled {
-    pointer-events: none;
+    white-space: nowrap;
   }
 `);
diff --git a/app/client/ui/DocHistory.ts b/app/client/ui/DocHistory.ts
index 30ac2ff2..3c3f9a20 100644
--- a/app/client/ui/DocHistory.ts
+++ b/app/client/ui/DocHistory.ts
@@ -1,9 +1,9 @@
 import {makeT} from 'app/client/lib/localization';
 import {createSessionObs} from 'app/client/lib/sessionObs';
+import {getTimeFromNow} from 'app/client/lib/timeUtils';
 import {DocPageModel} from 'app/client/models/DocPageModel';
 import {reportError} from 'app/client/models/errors';
 import {urlState} from 'app/client/models/gristUrlState';
-import {getTimeFromNow} from 'app/client/models/HomeModel';
 import {buildConfigContainer} from 'app/client/ui/RightPanel';
 import {buttonSelect} from 'app/client/ui2018/buttonSelect';
 import {testId, theme, vars} from 'app/client/ui2018/cssVars';
diff --git a/app/client/ui/DocMenu.ts b/app/client/ui/DocMenu.ts
index 90d5b26f..7ecdfb5e 100644
--- a/app/client/ui/DocMenu.ts
+++ b/app/client/ui/DocMenu.ts
@@ -4,9 +4,10 @@
  * Orgs, workspaces and docs are fetched asynchronously on build via the passed in API.
  */
 import {loadUserManager} from 'app/client/lib/imports';
+import {getTimeFromNow} from 'app/client/lib/timeUtils';
 import {reportError} from 'app/client/models/AppModel';
 import {docUrl, urlState} from 'app/client/models/gristUrlState';
-import {getTimeFromNow, HomeModel, makeLocalViewSettings, ViewSettings} from 'app/client/models/HomeModel';
+import {HomeModel, makeLocalViewSettings, ViewSettings} from 'app/client/models/HomeModel';
 import {getWorkspaceInfo, workspaceName} from 'app/client/models/WorkspaceInfo';
 import {attachAddNewTip} from 'app/client/ui/AddNewTip';
 import * as css from 'app/client/ui/DocMenuCss';
diff --git a/app/client/ui/FieldConfig.ts b/app/client/ui/FieldConfig.ts
index 606664fe..934eeadf 100644
--- a/app/client/ui/FieldConfig.ts
+++ b/app/client/ui/FieldConfig.ts
@@ -2,7 +2,7 @@ import {makeT} from 'app/client/lib/localization';
 import {GristDoc} from 'app/client/components/GristDoc';
 import {BEHAVIOR, ColumnRec} from 'app/client/models/entities/ColumnRec';
 import {buildHighlightedCode, cssCodeBlock} from 'app/client/ui/CodeHighlight';
-import {cssBlockedCursor, cssLabel, cssRow} from 'app/client/ui/RightPanelStyles';
+import {cssBlockedCursor, cssFieldFormula, cssLabel, cssRow} from 'app/client/ui/RightPanelStyles';
 import {withInfoTooltip} from 'app/client/ui/tooltips';
 import {buildFormulaTriggers} from 'app/client/ui/TriggerFormulas';
 import {textButton} from 'app/client/ui2018/buttons';
@@ -13,7 +13,6 @@ import {IconName} from 'app/client/ui2018/IconList';
 import {selectMenu, selectOption, selectTitle} from 'app/client/ui2018/menus';
 import {createFormulaErrorObs, cssError} from 'app/client/widgets/FormulaEditor';
 import {sanitizeIdent} from 'app/common/gutil';
-import {Theme} from 'app/common/ThemePrefs';
 import {CursorPos} from 'app/plugin/GristAPI';
 import {bundleChanges, Computed, dom, DomContents, DomElementArg, fromKo, MultiHolder,
         Observable, styled} from 'grainjs';
@@ -139,6 +138,8 @@ export function buildFormulaConfig(
   // And close it dispose it when user opens up behavior menu.
   let formulaField: HTMLElement|null = null;
 
+  const focusFormulaField = () => setTimeout(() => formulaField?.focus(), 0);
+
   // Helper function to clear temporary state (will be called when column changes or formula editor closes)
   const clearState = () => bundleChanges(() => {
     // For a detached editor, we may have already been disposed when user switched page.
@@ -242,7 +243,7 @@ export function buildFormulaConfig(
 
   // Converts data column to formula column.
   const convertDataColumnToFormulaOption = () => selectOption(
-    () => (maybeFormula.set(true), formulaField?.focus()),
+    () => (maybeFormula.set(true), focusFormulaField()),
     t("Clear and make into formula"), 'Script');
 
   // Converts to empty column and opens up the editor. (label is the same, but this is used when we have no formula)
@@ -270,15 +271,15 @@ export function buildFormulaConfig(
   const convertDataColumnToTriggerColumn = () => {
     maybeTrigger.set(true);
     // Open the formula editor.
-    formulaField?.focus();
+    focusFormulaField();
   };
 
   // Converts formula column to trigger formula column.
   const convertFormulaToTrigger = () =>
     gristDoc.convertIsFormula([origColumn.id.peek()], {toFormula: false, noRecalc: false});
 
-  const setFormula = () => (maybeFormula.set(true), formulaField?.focus());
-  const setTrigger = () => (maybeTrigger.set(true), formulaField?.focus());
+  const setFormula = () => { maybeFormula.set(true); focusFormulaField(); };
+  const setTrigger = () => { maybeTrigger.set(true); focusFormulaField(); };
 
   // Actions on save formula. Those actions are using column that comes from FormulaEditor.
   // Formula editor scope is broader then RightPanel, it can be disposed after RightPanel is closed,
@@ -325,16 +326,19 @@ export function buildFormulaConfig(
   const errorMessage = createFormulaErrorObs(owner, gristDoc, origColumn);
   // Helper that will create different flavors for formula builder.
   const formulaBuilder = (onSave: SaveHandler, canDetach?: boolean) => [
-    cssRow(formulaField = buildFormula(
-      origColumn,
-      buildEditor,
-      {
-        gristTheme: gristDoc.currentTheme,
-        disabled: disableOtherActions,
-        canDetach,
-        onSave,
-        onCancel: clearState,
-      })),
+    cssRow(
+      buildFormula(
+        origColumn,
+        buildEditor,
+        {
+          disabled: disableOtherActions,
+          canDetach,
+          onSave,
+          onCancel: clearState,
+        },
+        (el) => { formulaField = el; },
+      )
+    ),
     dom.maybe(errorMessage, errMsg => cssRow(cssError(errMsg), testId('field-error-count'))),
   ];
 
@@ -419,7 +423,6 @@ export function buildFormulaConfig(
 }
 
 interface BuildFormulaOptions {
-  gristTheme: Computed<Theme>;
   disabled: Observable<boolean>;
   canDetach?: boolean;
   onSave?: SaveHandler;
@@ -429,10 +432,12 @@ interface BuildFormulaOptions {
 function buildFormula(
   column: ColumnRec,
   buildEditor: BuildEditor,
-  options: BuildFormulaOptions
+  options: BuildFormulaOptions,
+  ...args: DomElementArg[]
 ) {
-  const {gristTheme, disabled, canDetach = true, onSave, onCancel} = options;
-  return cssFieldFormula(column.formula, {gristTheme, maxLines: 2},
+  const {disabled, canDetach = true, onSave, onCancel} = options;
+  return dom.create(buildHighlightedCode, column.formula, {maxLines: 2},
+    dom.cls(cssFieldFormula.className),
     dom.cls('formula_field_sidepane'),
     cssFieldFormula.cls('-disabled', disabled),
     cssFieldFormula.cls('-disabled-icon', use => !use(column.formula)),
@@ -447,24 +452,10 @@ function buildFormula(
       onSave,
       onCancel,
     })),
+    ...args,
   );
 }
 
-export const cssFieldFormula = styled(buildHighlightedCode, `
-  flex: auto;
-  cursor: pointer;
-  margin-top: 4px;
-  padding-left: 24px;
-  --icon-color: ${theme.accentIcon};
-
-  &-disabled-icon.formula_field_sidepane::before {
-    --icon-color: ${theme.lightText};
-  }
-  &-disabled {
-    pointer-events: none;
-  }
-`);
-
 const cssToggleButton = styled(cssIconButton, `
   margin-left: 8px;
   background-color: ${theme.rightPanelToggleButtonDisabledBg};
diff --git a/app/client/ui/GristTooltips.ts b/app/client/ui/GristTooltips.ts
index 8f26142d..9b7b2554 100644
--- a/app/client/ui/GristTooltips.ts
+++ b/app/client/ui/GristTooltips.ts
@@ -1,5 +1,6 @@
 import * as commands from 'app/client/components/commands';
 import {makeT} from 'app/client/lib/localization';
+import {buildHighlightedCode} from 'app/client/ui/CodeHighlight';
 import {ShortcutKey, ShortcutKeyContent} from 'app/client/ui/ShortcutKey';
 import {icon} from 'app/client/ui2018/icons';
 import {cssLink} from 'app/client/ui2018/links';
@@ -39,7 +40,9 @@ export type Tooltip =
   | 'uuid'
   | 'lookups'
   | 'formulaColumn'
-  | 'accessRulesTableWide';
+  | 'accessRulesTableWide'
+  | 'setChoiceDropdownCondition'
+  | 'setRefDropdownCondition';
 
 export type TooltipContentFunc = (...domArgs: DomElementArg[]) => DomContents;
 
@@ -125,7 +128,26 @@ see or edit which parts of your document.')
     ...args,
   ),
   accessRulesTableWide: (...args: DomElementArg[]) => cssTooltipContent(
-    dom('div', t('These rules are applied after all column rules have been processed, if applicable.'))
+    dom('div', t('These rules are applied after all column rules have been processed, if applicable.')),
+    ...args,
+  ),
+  setChoiceDropdownCondition: (...args: DomElementArg[]) => cssTooltipContent(
+    dom('div',
+      t('Filter displayed dropdown values with a condition.')
+    ),
+    dom('div', {style: 'margin-top: 8px;'}, t('Example: {{example}}', {
+      example: dom.create(buildHighlightedCode, 'choice not in $Categories', {}, {style: 'margin-top: 8px;'}),
+    })),
+    ...args,
+  ),
+  setRefDropdownCondition: (...args: DomElementArg[]) => cssTooltipContent(
+    dom('div',
+      t('Filter displayed dropdown values with a condition.')
+    ),
+    dom('div', {style: 'margin-top: 8px;'}, t('Example: {{example}}', {
+      example: dom.create(buildHighlightedCode, 'choice.Role == "Manager"', {}, {style: 'margin-top: 8px;'}),
+    })),
+    ...args,
   ),
 };
 
diff --git a/app/client/ui/PinnedDocs.ts b/app/client/ui/PinnedDocs.ts
index e84f3f1e..7077749c 100644
--- a/app/client/ui/PinnedDocs.ts
+++ b/app/client/ui/PinnedDocs.ts
@@ -1,5 +1,6 @@
+import {getTimeFromNow} from 'app/client/lib/timeUtils';
 import {docUrl, urlState} from 'app/client/models/gristUrlState';
-import {getTimeFromNow, HomeModel} from 'app/client/models/HomeModel';
+import {HomeModel} from 'app/client/models/HomeModel';
 import {makeDocOptionsMenu, makeRemovedDocOptionsMenu} from 'app/client/ui/DocMenu';
 import {transientInput} from 'app/client/ui/transientInput';
 import {colors, theme, vars} from 'app/client/ui2018/cssVars';
diff --git a/app/client/ui/RightPanelStyles.ts b/app/client/ui/RightPanelStyles.ts
index b6ec7c0f..8e7a4723 100644
--- a/app/client/ui/RightPanelStyles.ts
+++ b/app/client/ui/RightPanelStyles.ts
@@ -94,3 +94,18 @@ export const cssPinButton = styled('div', `
 export const cssNumericSpinner = styled(numericSpinner, `
   height: 28px;
 `);
+
+export const cssFieldFormula = styled('div', `
+  flex: auto;
+  cursor: pointer;
+  margin-top: 4px;
+  padding-left: 24px;
+  --icon-color: ${theme.accentIcon};
+
+  &-disabled-icon.formula_field_sidepane::before {
+    --icon-color: ${theme.iconDisabled};
+  }
+  &-disabled {
+    pointer-events: none;
+  }
+`);
diff --git a/app/client/ui/ThemeConfig.ts b/app/client/ui/ThemeConfig.ts
index 7b371a62..b9492d92 100644
--- a/app/client/ui/ThemeConfig.ts
+++ b/app/client/ui/ThemeConfig.ts
@@ -2,7 +2,7 @@ import {makeT} from 'app/client/lib/localization';
 import {AppModel} from 'app/client/models/AppModel';
 import * as css from 'app/client/ui/AccountPageCss';
 import {labeledSquareCheckbox} from 'app/client/ui2018/checkbox';
-import {prefersDarkModeObs} from 'app/client/ui2018/cssVars';
+import {prefersColorSchemeDarkObs} from 'app/client/ui2018/theme';
 import {select} from 'app/client/ui2018/menus';
 import {ThemeAppearance} from 'app/common/ThemePrefs';
 import {Computed, Disposable, dom, makeTestId, styled} from 'grainjs';
@@ -20,10 +20,10 @@ export class ThemeConfig extends Disposable {
   private _appearance = Computed.create(this,
     this._themePrefs,
     this._syncWithOS,
-    prefersDarkModeObs(),
-    (_use, prefs, syncWithOS, prefersDarkMode) => {
+    prefersColorSchemeDarkObs(),
+    (_use, prefs, syncWithOS, prefersColorSchemeDark) => {
       if (syncWithOS) {
-        return prefersDarkMode ? 'dark' : 'light';
+        return prefersColorSchemeDark ? 'dark' : 'light';
       } else {
         return prefs.appearance;
       }
diff --git a/app/client/ui/createAppPage.ts b/app/client/ui/createAppPage.ts
index f5840d70..28dc51a3 100644
--- a/app/client/ui/createAppPage.ts
+++ b/app/client/ui/createAppPage.ts
@@ -4,7 +4,8 @@ import {AppModel, TopAppModelImpl, TopAppModelOptions} from 'app/client/models/A
 import {reportError, setUpErrorHandling} from 'app/client/models/errors';
 import {buildSnackbarDom} from 'app/client/ui/NotifyUI';
 import {addViewportTag} from 'app/client/ui/viewport';
-import {attachCssRootVars, attachTheme} from 'app/client/ui2018/cssVars';
+import {attachCssRootVars} from 'app/client/ui2018/cssVars';
+import {attachTheme} from 'app/client/ui2018/theme';
 import {BaseAPI} from 'app/common/BaseAPI';
 import {dom, DomContents} from 'grainjs';
 
@@ -16,22 +17,22 @@ const G = getBrowserGlobals('document', 'window');
  */
 export function createAppPage(
   buildAppPage: (appModel: AppModel) => DomContents,
-  modelOptions: TopAppModelOptions = {}) {
+  modelOptions: TopAppModelOptions = {}
+) {
   setUpErrorHandling();
 
   const topAppModel = TopAppModelImpl.create(null, {}, undefined, modelOptions);
 
   addViewportTag();
   attachCssRootVars(topAppModel.productFlavor);
+  attachTheme();
   setupLocale().catch(reportError);
 
   // Add globals needed by test utils.
   G.window.gristApp = {
     testNumPendingApiRequests: () => BaseAPI.numPendingRequests(),
   };
-  dom.update(document.body, dom.maybeOwned(topAppModel.appObs, (owner, appModel) => {
-    owner.autoDispose(attachTheme(appModel.currentTheme));
-
+  dom.update(document.body, dom.maybe(topAppModel.appObs, (appModel) => {
     return [
       buildAppPage(appModel),
       buildSnackbarDom(appModel.notifier, appModel),
diff --git a/app/client/ui/createPage.ts b/app/client/ui/createPage.ts
index a5fa5c69..027af0a8 100644
--- a/app/client/ui/createPage.ts
+++ b/app/client/ui/createPage.ts
@@ -4,7 +4,8 @@ import {reportError, setErrorNotifier, setUpErrorHandling} from 'app/client/mode
 import {Notifier} from 'app/client/models/NotifyModel';
 import {buildSnackbarDom} from 'app/client/ui/NotifyUI';
 import {addViewportTag} from 'app/client/ui/viewport';
-import {attachCssRootVars, attachTheme, prefersColorSchemeThemeObs} from 'app/client/ui2018/cssVars';
+import {attachCssRootVars} from 'app/client/ui2018/cssVars';
+import {attachTheme} from 'app/client/ui2018/theme';
 import {BaseAPI} from 'app/common/BaseAPI';
 import {dom, DomContents} from 'grainjs';
 
@@ -21,6 +22,7 @@ export function createPage(buildPage: () => DomContents, options: {disableTheme?
 
   addViewportTag();
   attachCssRootVars('grist');
+  if (!disableTheme) { attachTheme(); }
   setupLocale().catch(reportError);
 
   // Add globals needed by test utils.
@@ -32,7 +34,6 @@ export function createPage(buildPage: () => DomContents, options: {disableTheme?
   setErrorNotifier(notifier);
 
   dom.update(document.body, () => [
-    disableTheme ? null : dom.autoDispose(attachTheme(prefersColorSchemeThemeObs())),
     buildPage(),
     buildSnackbarDom(notifier, null),
   ]);
diff --git a/app/client/ui/searchDropdown.ts b/app/client/ui/searchDropdown.ts
index b618f7bd..901feb3b 100644
--- a/app/client/ui/searchDropdown.ts
+++ b/app/client/ui/searchDropdown.ts
@@ -2,16 +2,17 @@
 // keyboard. Dropdown features a search input and reoders the list of
 // items to bring best matches at the top.
 
-import { Disposable, dom, DomElementMethod, IOptionFull, makeTestId, Observable, styled } from "grainjs";
-import { theme, vars } from 'app/client/ui2018/cssVars';
 import { ACIndexImpl, ACIndexOptions, ACItem, buildHighlightedDom, HighlightFunc,
          normalizeText } from "app/client/lib/ACIndex";
-import { menuDivider } from "app/client/ui2018/menus";
-import { icon } from "app/client/ui2018/icons";
-import { cssMenuItem, defaultMenuOptions, IOpenController, IPopupOptions, setPopupToFunc } from "popweasel";
-import { mergeWith } from "lodash";
-import { getOptionFull, SimpleList } from "../lib/simpleList";
 import { makeT } from 'app/client/lib/localization';
+import { getOptionFull, SimpleList } from "app/client/lib/simpleList";
+import { theme, vars } from 'app/client/ui2018/cssVars';
+import { icon } from "app/client/ui2018/icons";
+import { menuDivider } from "app/client/ui2018/menus";
+import { Disposable, dom, DomElementMethod, IOptionFull, makeTestId, Observable, styled } from "grainjs";
+import mergeWith from "lodash/mergeWith";
+import { cssMenuItem, defaultMenuOptions, IOpenController, IPopupOptions, setPopupToFunc } from "popweasel";
+
 
 const t = makeT('searchDropdown');
 
diff --git a/app/client/ui/tooltips.ts b/app/client/ui/tooltips.ts
index 4398a52f..778dd3a8 100644
--- a/app/client/ui/tooltips.ts
+++ b/app/client/ui/tooltips.ts
@@ -582,7 +582,7 @@ const cssInfoTooltipPopup = styled('div', `
   display: flex;
   flex-direction: column;
   background-color: ${theme.popupBg};
-  max-width: 200px;
+  max-width: 240px;
   margin: 4px;
   padding: 0px;
 `);
diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts
index deab8233..5cd706e5 100644
--- a/app/client/ui2018/cssVars.ts
+++ b/app/client/ui2018/cssVars.ts
@@ -6,16 +6,10 @@
  *  https://css-tricks.com/snippets/css/system-font-stack/
  *
  */
-import {createPausableObs, PausableObservable} from 'app/client/lib/pausableObs';
-import {getStorage} from 'app/client/lib/storage';
 import {urlState} from 'app/client/models/gristUrlState';
 import {getTheme, ProductFlavor} from 'app/client/ui/CustomThemes';
-import {Theme, ThemeAppearance} from 'app/common/ThemePrefs';
-import {getThemeColors} from 'app/common/Themes';
-import {getGristConfig} from 'app/common/urlUtils';
-import {Computed, dom, DomElementMethod, makeTestId, Observable, styled, TestId} from 'grainjs';
+import {dom, DomElementMethod, makeTestId, Observable, styled, TestId} from 'grainjs';
 import debounce = require('lodash/debounce');
-import isEqual = require('lodash/isEqual');
 import values = require('lodash/values');
 
 const VAR_PREFIX = 'grist';
@@ -1021,51 +1015,6 @@ export function isScreenResizing(): Observable<boolean> {
   return _isScreenResizingObs;
 }
 
-export function prefersDarkMode(): boolean {
-  return window.matchMedia('(prefers-color-scheme: dark)').matches;
-}
-
-let _prefersDarkModeObs: PausableObservable<boolean>|undefined;
-
-/**
- * Returns a singleton observable for whether the user agent prefers dark mode.
- */
-export function prefersDarkModeObs(): PausableObservable<boolean> {
-  if (!_prefersDarkModeObs) {
-    const query = window.matchMedia('(prefers-color-scheme: dark)');
-    const obs = createPausableObs<boolean>(null, query.matches);
-    query.addEventListener('change', event => obs.set(event.matches));
-    _prefersDarkModeObs = obs;
-  }
-  return _prefersDarkModeObs;
-}
-
-let _prefersColorSchemeThemeObs: Computed<Theme>|undefined;
-
-/**
- * Returns a singleton observable for the Grist theme matching the current
- * user agent color scheme preference ("light" or "dark").
- */
-export function prefersColorSchemeThemeObs(): Computed<Theme> {
-  if (!_prefersColorSchemeThemeObs) {
-    const obs = Computed.create(null, prefersDarkModeObs(), (_use, prefersDarkTheme) => {
-      if (prefersDarkTheme) {
-        return {
-          appearance: 'dark',
-          colors: getThemeColors('GristDark'),
-        } as const;
-      } else {
-        return {
-          appearance: 'light',
-          colors: getThemeColors('GristLight'),
-        } as const;
-      }
-    });
-    _prefersColorSchemeThemeObs = obs;
-  }
-  return _prefersColorSchemeThemeObs;
-}
-
 /**
  * Attaches the global css properties to the document's root to make them available in the page.
  */
@@ -1081,96 +1030,6 @@ export function attachCssRootVars(productFlavor: ProductFlavor, varsOnly: boolea
   document.body.classList.add(`interface-${interfaceStyle}`);
 }
 
-export function attachTheme(themeObs: Observable<Theme>) {
-  // Attach the current theme to the DOM.
-  attachCssThemeVars(themeObs.get());
-
-  // Whenever the theme changes, re-attach it to the DOM.
-  return themeObs.addListener((newTheme, oldTheme) => {
-    if (isEqual(newTheme, oldTheme)) { return; }
-
-    attachCssThemeVars(newTheme);
-  });
-}
-
-/**
- * Attaches theme-related css properties to the theme style element.
- */
-function attachCssThemeVars({appearance, colors: themeColors}: Theme) {
-  // Custom CSS is incompatible with custom themes.
-  if (getGristConfig().enableCustomCss) { return; }
-
-  // Prepare the custom properties needed for applying the theme.
-  const properties = Object.entries(themeColors)
-    .map(([name, value]) => `--grist-theme-${name}: ${value};`);
-
-  // Include properties for styling the scrollbar.
-  properties.push(...getCssScrollbarProperties(appearance));
-
-  // Include properties for picking an appropriate background image.
-  properties.push(...getCssThemeBackgroundProperties(appearance));
-
-  // Apply the properties to the theme style element.
-  getOrCreateStyleElement('grist-theme').textContent = `:root {
-${properties.join('\n')}
-  }`;
-
-  // Make the browser aware of the color scheme.
-  document.documentElement.style.setProperty(`color-scheme`, appearance);
-
-  // Cache the appearance in local storage; this is currently used to apply a suitable
-  // background image that's shown while the application is loading.
-  getStorage().setItem('appearance', appearance);
-}
-
-/**
- * Gets scrollbar-related css properties that are appropriate for the given `appearance`.
- *
- * Note: Browser support for customizing scrollbars is still a mixed bag; the bulk of customization
- * is non-standard and unsupported by Firefox. If support matures, we could expose some of these in
- * custom themes, but for now we'll just go with reasonable presets.
- */
-function getCssScrollbarProperties(appearance: ThemeAppearance) {
-  return [
-    '--scroll-bar-fg: ' +
-      (appearance === 'dark' ? '#6B6B6B;' : '#A8A8A8;'),
-    '--scroll-bar-hover-fg: ' +
-      (appearance === 'dark' ? '#7B7B7B;' : '#8F8F8F;'),
-    '--scroll-bar-active-fg: ' +
-      (appearance === 'dark' ? '#8B8B8B;' : '#7C7C7C;'),
-    '--scroll-bar-bg: ' +
-      (appearance === 'dark' ? '#2B2B2B;' : '#F0F0F0;'),
-  ];
-}
-
-/**
- * Gets background-related css properties that are appropriate for the given `appearance`.
- *
- * Currently, this sets a property for showing a background image that's visible while a page
- * is loading.
- */
-function getCssThemeBackgroundProperties(appearance: ThemeAppearance) {
-  const value = appearance === 'dark'
-    ? 'url("img/prismpattern.png")'
-    : 'url("img/gplaypattern.png")';
-  return [`--grist-theme-bg: ${value};`];
-}
-
-/**
- * Gets or creates a style element in the head of the document with the given `id`.
- *
- * Useful for grouping CSS values such as theme custom properties without needing to
- * pollute the document with in-line styles.
- */
-function getOrCreateStyleElement(id: string) {
-  let style = document.head.querySelector(`#${id}`);
-  if (style) { return style; }
-  style = document.createElement('style');
-  style.setAttribute('id', id);
-  document.head.append(style);
-  return style;
-}
-
 // A dom method to hide element in print view
 export function hideInPrintView(): DomElementMethod {
   return cssHideInPrint.cls('');
diff --git a/app/client/ui2018/theme.ts b/app/client/ui2018/theme.ts
new file mode 100644
index 00000000..642732ad
--- /dev/null
+++ b/app/client/ui2018/theme.ts
@@ -0,0 +1,191 @@
+import { createPausableObs, PausableObservable } from 'app/client/lib/pausableObs';
+import { getStorage } from 'app/client/lib/storage';
+import { urlState } from 'app/client/models/gristUrlState';
+import { Theme, ThemeAppearance, ThemeColors, ThemePrefs } from 'app/common/ThemePrefs';
+import { getThemeColors } from 'app/common/Themes';
+import { getGristConfig } from 'app/common/urlUtils';
+import { Computed, Observable } from 'grainjs';
+import isEqual from 'lodash/isEqual';
+
+const DEFAULT_LIGHT_THEME: Theme = {appearance: 'light', colors: getThemeColors('GristLight')};
+const DEFAULT_DARK_THEME: Theme = {appearance: 'dark', colors: getThemeColors('GristDark')};
+
+/**
+ * A singleton observable for the current user's Grist theme preferences.
+ *
+ * Set by `AppModel`, which populates it from `UserPrefs`.
+ */
+export const gristThemePrefs = Observable.create<ThemePrefs | null>(null, null);
+
+/**
+ * Returns `true` if the user agent prefers a dark color scheme.
+ */
+export function prefersColorSchemeDark(): boolean {
+  return window.matchMedia('(prefers-color-scheme: dark)').matches;
+}
+
+let _prefersColorSchemeDarkObs: PausableObservable<boolean> | undefined;
+
+/**
+ * Returns a singleton observable for whether the user agent prefers a
+ * dark color scheme.
+ */
+export function prefersColorSchemeDarkObs(): PausableObservable<boolean> {
+  if (!_prefersColorSchemeDarkObs) {
+    const query = window.matchMedia('(prefers-color-scheme: dark)');
+    const obs = createPausableObs<boolean>(null, query.matches);
+    query.addEventListener('change', event => obs.set(event.matches));
+    _prefersColorSchemeDarkObs = obs;
+  }
+  return _prefersColorSchemeDarkObs;
+}
+
+let _gristThemeObs: Computed<Theme> | undefined;
+
+/**
+ * A singleton observable for the current Grist theme.
+ */
+export function gristThemeObs() {
+  if (!_gristThemeObs) {
+    _gristThemeObs = Computed.create(null, (use) => {
+      // Custom CSS is incompatible with custom themes.
+      if (getGristConfig().enableCustomCss) { return DEFAULT_LIGHT_THEME; }
+
+      // If a user's preference is known, return it.
+      const themePrefs = use(gristThemePrefs);
+      const userAgentPrefersDarkTheme = use(prefersColorSchemeDarkObs());
+      if (themePrefs) { return getThemeFromPrefs(themePrefs, userAgentPrefersDarkTheme); }
+
+      // Otherwise, fall back to the user agent's preference.
+      return userAgentPrefersDarkTheme ? DEFAULT_DARK_THEME : DEFAULT_LIGHT_THEME;
+    });
+  }
+  return _gristThemeObs;
+}
+
+/**
+ * Attaches the current theme's CSS variables to the document, and
+ * re-attaches them whenever the theme changes.
+ */
+export function attachTheme() {
+  // Custom CSS is incompatible with custom themes.
+  if (getGristConfig().enableCustomCss) { return; }
+
+  // Attach the current theme's variables to the DOM.
+  attachCssThemeVars(gristThemeObs().get());
+
+  // Whenever the theme changes, re-attach its variables to the DOM.
+  gristThemeObs().addListener((newTheme, oldTheme) => {
+    if (isEqual(newTheme, oldTheme)) { return; }
+
+    attachCssThemeVars(newTheme);
+  });
+}
+
+/**
+ * Returns the `Theme` from the given `themePrefs`.
+ *
+ * If theme query parameters are present (`themeName`, `themeAppearance`, `themeSyncWithOs`),
+ * they will take precedence over their respective values in `themePrefs`.
+ */
+function getThemeFromPrefs(themePrefs: ThemePrefs, userAgentPrefersDarkTheme: boolean): Theme {
+  let {appearance, syncWithOS} = themePrefs;
+
+  const urlParams = urlState().state.get().params;
+  if (urlParams?.themeAppearance) {
+    appearance = urlParams?.themeAppearance;
+  }
+  if (urlParams?.themeSyncWithOs !== undefined) {
+    syncWithOS = urlParams?.themeSyncWithOs;
+  }
+
+  if (syncWithOS) {
+    appearance = userAgentPrefersDarkTheme ? 'dark' : 'light';
+  }
+
+  let nameOrColors = themePrefs.colors[appearance];
+  if (urlParams?.themeName) {
+    nameOrColors = urlParams?.themeName;
+  }
+
+  let colors: ThemeColors;
+  if (typeof nameOrColors === 'string') {
+    colors = getThemeColors(nameOrColors);
+  } else {
+    colors = nameOrColors;
+  }
+
+  return {appearance, colors};
+}
+
+function attachCssThemeVars({appearance, colors: themeColors}: Theme) {
+  // Prepare the custom properties needed for applying the theme.
+  const properties = Object.entries(themeColors)
+    .map(([name, value]) => `--grist-theme-${name}: ${value};`);
+
+  // Include properties for styling the scrollbar.
+  properties.push(...getCssThemeScrollbarProperties(appearance));
+
+  // Include properties for picking an appropriate background image.
+  properties.push(...getCssThemeBackgroundProperties(appearance));
+
+  // Apply the properties to the theme style element.
+  getOrCreateStyleElement('grist-theme').textContent = `:root {
+${properties.join('\n')}
+  }`;
+
+  // Make the browser aware of the color scheme.
+  document.documentElement.style.setProperty(`color-scheme`, appearance);
+
+  // Cache the appearance in local storage; this is currently used to apply a suitable
+  // background image that's shown while the application is loading.
+  getStorage().setItem('appearance', appearance);
+}
+
+/**
+ * Gets scrollbar-related css properties that are appropriate for the given `appearance`.
+ *
+ * Note: Browser support for customizing scrollbars is still a mixed bag; the bulk of customization
+ * is non-standard and unsupported by Firefox. If support matures, we could expose some of these in
+ * custom themes, but for now we'll just go with reasonable presets.
+ */
+function getCssThemeScrollbarProperties(appearance: ThemeAppearance) {
+  return [
+    '--scroll-bar-fg: ' +
+      (appearance === 'dark' ? '#6B6B6B;' : '#A8A8A8;'),
+    '--scroll-bar-hover-fg: ' +
+      (appearance === 'dark' ? '#7B7B7B;' : '#8F8F8F;'),
+    '--scroll-bar-active-fg: ' +
+      (appearance === 'dark' ? '#8B8B8B;' : '#7C7C7C;'),
+    '--scroll-bar-bg: ' +
+      (appearance === 'dark' ? '#2B2B2B;' : '#F0F0F0;'),
+  ];
+}
+
+/**
+ * Gets background-related css properties that are appropriate for the given `appearance`.
+ *
+ * Currently, this sets a property for showing a background image that's visible while a page
+ * is loading.
+ */
+function getCssThemeBackgroundProperties(appearance: ThemeAppearance) {
+  const value = appearance === 'dark'
+    ? 'url("img/prismpattern.png")'
+    : 'url("img/gplaypattern.png")';
+  return [`--grist-theme-bg: ${value};`];
+}
+
+/**
+ * Gets or creates a style element in the head of the document with the given `id`.
+ *
+ * Useful for grouping CSS values such as theme custom properties without needing to
+ * pollute the document with in-line styles.
+ */
+function getOrCreateStyleElement(id: string) {
+  let style = document.head.querySelector(`#${id}`);
+  if (style) { return style; }
+  style = document.createElement('style');
+  style.setAttribute('id', id);
+  document.head.append(style);
+  return style;
+}
diff --git a/app/client/widgets/ChoiceEditor.js b/app/client/widgets/ChoiceEditor.js
index 19ebfcba..940c8d53 100644
--- a/app/client/widgets/ChoiceEditor.js
+++ b/app/client/widgets/ChoiceEditor.js
@@ -4,13 +4,22 @@ var TextEditor = require('app/client/widgets/TextEditor');
 
 const {Autocomplete} = require('app/client/lib/autocomplete');
 const {ACIndexImpl, buildHighlightedDom} = require('app/client/lib/ACIndex');
-const {ChoiceItem, cssChoiceList, cssMatchText, cssPlusButton,
-       cssPlusIcon} = require('app/client/widgets/ChoiceListEditor');
+const {makeT} = require('app/client/lib/localization');
+const {
+  buildDropdownConditionFilter,
+  ChoiceItem,
+  cssChoiceList,
+  cssMatchText,
+  cssPlusButton,
+  cssPlusIcon,
+} = require('app/client/widgets/ChoiceListEditor');
+const {icon} = require('app/client/ui2018/icons');
 const {menuCssClass} = require('app/client/ui2018/menus');
 const {testId, theme} = require('app/client/ui2018/cssVars');
 const {choiceToken, cssChoiceACItem} = require('app/client/widgets/ChoiceToken');
 const {dom, styled} = require('grainjs');
-const {icon} = require('../ui2018/icons');
+
+const t = makeT('ChoiceEditor');
 
 /**
  * ChoiceEditor - TextEditor with a dropdown for possible choices.
@@ -18,15 +27,46 @@ const {icon} = require('../ui2018/icons');
 function ChoiceEditor(options) {
   TextEditor.call(this, options);
 
-  this.choices = options.field.widgetOptionsJson.peek().choices || [];
-  this.choiceOptions = options.field.widgetOptionsJson.peek().choiceOptions || {};
+  this.widgetOptionsJson = options.field.widgetOptionsJson;
+  this.choices = this.widgetOptionsJson.peek().choices || [];
+  this.choicesSet = new Set(this.choices);
+  this.choiceOptions = this.widgetOptionsJson.peek().choiceOptions || {};
+
+  this.hasDropdownCondition = Boolean(options.field.dropdownCondition.peek()?.text);
+  this.dropdownConditionError;
+
+  let acItems = this.choices.map(c => new ChoiceItem(c, false, false));
+  if (this.hasDropdownCondition) {
+    try {
+      const dropdownConditionFilter = this.buildDropdownConditionFilter();
+      acItems = acItems.filter((item) => dropdownConditionFilter(item));
+    } catch (e) {
+      acItems = [];
+      this.dropdownConditionError = e.message;
+    }
+  }
+
+  const acIndex = new ACIndexImpl(acItems);
+  this._acOptions = {
+    popperOptions: {
+      placement: 'bottom'
+    },
+    menuCssClass: `${menuCssClass} ${cssChoiceList.className} test-autocomplete`,
+    buildNoItemsMessage: this.buildNoItemsMessage.bind(this),
+    search: (term) => this.maybeShowAddNew(acIndex.search(term), term),
+    renderItem: (item, highlightFunc) => this.renderACItem(item, highlightFunc),
+    getItemText: (item) => item.label,
+    onClick: () => this.options.commands.fieldEditSave(),
+  };
+
   if (!options.readonly && options.field.viewSection().parentKey() === "single") {
     this.cellEditorDiv.classList.add(cssChoiceEditor.className);
     this.cellEditorDiv.appendChild(cssChoiceEditIcon('Dropdown'));
   }
+
   // Whether to include a button to show a new choice.
   // TODO: Disable when the user cannot change column configuration.
-  this.enableAddNew = true;
+  this.enableAddNew = !this.hasDropdownCondition;
 }
 
 dispose.makeDisposable(ChoiceEditor);
@@ -66,20 +106,7 @@ ChoiceEditor.prototype.attach = function(cellElem) {
   // Don't create autocomplete if readonly.
   if (this.options.readonly) { return; }
 
-  const acItems = this.choices.map(c => new ChoiceItem(c, false, false));
-  const acIndex = new ACIndexImpl(acItems);
-  const acOptions = {
-    popperOptions: {
-      placement: 'bottom'
-    },
-    menuCssClass: `${menuCssClass} ${cssChoiceList.className} test-autocomplete`,
-    search: (term) => this.maybeShowAddNew(acIndex.search(term), term),
-    renderItem: (item, highlightFunc) => this.renderACItem(item, highlightFunc),
-    getItemText: (item) => item.label,
-    onClick: () => this.options.commands.fieldEditSave(),
-  };
-
-  this.autocomplete = Autocomplete.create(this, this.textInput, acOptions);
+  this.autocomplete = Autocomplete.create(this, this.textInput, this._acOptions);
 }
 
 /**
@@ -89,11 +116,35 @@ ChoiceEditor.prototype.attach = function(cellElem) {
 ChoiceEditor.prototype.prepForSave = async function() {
   const selectedItem = this.autocomplete && this.autocomplete.getSelectedItem();
   if (selectedItem && selectedItem.isNew) {
-    const choices = this.options.field.widgetOptionsJson.prop('choices');
+    const choices = this.widgetOptionsJson.prop('choices');
     await choices.saveOnly([...(choices.peek() || []), selectedItem.label]);
   }
 }
 
+ChoiceEditor.prototype.buildDropdownConditionFilter = function() {
+  const dropdownConditionCompiled = this.options.field.dropdownConditionCompiled.get();
+  if (dropdownConditionCompiled?.kind !== 'success') {
+    throw new Error('Dropdown condition is not compiled');
+  }
+
+  return buildDropdownConditionFilter({
+    dropdownConditionCompiled: dropdownConditionCompiled.result,
+    docData: this.options.gristDoc.docData,
+    tableId: this.options.field.tableId(),
+    rowId: this.options.rowId,
+  });
+}
+
+ChoiceEditor.prototype.buildNoItemsMessage = function() {
+  if (this.dropdownConditionError) {
+    return t('Error in dropdown condition');
+  } else if (this.hasDropdownCondition) {
+    return t('No choices matching condition');
+  } else {
+    return t('No choices to select');
+  }
+}
+
 /**
  * If the search text does not match anything exactly, adds 'new' item to it.
  *
@@ -103,15 +154,21 @@ ChoiceEditor.prototype.maybeShowAddNew = function(result, text) {
   // TODO: This logic is also mostly duplicated in ChoiceListEditor and ReferenceEditor.
   // See if there's anything common we can factor out and re-use.
   this.showAddNew = false;
+  if (!this.enableAddNew) {
+    return result;
+  }
+
   const trimmedText = text.trim();
-  if (!this.enableAddNew || !trimmedText) { return result; }
+  if (!trimmedText || this.choicesSet.has(trimmedText)) {
+    return result;
+  }
 
   const addNewItem = new ChoiceItem(trimmedText, false, false, true);
   if (result.items.find((item) => item.cleanText === addNewItem.cleanText)) {
     return result;
   }
 
-  result.items.push(addNewItem);
+  result.extraItems.push(addNewItem);
   this.showAddNew = true;
 
   return result;
diff --git a/app/client/widgets/ChoiceListEditor.ts b/app/client/widgets/ChoiceListEditor.ts
index 60329b63..238f47f0 100644
--- a/app/client/widgets/ChoiceListEditor.ts
+++ b/app/client/widgets/ChoiceListEditor.ts
@@ -2,7 +2,9 @@ import {createGroup} from 'app/client/components/commands';
 import {ACIndexImpl, ACItem, ACResults,
         buildHighlightedDom, HighlightFunc, normalizeText} from 'app/client/lib/ACIndex';
 import {IAutocompleteOptions} from 'app/client/lib/autocomplete';
+import {makeT} from 'app/client/lib/localization';
 import {IToken, TokenField, tokenFieldStyles} from 'app/client/lib/TokenField';
+import {DocData} from 'app/client/models/DocData';
 import {colors, testId, theme} from 'app/client/ui2018/cssVars';
 import {menuCssClass} from 'app/client/ui2018/menus';
 import {createMobileButtons, getButtonMargins} from 'app/client/widgets/EditorButtons';
@@ -10,12 +12,15 @@ import {EditorPlacement} from 'app/client/widgets/EditorPlacement';
 import {FieldOptions, NewBaseEditor} from 'app/client/widgets/NewBaseEditor';
 import {csvEncodeRow} from 'app/common/csvFormat';
 import {CellValue} from "app/common/DocActions";
+import {CompiledPredicateFormula, EmptyRecordView} from 'app/common/PredicateFormula';
 import {decodeObject, encodeObject} from 'app/plugin/objtypes';
 import {ChoiceOptions, getRenderFillColor, getRenderTextColor} from 'app/client/widgets/ChoiceTextBox';
 import {choiceToken, cssChoiceACItem, cssChoiceToken} from 'app/client/widgets/ChoiceToken';
 import {icon} from 'app/client/ui2018/icons';
 import {dom, styled} from 'grainjs';
 
+const t = makeT('ChoiceListEditor');
+
 export class ChoiceItem implements ACItem, IToken {
   public cleanText: string = normalizeText(this.label);
   constructor(
@@ -38,25 +43,37 @@ export class ChoiceListEditor extends NewBaseEditor {
   private _inputSizer!: HTMLElement;     // Part of _contentSizer to size the text input
   private _alignment: string;
 
+  private _widgetOptionsJson = this.options.field.widgetOptionsJson.peek();
+  private _choices: string[] = this._widgetOptionsJson.choices || [];
+  private _choicesSet: Set<string> = new Set(this._choices);
+  private _choiceOptionsByName: ChoiceOptions = this._widgetOptionsJson.choiceOptions || {};
+
   // Whether to include a button to show a new choice.
   // TODO: Disable when the user cannot change column configuration.
-  private _enableAddNew: boolean = true;
+  private _enableAddNew: boolean;
   private _showAddNew: boolean = false;
 
-  private _choiceOptionsByName: ChoiceOptions;
+  private _hasDropdownCondition = Boolean(this.options.field.dropdownCondition.peek()?.text);
+  private _dropdownConditionError: string | undefined;
 
   constructor(protected options: FieldOptions) {
     super(options);
 
-    const choices: string[] = options.field.widgetOptionsJson.peek().choices || [];
-    this._choiceOptionsByName = options.field.widgetOptionsJson
-      .peek().choiceOptions || {};
-    const acItems = choices.map(c => new ChoiceItem(c, false, false));
-    const choiceSet = new Set(choices);
+    let acItems = this._choices.map(c => new ChoiceItem(c, false, false));
+    if (this._hasDropdownCondition) {
+      try {
+        const dropdownConditionFilter = this._buildDropdownConditionFilter();
+        acItems = acItems.filter((item) => dropdownConditionFilter(item));
+      } catch (e) {
+        acItems = [];
+        this._dropdownConditionError = e.message;
+      }
+    }
 
     const acIndex = new ACIndexImpl<ChoiceItem>(acItems);
     const acOptions: IAutocompleteOptions<ChoiceItem> = {
       menuCssClass: `${menuCssClass} ${cssChoiceList.className} test-autocomplete`,
+      buildNoItemsMessage: this._buildNoItemsMessage.bind(this),
       search: async (term: string) => this._maybeShowAddNew(acIndex.search(term), term),
       renderItem: (item, highlightFunc) => this._renderACItem(item, highlightFunc),
       getItemText: (item) => item.label,
@@ -65,12 +82,13 @@ export class ChoiceListEditor extends NewBaseEditor {
     this.commandGroup = this.autoDispose(createGroup(options.commands, null, true));
     this._alignment = options.field.widgetOptionsJson.peek().alignment || 'left';
 
+
     // If starting to edit by typing in a string, ignore previous tokens.
     const cellValue = decodeObject(options.cellValue);
     const startLabels: unknown[] = options.editValue !== undefined || !Array.isArray(cellValue) ? [] : cellValue;
     const startTokens = startLabels.map(label => new ChoiceItem(
       String(label),
-      !choiceSet.has(String(label)),
+      !this._choicesSet.has(String(label)),
       String(label).trim() === ''
     ));
 
@@ -87,7 +105,7 @@ export class ChoiceListEditor extends NewBaseEditor {
         cssChoiceToken.cls('-invalid', item.isInvalid),
         cssChoiceToken.cls('-blank', item.isBlank),
       ],
-      createToken: label => new ChoiceItem(label, !choiceSet.has(label), label.trim() === ''),
+      createToken: label => new ChoiceItem(label, !this._choicesSet.has(label), label.trim() === ''),
       acOptions,
       openAutocompleteOnFocus: true,
       readonly : options.readonly,
@@ -118,6 +136,8 @@ export class ChoiceListEditor extends NewBaseEditor {
       dom.prop('value', options.editValue || ''),
       this.commandGroup.attach(),
     );
+
+    this._enableAddNew = !this._hasDropdownCondition;
   }
 
   public attach(cellElem: Element): void {
@@ -150,7 +170,7 @@ export class ChoiceListEditor extends NewBaseEditor {
   }
 
   public getTextValue() {
-    const values = this._tokenField.tokensObs.get().map(t => t.label);
+    const values = this._tokenField.tokensObs.get().map(token => token.label);
     return csvEncodeRow(values, {prettier: true});
   }
 
@@ -164,7 +184,7 @@ export class ChoiceListEditor extends NewBaseEditor {
    */
   public async prepForSave() {
     const tokens = this._tokenField.tokensObs.get();
-    const newChoices = tokens.filter(t => t.isNew).map(t => t.label);
+    const newChoices = tokens.filter(({isNew}) => isNew).map(({label}) => label);
     if (newChoices.length > 0) {
       const choices = this.options.field.widgetOptionsJson.prop('choices');
       await choices.saveOnly([...(choices.peek() || []), ...new Set(newChoices)]);
@@ -218,6 +238,30 @@ export class ChoiceListEditor extends NewBaseEditor {
     this._textInput.style.width = this._inputSizer.getBoundingClientRect().width + 'px';
   }
 
+  private _buildDropdownConditionFilter() {
+    const dropdownConditionCompiled = this.options.field.dropdownConditionCompiled.get();
+    if (dropdownConditionCompiled?.kind !== 'success') {
+      throw new Error('Dropdown condition is not compiled');
+    }
+
+    return buildDropdownConditionFilter({
+      dropdownConditionCompiled: dropdownConditionCompiled.result,
+      docData: this.options.gristDoc.docData,
+      tableId: this.options.field.tableId(),
+      rowId: this.options.rowId,
+    });
+  }
+
+  private _buildNoItemsMessage(): string {
+    if (this._dropdownConditionError) {
+      return t('Error in dropdown condition');
+    } else if (this._hasDropdownCondition) {
+      return t('No choices matching condition');
+    } else {
+      return t('No choices to select');
+    }
+  }
+
   /**
    * If the search text does not match anything exactly, adds 'new' item to it.
    *
@@ -225,15 +269,21 @@ export class ChoiceListEditor extends NewBaseEditor {
    */
   private _maybeShowAddNew(result: ACResults<ChoiceItem>, text: string): ACResults<ChoiceItem> {
     this._showAddNew = false;
+    if (!this._enableAddNew) {
+      return result;
+    }
+
     const trimmedText = text.trim();
-    if (!this._enableAddNew || !trimmedText) { return result; }
+    if (!trimmedText || this._choicesSet.has(trimmedText)) {
+      return result;
+    }
 
     const addNewItem = new ChoiceItem(trimmedText, false, false, true);
     if (result.items.find((item) => item.cleanText === addNewItem.cleanText)) {
       return result;
     }
 
-    result.items.push(addNewItem);
+    result.extraItems.push(addNewItem);
     this._showAddNew = true;
 
     return result;
@@ -259,6 +309,24 @@ export class ChoiceListEditor extends NewBaseEditor {
   }
 }
 
+export interface GetACFilterFuncParams {
+  dropdownConditionCompiled: CompiledPredicateFormula;
+  docData: DocData;
+  tableId: string;
+  rowId: number;
+}
+
+export function buildDropdownConditionFilter(
+  params: GetACFilterFuncParams
+): (item: ChoiceItem) => boolean {
+  const {dropdownConditionCompiled, docData, tableId, rowId} = params;
+  const table = docData.getTable(tableId);
+  if (!table) { throw new Error(`Table ${tableId} not found`); }
+
+  const rec = table.getRecord(rowId) || new EmptyRecordView();
+  return (item: ChoiceItem) => dropdownConditionCompiled({rec, choice: item.label});
+}
+
 const cssCellEditor = styled('div', `
   background-color: ${theme.cellEditorBg};
   font-family: var(--grist-font-family-data);
diff --git a/app/client/widgets/ChoiceListEntry.ts b/app/client/widgets/ChoiceListEntry.ts
index 9e83197d..450282f0 100644
--- a/app/client/widgets/ChoiceListEntry.ts
+++ b/app/client/widgets/ChoiceListEntry.ts
@@ -605,7 +605,6 @@ const cssButtonRow = styled('div', `
   gap: 8px;
   display: flex;
   margin-top: 8px;
-  margin-bottom: 16px;
 `);
 
 const cssDeleteButton = styled('div', `
diff --git a/app/client/widgets/ChoiceTextBox.ts b/app/client/widgets/ChoiceTextBox.ts
index f5a4208d..d2740947 100644
--- a/app/client/widgets/ChoiceTextBox.ts
+++ b/app/client/widgets/ChoiceTextBox.ts
@@ -3,6 +3,7 @@ import {
   FormOptionsSortConfig,
   FormSelectConfig,
 } from 'app/client/components/Forms/FormConfig';
+import {DropdownConditionConfig} from 'app/client/components/DropdownConditionConfig';
 import {makeT} from 'app/client/lib/localization';
 import {DataRowModel} from 'app/client/models/DataRowModel';
 import {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec';
@@ -82,11 +83,15 @@ export class ChoiceTextBox extends NTextBox {
     return [
       super.buildConfigDom(),
       this.buildChoicesConfigDom(),
+      dom.create(DropdownConditionConfig, this.field),
     ];
   }
 
   public buildTransformConfigDom() {
-    return this.buildConfigDom();
+    return [
+      super.buildConfigDom(),
+      this.buildChoicesConfigDom(),
+    ];
   }
 
   public buildFormConfigDom() {
diff --git a/app/client/widgets/ConditionalStyle.ts b/app/client/widgets/ConditionalStyle.ts
index c17ef929..f2ccdf23 100644
--- a/app/client/widgets/ConditionalStyle.ts
+++ b/app/client/widgets/ConditionalStyle.ts
@@ -4,7 +4,8 @@ import {ColumnRec} from 'app/client/models/DocModel';
 import {KoSaveableObservable} from 'app/client/models/modelUtil';
 import {RuleOwner} from 'app/client/models/RuleOwner';
 import {Style} from 'app/client/models/Styles';
-import {cssFieldFormula} from 'app/client/ui/FieldConfig';
+import {buildHighlightedCode} from 'app/client/ui/CodeHighlight';
+import {cssFieldFormula} from 'app/client/ui/RightPanelStyles';
 import {withInfoTooltip} from 'app/client/ui/tooltips';
 import {textButton} from 'app/client/ui2018/buttons';
 import {ColorOption, colorSelect} from 'app/client/ui2018/ColorSelect';
@@ -180,10 +181,11 @@ export class ConditionalStyle extends Disposable {
     column: ColumnRec,
     hasError: Observable<boolean>
   ) {
-    return cssFieldFormula(
+    return dom.create(buildHighlightedCode,
       formula,
-      { gristTheme: this._gristDoc.currentTheme, maxLines: 1 },
+      { maxLines: 1 },
       dom.cls('formula_field_sidepane'),
+      dom.cls(cssFieldFormula.className),
       dom.cls(cssErrorBorder.className, hasError),
       { tabIndex: '-1' },
       dom.on('focus', (_, refElem) => {
diff --git a/app/client/widgets/EditorButtons.ts b/app/client/widgets/EditorButtons.ts
index 71f28648..ac08fd09 100644
--- a/app/client/widgets/EditorButtons.ts
+++ b/app/client/widgets/EditorButtons.ts
@@ -10,8 +10,8 @@ import {dom, styled} from 'grainjs';
 export function createMobileButtons(commands: IEditorCommandGroup) {
   // TODO A better check may be to detect a physical keyboard or touch support.
   return isDesktop() ? null : [
-    cssCancelBtn(cssIconWrap(cssFinishIcon('CrossSmall')), dom.on('click', commands.fieldEditCancel)),
-    cssSaveBtn(cssIconWrap(cssFinishIcon('Tick')), dom.on('click', commands.fieldEditSaveHere)),
+    cssCancelBtn(cssIconWrap(cssFinishIcon('CrossSmall')), dom.on('mousedown', commands.fieldEditCancel)),
+    cssSaveBtn(cssIconWrap(cssFinishIcon('Tick')), dom.on('mousedown', commands.fieldEditSaveHere)),
   ];
 }
 
diff --git a/app/client/widgets/FormulaAssistant.ts b/app/client/widgets/FormulaAssistant.ts
index 2006dfe6..4aa2378f 100644
--- a/app/client/widgets/FormulaAssistant.ts
+++ b/app/client/widgets/FormulaAssistant.ts
@@ -9,12 +9,13 @@ import {ColumnRec, ViewFieldRec} from 'app/client/models/DocModel';
 import {ChatMessage} from 'app/client/models/entities/ColumnRec';
 import {HAS_FORMULA_ASSISTANT, WHICH_FORMULA_ASSISTANT} from 'app/client/models/features';
 import {getLoginOrSignupUrl, urlState} from 'app/client/models/gristUrlState';
-import {buildHighlightedCode} from 'app/client/ui/CodeHighlight';
+import {buildCodeHighlighter, buildHighlightedCode} from 'app/client/ui/CodeHighlight';
 import {autoGrow} from 'app/client/ui/forms';
 import {sanitizeHTML} from 'app/client/ui/sanitizeHTML';
 import {createUserImage} from 'app/client/ui/UserImage';
 import {basicButton, bigPrimaryButtonLink, primaryButton} from 'app/client/ui2018/buttons';
 import {theme, vars} from 'app/client/ui2018/cssVars';
+import {gristThemeObs} from 'app/client/ui2018/theme';
 import {icon} from 'app/client/ui2018/icons';
 import {cssLink} from 'app/client/ui2018/links';
 import {loadingDots} from 'app/client/ui2018/loaders';
@@ -1009,26 +1010,19 @@ class ChatHistory extends Disposable {
    * Renders the message as markdown if possible, otherwise as a code block.
    */
   private _render(message: string, ...args: DomElementArg[]) {
-    const doc = this._options.gristDoc;
     if (this.supportsMarkdown()) {
       return dom('div',
-        (el) => subscribeElem(el, doc.currentTheme, () => {
+        (el) => subscribeElem(el, gristThemeObs(), async () => {
+          const highlightCode = await buildCodeHighlighter({maxLines: 60});
           const content = sanitizeHTML(marked(message, {
-            highlight: (code) => {
-              const codeBlock = buildHighlightedCode(code, {
-                gristTheme: doc.currentTheme,
-                maxLines: 60,
-              });
-              return codeBlock.innerHTML;
-            },
+            highlight: (code) => highlightCode(code)
           }));
           el.innerHTML = content;
         }),
         ...args
       );
     } else {
-      return buildHighlightedCode(message, {
-        gristTheme: doc.currentTheme,
+      return dom.create(buildHighlightedCode, message, {
         maxLines: 100,
       });
     }
diff --git a/app/client/widgets/FormulaEditor.ts b/app/client/widgets/FormulaEditor.ts
index c30681e3..010c1e93 100644
--- a/app/client/widgets/FormulaEditor.ts
+++ b/app/client/widgets/FormulaEditor.ts
@@ -74,15 +74,13 @@ export class FormulaEditor extends NewBaseEditor {
     this._aceEditor = AceEditor.create({
       // A bit awkward, but we need to assume calcSize is not used until attach() has been called
       // and _editorPlacement created.
-      column: options.column,
       calcSize: this._calcSize.bind(this),
-      gristDoc: options.gristDoc,
       saveValueOnBlurEvent: !options.readonly,
       editorState : this.editorState,
-      readonly: options.readonly
+      readonly: options.readonly,
+      getSuggestions: this._getSuggestions.bind(this),
     });
 
-
     // For editable editor we will grab the cursor when we are in the formula editing mode.
     const cursorCommands = options.readonly ? {} : { setCursor: this._onSetCursor };
     const isActive = Computed.create(this, use => Boolean(use(editingFormula)));
@@ -201,10 +199,7 @@ export class FormulaEditor extends NewBaseEditor {
       cssFormulaEditor.cls('-detached', this.isDetached),
       dom('div.formula_editor.formula_field_edit', testId('formula-editor'),
         this._aceEditor.buildDom((aceObj: any) => {
-          aceObj.setFontSize(11);
-          aceObj.setHighlightActiveLine(false);
-          aceObj.getSession().setUseWrapMode(false);
-          aceObj.renderer.setPadding(0);
+          initializeAceOptions(aceObj);
           const val = initialValue;
           const pos = Math.min(options.cursorPos, val.length);
           this._aceEditor.setValue(val, pos);
@@ -405,6 +400,17 @@ export class FormulaEditor extends NewBaseEditor {
     return result;
   }
 
+  private _getSuggestions(prefix: string) {
+    const section = this.options.gristDoc.viewModel.activeSection();
+    // If section is disposed or is pointing to an empty row, don't try to autocomplete.
+    if (!section?.getRowId()) { return []; }
+
+    const tableId = section.table().tableId();
+    const columnId = this.options.column.colId();
+    const rowId = section.activeRowId();
+    return this.options.gristDoc.docComm.autocomplete(prefix, tableId, columnId, rowId);
+  }
+
   // TODO: update regexes to unicode?
   private _onSetCursor(row?: DataRowModel, col?: ViewFieldRec) {
     // Don't do anything when we are readonly.
@@ -714,6 +720,13 @@ export function createFormulaErrorObs(owner: MultiHolder, gristDoc: GristDoc, or
   return errorMessage;
 }
 
+export function initializeAceOptions(aceObj: any) {
+  aceObj.setFontSize(11);
+  aceObj.setHighlightActiveLine(false);
+  aceObj.getSession().setUseWrapMode(false);
+  aceObj.renderer.setPadding(0);
+}
+
 const cssCollapseIcon = styled(icon, `
   margin: -3px 4px 0 4px;
   --icon-color: ${colors.slate};
diff --git a/app/client/widgets/Reference.ts b/app/client/widgets/Reference.ts
index 282388ac..81da964b 100644
--- a/app/client/widgets/Reference.ts
+++ b/app/client/widgets/Reference.ts
@@ -3,6 +3,7 @@ import {
   FormOptionsSortConfig,
   FormSelectConfig
 } from 'app/client/components/Forms/FormConfig';
+import {DropdownConditionConfig} from 'app/client/components/DropdownConditionConfig';
 import {makeT} from 'app/client/lib/localization';
 import {DataRowModel} from 'app/client/models/DataRowModel';
 import {TableRec} from 'app/client/models/DocModel';
@@ -55,6 +56,7 @@ export class Reference extends NTextBox {
   public buildConfigDom() {
     return [
       this.buildTransformConfigDom(),
+      dom.create(DropdownConditionConfig, this.field),
       cssLabel(t('CELL FORMAT')),
       super.buildConfigDom(),
     ];
diff --git a/app/client/widgets/ReferenceEditor.ts b/app/client/widgets/ReferenceEditor.ts
index 71ee3254..79358917 100644
--- a/app/client/widgets/ReferenceEditor.ts
+++ b/app/client/widgets/ReferenceEditor.ts
@@ -11,7 +11,6 @@ import { nocaseEqual, ReferenceUtils } from 'app/client/lib/ReferenceUtils';
 import { undef } from 'app/common/gutil';
 import { styled } from 'grainjs';
 
-
 /**
  * A ReferenceEditor offers an autocomplete of choices from the referenced table.
  */
@@ -28,7 +27,12 @@ export class ReferenceEditor extends NTextEditor {
     this._utils = new ReferenceUtils(options.field, docData);
 
     const vcol = this._utils.visibleColModel;
-    this._enableAddNew = vcol && !vcol.isRealFormula() && !!vcol.colId();
+    this._enableAddNew = (
+      vcol &&
+      !vcol.isRealFormula() &&
+      !!vcol.colId() &&
+      !this._utils.hasDropdownCondition
+    );
 
     // Decorate the editor to look like a reference column value (with a "link" icon).
     // But not on readonly mode - here we will reuse default decoration
@@ -65,7 +69,8 @@ export class ReferenceEditor extends NTextEditor {
     // don't create autocomplete for readonly mode
     if (this.options.readonly) { return; }
     this._autocomplete = this.autoDispose(new Autocomplete<ICellItem>(this.textInput, {
-      menuCssClass: menuCssClass + ' ' + cssRefList.className,
+      menuCssClass: `${menuCssClass} ${cssRefList.className} test-autocomplete`,
+      buildNoItemsMessage: () => this._utils.buildNoItemsMessage(),
       search: this._doSearch.bind(this),
       renderItem: this._renderItem.bind(this),
       getItemText: (item) => item.text,
@@ -110,7 +115,7 @@ export class ReferenceEditor extends NTextEditor {
    * Also see: prepForSave.
    */
   private async _doSearch(text: string): Promise<ACResults<ICellItem>> {
-    const result = this._utils.autocompleteSearch(text);
+    const result = this._utils.autocompleteSearch(text, this.options.rowId);
 
     this._showAddNew = false;
     if (!this._enableAddNew || !text) { return result; }
@@ -120,7 +125,7 @@ export class ReferenceEditor extends NTextEditor {
       return result;
     }
 
-    result.items.push({rowId: 'new', text, cleanText});
+    result.extraItems.push({rowId: 'new', text, cleanText});
     this._showAddNew = true;
 
     return result;
diff --git a/app/client/widgets/ReferenceListEditor.ts b/app/client/widgets/ReferenceListEditor.ts
index be6f7426..c2060199 100644
--- a/app/client/widgets/ReferenceListEditor.ts
+++ b/app/client/widgets/ReferenceListEditor.ts
@@ -59,10 +59,16 @@ export class ReferenceListEditor extends NewBaseEditor {
     this._utils = new ReferenceUtils(options.field, docData);
 
     const vcol = this._utils.visibleColModel;
-    this._enableAddNew = vcol && !vcol.isRealFormula() && !!vcol.colId();
+    this._enableAddNew = (
+      vcol &&
+      !vcol.isRealFormula() &&
+      !!vcol.colId() &&
+      !this._utils.hasDropdownCondition
+    );
 
     const acOptions: IAutocompleteOptions<ReferenceItem> = {
-      menuCssClass: `${menuCssClass} ${cssRefList.className}`,
+      menuCssClass: `${menuCssClass} ${cssRefList.className} test-autocomplete`,
+      buildNoItemsMessage: () => this._utils.buildNoItemsMessage(),
       search: this._doSearch.bind(this),
       renderItem: this._renderItem.bind(this),
       getItemText: (item) => item.text,
@@ -166,12 +172,14 @@ export class ReferenceListEditor extends NewBaseEditor {
   }
 
   public getCellValue(): CellValue {
-    const rowIds = this._tokenField.tokensObs.get().map(t => typeof t.rowId === 'number' ? t.rowId : t.text);
+    const rowIds = this._tokenField.tokensObs.get()
+      .map(token => typeof token.rowId === 'number' ? token.rowId : token.text);
     return encodeObject(rowIds);
   }
 
   public getTextValue(): string {
-    const rowIds = this._tokenField.tokensObs.get().map(t => typeof t.rowId === 'number' ? String(t.rowId) : t.text);
+    const rowIds = this._tokenField.tokensObs.get()
+      .map(token => typeof token.rowId === 'number' ? String(token.rowId) : token.text);
     return csvEncodeRow(rowIds, {prettier: true});
   }
 
@@ -184,19 +192,19 @@ export class ReferenceListEditor extends NewBaseEditor {
    */
   public async prepForSave() {
     const tokens = this._tokenField.tokensObs.get();
-    const newValues = tokens.filter(t => t.rowId === 'new');
+    const newValues = tokens.filter(({rowId})=> rowId === 'new');
     if (newValues.length === 0) { return; }
 
     // Add the new items to the referenced table.
-    const colInfo = {[this._utils.visibleColId]: newValues.map(t => t.text)};
+    const colInfo = {[this._utils.visibleColId]: newValues.map(({text}) => text)};
     const rowIds = await this._utils.tableData.sendTableAction(
       ["BulkAddRecord", new Array(newValues.length).fill(null), colInfo]
     );
 
     // Update the TokenField tokens with the returned row ids.
     let i = 0;
-    const newTokens = tokens.map(t => {
-      return t.rowId === 'new' ? new ReferenceItem(t.text, rowIds[i++]) : t;
+    const newTokens = tokens.map(token => {
+      return token.rowId === 'new' ? new ReferenceItem(token.text, rowIds[i++]) : token;
     });
     this._tokenField.setTokens(newTokens);
   }
@@ -254,11 +262,12 @@ export class ReferenceListEditor extends NewBaseEditor {
    * Also see: prepForSave.
    */
    private async _doSearch(text: string): Promise<ACResults<ReferenceItem>> {
-    const {items, selectIndex, highlightFunc} = this._utils.autocompleteSearch(text);
+    const {items, selectIndex, highlightFunc} = this._utils.autocompleteSearch(text, this.options.rowId);
     const result: ACResults<ReferenceItem> = {
       selectIndex,
       highlightFunc,
-      items: items.map(i => new ReferenceItem(i.text, i.rowId))
+      items: items.map(i => new ReferenceItem(i.text, i.rowId)),
+      extraItems: [],
     };
 
     this._showAddNew = false;
@@ -269,7 +278,7 @@ export class ReferenceListEditor extends NewBaseEditor {
       return result;
     }
 
-    result.items.push(new ReferenceItem(text, 'new'));
+    result.extraItems.push(new ReferenceItem(text, 'new'));
     this._showAddNew = true;
 
     return result;
diff --git a/app/common/ACLRuleCollection.ts b/app/common/ACLRuleCollection.ts
index f2f004dd..ce1f8234 100644
--- a/app/common/ACLRuleCollection.ts
+++ b/app/common/ACLRuleCollection.ts
@@ -3,14 +3,15 @@ import {AVAILABLE_BITS_COLUMNS, AVAILABLE_BITS_TABLES, trimPermissions} from 'ap
 import {ACLRulesReader} from 'app/common/ACLRulesReader';
 import {AclRuleProblem} from 'app/common/ActiveDocAPI';
 import {DocData} from 'app/common/DocData';
-import {AclMatchFunc, ParsedAclFormula, RulePart, RuleSet, UserAttributeRule} from 'app/common/GranularAccessClause';
+import {RulePart, RuleSet, UserAttributeRule} from 'app/common/GranularAccessClause';
 import {getSetMapValue, isNonNullish} from 'app/common/gutil';
+import {CompiledPredicateFormula, ParsedPredicateFormula} from 'app/common/PredicateFormula';
 import {MetaRowRecord} from 'app/common/TableData';
 import {decodeObject} from 'app/plugin/objtypes';
 
 export type ILogger = Pick<Console, 'log'|'debug'|'info'|'warn'|'error'>;
 
-const defaultMatchFunc: AclMatchFunc = () => true;
+const defaultMatchFunc: CompiledPredicateFormula = () => true;
 
 export const SPECIAL_RULES_TABLE_ID = '*SPECIAL';
 
@@ -20,12 +21,12 @@ const DEFAULT_RULE_SET: RuleSet = {
   colIds: '*',
   body: [{
     aclFormula: "user.Access in [EDITOR, OWNER]",
-    matchFunc:  (input) => ['editors', 'owners'].includes(String(input.user.Access)),
+    matchFunc: (input) => ['editors', 'owners'].includes(String(input.user!.Access)),
     permissions: parsePermissions('all'),
     permissionsText: 'all',
   }, {
     aclFormula: "user.Access in [VIEWER]",
-    matchFunc:  (input) => ['viewers'].includes(String(input.user.Access)),
+    matchFunc: (input) => ['viewers'].includes(String(input.user!.Access)),
     permissions: parsePermissions('+R-CUDS'),
     permissionsText: '+R',
   }, {
@@ -48,7 +49,7 @@ const SPECIAL_RULE_SETS: Record<string, RuleSet> = {
     colIds: ['SchemaEdit'],
     body: [{
       aclFormula: "user.Access in [EDITOR, OWNER]",
-      matchFunc:  (input) => ['editors', 'owners'].includes(String(input.user.Access)),
+      matchFunc: (input) => ['editors', 'owners'].includes(String(input.user!.Access)),
       permissions: parsePermissions('+S'),
       permissionsText: '+S',
     }, {
@@ -63,7 +64,7 @@ const SPECIAL_RULE_SETS: Record<string, RuleSet> = {
     colIds: ['AccessRules'],
     body: [{
       aclFormula: "user.Access in [OWNER]",
-      matchFunc:  (input) => ['owners'].includes(String(input.user.Access)),
+      matchFunc: (input) => ['owners'].includes(String(input.user!.Access)),
       permissions: parsePermissions('+R'),
       permissionsText: '+R',
     }, {
@@ -78,7 +79,7 @@ const SPECIAL_RULE_SETS: Record<string, RuleSet> = {
     colIds: ['FullCopies'],
     body: [{
       aclFormula: "user.Access in [OWNER]",
-      matchFunc:  (input) => ['owners'].includes(String(input.user.Access)),
+      matchFunc: (input) => ['owners'].includes(String(input.user!.Access)),
       permissions: parsePermissions('+R'),
       permissionsText: '+R',
     }, {
@@ -102,7 +103,7 @@ const EMERGENCY_RULE_SET: RuleSet = {
   colIds: '*',
   body: [{
     aclFormula: "user.Access in [OWNER]",
-    matchFunc:  (input) => ['owners'].includes(String(input.user.Access)),
+    matchFunc:  (input) => ['owners'].includes(String(input.user!.Access)),
     permissions: parsePermissions('all'),
     permissionsText: 'all',
   }, {
@@ -381,7 +382,7 @@ export class ACLRuleCollection {
 
 export interface ReadAclOptions {
   log: ILogger;     // For logging warnings during rule processing.
-  compile?: (parsed: ParsedAclFormula) => AclMatchFunc;
+  compile?: (parsed: ParsedPredicateFormula) => CompiledPredicateFormula;
   // If true, add and modify access rules in some special ways.
   // Specifically, call addHelperCols to add helper columns of restricted columns to rule sets,
   // and use ACLShareRules to implement any special shares as access rules.
diff --git a/app/common/ACLRulesReader.ts b/app/common/ACLRulesReader.ts
index 741a719e..97355861 100644
--- a/app/common/ACLRulesReader.ts
+++ b/app/common/ACLRulesReader.ts
@@ -3,7 +3,8 @@ import { getSetMapValue } from 'app/common/gutil';
 import { SchemaTypes } from 'app/common/schema';
 import { ShareOptions } from 'app/common/ShareOptions';
 import { MetaRowRecord, MetaTableData } from 'app/common/TableData';
-import { isEqual, sortBy } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import sortBy from 'lodash/sortBy';
 
 /**
  * For special shares, we need to refer to resources that may not
diff --git a/app/common/ActiveDocAPI.ts b/app/common/ActiveDocAPI.ts
index f10a5804..0dbec7e8 100644
--- a/app/common/ActiveDocAPI.ts
+++ b/app/common/ActiveDocAPI.ts
@@ -1,6 +1,6 @@
 import {ActionGroup} from 'app/common/ActionGroup';
 import {BulkAddRecord, CellValue, TableDataAction, UserAction} from 'app/common/DocActions';
-import {FormulaProperties} from 'app/common/GranularAccessClause';
+import {PredicateFormulaProperties} from 'app/common/PredicateFormula';
 import {FetchUrlOptions, UploadResult} from 'app/common/uploads';
 import {DocStateComparison, PermissionData, UserAccessData} from 'app/common/UserAPI';
 import {ParseOptions} from 'app/plugin/FileParserAPI';
@@ -421,7 +421,7 @@ export interface ActiveDocAPI {
    * Find and return a list of auto-complete suggestions that start with `txt`, when editing a
    * formula in table `tableId` and column `columnId`.
    */
-  autocomplete(txt: string, tableId: string, columnId: string, rowId: UIRowId): Promise<ISuggestionWithValue[]>;
+  autocomplete(txt: string, tableId: string, columnId: string, rowId: UIRowId | null): Promise<ISuggestionWithValue[]>;
 
   /**
    * Removes the current instance from the doc.
@@ -467,7 +467,7 @@ export interface ActiveDocAPI {
   /**
    * Check if an ACL formula is valid. If not, will throw an error with an explanation.
    */
-  checkAclFormula(text: string): Promise<FormulaProperties>;
+  checkAclFormula(text: string): Promise<PredicateFormulaProperties>;
 
   /**
    * Get a token for out-of-band access to the document.
diff --git a/app/common/ColumnFilterFunc.ts b/app/common/ColumnFilterFunc.ts
index 8d62f4f3..742c0737 100644
--- a/app/common/ColumnFilterFunc.ts
+++ b/app/common/ColumnFilterFunc.ts
@@ -4,7 +4,7 @@ import {decodeObject} from "app/plugin/objtypes";
 import moment, { Moment } from "moment-timezone";
 import {extractInfoFromColType, isDateLikeType, isList, isListType, isNumberType} from "app/common/gristTypes";
 import {isRelativeBound, relativeDateToUnixTimestamp} from "app/common/RelativeDates";
-import {noop} from "lodash";
+import noop from "lodash/noop";
 
 export type ColumnFilterFunc = (value: CellValue) => boolean;
 
diff --git a/app/common/DropdownCondition.ts b/app/common/DropdownCondition.ts
new file mode 100644
index 00000000..b9262295
--- /dev/null
+++ b/app/common/DropdownCondition.ts
@@ -0,0 +1,20 @@
+import { CompiledPredicateFormula } from 'app/common/PredicateFormula';
+
+export interface DropdownCondition {
+  text: string;
+  parsed: string;
+}
+
+export type DropdownConditionCompilationResult =
+  | DropdownConditionCompilationSuccess
+  | DropdownConditionCompilationFailure;
+
+interface DropdownConditionCompilationSuccess {
+  kind: 'success';
+  result: CompiledPredicateFormula;
+}
+
+interface DropdownConditionCompilationFailure {
+  kind: 'failure';
+  error: string;
+}
diff --git a/app/common/GranularAccessClause.ts b/app/common/GranularAccessClause.ts
index b5ed6707..3f3b7769 100644
--- a/app/common/GranularAccessClause.ts
+++ b/app/common/GranularAccessClause.ts
@@ -1,7 +1,8 @@
 import {PartialPermissionSet} from 'app/common/ACLPermissions';
 import {CellValue, RowRecord} from 'app/common/DocActions';
+import {CompiledPredicateFormula} from 'app/common/PredicateFormula';
+import {Role} from 'app/common/roles';
 import {MetaRowRecord} from 'app/common/TableData';
-import {Role} from './roles';
 
 export interface RuleSet {
   tableId: '*' | string;
@@ -18,7 +19,7 @@ export interface RulePart {
   permissionsText: string;        // The text version of PermissionSet, as stored.
 
   // Compiled version of aclFormula.
-  matchFunc?: AclMatchFunc;
+  matchFunc?: CompiledPredicateFormula;
 
   // Optional memo, currently extracted from comment in formula.
   memo?: string;
@@ -53,35 +54,6 @@ export interface UserInfo {
   toJSON(): {[key: string]: any};
 }
 
-/**
- * Input into the AclMatchFunc. Compiled formulas evaluate AclMatchInput to produce a boolean.
- */
-export interface AclMatchInput {
-  user: UserInfo;
-  rec?: InfoView;
-  newRec?: InfoView;
-  docId?: string;
-}
-
-/**
- * The actual boolean function that can evaluate a request. The result of compiling ParsedAclFormula.
- */
-export type AclMatchFunc = (input: AclMatchInput) => boolean;
-
-/**
- * Representation of a parsed ACL formula.
- */
-type PrimitiveCellValue = number|string|boolean|null;
-export type ParsedAclFormula = [string, ...(ParsedAclFormula|PrimitiveCellValue)[]];
-
-/**
- * Observations about a formula.
- */
-export interface FormulaProperties {
-  hasRecOrNewRec?: boolean;
-  usedColIds?: string[];
-}
-
 export interface UserAttributeRule {
   origRecord?: RowRecord;         // Original record used to create this UserAttributeRule.
   name: string;       // Should be unique among UserAttributeRules.
@@ -89,45 +61,3 @@ export interface UserAttributeRule {
   lookupColId: string;  // Column in tableId in which to do the lookup.
   charId: string;     // Attribute to look up, possibly a path. E.g. 'Email' or 'office.city'.
 }
-
-/**
- * Check some key facts about the formula.
- */
-export function getFormulaProperties(formula: ParsedAclFormula) {
-  const result: FormulaProperties = {};
-  if (usesRec(formula)) { result.hasRecOrNewRec = true; }
-  const colIds = new Set<string>();
-  collectRecColIds(formula, colIds);
-  result.usedColIds = Array.from(colIds);
-  return result;
-}
-
-/**
- * Check whether a formula mentions `rec` or `newRec`.
- */
-export function usesRec(formula: ParsedAclFormula): boolean {
-  if (!Array.isArray(formula)) { throw new Error('expected a list'); }
-  if (isRecOrNewRec(formula)) {
-    return true;
-  }
-  return formula.some(el => {
-    if (!Array.isArray(el)) { return false; }
-    return usesRec(el);
-  });
-}
-
-function isRecOrNewRec(formula: ParsedAclFormula|PrimitiveCellValue): boolean {
-  return Array.isArray(formula) &&
-    formula[0] === 'Name' &&
-    (formula[1] === 'rec' || formula[1] === 'newRec');
-}
-
-function collectRecColIds(formula: ParsedAclFormula, colIds: Set<string>): void {
-  if (!Array.isArray(formula)) { throw new Error('expected a list'); }
-  if (formula[0] === 'Attr' && isRecOrNewRec(formula[1])) {
-    const colId = formula[2];
-    colIds.add(String(colId));
-    return;
-  }
-  formula.forEach(el => Array.isArray(el) && collectRecColIds(el, colIds));
-}
diff --git a/app/common/PredicateFormula.ts b/app/common/PredicateFormula.ts
new file mode 100644
index 00000000..2d9d5f30
--- /dev/null
+++ b/app/common/PredicateFormula.ts
@@ -0,0 +1,223 @@
+/**
+ * Representation and compilation of predicate formulas.
+ *
+ * An example of a predicate formula is: "rec.office == 'Seattle' and user.email in ['sally@', 'xie@']".
+ * These formulas are parsed in Python into a tree with nodes of the form [NODE_TYPE, ...args].
+ * See sandbox/grist/predicate_formula.py for details.
+ *
+ * This module includes typings for the nodes, and the compilePredicateFormula() function that
+ * turns such trees into actual predicate functions.
+ */
+import {CellValue, RowRecord} from 'app/common/DocActions';
+import {ErrorWithCode} from 'app/common/ErrorWithCode';
+import {InfoView, UserInfo} from 'app/common/GranularAccessClause';
+import {decodeObject} from 'app/plugin/objtypes';
+import constant = require('lodash/constant');
+
+/**
+ * Representation of a parsed predicate formula.
+ */
+export type PrimitiveCellValue = number|string|boolean|null;
+export type ParsedPredicateFormula = [string, ...(ParsedPredicateFormula|PrimitiveCellValue)[]];
+
+/**
+ * Inputs to a predicate formula function.
+ */
+export interface PredicateFormulaInput {
+  user?: UserInfo;
+  rec?: RowRecord|InfoView;
+  newRec?: InfoView;
+  docId?: string;
+  choice?: string|RowRecord|InfoView;
+}
+
+export class EmptyRecordView implements InfoView {
+  public get(_colId: string): CellValue { return null; }
+  public toJSON() { return {}; }
+}
+
+/**
+ * The result of compiling ParsedPredicateFormula.
+ */
+export type CompiledPredicateFormula = (input: PredicateFormulaInput) => boolean;
+
+const GRIST_CONSTANTS: Record<string, string> = {
+  EDITOR: 'editors',
+  OWNER: 'owners',
+  VIEWER: 'viewers',
+};
+
+/**
+ * An intermediate predicate formula returned during compilation, which may return
+ * a non-boolean value.
+ */
+type IntermediatePredicateFormula = (input: PredicateFormulaInput) => any;
+
+export interface CompilePredicateFormulaOptions {
+  /** Defaults to `'acl'`. */
+  variant?: 'acl'|'dropdown-condition';
+}
+
+/**
+ * Compiles a parsed predicate formula and returns it.
+ */
+export function compilePredicateFormula(
+  parsedPredicateFormula: ParsedPredicateFormula,
+  options: CompilePredicateFormulaOptions = {}
+): CompiledPredicateFormula {
+  const {variant = 'acl'} = options;
+
+  function compileNode(node: ParsedPredicateFormula): IntermediatePredicateFormula {
+    const rawArgs = node.slice(1);
+    const args = rawArgs as ParsedPredicateFormula[];
+    switch (node[0]) {
+      case 'And':   { const parts = args.map(compileNode); return (input) => parts.every(p => p(input)); }
+      case 'Or':    { const parts = args.map(compileNode); return (input) => parts.some(p => p(input)); }
+      case 'Add':   return compileAndCombine(args, ([a, b]) => a + b);
+      case 'Sub':   return compileAndCombine(args, ([a, b]) => a - b);
+      case 'Mult':  return compileAndCombine(args, ([a, b]) => a * b);
+      case 'Div':   return compileAndCombine(args, ([a, b]) => a / b);
+      case 'Mod':   return compileAndCombine(args, ([a, b]) => a % b);
+      case 'Not':   return compileAndCombine(args, ([a]) => !a);
+      case 'Eq':    return compileAndCombine(args, ([a, b]) => a === b);
+      case 'NotEq': return compileAndCombine(args, ([a, b]) => a !== b);
+      case 'Lt':    return compileAndCombine(args, ([a, b]) => a < b);
+      case 'LtE':   return compileAndCombine(args, ([a, b]) => a <= b);
+      case 'Gt':    return compileAndCombine(args, ([a, b]) => a > b);
+      case 'GtE':   return compileAndCombine(args, ([a, b]) => a >= b);
+      case 'Is':    return compileAndCombine(args, ([a, b]) => a === b);
+      case 'IsNot': return compileAndCombine(args, ([a, b]) => a !== b);
+      case 'In':    return compileAndCombine(args, ([a, b]) => Boolean(b?.includes(a)));
+      case 'NotIn': return compileAndCombine(args, ([a, b]) => !b?.includes(a));
+      case 'List':  return compileAndCombine(args, (values) => values);
+      case 'Const': return constant(node[1] as CellValue);
+      case 'Name': {
+        const name = rawArgs[0] as keyof PredicateFormulaInput;
+        if (GRIST_CONSTANTS[name]) { return constant(GRIST_CONSTANTS[name]); }
+
+        let validNames: string[];
+        switch (variant) {
+          case 'acl': {
+            validNames = ['newRec', 'rec', 'user'];
+            break;
+          }
+          case 'dropdown-condition': {
+            validNames = ['rec', 'choice'];
+            break;
+          }
+        }
+        if (!validNames.includes(name)) { throw new Error(`Unknown variable '${name}'`); }
+
+        return (input) => input[name];
+      }
+      case 'Attr': {
+        const attrName = rawArgs[1] as string;
+        return compileAndCombine([args[0]], ([value]) => getAttr(value, attrName, args[0]));
+      }
+      case 'Comment': return compileNode(args[0]);
+    }
+    throw new Error(`Unknown node type '${node[0]}'`);
+  }
+
+  /**
+   * Helper for operators: compile a list of nodes, then when evaluating, evaluate them all and
+   * combine the array of results using the given combine() function.
+   */
+  function compileAndCombine(
+    args: ParsedPredicateFormula[],
+    combine: (values: any[]) => any
+  ): IntermediatePredicateFormula {
+    const compiled = args.map(compileNode);
+    return (input: PredicateFormulaInput) => combine(compiled.map(c => c(input)));
+  }
+
+  const compiledPredicateFormula = compileNode(parsedPredicateFormula);
+  return (input) => Boolean(compiledPredicateFormula(input));
+}
+
+function describeNode(node: ParsedPredicateFormula): string {
+  if (node[0] === 'Name') {
+    return node[1] as string;
+  } else if (node[0] === 'Attr') {
+    return describeNode(node[1] as ParsedPredicateFormula) + '.' + (node[2] as string);
+  } else {
+    return 'value';
+  }
+}
+
+function getAttr(value: any, attrName: string, valueNode: ParsedPredicateFormula): any {
+  if (value == null) {
+    if (valueNode[0] === 'Name' && (valueNode[1] === 'rec' || valueNode[1] === 'newRec')) {
+      // This code is recognized by GranularAccess to know when an ACL rule is row-specific.
+      throw new ErrorWithCode('NEED_ROW_DATA', `Missing row data '${valueNode[1]}'`);
+    }
+    throw new Error(`No value for '${describeNode(valueNode)}'`);
+  }
+  return typeof value.get === 'function'
+    ? decodeObject(value.get(attrName)) // InfoView
+    : value[attrName];
+}
+
+/**
+ * Predicate formula properties.
+ */
+export interface PredicateFormulaProperties {
+  /**
+   * List of column ids that are referenced by either `$` or `rec.` notation.
+   */
+  recColIds?: string[];
+  /**
+   * List of column ids that are referenced by `choice.` notation.
+   *
+   * Only applies to the `dropdown-condition` variant of predicate formulas,
+   * and only for Reference and Reference List columns.
+   */
+  choiceColIds?: string[];
+}
+
+/**
+ * Returns properties about a predicate `formula`.
+ *
+ * Properties include the list of column ids referenced in the formula.
+ * Currently, this information is used for error validation; specifically, to
+ * report when invalid column ids are referenced in ACL formulas and dropdown
+ * conditions.
+ */
+export function getPredicateFormulaProperties(
+  formula: ParsedPredicateFormula
+): PredicateFormulaProperties {
+  return {
+    recColIds: [...getRecColIds(formula)],
+    choiceColIds: [...getChoiceColIds(formula)],
+  };
+}
+
+function isRecOrNewRec(formula: ParsedPredicateFormula|PrimitiveCellValue): boolean {
+  return Array.isArray(formula) &&
+    formula[0] === 'Name' &&
+    (formula[1] === 'rec' || formula[1] === 'newRec');
+}
+
+function getRecColIds(formula: ParsedPredicateFormula): string[] {
+  return [...new Set(collectColIds(formula, isRecOrNewRec))];
+}
+
+function isChoice(formula: ParsedPredicateFormula|PrimitiveCellValue): boolean {
+  return Array.isArray(formula) && formula[0] === 'Name' && formula[1] === 'choice';
+}
+
+function getChoiceColIds(formula: ParsedPredicateFormula): string[] {
+  return [...new Set(collectColIds(formula, isChoice))];
+}
+
+function collectColIds(
+  formula: ParsedPredicateFormula,
+  isIdentifierWithColIds: (formula: ParsedPredicateFormula|PrimitiveCellValue) => boolean,
+): string[] {
+  if (!Array.isArray(formula)) { throw new Error('expected a list'); }
+  if (formula[0] === 'Attr' && isIdentifierWithColIds(formula[1])) {
+    const colId = String(formula[2]);
+    return [colId];
+  }
+  return formula.flatMap(el => Array.isArray(el) ? collectColIds(el, isIdentifierWithColIds) : []);
+}
diff --git a/app/common/RelativeDates.ts b/app/common/RelativeDates.ts
index c3012dd0..2803d6b6 100644
--- a/app/common/RelativeDates.ts
+++ b/app/common/RelativeDates.ts
@@ -2,9 +2,12 @@
 // time defined as a series of periods. Hence, starting from the current date, each one of the
 // periods gets applied successively which eventually yields to the final date. Typical relative
 
-import { isEqual, isNumber, isUndefined, omitBy } from "lodash";
-import moment from "moment-timezone";
 import getCurrentTime from "app/common/getCurrentTime";
+import isEqual from "lodash/isEqual";
+import isNumber from "lodash/isNumber";
+import isUndefined from "lodash/isUndefined";
+import omitBy from "lodash/omitBy";
+import moment from "moment-timezone";
 
 // Relative date uses one or two periods. When relative dates are defined by two periods, they are
 // applied successively to the start date to resolve the target date. In practice in grist, as of
diff --git a/app/server/lib/ACLFormula.ts b/app/server/lib/ACLFormula.ts
deleted file mode 100644
index 41a8deca..00000000
--- a/app/server/lib/ACLFormula.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Representation and compilation of ACL formulas.
- *
- * An example of an ACL formula is: "rec.office == 'Seattle' and user.email in ['sally@', 'xie@']".
- * These formulas are parsed in Python into a tree with nodes of the form [NODE_TYPE, ...args].
- * See sandbox/grist/acl_formula.py for details.
- *
- * This modules includes typings for the nodes, and compileAclFormula() function that turns such a
- * tree into an actual boolean function.
- */
-import {CellValue} from 'app/common/DocActions';
-import {ErrorWithCode} from 'app/common/ErrorWithCode';
-import {AclMatchFunc, AclMatchInput, ParsedAclFormula} from 'app/common/GranularAccessClause';
-import {decodeObject} from "app/plugin/objtypes";
-import constant = require('lodash/constant');
-
-const GRIST_CONSTANTS: Record<string, string> = {
-  EDITOR: 'editors',
-  OWNER: 'owners',
-  VIEWER: 'viewers',
-};
-
-/**
- * Compile a parsed ACL formula into an actual function that can evaluate a request.
- */
-export function compileAclFormula(parsedAclFormula: ParsedAclFormula): AclMatchFunc {
-  const compiled = _compileNode(parsedAclFormula);
-  return (input) => Boolean(compiled(input));
-}
-
-/**
- * Type for intermediate functions, which may return values other than booleans.
- */
-type AclEvalFunc = (input: AclMatchInput) => any;
-
-/**
- * Compile a single node of the parsed formula tree.
- */
-function _compileNode(parsedAclFormula: ParsedAclFormula): AclEvalFunc {
-  const rawArgs = parsedAclFormula.slice(1);
-  const args = rawArgs as ParsedAclFormula[];
-  switch (parsedAclFormula[0]) {
-    case 'And':   { const parts = args.map(_compileNode); return (input) => parts.every(p => p(input)); }
-    case 'Or':    { const parts = args.map(_compileNode); return (input) => parts.some(p => p(input)); }
-    case 'Add':   return _compileAndCombine(args, ([a, b]) => a + b);
-    case 'Sub':   return _compileAndCombine(args, ([a, b]) => a - b);
-    case 'Mult':  return _compileAndCombine(args, ([a, b]) => a * b);
-    case 'Div':   return _compileAndCombine(args, ([a, b]) => a / b);
-    case 'Mod':   return _compileAndCombine(args, ([a, b]) => a % b);
-    case 'Not':   return _compileAndCombine(args, ([a]) => !a);
-    case 'Eq':    return _compileAndCombine(args, ([a, b]) => a === b);
-    case 'NotEq': return _compileAndCombine(args, ([a, b]) => a !== b);
-    case 'Lt':    return _compileAndCombine(args, ([a, b]) => a < b);
-    case 'LtE':   return _compileAndCombine(args, ([a, b]) => a <= b);
-    case 'Gt':    return _compileAndCombine(args, ([a, b]) => a > b);
-    case 'GtE':   return _compileAndCombine(args, ([a, b]) => a >= b);
-    case 'Is':    return _compileAndCombine(args, ([a, b]) => a === b);
-    case 'IsNot': return _compileAndCombine(args, ([a, b]) => a !== b);
-    case 'In':    return _compileAndCombine(args, ([a, b]) => Boolean(b?.includes(a)));
-    case 'NotIn': return _compileAndCombine(args, ([a, b]) => !b?.includes(a));
-    case 'List':  return _compileAndCombine(args, (values) => values);
-    case 'Const': return constant(parsedAclFormula[1] as CellValue);
-    case 'Name': {
-      const name = rawArgs[0] as keyof AclMatchInput;
-      if (GRIST_CONSTANTS[name]) { return constant(GRIST_CONSTANTS[name]); }
-      if (!['user', 'rec', 'newRec'].includes(name)) {
-        throw new Error(`Unknown variable '${name}'`);
-      }
-      return (input) => input[name];
-    }
-    case 'Attr': {
-      const attrName = rawArgs[1] as string;
-      return _compileAndCombine([args[0]], ([value]) => getAttr(value, attrName, args[0]));
-    }
-    case 'Comment': return _compileNode(args[0]);
-  }
-  throw new Error(`Unknown node type '${parsedAclFormula[0]}'`);
-}
-
-function describeNode(node: ParsedAclFormula): string {
-  if (node[0] === 'Name') {
-    return node[1] as string;
-  } else if (node[0] === 'Attr') {
-    return describeNode(node[1] as ParsedAclFormula) + '.' + (node[2] as string);
-  } else {
-    return 'value';
-  }
-}
-
-function getAttr(value: any, attrName: string, valueNode: ParsedAclFormula): any {
-  if (value == null) {
-    if (valueNode[0] === 'Name' && (valueNode[1] === 'rec' || valueNode[1] === 'newRec')) {
-      // This code is recognized by GranularAccess to know when a rule is row-specific.
-      throw new ErrorWithCode('NEED_ROW_DATA', `Missing row data '${valueNode[1]}'`);
-    }
-    throw new Error(`No value for '${describeNode(valueNode)}'`);
-  }
-  return (typeof value.get === 'function' ? decodeObject(value.get(attrName)) : // InfoView
-          value[attrName]);
-}
-
-/**
- * Helper for operators: compile a list of nodes, then when evaluating, evaluate them all and
- * combine the array of results using the given combine() function.
- */
-function _compileAndCombine(args: ParsedAclFormula[], combine: (values: any[]) => any): AclEvalFunc {
-  const compiled = args.map(_compileNode);
-  return (input: AclMatchInput) => combine(compiled.map(c => c(input)));
-}
diff --git a/app/server/lib/ActiveDoc.ts b/app/server/lib/ActiveDoc.ts
index 41acb51a..b65ba14b 100644
--- a/app/server/lib/ActiveDoc.ts
+++ b/app/server/lib/ActiveDoc.ts
@@ -64,12 +64,16 @@ import {
 } from 'app/common/DocUsage';
 import {normalizeEmail} from 'app/common/emails';
 import {Product} from 'app/common/Features';
-import {FormulaProperties, getFormulaProperties} from 'app/common/GranularAccessClause';
 import {isHiddenCol} from 'app/common/gristTypes';
 import {commonUrls, parseUrlId} from 'app/common/gristUrls';
 import {byteString, countIf, retryOnce, safeJsonParse, timeoutReached} from 'app/common/gutil';
 import {InactivityTimer} from 'app/common/InactivityTimer';
 import {Interval} from 'app/common/Interval';
+import {
+  compilePredicateFormula,
+  getPredicateFormulaProperties,
+  PredicateFormulaProperties,
+} from 'app/common/PredicateFormula';
 import * as roles from 'app/common/roles';
 import {schema, SCHEMA_VERSION} from 'app/common/schema';
 import {MetaRowRecord, SingleCell} from 'app/common/TableData';
@@ -84,7 +88,6 @@ import {Share} from 'app/gen-server/entity/Share';
 import {RecordWithStringId} from 'app/plugin/DocApiTypes';
 import {ParseFileResult, ParseOptions} from 'app/plugin/FileParserAPI';
 import {AccessTokenOptions, AccessTokenResult, GristDocAPI, UIRowId} from 'app/plugin/GristAPI';
-import {compileAclFormula} from 'app/server/lib/ACLFormula';
 import {AssistanceSchemaPromptV1Context} from 'app/server/lib/Assistance';
 import {AssistanceContext} from 'app/common/AssistancePrompts';
 import {Authorizer, RequestWithLogin} from 'app/server/lib/Authorizer';
@@ -1289,7 +1292,11 @@ export class ActiveDoc extends EventEmitter {
   }
 
   public async autocomplete(
-    docSession: DocSession, txt: string, tableId: string, columnId: string, rowId: UIRowId
+    docSession: DocSession,
+    txt: string,
+    tableId: string,
+    columnId: string,
+    rowId: UIRowId | null
   ): Promise<ISuggestionWithValue[]> {
     // Autocompletion can leak names of tables and columns.
     if (!await this._granularAccess.canScanData(docSession)) { return []; }
@@ -1479,16 +1486,16 @@ export class ActiveDoc extends EventEmitter {
   /**
    * Check if an ACL formula is valid. If not, will throw an error with an explanation.
    */
-  public async checkAclFormula(docSession: DocSession, text: string): Promise<FormulaProperties> {
+  public async checkAclFormula(docSession: DocSession, text: string): Promise<PredicateFormulaProperties> {
     // Checks can leak names of tables and columns.
     if (await this._granularAccess.hasNuancedAccess(docSession)) { return {}; }
     await this.waitForInitialization();
     try {
-      const parsedAclFormula = await this._pyCall('parse_acl_formula', text);
-      compileAclFormula(parsedAclFormula);
+      const parsedAclFormula = await this._pyCall('parse_predicate_formula', text);
+      compilePredicateFormula(parsedAclFormula);
       // TODO We also need to check the validity of attributes, and of tables and columns
       // mentioned in resources and userAttribute rules.
-      return getFormulaProperties(parsedAclFormula);
+      return getPredicateFormulaProperties(parsedAclFormula);
     } catch (e) {
       e.message = e.message?.replace('[Sandbox] ', '');
       throw e;
diff --git a/app/server/lib/GranularAccess.ts b/app/server/lib/GranularAccess.ts
index 73241aab..e6116d36 100644
--- a/app/server/lib/GranularAccess.ts
+++ b/app/server/lib/GranularAccess.ts
@@ -26,16 +26,15 @@ import { UserOverride } from 'app/common/DocListAPI';
 import { DocUsageSummary, FilteredDocUsageSummary } from 'app/common/DocUsage';
 import { normalizeEmail } from 'app/common/emails';
 import { ErrorWithCode } from 'app/common/ErrorWithCode';
-import { AclMatchInput, InfoEditor, InfoView } from 'app/common/GranularAccessClause';
-import { UserInfo } from 'app/common/GranularAccessClause';
+import { InfoEditor, InfoView, UserInfo } from 'app/common/GranularAccessClause';
 import * as gristTypes from 'app/common/gristTypes';
 import { getSetMapValue, isNonNullish, pruneArray } from 'app/common/gutil';
+import { compilePredicateFormula, EmptyRecordView, PredicateFormulaInput } from 'app/common/PredicateFormula';
 import { MetaRowRecord, SingleCell } from 'app/common/TableData';
 import { canEdit, canView, isValidRole, Role } from 'app/common/roles';
 import { FullUser, UserAccessData } from 'app/common/UserAPI';
 import { HomeDBManager } from 'app/gen-server/lib/HomeDBManager';
 import { GristObjCode } from 'app/plugin/GristData';
-import { compileAclFormula } from 'app/server/lib/ACLFormula';
 import { DocClients } from 'app/server/lib/DocClients';
 import { getDocSessionAccess, getDocSessionAltSessionId, getDocSessionShare,
          getDocSessionUser, OptDocSession } from 'app/server/lib/DocSession';
@@ -344,7 +343,7 @@ export class GranularAccess implements GranularAccessForBundle {
    * Represent fields from the session in an input object for ACL rules.
    * Just one field currently, "user".
    */
-  public async inputs(docSession: OptDocSession): Promise<AclMatchInput> {
+  public async inputs(docSession: OptDocSession): Promise<PredicateFormulaInput> {
     return {
       user: await this._getUser(docSession),
       docId: this._docId
@@ -401,7 +400,7 @@ export class GranularAccess implements GranularAccessForBundle {
     }
     const rec = new RecordView(rows, 0);
     if (!hasExceptionalAccess) {
-      const input: AclMatchInput = {...await this.inputs(docSession), rec, newRec: rec};
+      const input: PredicateFormulaInput = {...await this.inputs(docSession), rec, newRec: rec};
       const rowPermInfo = new PermissionInfo(this._ruler.ruleCollection, input);
       const rowAccess = rowPermInfo.getTableAccess(cell.tableId).perms.read;
       if (rowAccess === 'deny') { fail(); }
@@ -560,7 +559,7 @@ export class GranularAccess implements GranularAccessForBundle {
 
       // Use the post-actions data to process the rules collection, and throw error if that fails.
       const ruleCollection = new ACLRuleCollection();
-      await ruleCollection.update(tmpDocData, {log, compile: compileAclFormula});
+      await ruleCollection.update(tmpDocData, {log, compile: compilePredicateFormula});
       if (ruleCollection.ruleError) {
         throw new ApiError(ruleCollection.ruleError.message, 400);
       }
@@ -1664,7 +1663,7 @@ export class GranularAccess implements GranularAccessForBundle {
 
     const rec = new RecordView(rowsRec, undefined);
     const newRec = new RecordView(rowsNewRec, undefined);
-    const input: AclMatchInput = {...await this.inputs(docSession), rec, newRec};
+    const input: PredicateFormulaInput = {...await this.inputs(docSession), rec, newRec};
 
     const [, tableId, , colValues] = action;
     let filteredColValues: ColValues | BulkColValues | undefined | null = null;
@@ -1746,7 +1745,7 @@ export class GranularAccess implements GranularAccessForBundle {
                                   colId?: string): Promise<number[]> {
     const ruler = await this._getRuler(cursor);
     const rec = new RecordView(data, undefined);
-    const input: AclMatchInput = {...await this.inputs(cursor.docSession), rec};
+    const input: PredicateFormulaInput = {...await this.inputs(cursor.docSession), rec};
 
     const [, tableId, rowIds] = data;
     const toRemove: number[] = [];
@@ -2561,7 +2560,7 @@ export class GranularAccess implements GranularAccessForBundle {
         }
       }
       const rec = rows ? new RecordView(rows, 0) : undefined;
-      const input: AclMatchInput = {...inputs, rec, newRec: rec};
+      const input: PredicateFormulaInput = {...inputs, rec, newRec: rec};
       const rowPermInfo = new PermissionInfo(ruler.ruleCollection, input);
       const rowAccess = rowPermInfo.getTableAccess(cell.tableId).perms.read;
       if (rowAccess === 'deny') { return false; }
@@ -2635,7 +2634,11 @@ export class Ruler {
    * Update granular access from DocData.
    */
   public async update(docData: DocData) {
-    await this.ruleCollection.update(docData, {log, compile: compileAclFormula, enrichRulesForImplementation: true});
+    await this.ruleCollection.update(docData, {
+      log,
+      compile: compilePredicateFormula,
+      enrichRulesForImplementation: true,
+    });
 
     // Also clear the per-docSession cache of rule evaluations.
     this.clearCache();
@@ -2652,7 +2655,7 @@ export class Ruler {
 
 export interface RulerOwner {
   getUser(docSession: OptDocSession): Promise<UserInfo>;
-  inputs(docSession: OptDocSession): Promise<AclMatchInput>;
+  inputs(docSession: OptDocSession): Promise<PredicateFormulaInput>;
 }
 
 /**
@@ -2762,11 +2765,6 @@ class RecordEditor implements InfoEditor {
   }
 }
 
-class EmptyRecordView implements InfoView {
-  public get(colId: string): CellValue { return null; }
-  public toJSON() { return {}; }
-}
-
 /**
  * Cache information about user attributes.
  */
@@ -2840,7 +2838,7 @@ class CellAccessHelper {
   private _tableAccess: Map<string, boolean> = new Map();
   private _rowPermInfo: Map<string, Map<number, PermissionInfo>> = new Map();
   private _rows: Map<string, TableDataAction> = new Map();
-  private _inputs!: AclMatchInput;
+  private _inputs!: PredicateFormulaInput;
 
   constructor(
     private _granular: GranularAccess,
@@ -2864,7 +2862,7 @@ class CellAccessHelper {
         for(const [idx, rowId] of rows[2].entries()) {
           if (rowIds.has(rowId) === false) { continue; }
           const rec = new RecordView(rows, idx);
-          const input: AclMatchInput = {...this._inputs, rec, newRec: rec};
+          const input: PredicateFormulaInput = {...this._inputs, rec, newRec: rec};
           const rowPermInfo = new PermissionInfo(this._ruler.ruleCollection, input);
           if (!this._rowPermInfo.has(tableId)) {
             this._rowPermInfo.set(tableId, new Map());
diff --git a/app/server/lib/PermissionInfo.ts b/app/server/lib/PermissionInfo.ts
index 164db7ad..7ef7860f 100644
--- a/app/server/lib/PermissionInfo.ts
+++ b/app/server/lib/PermissionInfo.ts
@@ -3,7 +3,8 @@ import { ALL_PERMISSION_PROPS, emptyPermissionSet,
          MixedPermissionSet, PartialPermissionSet, PermissionSet, TablePermissionSet,
          toMixed } from 'app/common/ACLPermissions';
 import { ACLRuleCollection } from 'app/common/ACLRuleCollection';
-import { AclMatchInput, RuleSet, UserInfo } from 'app/common/GranularAccessClause';
+import { RuleSet, UserInfo } from 'app/common/GranularAccessClause';
+import { PredicateFormulaInput } from 'app/common/PredicateFormula';
 import { getSetMapValue } from 'app/common/gutil';
 import log from 'app/server/lib/log';
 import { mapValues } from 'lodash';
@@ -59,7 +60,7 @@ abstract class RuleInfo<MixedT extends TableT, TableT> {
 
   // Construct a RuleInfo for a particular input, which is a combination of user and
   // optionally a record.
-  constructor(protected _acls: ACLRuleCollection, protected _input: AclMatchInput) {}
+  constructor(protected _acls: ACLRuleCollection, protected _input: PredicateFormulaInput) {}
 
   public getColumnAspect(tableId: string, colId: string): MixedT {
     const ruleSet: RuleSet|undefined = this._acls.getColumnRuleSet(tableId, colId);
@@ -80,7 +81,7 @@ abstract class RuleInfo<MixedT extends TableT, TableT> {
   }
 
   public getUser(): UserInfo {
-    return this._input.user;
+    return this._input.user!;
   }
 
   protected abstract _processRule(ruleSet: RuleSet, defaultAccess?: () => MixedT): MixedT;
@@ -205,7 +206,7 @@ export class PermissionInfo extends RuleInfo<MixedPermissionSet, TablePermission
  * included, the result may include permission values like 'allowSome', 'denySome', or 'mixed' (for
  * rules with memo).
  */
-function evaluateRule(ruleSet: RuleSet, input: AclMatchInput): PartialPermissionSet {
+function evaluateRule(ruleSet: RuleSet, input: PredicateFormulaInput): PartialPermissionSet {
   let pset: PartialPermissionSet = emptyPermissionSet();
   for (const rule of ruleSet.body) {
     try {
@@ -268,7 +269,7 @@ function evaluateRule(ruleSet: RuleSet, input: AclMatchInput): PartialPermission
  * If a rule has a memo, and passes, add that memo for all permissions it denies.
  * If a rule has a memo, and fails, add that memo for all permissions it allows.
  */
-function extractMemos(ruleSet: RuleSet, input: AclMatchInput): MemoSet {
+function extractMemos(ruleSet: RuleSet, input: PredicateFormulaInput): MemoSet {
   const pset = emptyMemoSet();
   for (const rule of ruleSet.body) {
     try {
diff --git a/sandbox/grist/acl.py b/sandbox/grist/acl.py
index dcba9c0f..b3c46136 100644
--- a/sandbox/grist/acl.py
+++ b/sandbox/grist/acl.py
@@ -5,7 +5,8 @@
 import json
 import logging
 
-from acl_formula import parse_acl_grist_entities, parse_acl_formula_json
+from acl_formula import parse_acl_grist_entities
+from predicate_formula import parse_predicate_formula_json
 import action_obj
 import textbuilder
 
@@ -130,7 +131,7 @@ def prepare_acl_col_renames(docmodel, useractions, col_renames_dict):
       replacer = textbuilder.Replacer(textbuilder.Text(formula), patches)
       txt = replacer.get_text()
       rule_updates.append((rule_rec, {'aclFormula': txt,
-                                      'aclFormulaParsed': parse_acl_formula_json(txt)}))
+                                      'aclFormulaParsed': parse_predicate_formula_json(txt)}))
 
   def do_renames():
     useractions.doBulkUpdateFromPairs('_grist_ACLResources', resource_updates)
diff --git a/sandbox/grist/acl_formula.py b/sandbox/grist/acl_formula.py
index 494f0b15..19a1d63b 100644
--- a/sandbox/grist/acl_formula.py
+++ b/sandbox/grist/acl_formula.py
@@ -1,63 +1,19 @@
 import ast
-import io
-import json
-import tokenize
-from collections import namedtuple
 
 import asttokens
-import six
 
-from codebuilder import replace_dollar_attrs
+from predicate_formula import NamedEntity, parse_predicate_formula_json, TreeConverter
 
-def parse_acl_formula(acl_formula):
+def parse_acl_formulas(col_values):
   """
-  Parse an ACL formula expression into a parse tree that we can interpret in JS, e.g.
-  "rec.office == 'Seattle' and user.email in ['sally@', 'xie@']".
-
-  The idea is to support enough to express ACL rules flexibly, but we don't need to support too
-  much, since rules should be reasonably simple.
-
-  The returned tree has the form [NODE_TYPE, arguments...], with these NODE_TYPEs supported:
-    And|Or                  ...values
-    Add|Sub|Mult|Div|Mod    left, right
-    Not                     operand
-    Eq|NotEq|Lt|LtE|Gt|GtE  left, right
-    Is|IsNot|In|NotIn       left, right
-    List                    ...elements
-    Const                   value (number, string, bool)
-    Name                    name (string)
-    Attr                    node, attr_name
-    Comment                 node, comment
+  Populates `aclFormulaParsed` by parsing `aclFormula` for all `col_values`.
   """
-  if isinstance(acl_formula, six.binary_type):
-    acl_formula = acl_formula.decode('utf8')
-  try:
-    acl_formula = replace_dollar_attrs(acl_formula)
-    tree = ast.parse(acl_formula, mode='eval')
-    result = _TreeConverter().visit(tree)
-    for part in tokenize.generate_tokens(io.StringIO(acl_formula).readline):
-      if part[0] == tokenize.COMMENT and part[1].startswith('#'):
-        result = ['Comment', result, part[1][1:].strip()]
-        break
-    return result
-  except SyntaxError as err:
-    # In case of an error, include line and offset.
-    raise SyntaxError("%s on line %s col %s" % (err.args[0], err.lineno, err.offset))
+  if 'aclFormula' not in col_values:
+    return
 
-
-def parse_acl_formula_json(acl_formula):
-  """
-  As parse_acl_formula(), but stringifies the result, and converts empty string to empty string.
-  """
-  return json.dumps(parse_acl_formula(acl_formula)) if acl_formula else ""
-
-
-# Entities encountered in ACL formulas, which may get renamed.
-#   type : 'recCol'|'userAttr'|'userAttrCol',
-#   start_pos: number,        # start position of the token in the code.
-#   name: string,             # the name that may be updated by a rename.
-#   extra: string|None,       # name of userAttr in case of userAttrCol; otherwise None.
-NamedEntity = namedtuple('NamedEntity', ('type', 'start_pos', 'name', 'extra'))
+  col_values['aclFormulaParsed'] = [parse_predicate_formula_json(v)
+                                    for v
+                                    in col_values['aclFormula']]
 
 def parse_acl_grist_entities(acl_formula):
   """
@@ -72,69 +28,7 @@ def parse_acl_grist_entities(acl_formula):
   except SyntaxError as err:
     return []
 
-
-named_constants = {
-  'True': True,
-  'False': False,
-  'None': None,
-}
-
-class _TreeConverter(ast.NodeVisitor):
-  # AST nodes are documented here: https://docs.python.org/2/library/ast.html#abstract-grammar
-  # pylint:disable=no-self-use
-
-  def visit_Expression(self, node):
-    return self.visit(node.body)
-
-  def visit_BoolOp(self, node):
-    return [node.op.__class__.__name__] + [self.visit(v) for v in node.values]
-
-  def visit_BinOp(self, node):
-    if not isinstance(node.op, (ast.Add, ast.Sub, ast.Mult, ast.Div, ast.Mod)):
-      return self.generic_visit(node)
-    return [node.op.__class__.__name__, self.visit(node.left), self.visit(node.right)]
-
-  def visit_UnaryOp(self, node):
-    if not isinstance(node.op, (ast.Not)):
-      return self.generic_visit(node)
-    return [node.op.__class__.__name__, self.visit(node.operand)]
-
-  def visit_Compare(self, node):
-    # We don't try to support chained comparisons like "1 < 2 < 3" (though it wouldn't be hard).
-    if len(node.ops) != 1 or len(node.comparators) != 1:
-      raise ValueError("Can't use chained comparisons")
-    return [node.ops[0].__class__.__name__, self.visit(node.left), self.visit(node.comparators[0])]
-
-  def visit_Name(self, node):
-    if node.id in named_constants:
-      return ["Const", named_constants[node.id]]
-    return ["Name", node.id]
-
-  def visit_Constant(self, node):
-    return ["Const", node.value]
-
-  visit_NameConstant = visit_Constant
-
-  def visit_Attribute(self, node):
-    return ["Attr", self.visit(node.value), node.attr]
-
-  def visit_Num(self, node):
-    return ["Const", node.n]
-
-  def visit_Str(self, node):
-    return ["Const", node.s]
-
-  def visit_List(self, node):
-    return ["List"] + [self.visit(e) for e in node.elts]
-
-  def visit_Tuple(self, node):
-    return self.visit_List(node)    # We don't distinguish tuples and lists
-
-  def generic_visit(self, node):
-    raise ValueError("Unsupported syntax at %s:%s" % (node.lineno, node.col_offset + 1))
-
-
-class _EntityCollector(_TreeConverter):
+class _EntityCollector(TreeConverter):
   def __init__(self):
     self.entities = []    # NamedEntity list
 
diff --git a/sandbox/grist/dropdown_condition.py b/sandbox/grist/dropdown_condition.py
new file mode 100644
index 00000000..b57ef3f0
--- /dev/null
+++ b/sandbox/grist/dropdown_condition.py
@@ -0,0 +1,43 @@
+import json
+import logging
+
+from predicate_formula import parse_predicate_formula_json
+
+log = logging.getLogger(__name__)
+
+def parse_dropdown_conditions(col_values):
+  """
+  Parses any unparsed dropdown conditions in `col_values`.
+  """
+  if 'widgetOptions' not in col_values:
+    return
+
+  col_values['widgetOptions'] = [parse_dropdown_condition(widget_options_json)
+                                 for widget_options_json
+                                 in col_values['widgetOptions']]
+
+def parse_dropdown_condition(widget_options_json):
+  """
+  Parses `dropdownCondition.text` in `widget_options_json` and stores the parsed
+  representation in `dropdownCondition.parsed`.
+
+  If `dropdownCondition.parsed` is already set, parsing is skipped (as an optimization).
+  Clients are responsible for including just `dropdownCondition.text` when creating new
+  (or updating existing) dropdown conditions.
+
+  Returns an updated copy of `widget_options_json` or the original widget_options_json
+  if parsing was skipped.
+  """
+  try:
+    widget_options = json.loads(widget_options_json)
+    if 'dropdownCondition' not in widget_options:
+      return widget_options_json
+
+    dropdown_condition = widget_options['dropdownCondition']
+    if 'parsed' in dropdown_condition:
+      return widget_options_json
+
+    dropdown_condition['parsed'] = parse_predicate_formula_json(dropdown_condition['text'])
+    return json.dumps(widget_options)
+  except (TypeError, ValueError):
+    return widget_options_json
diff --git a/sandbox/grist/main.py b/sandbox/grist/main.py
index 2929183f..a6d21240 100644
--- a/sandbox/grist/main.py
+++ b/sandbox/grist/main.py
@@ -23,7 +23,7 @@ import migrations
 import schema
 import useractions
 import objtypes
-from acl_formula import parse_acl_formula
+from predicate_formula import parse_predicate_formula
 from sandbox import get_default_sandbox
 from imports.register import register_import_parsers
 
@@ -174,7 +174,7 @@ def run(sandbox):
   def get_timings():
     return eng._timing.get()
 
-  export(parse_acl_formula)
+  export(parse_predicate_formula)
   export(eng.load_empty)
   export(eng.load_done)
 
diff --git a/sandbox/grist/predicate_formula.py b/sandbox/grist/predicate_formula.py
new file mode 100644
index 00000000..f4213833
--- /dev/null
+++ b/sandbox/grist/predicate_formula.py
@@ -0,0 +1,118 @@
+import ast
+import io
+import json
+import tokenize
+from collections import namedtuple
+
+import six
+
+from codebuilder import replace_dollar_attrs
+
+# Entities encountered in predicate formulas, which may get renamed.
+#   type : 'recCol'|'userAttr'|'userAttrCol',
+#   start_pos: number,        # start position of the token in the code.
+#   name: string,             # the name that may be updated by a rename.
+#   extra: string|None,       # name of userAttr in case of userAttrCol; otherwise None.
+NamedEntity = namedtuple('NamedEntity', ('type', 'start_pos', 'name', 'extra'))
+
+def parse_predicate_formula(formula):
+  """
+  Parse a predicate formula expression into a parse tree that we can interpret in JS, e.g.
+  "rec.office == 'Seattle' and user.email in ['sally@', 'xie@']".
+
+  The idea is to support enough to express ACL rules and dropdown conditions flexibly, but we
+  don't need to support too much, since expressions should be reasonably simple.
+
+  The returned tree has the form [NODE_TYPE, arguments...], with these NODE_TYPEs supported:
+    And|Or                  ...values
+    Add|Sub|Mult|Div|Mod    left, right
+    Not                     operand
+    Eq|NotEq|Lt|LtE|Gt|GtE  left, right
+    Is|IsNot|In|NotIn       left, right
+    List                    ...elements
+    Const                   value (number, string, bool)
+    Name                    name (string)
+    Attr                    node, attr_name
+    Comment                 node, comment
+  """
+  if isinstance(formula, six.binary_type):
+    formula = formula.decode('utf8')
+  try:
+    formula = replace_dollar_attrs(formula)
+    tree = ast.parse(formula, mode='eval')
+    result = TreeConverter().visit(tree)
+    for part in tokenize.generate_tokens(io.StringIO(formula).readline):
+      if part[0] == tokenize.COMMENT and part[1].startswith('#'):
+        result = ['Comment', result, part[1][1:].strip()]
+        break
+    return result
+  except SyntaxError as err:
+    # In case of an error, include line and offset.
+    raise SyntaxError("%s on line %s col %s" % (err.args[0], err.lineno, err.offset))
+
+def parse_predicate_formula_json(formula):
+  """
+  As parse_predicate_formula(), but stringifies the result, and converts falsy
+  values to empty string.
+  """
+  return json.dumps(parse_predicate_formula(formula)) if formula else ""
+
+named_constants = {
+  'True': True,
+  'False': False,
+  'None': None,
+}
+
+class TreeConverter(ast.NodeVisitor):
+  # AST nodes are documented here: https://docs.python.org/2/library/ast.html#abstract-grammar
+  # pylint:disable=no-self-use
+
+  def visit_Expression(self, node):
+    return self.visit(node.body)
+
+  def visit_BoolOp(self, node):
+    return [node.op.__class__.__name__] + [self.visit(v) for v in node.values]
+
+  def visit_BinOp(self, node):
+    if not isinstance(node.op, (ast.Add, ast.Sub, ast.Mult, ast.Div, ast.Mod)):
+      return self.generic_visit(node)
+    return [node.op.__class__.__name__, self.visit(node.left), self.visit(node.right)]
+
+  def visit_UnaryOp(self, node):
+    if not isinstance(node.op, (ast.Not)):
+      return self.generic_visit(node)
+    return [node.op.__class__.__name__, self.visit(node.operand)]
+
+  def visit_Compare(self, node):
+    # We don't try to support chained comparisons like "1 < 2 < 3" (though it wouldn't be hard).
+    if len(node.ops) != 1 or len(node.comparators) != 1:
+      raise ValueError("Can't use chained comparisons")
+    return [node.ops[0].__class__.__name__, self.visit(node.left), self.visit(node.comparators[0])]
+
+  def visit_Name(self, node):
+    if node.id in named_constants:
+      return ["Const", named_constants[node.id]]
+    return ["Name", node.id]
+
+  def visit_Constant(self, node):
+    return ["Const", node.value]
+
+  visit_NameConstant = visit_Constant
+
+  def visit_Attribute(self, node):
+    return ["Attr", self.visit(node.value), node.attr]
+
+  def visit_Num(self, node):
+    return ["Const", node.n]
+
+  def visit_Str(self, node):
+    return ["Const", node.s]
+
+  def visit_List(self, node):
+    return ["List"] + [self.visit(e) for e in node.elts]
+
+  def visit_Tuple(self, node):
+    return self.visit_List(node)    # We don't distinguish tuples and lists
+
+  def generic_visit(self, node):
+    raise ValueError("Unsupported syntax at %s:%s" % (node.lineno, node.col_offset + 1))
diff --git a/sandbox/grist/test_acl_formula.py b/sandbox/grist/test_acl_formula.py
index 62c51e39..097f6d4e 100644
--- a/sandbox/grist/test_acl_formula.py
+++ b/sandbox/grist/test_acl_formula.py
@@ -1,151 +1,8 @@
 # -*- coding: utf-8 -*-
 # pylint:disable=line-too-long
 
-import unittest
-from acl_formula import parse_acl_formula
 import test_engine
 
-
-class TestACLFormula(unittest.TestCase):
-  def test_basic(self):
-    # Test a few basic formulas and structures, hitting everything we expect to support
-    self.assertEqual(parse_acl_formula(
-      "user.Email == 'X@'"),
-      ["Eq", ["Attr", ["Name", "user"], "Email"],
-        ["Const", "X@"]])
-
-    self.assertEqual(parse_acl_formula(
-      "user.Role in ('editors', 'owners')"),
-      ["In", ["Attr", ["Name", "user"], "Role"],
-             ["List", ["Const", "editors"], ["Const", "owners"]]])
-
-    self.assertEqual(parse_acl_formula(
-      "user.Role not in ('editors', 'owners')"),
-      ["NotIn", ["Attr", ["Name", "user"], "Role"],
-                ["List", ["Const", "editors"], ["Const", "owners"]]])
-
-    self.assertEqual(parse_acl_formula(
-      "rec.office == 'Seattle' and user.email in ['sally@', 'xie@']"),
-      ['And',
-        ['Eq', ['Attr', ['Name', 'rec'], 'office'], ['Const', 'Seattle']],
-        ['In',
-         ['Attr', ['Name', 'user'], 'email'],
-         ['List', ['Const', 'sally@'], ['Const', 'xie@']]
-        ]])
-
-    self.assertEqual(parse_acl_formula(
-      "$office == 'Seattle' and user.email in ['sally@', 'xie@']"),
-      ['And',
-        ['Eq', ['Attr', ['Name', 'rec'], 'office'], ['Const', 'Seattle']],
-        ['In',
-         ['Attr', ['Name', 'user'], 'email'],
-         ['List', ['Const', 'sally@'], ['Const', 'xie@']]
-        ]])
-
-    self.assertEqual(parse_acl_formula(
-      "user.IsAdmin or rec.assigned is None or (not newRec.HasDuplicates and rec.StatusIndex <= newRec.StatusIndex)"),
-      ['Or',
-        ['Attr', ['Name', 'user'], 'IsAdmin'],
-        ['Is', ['Attr', ['Name', 'rec'], 'assigned'], ['Const', None]],
-        ['And',
-          ['Not', ['Attr', ['Name', 'newRec'], 'HasDuplicates']],
-          ['LtE', ['Attr', ['Name', 'rec'], 'StatusIndex'], ['Attr', ['Name', 'newRec'], 'StatusIndex']]
-        ]
-      ])
-
-    self.assertEqual(parse_acl_formula(
-      "user.IsAdmin or $assigned is None or (not newRec.HasDuplicates and $StatusIndex <= newRec.StatusIndex)"),
-      ['Or',
-        ['Attr', ['Name', 'user'], 'IsAdmin'],
-        ['Is', ['Attr', ['Name', 'rec'], 'assigned'], ['Const', None]],
-        ['And',
-          ['Not', ['Attr', ['Name', 'newRec'], 'HasDuplicates']],
-          ['LtE', ['Attr', ['Name', 'rec'], 'StatusIndex'], ['Attr', ['Name', 'newRec'], 'StatusIndex']]
-        ]
-      ])
-
-    self.assertEqual(parse_acl_formula(
-      "r.A <= n.A + 1 or r.A >= n.A - 1 or r.B < n.B * 2.5 or r.B > n.B / 2.5 or r.C % 2 != 0"),
-      ['Or',
-        ['LtE',
-          ['Attr', ['Name', 'r'], 'A'],
-          ['Add', ['Attr', ['Name', 'n'], 'A'], ['Const', 1]]],
-        ['GtE',
-          ['Attr', ['Name', 'r'], 'A'],
-          ['Sub', ['Attr', ['Name', 'n'], 'A'], ['Const', 1]]],
-        ['Lt',
-          ['Attr', ['Name', 'r'], 'B'],
-          ['Mult', ['Attr', ['Name', 'n'], 'B'], ['Const', 2.5]]],
-        ['Gt',
-          ['Attr', ['Name', 'r'], 'B'],
-          ['Div', ['Attr', ['Name', 'n'], 'B'], ['Const', 2.5]]],
-        ['NotEq',
-          ['Mod', ['Attr', ['Name', 'r'], 'C'], ['Const', 2]],
-          ['Const', 0]]
-      ])
-
-    self.assertEqual(parse_acl_formula(
-      "rec.A is True or rec.A is not False"),
-      ['Or',
-        ['Is', ['Attr', ['Name', 'rec'], 'A'], ['Const', True]],
-        ['IsNot', ['Attr', ['Name', 'rec'], 'A'], ['Const', False]]
-      ])
-
-    self.assertEqual(parse_acl_formula(
-      "$A is True or $A is not False"),
-      ['Or',
-        ['Is', ['Attr', ['Name', 'rec'], 'A'], ['Const', True]],
-        ['IsNot', ['Attr', ['Name', 'rec'], 'A'], ['Const', False]]
-      ])
-
-    self.assertEqual(parse_acl_formula(
-      "user.Office.City == 'Seattle' and user.Status.IsActive"),
-      ['And',
-        ['Eq',
-          ['Attr', ['Attr', ['Name', 'user'], 'Office'], 'City'],
-          ['Const', 'Seattle']],
-        ['Attr', ['Attr', ['Name', 'user'], 'Status'], 'IsActive']
-      ])
-
-    self.assertEqual(parse_acl_formula(
-      "True # Comment!  "),
-      ['Comment', ['Const', True], 'Comment!'])
-
-    self.assertEqual(parse_acl_formula(
-      "\"#x\" == \" # Not a comment \"#Comment!"),
-      ['Comment',
-       ['Eq', ['Const', '#x'], ['Const', ' # Not a comment ']],
-       'Comment!'
-      ])
-
-    self.assertEqual(parse_acl_formula(
-      "# Allow owners\nuser.Access == 'owners' # ignored\n# comment ignored"),
-      ['Comment',
-       ['Eq', ['Attr', ['Name', 'user'], 'Access'], ['Const', 'owners']],
-       'Allow owners'
-      ])
-
-  def test_unsupported(self):
-    # Test a few constructs we expect to fail
-    # Not an expression
-    self.assertRaises(SyntaxError, parse_acl_formula, "return 1")
-    self.assertRaises(SyntaxError, parse_acl_formula, "def foo(): pass")
-
-    # Unsupported node type
-    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_acl_formula, "max(rec)")
-    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_acl_formula, "user.id in {1, 2, 3}")
-    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_acl_formula, "1 if user.IsAnon else 2")
-
-    # Unsupported operation
-    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_acl_formula, "1 | 2")
-    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_acl_formula, "1 << 2")
-    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_acl_formula, "~test")
-
-    # Syntax error
-    self.assertRaises(SyntaxError, parse_acl_formula, "[(]")
-    self.assertRaises(SyntaxError, parse_acl_formula, "user.id in (1,2))")
-    self.assertRaisesRegex(SyntaxError, r'invalid syntax on line 1 col 9', parse_acl_formula, "foo and !bar")
-
 class TestACLFormulaUserActions(test_engine.EngineTestCase):
   def test_acl_actions(self):
     # Adding or updating ACLRules automatically includes aclFormula compilation.
diff --git a/sandbox/grist/test_dropdown_condition.py b/sandbox/grist/test_dropdown_condition.py
new file mode 100644
index 00000000..c7add3e5
--- /dev/null
+++ b/sandbox/grist/test_dropdown_condition.py
@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+# pylint:disable=line-too-long
+import json
+
+import test_engine
+
+class TestDropdownConditionUserActions(test_engine.EngineTestCase):
+  def test_dropdown_condition_col_actions(self):
+    self.apply_user_action(['AddTable', 'Table1', [
+      {'id': 'A', 'type': 'Text'},
+      {'id': 'B', 'type': 'Text'},
+      {'id': 'C', 'type': 'Text'},
+    ]])
+
+    # Check that setting dropdownCondition.text automatically sets a parsed version.
+    out_actions = self.apply_user_action(['UpdateRecord', '_grist_Tables_column', 1, {
+        "widgetOptions": json.dumps({
+          "dropdownCondition": {
+            "text": 'choice.Role == "Manager"',
+          },
+        }),
+    }])
+    self.assertPartialOutActions(out_actions, { "stored": [
+      ["UpdateRecord", "_grist_Tables_column", 1, {
+        "widgetOptions": "{\"dropdownCondition\": {\"text\": "
+          + "\"choice.Role == \\\"Manager\\\"\", \"parsed\": "
+          + "\"[\\\"Eq\\\", [\\\"Attr\\\", [\\\"Name\\\", \\\"choice\\\"], "
+          + "\\\"Role\\\"], [\\\"Const\\\", \\\"Manager\\\"]]\"}}"
+      }]
+    ]})
+    out_actions = self.apply_user_action(['BulkUpdateRecord', '_grist_Tables_column', [2, 3], {
+      "widgetOptions": [
+        json.dumps({
+          "dropdownCondition": {
+            "text": 'choice == "Manager"',
+          },
+        }),
+        json.dumps({
+          "dropdownCondition": {
+            "text": '$Role == "Manager"',
+          },
+        }),
+      ],
+    }])
+    self.assertPartialOutActions(out_actions, { "stored": [
+      ["BulkUpdateRecord", "_grist_Tables_column", [2, 3], {
+        "widgetOptions": [
+          "{\"dropdownCondition\": {\"text\": \"choice == "
+            + "\\\"Manager\\\"\", \"parsed\": \"[\\\"Eq\\\", "
+            + "[\\\"Name\\\", \\\"choice\\\"], [\\\"Const\\\", \\\"Manager\\\"]]\"}}",
+          "{\"dropdownCondition\": {\"text\": \"$Role == "
+            + "\\\"Manager\\\"\", \"parsed\": \"[\\\"Eq\\\", "
+            + "[\\\"Attr\\\", [\\\"Name\\\", \\\"rec\\\"], \\\"Role\\\"], "
+            + "[\\\"Const\\\", \\\"Manager\\\"]]\"}}",
+        ]
+      }]
+    ]})
+
+  def test_dropdown_condition_field_actions(self):
+    self.apply_user_action(['AddTable', 'Table1', [
+      {'id': 'A', 'type': 'Text'},
+      {'id': 'B', 'type': 'Text'},
+      {'id': 'C', 'type': 'Text'},
+    ]])
+
+    # Check that setting dropdownCondition.text automatically sets a parsed version.
+    out_actions = self.apply_user_action(['UpdateRecord', '_grist_Views_section_field', 1, {
+        "widgetOptions": json.dumps({
+          "dropdownCondition": {
+            "text": 'choice.Role == "Manager"',
+          },
+        }),
+    }])
+    self.assertPartialOutActions(out_actions, { "stored": [
+      ["UpdateRecord", "_grist_Views_section_field", 1, {
+        "widgetOptions": "{\"dropdownCondition\": {\"text\": "
+          + "\"choice.Role == \\\"Manager\\\"\", \"parsed\": "
+          + "\"[\\\"Eq\\\", [\\\"Attr\\\", [\\\"Name\\\", \\\"choice\\\"], "
+          + "\\\"Role\\\"], [\\\"Const\\\", \\\"Manager\\\"]]\"}}"
+      }]
+    ]})
+    out_actions = self.apply_user_action(['BulkUpdateRecord', '_grist_Views_section_field', [2, 3], {
+      "widgetOptions": [
+        json.dumps({
+          "dropdownCondition": {
+            "text": 'choice == "Manager"',
+          },
+        }),
+        json.dumps({
+          "dropdownCondition": {
+            "text": '$Role == "Manager"',
+          },
+        }),
+      ],
+    }])
+    self.assertPartialOutActions(out_actions, { "stored": [
+      ["BulkUpdateRecord", "_grist_Views_section_field", [2, 3], {
+        "widgetOptions": [
+          "{\"dropdownCondition\": {\"text\": \"choice == "
+            + "\\\"Manager\\\"\", \"parsed\": \"[\\\"Eq\\\", "
+            + "[\\\"Name\\\", \\\"choice\\\"], [\\\"Const\\\", \\\"Manager\\\"]]\"}}",
+          "{\"dropdownCondition\": {\"text\": \"$Role == "
+            + "\\\"Manager\\\"\", \"parsed\": \"[\\\"Eq\\\", "
+            + "[\\\"Attr\\\", [\\\"Name\\\", \\\"rec\\\"], \\\"Role\\\"], "
+            + "[\\\"Const\\\", \\\"Manager\\\"]]\"}}",
+        ]
+      }]
+    ]})
diff --git a/sandbox/grist/test_predicate_formula.py b/sandbox/grist/test_predicate_formula.py
new file mode 100644
index 00000000..34914c2e
--- /dev/null
+++ b/sandbox/grist/test_predicate_formula.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+# pylint:disable=line-too-long
+
+import unittest
+from predicate_formula import parse_predicate_formula
+
+class TestPredicateFormula(unittest.TestCase):
+  def test_basic(self):
+    # Test a few basic formulas and structures, hitting everything we expect to support
+    # in ACL formulas and dropdown conditions.
+    self.assertEqual(parse_predicate_formula(
+      "user.Email == 'X@'"),
+      ["Eq", ["Attr", ["Name", "user"], "Email"],
+        ["Const", "X@"]])
+
+    self.assertEqual(parse_predicate_formula(
+      "user.Role in ('editors', 'owners')"),
+      ["In", ["Attr", ["Name", "user"], "Role"],
+             ["List", ["Const", "editors"], ["Const", "owners"]]])
+
+    self.assertEqual(parse_predicate_formula(
+      "user.Role not in ('editors', 'owners')"),
+      ["NotIn", ["Attr", ["Name", "user"], "Role"],
+                ["List", ["Const", "editors"], ["Const", "owners"]]])
+
+    self.assertEqual(parse_predicate_formula(
+      "rec.office == 'Seattle' and user.email in ['sally@', 'xie@']"),
+      ['And',
+        ['Eq', ['Attr', ['Name', 'rec'], 'office'], ['Const', 'Seattle']],
+        ['In',
+         ['Attr', ['Name', 'user'], 'email'],
+         ['List', ['Const', 'sally@'], ['Const', 'xie@']]
+        ]])
+
+    self.assertEqual(parse_predicate_formula(
+      "$office == 'Seattle' and user.email in ['sally@', 'xie@']"),
+      ['And',
+        ['Eq', ['Attr', ['Name', 'rec'], 'office'], ['Const', 'Seattle']],
+        ['In',
+         ['Attr', ['Name', 'user'], 'email'],
+         ['List', ['Const', 'sally@'], ['Const', 'xie@']]
+        ]])
+
+    self.assertEqual(parse_predicate_formula(
+      "user.IsAdmin or rec.assigned is None or (not newRec.HasDuplicates and rec.StatusIndex <= newRec.StatusIndex)"),
+      ['Or',
+        ['Attr', ['Name', 'user'], 'IsAdmin'],
+        ['Is', ['Attr', ['Name', 'rec'], 'assigned'], ['Const', None]],
+        ['And',
+          ['Not', ['Attr', ['Name', 'newRec'], 'HasDuplicates']],
+          ['LtE', ['Attr', ['Name', 'rec'], 'StatusIndex'], ['Attr', ['Name', 'newRec'], 'StatusIndex']]
+        ]
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "user.IsAdmin or $assigned is None or (not newRec.HasDuplicates and $StatusIndex <= newRec.StatusIndex)"),
+      ['Or',
+        ['Attr', ['Name', 'user'], 'IsAdmin'],
+        ['Is', ['Attr', ['Name', 'rec'], 'assigned'], ['Const', None]],
+        ['And',
+          ['Not', ['Attr', ['Name', 'newRec'], 'HasDuplicates']],
+          ['LtE', ['Attr', ['Name', 'rec'], 'StatusIndex'], ['Attr', ['Name', 'newRec'], 'StatusIndex']]
+        ]
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "r.A <= n.A + 1 or r.A >= n.A - 1 or r.B < n.B * 2.5 or r.B > n.B / 2.5 or r.C % 2 != 0"),
+      ['Or',
+        ['LtE',
+          ['Attr', ['Name', 'r'], 'A'],
+          ['Add', ['Attr', ['Name', 'n'], 'A'], ['Const', 1]]],
+        ['GtE',
+          ['Attr', ['Name', 'r'], 'A'],
+          ['Sub', ['Attr', ['Name', 'n'], 'A'], ['Const', 1]]],
+        ['Lt',
+          ['Attr', ['Name', 'r'], 'B'],
+          ['Mult', ['Attr', ['Name', 'n'], 'B'], ['Const', 2.5]]],
+        ['Gt',
+          ['Attr', ['Name', 'r'], 'B'],
+          ['Div', ['Attr', ['Name', 'n'], 'B'], ['Const', 2.5]]],
+        ['NotEq',
+          ['Mod', ['Attr', ['Name', 'r'], 'C'], ['Const', 2]],
+          ['Const', 0]]
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "rec.A is True or rec.A is not False"),
+      ['Or',
+        ['Is', ['Attr', ['Name', 'rec'], 'A'], ['Const', True]],
+        ['IsNot', ['Attr', ['Name', 'rec'], 'A'], ['Const', False]]
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "$A is True or $A is not False"),
+      ['Or',
+        ['Is', ['Attr', ['Name', 'rec'], 'A'], ['Const', True]],
+        ['IsNot', ['Attr', ['Name', 'rec'], 'A'], ['Const', False]]
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "user.Office.City == 'Seattle' and user.Status.IsActive"),
+      ['And',
+        ['Eq',
+          ['Attr', ['Attr', ['Name', 'user'], 'Office'], 'City'],
+          ['Const', 'Seattle']],
+        ['Attr', ['Attr', ['Name', 'user'], 'Status'], 'IsActive']
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "True # Comment!  "),
+      ['Comment', ['Const', True], 'Comment!'])
+
+    self.assertEqual(parse_predicate_formula(
+      "\"#x\" == \" # Not a comment \"#Comment!"),
+      ['Comment',
+       ['Eq', ['Const', '#x'], ['Const', ' # Not a comment ']],
+       'Comment!'
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "# Allow owners\nuser.Access == 'owners' # ignored\n# comment ignored"),
+      ['Comment',
+       ['Eq', ['Attr', ['Name', 'user'], 'Access'], ['Const', 'owners']],
+       'Allow owners'
+      ])
+
+    self.assertEqual(parse_predicate_formula(
+      "choice not in $Categories"),
+      ['NotIn', ['Name', 'choice'], ['Attr', ['Name', 'rec'], 'Categories']])
+
+    self.assertEqual(parse_predicate_formula(
+      "choice.role == \"Manager\""),
+      ['Eq', ['Attr', ['Name', 'choice'], 'role'], ['Const', 'Manager']])
+
+  def test_unsupported(self):
+    # Test a few constructs we expect to fail
+    # Not an expression
+    self.assertRaises(SyntaxError, parse_predicate_formula, "return 1")
+    self.assertRaises(SyntaxError, parse_predicate_formula, "def foo(): pass")
+
+    # Unsupported node type
+    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_predicate_formula, "max(rec)")
+    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_predicate_formula, "user.id in {1, 2, 3}")
+    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_predicate_formula, "1 if user.IsAnon else 2")
+
+    # Unsupported operation
+    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_predicate_formula, "1 | 2")
+    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_predicate_formula, "1 << 2")
+    self.assertRaisesRegex(ValueError, r'Unsupported syntax', parse_predicate_formula, "~test")
+
+    # Syntax error
+    self.assertRaises(SyntaxError, parse_predicate_formula, "[(]")
+    self.assertRaises(SyntaxError, parse_predicate_formula, "user.id in (1,2))")
+    self.assertRaisesRegex(SyntaxError, r'invalid syntax on line 1 col 9', parse_predicate_formula, "foo and !bar")
diff --git a/sandbox/grist/useractions.py b/sandbox/grist/useractions.py
index 4a8ec78e..ac9261ef 100644
--- a/sandbox/grist/useractions.py
+++ b/sandbox/grist/useractions.py
@@ -12,7 +12,8 @@ from six.moves import xrange
 import acl
 import depend
 import gencode
-from acl_formula import parse_acl_formula_json
+from acl_formula import parse_acl_formulas
+from dropdown_condition import parse_dropdown_conditions
 import actions
 import column
 import sort_specs
@@ -437,9 +438,7 @@ class UserActions(object):
 
   @override_action('BulkAddRecord', '_grist_ACLRules')
   def _addACLRules(self, table_id, row_ids, col_values):
-    # Automatically populate aclFormulaParsed value by parsing aclFormula.
-    if 'aclFormula' in col_values:
-      col_values['aclFormulaParsed'] = [parse_acl_formula_json(v) for v in col_values['aclFormula']]
+    parse_acl_formulas(col_values)
     return self.doBulkAddOrReplace(table_id, row_ids, col_values)
 
   #----------------------------------------
@@ -672,6 +671,7 @@ class UserActions(object):
     #     columns for all summary tables of the same source table).
     # (4) Updates to the source columns of summary group-by columns (including renaming and type
     #     changes) should be copied to those group-by columns.
+    parse_dropdown_conditions(col_values)
 
     # A list of individual (col_rec, values) updates, where values is a per-column dict.
     col_updates = OrderedDict()
@@ -781,11 +781,14 @@ class UserActions(object):
 
     self.doBulkUpdateRecord(table_id, row_ids, col_values)
 
+  @override_action('BulkUpdateRecord', '_grist_Views_section_field')
+  def _updateViewSectionFields(self, table_id, row_ids, col_values):
+    parse_dropdown_conditions(col_values)
+    return self.doBulkUpdateRecord(table_id, row_ids, col_values)
+
   @override_action('BulkUpdateRecord', '_grist_ACLRules')
   def _updateACLRules(self, table_id, row_ids, col_values):
-    # Automatically populate aclFormulaParsed value by parsing aclFormula.
-    if 'aclFormula' in col_values:
-      col_values['aclFormulaParsed'] = [parse_acl_formula_json(v) for v in col_values['aclFormula']]
+    parse_acl_formulas(col_values)
     return self.doBulkUpdateRecord(table_id, row_ids, col_values)
 
   def _prepare_formula_renames(self, renames):
diff --git a/test/client/lib/ACIndex.ts b/test/client/lib/ACIndex.ts
index 75eb7c20..1650e7a8 100644
--- a/test/client/lib/ACIndex.ts
+++ b/test/client/lib/ACIndex.ts
@@ -378,7 +378,12 @@ class BruteForceACIndexImpl<Item extends ACItem> implements ACIndex<Item> {
   public search(searchText: string): ACResults<Item> {
     const cleanedSearchText = searchText.trim().toLowerCase();
     if (!cleanedSearchText) {
-      return {items: this._allItems.slice(0, this._maxResults), highlightFunc: highlightNone, selectIndex: -1};
+      return {
+        items: this._allItems.slice(0, this._maxResults),
+        extraItems: [],
+        highlightFunc: highlightNone,
+        selectIndex: -1,
+      };
     }
 
     const searchWords = cleanedSearchText.split(/\s+/);
@@ -397,7 +402,7 @@ class BruteForceACIndexImpl<Item extends ACItem> implements ACIndex<Item> {
     matches.sort((a, b) => nativeCompare(b[0], a[0]) || nativeCompare(a[1], b[1]));
     const items = matches.slice(0, this._maxResults).map((m) => m[2]);
 
-    return {items, highlightFunc: highlightNone, selectIndex: -1};
+    return {items, extraItems: [], highlightFunc: highlightNone, selectIndex: -1};
   }
 }
 
diff --git a/test/client/lib/SafeBrowser.ts b/test/client/lib/SafeBrowser.ts
index 66390338..442c6f1b 100644
--- a/test/client/lib/SafeBrowser.ts
+++ b/test/client/lib/SafeBrowser.ts
@@ -3,13 +3,11 @@ import { Disposable } from 'app/client/lib/dispose';
 import { ClientProcess, SafeBrowser } from 'app/client/lib/SafeBrowser';
 import { LocalPlugin } from 'app/common/plugin';
 import { PluginInstance } from 'app/common/PluginInstance';
-import { GristLight } from 'app/common/themes/GristLight';
 import { GristAPI, RPC_GRISTAPI_INTERFACE } from 'app/plugin/GristAPI';
 import { Storage } from 'app/plugin/StorageAPI';
 import { checkers } from 'app/plugin/TypeCheckers';
 import { assert } from 'chai';
 import { Rpc } from 'grain-rpc';
-import { Computed } from 'grainjs';
 import { noop } from 'lodash';
 import { basename } from 'path';
 import * as sinon from 'sinon';
@@ -188,7 +186,6 @@ describe('SafeBrowser', function() {
       untrustedContentOrigin: '',
       mainPath,
       baseLogger: {},
-      theme: Computed.create(null, () => ({appearance: 'light', colors: GristLight})),
     });
     cleanup.push(() => safeBrowser.deactivate());
     pluginInstance.rpc.registerForwarder(mainPath, safeBrowser);
diff --git a/test/client/ui/AccountPage.ts b/test/client/lib/nameUtils.ts
similarity index 91%
rename from test/client/ui/AccountPage.ts
rename to test/client/lib/nameUtils.ts
index 1f701664..438e1de2 100644
--- a/test/client/ui/AccountPage.ts
+++ b/test/client/lib/nameUtils.ts
@@ -1,11 +1,9 @@
-import {checkName} from 'app/client/ui/AccountPage';
+import {checkName} from 'app/client/lib/nameUtils';
 import {assert} from 'chai';
 
-
-describe("AccountPage", function() {
+describe("nameUtils", function() {
   describe("isValidName", function() {
     it("should detect invalid name", function() {
-
       assert.equal(checkName('santa'), true);
       assert.equal(checkName('_santa'), true);
       assert.equal(checkName("O'Neil"), true);
diff --git a/test/client/models/HomeModel.ts b/test/client/lib/timeUtils.ts
similarity index 87%
rename from test/client/models/HomeModel.ts
rename to test/client/lib/timeUtils.ts
index 77e6ef13..1f3f7058 100644
--- a/test/client/models/HomeModel.ts
+++ b/test/client/lib/timeUtils.ts
@@ -1,8 +1,8 @@
-import {getTimeFromNow} from 'app/client/models/HomeModel';
+import {getTimeFromNow} from 'app/client/lib/timeUtils';
 import {assert} from 'chai';
 import moment from 'moment';
 
-describe("HomeModel", function() {
+describe("timeUtils", function() {
   describe("getTimeFromNow", function() {
     it("should give good summary of time that just passed", function() {
       const t = moment().subtract(10, 's');
@@ -18,5 +18,5 @@ describe("HomeModel", function() {
       const t = moment().add(2, 'minutes');
       assert.equal(getTimeFromNow(t.toISOString()), 'in 2 minutes');
     });
-});
+  });
 });
diff --git a/test/fixtures/docs/DropdownCondition.grist b/test/fixtures/docs/DropdownCondition.grist
new file mode 100644
index 0000000000000000000000000000000000000000..50c7b18903b71911253fa34512628793f0db6df6
GIT binary patch
literal 167936
zcmeI5TWlQHdB=Bn+a;ytN|v3q?8q9e?2ucDHYtjt8P$!K<Vsp-c`>=PtqAF6ICIFI
zXm(~j7g4lfG$bWADB7Y=ZGrZoPi<dX^eF`z6bX=rqUb{k1ZWEsD2zU|K^hbZ3K&5O
z6#dT3?(BtUMwSg<#QX=8xO2X9`OfeA&TY=&?D}hE-DUEYW!Du~o=%)dNK)ceSxzJp
z{q!$S|5{fceHdun&~J(Ur8@3KANvz8s)<38^kqKa@^hL0&3rKO^s#?U{qFGJCciVp
z2G<6jk^VaKb5UZ1MH0CG^>i{jGb4RVb(KwnRkv;3ajO;n*{Q0Q;nhu1*yzGqu}~?>
zmBM_vDCa~`a`L#Y$))8=@p^GhUR^6K71nOaH;cC}%DIMOGt(_;xlq1XyjIvKSLDf1
zx@tK&d3j^0xK>(_TjD7;H#bL7NHd<gQhc)#%Erb>;O;h<D11lPwwb%qaCOV1d=Dqo
zoonQ}o}uLA`IVJ&v9KIw%yr^^?F$d5G?Yzdh_cj}quRP(q)6<UuFe*CMXuRay&U8s
zD%<hub;aIYw>(?r3B=Si-Dw!gZlwIK?&xIINV)Bi$$Ru%-YA!;@-|ZyLw%#hOmWeH
ze33Oo>GS(D$CKHyG3kC@;9{NrmX2|%IB)W^6}v;j);YS@b+!}bZC!MI#}`-9G8b80
zG0E#hHnNo+UdTFAxreQ>EpaA9%CfZu#nv7gJHLP8STdW>O9!_*xh-01$=tG<Ev|WY
zTu81dj6<hUZo+odV9f5drr*Fe73U7~o9^M3;HWi1^g5*^24VoNUT1Gxrm&5YGG3kf
zg>~k-y19M0`27C*h~Hb?FLfYscAe^~;ce^YqT(t6nC`G+U3f$><na-?c|~<vzIb9n
zUNscmly%c(+su|5e!;RvCCj=NW)cLKw4kF|Ua3$|#+y<*6RvM(iaTsq7`c_gtudM6
zgeBZn43Ek4<(2ucpBftr@|R^&lgAI@D2`*Py5cfT-qGEfFX_xFzqdM^%uY>7`!{>2
zUegWMb~etm6*3Y*v?YHiPkG@+ap9&vM7$zT<}Zfz@;&lU{~U^~9h2E5({UA3Wi7s~
z(P3<?885$oF`3L>zb+lT(Nm>@-#%~9AZOXT^ETyDYx{#hn2M;VAnHTw+%!M8&N4Z=
zt*i2;uYp`z3@d0Vbrw{AW4ZL&MzNJBbe%wHna2wgDXm^798X)Gz<*PDWir3x%0WEY
zGMfdraNSA`W$V|agl=l=p7WMLGr6kbxt4!ljRjPliWLtZygHc7UcD;4myNSTL>@yQ
zhW?{)?{2(J9Hm8hJQpI&<$JK+P@I~`B80WzbC;>xQ}56?5+)4hH#7>g?9pXKN=TiI
zwIv79_$RlfJ5B3^nFJb<r$l8!Bfj4Z<Sm*%$hKv<epWVP)IBwGbHeO4Ep0dGFFJjr
z^_g^1E$Y)uKaZg3X43r9&`?&n`iR~U=@-d^(Sc-kc2;_DRp=2_$7PLPfA9kbW4*zT
z@^D`Wd2~!dyL!>dc3;$-O?HWC5Nv0`8zIdHx;x<xxnDs(z(z+=`2>)Ly670TMRS+f
z7=Aw=8{-=eACP;>XxVrFR(~=(F(KV&VuSc|G~W9M?miG}hDWhL=;1x8b(w%B3^8KQ
zVRnzW%R+n(9w)bGoU{*Fs8az$H}Awoh-JHXR!U|sT#)v>9=3d>blPt2-}Xh2^@WcB
zR@Znt_UC8KK_qlpf1<+upcRsTrEe(v+J%R=?m*#=-kt~0y7GxE{dXdr=1a^I{6AbE
z00JNY0w4eaAOHd&00JNY0w4eaN0q<`uNc<<N7cNj7YKj=2!H?xfB*=900@8p2!H?x
z_yn;34@Uq25C8!X009sH0T2KI5C8!X0D+@V0PFvwZ)4OD1V8`;KmY_l00ck)1V8`;
zKmY{z`d>Q!tpxqx0s#;J0T2KI5C8!X009sHflr0Nd){~|v6q&l-`-R%D_6A5&6i)^
znpG}czOuDBGd(%8rEb1FcV$acUe>0rT)Hy1H9a#ky?N=<rOT67wr003O<h)1ZF5qc
zoYlt0-|_gLH3zS$<FA4AUgftRGh1&s%#&X3sE^Z~$6tre-?4m~ekc40%)HACtHGSx
z{PpO8BJ}oPy`j^)-GV?r)%ilXJn4VZ>9xSO`McG1p2<6Y7=QiUa#QNKer-I{VeW)Z
zuTb@dC|>Y-J3on+r2FOz@qz%Z7Jp;!cH;dX-23*=?#=sI@ptZd84~SU-mC1MQg0aS
zMb)ZLdi?LdgO^$cuL=yAZM{6FZf;Fq*}6P+X<D0|RA(;F%}#6D^z>!zk~)3q^3*I-
zr)JdYX?1H_o4Iu9iZ(Z;PBNxUv$@ODv%aeQovlpstJtpRZLXttoc`Nr(97-En*WAn
zA7POcvvwJC^ftnEufc436}DyTJmKU=%IFlO^k0g2gBg@vbuoDLw#V1NtIA!)l$R7u
zH+IdyFrKLehWY5aQpTj~hp%dshJHTYG5W=g7#JyVrboz}w~1bklRQw${7r&>aDe~_
zfB*=900@8p2!H?xfB*=900?~U2owkCaoNXxs5Q=?ee`F3kjVT`=HKZTE)W0#5C8!X
z009sH0T2KI5C8!X0D;dxfs_3Mi5DcpqC+WFeqzLQ$1{BciF3^$Kj4@&kT@+lHTp7l
zZJh7__h<eok@;EXefot91V8`;KmY_l00ck)1V8`;KmY_l;ISbv+<$sFSm2-N?|vN6
zKic2<Frd%>`~S=@67+)$1V8`;KmY_l00ck)1V8`;KmY_l;K&geNDL&>X}<nX@b^F9
z0s#;J0T2KI5C8!X009sH0T2KI5IC{~g8ly=CNe)fvQ<RIKmY_l00ck)1V8`;KmY_l
z00cnbC=$3JrTE6aG%@ung*vl!Re5Qd?No1B_MLZf{;L64?#nr5PHe2_-VN6OKTc$R
zd=ycjP9OjRAOHd&00JNY0w4eaAOHd&@XJQv$-Y$LtdvSgQuqaneS<@M{XaPR$BE3}
zXZ|en{OEttM_eEP0w4eaAOHd&00JNY0w4eaAn>UYSQ>sJAxYDx(!&$e=@eawRHAQq
z+twZT1~VGWt}g0M!%%h$=I-<DZ?=DNS*bHYtl1RL?%Y^9l|Dz=NfOU4)lRp@w!R!L
zjoZP)LwkwjDN6a&>AmZz^i!cG$u-Mh3pGnu**m!%UE5|Z?W<SVJ$K%^m%Er#eUX#<
z^6gy3R&<jw3T)?_``X2vV(8muo!-(<2@SU8hN)H>u5Ou>_MLa%<;BQDT=%D_@D2rr
zctv@6{P)aYSM35=gLTF96l2}8-KFr;s^zqU@%R6qs!O9V5C8!X009sH0T2KI5C8!X
z009vAObGDxe_Hx(BJ=B+v+3_2zcgZv$f=*Den0vBq59xg2XZ8OK9P|AD4Wkq5AL|i
zropQIvz2P8-k`?{PWN4AVXauG6y-``zFd@Z-NKwau4{5>xl+7dT$5MVN=t>cTk_4~
zt&4Kb&zYXU<U;vk@mgV{T#+Y9YT5esHQiwRK}Sxm6yL1KE%DeG$s3C8uxplG_Y6fO
z*O;N#b(h&fq2*Dn-tsJ$@}6H=DHjXNVfMUq=BP@8sq}@3qU3(UD4}ylZ|J7(>Wbks
z6g8><Q?)eR+!keDQ=A)2(U|QBl*`}$dODe%nUTJwcABQb&E!;7%kb)E(*|8(qe3%v
zMTs*O;ihL+B~5IsKuS-Ua`N)VQgN-c5Yn7tb8~Y<lr-b14;#|mZ3qn<JYH)(6%!=X
zozVOu6K+NOhM{aSL!^sFcDHr^L7YhJnXb+jctx(+R=phLA}ZVQ>UG85UAH`2<q5>p
zwBS)@r2MY#=w#JMx$Tk3d-Po1D3^)0&FJeu)i-L)6c-)H7g<A;KEFS6JeeIElkVpQ
zE*5kJf#alOoGQ+n{A|VU(6Dum?sc8*M0r~mU0)G#B`tH2(PK~YI+2ZRWrr8C&Q$)~
zHL@QfQkJbPD7N;{*!lev$CA9)Jh<J-ZP8Lo=9blLl+C;2LUK)E96F716SkuU^E-^g
z4Qx|!?l8aU9+o+3jS#&~DT#rYqN~^0+m<P8qoj<-pJlHz*QL&^*O|t~^84!}es6WZ
z)Pcm=b*ig|x2>CtimL=*y2Flj;St4<$4BJm6*a>6;)w}))u2c5vTnL;o7r;1FId*7
zWLek3OoHH&7IZYrD;4U=cvEU;!u9P;afj^+BeznxH6~M>u!Osc;W2r>yfPnlj$>m%
z{<2JJ^7ug<#c?cES6rsaJGxu*C7n6t_g06K*{LaM|7H(WK4P|=jWcb9j6@J^$sfv7
zUbs<Qxap7QugH`6i($Qdk37^rhhl5TWOm7PT*Xvbi*I`<Z^p~tN)2V}*QJDRYV4l#
zmO(>zRq<TQzpu7Epx`&x8?+&0*}L;LWm>CF#fpdbFD8@O>(`}&H+pD^^76Yk4o)CU
zMKBaZeJIYRXK}+XQyZec*_1c^+Q_BFkex}BpMdPfa_O~=Vk=STl>q>m#|slFtqv`m
zSGAms|EBWF<XMg@2k~UfY!=+I#M01ER=N6!mWZ@L^5E6MWcKP+>Ah?m{Rj&VeHh}8
z!n(UJXd);r%Hz2ZTQ1*&@`mEnL{=b_1)sG{y{LMJhNUoJFd?ErrDcOI%TYq=v#c#S
zh{iv;HQi}iB+Mkxh`b{z6PiHytxDda>4<Dwmg{F_Ge*5#GdCy9Zqw3sgYKu(A6lPD
zC)J`Z()9BPif$&&AB+wpv$M0(gR4RlRvni$dJX6Y4#t|#kMeNig%#j){^lgKs~4SY
z_eHs2HrXYn<w83P-co2j(A^1l$o&fP0X8~{$|ry{)J4azEt<Q;#_;?3*cjh%_<-C~
zM#~`kxB8RWi3#aG6C0$b6B~#%!=qRrbjcpox=cV5h8VHu@HJUa#X2m&=iqU2i^fU&
zkcB!GFm&@yY=l_0uk;ONU%T+|?vD?gPG`602lVfqm6F*D7o<I}$239w&@%pQUxZ<N
z;Um~Z*Lb`2r+3YPBJ_BFp2KOkLh{)E|4bgcpimG10T2KI5C8!X009sH0T2KI5cpIH
z@b&-5z;_b^-yMB_G@af){&&YO99tXt^W=XIeRbgd{x_xnOk7L+T8v7mKsNLwf6noM
z9znKG2ox5|YkXHScp6x3-Jb1w&e1v}(2~Y&ciGJGH&MlVQ}hQRb=~26SM)5cb;_W%
zx4`%DX*bbS^#*Ol_w1AUX9yJ42)B?A?~Rd^wq9vFU7U40@hU%x5V0p0>c{_RL!<-W
z#EsoJ=g-Ruu50U?9zC`fWl?8!>ri-p-+b185cS|xr-3STtb%sIS_W#}J|{F#OB!b&
zKl8}lQ+AggOjT%yzgO|*KDF+w(MgA0;vAVp@W`<@y>GwBeS9Gieyqdfz8bM1yra1E
z9A67`Dbu6%9;Qu|t>)k9^zL}&4+fv{H{~A8bOI;SDQb;xlD3$4gq#s#?}!jbev9w*
z@dtlBdirR%FzV<GmvNg!rCZnECYh)?@svfeAJeY=HoL*}?HcJLO6x~>L)YAzSkCvE
z7n#9m*E1(C(utx<X{i|Qls4g0q=TnN{Y`cpO%mDfGd-Gga59_B77EgXiOv?l&rLX0
zCpc$O-O`z%HHQa*<QZX$5JZe?8SQ-{ks}7u*gluGcq02FI+qmX!Vf*N^l?x8Q2UEG
z(H3<UDF0yg3;qF&-#Qs>li)~C7v$3qw?mu-;zxxKW1pLBSLENW?i#|5>mf(CG`6L9
zh8xrWY|=3wX2(RJeJAlz#HbO0pL(Mcg#P#^stf%YtL3@tbk0yD4Qw4Hb?6{wFj9#}
zM%n^fx7CLoZsI#-6fJJ}<xwh%O@HYc7mL+5nI=A$6y=#j$00f_>V#i@Z|tdL_JtRu
zeSzn8c<j^Bo*L(&!A9`mSzpv~#291c_g;T8(A4T|W2-bEw#Iz_b5^LSFN)LjF7=<0
zy%9eiW4a1I!X_S88>B^SU*{V^oPU1r^eO)!;NDxE6{{$l^NQW<!-JbI2&)#zK62ft
z%xKN?duN^qHd=diE4i%R;!Ya)w@*ds=S$->Bqa<c#zP()ZJYew`IE`)OD}bA1XoER
zg9SZp;KS{JC!=(1CirBuTs`3*?b!c{U(u#fX^zKiQ!%R1fv1Gpb|?Jk8uMLiI=2`N
z-d9XG!OicV$t1I{ydoVe3AJx!-CNaG_{sQ+wW7t<t!5osJouAxetKTqO8Fu$sz=i3
zBsoo<L}Nr-nZq3!KOjeK|4=gQ|HnMqfCvOY00ck)1V8`;KmY_l00ck)1da*;oc}*6
zmP9>300ck)1V8`;KmY_l00ck)1VA8~0M`G}Y#;#v5C8!X009sH0T2KI5C8!X0D+@I
zfUp0h%+C|_g9`*e00ck)1V8`;KmY_l00ck)1VG@35g6(lNJvs&U$FlFAd&gth*c2P
z0Ra#I0T2KI5C8!X009sH0T2LzUwQ(mzM+Jal2Wbp|Bn)xAN|rp0RRvH0T2KI5C8!X
z009sH0T2KI5P0kfe4%eJarR8QSZ^5CE@O_Z>{R&|2Jrp={>&dFGXIwOHvPf{0w4ea
zAOHd&00JNY0w4eaAOHd&@aYjaGxQW~(4S7HrQx)HrBbPMBHicc<~Dt2`IiQL@!4Ln
z%~bm0+HjGt$paKmYG-q@nN431QM>&$zWyK1G!mJgX5P>IW9ECAzsmec=Jzt+q##@%
z00JNY0w4eaAOHd&00JNY0w4eaACbW56US&pE~V0ZJwNnBYV>61{mJC$iO%~IL!+6F
z`@u|VbhPt+G&!2?yiX5}9`CpxIG!3k)_H#{IXcpLKQhGE|A`YHu`);o0w4eaAOHd&
z00JNY0w4eaAOHd&@K_MQ`v0*o6O;r25C8!X009sH0T2KI5C8!X0D+H10PFvcg%62A
z00ck)1V8`;KmY_l00ck)1VG@iAb|D%V__yJ2?8Jh0w4eaAOHd&00JNY0w4eaABzBA
z|4W(wNYD>15C8!X009sH0T2KI5C8!X009sHfybJ_)6((8uyiV&N~e?Q^jB_AeeE}X
z8dNA)|NkP9`Nd;hK`0LbAOHd&00JNY0w4eaAOHd&00JN&BrqTiB<QOJNjBQ|r-@8q
z^u6Q%ckFkDe=>Y6buIaaL*E<x&4KUq|3m+aB*X;*pDBU8!55O*;*_*^PB%4nuexpP
zj$19buA<iJ%ygaVmTs_;MjsE$@(XLlLZv8|mKTd}%7^9cwDQWbKt3Mko!@)r`DFIy
zjI>wi(8Jkvs;h>#t(%LAt5iKxf6HUlJ8U;7s#`qXRAytj^x8(ZPTdhZ@{ujGsaAKC
z@rGY&NxLXhY5BeS`DFI&S?M6}Dw_rizXde>FxD))QkX9n<y;t^lgD+9@KlP|i)-@g
zT4|}Uc1yllyme8|)fLlIjCIR)bMo@WQgN-cATJiL6*kHhd5X==%~70XrOtA4rTAtg
z6pf8h_?l%1!`HnAv+wGTW#__DTX{}WI^ViCm_f0si@MV=l--;>UtXCHvtQmQm-Bn2
zTrxX0ChfoG*SBfd^_pTcr|afR-SzI0#ns)=%{wJcR5PpL>Xzw<M251-43R)%j%w?E
z!b9Tx{*`md><ceQ_h0I)%K|fuR#p7ZF9>Vmi{dKc=efqV#JE+<h?LpZ4kys^jZQ1s
zmPI}>zp_#;7M4THaQijL0;U_4&fRU0SBP>{Ez_lhhv-n2p2KWk$sRAu?`_D*Y(6jT
zvrcf=bi-wK3tjW>c_F-}Fb>~co$ahMm76>gR2)R=KS&!<wHmr<GU9uPVt((!*<^Nh
zR@(DA>s44NFR}V2RjsBsTGi_gJTI(ecbvG&2F8mpP)#>P-jLsW_qk+tW=1+V)1&RG
zt(&UeP(n8*McQGxC|x_E#Pm&pC-rzl(^-mjMHe<h?nzM{*0ybVjVPgRI<8`>G|C*Z
zWPb1bnPhf)TH34k)PIdRmS?MBheXv6gXE~%hcV*p<QF8+h3ZefSkex6PWgl9zL?Bj
zxF9{CiqHVj><76@p3$WtzdakN9hb&wM%}MpXR!}ar(V|`C+I#!y+9*$nM0hZZi;GL
zv+TNOC=t>H%kb)^xa@Y~RmFCA!#nIe9r{(+Jz-~L6M<EW7(@+-+{b8gV(Xip%UK;R
zrOxWsq44~^`D|dIQ=JB?*!uQ%yEkjyJ|{F#OB!b&Kl8|*jNPR^xI&$Dui|{rB@5`z
z8dJ1g;vAWU;`f!k>HRrD<nSmYLd7wY`>LpqB;k(Ysx_tsx|C^7*u%7`a@260KNx%_
znVp)F9?WzC@0?d2nrWU9V(&;2N1jH4V3yjWr;mmUqdFfh<2H#(x30e(F{tvCMX?|2
zb!D5~VET5AxQUvgAK?vMb8BL`tJm2gGnmWmvq*F7N@=MWP6e9qd8CboVJTW<to+`~
zr<2)<32Fa)rybUctL5qqKGP4Z5Z-@LXoFB3X93mHgb*#yZFp`}i)XfN*+OA{?^mDp
zU8r02*A+w86n~P~RK6qRS)uwJ5#lPa72W%p5%chv_MYeK|AEY3CNe+C{7dHh^Z^$L
zfB*=900@8p2!H?xfB*=900@A<XH4MKKr)d{r=LyxPpV(1eF=Ilc&fiMu&C*-Wjjyw
z`GKc{m<6p)kFTGQI>T0WOiIkx|A`ZyakWr92!H?xfB*=900@8p2!H?xfB*=9z$Z!o
z>;F#_FER%K5C8!X009sH0T2KI5C8!X0D;d10j&Q&7iNGGAOHd&00JNY0w4eaAOHd&
z00JQJi4ws2{}aWF%s~JIKmY_l00ck)1V8`;KmY_l;B!HMum1-#uO>48ocW8)H#1fG
zhzkTj00ck)1V8`;KmY_l00ck)1VEsNz?s2hLOOpgl^$GDY@Nwp)pr%G{RLNN>4kmL
z7>Nf~mAi^5FDaUC?3(Qe7wF}EQvO+KtpA2((6@ZZH;rBXjb;^F(M`s>la13${iLyH
zrSp9&hECr~WXtn9eT7gnZl?xg^s2w%^OS9|URUHwO{wd)Fv}5MAH4ss$Evsm0T2KI
z5C8!X009sH0T2KI5CDOrMF8vnqh(Lj1_VF=1V8`;KmY_l00ck)1V8`;L<IgH9edhw

literal 0
HcmV?d00001

diff --git a/test/nbrowser/DropdownConditionEditor.ts b/test/nbrowser/DropdownConditionEditor.ts
new file mode 100644
index 00000000..d12527b6
--- /dev/null
+++ b/test/nbrowser/DropdownConditionEditor.ts
@@ -0,0 +1,272 @@
+import {assert, driver, Key} from 'mocha-webdriver';
+import * as gu from 'test/nbrowser/gristUtils';
+import {setupTestSuite} from 'test/nbrowser/testUtils';
+
+describe('DropdownConditionEditor', function () {
+  this.timeout(20000);
+  const cleanup = setupTestSuite();
+
+  before(async () => {
+    const session = await gu.session().login();
+    await session.tempDoc(cleanup, 'DropdownCondition.grist');
+    await gu.openColumnPanel();
+  });
+
+  afterEach(() => gu.checkForErrors());
+
+  describe(`in choice columns`, function() {
+    it('creates dropdown conditions', async function() {
+      await gu.getCell(1, 1).click();
+      assert.isFalse(await driver.find('.test-field-dropdown-condition').isPresent());
+      await driver.find('.test-field-set-dropdown-condition').click();
+      await gu.sendKeys('c');
+      await gu.waitToPass(async () => {
+        const completions = await driver.findAll('.ace_autocomplete .ace_line', el => el.getText());
+        assert.deepEqual(completions, [
+          'c\nhoice\n ',
+          're\nc\n.Name\n ',
+          're\nc\n.Role\n ',
+          're\nc\n.Supervisor\n ',
+        ]);
+      });
+      await gu.sendKeys('hoice not in $');
+      await gu.waitToPass(async () => {
+        const completions = await driver.findAll('.ace_autocomplete .ace_line', el => el.getText());
+        assert.deepEqual(completions, [
+          '$\nName\n ',
+          '$\nRole\n ',
+          '$\nSupervisor\n ',
+        ]);
+      });
+      await gu.sendKeys('Role', Key.ENTER);
+      await gu.waitForServer();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition').getText(),
+        'choice not in $Role'
+      );
+
+      // Check that autocomplete values are filtered.
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Supervisor',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+      await gu.getCell(1, 4).click();
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Trainee',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+      await gu.getCell(1, 6).click();
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Trainee',
+        'Supervisor',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Change the column type to Choice List and check values are still filtered.
+      await gu.setType('Choice List', {apply: true});
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition').getText(),
+        'choice not in $Role'
+      );
+      await gu.getCell(1, 4).click();
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Trainee',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+    });
+
+    it('removes dropdown conditions', async function() {
+      await driver.find('.test-field-dropdown-condition').click();
+      await gu.sendKeys(await gu.selectAllKey(), Key.DELETE, Key.ENTER);
+      await gu.waitForServer();
+
+      // Check that autocomplete values are no longer filtered.
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Trainee',
+        'Supervisor',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Change the column type back to Choice and check values are still no longer filtered.
+      await gu.setType('Choice', {apply: true});
+      assert.isFalse(await driver.find('.test-field-dropdown-condition').isPresent());
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Supervisor',
+        'Trainee',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+    });
+
+    it('reports errors', async function() {
+      // Check syntax errors are reported, but not saved.
+      await driver.find('.test-field-set-dropdown-condition').click();
+      await gu.sendKeys('!@#$%^', Key.ENTER);
+      await gu.waitForServer();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition-error').getText(),
+        'SyntaxError invalid syntax on line 1 col 1'
+      );
+      await gu.reloadDoc();
+      assert.isFalse(await driver.find('.test-field-dropdown-condition-error').isPresent());
+
+      // Check compilation errors are reported and saved.
+      await driver.find('.test-field-set-dropdown-condition').click();
+      await gu.sendKeys('foo', Key.ENTER);
+      await gu.waitForServer();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition-error').getText(),
+        "Unknown variable 'foo'"
+      );
+      await gu.reloadDoc();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition-error').getText(),
+        "Unknown variable 'foo'"
+      );
+
+      // Check that the autocomplete dropdown also reports an error.
+      await gu.sendKeys(Key.ENTER);
+      assert.equal(
+        await driver.find('.test-autocomplete-no-items-message').getText(),
+        'Error in dropdown condition'
+      );
+      await gu.sendKeys(Key.ESCAPE);
+    });
+  });
+
+  describe(`in reference columns`, function() {
+    it('creates dropdown conditions', async function() {
+      await gu.getCell(2, 1).click();
+      assert.isFalse(await driver.find('.test-field-dropdown-condition').isPresent());
+      await driver.find('.test-field-set-dropdown-condition').click();
+      await gu.sendKeys('choice');
+      await gu.waitToPass(async () => {
+        const completions = await driver.findAll('.ace_autocomplete .ace_line', el => el.getText());
+        assert.deepEqual(completions, [
+          'choice\n ',
+          'choice\n.id\n ',
+          'choice\n.Name\n ',
+          'choice\n.Role\n ',
+          'choice\n.Supervisor\n '
+        ]);
+      });
+      await gu.sendKeys('.Role == "Supervisor" and $Role != "Supervisor"', Key.ENTER);
+      await gu.waitForServer();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition .ace_line').getAttribute('textContent'),
+        'choice.Role == "Supervisor" and $Role != "Supervisor"\n'
+      );
+
+      // Check that autocomplete values are filtered.
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Pavan Madilyn',
+        'Marie Ziyad',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+      await gu.getCell(2, 4).click();
+      await gu.sendKeys(Key.ENTER);
+      assert.isEmpty(await driver.findAll('.test-autocomplete li', (el) => el.getText()));
+      await gu.sendKeys(Key.ESCAPE);
+      await gu.getCell(2, 6).click();
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Marie Ziyad',
+        'Pavan Madilyn',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Change the column type to Reference List and check values are still filtered.
+      await gu.setType('Reference List', {apply: true});
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition .ace_line').getAttribute('textContent'),
+        'choice.Role == "Supervisor" and $Role != "Supervisor"\n'
+      );
+      await gu.getCell(2, 4).click();
+      await gu.sendKeys(Key.ENTER);
+      assert.isEmpty(await driver.findAll('.test-autocomplete li', (el) => el.getText()));
+      await gu.sendKeys(Key.ESCAPE);
+    });
+
+    it('removes dropdown conditions', async function() {
+      await driver.find('.test-field-dropdown-condition').click();
+      await gu.sendKeys(await gu.selectAllKey(), Key.DELETE, Key.ENTER);
+      await gu.waitForServer();
+
+      // Check that autocomplete values are no longer filtered.
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Emma Thamir',
+        'Holger Klyment',
+        'Marie Ziyad',
+        'Olivier Bipin',
+        'Pavan Madilyn',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Change the column type back to Reference and check values are still no longer filtered.
+      await gu.setType('Reference', {apply: true});
+      assert.isFalse(await driver.find('.test-field-dropdown-condition').isPresent());
+      await gu.sendKeys(Key.ENTER);
+      assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
+        'Emma Thamir',
+        'Holger Klyment',
+        'Marie Ziyad',
+        'Olivier Bipin',
+        'Pavan Madilyn',
+      ]);
+      await gu.sendKeys(Key.ESCAPE);
+    });
+
+    it('reports errors', async function() {
+      // Check syntax errors are reported, but not saved.
+      await driver.find('.test-field-set-dropdown-condition').click();
+      await gu.sendKeys('!@#$%^', Key.ENTER);
+      await gu.waitForServer();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition-error').getText(),
+        'SyntaxError invalid syntax on line 1 col 1'
+      );
+      await gu.reloadDoc();
+      assert.isFalse(await driver.find('.test-field-dropdown-condition-error').isPresent());
+
+      // Check compilation errors are reported and saved.
+      await driver.find('.test-field-set-dropdown-condition').click();
+      await gu.sendKeys('foo', Key.ENTER);
+      await gu.waitForServer();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition-error').getText(),
+        "Unknown variable 'foo'"
+      );
+      await gu.reloadDoc();
+      assert.equal(
+        await driver.find('.test-field-dropdown-condition-error').getText(),
+        "Unknown variable 'foo'"
+      );
+
+      // Check that the autocomplete dropdown also reports an error.
+      await gu.sendKeys(Key.ENTER);
+      assert.equal(
+        await driver.find('.test-autocomplete-no-items-message').getText(),
+        'Error in dropdown condition'
+      );
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Check evaluation errors are also reported in the dropdown.
+      await driver.find('.test-field-dropdown-condition').click();
+      await gu.sendKeys(await gu.selectAllKey(), Key.DELETE, '[] not in 5', Key.ENTER);
+      await gu.waitForServer();
+      await gu.sendKeys(Key.ENTER);
+      assert.equal(
+        await driver.find('.test-autocomplete-no-items-message').getText(),
+        'Error in dropdown condition'
+      );
+      await gu.sendKeys(Key.ESCAPE);
+    });
+  });
+});
diff --git a/test/nbrowser/Importer.ts b/test/nbrowser/Importer.ts
new file mode 100644
index 00000000..daf9c275
--- /dev/null
+++ b/test/nbrowser/Importer.ts
@@ -0,0 +1,1008 @@
+/**
+ * Test of the Importer dialog (part 1), for imports inside an open doc.
+ * (See Import.ts for tests from the DocMenu page.)
+ */
+import {assert, driver, Key} from 'mocha-webdriver';
+import * as gu from 'test/nbrowser/gristUtils';
+import {getColumnMatchingRows, getParseOptionInput, getPreviewDiffCellValues,
+        openTableMapping, waitForColumnMapping, waitForDiffPreviewToLoad} from 'test/nbrowser/importerTestUtils';
+import {setupTestSuite} from 'test/nbrowser/testUtils';
+
+describe('Importer', function() {
+  this.timeout(70000); // Imports can take some time, especially in tests that import larger files.
+  const cleanup = setupTestSuite();
+
+  let docUrl: string|undefined;
+
+  beforeEach(async function() {
+    // Log in and import a sample document. If this is already done, we can skip these tests, to
+    // have tests go faster. Each successful test case should leave the document unchanged.
+    if (!docUrl || !await gu.testCurrentUrl(docUrl)) {
+      const session = await gu.session().teamSite.login();
+      await session.tempDoc(cleanup, 'Hello.grist');
+      docUrl = await driver.getCurrentUrl();
+    }
+  });
+
+  afterEach(() => gu.checkForErrors());
+
+  it('should show correct preview', async function() {
+    await gu.importFileDialog('./uploads/UploadedData1.csv');
+    assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+    assert.lengthOf(await driver.findAll('.test-importer-source'), 1);
+
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2], [1, 2, 3]),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor' ]);
+
+    // Check that the preview table cannot be edited by double-clicking a cell or via keyboard.
+    const cell = await (await gu.getPreviewCell(0, 1)).doClick();
+    await driver.withActions(a => a.doubleClick(cell));
+    assert(await driver.find(".default_editor.readonly_editor").isPresent());
+    await gu.sendKeys(Key.ESCAPE);
+    assert.isFalse(await driver.find(".default_editor.readonly_editor").isPresent());
+    await gu.sendKeys(Key.DELETE);
+    await gu.waitForServer();
+    assert.equal(await cell.getText(), 'Lily');
+
+    // Check that the column matching section is not shown for new tables.
+    assert.isFalse(await driver.find('.test-importer-column-match-options').isPresent());
+
+    // Check that the preview table doesn't show formula icons in cells.
+    assert.isFalse(await cell.find('.formula_field').isPresent());
+
+    // Check that we have "Import Options" link and click it.
+    assert.equal(await driver.find('.test-importer-options-link').isPresent(), true);
+    await driver.find('.test-importer-options-link').click();
+
+    // Check that initially we see a button "Close" (nothing to update)
+    assert.equal(await driver.findWait('.test-parseopts-back', 500).getText(), 'Close');
+    assert.equal(await driver.find('.test-parseopts-update').isPresent(), false);
+
+    // After a change to parse options, button should change to 'Update Preview'
+    await getParseOptionInput(/Field separator/).doClear().sendKeys("|");
+    assert.equal(await driver.findWait('.test-parseopts-update', 500).getText(), 'Update preview');
+    assert.equal(await driver.find('.test-parseopts-back').isPresent(), false);
+
+    // Changing the parse option back to initial state reverts the button back too.
+    await getParseOptionInput(/Field separator/).doClear().sendKeys(",");
+    assert.equal(await driver.findWait('.test-parseopts-back', 500).getText(), 'Close');
+    assert.equal(await driver.find('.test-parseopts-update').isPresent(), false);
+
+    // ensure that option 'First row contains headers' is checked if headers were guessed
+    let useHeaders = await getParseOptionInput(/First row/);
+    assert.equal(await useHeaders.getAttribute('checked'), 'true');
+
+    // Uncheck the option and update the preview.
+    await useHeaders.click();
+    assert.equal(await useHeaders.getAttribute('checked'), null);
+    await driver.find('.test-parseopts-update').click();
+    await gu.waitForServer();
+
+    // Ensure that column names become the first row in preview data.
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2], [1, 2, 3, 4]),
+      [ 'Name', 'Phone', 'Title',
+        'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor' ]);
+
+    // Check the option again and update the preview.
+    await driver.find('.test-importer-options-link').click();
+    useHeaders = await getParseOptionInput(/First row/);
+    assert.equal(await useHeaders.getAttribute('checked'), null);
+    await useHeaders.click();
+    await driver.find('.test-parseopts-update').click();
+    await gu.waitForServer();
+
+    // Ensure that column names are used as headers again.
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2], [1, 2, 3]),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor' ]);
+
+    // Right-click a column header, to ensure we don't get a JS error in this case.
+    const colHeader = await driver.findContent('.test-importer-preview .column_name', /Name/);
+    await driver.withActions(actions => actions.contextClick(colHeader));
+    await gu.checkForErrors();
+
+    // Change Field separator and update the preview.
+    await driver.find('.test-importer-options-link').click();
+    await getParseOptionInput(/Field separator/).doClick().sendKeys("|");
+    assert.equal(await getParseOptionInput(/Field separator/).value(), "|");
+    assert.equal(await getParseOptionInput(/Line terminator/).value(), "\\n");
+    await driver.find('.test-parseopts-update').click();
+    await gu.waitForServer();
+
+    assert.deepEqual(await gu.getPreviewContents([0], [1, 2, 3]),
+      [ 'Lily,Jones,director',
+        'Kathy,Mills,student',
+        'Karen,Gold,professor' ]);
+
+    // Close the dialog.
+    await driver.find('.test-modal-cancel').click();
+    await gu.waitForServer();
+    assert.equal(await driver.find('.test-importer-dialog').isPresent(), false);
+
+    // No new pages should be present.
+    assert.deepEqual(await gu.getPageNames(), ['Table1']);
+  });
+
+  it('should show correct preview for multiple tables', async function() {
+    await gu.importFileDialog('./uploads/UploadedData1.csv,./uploads/UploadedData2.csv');
+    assert.equal(await driver.findWait('.test-importer-preview', 8000).isPresent(), true);
+    assert.lengthOf(await driver.findAll('.test-importer-source'), 2);
+    assert.equal(await driver.find('.test-importer-source-selected .test-importer-from').getText(),
+      'UploadedData1.csv');
+
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2], [1, 2, 3]),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor' ]);
+
+    // Select another table
+    await driver.findContent('.test-importer-from', /UploadedData2/).click();
+    await gu.waitForServer();
+    assert.equal(await driver.find('.test-importer-source-selected .test-importer-from').getText(),
+      'UploadedData2.csv');
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6]),
+      [ 'BUS100',      'Intro to Business',   '',                    '01/13/2021',      '',
+        'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+        'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+        'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+        'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+        'BUS540',      'Capstone',            '',                    '01/13/2021',      '' ]);
+
+    // Check that changing a parse option (Field Separator to "|") affects both tables.
+    await driver.find('.test-importer-options-link').click();
+    await getParseOptionInput(/Field separator/).doClick().sendKeys("|");
+    await driver.find('.test-parseopts-update').click();
+    await gu.waitForServer();
+
+    assert.deepEqual(await gu.getPreviewContents([0], [1, 2, 3]),
+      [ 'Lily,Jones,director',
+        'Kathy,Mills,student',
+        'Karen,Gold,professor' ]);
+
+    await driver.findContent('.test-importer-from', /UploadedData2/).click();
+    await gu.waitForServer();
+    assert.deepEqual(await gu.getPreviewContents([0], [1, 2, 3, 4, 5, 6]),
+      [ 'BUS100,Intro to Business,,01/13/2021,false',
+        'BUS102,Business Law,Nathalie Patricia,01/13/2021,false',
+        'BUS300,Business Operations,Michael Rian,01/14/2021,false',
+        'BUS301,History of Business,Mariyam Melania,01/14/2021,false',
+        'BUS500,Ethics and Law,Filip Andries,01/13/2021,false',
+        'BUS540,Capstone,,01/13/2021,true' ]);
+
+    // Close the dialog.
+    await driver.find('.test-modal-cancel').click();
+    await gu.waitForServer();
+    assert.equal(await driver.find('.test-importer-dialog').isPresent(), false);
+  });
+
+  it('should not show preview for single empty file', async function() {
+    await gu.importFileDialog('./uploads/UploadedDataEmpty.csv');
+    assert.match(await driver.findWait('.test-importer-error', 1000).getText(),
+      /Import failed: No data was imported/);
+
+    await driver.find('.test-modal-cancel').click();
+    await gu.waitForServer();
+  });
+
+  it('should not show preview for empty file when importing with non empty files', async function() {
+    await gu.importFileDialog(
+      './uploads/UploadedData1.csv,./uploads/UploadedData2.csv,./uploads/UploadedDataEmpty.csv');
+
+    assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+    // Ensure that there are no empty tables shown.
+    assert.deepEqual(await driver.findAll('.test-importer-from', (el) => el.getText()),
+      ['UploadedData1.csv', 'UploadedData2.csv']);
+
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2], [1, 2, 3]),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor' ]);
+
+    await driver.findContent('.test-importer-from', /UploadedData2/).click();
+    await gu.waitForServer();
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6]),
+      [ 'BUS100',      'Intro to Business',   '',                    '01/13/2021',      '',
+        'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+        'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+        'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+        'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+        'BUS540',      'Capstone',            '',                    '01/13/2021',      '' ]);
+
+    await driver.find('.test-modal-cancel').click();
+    await gu.waitForServer();
+  });
+
+  it('should finish import into an existing table', async function() {
+    // First import the file into a new table, which is the default import action.
+    await gu.importFileDialog('./uploads/UploadedData1.csv');
+    assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitForServer();
+
+    assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4], cols: [0, 1, 2] }),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor',
+        '', '', '']);
+    assert.deepEqual(await gu.getPageNames(), ['Table1', 'UploadedData1']);
+
+    // Now import the same file again, choosing the same table as the first time.
+    await gu.importFileDialog('./uploads/UploadedData1.csv');
+    assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+    await driver.findContent('.test-importer-target-existing-table', /UploadedData1/).click();
+    await gu.waitForServer();
+
+    // The preview content should be the same, since all columns match.
+    assert.deepEqual(await gu.getPreviewContents([0, 1, 2], [1, 2, 3]),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor' ]);
+
+    await waitForColumnMapping();
+    assert.deepEqual(await getColumnMatchingRows(), [
+      { destination: 'Name', source: 'Name' },
+      { destination: 'Phone', source: 'Phone' },
+      { destination: 'Title', source: 'Title' },
+    ]);
+
+    // Complete this second import.
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitForServer();
+
+    assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4, 5, 6, 7], cols: [0, 1, 2] }),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor',
+        'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor',
+        '', '', '']);
+    assert.deepEqual(await gu.getPageNames(), ['Table1', 'UploadedData1']);
+
+    // Undo the import
+    await gu.undo(2);
+
+    // Ensure that imported table is removed, and we are back to the original one.
+    assert.deepEqual(await gu.getPageNames(), ['Table1']);
+    assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1], cols: [0, 1, 2] }),
+      [ 'hello', '', '']);
+  });
+
+  it('should finish import multiple files', async function() {
+    // Import two files together.
+    await gu.importFileDialog('./uploads/UploadedData1.csv,./uploads/UploadedData2.csv');
+    await driver.findWait('.test-modal-confirm', 2000).click();
+    await gu.waitForServer();
+
+    assert.deepEqual(await gu.getPageNames(), ['Table1', 'UploadedData1', 'UploadedData2']);
+    assert.deepEqual(await gu.getVisibleGridCells({cols: [0, 1, 2], rowNums: [1, 2, 3]}),
+      [ 'Lily', 'Jones', 'director',
+        'Kathy', 'Mills', 'student',
+        'Karen', 'Gold', 'professor' ]);
+
+    await gu.getPageItem('UploadedData2').click();
+    await gu.waitForServer();
+    assert.deepEqual(await gu.getVisibleGridCells({cols: [0, 1, 2, 3, 4], rowNums: [1, 2, 3, 4, 5, 6]}),
+    [ 'BUS100',      'Intro to Business',   '',                    '01/13/2021',      '',
+      'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+      'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+      'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+      'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+      'BUS540',      'Capstone',            '',                    '01/13/2021',      '' ]);
+
+    // Undo and check that we are back to the original state.
+    await gu.undo();
+    assert.deepEqual(await gu.getPageNames(), ['Table1']);
+    assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1], cols: [0, 1, 2] }),
+      [ 'hello', '', '']);
+  });
+
+  it('should import empty dates', async function() {
+    await gu.importFileDialog('./uploads/EmptyDate.csv');
+    assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+    // Finish import and check that the dialog gets closed.
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitForServer();
+    assert.equal(await driver.find('.test-importer-dialog').isPresent(), false);
+
+    assert.deepEqual(await gu.getVisibleGridCells({rowNums: [1, 2, 3], cols: [0, 1]}),
+      [ "Bob", "2018-01-01",
+        "Alice", "",
+        "Carol", "2017-01-01" ]);
+
+    assert.deepEqual(await gu.getPageNames(), ['Table1', 'EmptyDate']);
+
+    // Add a new column, with a formula to examine the first.
+    await gu.openColumnMenu('Birthday', 'Insert column to the right');
+    await driver.find('.test-new-columns-menu-add-new').click();
+    await gu.waitForServer();
+    await driver.sendKeys(Key.ESCAPE);
+    await gu.getCell({col: 2, rowNum: 1}).click();
+    await driver.sendKeys('=type($Birthday).__name__', Key.ENTER);
+    await gu.waitForServer();
+    // Ensure that there is no ValueError in second row
+    assert.deepEqual(await gu.getVisibleGridCells({rowNums: [1, 2, 3], cols: [0, 1, 2]}),
+      [ "Bob",    "2018-01-01",   "date",
+        "Alice",  "",             "NoneType",
+        "Carol",  "2017-01-01",   "date" ]);
+  });
+
+  it('should finish import xlsx file', async function() {
+    await gu.importFileDialog('./uploads/homicide_rates.xlsx');
+    assert.equal(await driver.findWait('.test-importer-preview', 5000).isPresent(), true);
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitForServer(5000);
+    assert.equal(await driver.find('.test-importer-dialog').isPresent(), false);
+    // Look at a small subset of the imported table.
+    assert.deepEqual(await gu.getVisibleGridCells({rowNums: [1, 2, 3], cols: [0, 1, 2]}),
+                     [ 'Africa', 'Eastern Africa', 'Burundi',
+                       'Africa', 'Eastern Africa', 'Burundi',
+                       'Africa', 'Eastern Africa', 'Comoros']);
+  });
+
+  it('should import correctly in prefork mode', async function() {
+    await driver.get(`${docUrl}/m/fork`);
+    await gu.waitForDocToLoad();
+
+    await gu.importFileDialog('./uploads/homicide_rates.xlsx');
+    assert.equal(await driver.findWait('.test-importer-preview', 5000).isPresent(), true);
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitForServer(5000);
+    assert.equal(await driver.find('.test-importer-dialog').isPresent(), false);
+    // Look at a small subset of the imported table.
+    assert.deepEqual(await gu.getVisibleGridCells({rowNums: [1, 2, 3], cols: [0, 1, 2]}),
+                     [ 'Africa', 'Eastern Africa', 'Burundi',
+                       'Africa', 'Eastern Africa', 'Burundi',
+                       'Africa', 'Eastern Africa', 'Comoros']);
+    await driver.get(`${docUrl}`);
+    await gu.acceptAlert();
+    await gu.waitForDocToLoad();
+  });
+
+  it('should support importing into on-demand tables', async function() {
+    // Mark EmptyDate as on-demand.
+    await gu.getPageItem('EmptyDate').click();
+    await gu.waitForServer();
+    await gu.toggleSidePanel('right', 'open');
+    await driver.find('.test-config-data').click();
+    await driver.find('[data-test-id=ViewConfig_advanced').click();
+    await driver.find('[data-test-id=ViewConfig_onDemandBtn').click();
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitForServer();
+    await gu.waitForDocToLoad();
+
+    // Import EmptyDate.csv into EmptyDate and check the import was successful.
+    await gu.importFileDialog('./uploads/EmptyDate.csv');
+    assert.equal(await driver.findWait('.test-importer-preview', 5000).isPresent(), true);
+    await driver.findContent('.test-importer-target-existing-table', /EmptyDate/).click();
+    await gu.waitForServer();
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitForServer(5000);
+    assert.equal(await driver.find('.test-importer-dialog').isPresent(), false);
+
+    // Check that the imported file contents were added to the end of EmptyDate.
+    assert.deepEqual(await gu.getVisibleGridCells({rowNums: [4, 5, 6], cols: [0, 1]}),
+      [ "Bob", "2018-01-01",
+        "Alice", "",
+        "Carol", "2017-01-01" ]);
+    assert.equal(await gu.getGridRowCount(), 7);
+  });
+
+  describe('when updating existing records', async function() {
+    it('should populate merge columns/fields menu with columns from preview', async function() {
+      // First import a file into a new table, so that we have a base for merging.
+      await gu.importFileDialog('./uploads/UploadedData1.csv');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+
+      // Now import the same file again.
+      await gu.importFileDialog('./uploads/UploadedData1.csv');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+      // Check that the 'Update existing records' checkbox is not visible (since destination is 'New Table').
+      assert.isNotTrue(await driver.find('.test-importer-update-existing-records').isPresent());
+      assert.isNotTrue(await driver.find('.test-importer-merge-fields-select').isPresent());
+      assert.isNotTrue(await driver.find('.test-importer-merge-fields-message').isPresent());
+
+      // Change the destination to the table we created earlier ('UploadedData1').
+      await driver.findContent('.test-importer-target-existing-table', /UploadedData1/).click();
+      await gu.waitForServer();
+
+      // Check that the 'Update existing records' checkbox is now visible and unchecked.
+      assert(await driver.find('.test-importer-update-existing-records').isPresent());
+      assert.isNotTrue(await driver.find('.test-importer-merge-fields-select').isPresent());
+      assert.isNotTrue(await driver.find('.test-importer-merge-fields-message').isPresent());
+
+      // Click 'Update existing records' and verify that additional merge options are shown.
+      await waitForColumnMapping();
+      await driver.find('.test-importer-update-existing-records').click();
+      assert.equal(
+        await driver.find('.test-importer-merge-fields-message').getText(),
+        'Merge rows that match these fields:'
+      );
+      assert.equal(
+        await driver.find('.test-importer-merge-fields-select').getText(),
+        'Select fields to match on'
+      );
+
+      // Open the field select menu and check that all the preview table columns are available options.
+      await driver.find('.test-importer-merge-fields-select').click();
+      assert.deepEqual(
+        await driver.findAll('.test-multi-select-menu .test-multi-select-menu-option-text', e => e.getText()),
+        ['Name', 'Phone', 'Title']
+      );
+
+      // Close the field select menu.
+      await gu.sendKeys(Key.ESCAPE);
+    });
+
+    it('should display an error when clicking Import with no merge fields selected', async function() {
+      // No merge fields are currently selected. Click Import and check that nothing happened.
+      await driver.find('.test-modal-confirm').click();
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+      // Check that the merge field select button has a red outline.
+      assert.equal(
+        await driver.find('.test-importer-merge-fields-select').getCssValue('border'),
+        '1px solid rgb(208, 2, 27)'
+      );
+
+      // Select a merge field, and check that the red outline is gone.
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Name/
+      ).click();
+      assert.equal(
+        await driver.find('.test-importer-merge-fields-select').getCssValue('border'),
+        '1px solid rgb(217, 217, 217)'
+      );
+      // Hide dropdown
+      await gu.sendKeys(Key.ESCAPE);
+
+      await gu.checkForErrors();
+    });
+
+
+    it('should not throw an error when a column in the preview is clicked', async function() {
+      // A bug was previosuly causing an error to be thrown whenever a column header was
+      // clicked while merge columns were set.
+      await driver.findContent('.test-importer-preview .column_name', /Name/).click();
+      await gu.checkForErrors();
+    });
+
+    it('should merge fields of matching records when Import is clicked', async function() {
+      // The 'Name' field is selected as the only merge field. Click Import.
+      assert.equal(await driver.find('.test-importer-merge-fields-select').getText(), 'Name');
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+
+      // Check that the destination table is unchanged since we imported the same file.
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4], cols: [0, 1, 2] }),
+        [ 'Lily', 'Jones', 'director',
+          'Kathy', 'Mills', 'student',
+          'Karen', 'Gold', 'professor',
+          '', '', ''
+        ]
+      );
+
+      // Undo the import, and check that the destination table is still unchanged.
+      await gu.undo();
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4], cols: [0, 1, 2] }),
+        [ 'Lily', 'Jones', 'director',
+          'Kathy', 'Mills', 'student',
+          'Karen', 'Gold', 'professor',
+          '', '', ''
+        ]
+      );
+
+      // Import from another file containing some duplicates (with new values).
+      await gu.importFileDialog('./uploads/UploadedData1Extended.csv');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+      await driver.findContent('.test-importer-target-existing-table', /UploadedData1/).click();
+      await gu.waitForServer();
+
+      // Set the merge fields to 'Name' and 'Phone'.
+      await waitForColumnMapping();
+      await driver.find('.test-importer-update-existing-records').click();
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Name/
+      ).click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Phone/
+      ).click();
+
+      // Close the merge fields menu.
+      await gu.sendKeys(Key.ESCAPE);
+      assert.equal(await driver.find('.test-importer-merge-fields-select').getText(), 'Name, Phone');
+
+      // Check the preview shows a diff of the changes importing will make.
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2], [1, 2, 3, 4, 5, 6]),
+        [ 'Lily', 'Jones', ['director', 'student', undefined],
+          'Kathy', 'Mills', ['student', 'professor', undefined],
+          'Karen', 'Gold', ['professor', 'director', undefined],
+          [undefined, 'Michael', undefined], [undefined, 'Smith', undefined], [undefined, 'student', undefined],
+          [undefined, 'Lily', undefined], [undefined, 'James', undefined], [undefined, 'student', undefined],
+          '', '', '',
+        ]
+      );
+
+      // Complete the import, and verify that incoming data was merged into matching records in UploadedData1.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4, 5, 6], cols: [0, 1, 2] }),
+        [ 'Lily', 'Jones', 'student',
+          'Kathy', 'Mills', 'professor',
+          'Karen', 'Gold', 'director',
+          'Michael', 'Smith', 'student',
+          'Lily', 'James', 'student',
+          '', '', ''
+        ]
+      );
+
+      // Undo the import, and check the table is back to how it was pre-import.
+      await gu.undo();
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4], cols: [0, 1, 2] }),
+        [ 'Lily', 'Jones', 'director',
+          'Kathy', 'Mills', 'student',
+          'Karen', 'Gold', 'professor',
+          '', '', ''
+        ]
+      );
+    });
+
+    it('should support merging multiple CSV files into multiple tables', async function() {
+      // Import a second table, so we have 2 destinations to incrementally import into.
+      await gu.importFileDialog('./uploads/UploadedData2.csv');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+
+      // Now import new versions of both files together.
+      await gu.importFileDialog('./uploads/UploadedData1Extended.csv,./uploads/UploadedData2Extended.csv');
+
+      // For UploadedData1Extended.csv, check 'Update existing records', but don't pick any merge fields yet.
+      await driver.findContent('.test-importer-target-existing-table', /UploadedData1/).click();
+
+      await gu.waitForServer();
+      await waitForColumnMapping();
+      await driver.find('.test-importer-update-existing-records').click();
+
+      // Try to click on UploadedData2.csv.
+      await driver.findContent('.test-importer-source', /UploadedData2Extended.csv/).click();
+
+      // Check that it failed, and that the merge fields select button is outlined in red.
+      assert.equal(
+        await driver.find('.test-importer-merge-fields-select').getCssValue('border'),
+        '1px solid rgb(208, 2, 27)'
+      );
+      assert.equal(
+        await driver.find('.test-importer-source-selected .test-importer-from').getText(),
+        'UploadedData1Extended.csv'
+      );
+
+      // Now pick the merge fields, and check that the preview diff looks correct.
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Name/
+      ).click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Phone/
+      ).click();
+      await gu.sendKeys(Key.ESCAPE);
+
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2], [1, 2, 3, 4, 5, 6]),
+        [ 'Lily', 'Jones', ['director', 'student', undefined],
+          'Kathy', 'Mills', ['student', 'professor', undefined],
+          'Karen', 'Gold', ['professor', 'director', undefined],
+          [undefined, 'Michael', undefined], [undefined, 'Smith', undefined], [undefined, 'student', undefined],
+          [undefined, 'Lily', undefined], [undefined, 'James', undefined], [undefined, 'student', undefined],
+          '', '', '',
+        ]
+      );
+
+      // Check that clicking UploadedData2 now works.
+      await driver.findContent('.test-importer-source', /UploadedData2Extended.csv/).click();
+      await gu.waitForServer();
+      await driver.findContent('.test-importer-target-existing-table', /UploadedData2/).click();
+      await gu.waitForServer();
+      assert.equal(
+        await driver.find('.test-importer-source-selected .test-importer-from').getText(),
+        'UploadedData2Extended.csv'
+      );
+
+      // Set the merge fields for UploadedData2 to 'CourseId'.
+      await waitForColumnMapping();
+      await driver.find('.test-importer-update-existing-records').click();
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /CourseId/
+      ).click();
+
+      // Close the merge fields menu.
+      await gu.sendKeys(Key.ESCAPE);
+
+      assert.equal(await driver.find('.test-importer-merge-fields-select').getText(), 'CourseId');
+
+      // Check that the preview diff looks correct for UploadedData2.
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6, 7, 8, 9]),
+        [ 'BUS100',      'Intro to Business',   [undefined, 'Mariyam Melania', undefined], '01/13/2021', '',
+          'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',       '',
+          'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',       '',
+          'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',       '',
+          'BUS500',      [undefined, undefined, 'Ethics and Law'],     'Filip Andries',    '01/13/2021', '',
+          [undefined, 'BUS501', undefined], [undefined, 'Marketing', undefined], [undefined, 'Michael Rian', undefined],
+            [undefined, '01/13/2021', undefined], [undefined, 'false', undefined],
+          [undefined, 'BUS539', undefined], [undefined, 'Independent Study', undefined],   '',
+            [undefined, '01/13/2021', undefined], [undefined, 'true', undefined],
+          'BUS540',      'Capstone',            '',                    '01/13/2021',      ['true', 'false', undefined],
+          '', '', '', '', ''
+        ]
+      );
+
+      // Complete the import, and verify that incoming data was merged into both UploadedData1 and UploadedData2.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getPageNames(), [
+        'Table1',
+        'EmptyDate',
+        'Homicide counts and rates (2000',
+        'Sheet1',
+        'UploadedData1',
+        'UploadedData2'
+      ]);
+
+      // Check the contents of UploadedData1.
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4, 5, 6], cols: [0, 1, 2] }),
+        [ 'Lily', 'Jones', 'student',
+          'Kathy', 'Mills', 'professor',
+          'Karen', 'Gold', 'director',
+          'Michael', 'Smith', 'student',
+          'Lily', 'James', 'student',
+          '', '', ''
+        ]
+      );
+
+      // Check the contents of UploadedData2.
+      await gu.getPageItem('UploadedData2').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getVisibleGridCells({cols: [0, 1, 2, 3, 4], rowNums: [1, 2, 3, 4, 5, 6, 7, 8, 9]}),
+        [ 'BUS100',      'Intro to Business',   'Mariyam Melania',     '01/13/2021',      '',
+          'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+          'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+          'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+          'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+          'BUS540',      'Capstone',            '',                    '01/13/2021',      '',
+          'BUS501',      'Marketing',           'Michael Rian',        '01/13/2021',      '',
+          'BUS539',      'Independent Study',   '',                    '01/13/2021',      '',
+          '',            '',                    '',                    '',                '' ]);
+    });
+
+    it('should support merging multiple Excel sheets into multiple tables', async function() {
+      this.timeout(90000);
+
+      // Import an Excel file with multiple sheets into new tables.
+      await gu.importFileDialog('./uploads/World-v0.xlsx');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+
+      // Now import a new version of the Excel file with updated data.
+      await gu.importFileDialog('./uploads/World-v1.xlsx');
+
+      // For sheet Table1, don't pick any merge fields and import into the existing table (Table1_2).
+      await driver.findContent('.test-importer-target-existing-table', /Table1_2/).click();
+
+      await gu.waitForServer();
+
+      // For sheet City, merge on Name, District and Country.
+      await driver.findContent('.test-importer-source', /City/).click();
+      await gu.waitForServer();
+      await driver.findContent('.test-importer-target-existing-table', /City/).click();
+      await gu.waitForServer();
+      await waitForColumnMapping();
+      await driver.find('.test-importer-update-existing-records').click();
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Name/
+      ).click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /District/
+      ).click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Country/
+      ).click();
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Check the preview diff of City. The population should have doubled in every row.
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5]),
+        [
+          'Kabul', 'Kabol', ['1780000', '3560000', undefined], '2', ['1780', '3560', undefined],
+          'Qandahar', 'Qandahar', ['237500', '475000', undefined], '2', ['237.5', '475', undefined],
+          'Herat', 'Herat', ['186800', '373600', undefined], '2', ['186.8', '373.6', undefined],
+          'Mazar-e-Sharif', 'Balkh', ['127800', '255600', undefined], '2', ['127.8', '255.6', undefined],
+          'Amsterdam', 'Noord-Holland', ['731200', '1462400', undefined], '159',  ['731.2', '1462.4', undefined],
+        ]
+      );
+
+      // For sheet Country, merge on Code.
+      await driver.findContent('.test-importer-source', /Country/).click();
+      await gu.waitForServer();
+      await driver.findContent('.test-importer-target-existing-table', /Country/).click();
+      await gu.waitForServer();
+      await waitForColumnMapping();
+      await driver.find('.test-importer-update-existing-records').click();
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Code/
+      ).click();
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Check the preview diff of Country. The population should have doubled in every row.
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(
+        await getPreviewDiffCellValues([0, 6], [1, 2, 3, 4, 5]),
+        [ 'ABW', ['103000', '206000', undefined],
+          'AFG', ['22720000', '45440000', undefined],
+          'AGO', ['12878000', '25756000', undefined],
+          'AIA', ['8000', '16000', undefined],
+          'ALB', [ '3401200', '6802400', undefined]
+        ]
+      );
+
+      // For sheet CountryLanguage, merge on Country and Language.
+      await driver.findContent('.test-importer-source', /CountryLanguage/).click();
+      await gu.waitForServer();
+      await driver.findContent('.test-importer-target-existing-table', /CountryLanguage/).click();
+      await gu.waitForServer();
+
+      await waitForColumnMapping();
+      await driver.find('.test-importer-update-existing-records').click();
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Country/
+      ).click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Language/
+      ).click();
+      await gu.sendKeys(Key.ESCAPE);
+
+      // Check the preview diff of CountryLanguage. The first few percentages should be slightly different.
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3], [1, 2, 3, 4, 5]),
+        [ 'Dutch', ['5.3', '5.5', undefined], 'ABW', '',
+          'English', ['9.5', '9.3', undefined], 'ABW', '',
+          'Papiamento', ['76.7', '76.3', undefined], 'ABW', '',
+          'Spanish', ['7.4', '7.8', undefined], 'ABW', '',
+          'Balochi', ['0.9', '1.1', undefined], 'AFG', ''
+        ]
+      );
+
+      // Complete the import, and verify that incoming data was merged correctly.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getPageNames(), [
+        'Table1',
+        'EmptyDate',
+        'Homicide counts and rates (2000',
+        'Sheet1',
+        'UploadedData1',
+        'UploadedData2',
+        'Table1',
+        'City',
+        'Country',
+        'CountryLanguage'
+      ]);
+
+      // Check the contents of Table1; it should have duplicates of the original 2 rows.
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4, 5], cols: [0, 1, 2, 3, 4] }),
+        [
+          'hello', '', '', '', 'HELLO',
+          '', 'world', '', '', '',
+          'hello', '', '', '', 'HELLO',
+          '', 'world', '', '', '',
+          '', '', '', '', '',
+        ]
+      );
+
+      // Check the contents of City. The population should have doubled in every row.
+      await gu.getPageItem('City').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getVisibleGridCells({cols: [0, 1, 2, 3, 4], rowNums: [1, 2, 3, 4, 5]}),
+        [
+          'Kabul', 'Kabol', '3560000', '2', '3560',
+          'Qandahar', 'Qandahar', '475000', '2', '475',
+          'Herat', 'Herat', '373600', '2', '373.6',
+          'Mazar-e-Sharif', 'Balkh', '255600', '2', '255.6',
+          'Amsterdam', 'Noord-Holland', '1462400', '159', '1462.4',
+        ]
+      );
+
+      // Check that no new rows were added to City.
+      assert.equal(await gu.getGridRowCount(), 4080);
+
+      // Check the contents of Country. The population should have doubled in every row.
+      await gu.getPageItem('Country').click();
+      await gu.waitForServer();
+      assert.deepEqual(
+        await gu.getVisibleGridCells({
+          cols: [0, 6],
+          rowNums: [1, 2, 3, 4, 5]
+        }),
+        [ 'ABW', '206000',
+          'AFG', '45440000',
+          'AGO', '25756000',
+          'AIA', '16000',
+          'ALB', '6802400'
+        ]
+      );
+
+      // Check that no new rows were added to Country.
+      assert.equal(await gu.getGridRowCount(), 240);
+
+      // Check the contents of CountryLanguage. The first few percentages should be slightly different.
+      await gu.getPageItem('CountryLanguage').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getVisibleGridCells({cols: [0, 1, 2, 3], rowNums: [1, 2, 3, 4, 5]}),
+        [ 'Dutch', '5.5', 'ABW', '',
+          'English', '9.3', 'ABW', '',
+          'Papiamento', '76.3', 'ABW', '',
+          'Spanish', '7.8', 'ABW', '',
+          'Balochi', '1.1', 'AFG', ''
+        ]
+      );
+
+      // Check that no new rows were added to CountryLanguage.
+      assert.equal(await gu.getGridRowCount(), 985);
+    });
+
+    it('should show diff of changes in preview', async function() {
+      // Import UploadedData2.csv again, and change the destination to UploadedData2.
+      await gu.importFileDialog('./uploads/UploadedData2.csv');
+      await driver.findContent('.test-importer-target-existing-table', /UploadedData2/).click();
+      await gu.waitForServer();
+      await waitForColumnMapping();
+
+      // Click 'Update existing records', and check the preview does not yet show a diff.
+      await driver.find('.test-importer-update-existing-records').click();
+      await gu.waitForServer();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6, 7]),
+        [ 'BUS100',      'Intro to Business',   '',                    '01/13/2021',      '',
+          'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+          'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+          'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+          'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+          'BUS540',      'Capstone',            '',                    '01/13/2021',      '',
+          '',            '',                    '',                    '',                '' ]);
+
+      // Select 'CourseId' as the merge column, and check that the preview now contains a diff of old/new values.
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /CourseId/
+      ).click();
+      await gu.sendKeys(Key.ESCAPE);
+      await gu.waitForServer();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6, 7]),
+        [ 'BUS100',      'Intro to Business',   [undefined, undefined, 'Mariyam Melania'], '01/13/2021', '',
+          'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+          'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+          'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+          'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+          'BUS540',      'Capstone',            '',                    '01/13/2021',      ['false', 'true', undefined],
+          '',            '',                    '',                    '',                '' ]);
+
+
+      // Uncheck 'Update existing records', and check that the preview no longer shows a diff.
+      await driver.find('.test-importer-update-existing-records').click();
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6, 7]),
+        [ 'BUS100',      'Intro to Business',   '',                    '01/13/2021',      '',
+          'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+          'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+          'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+          'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+          'BUS540',      'Capstone',            '',                    '01/13/2021',      '',
+          '',            '',                    '',                    '',                '' ]);
+
+      // Check that the column matching section is correct.
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { destination: 'CourseId', source: 'CourseId' },
+        { destination: 'CourseName', source: 'CourseName' },
+        { destination: 'Instructor', source: 'Instructor' },
+        { destination: 'StartDate', source: 'StartDate' },
+        { destination: 'PassFail', source: 'PassFail' },
+      ]);
+
+      // Click 'Update existing records' again, and edit the formula for CourseId to append a suffix.
+      await driver.find('.test-importer-update-existing-records').click();
+      await waitForDiffPreviewToLoad();
+      await driver.findContent('.test-importer-column-match-source-destination', /CourseId/)
+        .find('.test-importer-column-match-formula').click();
+      await driver.find('.test-importer-apply-formula').click();
+      await gu.sendKeys(' + "-NEW"');
+
+      // Before saving the formula, check that the preview isn't showing the hidden helper column ids.
+      assert.deepEqual(
+        await driver.find('.test-importer-preview').findAll('.g-column-label', el => el.getText()),
+        ['CourseId', 'CourseName', 'Instructor', 'StartDate', 'PassFail']
+      );
+      await gu.sendKeys(Key.ENTER);
+      await gu.waitForServer();
+
+      // Check that the preview diff was updated and now shows that all 6 rows are new rows.
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6, 7]),
+        [
+          [undefined, 'BUS100-NEW', undefined], [undefined, 'Intro to Business', undefined], '',
+            [undefined, '01/13/2021', undefined], [undefined, 'false', undefined],
+          [undefined, 'BUS102-NEW', undefined], [undefined, 'Business Law', undefined],
+            [undefined, 'Nathalie Patricia', undefined], [undefined, '01/13/2021', undefined],
+            [undefined, 'false', undefined],
+          [undefined, 'BUS300-NEW', undefined], [undefined, 'Business Operations', undefined],
+            [undefined, 'Michael Rian', undefined], [undefined, '01/14/2021', undefined],
+            [undefined, 'false', undefined],
+          [undefined, 'BUS301-NEW', undefined], [undefined, 'History of Business', undefined],
+            [undefined, 'Mariyam Melania', undefined], [undefined, '01/14/2021', undefined],
+            [undefined, 'false', undefined],
+          [undefined, 'BUS500-NEW', undefined], [undefined, 'Ethics and Law', undefined],
+            [undefined, 'Filip Andries', undefined], [undefined, '01/13/2021', undefined],
+            [undefined, 'false', undefined],
+          [undefined, 'BUS540-NEW', undefined], [undefined, 'Capstone', undefined], '',
+            [undefined, '01/13/2021', undefined], [undefined, 'true', undefined],
+          '', '', '', '', ''
+        ]
+      );
+
+      // Check the column mapping section updated with the new formula.
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { destination: 'CourseId', source: '$CourseId + "-NEW"\n' },
+        { destination: 'CourseName', source: 'CourseName' },
+        { destination: 'Instructor', source: 'Instructor' },
+        { destination: 'StartDate', source: 'StartDate' },
+        { destination: 'PassFail', source: 'PassFail' },
+      ]);
+
+      // Change the destination back to new table, and check that the preview no longer shows a diff.
+      await openTableMapping();
+      await driver.find('.test-importer-target-new-table').click();
+      await gu.waitForServer();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6, 7]),
+        [ 'BUS100',      'Intro to Business',   '',                    '01/13/2021',      '',
+          'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+          'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+          'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+          'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+          'BUS540',      'Capstone',            '',                    '01/13/2021',      '',
+          '',            '',                    '',                    '',                '' ]);
+
+      // Close the dialog.
+      await driver.find('.test-modal-cancel').click();
+      await gu.waitForServer();
+    });
+  });
+});
diff --git a/test/nbrowser/Importer2.ts b/test/nbrowser/Importer2.ts
new file mode 100644
index 00000000..5cb9c179
--- /dev/null
+++ b/test/nbrowser/Importer2.ts
@@ -0,0 +1,818 @@
+/**
+ * Test of the Importer dialog (part 2), for imports inside an open doc.
+ */
+import {DocAPI} from 'app/common/UserAPI';
+import {DocCreationInfo} from 'app/common/DocListAPI';
+import * as _ from 'lodash';
+import {assert, driver, Key} from 'mocha-webdriver';
+import * as gu from 'test/nbrowser/gristUtils';
+import {getColumnMatchingRows, getPreviewDiffCellValues, openSource as openSourceFor,
+        openTableMapping, waitForColumnMapping, waitForDiffPreviewToLoad} from 'test/nbrowser/importerTestUtils';
+import {setupTestSuite} from 'test/nbrowser/testUtils';
+
+describe('Importer2', function() {
+  this.timeout(60000);
+  const cleanup = setupTestSuite();
+  let doc: DocCreationInfo;
+  let api: DocAPI;
+
+  before(async function() {
+    // Log in and import a sample document.
+    const session = await gu.session().teamSite.login();
+    doc = await session.tempDoc(cleanup, 'Hello.grist');
+    api = session.createHomeApi().getDocAPI(doc.id);
+  });
+
+  afterEach(() => gu.checkForErrors());
+
+  it("should import new tables losslessly", async function() {
+    // Import mixed_dates.csv into a new table
+    await gu.importFileDialog('./uploads/mixed_dates.csv');
+    await waitForDiffPreviewToLoad();
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitAppFocus();
+
+    // Import the same file again into the same table
+    await gu.importFileDialog('./uploads/mixed_dates.csv');
+    await driver.findContent('.test-importer-target-existing-table', /Mixed_dates/).click();
+    await waitForDiffPreviewToLoad();
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitAppFocus();
+
+    assert.deepEqual(
+      await gu.getVisibleGridCells({cols: [0], rowNums: _.range(1, 21)}),
+      [
+        // mixed_dates.csv contains 10 dates. The first 9 are YYYY-MM-DD so that's the guessed date format.
+        // The last date '01/02/03' doesn't fit this format.
+        // Since 90% of the values fit the guessed format, the column is guessed to have type Date.
+        // The dates are parsed by DateGuesser which uses moment's strict parsing directly, not parseDate.
+        // So '01/02/03' isn't parsed and remains a string, and the column is imported losslessly,
+        // i.e. converting it back to text yields the original strings in the file unchanged.
+        '2020-03-04',
+        '2020-03-05',
+        '2020-03-06',
+        '2020-03-04',
+        '2020-03-05',
+        '2020-03-06',
+        '2020-03-04',
+        '2020-03-05',
+        '2020-03-06',
+        '01/02/03',
+
+        // When the file is imported again into the same table, things go differently.
+        // The intermediate hidden table goes through the same process and stores '01/02/03' as a string.
+        // But for existing tables we set parseStrings to true when applying the final BulkAddRecord.
+        // So '01/02/03' is parsed by parseDate according to the existing column's date format which gives 2001-02-03.
+        '2020-03-04',
+        '2020-03-05',
+        '2020-03-06',
+        '2020-03-04',
+        '2020-03-05',
+        '2020-03-06',
+        '2020-03-04',
+        '2020-03-05',
+        '2020-03-06',
+        '2001-02-03',
+      ],
+    );
+
+    await gu.undo(2);
+  });
+
+  it("should set widget options for formatted numbers", async function() {
+    // Import formatted_numbers.csv into a new table
+    await gu.importFileDialog('./uploads/formatted_numbers.csv');
+    await waitForDiffPreviewToLoad();
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitAppFocus();
+
+    // Numbers appear formatted as in the CSV file
+    assert.deepEqual(
+      await gu.getVisibleGridCells({cols: [0, 1, 2, 3, 4], rowNums: [1]}),
+      ["$1.00", "1.20E3", "2,000,000", "43%", "(56)"],
+    );
+
+    const records = await api.getRecords('Formatted_numbers');
+    const cols = await api.getRecords('_grist_Tables_column');
+
+    // Actual data has correct values, e.g. 43% -> 0.43
+    assert.deepEqual(records, [{
+      id: 1,
+      fields: {
+        fn_currency: 1,
+        fn_scientific: 1200,
+        fn_decimal: 2000000,
+        fn_percent: 0.43,
+        fn_parens: -56,
+      },
+    }]);
+
+    // Get the fields we care about describing the columns to allow comparison.
+    // All column names in the CSV file start with "fn_"
+    const colFields = cols.map(
+      ({fields: {colId, type, widgetOptions}}) =>
+        ({colId, type, widgetOptions: JSON.parse(widgetOptions as string || "{}")})
+    ).filter(f => (f.colId as string).startsWith("fn_"));
+
+    // All the columns are numeric and have some kind of formatting
+    assert.deepEqual(colFields, [
+      {
+        colId: 'fn_currency',
+        type: 'Numeric',
+        widgetOptions: {decimals: 2, numMode: 'currency'}
+      },
+      {
+        colId: 'fn_scientific',
+        type: 'Numeric',
+        widgetOptions: {decimals: 2, numMode: 'scientific'}
+      },
+      {
+        colId: 'fn_decimal',
+        type: 'Numeric',
+        widgetOptions: {numMode: 'decimal'}
+      },
+      {
+        colId: 'fn_percent',
+        type: 'Numeric',
+        widgetOptions: {numMode: 'percent'}
+      },
+      {
+        colId: 'fn_parens',
+        type: 'Numeric',
+        widgetOptions: {numSign: 'parens'}
+      },
+    ]);
+
+    // Remove the imported table
+    await gu.undo();
+  });
+
+  it("should not show skip option for single table", async function() {
+    async function noSkip() {
+      await waitForDiffPreviewToLoad();
+      assert.isFalse(await driver.find('.test-importer-target-skip').isPresent());
+      await driver.sendKeys(Key.ESCAPE);
+      await driver.find('.test-modal-cancel').click();
+      await gu.waitAppFocus();
+    }
+    await gu.importFileDialog('./uploads/UploadedData1.csv');
+    await noSkip();
+    await gu.importFileDialog('./uploads/BooleanData.xlsx');
+    await noSkip();
+  });
+
+  it("should show skip option for multiple tables", async function() {
+    async function hasSkip() {
+      await waitForDiffPreviewToLoad();
+      assert.isTrue(await driver.find('.test-importer-target-skip').isDisplayed());
+      await driver.find('.test-importer-source-not-selected').click();
+      assert.isTrue(await driver.find('.test-importer-target-skip').isDisplayed());
+      await driver.find('.test-modal-cancel').click();
+      await gu.waitAppFocus();
+    }
+    await gu.importFileDialog('./uploads/UploadedData1.csv,./uploads/UploadedData2.csv');
+    await hasSkip();
+    await gu.importFileDialog('./uploads/homicide_rates.xlsx');
+    await hasSkip();
+  });
+
+  it("should skip importing", async function() {
+    await gu.importFileDialog('./uploads/UploadedData1.csv,./uploads/UploadedData2.csv');
+    await waitForDiffPreviewToLoad();
+    // Skip the first table.
+    await driver.find('.test-importer-target-skip').click();
+    // Make sure preview is grayed out.
+    assert.isTrue(await driver.find(".test-importer-preview-overlay").isPresent());
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitAppFocus();
+    // Make sure only second table is visible.
+    assert.deepEqual(await gu.getPageNames(), ['Table1', 'UploadedData2']);
+    // And data is valid.
+    await gu.getPageItem('UploadedData2').click();
+    await gu.waitForServer();
+    assert.deepEqual(await gu.getVisibleGridCells({cols: [0, 1, 2, 3, 4], rowNums: [1, 2, 3, 4, 5, 6]}),
+    [ 'BUS100',      'Intro to Business',   '',                    '01/13/2021',      '',
+      'BUS102',      'Business Law',        'Nathalie Patricia',   '01/13/2021',      '',
+      'BUS300',      'Business Operations', 'Michael Rian',        '01/14/2021',      '',
+      'BUS301',      'History of Business', 'Mariyam Melania',     '01/14/2021',      '',
+      'BUS500',      'Ethics and Law',      'Filip Andries',       '01/13/2021',      '',
+      'BUS540',      'Capstone',            '',                    '01/13/2021',      '' ]);
+    await gu.undo();
+  });
+
+  it("should clean mapping when skipped", async function() {
+    // Import UploadedData2 to have a destination table.
+    await gu.importFileDialog('./uploads/UploadedData2.csv');
+    await waitForDiffPreviewToLoad();
+    await driver.find('.test-modal-confirm').click();
+    await gu.waitAppFocus();
+
+    // Reimport
+    await gu.importFileDialog('./uploads/UploadedData1.csv,./uploads/UploadedData2.csv');
+    await waitForDiffPreviewToLoad();
+
+    // Skip first table
+    await driver.find('.test-importer-target-skip').click();
+
+    // Select second table and add mapping to update existing records.
+    await driver.find('.test-importer-source-not-selected').click();
+    await driver.findContent('.test-importer-target-existing-table', /UploadedData2/).click();
+
+    await waitForDiffPreviewToLoad();
+    await waitForColumnMapping();
+    await driver.find('.test-importer-update-existing-records').click();
+    await driver.find('.test-importer-merge-fields-select').click();
+    await driver.findContent(
+      '.test-multi-select-menu .test-multi-select-menu-option',
+      /CourseId/
+    ).click();
+    await gu.sendKeys(Key.ESCAPE);
+    await gu.waitForServer();
+
+    // Now skip and make sure options are hidden
+    await openTableMapping();
+    await driver.find('.test-importer-target-skip').click();
+
+    // And unskip, and make sure options are back, but not filled
+    await driver.findContent('.test-importer-target-existing-table', /UploadedData2/).click();
+    await waitForDiffPreviewToLoad();
+
+    await waitForColumnMapping();
+    assert.isTrue(await driver.find('.test-importer-update-existing-records').isPresent());
+    assert.isTrue(await driver.find('.test-importer-merge-fields-select').isPresent());
+    assert.isTrue(await driver.find('.test-importer-merge-fields-message').isPresent());
+    assert.equal(await driver.find('.test-importer-merge-fields-select').getText(),
+      'Select fields to match on');
+
+    await driver.find('.test-modal-cancel').click();
+    await gu.waitAppFocus();
+    await gu.undo(2); // Press two times, as we cancelled and import hasn't cleaned temps.
+  });
+
+  it("should disable import button when all tables are skipped", async function() {
+    await gu.importFileDialog('./uploads/UploadedData1.csv,./uploads/UploadedData2.csv');
+    await waitForDiffPreviewToLoad();
+    // Make sure both previews are available
+    for(const source of await driver.findAll(".test-importer-source")) {
+      await source.click();
+      assert.isFalse(await driver.find(".test-importer-preview-overlay").isPresent());
+    }
+    const sources = await driver.findAll(".test-importer-source");
+    // Skip both tables.
+     for(const source of sources) {
+      await source.click();
+      await gu.waitForServer();
+      await driver.find('.test-importer-target-skip').click();
+      await gu.waitForServer();
+    }
+    assert.equal(await driver.find('.test-modal-confirm').getAttribute('disabled'), 'true');
+    // Make sure both previews are grayed out
+    for(const source of sources) {
+      await source.click();
+      assert.isTrue(await driver.find(".test-importer-preview-overlay").isPresent());
+    }
+
+    // Enable first, and test if one is grayed out and the second is not.
+    await sources[0].click();
+    await gu.waitForServer();
+    await driver.find(".test-importer-target-new-table").click();
+    await gu.waitForServer();
+    await waitForDiffPreviewToLoad();
+    assert.isFalse(await driver.find(".test-importer-preview-overlay").isPresent());
+    assert.equal(await driver.find('.test-modal-confirm').getAttribute('disabled'), null);
+
+    // Second should be still grayed out
+    await sources[1].click();
+    assert.isTrue(await driver.find(".test-importer-preview-overlay").isPresent());
+
+    await driver.find('.test-modal-cancel').click();
+    await gu.waitAppFocus();
+  });
+
+  describe('when importing JSON', async function() {
+    // A previous bug caused an error to be thrown when finishing importing a nested JSON file.
+    it('should import successfully to new tables', async function() {
+      // Import a nested JSON file.
+      await gu.importFileDialog('./uploads/names.json');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+      // Check that two preview tables were created.
+      assert.lengthOf(await driver.findAll('.test-importer-source'), 2);
+      assert.equal(
+        await driver.find('.test-importer-source[class*=-selected] .test-importer-from').getText(),
+        'names - names.json'
+      );
+      assert.deepEqual(
+        await driver.findAll('.test-importer-source .test-importer-from', (e) => e.getText()),
+        ['names - names.json', 'names_name - names.json']
+      );
+
+      // Check that the first table looks ok.
+      assert.deepEqual(await gu.getPreviewContents([0], [1, 2, 3]), [ '[1]', '[2]', '']);
+
+      // Check that the second table looks ok.
+      await driver.findContent('.test-importer-source', /names_name/).click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getPreviewContents([0], [1, 2, 3]), [ 'Bob', 'Alice', '']);
+
+      // Finish import, and verify the import succeeded.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getPageNames(), [
+        'Table1',
+        'names',
+        'names_name',
+      ]);
+
+      // Verify data was imported to Names correctly.
+      assert.deepEqual(
+        await gu.getVisibleGridCells({ rowNums: [1, 2, 3], cols: [0] }),
+        ['Names_name[1]', 'Names_name[2]', '']
+      );
+
+      // Open the side panel and check that the column type for 'name' is Reference (pointing to 'first').
+      await gu.toggleSidePanel('right', 'open');
+      await driver.find('.test-right-tab-field').click();
+      assert.equal(await driver.find('.test-fbuilder-type-select').getText(), 'Reference');
+      assert.equal(await gu.getRefTable(), 'names_name');
+      assert.equal(await gu.getRefShowColumn(), 'Row ID');
+
+      // Verify data was imported to Names_name correctly.
+      await gu.getPageItem('names_name').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3], cols: [0] }), ['Bob', 'Alice', '']);
+    });
+
+    it('should import successfully to existing tables with references', async function() {
+      // Import the same nested JSON file again.
+      await gu.importFileDialog('./uploads/names.json');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+      // Change the destination of both source tables to the existing destination ones.
+      await driver.findContent('.test-importer-target-existing-table', /Names/).click();
+      await gu.waitForServer();
+      // Now on the second tab.
+      await driver.findContent('.test-importer-source', /names_name/).click();
+      await driver.findContent('.test-importer-target-existing-table', /Names_name/).click();
+      await gu.waitForServer();
+
+      // Finish import, and verify the import succeeded.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getPageNames(), [
+        'Table1',
+        'names',
+        'names_name',
+      ]);
+
+      // Verify data was imported to Names correctly.
+      assert.deepEqual(
+        await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4, 5], cols: [0] }),
+        ['Names_name[1]', 'Names_name[2]', 'Names_name[1]', 'Names_name[2]', '']
+      );
+
+      // Open the side panel and check that the column type for 'name' is Reference (pointing to 'first').
+      await gu.toggleSidePanel('right', 'open');
+      await driver.find('.test-right-tab-field').click();
+      assert.equal(await driver.find('.test-fbuilder-type-select').getText(), 'Reference');
+      assert.equal(await gu.getRefTable(), 'names_name');
+      assert.equal(await gu.getRefShowColumn(), 'Row ID');
+
+      // Verify data was imported to Names_name correctly.
+      await gu.getPageItem('names_name').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getVisibleGridCells(
+        { rowNums: [1, 2, 3, 4, 5], cols: [0] }),
+        ['Bob', 'Alice', 'Bob', 'Alice', '']
+      );
+
+      // Undo the last 2 imports.
+      await gu.undo(2);
+    });
+  });
+
+  describe('when matching columns', async function() {
+    it('should not display column matching section for new destinations', async function() {
+      // Import an Excel file with multiple sheets.
+      await gu.importFileDialog('./uploads/World-v0.xlsx');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+      // Check that the column matching section is not shown.
+      assert.isFalse(await driver.find('.test-importer-column-match-options').isPresent());
+    });
+
+    it('should display column matching section for existing destinations', async function() {
+      // From the previous test: finish importing World-v1.xlsx so we have tables to import to.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer(10_000);
+
+      // Import the same file again.
+      await gu.importFileDialog('./uploads/World-v0.xlsx');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+      // Change the destination of the selected sheet to the table created earlier.
+      await driver.findContent('.test-importer-target-existing-table', /Table1_2/).click();
+      await gu.waitForServer();
+
+      await waitForColumnMapping();
+      // Check that source and destination are populated for each column from the first sheet.
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { destination: 'a', source: 'a' },
+        { destination: 'b', source: 'b' },
+        { destination: 'c', source: 'c' },
+        { destination: 'd', source: 'd' },
+        { destination: 'E', source: 'E' },
+      ]);
+      assert.isFalse(await driver.find('.test-importer-unmatched-fields').isPresent());
+
+      // Switch to the City sheet, and check that the column matching section is no longer shown.
+      await driver.findContent('.test-importer-source', /City/).click();
+      await gu.waitForServer();
+      assert.isFalse(await driver.find('.test-importer-column-match-options').isPresent());
+
+      // Change the destination to 'City', and now check that the section is shown.
+      await driver.findContent('.test-importer-target-existing-table', /City/).click();
+      await gu.waitForServer();
+
+      await waitForColumnMapping();
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { destination: 'Name', source: 'Name' },
+        { destination: 'District', source: 'District' },
+        { destination: 'Population', source: 'Population' },
+        { destination: 'Country', source: 'Country' },
+        { destination: 'Pop. \'000', source: 'Pop. \'000' },
+      ]);
+      assert.isFalse(await driver.find('.test-importer-unmatched-fields').isPresent());
+    });
+
+    it('should allow skipping importing columns', async function() {
+      // Starting from the City sheet, open the menu for "Pop. '000".
+      await driver.findContent('.test-importer-column-match-source', /Pop\. '000/).click();
+
+      // Check that the menu contains only the selected source column, plus a 'Skip' option.
+      const menu = driver.find('.test-select-menu');
+      assert.deepEqual(
+        await menu.findAll('.test-importer-column-match-menu-item', el => el.getText()),
+        ['Skip', 'Pop. \'000']
+      );
+
+      // Click 'Skip', and check that the column mapping section and preview both updated.
+      await menu.findContent('.test-importer-column-match-menu-item', /Skip/).click();
+      await gu.waitForServer();
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { destination: 'Name', source: 'Name' },
+        { destination: 'District', source: 'District' },
+        { destination: 'Population', source: 'Population' },
+        { destination: 'Country', source: 'Country' },
+        { destination: 'Pop. \'000', source: 'Skip' },
+      ]);
+      assert.deepEqual(await gu.getPreviewContents([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6]), [
+        'Kabul',  'Kabol',  '1780000',  '2',  '0',
+        'Qandahar',  'Qandahar',  '237500',  '2',  '0',
+        'Herat',  'Herat',  '186800',  '2',  '0',
+        'Mazar-e-Sharif',  'Balkh',  '127800',  '2',  '0',
+        'Amsterdam',  'Noord-Holland',  '731200',  '159',  '0',
+        'Rotterdam',  'Zuid-Holland',  '593321',  '159',  '0',
+      ]);
+
+      // Check that a message is now shown about there being 1 unmapped field.
+      assert.equal(
+        await driver.find('.test-importer-unmatched-fields').getText(),
+        '1 unmatched field in import:\nPop. \'000'
+      );
+
+      // Click Country in the column mapping section, and clear the formula.
+      await driver.findContent('.test-importer-column-match-source', /Country/).click();
+      await driver.find('.test-importer-apply-formula').click();
+      await gu.sendKeys(await gu.selectAllKey(), Key.DELETE, Key.ENTER);
+      await gu.waitForServer();
+
+      // Check that the column mapping section and preview now show that it will be skipped.
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { destination: 'Name', source: 'Name' },
+        { destination: 'District', source: 'District' },
+        { destination: 'Population', source: 'Population' },
+        { destination: 'Country', source: 'Skip' },
+        { destination: 'Pop. \'000', source: 'Skip' },
+      ]);
+      assert.deepEqual(await gu.getPreviewContents([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6]), [
+        'Kabul',  'Kabol',  '1780000',  '0',  '0',
+        'Qandahar',  'Qandahar',  '237500',  '0',  '0',
+        'Herat',  'Herat',  '186800',  '0',  '0',
+        'Mazar-e-Sharif',  'Balkh',  '127800',  '0',  '0',
+        'Amsterdam',  'Noord-Holland',  '731200',  '0',  '0',
+        'Rotterdam',  'Zuid-Holland',  '593321',  '0',  '0',
+      ]);
+      assert.equal(
+        await driver.find('.test-importer-unmatched-fields').getText(),
+        '2 unmatched fields in import:\nCountry, Pop. \'000'
+      );
+    });
+
+    it('should autocomplete formula in source', async function() {
+      // Starting from the City sheet, open the menu for "Pop. '000".
+      await openSourceFor(/Pop\. '000/);
+
+      // We want to map the same column twice, which is not possible through the menu, so we will
+      // use the formula.
+      await driver.find('.test-importer-apply-formula').click();
+      await gu.sendKeys(await gu.selectAllKey(), Key.DELETE, '$Population', Key.ENTER);
+      await gu.waitForServer();
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { source: 'Name', destination: 'Name' },
+        { source: 'District', destination: 'District' },
+        { source: 'Population', destination: 'Population' },
+        { source: 'Skip', destination: 'Country' },
+        { source: '$Population\n', destination: 'Pop. \'000' },
+      ]);
+      assert.deepEqual(await gu.getPreviewContents([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6]), [
+        'Kabul',  'Kabol',  '1780000',  '0',  '1780000',
+        'Qandahar',  'Qandahar',  '237500',  '0',  '237500',
+        'Herat',  'Herat',  '186800',  '0',  '186800',
+        'Mazar-e-Sharif',  'Balkh',  '127800',  '0',  '127800',
+        'Amsterdam',  'Noord-Holland',  '731200',  '0',  '731200',
+        'Rotterdam',  'Zuid-Holland',  '593321',  '0',  '593321',
+      ]);
+      assert.equal(
+        await driver.find('.test-importer-unmatched-fields').getText(),
+        '1 unmatched field in import:\nCountry'
+      );
+
+      // Click Country (with formula 'Skip') in the column mapping section, and start typing a formula.
+      await openSourceFor(/Country/);
+      await driver.find('.test-importer-apply-formula').click();
+      await gu.sendKeys('$');
+      await gu.waitForServer();
+
+      // Wait until the Ace autocomplete menu is shown.
+      await driver.wait(() => driver.find('div.ace_autocomplete').isDisplayed(), 2000);
+
+      // Check that the autocomplete is suggesting column ids from the imported table.
+      const completions = await driver.findAll(
+        'div.ace_autocomplete div.ace_line', async el => (await el.getText()).split(' ')[0]
+      );
+      assert.deepEqual(
+        completions.slice(0, 6),
+        [
+          "$\nCountry",
+          "$\nDistrict",
+          "$\nid",
+          "$\nName",
+          "$\nPop_000",
+          "$\nPopulation",
+        ]
+      );
+
+      // Set a constant value for the formula.
+      await gu.sendKeys(Key.BACK_SPACE, '123', Key.ENTER);
+      await gu.waitForServer();
+
+      // Check that the formula code is shown, as well as the evaluation result in the preview.
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { source: 'Name', destination: 'Name' },
+        { source: 'District', destination: 'District' },
+        { source: 'Population', destination: 'Population' },
+        { source: '123\n', destination: 'Country' },
+        { source: '$Population\n', destination: 'Pop. \'000' },
+      ]);
+
+      assert.deepEqual(await gu.getPreviewContents([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6]), [
+        'Kabul',  'Kabol',  '1780000',  '123',  '1780000',
+        'Qandahar',  'Qandahar',  '237500',  '123',  '237500',
+        'Herat',  'Herat',  '186800',  '123',  '186800',
+        'Mazar-e-Sharif',  'Balkh',  '127800',  '123',  '127800',
+        'Amsterdam',  'Noord-Holland',  '731200',  '123',  '731200',
+        'Rotterdam',  'Zuid-Holland',  '593321',  '123',  '593321',
+      ]);
+      assert.isFalse(await driver.find('.test-importer-unmatched-fields').isPresent());
+    });
+
+    it('should reflect mappings when import to new table is finished', async function() {
+      // Skip 'Population', so that we can test imports with skipped columns.
+      await openSourceFor(/Population/);
+      await driver.findContent('.test-importer-column-match-menu-item', 'Skip').click();
+      await gu.waitForServer();
+
+      // Finish importing, and check that the destination tables have the correct data.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getPageNames(), [
+        'Table1',
+        'Table1',
+        'City',
+        'Country',
+        'CountryLanguage',
+        'Country',
+        'CountryLanguage'
+      ]);
+
+      // Check the contents of Table1; it should have duplicates of the original 2 rows.
+      assert.deepEqual(await gu.getVisibleGridCells({ rowNums: [1, 2, 3, 4, 5], cols: [0, 1, 2, 3, 4] }),
+        [
+          'hello', '', '', '', 'HELLO',
+          '', 'world', '', '', '',
+          'hello', '', '', '', 'HELLO',
+          '', 'world', '', '', '',
+          '', '', '', '', '',
+        ]
+      );
+
+      await gu.getPageItem('City').click();
+      await gu.waitForServer();
+
+      // The first half should be the original imported rows.
+      assert.deepEqual(await gu.getVisibleGridCells(
+        {cols: [0, 1, 2, 3, 4], rowNums: [1, 2, 3, 4, 5, 6]}),
+        [
+          'Kabul', 'Kabol', '1780000', '2', '1780',
+          'Qandahar', 'Qandahar', '237500', '2', '237.5',
+          'Herat', 'Herat', '186800', '2', '186.8',
+          'Mazar-e-Sharif', 'Balkh', '127800', '2', '127.8',
+          'Amsterdam', 'Noord-Holland', '731200', '159', '731.2',
+          'Rotterdam', 'Zuid-Holland', '593321', '159', '593.321',
+        ]
+      );
+
+      // The second half should be the newly imported rows with custom mappings.
+      assert.equal(await gu.getGridRowCount(), 8159);
+      assert.deepEqual(await gu.getVisibleGridCells(
+        {cols: [0, 1, 2, 3, 4], rowNums: [8152, 8153, 8154, 8155, 8156, 8157]}),
+        [
+          'Gweru', 'Midlands', '0', '123', '128037',
+          'Gaza', 'Gaza', '0', '123', '353632',
+          'Khan Yunis', 'Khan Yunis', '0', '123', '123175',
+          'Hebron', 'Hebron', '0', '123', '119401',
+          'Jabaliya', 'North Gaza', '0', '123', '113901',
+          'Nablus', 'Nablus', '0', '123', '100231',
+        ]
+      );
+    });
+
+    it('should reflect mappings in previews of incremental imports', async function() {
+      // Delete the first row of the Country column. (Needed for a later assertion.)
+      await gu.sendKeys(Key.chord(await gu.modKey(), Key.UP));
+      await gu.getCell(3, 1).click();
+      await gu.sendKeys(Key.DELETE);
+      await gu.waitForServer();
+
+      // Import a CSV file containing city data, with column names that differ from the City table.
+      await gu.importFileDialog('./uploads/Cities.csv');
+      assert.equal(await driver.findWait('.test-importer-preview', 2000).isPresent(), true);
+
+      // Change the destination to City, and check that column mapping defaults to skipping all columns.
+      await driver.findContent('.test-importer-target-existing-table', /City/).click();
+      await gu.waitForServer();
+      await waitForColumnMapping();
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { source: 'Skip', destination: 'Name' },
+        { source: 'Skip', destination: 'District' },
+        { source: 'Skip', destination: 'Population' },
+        { source: 'Skip', destination: 'Country' },
+        { source: 'Skip', destination: 'Pop. \'000' },
+      ]);
+
+      assert.equal(
+        await driver.find('.test-importer-unmatched-fields').getText(),
+        '5 unmatched fields in import:\nName, District, Population, Country, Pop. \'000'
+      );
+
+      // Set formula for 'Name' to 'city_name' by typing in the formula.
+      await openSourceFor(/Name/);
+      await driver.find('.test-importer-apply-formula').click();
+      await gu.sendKeys('$city_name', Key.ENTER);
+      await gu.waitForServer();
+
+      // Map 'District' to 'city_district' via the column mapping menu.
+      await openSourceFor('District');
+      const menu = driver.find('.test-select-menu');
+      await menu.findContent('.test-importer-column-match-menu-item', /city_district/).click();
+      await gu.waitForServer();
+
+      // Check the column mapping section and preview both updated correctly.
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { source: '$city_name\n', destination: 'Name' },
+        { source: 'city_district', destination: 'District' },
+        { source: 'Skip', destination: 'Population' },
+        { source: 'Skip', destination: 'Country' },
+        { source: 'Skip', destination: 'Pop. \'000' },
+      ]);
+      assert.deepEqual(await gu.getPreviewContents([0, 1, 2, 3, 4], [1, 2, 3, 4, 5, 6]), [
+        'Kabul',  'Kabol',  '0',  '0',  '0',
+        'Qandahar',  'Qandahar',  '0',  '0',  '0',
+        'Herat',  'Herat',  '0',  '0',  '0',
+        'Mazar-e-Sharif',  'Balkh',  '0',  '0',  '0',
+        'Amsterdam',  'Noord-Holland',  '0',  '0',  '0',
+        'Rotterdam',  'Zuid-Holland',  '0',  '0',  '0',
+      ]);
+      assert.equal(
+        await driver.find('.test-importer-unmatched-fields').getText(),
+        '3 unmatched fields in import:\nPopulation, Country, Pop. \'000'
+      );
+
+      // Now toggle 'Update existing records', and merge on 'Name' and 'District'.
+      await driver.find('.test-importer-update-existing-records').click();
+      await driver.find('.test-importer-merge-fields-select').click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /Name/
+      ).click();
+      await driver.findContent(
+        '.test-multi-select-menu .test-multi-select-menu-option',
+        /District/
+      ).click();
+      await gu.sendKeys(Key.ESCAPE);
+      await gu.waitForServer();
+
+      // Check that the column mapping section and preview updated correctly.
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { source: '$city_name\n', destination: 'Name' },
+        { source: 'city_district', destination: 'District' },
+        { source: 'Skip', destination: 'Population' },
+        { source: 'Skip', destination: 'Country' },
+        { source: 'Skip', destination: 'Pop. \'000' },
+      ]);
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5]), [
+        'Kabul', 'Kabol', [undefined, undefined, '1780000'], '', [undefined, undefined, '1780'],
+        'Qandahar', 'Qandahar', [undefined, undefined, '237500'], [undefined, undefined, '2'],
+          [undefined, undefined, '237.5'],
+        'Herat', 'Herat', [undefined, undefined, '186800'], [undefined, undefined, '2'],
+          [undefined, undefined, '186.8'],
+        'Mazar-e-Sharif', 'Balkh', [undefined, undefined, '127800'], [undefined, undefined, '2'],
+          [undefined, undefined, '127.8'],
+        'Amsterdam', 'Noord-Holland', [undefined, undefined, '731200'], [undefined, undefined, '159'],
+          [undefined, undefined, '731.2'],
+      ]);
+      assert.equal(
+        await driver.find('.test-importer-unmatched-fields').getText(),
+        '3 unmatched fields in import:\nPopulation, Country, Pop. \'000'
+      );
+
+      // Map the remaining columns, except "Country"; we'll leave it skipped to check that
+      // we don't overwrite any values in the destination table. (A previous bug caused non-text
+      // skipped columns to overwrite data with default values, like 0.)
+      await openSourceFor(/Population/);
+      await driver.find('.test-importer-apply-formula').click();
+      await gu.sendKeys('$city_pop', Key.ENTER);
+      await gu.waitForServer();
+
+      // For "Pop. '000", deliberately map a duplicate column (so we can later check if import succeeded).
+      await openSourceFor(/Pop\. '000/);
+      await driver.find('.test-importer-apply-formula').click();
+      await gu.sendKeys('$city_pop', Key.ENTER);
+      await gu.waitForServer();
+
+      assert.deepEqual(await getColumnMatchingRows(), [
+        { source: '$city_name\n',      destination: 'Name' },
+        { source: 'city_district',   destination: 'District' },
+        { source: '$city_pop\n',       destination: 'Population' },
+        { source: 'Skip',            destination: 'Country' },
+        { source: '$city_pop\n',       destination: 'Pop. \'000' },
+      ]);
+
+      await waitForDiffPreviewToLoad();
+      assert.deepEqual(await getPreviewDiffCellValues([0, 1, 2, 3, 4], [1, 2, 3, 4, 5]), [
+        // Kabul's Country column should appear blank, since we deleted it earlier.
+        'Kabul', 'Kabol', ['1780000', '3560000', undefined], '', ['1780', '3560000', undefined],
+        'Qandahar', 'Qandahar', ['237500', '475000', undefined], [undefined, undefined, '2'],
+          ['237.5', '475000', undefined],
+        'Herat', 'Herat', ['186800', '373600', undefined], [undefined, undefined, '2'],
+          ['186.8', '373600', undefined],
+        'Mazar-e-Sharif', 'Balkh', ['127800', '255600', undefined], [undefined, undefined, '2'],
+          ['127.8', '255600', undefined],
+        'Amsterdam', 'Noord-Holland', ['731200', '1462400', undefined], [undefined, undefined, '159'],
+          ['731.2', '1462400', undefined],
+      ]);
+      assert.equal(
+        await driver.find('.test-importer-unmatched-fields').getText(),
+        '1 unmatched field in import:\nCountry'
+      );
+    });
+
+    it('should reflect mappings when incremental import is finished', async function() {
+      // Finish importing, and check that the destination table has the correct data.
+      await driver.find('.test-modal-confirm').click();
+      await gu.waitForServer();
+      assert.deepEqual(await gu.getPageNames(), [
+        'Table1',
+        'Table1',
+        'City',
+        'Country',
+        'CountryLanguage',
+        'Country',
+        'CountryLanguage',
+      ]);
+
+      assert.deepEqual(await gu.getVisibleGridCells({cols: [0, 1, 2, 3, 4], rowNums: [1, 2, 3, 4, 5]}),
+        [
+          // Kabul's Country column should still be blank, since we skipped it earlier.
+          'Kabul', 'Kabol', '3560000', '', '3560000',
+          'Qandahar', 'Qandahar', '475000', '2', '475000',
+          'Herat', 'Herat', '373600', '2', '373600',
+          'Mazar-e-Sharif', 'Balkh', '255600', '2', '255600',
+          'Amsterdam', 'Noord-Holland', '1462400', '159', '1462400',
+        ]
+      );
+    });
+  });
+});
diff --git a/test/nbrowser/importerTestUtils.ts b/test/nbrowser/importerTestUtils.ts
index 81040d41..5715ccec 100644
--- a/test/nbrowser/importerTestUtils.ts
+++ b/test/nbrowser/importerTestUtils.ts
@@ -41,7 +41,7 @@ export const waitForDiffPreviewToLoad = stackWrapFunc(async (): Promise<void> =>
 // Helper that gets the list of visible column matching rows to the left of the preview.
 export const getColumnMatchingRows = stackWrapFunc(async (): Promise<{source: string, destination: string}[]> => {
   return await driver.findAll('.test-importer-column-match-source-destination', async (el) => {
-    const source = await el.find('.test-importer-column-match-formula').getText();
+    const source = await el.find('.test-importer-column-match-formula').getAttribute('textContent');
     const destination = await el.find('.test-importer-column-match-destination').getText();
     return {source, destination};
   });
diff --git a/test/server/lib/ACLFormula.ts b/test/server/lib/ACLFormula.ts
index 4b4ac634..8951c0f9 100644
--- a/test/server/lib/ACLFormula.ts
+++ b/test/server/lib/ACLFormula.ts
@@ -1,7 +1,7 @@
 import {CellValue} from 'app/common/DocActions';
-import {AclMatchFunc, InfoView} from 'app/common/GranularAccessClause';
+import {InfoView} from 'app/common/GranularAccessClause';
 import {GristObjCode} from 'app/plugin/GristData';
-import {compileAclFormula} from 'app/server/lib/ACLFormula';
+import {CompiledPredicateFormula, compilePredicateFormula} from 'app/common/PredicateFormula';
 import {makeExceptionalDocSession} from 'app/server/lib/DocSession';
 import {User} from 'app/server/lib/GranularAccess';
 import {assert} from 'chai';
@@ -26,7 +26,7 @@ describe('ACLFormula', function() {
 
   const V = getInfoView;    // A shortcut.
 
-  type SetAndCompile = (aclFormula: string) => Promise<AclMatchFunc>;
+  type SetAndCompile = (aclFormula: string) => Promise<CompiledPredicateFormula>;
   let setAndCompile: SetAndCompile;
 
   before(async function () {
@@ -44,7 +44,7 @@ describe('ACLFormula', function() {
         fakeSession, {tableId: '_grist_ACLRules', filters: {id: [ruleRef]}});
       assert(tableData[3].aclFormulaParsed, "Expected aclFormulaParsed to be populated");
       const parsedFormula = String(tableData[3].aclFormulaParsed[0]);
-      return compileAclFormula(JSON.parse(parsedFormula));
+      return compilePredicateFormula(JSON.parse(parsedFormula));
     };
   });
 

From 8012e376b52680777fb8692c302fedc024abfe29 Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Fri, 26 Apr 2024 18:01:41 -0400
Subject: [PATCH 30/45] (core) Add learn more link to tooltip

Summary:
Adds a link to the support site documentation from the tooltip
about filtering reference choices with dropdown conditions.

Test Plan: N/A

Reviewers: paulfitz

Reviewed By: paulfitz

Differential Revision: https://phab.getgrist.com/D4240
---
 app/client/ui/GristTooltips.ts | 3 +++
 app/common/gristUrls.ts        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/client/ui/GristTooltips.ts b/app/client/ui/GristTooltips.ts
index 9b7b2554..e212987d 100644
--- a/app/client/ui/GristTooltips.ts
+++ b/app/client/ui/GristTooltips.ts
@@ -147,6 +147,9 @@ see or edit which parts of your document.')
     dom('div', {style: 'margin-top: 8px;'}, t('Example: {{example}}', {
       example: dom.create(buildHighlightedCode, 'choice.Role == "Manager"', {}, {style: 'margin-top: 8px;'}),
     })),
+    dom('div',
+      cssLink({href: commonUrls.helpFilteringReferenceChoices, target: '_blank'}, t('Learn more.')),
+    ),
     ...args,
   ),
 };
diff --git a/app/common/gristUrls.ts b/app/common/gristUrls.ts
index 69f2fa2a..903c3206 100644
--- a/app/common/gristUrls.ts
+++ b/app/common/gristUrls.ts
@@ -86,6 +86,7 @@ export const commonUrls = {
   helpTelemetryLimited: "https://support.getgrist.com/telemetry-limited",
   helpCalendarWidget: "https://support.getgrist.com/widget-calendar",
   helpLinkKeys: "https://support.getgrist.com/examples/2021-04-link-keys",
+  helpFilteringReferenceChoices: "https://support.getgrist.com/col-refs/#filtering-reference-choices-in-dropdown",
   freeCoachingCall: getFreeCoachingCallUrl(),
   contactSupport: getContactSupportUrl(),
   plans: "https://www.getgrist.com/pricing",

From f405ae715b28e1f8c04d56f1efb65533401657fe Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Sat, 30 Mar 2024 11:39:08 +0100
Subject: [PATCH 31/45] Bump dependencies versions

---
 app/client/ui/HomeImports.ts               |  7 ++++---
 app/common/UserAPI.ts                      |  5 +++--
 app/server/lib/MinIOExternalStorage.ts     |  4 ++--
 package.json                               | 22 +++++++++++-----------
 test/formula-dataset/runCompletion_impl.ts |  2 +-
 test/gen-server/apiUtils.ts                |  2 +-
 test/gen-server/testUtils.ts               |  2 +-
 test/server/gristClient.ts                 |  2 +-
 test/server/lib/DocApi.ts                  | 14 +++++++-------
 9 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/client/ui/HomeImports.ts b/app/client/ui/HomeImports.ts
index 84d23af7..466e3e73 100644
--- a/app/client/ui/HomeImports.ts
+++ b/app/client/ui/HomeImports.ts
@@ -6,6 +6,7 @@ import {AppModel, reportError} from 'app/client/models/AppModel';
 import {IProgress} from 'app/client/models/NotifyModel';
 import {openFilePicker} from 'app/client/ui/FileDialog';
 import {byteString} from 'app/common/gutil';
+import { AxiosProgressEvent } from 'axios';
 import {Disposable} from 'grainjs';
 
 /**
@@ -39,9 +40,9 @@ export async function fileImport(
     const timezone = await guessTimezone();
 
     if (workspaceId === "unsaved") {
-      function onUploadProgress(ev: ProgressEvent) {
-        if (ev.lengthComputable) {
-          progress.setUploadProgress(ev.loaded / ev.total * 100);   // percentage complete
+      function onUploadProgress(ev: AxiosProgressEvent) {
+        if (ev.event.lengthComputable) {
+          progress.setUploadProgress(ev.event.loaded / ev.event.total * 100);   // percentage complete
         }
       }
       return await app.api.importUnsavedDoc(files[0], {timezone, onUploadProgress});
diff --git a/app/common/UserAPI.ts b/app/common/UserAPI.ts
index df4d0788..c4b06bdb 100644
--- a/app/common/UserAPI.ts
+++ b/app/common/UserAPI.ts
@@ -22,6 +22,7 @@ import {
   WebhookUpdate
 } from 'app/common/Triggers';
 import {addCurrentOrgToPath, getGristConfig} from 'app/common/urlUtils';
+import { AxiosProgressEvent } from 'axios';
 import omitBy from 'lodash/omitBy';
 
 
@@ -405,7 +406,7 @@ export interface UserAPI {
   importUnsavedDoc(material: UploadType, options?: {
     filename?: string,
     timezone?: string,
-    onUploadProgress?: (ev: ProgressEvent) => void,
+    onUploadProgress?: (ev: AxiosProgressEvent) => void,
   }): Promise<string>;
   deleteUser(userId: number, name: string): Promise<void>;
   getBaseUrl(): string;  // Get the prefix for all the endpoints this object wraps.
@@ -816,7 +817,7 @@ export class UserAPIImpl extends BaseAPI implements UserAPI {
   public async importUnsavedDoc(material: UploadType, options?: {
     filename?: string,
     timezone?: string,
-    onUploadProgress?: (ev: ProgressEvent) => void,
+    onUploadProgress?: (ev: AxiosProgressEvent) => void,
   }): Promise<string> {
     options = options || {};
     const formData = this.newFormData();
diff --git a/app/server/lib/MinIOExternalStorage.ts b/app/server/lib/MinIOExternalStorage.ts
index 73258887..9179be64 100644
--- a/app/server/lib/MinIOExternalStorage.ts
+++ b/app/server/lib/MinIOExternalStorage.ts
@@ -7,7 +7,7 @@ import * as minio from 'minio';
 
 // The minio typings appear to be quite stale. Extend them here to avoid
 // lots of casts to any.
-type MinIOClient = minio.Client & {
+export type MinIOClient = minio.Client & {
   statObject(bucket: string, key: string, options: {versionId?: string}): Promise<MinIOBucketItemStat>;
   getObject(bucket: string, key: string, options: {versionId?: string}): Promise<IncomingMessage>;
   listObjects(bucket: string, key: string, recursive: boolean,
@@ -132,7 +132,7 @@ export class MinIOExternalStorage implements ExternalStorage {
         v.lastModified && (v as any).versionId &&
         (options?.includeDeleteMarkers || !(v as any).isDeleteMarker))
       .map(v => ({
-        lastModified: v.lastModified.toISOString(),
+        lastModified: v.lastModified!.toISOString(),
         // Circumvent inconsistency of MinIO API with versionId by casting it to string
         // PR to MinIO so we don't have to do that anymore:
         // https://github.com/minio/minio-js/pull/1193
diff --git a/package.json b/package.json
index 417abef8..2633c484 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "esbuild-loader": "2.19.0",
     "eslint": "8.18.0",
     "http-proxy": "1.18.1",
-    "i18next-scanner": "4.1.0",
+    "i18next-scanner": "^4.4.0",
     "mocha": "10.2.0",
     "mocha-webdriver": "0.3.2",
     "moment-locales-webpack-plugin": "^1.2.0",
@@ -106,7 +106,7 @@
     "tmp-promise": "1.0.5",
     "ts-interface-builder": "0.3.2",
     "typescript": "4.7.4",
-    "webpack": "5.73.0",
+    "webpack": "^5.91.0",
     "webpack-cli": "4.10.0",
     "why-is-node-running": "2.0.3"
   },
@@ -123,19 +123,19 @@
     "accept-language-parser": "1.5.0",
     "ace-builds": "1.23.3",
     "async-mutex": "0.2.4",
-    "axios": "0.21.2",
+    "axios": "^1.6.8",
     "backbone": "1.3.3",
-    "bootstrap": "3.3.5",
+    "bootstrap": "^3.4.1",
     "bootstrap-datepicker": "1.9.0",
     "bowser": "2.7.0",
     "collect-js-deps": "^0.1.1",
     "color-convert": "2.0.1",
     "commander": "9.3.0",
     "components-jqueryui": "1.12.1",
-    "connect-redis": "3.4.0",
+    "connect-redis": "^3.4.0",
     "cookie": "0.5.0",
     "cookie-parser": "1.4.3",
-    "csv": "4.0.0",
+    "csv": "^6.3.8",
     "currency-symbol-map": "5.1.0",
     "diff-match-patch": "1.0.5",
     "dompurify": "3.0.6",
@@ -143,7 +143,7 @@
     "engine.io": "^6.5.4",
     "engine.io-client": "^6.5.3",
     "exceljs": "4.2.1",
-    "express": "4.18.2",
+    "express": "^4.19.2",
     "file-type": "16.5.4",
     "fs-extra": "7.0.0",
     "grain-rpc": "0.1.7",
@@ -160,12 +160,12 @@
     "js-yaml": "3.14.1",
     "jsdom": "^23.0.0",
     "jsesc": "3.0.2",
-    "jsonwebtoken": "8.3.0",
+    "jsonwebtoken": "^9.0.2",
     "knockout": "3.5.0",
     "locale-currency": "0.0.2",
     "lodash": "4.17.21",
     "marked": "4.2.12",
-    "minio": "7.0.32",
+    "minio": "^7.1.3",
     "moment": "2.29.4",
     "moment-timezone": "0.5.35",
     "morgan": "1.9.1",
@@ -184,13 +184,13 @@
     "randomcolor": "0.5.3",
     "redis": "3.1.1",
     "redlock": "3.1.2",
-    "saml2-js": "2.0.5",
+    "saml2-js": "^4.0.2",
     "short-uuid": "3.1.1",
     "slugify": "1.6.6",
     "swagger-ui-dist": "5.11.0",
     "tmp": "0.0.33",
     "ts-interface-checker": "1.0.2",
-    "typeorm": "0.3.9",
+    "typeorm": "^0.3.20",
     "underscore": "1.12.1",
     "uuid": "3.3.2",
     "winston": "2.4.5",
diff --git a/test/formula-dataset/runCompletion_impl.ts b/test/formula-dataset/runCompletion_impl.ts
index 5582faf2..eb915492 100644
--- a/test/formula-dataset/runCompletion_impl.ts
+++ b/test/formula-dataset/runCompletion_impl.ts
@@ -31,7 +31,7 @@ import { ActiveDoc, Deps as ActiveDocDeps } from "app/server/lib/ActiveDoc";
 import { DEPS, sendForCompletion } from "app/server/lib/Assistance";
 import log from 'app/server/lib/log';
 import crypto from 'crypto';
-import parse from 'csv-parse/lib/sync';
+import { parse } from 'csv-parse/sync';
 import fetch, {RequestInfo, RequestInit, Response} from 'node-fetch';
 import * as fs from "fs";
 import JSZip from "jszip";
diff --git a/test/gen-server/apiUtils.ts b/test/gen-server/apiUtils.ts
index f269be63..5737a496 100644
--- a/test/gen-server/apiUtils.ts
+++ b/test/gen-server/apiUtils.ts
@@ -254,7 +254,7 @@ export class TestSession {
   ) {
     const resp = await axios.get(`${this.home.getOwnUrl()}/test/session`,
                                  {validateStatus: (s => s < 400), headers: this.headers});
-    const cookie = this.headers.Cookie || resp.headers['set-cookie'][0];
+    const cookie = this.headers.Cookie || resp.headers['set-cookie']![0];
     const cid = decodeURIComponent(cookie.split('=')[1].split(';')[0]);
     const sessionId = this.home.getSessions().getSessionIdFromCookie(cid);
     const scopedSession = this.home.getSessions().getOrCreateSession(sessionId as string, org, '');
diff --git a/test/gen-server/testUtils.ts b/test/gen-server/testUtils.ts
index 68b37c3f..ef14ad00 100644
--- a/test/gen-server/testUtils.ts
+++ b/test/gen-server/testUtils.ts
@@ -21,7 +21,7 @@ export function configForUser(username: string): AxiosRequestConfig {
     }
   };
   if (username !== 'Anonymous') {
-    config.headers.Authorization = 'Bearer api_key_for_' + username.toLowerCase();
+    config.headers!.Authorization = 'Bearer api_key_for_' + username.toLowerCase();
   }
   return config;
 }
diff --git a/test/server/gristClient.ts b/test/server/gristClient.ts
index 911e7e8d..194e1210 100644
--- a/test/server/gristClient.ts
+++ b/test/server/gristClient.ts
@@ -166,7 +166,7 @@ export async function openClient(server: FlexServer, email: string, org: string,
   const headers: Record<string, string> = {};
   if (!emailHeader) {
     const resp = await axios.get(`${server.getOwnUrl()}/test/session`);
-    const cookie = resp.headers['set-cookie'][0];
+    const cookie = resp.headers['set-cookie']![0];
     if (email !== 'anon@getgrist.com') {
       const cid = decodeURIComponent(cookie.split('=')[1].split(';')[0]);
       const comm = server.getComm();
diff --git a/test/server/lib/DocApi.ts b/test/server/lib/DocApi.ts
index 0372e7bb..156353f3 100644
--- a/test/server/lib/DocApi.ts
+++ b/test/server/lib/DocApi.ts
@@ -1351,10 +1351,10 @@ function testDocApi() {
           }
         } else {
           if (sort) {
-            config.headers['x-sort'] = sort.join(',');
+            config.headers!['x-sort'] = sort.join(',');
           }
           if (limit) {
-            config.headers['x-limit'] = String(limit);
+            config.headers!['x-limit'] = String(limit);
           }
         }
         return axios.get(url.href, config);
@@ -4976,11 +4976,11 @@ function testDocApi() {
 
       const chimpyConfig = configForUser("Chimpy");
       const anonConfig = configForUser("Anonymous");
-      delete chimpyConfig.headers["X-Requested-With"];
-      delete anonConfig.headers["X-Requested-With"];
+      delete chimpyConfig.headers!["X-Requested-With"];
+      delete anonConfig.headers!["X-Requested-With"];
 
       // Target a more realistic Host than "localhost:port"
-      anonConfig.headers.Host = chimpyConfig.headers.Host = 'api.example.com';
+      anonConfig.headers!.Host = chimpyConfig.headers!.Host = 'api.example.com';
 
       const url = `${serverUrl}/api/docs/${docId}/tables/Table1/records`;
       const data = { records: [{ fields: {} }] };
@@ -4989,7 +4989,7 @@ function testDocApi() {
       const forbiddenOrigin = 'http://evil.com';
 
       // Normal same origin requests
-      anonConfig.headers.Origin = allowedOrigin;
+      anonConfig.headers!.Origin = allowedOrigin;
       let response: AxiosResponse;
       for (response of [
         await axios.post(url, data, anonConfig),
@@ -5005,7 +5005,7 @@ function testDocApi() {
 
       // Cross origin requests from untrusted origin.
       for (const config of [anonConfig, chimpyConfig]) {
-        config.headers.Origin = forbiddenOrigin;
+        config.headers!.Origin = forbiddenOrigin;
         for (response of [
           await axios.post(url, data, config),
           await axios.get(url, config),

From 920eb09b3b6c2b6bcd0a9eccdc0f5a9a42b3915a Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Mon, 1 Apr 2024 12:51:51 +0200
Subject: [PATCH 32/45] Fix ManyFetches test so it checks TEST_REDIS_URL is set

---
 test/server/lib/ManyFetches.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/server/lib/ManyFetches.ts b/test/server/lib/ManyFetches.ts
index 0565bf88..59db2551 100644
--- a/test/server/lib/ManyFetches.ts
+++ b/test/server/lib/ManyFetches.ts
@@ -28,6 +28,12 @@ describe('ManyFetches', function() {
   let docs: TestServer;
   let userApi: UserAPIImpl;
 
+  before(function () {
+    if (!process.env.TEST_REDIS_URL) {
+      return this.skip();
+    }
+  });
+
   beforeEach(async function() {
     oldEnv = new EnvironmentSnapshot();   // Needed for prepareDatabase, which changes process.env
     log.info("Starting servers");

From 14061fd5acf6641c3a82dd46d49c9910ee15d01d Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Mon, 1 Apr 2024 14:50:02 +0200
Subject: [PATCH 33/45] Remove catw

---
 buildtools/build.sh          |  1 -
 buildtools/webpack.config.js | 15 +++++++++++++++
 package.json                 |  2 +-
 sandbox/watch.sh             |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/buildtools/build.sh b/buildtools/build.sh
index c87643a6..813a1d1b 100755
--- a/buildtools/build.sh
+++ b/buildtools/build.sh
@@ -19,4 +19,3 @@ buildtools/update_type_info.sh app
 webpack --config $WEBPACK_CONFIG --mode production
 webpack --config buildtools/webpack.check.js --mode production
 webpack --config buildtools/webpack.api.config.js --mode production
-cat app/client/*.css app/client/*/*.css > static/bundle.css
diff --git a/buildtools/webpack.config.js b/buildtools/webpack.config.js
index 92e2c1dd..5d255697 100644
--- a/buildtools/webpack.config.js
+++ b/buildtools/webpack.config.js
@@ -1,7 +1,11 @@
 const fs = require('fs');
 const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
+const MergeIntoSingleFilePlugin = require('webpack-merge-and-include-globally');
 const { ProvidePlugin } = require('webpack');
 const path = require('path');
+const glob = require('glob');
+
+const cssFiles = glob.sync('app/client/**/*.css');
 
 // Get path to top-level node_modules if in a yarn workspace.
 // Otherwise node_modules one level up won't get resolved.
@@ -17,6 +21,7 @@ module.exports = {
     boot: "app/client/boot",
     billing: "app/client/billingMain",
     form: "app/client/formMain",
+    css: cssFiles,
     // Include client test harness if it is present (it won't be in
     // docker image).
     ...(fs.existsSync("test/client-harness/client.js") ? {
@@ -74,6 +79,10 @@ module.exports = {
       { test: /\.js$/,
         use: ["source-map-loader"],
         enforce: "pre"
+      },
+      {
+        test: /\.css$/,
+        type: 'asset/resource'
       }
     ]
   },
@@ -83,6 +92,12 @@ module.exports = {
       process: 'process',
       Buffer: ['buffer', 'Buffer']
     }),
+    new MergeIntoSingleFilePlugin({
+      files: {
+        "bundle.css": cssFiles
+      },
+      chunks: "css"
+    }),
     // To strip all locales except “en”
     new MomentLocalesPlugin()
   ],
diff --git a/package.json b/package.json
index 2633c484..9f0bb66d 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,6 @@
     "@typescript-eslint/eslint-plugin": "5.29.0",
     "@typescript-eslint/parser": "5.29.0",
     "app-module-path": "2.2.0",
-    "catw": "1.0.1",
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
     "chance": "1.0.16",
@@ -108,6 +107,7 @@
     "typescript": "4.7.4",
     "webpack": "^5.91.0",
     "webpack-cli": "4.10.0",
+    "webpack-merge-and-include-globally": "^2.3.4",
     "why-is-node-running": "2.0.3"
   },
   "dependencies": {
diff --git a/sandbox/watch.sh b/sandbox/watch.sh
index cac00b81..24aaa783 100755
--- a/sandbox/watch.sh
+++ b/sandbox/watch.sh
@@ -16,7 +16,7 @@ if [ ! -e _build ]; then
 fi
 
 tsc --build -w --preserveWatchOutput $PROJECT &
-catw app/client/*.css app/client/*/*.css -o static/bundle.css -v & webpack --config $WEBPACK_CONFIG --mode development --watch &
+webpack --config $WEBPACK_CONFIG --mode development --watch &
 NODE_PATH=_build:_build/stubs:_build/ext nodemon ${NODE_INSPECT:+--inspect} --delay 1 -w _build/app/server -w _build/app/common _build/stubs/app/server/server.js &
 
 wait

From 0224f2270598a77081cc6dc1ceb2fdd8d715317d Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Mon, 1 Apr 2024 18:55:48 +0200
Subject: [PATCH 34/45] Fix warning in webpack

---
 buildtools/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildtools/webpack.config.js b/buildtools/webpack.config.js
index 5d255697..098d2884 100644
--- a/buildtools/webpack.config.js
+++ b/buildtools/webpack.config.js
@@ -21,7 +21,7 @@ module.exports = {
     boot: "app/client/boot",
     billing: "app/client/billingMain",
     form: "app/client/formMain",
-    css: cssFiles,
+    css: new Set(cssFiles),
     // Include client test harness if it is present (it won't be in
     // docker image).
     ...(fs.existsSync("test/client-harness/client.js") ? {

From 2f4122905d68b9c24f9e27e22ea5746f728d18dc Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Tue, 2 Apr 2024 09:05:13 +0200
Subject: [PATCH 35/45] Remove useless export

---
 app/server/lib/MinIOExternalStorage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/lib/MinIOExternalStorage.ts b/app/server/lib/MinIOExternalStorage.ts
index 9179be64..e341d158 100644
--- a/app/server/lib/MinIOExternalStorage.ts
+++ b/app/server/lib/MinIOExternalStorage.ts
@@ -7,7 +7,7 @@ import * as minio from 'minio';
 
 // The minio typings appear to be quite stale. Extend them here to avoid
 // lots of casts to any.
-export type MinIOClient = minio.Client & {
+type MinIOClient = minio.Client & {
   statObject(bucket: string, key: string, options: {versionId?: string}): Promise<MinIOBucketItemStat>;
   getObject(bucket: string, key: string, options: {versionId?: string}): Promise<IncomingMessage>;
   listObjects(bucket: string, key: string, recursive: boolean,

From 9bacfc828737d613603635d3f89325d868e0db1f Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Sat, 6 Apr 2024 12:18:23 +0200
Subject: [PATCH 36/45] Use chokidar to bundle css files

---
 buildtools/build.sh          |  1 +
 buildtools/webpack.config.js | 11 -----------
 package.json                 |  2 +-
 sandbox/watch.sh             |  2 ++
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/buildtools/build.sh b/buildtools/build.sh
index 813a1d1b..c87643a6 100755
--- a/buildtools/build.sh
+++ b/buildtools/build.sh
@@ -19,3 +19,4 @@ buildtools/update_type_info.sh app
 webpack --config $WEBPACK_CONFIG --mode production
 webpack --config buildtools/webpack.check.js --mode production
 webpack --config buildtools/webpack.api.config.js --mode production
+cat app/client/*.css app/client/*/*.css > static/bundle.css
diff --git a/buildtools/webpack.config.js b/buildtools/webpack.config.js
index 098d2884..f7ecea7d 100644
--- a/buildtools/webpack.config.js
+++ b/buildtools/webpack.config.js
@@ -1,11 +1,7 @@
 const fs = require('fs');
 const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
-const MergeIntoSingleFilePlugin = require('webpack-merge-and-include-globally');
 const { ProvidePlugin } = require('webpack');
 const path = require('path');
-const glob = require('glob');
-
-const cssFiles = glob.sync('app/client/**/*.css');
 
 // Get path to top-level node_modules if in a yarn workspace.
 // Otherwise node_modules one level up won't get resolved.
@@ -21,7 +17,6 @@ module.exports = {
     boot: "app/client/boot",
     billing: "app/client/billingMain",
     form: "app/client/formMain",
-    css: new Set(cssFiles),
     // Include client test harness if it is present (it won't be in
     // docker image).
     ...(fs.existsSync("test/client-harness/client.js") ? {
@@ -92,12 +87,6 @@ module.exports = {
       process: 'process',
       Buffer: ['buffer', 'Buffer']
     }),
-    new MergeIntoSingleFilePlugin({
-      files: {
-        "bundle.css": cssFiles
-      },
-      chunks: "css"
-    }),
     // To strip all locales except “en”
     new MomentLocalesPlugin()
   ],
diff --git a/package.json b/package.json
index 9f0bb66d..86fd0932 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
     "chance": "1.0.16",
+    "chokidar-cli": "^3.0.0",
     "esbuild-loader": "2.19.0",
     "eslint": "8.18.0",
     "http-proxy": "1.18.1",
@@ -107,7 +108,6 @@
     "typescript": "4.7.4",
     "webpack": "^5.91.0",
     "webpack-cli": "4.10.0",
-    "webpack-merge-and-include-globally": "^2.3.4",
     "why-is-node-running": "2.0.3"
   },
   "dependencies": {
diff --git a/sandbox/watch.sh b/sandbox/watch.sh
index 24aaa783..6cb7a750 100755
--- a/sandbox/watch.sh
+++ b/sandbox/watch.sh
@@ -16,6 +16,8 @@ if [ ! -e _build ]; then
 fi
 
 tsc --build -w --preserveWatchOutput $PROJECT &
+css_files="app/client/**/*.css"
+chokidar "${css_files}" -c "bash -O globstar -c 'cat ${css_files} > static/bundle.css'" &
 webpack --config $WEBPACK_CONFIG --mode development --watch &
 NODE_PATH=_build:_build/stubs:_build/ext nodemon ${NODE_INSPECT:+--inspect} --delay 1 -w _build/app/server -w _build/app/common _build/stubs/app/server/server.js &
 

From 54a8f63f285c79a3b0f051648d840601ff0ffa7a Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Sat, 6 Apr 2024 12:23:56 +0200
Subject: [PATCH 37/45] Fix yarn.lock

---
 yarn.lock | 1880 +++++++++++++++++++++++++++--------------------------
 1 file changed, 969 insertions(+), 911 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 70ffd71e..0287d530 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -334,6 +334,13 @@
   optionalDependencies:
     node-gyp "8.x"
 
+"@gulpjs/to-absolute-glob@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz#1fc2460d3953e1d9b9f2dfdb4bcc99da4710c021"
+  integrity sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==
+  dependencies:
+    is-negated-glob "^1.0.0"
+
 "@humanwhocodes/config-array@^0.9.2":
   version "0.9.5"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
@@ -348,6 +355,18 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
@@ -356,15 +375,6 @@
     "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/gen-mapping@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"
-  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
 "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
@@ -374,11 +384,25 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
+  dependencies:
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.7"
   resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz"
   integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
 
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
 "@jridgewell/set-array@^1.0.0":
   version "1.1.1"
   resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"
@@ -389,20 +413,38 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
+
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
+  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
 
 "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.13"
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@jridgewell/trace-mapping@^0.3.9":
   version "0.3.13"
   resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"
   integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
@@ -462,6 +504,35 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@oozcitak/dom@1.15.8":
+  version "1.15.8"
+  resolved "https://registry.yarnpkg.com/@oozcitak/dom/-/dom-1.15.8.tgz#0c0c7bb54cfdaadc07fd637913e706101721d15d"
+  integrity sha512-MoOnLBNsF+ok0HjpAvxYxR4piUhRDCEWK0ot3upwOOHYudJd30j6M+LNcE8RKpwfnclAX9T66nXXzkytd29XSw==
+  dependencies:
+    "@oozcitak/infra" "1.0.8"
+    "@oozcitak/url" "1.0.4"
+    "@oozcitak/util" "8.3.8"
+
+"@oozcitak/infra@1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@oozcitak/infra/-/infra-1.0.8.tgz#b0b089421f7d0f6878687608301fbaba837a7d17"
+  integrity sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==
+  dependencies:
+    "@oozcitak/util" "8.3.8"
+
+"@oozcitak/url@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@oozcitak/url/-/url-1.0.4.tgz#ca8b1c876319cf5a648dfa1123600a6aa5cda6ba"
+  integrity sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==
+  dependencies:
+    "@oozcitak/infra" "1.0.8"
+    "@oozcitak/util" "8.3.8"
+
+"@oozcitak/util@8.3.8":
+  version "8.3.8"
+  resolved "https://registry.yarnpkg.com/@oozcitak/util/-/util-8.3.8.tgz#10f65fe1891fd8cde4957360835e78fd1936bfdd"
+  integrity sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==
+
 "@otplib/core@^12.0.1":
   version "12.0.1"
   resolved "https://registry.npmjs.org/@otplib/core/-/core-12.0.1.tgz"
@@ -500,6 +571,11 @@
     "@otplib/plugin-crypto" "^12.0.1"
     "@otplib/plugin-thirty-two" "^12.0.1"
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@popperjs/core@2.3.3":
   version "2.3.3"
   resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.3.3.tgz"
@@ -550,10 +626,10 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
-"@sqltools/formatter@^1.2.2":
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.3.tgz"
-  integrity sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg==
+"@sqltools/formatter@^1.2.5":
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.5.tgz#3abc203c79b8c3e90fd6c156a0c62d5403520e12"
+  integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==
 
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
@@ -682,11 +758,16 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^0.0.51":
+"@types/estree@*":
   version "0.0.51"
   resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
+"@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"
@@ -1107,125 +1188,125 @@
     "@typescript-eslint/types" "5.29.0"
     eslint-visitor-keys "^3.3.0"
 
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
 
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+"@webassemblyjs/helper-buffer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
 
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/helper-wasm-section@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
 
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-opt" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/wast-printer" "1.12.1"
 
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+"@webassemblyjs/wasm-gen@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+"@webassemblyjs/wasm-opt@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+"@webassemblyjs/wast-printer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^1.2.0":
@@ -1245,6 +1326,11 @@
   resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"
   integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
 
+"@xmldom/xmldom@^0.8.5", "@xmldom/xmldom@^0.8.6", "@xmldom/xmldom@^0.8.8":
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
@@ -1305,15 +1391,10 @@ acorn-class-fields@^0.3.7:
   dependencies:
     acorn-private-class-elements "^0.2.7"
 
-acorn-dynamic-import@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
-  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -1382,10 +1463,10 @@ acorn@^8.0.4, acorn@^8.8.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
   integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
-acorn@^8.4.1, acorn@^8.5.0:
-  version "8.7.1"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.7.1, acorn@^8.8.2:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
@@ -1455,7 +1536,12 @@ ansi-regex@^5.0.1:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^3.2.1:
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -1469,6 +1555,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 any-base@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz"
@@ -1479,18 +1570,18 @@ any-promise@^1.0.0:
   resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"
   integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
 
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+anymatch@^3.1.3, anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -1500,18 +1591,11 @@ app-module-path@2.2.0:
   resolved "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz"
   integrity sha1-ZBqlXft9am8KgUHEucCqULbCTdU=
 
-app-root-path@^3.0.0:
+app-root-path@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.1.0.tgz#5971a2fc12ba170369a7a1ef018c71e6e47c2e86"
   integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==
 
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
-  integrity sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==
-  dependencies:
-    buffer-equal "^1.0.0"
-
 "aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
@@ -1579,26 +1663,11 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-filter@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"
-  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-array-map@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"
-  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
-
-array-reduce@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"
-  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -1638,23 +1707,23 @@ async-mutex@0.2.4:
   dependencies:
     tslib "^2.0.0"
 
-async@^2.1.5, async@^2.5.0:
+async@^2.5.0:
   version "2.6.3"
   resolved "https://registry.npmjs.org/async/-/async-2.6.3.tgz"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
     lodash "^4.17.14"
 
-async@^3.1.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
-  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
-
 async@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/async/-/async-3.2.0.tgz"
   integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
+async@^3.2.4:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+
 async@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/async/-/async-1.0.0.tgz"
@@ -1670,12 +1739,14 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-axios@0.21.2:
-  version "0.21.2"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz"
-  integrity sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==
+axios@^1.6.8:
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
+  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
   dependencies:
-    follow-redirects "^1.14.0"
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 backbone@1.3.3:
   version "1.3.3"
@@ -1689,6 +1760,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+bare-events@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.2.tgz#a98a41841f98b2efe7ecc5c5468814469b018078"
+  integrity sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==
+
 base64-js@^1.2.0, base64-js@^1.3.0, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
@@ -1748,7 +1824,16 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-block-stream2@^2.0.0:
+bl@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273"
+  integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==
+  dependencies:
+    buffer "^6.0.3"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+block-stream2@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.1.0.tgz#ac0c5ef4298b3857796e05be8ebed72196fa054b"
   integrity sha512-suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg==
@@ -1780,13 +1865,13 @@ bn.js@^5.1.1:
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz"
   integrity sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -1794,7 +1879,7 @@ body-parser@1.20.1:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -1805,10 +1890,10 @@ bootstrap-datepicker@1.9.0:
   dependencies:
     jquery ">=1.7.1 <4.0.0"
 
-bootstrap@3.3.5:
-  version "3.3.5"
-  resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.5.tgz"
-  integrity sha1-F3ereSmbEo2H3OfL2G/cRqxpwLE=
+bootstrap@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
+  integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
 
 bowser@2.7.0:
   version "2.7.0"
@@ -1856,10 +1941,10 @@ brorand@^1.0.1, brorand@^1.1.0:
   resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
 
-browser-or-node@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-1.3.0.tgz#f2a4e8568f60263050a6714b2cc236bb976647a7"
-  integrity sha512-0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==
+browser-or-node@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-2.1.1.tgz#738790b3a86a8fc020193fa581273fbe65eaea0f"
+  integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
 
 browser-pack@^6.0.1:
   version "6.1.0"
@@ -1998,15 +2083,15 @@ browserify@^14.4.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
-browserslist@^4.14.5:
-  version "4.21.0"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz"
-  integrity sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==
+browserslist@^4.21.10:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
+  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
   dependencies:
-    caniuse-lite "^1.0.30001358"
-    electron-to-chromium "^1.4.164"
-    node-releases "^2.0.5"
-    update-browserslist-db "^1.0.0"
+    caniuse-lite "^1.0.30001587"
+    electron-to-chromium "^1.4.668"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
 
 browserslist@^4.21.3:
   version "4.21.4"
@@ -2028,11 +2113,6 @@ buffer-equal-constant-time@1.0.1:
   resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
   integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
 
-buffer-equal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
-  integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"
@@ -2149,30 +2229,15 @@ camelcase@^6.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001358:
-  version "1.0.30001359"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001359.tgz"
-  integrity sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw==
-
 caniuse-lite@^1.0.30001400:
   version "1.0.30001441"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e"
   integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==
 
-catw@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/catw/-/catw-1.0.1.tgz"
-  integrity sha1-hHqqlFJ/Lk2XMD4OkXXheSSrDsU=
-  dependencies:
-    defined "~0.0.0"
-    glob "~3.2.7"
-    globwatcher "~1.2.2"
-    minimist "~1.1.1"
-    resolve "~0.6.1"
-    shallow-copy "~0.0.1"
-    shell-quote "~1.4.0"
-    stream-combiner "~0.0.2"
-    through "~2.3.4"
+caniuse-lite@^1.0.30001587:
+  version "1.0.30001606"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz#b4d5f67ab0746a3b8b5b6d1f06e39c51beb39a9e"
+  integrity sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==
 
 chai-as-promised@7.1.1, chai-as-promised@^7.1.1:
   version "7.1.1"
@@ -2238,7 +2303,7 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.1.0:
+chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2256,6 +2321,16 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
+chokidar-cli@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chokidar-cli/-/chokidar-cli-3.0.0.tgz#29283666063b9e167559d30f247ff8fc48794eb7"
+  integrity sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ==
+  dependencies:
+    chokidar "^3.5.2"
+    lodash.debounce "^4.0.8"
+    lodash.throttle "^4.1.1"
+    yargs "^13.3.0"
+
 chokidar@3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -2286,6 +2361,21 @@ chokidar@^3.2.2:
   optionalDependencies:
     fsevents "~2.1.2"
 
+chokidar@^3.5.2:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
@@ -2333,6 +2423,15 @@ cli-highlight@^2.1.11:
     parse5-htmlparser2-tree-adapter "^6.0.0"
     yargs "^16.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"
@@ -2351,10 +2450,14 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
 
 clone-deep@^4.0.0, clone-deep@^4.0.1:
   version "4.0.1"
@@ -2377,25 +2480,11 @@ clone-stats@^1.0.0:
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
   integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==
 
-clone@^2.1.1:
+clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-coffee-script@*:
-  version "1.12.7"
-  resolved "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"
-  integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
-
 collect-js-deps@^0.1.1:
   version "0.1.1"
   resolved "https://registry.npmjs.org/collect-js-deps/-/collect-js-deps-0.1.1.tgz"
@@ -2532,12 +2621,12 @@ configstore@^5.0.1:
     write-file-atomic "^3.0.0"
     xdg-basedir "^4.0.0"
 
-connect-redis@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.0.tgz"
-  integrity sha512-YKPSO9tLwzUr8jzhsGMdSJUxevWrDt0ggXRcTMb+mtnJ/vWGlWV7RC4VUMgqvZv3uTGDFye8Bf7d6No0oSVkOQ==
+connect-redis@^3.4.0:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/connect-redis/-/connect-redis-3.4.2.tgz#e339fd0b00e1381e130101556657669cc855417e"
+  integrity sha512-ozA1Z0GDnsCJECfNyNJOqPuW3Fk43fUbKC65Sa/V9hkCBNtXsFU2xtTOVsQGUsflpywuJMgGOV4xrnKzIPFqvA==
   dependencies:
-    debug "^4.0.1"
+    debug "^4.1.1"
     redis "^2.8.0"
 
 console-browserify@^1.1.0:
@@ -2567,11 +2656,21 @@ content-type@~1.0.4:
   resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.7.0:
+content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
+convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 convert-source-map@~1.1.0:
   version "1.1.3"
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"
@@ -2605,6 +2704,11 @@ cookie@0.5.0:
   resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+
 cookie@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
@@ -2670,7 +2774,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2679,7 +2783,7 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypto-browserify@^3.0.0, crypto-browserify@^3.12.0:
+crypto-browserify@^3.0.0:
   version "3.12.0"
   resolved "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"
   integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
@@ -2708,32 +2812,30 @@ cssstyle@^3.0.0:
   dependencies:
     rrweb-cssom "^0.6.0"
 
-csv-generate@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/csv-generate/-/csv-generate-2.2.2.tgz"
-  integrity sha512-ETG8JGG0xOt2f1JzxrAcQONVc4+7srUdXeyLnow60ntBr+qiNCFTqi+ME6g0vZ4hMCbrwNrDPJPOYVznAeDDHQ==
+csv-generate@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-4.4.0.tgz#007575d825e537d9690e687f82fdf4a745e8c226"
+  integrity sha512-geM01acNPZ0wr4/9sKev5fCzFG/tsc/NbuFWrhLc47M1zQyUdEJH65+cxTLIVafEwhBjIYwQ7fdOL9roBqVltQ==
 
-csv-parse@^3.1.2:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/csv-parse/-/csv-parse-3.2.0.tgz"
-  integrity sha512-1IBQ7PYHc5h6AXS4nyGsmicttbpUbNvlsgKxhvouh+kRaVug8xBWSiIeWdbPUQgjKG88hEGYjdU29fX73mo+6Q==
+csv-parse@^5.5.5:
+  version "5.5.5"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.5.tgz#68a271a9092877b830541805e14c8a80e6a22517"
+  integrity sha512-erCk7tyU3yLWAhk6wvKxnyPtftuy/6Ak622gOO7BCJ05+TYffnPCJF905wmOQm+BpkX54OdAl8pveJwUdpnCXQ==
 
-csv-stringify@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.npmjs.org/csv-stringify/-/csv-stringify-4.3.1.tgz"
-  integrity sha512-VRjPYIUzex5kfbsOY7LaJcNE2qMWGQQAanb3/Vv85WbOgA+dAfDNfwntRvv335icJgGYrnTX403WxJxRVpLDFA==
+csv-stringify@^6.4.6:
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-6.4.6.tgz#9ccf87cb8b017c96673a9fa061768c8ba83e8b98"
+  integrity sha512-h2V2XZ3uOTLilF5dPIptgUfN/o2ia/80Ie0Lly18LAnw5s8Eb7kt8rfxSUy24AztJZas9f6DPZpVlzDUtFt/ag==
+
+csv@^6.3.8:
+  version "6.3.8"
+  resolved "https://registry.yarnpkg.com/csv/-/csv-6.3.8.tgz#c38ad67093622b9fcbce0afaeaab29d1bddeeceb"
+  integrity sha512-gRh3yiT9bHBA5ka2yOpyFqAVu/ZpwWzajMUR/es0ljevAE88WyHBuMUy7jzd2o5j6LYQesEO/AyhbQ9BhbDXUA==
   dependencies:
-    lodash.get "~4.4.2"
-
-csv@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/csv/-/csv-4.0.0.tgz"
-  integrity sha512-rj3+HMMIKskeiipg0VkFSx7o8FhrNSfIb1nLT6AkJ0gx7mdGU5JsJGv4tmk0vl1jV/h/TfWJOwh1tpbbhVqNKA==
-  dependencies:
-    csv-generate "^2.2.2"
-    csv-parse "^3.1.2"
-    csv-stringify "^4.3.1"
-    stream-transform "^1.0.7"
+    csv-generate "^4.4.0"
+    csv-parse "^5.5.5"
+    csv-stringify "^6.4.6"
+    stream-transform "^3.3.1"
 
 currency-symbol-map@5.1.0:
   version "5.1.0"
@@ -2758,17 +2860,17 @@ data-urls@^5.0.0:
     whatwg-mimetype "^4.0.0"
     whatwg-url "^14.0.0"
 
-date-fns@^2.28.0:
-  version "2.29.2"
-  resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.29.2.tgz"
-  integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA==
+dayjs@^1.11.9:
+  version "1.11.10"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
+  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
 
 dayjs@^1.8.34:
   version "1.10.6"
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz"
   integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.6.0:
+debug@2.6.9, debug@^2.2.0:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2782,7 +2884,7 @@ debug@4:
   dependencies:
     ms "2.1.2"
 
-debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1:
+debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2857,24 +2959,11 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
-define-properties@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
-  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
-  dependencies:
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
   integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
-defined@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"
-  integrity sha1-817qfXBekzuvE7LwOz+D2SFAOz4=
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
@@ -3001,10 +3090,10 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv@^16.0.0:
-  version "16.0.2"
-  resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.0.2.tgz"
-  integrity sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==
+dotenv@^16.0.3:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
 
 double-ended-queue@2.1.0-0, double-ended-queue@^2.1.0-0:
   version "2.1.0-0"
@@ -3023,20 +3112,10 @@ duplexer3@^0.1.4:
   resolved "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"
   integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
-duplexer@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
 ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
   version "1.0.11"
@@ -3050,21 +3129,16 @@ ee-first@1.1.1:
   resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.5.6:
-  version "2.7.4"
-  resolved "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"
-  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
-
-electron-to-chromium@^1.4.164:
-  version "1.4.170"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.170.tgz"
-  integrity sha512-rZ8PZLhK4ORPjFqLp9aqC4/S1j4qWFsPPz13xmWdrbBkU/LlxMcok+f+6f8YnQ57MiZwKtOaW15biZZsY5Igvw==
-
 electron-to-chromium@^1.4.251:
   version "1.4.284"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
+electron-to-chromium@^1.4.668:
+  version "1.4.729"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.729.tgz#8477d21e2a50993781950885b2731d92ad532c00"
+  integrity sha512-bx7+5Saea/qu14kmPTDHQxkp2UnziG3iajUQu3BxFvCOnpAJdDbMV4rSl+EqFDkkpNNVUFlR1kDfpL59xfy1HA==
+
 elliptic@^6.0.0, elliptic@^6.5.2:
   version "6.5.4"
   resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"
@@ -3088,6 +3162,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"
@@ -3110,7 +3189,7 @@ encoding@^0.1.12:
   dependencies:
     iconv-lite "^0.6.2"
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -3149,10 +3228,10 @@ engine.io@^6.5.4:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.9.3:
-  version "5.9.3"
-  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz"
-  integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
+enhanced-resolve@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
+  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -3187,15 +3266,10 @@ err-code@^2.0.2:
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
-
-es6-error@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"
-  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
+es-module-lexer@^1.2.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236"
+  integrity sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==
 
 esbuild-android-64@0.14.47:
   version "0.14.47"
@@ -3345,7 +3419,7 @@ escape-goat@^2.0.0:
   resolved "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz"
   integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
@@ -3540,17 +3614,17 @@ exit-on-epipe@~1.0.1:
   resolved "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"
   integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
 
-express@4.18.2:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+express@^4.19.2:
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -3577,7 +3651,7 @@ express@4.18.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend@^3.0.0, extend@^3.0.2:
+extend@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -3605,6 +3679,11 @@ fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-fifo@^1.1.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
+
 fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
@@ -3636,18 +3715,25 @@ fast-text-encoding@^1.0.0:
   resolved "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"
   integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==
 
-fast-xml-parser@^3.17.5:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736"
-  integrity sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==
+fast-xml-parser@^4.2.2:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz#190f9d99097f0c8f2d3a0e681a10404afca052ff"
+  integrity sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==
   dependencies:
-    strnum "^1.0.4"
+    strnum "^1.0.5"
 
 fastest-levenshtein@^1.0.12:
   version "1.0.12"
   resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"
   integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
 
+fastq@^1.13.0:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
+  dependencies:
+    reusify "^1.0.4"
+
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
@@ -3704,6 +3790,13 @@ find-up@5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
@@ -3730,23 +3823,15 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-flush-write-stream@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
 follow-redirects@^1.0.0:
   version "1.15.2"
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
-follow-redirects@^1.14.0:
-  version "1.15.1"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+follow-redirects@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -3755,6 +3840,14 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -3822,13 +3915,13 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
-  integrity sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==
+fs-mkdirp-stream@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz#1e82575c4023929ad35cf69269f84f1a8c973aa7"
+  integrity sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==
   dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
+    graceful-fs "^4.2.8"
+    streamx "^2.12.0"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -3933,7 +4026,7 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2:
   version "1.1.1"
   resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
@@ -3965,14 +4058,6 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
 glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -3980,46 +4065,33 @@ glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.1, glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
     is-glob "^4.0.3"
 
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
-  integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==
+glob-stream@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-8.0.1.tgz#d01fcf6ac393d0956de530593c4cbc0b91af7e91"
+  integrity sha512-gkw+JQajGXmzky/Lil3/tQ+p96YKkqJwxiakKgfDGpNBNFHxklnK2nPmYukEW6n8/HmcAfeSvT6xCdRafidwZQ==
   dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
+    "@gulpjs/to-absolute-glob" "^4.0.0"
+    anymatch "^3.1.3"
+    fastq "^1.13.0"
+    glob-parent "^6.0.2"
+    is-glob "^4.0.3"
     is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
+    normalize-path "^3.0.0"
+    now-and-later "^3.0.0"
+    streamx "^2.12.5"
 
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@*, glob@^7.1.0, glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
@@ -4032,7 +4104,30 @@ glob@7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
+glob@^10.3.10:
+  version "10.3.12"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
+  integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.6"
+    minimatch "^9.0.1"
+    minipass "^7.0.4"
+    path-scurry "^1.10.2"
+
+glob@^7.1.0, glob@^7.1.4:
+  version "7.1.6"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.3, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4044,14 +4139,6 @@ glob@^7.1.1, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~3.2.7:
-  version "3.2.11"
-  resolved "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"
-  integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
 global-dirs@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz"
@@ -4083,16 +4170,6 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globwatcher@~1.2.2:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/globwatcher/-/globwatcher-1.2.3.tgz"
-  integrity sha1-qqlCf3DfhxIRzuNUjaCN+lB9OcE=
-  dependencies:
-    coffee-script "*"
-    glob "*"
-    minimatch "*"
-    q "^1.0.1"
-
 google-auth-library@^7.0.2:
   version "7.3.0"
   resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.3.0.tgz"
@@ -4151,17 +4228,12 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
 graceful-fs@^4.1.2:
   version "4.2.4"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.8:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4171,6 +4243,11 @@ graceful-fs@^4.2.2:
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
+graceful-fs@^4.2.4, graceful-fs@^4.2.6:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
 grain-rpc@0.1.7:
   version "0.1.7"
   resolved "https://registry.npmjs.org/grain-rpc/-/grain-rpc-0.1.7.tgz"
@@ -4222,13 +4299,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
-  dependencies:
-    get-intrinsic "^1.1.1"
-
 has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"
@@ -4440,13 +4510,12 @@ i18next-http-middleware@3.3.2:
   resolved "https://registry.yarnpkg.com/i18next-http-middleware/-/i18next-http-middleware-3.3.2.tgz#6a24fee6bde44952a5af24364d43fa32f6c1b9b6"
   integrity sha512-PSeLXQXr9Qiv9Q3GCWCoIJenKVbxCcVsXb7VMp/mOprV4gu+AMJT7VHw4+QEf6oYW6GU31QSLnfDpLNoSMtx3g==
 
-i18next-scanner@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/i18next-scanner/-/i18next-scanner-4.1.0.tgz#15979dcfd6eca494e08c8a8ff784e8740ab7d318"
-  integrity sha512-KAZRc6ZBqtn/Qa5fRRTn7D8effB84K9m3g9SQcKD+tocMajEVW2zfFP397qNxROad1VFjUGT8aw1Y6ZcfnIzlg==
+i18next-scanner@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/i18next-scanner/-/i18next-scanner-4.4.0.tgz#aefa12bd2b879ddcd164669b192c15f2cdff81ba"
+  integrity sha512-bgnVEfoFHLVxfXNQtsFFzexB/5kwgDZZkZ6+AnCmyaFKEQQbtMkgPgLHlMZ0deIIEG6KN/tYAus5ZJzng2Ac9g==
   dependencies:
     acorn "^8.0.4"
-    acorn-dynamic-import "^4.0.0"
     acorn-jsx "^5.3.1"
     acorn-stage3 "^4.0.0"
     acorn-walk "^8.0.0"
@@ -4463,8 +4532,8 @@ i18next-scanner@4.1.0:
     parse5 "^6.0.0"
     sortobject "^4.0.0"
     through2 "^4.0.0"
-    vinyl "^2.2.0"
-    vinyl-fs "^3.0.1"
+    vinyl "^3.0.0"
+    vinyl-fs "^4.0.0"
 
 i18next@*:
   version "22.4.5"
@@ -4487,7 +4556,7 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.6.3, iconv-lite@^0.6.2:
+iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -4631,14 +4700,6 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
 is-arguments@^1.0.4:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
@@ -4654,7 +4715,7 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-buffer@^1.1.0, is-buffer@^1.1.5:
+is-buffer@^1.1.0:
   version "1.1.6"
   resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -4685,7 +4746,7 @@ is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
@@ -4707,13 +4768,6 @@ is-generator-function@^1.0.7:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
-  dependencies:
-    is-extglob "^2.1.0"
-
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -4776,13 +4830,6 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
 is-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"
@@ -4804,33 +4851,16 @@ is-typedarray@^1.0.0:
   resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
 is-unicode-supported@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==
-
 is-valid-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
   integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==
 
-is-windows@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
 is-yarn-global@^0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz"
@@ -4856,6 +4886,15 @@ isstream@0.1.x:
   resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
+jackspeak@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"
@@ -4885,6 +4924,14 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@3.14.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@3.14.1:
   version "3.14.1"
   resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
@@ -5010,12 +5057,12 @@ jsonparse@^1.2.0:
   resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonwebtoken@8.3.0:
-  version "8.3.0"
-  resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.3.0.tgz"
-  integrity sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag==
+jsonwebtoken@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
+  integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
   dependencies:
-    jws "^3.1.5"
+    jws "^3.2.2"
     lodash.includes "^4.3.0"
     lodash.isboolean "^3.0.3"
     lodash.isinteger "^4.0.4"
@@ -5024,6 +5071,7 @@ jsonwebtoken@8.3.0:
     lodash.isstring "^4.0.1"
     lodash.once "^4.0.0"
     ms "^2.1.1"
+    semver "^7.5.4"
 
 jszip@^3.10.1, jszip@^3.5.0:
   version "3.10.1"
@@ -5058,9 +5106,9 @@ jwa@^2.0.0:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
-jws@^3.1.5:
+jws@^3.2.2:
   version "3.2.2"
-  resolved "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
   integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
   dependencies:
     jwa "^1.4.1"
@@ -5113,12 +5161,10 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
-  integrity sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==
-  dependencies:
-    flush-write-stream "^1.0.2"
+lead@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lead/-/lead-4.0.0.tgz#5317a49effb0e7ec3a0c8fb9c1b24fb716aab939"
+  integrity sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==
 
 levn@^0.4.1:
   version "0.4.1"
@@ -5168,6 +5214,14 @@ locale-currency@0.0.2:
   resolved "https://registry.npmjs.org/locale-currency/-/locale-currency-0.0.2.tgz"
   integrity sha1-4skGB1Y85HpZ+VWeRacOJOTbS20=
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
@@ -5182,10 +5236,10 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash-node@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
-  integrity sha1-6oL3sQDHM9GkKvdoAeUGEF4qgOw=
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.defaults@^4.2.0:
   version "4.2.0"
@@ -5207,7 +5261,7 @@ lodash.flatten@^4.4.0:
   resolved "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"
   integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
 
-lodash.get@^4.4.2, lodash.get@~4.4.2:
+lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
@@ -5282,6 +5336,11 @@ lodash.once@^4.0.0:
   resolved "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"
   integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
+
 lodash.union@^4.6.0:
   version "4.6.0"
   resolved "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"
@@ -5322,10 +5381,10 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
+lru-cache@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
+  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -5447,7 +5506,7 @@ mime-types@^2.1.12:
   dependencies:
     mime-db "1.46.0"
 
-mime-types@^2.1.14, mime-types@^2.1.27, mime-types@~2.1.34:
+mime-types@^2.1.27, mime-types@^2.1.35, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -5481,21 +5540,6 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@*:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
-  integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
 minimatch@5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
@@ -5510,38 +5554,37 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^9.0.1:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz"
-  integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
-
-minio@7.0.32:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/minio/-/minio-7.0.32.tgz#fed6a4679c5954d3efc6df47f73f7e7124446e2c"
-  integrity sha512-txa7Vr0N24MKzeAybP/wY1jxbLnfGHXwZYyfFXuMW55HX2+HOcKEIgH4hU6Qj/kiMgyXs/ozHjAuLIDrR8nwLg==
+minio@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/minio/-/minio-7.1.3.tgz#86dc95f3671045d6956920db757bb63f25bf20ee"
+  integrity sha512-xPrLjWkTT5E7H7VnzOjF//xBp9I40jYB4aWhb2xTFopXXfw+Wo82DDWngdUju7Doy3Wk7R8C4LAgwhLHHnf0wA==
   dependencies:
-    async "^3.1.0"
-    block-stream2 "^2.0.0"
-    browser-or-node "^1.3.0"
+    async "^3.2.4"
+    block-stream2 "^2.1.0"
+    browser-or-node "^2.1.1"
     buffer-crc32 "^0.2.13"
-    crypto-browserify "^3.12.0"
-    es6-error "^4.1.1"
-    fast-xml-parser "^3.17.5"
+    fast-xml-parser "^4.2.2"
     ipaddr.js "^2.0.1"
     json-stream "^1.0.0"
     lodash "^4.17.21"
-    mime-types "^2.1.14"
-    mkdirp "^0.5.1"
-    query-string "^7.1.1"
-    through2 "^3.0.1"
+    mime-types "^2.1.35"
+    query-string "^7.1.3"
+    through2 "^4.0.2"
     web-encoding "^1.1.5"
-    xml "^1.0.0"
-    xml2js "^0.4.15"
+    xml "^1.0.1"
+    xml2js "^0.5.0"
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -5601,6 +5644,11 @@ minipass@^4.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.1.tgz#2b9408c6e81bb8b338d600fb3685e375a370a057"
   integrity sha512-V9esFpNbK0arbN3fm2sxDKqMYgIp7XtVdE4Esj+PE4Qaaxdg1wIw48ITQIOn1sc8xXSmUviVL3cyjMqPlrVkiA==
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
 minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -5609,7 +5657,7 @@ minizlib@^2.0.0, minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.1:
+"mkdirp@>=0.5 0":
   version "0.5.5"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -5621,6 +5669,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+mkdirp@^2.1.3:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
+  integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
+
 mocha-webdriver@0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/mocha-webdriver/-/mocha-webdriver-0.3.2.tgz#cfaf7cab18335993eeaccbd43f2547a236d0cd26"
@@ -5832,11 +5885,6 @@ node-forge@^0.10.0:
   resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-forge@^0.7.0:
-  version "0.7.6"
-  resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"
-  integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
-
 node-gyp-build@^4.2.2:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
@@ -5858,10 +5906,10 @@ node-gyp@8.x:
     tar "^6.1.2"
     which "^2.0.2"
 
-node-releases@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz"
-  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 node-releases@^2.0.6:
   version "2.0.8"
@@ -5898,14 +5946,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
+normalize-path@3.0.0, normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -5915,12 +5956,12 @@ normalize-url@^4.1.0:
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
+now-and-later@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-3.0.0.tgz#cdc045dc5b894b35793cf276cc3206077bb7302d"
+  integrity sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==
   dependencies:
-    once "^1.3.2"
+    once "^1.4.0"
 
 npm-run-path@^3.1.0:
   version "3.1.0"
@@ -5969,21 +6010,6 @@ object-inspect@^1.9.0:
   resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"
   integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.0.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
-
 oidc-token-hash@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz#9a229f0a1ce9d4fc89bcaee5478c97a889e7b7b6"
@@ -6008,7 +6034,7 @@ on-headers@~1.0.1, on-headers@~1.0.2:
   resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -6037,13 +6063,6 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
-  integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==
-  dependencies:
-    readable-stream "^2.0.1"
-
 os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"
@@ -6068,7 +6087,7 @@ p-cancelable@^1.0.0:
   resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-limit@^2.2.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -6082,6 +6101,13 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
@@ -6188,10 +6214,10 @@ path-browserify@~0.0.0:
   resolved "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"
   integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -6218,6 +6244,14 @@ path-platform@~0.11.15:
   resolved "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
   integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=
 
+path-scurry@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
+  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
@@ -6398,16 +6432,16 @@ printj@~1.1.0:
   resolved "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"
   integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
 
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
   integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
 process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
@@ -6450,6 +6484,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
@@ -6472,14 +6511,6 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"
@@ -6488,15 +6519,6 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.5:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
@@ -6524,11 +6546,6 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
-q@^1.0.1:
-  version "1.5.1"
-  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
 qrcode@1.5.0:
   version "1.5.0"
   resolved "https://registry.npmjs.org/qrcode/-/qrcode-1.5.0.tgz"
@@ -6553,7 +6570,7 @@ qs@^6.7.0:
   dependencies:
     side-channel "^1.0.4"
 
-query-string@^7.1.1:
+query-string@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328"
   integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==
@@ -6583,6 +6600,11 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+queue-tick@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
+  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
+
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"
@@ -6613,10 +6635,10 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"
@@ -6640,7 +6662,7 @@ read-only-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -6649,7 +6671,7 @@ read-only-stream@^2.0.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
+readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.6:
   version "2.3.7"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -6770,10 +6792,10 @@ redlock@3.1.2:
   dependencies:
     bluebird "^3.3.3"
 
-reflect-metadata@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"
-  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+reflect-metadata@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
+  integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
 
 regenerator-runtime@^0.13.11:
   version "0.13.11"
@@ -6804,32 +6826,15 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
-  integrity sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
-
-remove-trailing-separator@^1.0.1:
+remove-trailing-separator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
+replace-ext@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
+  integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==
 
 require-directory@^2.1.1:
   version "2.1.1"
@@ -6863,12 +6868,12 @@ resolve-from@^5.0.0:
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
-  integrity sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==
+resolve-options@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-2.0.0.tgz#a1a57a9949db549dd075de3f5550675f02f1e4c5"
+  integrity sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==
   dependencies:
-    value-or-function "^3.0.0"
+    value-or-function "^4.0.0"
 
 resolve@1.1.7:
   version "1.1.7"
@@ -6892,11 +6897,6 @@ resolve@^1.9.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@~0.6.1:
-  version "0.6.3"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz"
-  integrity sha1-3ZV5gufnNt699TtYpN2RdUV13UY=
-
 responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"
@@ -6968,19 +6968,18 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-saml2-js@2.0.5:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/saml2-js/-/saml2-js-2.0.5.tgz"
-  integrity sha512-8OOZxeMxpdtEszFbvR01TcjKb8g/HsE1si/EGdTawSQY0KgwtvPTG2Ctc5xhEW45xhU+j+UrU5ttZxC72YXSUQ==
+saml2-js@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/saml2-js/-/saml2-js-4.0.2.tgz#84b63866d805703852eea33d0db3d978be560cda"
+  integrity sha512-03EEy/d55+4Ltl6jXAcRY1Fkrcpwt3K6a0T4N4Bfq5IKu9TbJqYG5AoXSi1P4lKvwvxQ99v5RPeoffSsumRrEg==
   dependencies:
-    async "^2.5.0"
-    debug "^2.6.0"
+    "@xmldom/xmldom" "^0.8.6"
+    async "^3.2.0"
+    debug "^4.3.0"
     underscore "^1.8.0"
-    xml-crypto "^0.10.0"
-    xml-encryption "^0.11.0"
-    xml2js "^0.4.0"
-    xmlbuilder "~2.2.0"
-    xmldom "^0.1.0"
+    xml-crypto "^3.0.1"
+    xml-encryption "^3.0.2"
+    xmlbuilder2 "^2.4.0"
 
 sax@>=0.6.0:
   version "1.2.4"
@@ -7001,7 +7000,7 @@ saxes@^6.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -7010,6 +7009,15 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 selenium-webdriver@^4.11.1:
   version "4.13.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.13.0.tgz#1e06bab7adedb308e3635131bc75bd32038261d5"
@@ -7043,6 +7051,13 @@ semver@^7.3.5, semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.4:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -7062,13 +7077,20 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
+serialize-javascript@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
   integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-static@1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
@@ -7109,11 +7131,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shallow-copy@~0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"
-  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
-
 shasum-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz"
@@ -7146,16 +7163,6 @@ shell-quote@^1.6.1:
   resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shell-quote@~1.4.0:
-  version "1.4.3"
-  resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz"
-  integrity sha1-lSxE4LHtkBPvU5WBecxkPod3Rms=
-  dependencies:
-    array-filter "~0.0.0"
-    array-map "~0.0.0"
-    array-reduce "~0.0.0"
-    jsonify "~0.0.0"
-
 short-uuid@3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/short-uuid/-/short-uuid-3.1.1.tgz"
@@ -7173,11 +7180,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"
@@ -7188,6 +7190,11 @@ signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 simple-concat@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"
@@ -7331,12 +7338,12 @@ stream-combiner2@^1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
-stream-combiner@~0.0.2:
-  version "0.0.4"
-  resolved "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
+stream-composer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/stream-composer/-/stream-composer-1.0.2.tgz#7ee61ca1587bf5f31b2e29aa2093cbf11442d152"
+  integrity sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==
   dependencies:
-    duplexer "~0.1.1"
+    streamx "^2.13.2"
 
 stream-http@^2.0.0:
   version "2.8.3"
@@ -7349,11 +7356,6 @@ stream-http@^2.0.0:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
 stream-splicer@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz"
@@ -7362,16 +7364,35 @@ stream-splicer@^2.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-stream-transform@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.npmjs.org/stream-transform/-/stream-transform-1.0.8.tgz"
-  integrity sha512-1q+dL790Ps0NV33rISMq9OLtfDA9KMJZdo1PHZXE85orrWsM4FAh8CVyAOTHO0rhyeM138KNPngBPrx33bFsxw==
+stream-transform@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-3.3.1.tgz#f8bb6a811e505056b6a215c466e4c2760347189f"
+  integrity sha512-BL8pv9QL8Ikd11oZwlRDp1qYMhGR0i50zI9ltoijKGc4ubQWal/Rc4p6SYJp1TBOGpE0uAGchwbxOZ1ycwTuqQ==
+
+streamx@^2.12.0, streamx@^2.12.5, streamx@^2.13.2, streamx@^2.14.0:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614"
+  integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==
+  dependencies:
+    fast-fifo "^1.1.0"
+    queue-tick "^1.0.1"
+  optionalDependencies:
+    bare-events "^2.2.0"
 
 strict-uri-encode@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
   integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
 
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -7381,7 +7402,7 @@ strict-uri-encode@^2.0.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -7399,6 +7420,15 @@ string-width@^4.0.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
@@ -7425,7 +7455,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^5.1.0:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -7439,6 +7476,13 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -7449,7 +7493,7 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-strnum@^1.0.4:
+strnum@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db"
   integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==
@@ -7547,29 +7591,36 @@ tdigest@^0.1.1:
   dependencies:
     bintrees "1.0.2"
 
+teex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12"
+  integrity sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==
+  dependencies:
+    streamx "^2.12.5"
+
 term-size@^2.1.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz"
   integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
 
-terser-webpack-plugin@^5.1.3:
-  version "5.3.3"
-  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz"
-  integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.7"
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    terser "^5.7.2"
+    serialize-javascript "^6.0.1"
+    terser "^5.26.0"
 
-terser@^5.7.2:
-  version "5.14.2"
-  resolved "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz"
-  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
+terser@^5.26.0:
+  version "5.30.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2"
+  integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -7597,15 +7648,7 @@ thirty-two@^1.0.2:
   resolved "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz"
   integrity sha1-TKL//AKlEpDSdEueP1V2k8prYno=
 
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
+through2@^2.0.0, through2@^2.0.1:
   version "2.0.5"
   resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -7613,22 +7656,14 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
-through2@^4.0.0:
+through2@^4.0.0, through2@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
   integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
   dependencies:
     readable-stream "3"
 
-"through@>=2.2.7 <3", through@~2.3.4:
+"through@>=2.2.7 <3":
   version "2.3.8"
   resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -7662,14 +7697,6 @@ tmp@^0.2.0, tmp@^0.2.1:
   dependencies:
     rimraf "^3.0.0"
 
-to-absolute-glob@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
-  integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==
-  dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
@@ -7692,12 +7719,12 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
-  integrity sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==
+to-through@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/to-through/-/to-through-3.0.0.tgz#bf4956eaca5a0476474850a53672bed6906ace54"
+  integrity sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==
   dependencies:
-    through2 "^2.0.3"
+    streamx "^2.12.5"
 
 toidentifier@1.0.0:
   version "1.0.0"
@@ -7781,10 +7808,10 @@ tslib@^2.0.0:
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"
   integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
-tslib@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+tslib@^2.5.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 tsutils@^3.21.0:
   version "3.21.0"
@@ -7840,28 +7867,26 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeorm@0.3.9:
-  version "0.3.9"
-  resolved "https://registry.npmjs.org/typeorm/-/typeorm-0.3.9.tgz"
-  integrity sha512-xNcE44D4hn74n7pjuMog9hRgep+BiO3IBpjEaQZ8fb56zsDz7xHT1GAeWwmGuuU+4nDEELp2mIqgSCR+zxR7Jw==
+typeorm@^0.3.20:
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.20.tgz#4b61d737c6fed4e9f63006f88d58a5e54816b7ab"
+  integrity sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==
   dependencies:
-    "@sqltools/formatter" "^1.2.2"
-    app-root-path "^3.0.0"
+    "@sqltools/formatter" "^1.2.5"
+    app-root-path "^3.1.0"
     buffer "^6.0.3"
-    chalk "^4.1.0"
+    chalk "^4.1.2"
     cli-highlight "^2.1.11"
-    date-fns "^2.28.0"
-    debug "^4.3.3"
-    dotenv "^16.0.0"
-    glob "^7.2.0"
-    js-yaml "^4.1.0"
-    mkdirp "^1.0.4"
-    reflect-metadata "^0.1.13"
+    dayjs "^1.11.9"
+    debug "^4.3.4"
+    dotenv "^16.0.3"
+    glob "^10.3.10"
+    mkdirp "^2.1.3"
+    reflect-metadata "^0.2.1"
     sha.js "^2.4.11"
-    tslib "^2.3.1"
-    uuid "^8.3.2"
-    xml2js "^0.4.23"
-    yargs "^17.3.1"
+    tslib "^2.5.0"
+    uuid "^9.0.0"
+    yargs "^17.6.2"
 
 typescript@4.7.4:
   version "4.7.4"
@@ -7890,11 +7915,6 @@ umd@^3.0.0:
   resolved "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"
   integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==
 
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
-
 undeclared-identifiers@^1.1.2:
   version "1.1.3"
   resolved "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"
@@ -7937,14 +7957,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz"
@@ -7983,10 +7995,10 @@ unzipper@^0.10.11:
     readable-stream "~2.3.6"
     setimmediate "~1.0.4"
 
-update-browserslist-db@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz"
-  integrity sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -8098,73 +8110,81 @@ uuid@^3.3.2:
   resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2:
+uuid@^8.0.0, uuid@^8.3.0:
   version "8.3.2"
   resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
-  integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==
+value-or-function@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-4.0.0.tgz#70836b6a876a010dc3a2b884e7902e9db064378d"
+  integrity sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-vinyl-fs@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
+vinyl-contents@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-contents/-/vinyl-contents-2.0.0.tgz#cc2ba4db3a36658d069249e9e36d9e2b41935d89"
+  integrity sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==
   dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
+    bl "^5.0.0"
+    vinyl "^3.0.0"
+
+vinyl-fs@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-4.0.0.tgz#06cb36efc911c6e128452f230b96584a9133c3a1"
+  integrity sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==
+  dependencies:
+    fs-mkdirp-stream "^2.0.1"
+    glob-stream "^8.0.0"
+    graceful-fs "^4.2.11"
+    iconv-lite "^0.6.3"
     is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
+    lead "^4.0.0"
+    normalize-path "3.0.0"
+    resolve-options "^2.0.0"
+    stream-composer "^1.0.2"
+    streamx "^2.14.0"
+    to-through "^3.0.0"
+    value-or-function "^4.0.0"
+    vinyl "^3.0.0"
+    vinyl-sourcemap "^2.0.0"
 
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
-  integrity sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==
+vinyl-sourcemap@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz#422f410a0ea97cb54cebd698d56a06d7a22e0277"
+  integrity sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==
   dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
+    convert-source-map "^2.0.0"
+    graceful-fs "^4.2.10"
+    now-and-later "^3.0.0"
+    streamx "^2.12.5"
+    vinyl "^3.0.0"
+    vinyl-contents "^2.0.0"
 
-vinyl@^2.0.0, vinyl@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
-  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
+vinyl@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.0.tgz#11e14732bf56e2faa98ffde5157fe6c13259ff30"
+  integrity sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==
   dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
+    clone "^2.1.2"
     clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
+    remove-trailing-separator "^1.1.0"
+    replace-ext "^2.0.0"
+    teex "^1.0.1"
 
 vm-browserify@~0.0.1:
   version "0.0.4"
@@ -8180,10 +8200,10 @@ w3c-xmlserializer@^5.0.0:
   dependencies:
     xml-name-validator "^5.0.0"
 
-watchpack@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+watchpack@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff"
+  integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -8246,34 +8266,34 @@ webpack-sources@^3.2.3:
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.73.0:
-  version "5.73.0"
-  resolved "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz"
-  integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
+webpack@^5.91.0:
+  version "5.91.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
+  integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.7.1"
+    acorn-import-assertions "^1.9.0"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.9.3"
-    es-module-lexer "^0.9.0"
+    enhanced-resolve "^5.16.0"
+    es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.0"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
-    watchpack "^2.3.1"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
 whatwg-encoding@^3.1.1:
@@ -8381,6 +8401,24 @@ workerpool@6.2.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
@@ -8399,6 +8437,15 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -8439,86 +8486,73 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
-xml-crypto@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.10.1.tgz"
-  integrity sha1-+DL3TM9W8kr8rhFjofyrRNlndKg=
+xml-crypto@^3.0.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-3.2.0.tgz#a9debab572c8e895cff5fb351a8d8be3f6e1962e"
+  integrity sha512-qVurBUOQrmvlgmZqIVBqmb06TD2a/PpEUfFPgD7BuBfjmoH4zgkqaWSIJrnymlCvM2GGt9x+XtJFA+ttoAufqg==
   dependencies:
-    xmldom "=0.1.19"
-    xpath.js ">=0.0.3"
+    "@xmldom/xmldom" "^0.8.8"
+    xpath "0.0.32"
 
-xml-encryption@^0.11.0:
-  version "0.11.2"
-  resolved "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.11.2.tgz"
-  integrity sha512-jVvES7i5ovdO7N+NjgncA326xYKjhqeAnnvIgRnY7ROLCfFqEDLwP0Sxp/30SHG0AXQV1048T5yinOFyvwGFzg==
+xml-encryption@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-3.0.2.tgz#d3cb67d97cdd9673313a42cc0d7fa43ff0886c21"
+  integrity sha512-VxYXPvsWB01/aqVLd6ZMPWZ+qaj0aIdF+cStrVJMcFj3iymwZeI0ABzB3VqMYv48DkSpRhnrXqTUkR34j+UDyg==
   dependencies:
-    async "^2.1.5"
-    ejs "^2.5.6"
-    node-forge "^0.7.0"
-    xmldom "~0.1.15"
-    xpath "0.0.27"
+    "@xmldom/xmldom" "^0.8.5"
+    escape-html "^1.0.3"
+    xpath "0.0.32"
 
 xml-name-validator@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
   integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
 
-xml2js@^0.4.0, xml2js@^0.4.15, xml2js@^0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+xml2js@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
+  integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~11.0.0"
 
-xml@^1.0.0:
+xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
   integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==
 
+xmlbuilder2@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder2/-/xmlbuilder2-2.4.1.tgz#899c783a833188c5a5aa6f3c5428a3963f3e479d"
+  integrity sha512-vliUplZsk5vJnhxXN/mRcij/AE24NObTUm/Zo4vkLusgayO6s3Et5zLEA14XZnY1c3hX5o1ToR0m0BJOPy0UvQ==
+  dependencies:
+    "@oozcitak/dom" "1.15.8"
+    "@oozcitak/infra" "1.0.8"
+    "@oozcitak/util" "8.3.8"
+    "@types/node" "*"
+    js-yaml "3.14.0"
+
 xmlbuilder@~11.0.0:
   version "11.0.1"
   resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
-xmlbuilder@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz"
-  integrity sha1-kyZDDxMNh0NdTECGZDqikm4QWjI=
-  dependencies:
-    lodash-node "~2.4.1"
-
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmldom@=0.1.19:
-  version "0.1.19"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"
-  integrity sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=
-
-xmldom@^0.1.0, xmldom@~0.1.15:
-  version "0.1.31"
-  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
-
 xmlhttprequest-ssl@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
   integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
 
-xpath.js@>=0.0.3:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"
-  integrity sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==
+xpath@0.0.32:
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"
+  integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==
 
-xpath@0.0.27:
-  version "0.0.27"
-  resolved "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz"
-  integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==
-
-xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
@@ -8548,6 +8582,14 @@ yargs-parser@20.2.4:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
+yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
@@ -8561,9 +8603,9 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
+yargs-parser@^21.1.1:
   version "21.1.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
 yargs-unparser@2.0.0:
@@ -8589,6 +8631,22 @@ yargs@16.2.0, yargs@^16.0.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^13.3.0:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
@@ -8606,18 +8664,18 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^17.3.1:
-  version "17.5.1"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"
-  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+yargs@^17.6.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
-    cliui "^7.0.2"
+    cliui "^8.0.1"
     escalade "^3.1.1"
     get-caller-file "^2.0.5"
     require-directory "^2.1.1"
     string-width "^4.2.3"
     y18n "^5.0.5"
-    yargs-parser "^21.0.0"
+    yargs-parser "^21.1.1"
 
 yocto-queue@^0.1.0:
   version "0.1.0"

From 144f09ca36e81ce447fcbb64ec39a358022c0bb1 Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Sat, 6 Apr 2024 13:04:44 +0200
Subject: [PATCH 38/45] Attempt yarn-audit-fix

---
 yarn.lock | 453 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 328 insertions(+), 125 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0287d530..4b484638 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,6 +22,14 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
+"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
+  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
+  dependencies:
+    "@babel/highlight" "^7.24.2"
+    picocolors "^1.0.0"
+
 "@babel/compat-data@^7.20.5":
   version "7.20.10"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
@@ -57,7 +65,7 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.2", "@babel/generator@^7.20.7":
+"@babel/generator@^7.18.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
   integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
@@ -66,6 +74,16 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.24.1":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
+  integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
+  dependencies:
+    "@babel/types" "^7.24.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^2.5.1"
+
 "@babel/helper-compilation-targets@^7.18.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
@@ -82,20 +100,25 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
-"@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
@@ -132,16 +155,33 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
+"@babel/helper-string-parser@^7.23.4":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
+  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
+
 "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
@@ -165,11 +205,26 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
+  integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
 "@babel/parser@^7.18.5", "@babel/parser@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
   integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
 
+"@babel/parser@^7.24.0", "@babel/parser@^7.24.1":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
+  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
+
 "@babel/runtime@^7.17.2":
   version "7.19.0"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz"
@@ -184,7 +239,7 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.16.7", "@babel/template@^7.18.10", "@babel/template@^7.20.7":
+"@babel/template@^7.16.7", "@babel/template@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
   integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ -193,23 +248,32 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.18.5", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7":
-  version "7.20.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.10.tgz#2bf98239597fcec12f842756f186a9dde6d09230"
-  integrity sha512-oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg==
+"@babel/template@^7.22.15":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
+  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    debug "^4.1.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
+
+"@babel/traverse@^7.18.5", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
+  integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
+  dependencies:
+    "@babel/code-frame" "^7.24.1"
+    "@babel/generator" "^7.24.1"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.24.1"
+    "@babel/types" "^7.24.0"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7":
+"@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
   integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
@@ -218,6 +282,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
+  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.7"
   resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"
@@ -1527,9 +1600,9 @@ ansi-colors@4.1.1:
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
@@ -1678,7 +1751,7 @@ arrify@^2.0.0:
   resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-asn1.js@^4.0.0:
+asn1.js@^4.0.0, asn1.js@^4.10.1:
   version "4.10.1"
   resolved "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"
   integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
@@ -1714,12 +1787,7 @@ async@^2.5.0:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/async/-/async-3.2.0.tgz"
-  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
-
-async@^3.2.4:
+async@^3.2.0, async@^3.2.4:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
   integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
@@ -1860,10 +1928,10 @@ bn.js@^4.11.9:
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
-bn.js@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz"
-  integrity sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==
+bn.js@^5.0.0, bn.js@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
+  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
 body-parser@1.20.2:
   version "1.20.2"
@@ -1970,7 +2038,7 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"
   integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
@@ -2001,7 +2069,7 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"
   integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
@@ -2009,19 +2077,29 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
 
-browserify-sign@^4.0.0:
+browserify-rsa@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.1.0.tgz"
-  integrity sha512-VYxo7cDCeYUoBZ0ZCy4UyEUCP3smyBd4DRQM5nrFS1jJjPJjX7rP3oLRpPoWfkhQfyJ0I9ZbHbKafrFD/SGlrg==
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
   dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
+    bn.js "^5.0.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.3.tgz#7afe4c01ec7ee59a89a558a4b75bd85ae62d4208"
+  integrity sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==
+  dependencies:
+    bn.js "^5.2.1"
+    browserify-rsa "^4.1.0"
     create-hash "^1.2.0"
     create-hmac "^1.1.7"
-    elliptic "^6.5.2"
+    elliptic "^6.5.5"
+    hash-base "~3.0"
     inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
+    parse-asn1 "^5.1.7"
+    readable-stream "^2.3.8"
+    safe-buffer "^5.2.1"
 
 browserify-zlib@~0.2.0:
   version "0.2.0"
@@ -2214,6 +2292,17 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -2278,7 +2367,7 @@ chainsaw@~0.1.0:
   dependencies:
     traverse ">=0.3.0 <0.4"
 
-chalk@^2.0.0:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2884,7 +2973,7 @@ debug@4:
   dependencies:
     ms "2.1.2"
 
-debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1:
+debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2892,9 +2981,9 @@ debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.2, debug@^4.3.
     ms "2.1.2"
 
 debug@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
@@ -2959,6 +3048,15 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
+define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
@@ -3139,7 +3237,7 @@ electron-to-chromium@^1.4.668:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.729.tgz#8477d21e2a50993781950885b2731d92ad532c00"
   integrity sha512-bx7+5Saea/qu14kmPTDHQxkp2UnziG3iajUQu3BxFvCOnpAJdDbMV4rSl+EqFDkkpNNVUFlR1kDfpL59xfy1HA==
 
-elliptic@^6.0.0, elliptic@^6.5.2:
+elliptic@^6.0.0:
   version "6.5.4"
   resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"
   integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
@@ -3152,6 +3250,19 @@ elliptic@^6.0.0, elliptic@^6.5.2:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
+elliptic@^6.5.5:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.5.tgz#c715e09f78b6923977610d4c2346d6ce22e6dded"
+  integrity sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"
@@ -3266,6 +3377,18 @@ err-code@^2.0.2:
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
 es-module-lexer@^1.2.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236"
@@ -3823,12 +3946,7 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.0.0:
-  version "1.15.2"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
-
-follow-redirects@^1.15.6:
+follow-redirects@^1.0.0, follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
@@ -3953,6 +4071,11 @@ function-bind@^1.1.1:
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -4022,9 +4145,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
 get-intrinsic@^1.0.2:
   version "1.1.1"
@@ -4044,6 +4167,17 @@ get-intrinsic@^1.1.3:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"
@@ -4299,6 +4433,18 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
+has-proto@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
 has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"
@@ -4342,6 +4488,14 @@ hash-base@^3.0.0:
     readable-stream "^3.6.0"
     safe-buffer "^5.2.0"
 
+hash-base@~3.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
   resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"
@@ -4350,6 +4504,13 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hasown@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
 hdr-histogram-js@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz#0b860534655722b6e3f3e7dca7b78867cf43dcb5"
@@ -4395,12 +4556,7 @@ htmlescape@^1.1.0:
   resolved "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"
   integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
 
-http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
-
-http-cache-semantics@^4.1.0:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -4686,9 +4842,9 @@ interpret@^2.2.0:
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity "sha1-6PNZXTOj6mZJAgQjS3djaWUwcQU= sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -4905,9 +5061,9 @@ jest-worker@^27.4.5:
     supports-color "^8.0.0"
 
 jose@^4.15.1:
-  version "4.15.4"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.4.tgz#02a9a763803e3872cf55f29ecef0dfdcc218cc03"
-  integrity sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==
+  version "4.15.5"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.5.tgz#6475d0f467ecd3c630a1b5dadd2735a7288df706"
+  integrity sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==
 
 joycon@^3.0.1:
   version "3.1.1"
@@ -5030,12 +5186,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
-
-json5@^2.2.1:
+json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -5201,9 +5352,9 @@ loader-utils@^1.1.0:
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -5562,9 +5713,9 @@ minimatch@^9.0.1:
     brace-expansion "^2.0.1"
 
 minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minio@^7.1.3:
   version "7.1.3"
@@ -5754,9 +5905,9 @@ moment@2.29.4:
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 "moment@>= 2.9.0", moment@>=2.14.0:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
 morgan@1.9.1:
   version "1.9.1"
@@ -5869,9 +6020,11 @@ node-fetch@2.6.7:
     whatwg-url "^5.0.0"
 
 node-fetch@^2.3.0:
-  version "2.6.1"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
 
 node-fetch@^2.6.7:
   version "2.6.9"
@@ -6005,6 +6158,11 @@ object-hash@^2.2.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
   integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
 
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
 object-inspect@^1.9.0:
   version "1.9.0"
   resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"
@@ -6168,7 +6326,7 @@ parents@^1.0.0, parents@^1.0.1:
   dependencies:
     path-platform "~0.11.15"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+parse-asn1@^5.0.0:
   version "5.1.5"
   resolved "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"
   integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
@@ -6180,6 +6338,18 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
+parse-asn1@^5.1.7:
+  version "5.1.7"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.7.tgz#73cdaaa822125f9647165625eb45f8a051d2df06"
+  integrity sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==
+  dependencies:
+    asn1.js "^4.10.1"
+    browserify-aes "^1.2.0"
+    evp_bytestokey "^1.0.3"
+    hash-base "~3.0"
+    pbkdf2 "^3.1.2"
+    safe-buffer "^5.2.1"
+
 parse5-htmlparser2-tree-adapter@^6.0.0:
   version "6.0.1"
   resolved "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"
@@ -6283,6 +6453,17 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pbkdf2@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
 peek-readable@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"
@@ -6564,11 +6745,11 @@ qs@6.11.0:
     side-channel "^1.0.4"
 
 qs@^6.7.0:
-  version "6.10.1"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz"
-  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.0.tgz#edd40c3b823995946a8a0b1f208669c7a200db77"
+  integrity sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==
   dependencies:
-    side-channel "^1.0.4"
+    side-channel "^1.0.6"
 
 query-string@^7.1.3:
   version "7.1.3"
@@ -6684,19 +6865,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-readable-stream@~2.3.6:
+readable-stream@^2.3.8, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -6709,6 +6878,18 @@ readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@~2.0.0:
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
 readable-web-to-node-stream@^3.0.0:
   version "3.0.2"
   resolved "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz"
@@ -6958,7 +7139,7 @@ safe-buffer@5.2.0:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
 
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -7040,9 +7221,9 @@ semver@^5.7.1:
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.5, semver@^7.3.7:
   version "7.3.8"
@@ -7106,6 +7287,18 @@ set-blocking@^2.0.0:
   resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
 setimmediate@^1.0.5, setimmediate@~1.0.4:
   version "1.0.5"
   resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"
@@ -7159,9 +7352,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.6.1:
-  version "1.7.2"
-  resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"
-  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
 short-uuid@3.1.1:
   version "3.1.1"
@@ -7180,6 +7373,16 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+side-channel@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"
@@ -8387,9 +8590,9 @@ winston@2.4.5:
     stack-trace "0.0.x"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity "sha1-0sRcbdT7zmIaZvE2y+Mor9BBCzQ= sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
 
 wordwrap@^1.0.0:
   version "1.0.0"

From 71b282669dc7e2d4dc8cddda520755a60aa6a85a Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Sun, 7 Apr 2024 13:29:31 +0200
Subject: [PATCH 39/45] Fix moment version (so the parseDate pass)

---
 yarn.lock | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4b484638..24db1057 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1781,9 +1781,9 @@ async-mutex@0.2.4:
     tslib "^2.0.0"
 
 async@^2.5.0:
-  version "2.6.3"
-  resolved "https://registry.npmjs.org/async/-/async-2.6.3.tgz"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 
@@ -5180,9 +5180,9 @@ json-stream@^1.0.0:
   integrity sha512-H/ZGY0nIAg3QcOwE1QN/rK/Fa7gJn7Ii5obwp6zyPO4xiPNwpIMjqy2gwjBEGqzkF/vSWEIBQCBuN19hYiL6Qg==
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -5343,9 +5343,9 @@ loader-runner@^4.2.0:
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 loader-utils@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -5894,21 +5894,16 @@ moment-locales-webpack-plugin@^1.2.0:
 
 moment-timezone@0.5.35:
   version "0.5.35"
-  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.35.tgz"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.35.tgz#6fa2631bdbe8ff04f6b8753f7199516be6dc9839"
   integrity sha512-cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw==
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.29.4:
+moment@2.29.4, "moment@>= 2.9.0", moment@>=2.14.0:
   version "2.29.4"
-  resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
-"moment@>= 2.9.0", moment@>=2.14.0:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
-  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
-
 morgan@1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"
@@ -7225,14 +7220,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.5, semver@^7.3.7:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.5.4:
+semver@^7.3.5, semver@^7.3.7, semver@^7.5.4:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==

From b04304342dec87a4fc7c5318e13d24d01c47bee3 Mon Sep 17 00:00:00 2001
From: fflorent <florent.git@zeteo.me>
Date: Fri, 12 Apr 2024 16:10:47 +0200
Subject: [PATCH 40/45] Strict version in package.json

---
 package.json | 24 ++++++++++++------------
 yarn.lock    | 34 +++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 86fd0932..13ac678c 100644
--- a/package.json
+++ b/package.json
@@ -90,11 +90,11 @@
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
     "chance": "1.0.16",
-    "chokidar-cli": "^3.0.0",
+    "chokidar-cli": "3.0.0",
     "esbuild-loader": "2.19.0",
     "eslint": "8.18.0",
     "http-proxy": "1.18.1",
-    "i18next-scanner": "^4.4.0",
+    "i18next-scanner": "4.4.0",
     "mocha": "10.2.0",
     "mocha-webdriver": "0.3.2",
     "moment-locales-webpack-plugin": "^1.2.0",
@@ -106,7 +106,7 @@
     "tmp-promise": "1.0.5",
     "ts-interface-builder": "0.3.2",
     "typescript": "4.7.4",
-    "webpack": "^5.91.0",
+    "webpack": "5.91.0",
     "webpack-cli": "4.10.0",
     "why-is-node-running": "2.0.3"
   },
@@ -123,19 +123,19 @@
     "accept-language-parser": "1.5.0",
     "ace-builds": "1.23.3",
     "async-mutex": "0.2.4",
-    "axios": "^1.6.8",
+    "axios": "1.6.8",
     "backbone": "1.3.3",
-    "bootstrap": "^3.4.1",
+    "bootstrap": "3.4.1",
     "bootstrap-datepicker": "1.9.0",
     "bowser": "2.7.0",
     "collect-js-deps": "^0.1.1",
     "color-convert": "2.0.1",
     "commander": "9.3.0",
     "components-jqueryui": "1.12.1",
-    "connect-redis": "^3.4.0",
+    "connect-redis": "3.4.0",
     "cookie": "0.5.0",
     "cookie-parser": "1.4.3",
-    "csv": "^6.3.8",
+    "csv": "6.3.8",
     "currency-symbol-map": "5.1.0",
     "diff-match-patch": "1.0.5",
     "dompurify": "3.0.6",
@@ -143,7 +143,7 @@
     "engine.io": "^6.5.4",
     "engine.io-client": "^6.5.3",
     "exceljs": "4.2.1",
-    "express": "^4.19.2",
+    "express": "4.19.2",
     "file-type": "16.5.4",
     "fs-extra": "7.0.0",
     "grain-rpc": "0.1.7",
@@ -160,12 +160,12 @@
     "js-yaml": "3.14.1",
     "jsdom": "^23.0.0",
     "jsesc": "3.0.2",
-    "jsonwebtoken": "^9.0.2",
+    "jsonwebtoken": "9.0.2",
     "knockout": "3.5.0",
     "locale-currency": "0.0.2",
     "lodash": "4.17.21",
     "marked": "4.2.12",
-    "minio": "^7.1.3",
+    "minio": "7.1.3",
     "moment": "2.29.4",
     "moment-timezone": "0.5.35",
     "morgan": "1.9.1",
@@ -184,13 +184,13 @@
     "randomcolor": "0.5.3",
     "redis": "3.1.1",
     "redlock": "3.1.2",
-    "saml2-js": "^4.0.2",
+    "saml2-js": "4.0.2",
     "short-uuid": "3.1.1",
     "slugify": "1.6.6",
     "swagger-ui-dist": "5.11.0",
     "tmp": "0.0.33",
     "ts-interface-checker": "1.0.2",
-    "typeorm": "^0.3.20",
+    "typeorm": "0.3.20",
     "underscore": "1.12.1",
     "uuid": "3.3.2",
     "winston": "2.4.5",
diff --git a/yarn.lock b/yarn.lock
index 24db1057..4563f441 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1807,7 +1807,7 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-axios@^1.6.8:
+axios@1.6.8:
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
   integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
@@ -1958,7 +1958,7 @@ bootstrap-datepicker@1.9.0:
   dependencies:
     jquery ">=1.7.1 <4.0.0"
 
-bootstrap@^3.4.1:
+bootstrap@3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
@@ -2410,7 +2410,7 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
-chokidar-cli@^3.0.0:
+chokidar-cli@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chokidar-cli/-/chokidar-cli-3.0.0.tgz#29283666063b9e167559d30f247ff8fc48794eb7"
   integrity sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ==
@@ -2710,12 +2710,12 @@ configstore@^5.0.1:
     write-file-atomic "^3.0.0"
     xdg-basedir "^4.0.0"
 
-connect-redis@^3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/connect-redis/-/connect-redis-3.4.2.tgz#e339fd0b00e1381e130101556657669cc855417e"
-  integrity sha512-ozA1Z0GDnsCJECfNyNJOqPuW3Fk43fUbKC65Sa/V9hkCBNtXsFU2xtTOVsQGUsflpywuJMgGOV4xrnKzIPFqvA==
+connect-redis@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/connect-redis/-/connect-redis-3.4.0.tgz#4040dd3755bddbf93478fb84937a74052c31b965"
+  integrity sha512-YKPSO9tLwzUr8jzhsGMdSJUxevWrDt0ggXRcTMb+mtnJ/vWGlWV7RC4VUMgqvZv3uTGDFye8Bf7d6No0oSVkOQ==
   dependencies:
-    debug "^4.1.1"
+    debug "^4.0.1"
     redis "^2.8.0"
 
 console-browserify@^1.1.0:
@@ -2916,7 +2916,7 @@ csv-stringify@^6.4.6:
   resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-6.4.6.tgz#9ccf87cb8b017c96673a9fa061768c8ba83e8b98"
   integrity sha512-h2V2XZ3uOTLilF5dPIptgUfN/o2ia/80Ie0Lly18LAnw5s8Eb7kt8rfxSUy24AztJZas9f6DPZpVlzDUtFt/ag==
 
-csv@^6.3.8:
+csv@6.3.8:
   version "6.3.8"
   resolved "https://registry.yarnpkg.com/csv/-/csv-6.3.8.tgz#c38ad67093622b9fcbce0afaeaab29d1bddeeceb"
   integrity sha512-gRh3yiT9bHBA5ka2yOpyFqAVu/ZpwWzajMUR/es0ljevAE88WyHBuMUy7jzd2o5j6LYQesEO/AyhbQ9BhbDXUA==
@@ -2973,7 +2973,7 @@ debug@4:
   dependencies:
     ms "2.1.2"
 
-debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1:
+debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3737,7 +3737,7 @@ exit-on-epipe@~1.0.1:
   resolved "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"
   integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
 
-express@^4.19.2:
+express@4.19.2:
   version "4.19.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
   integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
@@ -4666,7 +4666,7 @@ i18next-http-middleware@3.3.2:
   resolved "https://registry.yarnpkg.com/i18next-http-middleware/-/i18next-http-middleware-3.3.2.tgz#6a24fee6bde44952a5af24364d43fa32f6c1b9b6"
   integrity sha512-PSeLXQXr9Qiv9Q3GCWCoIJenKVbxCcVsXb7VMp/mOprV4gu+AMJT7VHw4+QEf6oYW6GU31QSLnfDpLNoSMtx3g==
 
-i18next-scanner@^4.4.0:
+i18next-scanner@4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/i18next-scanner/-/i18next-scanner-4.4.0.tgz#aefa12bd2b879ddcd164669b192c15f2cdff81ba"
   integrity sha512-bgnVEfoFHLVxfXNQtsFFzexB/5kwgDZZkZ6+AnCmyaFKEQQbtMkgPgLHlMZ0deIIEG6KN/tYAus5ZJzng2Ac9g==
@@ -5208,7 +5208,7 @@ jsonparse@^1.2.0:
   resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonwebtoken@^9.0.2:
+jsonwebtoken@9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
   integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
@@ -5717,7 +5717,7 @@ minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minio@^7.1.3:
+minio@7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/minio/-/minio-7.1.3.tgz#86dc95f3671045d6956920db757bb63f25bf20ee"
   integrity sha512-xPrLjWkTT5E7H7VnzOjF//xBp9I40jYB4aWhb2xTFopXXfw+Wo82DDWngdUju7Doy3Wk7R8C4LAgwhLHHnf0wA==
@@ -7144,7 +7144,7 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-saml2-js@^4.0.2:
+saml2-js@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/saml2-js/-/saml2-js-4.0.2.tgz#84b63866d805703852eea33d0db3d978be560cda"
   integrity sha512-03EEy/d55+4Ltl6jXAcRY1Fkrcpwt3K6a0T4N4Bfq5IKu9TbJqYG5AoXSi1P4lKvwvxQ99v5RPeoffSsumRrEg==
@@ -8058,7 +8058,7 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeorm@^0.3.20:
+typeorm@0.3.20:
   version "0.3.20"
   resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.20.tgz#4b61d737c6fed4e9f63006f88d58a5e54816b7ab"
   integrity sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==
@@ -8457,7 +8457,7 @@ webpack-sources@^3.2.3:
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.91.0:
+webpack@5.91.0:
   version "5.91.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
   integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==

From b87ade6149bb372af65a057bbcc0432577144968 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:58:34 -0400
Subject: [PATCH 41/45] automated update to translation keys (#957)

Co-authored-by: Paul's Grist Bot <paul+bot@getgrist.com>
---
 static/locales/en.client.json | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/static/locales/en.client.json b/static/locales/en.client.json
index d20814e8..e1ed6496 100644
--- a/static/locales/en.client.json
+++ b/static/locales/en.client.json
@@ -1145,7 +1145,9 @@
         "Build simple forms right in Grist and share in a click with our new widget. {{learnMoreButton}}": "Build simple forms right in Grist and share in a click with our new widget. {{learnMoreButton}}",
         "Forms are here!": "Forms are here!",
         "Learn more": "Learn more",
-        "These rules are applied after all column rules have been processed, if applicable.": "These rules are applied after all column rules have been processed, if applicable."
+        "These rules are applied after all column rules have been processed, if applicable.": "These rules are applied after all column rules have been processed, if applicable.",
+        "Example: {{example}}": "Example: {{example}}",
+        "Filter displayed dropdown values with a condition.": "Filter displayed dropdown values with a condition."
     },
     "DescriptionConfig": {
         "DESCRIPTION": "DESCRIPTION"
@@ -1499,5 +1501,28 @@
         "Checkbox": "Checkbox",
         "Field Format": "Field Format",
         "Switch": "Switch"
+    },
+    "ChoiceEditor": {
+        "Error in dropdown condition": "Error in dropdown condition",
+        "No choices matching condition": "No choices matching condition",
+        "No choices to select": "No choices to select"
+    },
+    "ChoiceListEditor": {
+        "Error in dropdown condition": "Error in dropdown condition",
+        "No choices matching condition": "No choices matching condition",
+        "No choices to select": "No choices to select"
+    },
+    "DropdownConditionConfig": {
+        "Dropdown Condition": "Dropdown Condition",
+        "Invalid columns: {{colIds}}": "Invalid columns: {{colIds}}",
+        "Set dropdown condition": "Set dropdown condition"
+    },
+    "DropdownConditionEditor": {
+        "Enter condition.": "Enter condition."
+    },
+    "ReferenceUtils": {
+        "Error in dropdown condition": "Error in dropdown condition",
+        "No choices matching condition": "No choices matching condition",
+        "No choices to select": "No choices to select"
     }
 }

From ecf242c6c6ecabd4561e200ac5002b991cdf8b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?=
 <jaroslaw.sadzinski@gmail.com>
Date: Mon, 29 Apr 2024 16:54:03 +0200
Subject: [PATCH 42/45] (core) Adding latest version section to the admin
 panel.

Summary:
Update for the admin page to show the latest available version information.
- Latest version is read from docs.getgrist.com by default
- It sends basic information (installationId, deployment type, and version)
- Checks are done only on the page itself
- The actual request is routed through the API (to avoid CORS)

Test Plan: Added new test

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D4238
---
 app/client/lib/timeUtils.ts     |  10 +-
 app/client/ui/AdminPanel.ts     | 303 ++++++++++++++++++++++++++++++--
 app/client/ui2018/checkbox.ts   |  15 +-
 app/common/InstallAPI.ts        |  33 ++++
 app/common/gristUrls.ts         |   2 +
 app/server/lib/FlexServer.ts    |  31 +++-
 app/server/lib/UpdateManager.ts |  39 ++--
 test/gen-server/UpdateChecks.ts |  26 +--
 test/nbrowser/AdminPanel.ts     | 191 +++++++++++++++++++-
 test/server/customUtil.ts       |  28 +++
 10 files changed, 609 insertions(+), 69 deletions(-)

diff --git a/app/client/lib/timeUtils.ts b/app/client/lib/timeUtils.ts
index 637b2a97..3bc3fa85 100644
--- a/app/client/lib/timeUtils.ts
+++ b/app/client/lib/timeUtils.ts
@@ -4,8 +4,14 @@ import moment from 'moment';
  * Given a UTC Date ISO 8601 string (the doc updatedAt string), gives a reader-friendly
  * relative time to now - e.g. 'yesterday', '2 days ago'.
  */
-export function getTimeFromNow(utcDateISO: string): string {
-  const time = moment.utc(utcDateISO);
+export function getTimeFromNow(utcDateISO: string): string
+/**
+ * Given a unix timestamp (in milliseconds), gives a reader-friendly
+ * relative time to now - e.g. 'yesterday', '2 days ago'.
+ */
+export function getTimeFromNow(ms: number): string
+export function getTimeFromNow(isoOrTimestamp: string|number): string {
+  const time = moment.utc(isoOrTimestamp);
   const now = moment();
   const diff = now.diff(time, 's');
   if (diff < 0 && diff > -60) {
diff --git a/app/client/ui/AdminPanel.ts b/app/client/ui/AdminPanel.ts
index a8774233..da2c4393 100644
--- a/app/client/ui/AdminPanel.ts
+++ b/app/client/ui/AdminPanel.ts
@@ -1,9 +1,8 @@
-import {getPageTitleSuffix} from 'app/common/gristUrls';
-import {getGristConfig} from 'app/common/urlUtils';
-import * as version from 'app/common/version';
 import {buildHomeBanners} from 'app/client/components/Banners';
 import {makeT} from 'app/client/lib/localization';
-import {AppModel} from 'app/client/models/AppModel';
+import {localStorageJsonObs} from 'app/client/lib/localStorageObs';
+import {getTimeFromNow} from 'app/client/lib/timeUtils';
+import {AppModel, getHomeUrl} from 'app/client/models/AppModel';
 import {urlState} from 'app/client/models/gristUrlState';
 import {AppHeader} from 'app/client/ui/AppHeader';
 import {leftPanelBasic} from 'app/client/ui/LeftPanelCommon';
@@ -12,10 +11,19 @@ import {SupportGristPage} from 'app/client/ui/SupportGristPage';
 import {createTopBarHome} from 'app/client/ui/TopBar';
 import {transition} from 'app/client/ui/transitions';
 import {cssBreadcrumbs, separator} from 'app/client/ui2018/breadcrumbs';
+import {basicButton} from 'app/client/ui2018/buttons';
+import {toggle} from 'app/client/ui2018/checkbox';
 import {mediaSmall, testId, theme, vars} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
-import {cssLink} from 'app/client/ui2018/links';
-import {Disposable, dom, DomContents, IDisposableOwner, Observable, styled} from 'grainjs';
+import {cssLink, makeLinks} from 'app/client/ui2018/links';
+import {getPageTitleSuffix} from 'app/common/gristUrls';
+import {InstallAPI, InstallAPIImpl, LatestVersion} from 'app/common/InstallAPI';
+import {naturalCompare} from 'app/common/SortFunc';
+import {getGristConfig} from 'app/common/urlUtils';
+import * as version from 'app/common/version';
+import {Computed, Disposable, dom, DomContents, IDisposable,
+        IDisposableOwner, MultiHolder, Observable, styled} from 'grainjs';
+
 
 const t = makeT('AdminPanel');
 
@@ -26,6 +34,7 @@ export function getAdminPanelName() {
 
 export class AdminPanel extends Disposable {
   private _supportGrist = SupportGristPage.create(this, this._appModel);
+  private readonly _installAPI: InstallAPI = new InstallAPIImpl(getHomeUrl());
 
   constructor(private _appModel: AppModel) {
     super();
@@ -62,7 +71,7 @@ export class AdminPanel extends Disposable {
     );
   }
 
-  private _buildMainContent(owner: IDisposableOwner) {
+  private _buildMainContent(owner: MultiHolder) {
     return cssPageContainer(
       dom.cls('clipboard'),
       {tabIndex: "-1"},
@@ -91,6 +100,7 @@ export class AdminPanel extends Disposable {
           description: t('Current version of Grist'),
           value: cssValueLabel(`Version ${version.version}`),
         }),
+        this._buildUpdates(owner),
       ),
       testId('admin-panel'),
     );
@@ -138,18 +148,229 @@ export class AdminPanel extends Disposable {
       );
     }
   }
+
+  private _buildUpdates(owner: MultiHolder) {
+    // We can be in those states:
+    enum State {
+      // Never checked before (no last version or last check time).
+      // Shows "No information available" [Check now]
+      NEVER,
+      // Did check previously, but it was a while ago, user should press the button to check.
+      // Shows "Last checked X days ago" [Check now]
+      STALE,
+      // In the middle of checking for updates.
+      CHECKING,
+      // Transient state, shown after Check now is clicked.
+      // Grist is up to date (state only shown after a successful check), or even upfront.
+      // Won't be shown after page is reloaded.
+      // Shows "Checking for updates..."
+      CURRENT,
+      // A newer version is available. Can be shown after reload if last
+      // version that was checked is newer than the current version.
+      // Shows "Newer version available" [version]
+      AVAILABLE,
+      // Error occurred during this check. If the error occurred during last check
+      // it is not stored.
+      // Shows "Error checking for updates" [Check now]
+      ERROR,
+    }
+
+    // Are updates enabled at all.
+    const defaultValue = {
+      onLoad: false,
+      lastCheckDate: null as number|null,
+      lastVersion: null as string|null,
+    };
+    const prop = <T extends keyof typeof defaultValue>(key: T) => {
+      const computed = Computed.create(owner, (use) => use(settings)[key]);
+      computed.onWrite((val) => settings.set({...settings.get(), [key]: val}));
+      return computed as Observable<typeof defaultValue[T]>;
+    };
+    const settings = owner.autoDispose(localStorageJsonObs('new-version-check', defaultValue));
+    const onLoad = prop('onLoad');
+    const latestVersion = prop('lastVersion');
+    const lastCheckDate = prop('lastCheckDate');
+    const comparison = Computed.create(owner, (use) => {
+      const versions = [version.version, use(latestVersion)];
+      if (!versions[1]) {
+        return null;
+      }
+      // Sort them in natural order, so that "1.10" comes after "1.9".
+      versions.sort(naturalCompare).reverse();
+      if (versions[0] === version.version) {
+        return 'old';
+      } else {
+        return 'new';
+      }
+    });
+
+    // Observable state of the updates check.
+    const state: Observable<State> = Observable.create(owner, State.NEVER);
+
+    // The background task that checks for updates, can be disposed (cancelled) when needed.
+    let backgroundTask: IDisposable|null = null;
+
+    // By default we link to the GitHub releases page, but the endpoint might say something different.
+    let releaseURL = 'https://github.com/gristlabs/grist-core/releases';
+
+    // All the events that might occur
+    const actions = {
+      checkForUpdates: async () => {
+        state.set(State.CHECKING);
+        latestVersion.set(null);
+        // We can be disabled, why the check is in progress.
+        const controller = new AbortController();
+        backgroundTask = {
+          dispose() {
+            if (controller.signal.aborted) { return; }
+            backgroundTask = null;
+            controller.abort();
+          }
+        };
+        owner.autoDispose(backgroundTask);
+        try {
+          const result = await this._installAPI.checkUpdates();
+          if (controller.signal.aborted) { return; }
+          actions.gotLatestVersion(result);
+        } catch(err) {
+          if (controller.signal.aborted) { return; }
+          state.set(State.ERROR);
+          reportError(err);
+        }
+      },
+      disableAutoCheck: () => {
+        backgroundTask?.dispose();
+        backgroundTask = null;
+        onLoad.set(false);
+      },
+      enableAutoCheck: () => {
+        onLoad.set(true);
+        if (state.get() !== State.CHECKING && state.get() !== State.AVAILABLE) {
+          actions.checkForUpdates().catch(reportError);
+        }
+      },
+      gotLatestVersion: (data: LatestVersion) => {
+        lastCheckDate.set(Date.now());
+        latestVersion.set(data.latestVersion);
+        releaseURL = data.updateURL || releaseURL;
+        const result = comparison.get();
+        switch (result) {
+          case 'old': state.set(State.CURRENT); break;
+          case 'new': state.set(State.AVAILABLE); break;
+          // This should not happen, but if it does, we should show the error.
+          default: state.set(State.ERROR); break;
+        }
+      }
+    };
+
+    const description = Computed.create(owner, (use) => {
+      switch (use(state)) {
+        case State.NEVER: return t('No information available');
+        case State.CHECKING: return '⌛ ' + t('Checking for updates...');
+        case State.CURRENT: return '✅ ' + t('Grist is up to date');
+        case State.AVAILABLE: return t('Newer version available');
+        case State.ERROR: return '❌ ' + t('Error checking for updates');
+        case State.STALE: {
+          const lastCheck = use(lastCheckDate);
+          return t('Last checked {{time}}', {time: lastCheck ? getTimeFromNow(lastCheck) : 'n/a'});
+        }
+      }
+    });
+
+    // Now trigger the initial state, by checking if we should auto-check.
+    if (onLoad.get()) {
+      actions.checkForUpdates().catch(reportError);
+    } else {
+      if (comparison.get() === 'new') {
+        state.set(State.AVAILABLE);
+      } else if (comparison.get() === 'old') {
+        state.set(State.STALE);
+      } else {
+        state.set(State.NEVER); // default one.
+      }
+    }
+
+    // Toggle component operates on a boolean observable, without a way to set the value. So
+    // create a controller for it to intercept the write and call the appropriate action.
+    const enabledController = Computed.create(owner, (use) => use(onLoad));
+    enabledController.onWrite((val) => {
+      if (val) {
+        actions.enableAutoCheck();
+      } else {
+        actions.disableAutoCheck();
+      }
+    });
+
+    const upperCheckNowVisible = Computed.create(owner, (use) => {
+      switch (use(state)) {
+        case State.CHECKING:
+        case State.CURRENT:
+        case State.AVAILABLE:
+          return false;
+        default:
+          return true;
+      }
+    });
+
+    return this._buildItem(owner, {
+      id: 'updates',
+      name: t('Updates'),
+      description: dom('span', testId('admin-panel-updates-message'), dom.text(description)),
+      value: cssValueButton(
+        dom.domComputed(use => {
+          if (use(state) === State.CHECKING) {
+            return null;
+          }
+
+          if (use(upperCheckNowVisible)) {
+            return basicButton(
+              t('Check now'),
+              dom.on('click', actions.checkForUpdates),
+              testId('admin-panel-updates-upper-check-now')
+            );
+          }
+
+          if (use(latestVersion)) {
+            return cssValueLabel(`Version ${use(latestVersion)}`, testId('admin-panel-updates-version'));
+          }
+
+          throw new Error('Invalid state');
+        })
+      ),
+      expandedContent: cssColumns(
+        cssColumn(
+          cssColumn.cls('-left'),
+          dom('div', t('Grist releases are at '), makeLinks(releaseURL)),
+          dom.maybe(lastCheckDate, ms => dom('div',
+            dom('span', t('Last checked {{time}}', {time: getTimeFromNow(ms)})),
+            dom('span', ' '),
+            // Format date in local format.
+            cssGrayed(new Date(ms).toLocaleString()),
+          )),
+          dom('div', t('Auto-check when this page loads')),
+        ),
+        cssColumn(
+          cssColumn.cls('-right'),
+          // `Check now` button, only shown when auto checks are enabled and we are not in the
+          // middle of checking. Otherwise the button is shown in the summary row, and there is
+          // no need to duplicate it.
+          dom.maybe(use => !use(upperCheckNowVisible), () => [
+            cssCheckNowButton(
+              t('Check now'),
+              testId('admin-panel-updates-lower-check-now'),
+              dom.on('click', actions.checkForUpdates),
+              dom.prop('disabled', use => use(state) === State.CHECKING),
+            ),
+          ]),
+          toggle(enabledController, testId('admin-panel-updates-auto-check')),
+        ),
+      )
+    });
+  }
 }
 
 function maybeSwitchToggle(value: Observable<boolean|null>): DomContents {
-  return dom('div.widget_switch',
-    (elem) => elem.style.setProperty('--grist-actual-cell-color', theme.controlFg.toString()),
-    dom.hide((use) => use(value) === null),
-    dom.cls('switch_on', (use) => use(value) || false),
-    dom.cls('switch_transition', true),
-    dom.on('click', () => value.set(!value.get())),
-    dom('div.switch_slider'),
-    dom('div.switch_circle'),
-  );
+  return toggle(value, dom.hide((use) => use(value) === null));
 }
 
 const cssPageContainer = styled('div', `
@@ -215,7 +436,7 @@ const cssItemName = styled('div', `
   font-weight: bold;
   font-size: ${vars.largeFontSize};
   &:first-child {
-    margin-left: 28px;
+    margin-left: 24px;
   }
   @media ${mediaSmall} {
     & {
@@ -267,4 +488,52 @@ const cssValueLabel = styled('div', `
   color: ${theme.text};
   border: 1px solid ${theme.inputBorder};
   border-radius: ${vars.controlBorderRadius};
+  &-empty {
+    visibility: hidden;
+    content: " ";
+  }
+`);
+
+// A wrapper for the version details panel. Shows two columns.
+// First grows as needed, second shrinks as needed and is aligned to the bottom.
+const cssColumns = styled('div', `
+  display: flex;
+  align-items: flex-end;
+  & > div:first-child {
+    flex-grow: 1;
+    flex-shrink: 0;
+  }
+  & > div:last-child {
+    flex-shrink: 1;
+  }
+`);
+
+const cssColumn = styled('div', `
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  flex-grow: 1;
+  flex-shrink: 1;
+  margin-block: 1px; /* otherwise toggle is squashed: TODO: -1px in toggle looks like a bug */
+  &-left {
+    align-items: flex-start;
+  }
+  &-right {
+    align-items: flex-end;
+    justify-content: flex-end;
+  }
+`);
+
+const cssValueButton = styled('div', `
+  height: 30px;
+`);
+
+const cssCheckNowButton = styled(basicButton, `
+  &-hidden {
+    visibility: hidden;
+  }
+`);
+
+const cssGrayed = styled('span', `
+  color: ${theme.lightText};
 `);
diff --git a/app/client/ui2018/checkbox.ts b/app/client/ui2018/checkbox.ts
index 5ede5ef9..239989bf 100644
--- a/app/client/ui2018/checkbox.ts
+++ b/app/client/ui2018/checkbox.ts
@@ -16,7 +16,7 @@
  */
 
 import {testId, theme} from 'app/client/ui2018/cssVars';
-import {Computed, dom, DomArg, DomContents, Observable, styled} from 'grainjs';
+import {Computed, dom, DomArg, DomContents, DomElementArg, Observable, styled} from 'grainjs';
 
 export const cssLabel = styled('label', `
   position: relative;
@@ -194,6 +194,19 @@ export const cssRadioCheckboxOptions = styled('div', `
   gap: 10px;
 `);
 
+export function toggle(value: Observable<boolean|null>, ...domArgs: DomElementArg[]): DomContents {
+  return dom('div.widget_switch',
+    (elem) => elem.style.setProperty('--grist-actual-cell-color', theme.controlFg.toString()),
+    dom.hide((use) => use(value) === null),
+    dom.cls('switch_on', (use) => use(value) || false),
+    dom.cls('switch_transition', true),
+    dom.on('click', () => value.set(!value.get())),
+    dom('div.switch_slider'),
+    dom('div.switch_circle'),
+    ...domArgs
+  );
+}
+
 // We need to reset top and left of ::before element, as it is wrongly set
 // on the inline checkbox.
 // To simulate radio button behavior, we will block user input after option is selected, because
diff --git a/app/common/InstallAPI.ts b/app/common/InstallAPI.ts
index 745b0c1e..88cc35a5 100644
--- a/app/common/InstallAPI.ts
+++ b/app/common/InstallAPI.ts
@@ -24,9 +24,38 @@ export interface PrefWithSource<T> {
 
 export type PrefSource = 'environment-variable' | 'preferences';
 
+
+/**
+ * JSON returned to the client (exported for tests).
+ */
+export interface LatestVersion {
+  /**
+   * Latest version of core component of the client.
+   */
+  latestVersion: string;
+  /**
+   * If there were any critical updates after client's version. Undefined if
+   * we don't know client version or couldn't figure this out for some other reason.
+   */
+  isCritical?: boolean;
+  /**
+   * Url where the client can download the latest version (if applicable)
+   */
+  updateURL?: string;
+
+  /**
+   * When the latest version was updated (in ISO format).
+   */
+  updatedAt?: string;
+}
+
 export interface InstallAPI {
   getInstallPrefs(): Promise<InstallPrefsWithSources>;
   updateInstallPrefs(prefs: Partial<InstallPrefs>): Promise<void>;
+  /**
+   * Returns information about latest version of Grist
+   */
+  checkUpdates(): Promise<LatestVersion>;
 }
 
 export class InstallAPIImpl extends BaseAPI implements InstallAPI {
@@ -45,6 +74,10 @@ export class InstallAPIImpl extends BaseAPI implements InstallAPI {
     });
   }
 
+  public checkUpdates(): Promise<LatestVersion> {
+    return this.requestJson(`${this._url}/api/install/updates`, {method: 'GET'});
+  }
+
   private get _url(): string {
     return addCurrentOrgToPath(this._homeUrl);
   }
diff --git a/app/common/gristUrls.ts b/app/common/gristUrls.ts
index 903c3206..b852c853 100644
--- a/app/common/gristUrls.ts
+++ b/app/common/gristUrls.ts
@@ -105,6 +105,8 @@ export const commonUrls = {
   gristLabsWidgetRepository: 'https://github.com/gristlabs/grist-widget/releases/download/latest/manifest.json',
   githubGristCore: 'https://github.com/gristlabs/grist-core',
   githubSponsorGristLabs: 'https://github.com/sponsors/gristlabs',
+
+  versionCheck: 'https://api.getgrist.com/api/version',
 };
 
 /**
diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts
index d3d51231..5c10a65c 100644
--- a/app/server/lib/FlexServer.ts
+++ b/app/server/lib/FlexServer.ts
@@ -2,7 +2,7 @@ import {ApiError} from 'app/common/ApiError';
 import {ICustomWidget} from 'app/common/CustomWidget';
 import {delay} from 'app/common/delay';
 import {DocCreationInfo} from 'app/common/DocListAPI';
-import {encodeUrl, getSlugIfNeeded, GristDeploymentType, GristDeploymentTypes,
+import {commonUrls, encodeUrl, getSlugIfNeeded, GristDeploymentType, GristDeploymentTypes,
         GristLoadConfig, IGristUrlState, isOrgInPathOnly, parseSubdomain,
         sanitizePathTail} from 'app/common/gristUrls';
 import {getOrgUrlInfo} from 'app/common/gristUrls';
@@ -1853,6 +1853,35 @@ export class FlexServer implements GristServer {
 
       return resp.status(200).send();
     }));
+
+    // GET api/checkUpdates
+    // Retrieves the latest version of the client from Grist SAAS endpoint.
+    this.app.get('/api/install/updates', adminPageMiddleware, expressWrap(async (req, res) => {
+      // Prepare data for the telemetry that endpoint might expect.
+      const installationId = (await this.getActivations().current()).id;
+      const deploymentType = this.getDeploymentType();
+      const currentVersion = version.version;
+      const response = await fetch(process.env.GRIST_TEST_VERSION_CHECK_URL || commonUrls.versionCheck, {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json'},
+        body: JSON.stringify({
+          installationId,
+          deploymentType,
+          currentVersion,
+        }),
+      });
+      if (!response.ok) {
+        res.status(response.status);
+        if (response.headers.get('content-type')?.includes('application/json')) {
+          const data = await response.json();
+          res.json(data);
+        } else {
+          res.send(await response.text());
+        }
+      } else {
+        res.json(await response.json());
+      }
+    }));
   }
 
   // Get the HTML template sent for document pages.
diff --git a/app/server/lib/UpdateManager.ts b/app/server/lib/UpdateManager.ts
index d96b7090..47556b74 100644
--- a/app/server/lib/UpdateManager.ts
+++ b/app/server/lib/UpdateManager.ts
@@ -1,14 +1,16 @@
 import { ApiError } from "app/common/ApiError";
 import { MapWithTTL } from "app/common/AsyncCreate";
 import { GristDeploymentType } from "app/common/gristUrls";
+import { LatestVersion } from 'app/common/InstallAPI';
 import { naturalCompare } from "app/common/SortFunc";
 import { RequestWithLogin } from "app/server/lib/Authorizer";
+import { expressWrap } from 'app/server/lib/expressWrap';
 import { GristServer } from "app/server/lib/GristServer";
 import { optIntegerParam, optStringParam } from "app/server/lib/requestUtils";
+import { rateLimit } from 'express-rate-limit';
 import { AbortController, AbortSignal } from 'node-abort-controller';
 import type * as express from "express";
 import fetch from "node-fetch";
-import {expressWrap} from 'app/server/lib/expressWrap';
 
 
 // URL to show to the client where the new version for docker based deployments can be found.
@@ -67,8 +69,18 @@ export class UpdateManager {
       }
     }
 
+    // Rate limit the requests to the version API, so that we don't get spammed.
+    // 30 requests per second, per IP. The requests are cached so, we should be fine, but make
+    // sure it doesn't get out of hand. On dev laptop I could go up to 600 requests per second.
+    // (30 was picked by hand, to not hit the limit during tests).
+    const limiter = rateLimit({
+      windowMs: 1000,
+      limit: 30,
+      legacyHeaders: true,
+    });
+
     // Support both POST and GET requests.
-    this._app.use("/api/version", expressWrap(async (req, res) => {
+    this._app.use("/api/version", limiter, expressWrap(async (req, res) => {
       // Get some telemetry from the body request.
       const payload = (name: string) => req.body?.[name] ?? req.query[name];
 
@@ -132,29 +144,6 @@ export class UpdateManager {
   }
 }
 
-/**
- * JSON returned to the client (exported for tests).
- */
-export interface LatestVersion {
-  /**
-   * Latest version of core component of the client.
-   */
-  latestVersion: string;
-  /**
-   * If there were any critical updates after client's version. Undefined if
-   * we don't know client version or couldn't figure this out for some other reason.
-   */
-  isCritical?: boolean;
-  /**
-   * Url where the client can download the latest version (if applicable)
-   */
-  updateURL?: string;
-
-  /**
-   * When the latest version was updated (in ISO format).
-   */
-  updatedAt?: string;
-}
 
 type VersionChecker = (signal: AbortSignal) => Promise<LatestVersion>;
 
diff --git a/test/gen-server/UpdateChecks.ts b/test/gen-server/UpdateChecks.ts
index 3633a401..cdd9426f 100644
--- a/test/gen-server/UpdateChecks.ts
+++ b/test/gen-server/UpdateChecks.ts
@@ -4,10 +4,11 @@ import * as sinon from 'sinon';
 
 import { configForUser } from "test/gen-server/testUtils";
 import * as testUtils from "test/server/testUtils";
-import { serveSomething, Serving } from "test/server/customUtil";
-import { Deps, LatestVersion } from "app/server/lib/UpdateManager";
+import { Defer, serveSomething, Serving } from "test/server/customUtil";
+import { Deps } from "app/server/lib/UpdateManager";
 import { TestServer } from "test/gen-server/apiUtils";
 import { delay } from "app/common/delay";
+import { LatestVersion } from 'app/common/InstallAPI';
 
 const assert = chai.assert;
 
@@ -249,7 +250,7 @@ async function dummyDockerHub() {
 
   return Object.assign(tempServer, {
     signal() {
-      const p = defer();
+      const p = new Defer();
       signals.push(p);
       return p;
     },
@@ -326,22 +327,3 @@ const FIRST_PAGE = (tempServer: Serving) => ({
   next: tempServer.url + "/next",
 });
 
-interface Defer {
-  then: Promise<void>["then"];
-  resolve: () => void;
-  reject: () => void;
-}
-
-const defer = () => {
-  let resolve: () => void;
-  let reject: () => void;
-  const promise = new Promise<void>((res, rej) => {
-    resolve = res;
-    reject = rej;
-  }).catch(() => {});
-  return {
-    then: promise.then.bind(promise),
-    resolve: resolve!,
-    reject: reject!,
-  };
-};
diff --git a/test/nbrowser/AdminPanel.ts b/test/nbrowser/AdminPanel.ts
index fd92ff68..209baf8c 100644
--- a/test/nbrowser/AdminPanel.ts
+++ b/test/nbrowser/AdminPanel.ts
@@ -2,14 +2,17 @@ import {TelemetryLevel} from 'app/common/Telemetry';
 import {assert, driver, Key, WebElement} from 'mocha-webdriver';
 import * as gu from 'test/nbrowser/gristUtils';
 import {server, setupTestSuite} from 'test/nbrowser/testUtils';
+import {Defer, serveSomething, Serving} from 'test/server/customUtil';
 import * as testUtils from 'test/server/testUtils';
+import express from 'express';
 
 describe('AdminPanel', function() {
-  this.timeout(30000);
+  this.timeout(300000);
   setupTestSuite();
 
   let oldEnv: testUtils.EnvironmentSnapshot;
   let session: gu.Session;
+  let fakeServer: FakeUpdateServer;
 
   afterEach(() => gu.checkForErrors());
 
@@ -17,10 +20,13 @@ describe('AdminPanel', function() {
     oldEnv = new testUtils.EnvironmentSnapshot();
     process.env.GRIST_TEST_SERVER_DEPLOYMENT_TYPE = 'core';
     process.env.GRIST_DEFAULT_EMAIL = gu.session().email;
+    fakeServer = await startFakeServer();
+    process.env.GRIST_TEST_VERSION_CHECK_URL = `${fakeServer.url()}/version`;
     await server.restart(true);
   });
 
   after(async function() {
+    await fakeServer.close();
     oldEnv.restore();
     await server.restart(true);
   });
@@ -170,6 +176,128 @@ describe('AdminPanel', function() {
     assert.equal(await driver.find('.test-admin-panel-item-version').isDisplayed(), true);
     assert.match(await driver.find('.test-admin-panel-item-value-version').getText(), /^Version \d+\./);
   });
+
+  const upperCheckNow = () => driver.find('.test-admin-panel-updates-upper-check-now');
+  const lowerCheckNow = () => driver.find('.test-admin-panel-updates-lower-check-now');
+  const autoCheckToggle = () => driver.find('.test-admin-panel-updates-auto-check');
+  const updateMessage = () => driver.find('.test-admin-panel-updates-message');
+  const versionBox = () => driver.find('.test-admin-panel-updates-version');
+  function waitForStatus(message: RegExp) {
+    return gu.waitToPass(async () => {
+      assert.match(await updateMessage().getText(), message);
+    });
+  }
+
+  it('should check for updates', async function() {
+    // Clear any cached settings.
+    await driver.executeScript('window.sessionStorage.clear(); window.localStorage.clear();');
+    await driver.navigate().refresh();
+    await waitForAdminPanel();
+
+    // By default don't have any info.
+    await waitForStatus(/No information available/);
+
+    // We see upper check-now button.
+    assert.isTrue(await upperCheckNow().isDisplayed());
+
+    // We can expand.
+    await toggleItem('updates');
+
+    // We see a toggle to update automatically.
+    assert.isTrue(await autoCheckToggle().isDisplayed());
+    assert.isFalse(await isSwitchOn(autoCheckToggle()));
+
+    // We can click it, Grist will turn on auto checks and do it right away.
+    fakeServer.pause();
+    await autoCheckToggle().click();
+    assert.isTrue(await isSwitchOn(autoCheckToggle()));
+
+    // It will first show "Checking for updates" message.
+    // (Request is blocked by fake server, so it will not complete until we resume it.)
+    await waitForStatus(/Checking for updates/);
+
+    // Upper check now button is removed.
+    assert.isFalse(await upperCheckNow().isPresent());
+
+    // Resume server and respond.
+    fakeServer.resume();
+
+    // It will show "New version available" message.
+    await waitForStatus(/Newer version available/);
+    // And a version number.
+    assert.isTrue(await versionBox().isDisplayed());
+    assert.match(await versionBox().getText(), /Version 9\.9\.9/);
+
+    // When we reload, we will auto check for updates.
+    fakeServer.pause();
+    fakeServer.latestVersion = await currentVersion();
+    await driver.navigate().refresh();
+    await waitForAdminPanel();
+    await waitForStatus(/Checking for updates/);
+    fakeServer.resume();
+    await waitForStatus(/Grist is up to date/);
+
+    // Disable auto-checks.
+    await toggleItem('updates');
+    assert.isTrue(await isSwitchOn(autoCheckToggle()));
+    await autoCheckToggle().click();
+    assert.isFalse(await isSwitchOn(autoCheckToggle()));
+    // Nothing should happen.
+    await waitForStatus(/Grist is up to date/);
+    assert.isTrue(await versionBox().isDisplayed());
+    assert.equal(await versionBox().getText(), `Version ${await currentVersion()}`);
+
+    // Refresh to see if we are disabled.
+    fakeServer.pause();
+    await driver.navigate().refresh();
+    await waitForAdminPanel();
+    await waitForStatus(/Last checked .+ ago/);
+    fakeServer.resume();
+    // Expand and see if the toggle is off.
+    await toggleItem('updates');
+    assert.isFalse(await isSwitchOn(autoCheckToggle()));
+  });
+
+  it('shows up-to-date message', async function() {
+    fakeServer.latestVersion = await currentVersion();
+    // Click upper check now.
+    await waitForStatus(/Last checked .+ ago/);
+    await upperCheckNow().click();
+    await waitForStatus(/Grist is up to date/);
+
+    // Update version once again.
+    fakeServer.latestVersion = '9.9.10';
+    // Click lower check now.
+    fakeServer.pause();
+    await lowerCheckNow().click();
+    await waitForStatus(/Checking for updates/);
+    fakeServer.resume();
+    await waitForStatus(/Newer version available/);
+
+    // Make sure we see the new version.
+    assert.isTrue(await versionBox().isDisplayed());
+    assert.match(await versionBox().getText(), /Version 9\.9\.10/);
+  });
+
+  it('shows error message', async function() {
+    fakeServer.failNext = true;
+    fakeServer.pause();
+    await lowerCheckNow().click();
+    await waitForStatus(/Checking for updates/);
+    fakeServer.resume();
+    await waitForStatus(/Error checking for updates/);
+    assert.match((await gu.getToasts())[0], /some error/);
+    await gu.wipeToasts();
+  });
+
+  it('should send telemetry data', async function() {
+    assert.deepEqual({...fakeServer.payload, installationId: 'test'}, {
+      installationId: 'test',
+      deploymentType: 'core',
+      currentVersion: await currentVersion(),
+    });
+    assert.isNotEmpty(fakeServer.payload.installationId);
+  });
 });
 
 async function assertTelemetryLevel(level: TelemetryLevel) {
@@ -193,3 +321,64 @@ async function withExpandedItem(itemId: string, callback: () => Promise<void>) {
 
 const isSwitchOn = (switchElem: WebElement) => switchElem.matches('[class*=switch_on]');
 const waitForAdminPanel = () => driver.findWait('.test-admin-panel', 2000);
+
+interface FakeUpdateServer {
+  latestVersion: string;
+  failNext: boolean;
+  payload: any;
+  close: () => Promise<void>;
+  pause: () => void;
+  resume: () => void;
+  url: () => string;
+}
+
+async function startFakeServer() {
+  let mutex: Defer|null = null;
+  const API: FakeUpdateServer = {
+    latestVersion: '9.9.9',
+    failNext: false,
+    payload: null,
+    close: async () => {
+      mutex?.resolve();
+      mutex = null;
+      await server?.shutdown();
+      server = null;
+    },
+    pause: () => {
+      mutex = new Defer();
+    },
+    resume: () => {
+      mutex?.resolve();
+      mutex = null;
+    },
+    url: () => {
+      return server!.url;
+    }
+  };
+
+  let server: Serving|null = await serveSomething((app) => {
+    app.use(express.json());
+    app.post('/version', async (req, res, next) => {
+      API.payload = req.body;
+      try {
+        await mutex;
+        if (API.failNext) {
+          res.status(500).json({error: 'some error'});
+          API.failNext = false;
+          return;
+        }
+        res.json({latestVersion: API.latestVersion});
+      } catch(ex) {
+        next(ex);
+      }
+    });
+  });
+
+  return API;
+}
+
+async function currentVersion() {
+  const currentVersionText = await driver.find(".test-admin-panel-item-value-version").getText();
+  const currentVersion = currentVersionText.match(/Version (.+)/)![1];
+  return currentVersion;
+}
diff --git a/test/server/customUtil.ts b/test/server/customUtil.ts
index c2646573..efd727bf 100644
--- a/test/server/customUtil.ts
+++ b/test/server/customUtil.ts
@@ -64,3 +64,31 @@ export async function serveSomething(setup: (app: express.Express) => void, port
   const url = `http://localhost:${port}`;
   return {url, shutdown};
 }
+
+/**
+ * Creates a promise like object that can be resolved from outside.
+ */
+export class Defer {
+  private _resolve!: () => void;
+  private _reject!: (err: any) => void;
+  private _promise: Promise<void>;
+
+  constructor() {
+    this._promise = new Promise<void>((resolve, reject) => {
+      this._resolve = resolve;
+      this._reject = reject;
+    });
+  }
+
+  public get then() {
+    return this._promise.then.bind(this._promise);
+  }
+
+  public resolve() {
+    this._resolve();
+  }
+
+  public reject(err: any) {
+    this._reject(err);
+  }
+}

From 61cb80d4e37eb2da43c48d328b4d1ab83d569366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Guti=C3=A9rrez=20Hermoso?= <jordigh@octave.org>
Date: Mon, 29 Apr 2024 18:50:35 -0400
Subject: [PATCH 43/45] (core) Security updates for package.json following
 version bump update from grist-core

Summary: Fix the build and tests following version bump from [#921](https://github.com/gristlabs/grist-core/pull/921) from grist-core

Test Plan: Existing tests pass

Reviewers: georgegevoian, jordigh

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4239
---
 package.json | 1 +
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/package.json b/package.json
index 13ac678c..1cd6406a 100644
--- a/package.json
+++ b/package.json
@@ -144,6 +144,7 @@
     "engine.io-client": "^6.5.3",
     "exceljs": "4.2.1",
     "express": "4.19.2",
+    "express-rate-limit": "7.2.0",
     "file-type": "16.5.4",
     "fs-extra": "7.0.0",
     "grain-rpc": "0.1.7",
diff --git a/yarn.lock b/yarn.lock
index 4563f441..66dffe3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3737,6 +3737,11 @@ exit-on-epipe@~1.0.1:
   resolved "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"
   integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
 
+express-rate-limit@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-7.2.0.tgz#06ce387dd5388f429cab8263c514fc07bf90a445"
+  integrity sha512-T7nul1t4TNyfZMJ7pKRKkdeVJWa2CqB8NA1P8BwYaoDI5QSBZARv5oMS43J7b7I5P+4asjVXjb7ONuwDKucahg==
+
 express@4.19.2:
   version "4.19.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"

From d431c1eb631aa065f6bdb355706e62806c2dc94c Mon Sep 17 00:00:00 2001
From: Paul Fitzpatrick <paulfitz@alum.mit.edu>
Date: Mon, 29 Apr 2024 20:31:10 -0400
Subject: [PATCH 44/45] (core) add a sandbox check to admin panel, and start
 reconciling boot and admin pages

Summary:
This adds a basic sandbox check to the admin panel. It also makes
the "probes" used in the boot page available from the admin panel,
though they are not yet displayed. The sandbox check is built as
a probe.

In the interests of time, a lot of steps had to be deferred:
 * Reconcile fully the admin panel and boot page. Specifically, the
   admin panel should be equally robust to common configuration problems.
 * Add tests for the sandbox check.
 * Generalize to multi-server setups. The read-out will not yet be useful
   for setups where doc workers and home servers are configured
   separately.

Test Plan: Added new test

Reviewers: jarek, georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4241
---
 app/client/boot.ts               | 129 +++---------------------
 app/client/models/AdminChecks.ts | 165 +++++++++++++++++++++++++++++++
 app/client/ui/AdminPanel.ts      |  65 +++++++++++-
 app/common/BootProbe.ts          |   3 +
 app/common/SandboxInfo.ts        |   9 ++
 app/common/gristUrls.ts          |   1 +
 app/server/lib/ActiveDoc.ts      |  30 +++++-
 app/server/lib/BootProbes.ts     |  25 ++++-
 app/server/lib/FlexServer.ts     |  48 ++++++++-
 app/server/lib/GristServer.ts    |   3 +
 app/server/lib/ISandbox.ts       |   1 +
 app/server/lib/NSandbox.ts       |   8 ++
 app/server/lib/NullSandbox.ts    |   4 +
 app/server/mergedServerMain.ts   |   6 ++
 test/nbrowser/AdminPanel.ts      |  13 +++
 15 files changed, 385 insertions(+), 125 deletions(-)
 create mode 100644 app/client/models/AdminChecks.ts
 create mode 100644 app/common/SandboxInfo.ts

diff --git a/app/client/boot.ts b/app/client/boot.ts
index fed21107..a37fd363 100644
--- a/app/client/boot.ts
+++ b/app/client/boot.ts
@@ -1,8 +1,8 @@
 import { AppModel } from 'app/client/models/AppModel';
+import { AdminChecks, ProbeDetails } from 'app/client/models/AdminChecks';
 import { createAppPage } from 'app/client/ui/createAppPage';
 import { pagePanels } from 'app/client/ui/PagePanels';
 import { BootProbeInfo, BootProbeResult } from 'app/common/BootProbe';
-import { removeTrailingSlash } from 'app/common/gutil';
 import { getGristConfig } from 'app/common/urlUtils';
 import { Disposable, dom, Observable, styled, UseCBOwner } from 'grainjs';
 
@@ -30,24 +30,14 @@ const cssResult = styled('div', `
  */
 export class Boot extends Disposable {
 
-  // The back end will offer a set of probes (diagnostics) we
-  // can use. Probes have unique IDs.
-  public probes: Observable<BootProbeInfo[]>;
-
-  // Keep track of probe results we have received, by probe ID.
-  public results: Map<string, Observable<BootProbeResult>>;
-
-  // Keep track of probe requests we are making, by probe ID.
-  public requests: Map<string, BootProbe>;
+  private _checks: AdminChecks;
 
   constructor(_appModel: AppModel) {
     super();
     // Setting title in constructor seems to be how we are doing this,
     // based on other similar pages.
     document.title = 'Booting Grist';
-    this.probes = Observable.create(this, []);
-    this.results = new Map();
-    this.requests = new Map();
+    this._checks = new AdminChecks(this);
   }
 
   /**
@@ -55,20 +45,10 @@ export class Boot extends Disposable {
    * side panel, just for convenience. Could be made a lot prettier.
    */
   public buildDom() {
+    this._checks.fetchAvailableChecks().catch(e => reportError(e));
+
     const config = getGristConfig();
     const errMessage = config.errMessage;
-    if (!errMessage) {
-      // Probe tool URLs are relative to the current URL. Don't trust configuration,
-      // because it may be buggy if the user is here looking at the boot page
-      // to figure out some problem.
-      const url = new URL(removeTrailingSlash(document.location.href));
-      url.pathname += '/probe';
-      fetch(url.href).then(async resp => {
-        const _probes = await resp.json();
-        this.probes.set(_probes.probes);
-      }).catch(e => reportError(e));
-    }
-
     const rootNode = dom('div',
       dom.domComputed(
         use => {
@@ -99,21 +79,10 @@ export class Boot extends Disposable {
       return cssBody(cssResult(this.buildError()));
     }
     return cssBody([
-      ...use(this.probes).map(probe => {
-        const {id} = probe;
-        let result = this.results.get(id);
-        if (!result) {
-          result = Observable.create(this, {});
-          this.results.set(id, result);
-        }
-        let request = this.requests.get(id);
-        if (!request) {
-          request = new BootProbe(id, this);
-          this.requests.set(id, request);
-        }
-        request.start();
+      ...use(this._checks.probes).map(probe => {
+        const req = this._checks.requestCheck(probe);
         return cssResult(
-          this.buildResult(probe, use(result), probeDetails[id]));
+          this.buildResult(req.probe, use(req.result), req.details));
       }),
     ]);
   }
@@ -164,7 +133,7 @@ export class Boot extends Disposable {
       for (const [key, val] of Object.entries(result.details)) {
         out.push(dom(
           'div',
-          key,
+          cssLabel(key),
           dom('input', dom.prop('value', JSON.stringify(val)))));
       }
     }
@@ -172,31 +141,6 @@ export class Boot extends Disposable {
   }
 }
 
-/**
- * Represents a single diagnostic.
- */
-export class BootProbe {
-  constructor(public id: string, public boot: Boot) {
-    const url = new URL(removeTrailingSlash(document.location.href));
-    url.pathname = url.pathname + '/probe/' + id;
-    fetch(url.href).then(async resp => {
-      const _probes: BootProbeResult = await resp.json();
-      const ob = boot.results.get(id);
-      if (ob) {
-        ob.set(_probes);
-      }
-    }).catch(e => console.error(e));
-  }
-
-  public start() {
-    let result = this.boot.results.get(this.id);
-    if (!result) {
-      result = Observable.create(this.boot, {});
-      this.boot.results.set(this.id, result);
-    }
-  }
-}
-
 /**
  * Create a stripped down page to show boot information.
  * Make sure the API isn't used since it may well be unreachable
@@ -208,52 +152,9 @@ createAppPage(appModel => {
   useApi: false,
 });
 
-/**
- * Basic information about diagnostics is kept on the server,
- * but it can be useful to show extra details and tips in the
- * client.
- */
-const probeDetails: Record<string, ProbeDetails> = {
-  'boot-page': {
-    info: `
-This boot page should not be too easy to access. Either turn
-it off when configuration is ok (by unsetting GRIST_BOOT_KEY)
-or make GRIST_BOOT_KEY long and cryptographically secure.
-`,
-  },
-
-  'health-check': {
-    info: `
-Grist has a small built-in health check often used when running
-it as a container.
-`,
-  },
-
-  'host-header': {
-    info: `
-Requests arriving to Grist should have an accurate Host
-header. This is essential when GRIST_SERVE_SAME_ORIGIN
-is set.
-`,
-  },
-
-  'system-user': {
-    info: `
-It is good practice not to run Grist as the root user.
-`,
-  },
-
-  'reachable': {
-    info: `
-The main page of Grist should be available.
-`
-  },
-};
-
-/**
- * Information about the probe.
- */
-interface ProbeDetails {
-  info: string;
-}
-
+export const cssLabel = styled('div', `
+  display: inline-block;
+  min-width: 100px;
+  text-align: right;
+  padding-right: 5px;
+`);
diff --git a/app/client/models/AdminChecks.ts b/app/client/models/AdminChecks.ts
new file mode 100644
index 00000000..45de41ed
--- /dev/null
+++ b/app/client/models/AdminChecks.ts
@@ -0,0 +1,165 @@
+import { BootProbeIds, BootProbeInfo, BootProbeResult } from 'app/common/BootProbe';
+import { removeTrailingSlash } from 'app/common/gutil';
+import { getGristConfig } from 'app/common/urlUtils';
+import { Disposable, Observable, UseCBOwner } from 'grainjs';
+
+/**
+ * Manage a collection of checks about the status of Grist, for
+ * presentation on the admin panel or the boot page.
+ */
+export class AdminChecks {
+
+  // The back end will offer a set of probes (diagnostics) we
+  // can use. Probes have unique IDs.
+  public probes: Observable<BootProbeInfo[]>;
+
+  // Keep track of probe requests we are making, by probe ID.
+  private _requests: Map<string, AdminCheckRunner>;
+
+  // Keep track of probe results we have received, by probe ID.
+  private _results: Map<string, Observable<BootProbeResult>>;
+
+  constructor(private _parent: Disposable) {
+    this.probes = Observable.create(_parent, []);
+    this._results = new Map();
+    this._requests = new Map();
+  }
+
+  /**
+   * Fetch a list of available checks from the server.
+   */
+  public async fetchAvailableChecks() {
+    const config = getGristConfig();
+    const errMessage = config.errMessage;
+    if (!errMessage) {
+      // Probe tool URLs are relative to the current URL. Don't trust configuration,
+      // because it may be buggy if the user is here looking at the boot page
+      // to figure out some problem.
+      //
+      // We have been careful to make URLs available with appropriate
+      // middleware relative to both of the admin panel and the boot page.
+      const url = new URL(removeTrailingSlash(document.location.href));
+      url.pathname += '/probe';
+      const resp = await fetch(url.href);
+      const _probes = await resp.json();
+      this.probes.set(_probes.probes);
+    }
+  }
+
+  /**
+   * Request the result of one of the available checks. Returns information
+   * about the check and a way to observe the result when it arrives.
+   */
+  public requestCheck(probe: BootProbeInfo): AdminCheckRequest {
+    const {id} = probe;
+    let result = this._results.get(id);
+    if (!result) {
+      result = Observable.create(this._parent, {});
+      this._results.set(id, result);
+    }
+    let request = this._requests.get(id);
+    if (!request) {
+      request = new AdminCheckRunner(id, this._results, this._parent);
+      this._requests.set(id, request);
+    }
+    request.start();
+    return {
+      probe,
+      result,
+      details: probeDetails[id],
+    };
+  }
+
+  /**
+   * Request the result of a check, by its id.
+   */
+  public requestCheckById(use: UseCBOwner, id: BootProbeIds): AdminCheckRequest|undefined {
+    const probe = use(this.probes).find(p => p.id === id);
+    if (!probe) { return; }
+    return this.requestCheck(probe);
+  }
+}
+
+/**
+ * Information about a check and a way to observe its result once available.
+ */
+export interface AdminCheckRequest {
+  probe: BootProbeInfo,
+  result: Observable<BootProbeResult>,
+  details: ProbeDetails,
+}
+
+/**
+ * Manage a single check.
+ */
+export class AdminCheckRunner {
+  constructor(public id: string, public results: Map<string, Observable<BootProbeResult>>,
+              public parent: Disposable) {
+    const url = new URL(removeTrailingSlash(document.location.href));
+    url.pathname = url.pathname + '/probe/' + id;
+    fetch(url.href).then(async resp => {
+      const _probes: BootProbeResult = await resp.json();
+      const ob = results.get(id);
+      if (ob) {
+        ob.set(_probes);
+      }
+    }).catch(e => console.error(e));
+  }
+
+  public start() {
+    let result = this.results.get(this.id);
+    if (!result) {
+      result = Observable.create(this.parent, {});
+      this.results.set(this.id, result);
+    }
+  }
+}
+
+/**
+ * Basic information about diagnostics is kept on the server,
+ * but it can be useful to show extra details and tips in the
+ * client.
+ */
+const probeDetails: Record<string, ProbeDetails> = {
+  'boot-page': {
+    info: `
+This boot page should not be too easy to access. Either turn
+it off when configuration is ok (by unsetting GRIST_BOOT_KEY)
+or make GRIST_BOOT_KEY long and cryptographically secure.
+`,
+  },
+
+  'health-check': {
+    info: `
+Grist has a small built-in health check often used when running
+it as a container.
+`,
+  },
+
+  'host-header': {
+    info: `
+Requests arriving to Grist should have an accurate Host
+header. This is essential when GRIST_SERVE_SAME_ORIGIN
+is set.
+`,
+  },
+
+  'system-user': {
+    info: `
+It is good practice not to run Grist as the root user.
+`,
+  },
+
+  'reachable': {
+    info: `
+The main page of Grist should be available.
+`
+  },
+};
+
+/**
+ * Information about the probe.
+ */
+export interface ProbeDetails {
+  info: string;
+}
diff --git a/app/client/ui/AdminPanel.ts b/app/client/ui/AdminPanel.ts
index da2c4393..f02d8351 100644
--- a/app/client/ui/AdminPanel.ts
+++ b/app/client/ui/AdminPanel.ts
@@ -2,7 +2,8 @@ import {buildHomeBanners} from 'app/client/components/Banners';
 import {makeT} from 'app/client/lib/localization';
 import {localStorageJsonObs} from 'app/client/lib/localStorageObs';
 import {getTimeFromNow} from 'app/client/lib/timeUtils';
-import {AppModel, getHomeUrl} from 'app/client/models/AppModel';
+import {AppModel, getHomeUrl, reportError} from 'app/client/models/AppModel';
+import {AdminChecks} from 'app/client/models/AdminChecks';
 import {urlState} from 'app/client/models/gristUrlState';
 import {AppHeader} from 'app/client/ui/AppHeader';
 import {leftPanelBasic} from 'app/client/ui/LeftPanelCommon';
@@ -16,7 +17,8 @@ import {toggle} from 'app/client/ui2018/checkbox';
 import {mediaSmall, testId, theme, vars} from 'app/client/ui2018/cssVars';
 import {icon} from 'app/client/ui2018/icons';
 import {cssLink, makeLinks} from 'app/client/ui2018/links';
-import {getPageTitleSuffix} from 'app/common/gristUrls';
+import {SandboxingBootProbeDetails} from 'app/common/BootProbe';
+import {commonUrls, getPageTitleSuffix} from 'app/common/gristUrls';
 import {InstallAPI, InstallAPIImpl, LatestVersion} from 'app/common/InstallAPI';
 import {naturalCompare} from 'app/common/SortFunc';
 import {getGristConfig} from 'app/common/urlUtils';
@@ -35,13 +37,18 @@ export function getAdminPanelName() {
 export class AdminPanel extends Disposable {
   private _supportGrist = SupportGristPage.create(this, this._appModel);
   private readonly _installAPI: InstallAPI = new InstallAPIImpl(getHomeUrl());
+  private _checks: AdminChecks;
 
   constructor(private _appModel: AppModel) {
     super();
     document.title = getAdminPanelName() + getPageTitleSuffix(getGristConfig());
+    this._checks = new AdminChecks(this);
   }
 
   public buildDom() {
+    this._checks.fetchAvailableChecks().catch(err => {
+      reportError(err);
+    });
     const panelOpen = Observable.create(this, false);
     return pagePanels({
       leftPanel: {
@@ -92,6 +99,16 @@ export class AdminPanel extends Disposable {
           expandedContent: this._supportGrist.buildSponsorshipSection(),
         }),
       ),
+      cssSection(
+        cssSectionTitle(t('Security Settings')),
+        this._buildItem(owner, {
+          id: 'sandboxing',
+          name: t('Sandboxing'),
+          description: t('Sandbox settings for data engine'),
+          value: this._buildSandboxingDisplay(owner),
+          expandedContent: this._buildSandboxingNotice(),
+        }),
+      ),
       cssSection(
         cssSectionTitle(t('Version')),
         this._buildItem(owner, {
@@ -106,6 +123,42 @@ export class AdminPanel extends Disposable {
     );
   }
 
+  private _buildSandboxingDisplay(owner: IDisposableOwner) {
+    return dom.domComputed(
+      use => {
+        const req = this._checks.requestCheckById(use, 'sandboxing');
+        const result = req ? use(req.result) : undefined;
+        const success = result?.success;
+        const details = result?.details as SandboxingBootProbeDetails|undefined;
+        if (!details) {
+          return cssValueLabel(t('unknown'));
+        }
+        const flavor = details.flavor;
+        const configured = details.configured;
+        return cssValueLabel(
+          configured ?
+              (success ? cssHappy(t('OK') + `: ${flavor}`) :
+                  cssError(t('Error') + `: ${flavor}`)) :
+              cssError(t('unconfigured')));
+      }
+    );
+  }
+
+  private _buildSandboxingNotice() {
+    return [
+      t('Grist allows for very powerful formulas, using Python. \
+We recommend setting the environment variable GRIST_SANDBOX_FLAVOR to gvisor \
+if your hardware supports it (most will), \
+to run formulas in each document within a sandbox \
+isolated from other documents and isolated from the network.'),
+      dom(
+        'div',
+        {style: 'margin-top: 8px'},
+        cssLink({href: commonUrls.helpSandboxing, target: '_blank'}, t('Learn more.'))
+      ),
+    ];
+  }
+
   private _buildItem(owner: IDisposableOwner, options: {
     id: string,
     name: DomContents,
@@ -537,3 +590,11 @@ const cssCheckNowButton = styled(basicButton, `
 const cssGrayed = styled('span', `
   color: ${theme.lightText};
 `);
+
+export const cssError = styled('div', `
+  color: ${theme.errorText};
+`);
+
+export const cssHappy = styled('div', `
+  color: ${theme.controlFg};
+`);
diff --git a/app/common/BootProbe.ts b/app/common/BootProbe.ts
index 5f0ee785..753af1c4 100644
--- a/app/common/BootProbe.ts
+++ b/app/common/BootProbe.ts
@@ -1,9 +1,11 @@
+import { SandboxInfo } from 'app/common/SandboxInfo';
 
 export type BootProbeIds =
     'boot-page' |
     'health-check' |
     'reachable' |
     'host-header' |
+    'sandboxing' |
     'system-user'
 ;
 
@@ -20,3 +22,4 @@ export interface BootProbeInfo {
   name: string;
 }
 
+export type SandboxingBootProbeDetails = SandboxInfo;
diff --git a/app/common/SandboxInfo.ts b/app/common/SandboxInfo.ts
new file mode 100644
index 00000000..374672a7
--- /dev/null
+++ b/app/common/SandboxInfo.ts
@@ -0,0 +1,9 @@
+export interface SandboxInfo {
+  flavor: string;       // the type of sandbox in use (gvisor, unsandboxed, etc)
+  functional: boolean;  // whether the sandbox can run code
+  effective: boolean;   // whether the sandbox is actually giving protection
+  configured: boolean;  // whether a sandbox type has been specified
+  // if sandbox fails to run, this records the last step that worked
+  lastSuccessfulStep: 'none' | 'create' | 'use' | 'all';
+  error?: string;       // if sandbox fails, this stores an error
+}
diff --git a/app/common/gristUrls.ts b/app/common/gristUrls.ts
index b852c853..8779d23a 100644
--- a/app/common/gristUrls.ts
+++ b/app/common/gristUrls.ts
@@ -87,6 +87,7 @@ export const commonUrls = {
   helpCalendarWidget: "https://support.getgrist.com/widget-calendar",
   helpLinkKeys: "https://support.getgrist.com/examples/2021-04-link-keys",
   helpFilteringReferenceChoices: "https://support.getgrist.com/col-refs/#filtering-reference-choices-in-dropdown",
+  helpSandboxing: "https://support.getgrist.com/self-managed/#how-do-i-sandbox-documents",
   freeCoachingCall: getFreeCoachingCallUrl(),
   contactSupport: getContactSupportUrl(),
   plans: "https://www.getgrist.com/pricing",
diff --git a/app/server/lib/ActiveDoc.ts b/app/server/lib/ActiveDoc.ts
index b65ba14b..c7fa5570 100644
--- a/app/server/lib/ActiveDoc.ts
+++ b/app/server/lib/ActiveDoc.ts
@@ -95,12 +95,14 @@ import {checksumFile} from 'app/server/lib/checksumFile';
 import {Client} from 'app/server/lib/Client';
 import {getMetaTables} from 'app/server/lib/DocApi';
 import {DEFAULT_CACHE_TTL, DocManager} from 'app/server/lib/DocManager';
+import {GristServer} from 'app/server/lib/GristServer';
 import {ICreateActiveDocOptions} from 'app/server/lib/ICreate';
 import {makeForkIds} from 'app/server/lib/idUtils';
 import {GRIST_DOC_SQL, GRIST_DOC_WITH_TABLE1_SQL} from 'app/server/lib/initialDocSql';
 import {ISandbox} from 'app/server/lib/ISandbox';
 import log from 'app/server/lib/log';
 import {LogMethods} from "app/server/lib/LogMethods";
+import {ISandboxOptions} from 'app/server/lib/NSandbox';
 import {NullSandbox, UnavailableSandboxMethodError} from 'app/server/lib/NullSandbox';
 import {DocRequests} from 'app/server/lib/Requests';
 import {shortDesc} from 'app/server/lib/shortDesc';
@@ -2764,11 +2766,9 @@ export class ActiveDoc extends EventEmitter {
         }
       }
     }
-    return this._docManager.gristServer.create.NSandbox({
-      comment: this._docName,
-      logCalls: false,
-      logTimes: true,
-      logMeta: {docId: this._docName},
+    return createSandbox({
+      server: this._docManager.gristServer,
+      docId: this._docName,
       preferredPythonVersion,
       sandboxOptions: {
         exports: {
@@ -2951,3 +2951,23 @@ export async function getRealTableId(
 export function sanitizeApplyUAOptions(options?: ApplyUAOptions): ApplyUAOptions {
   return pick(options||{}, ['desc', 'otherId', 'linkId', 'parseStrings']);
 }
+
+/**
+ * Create a sandbox in its default initial state and with default logging.
+ */
+export function createSandbox(options: {
+  server: GristServer,
+  docId: string,
+  preferredPythonVersion: '2' | '3' | undefined,
+  sandboxOptions?: Partial<ISandboxOptions>,
+}) {
+  const {docId, preferredPythonVersion, sandboxOptions, server} = options;
+  return server.create.NSandbox({
+    comment: docId,
+    logCalls: false,
+    logTimes: true,
+    logMeta: {docId},
+    preferredPythonVersion,
+    sandboxOptions,
+  });
+}
diff --git a/app/server/lib/BootProbes.ts b/app/server/lib/BootProbes.ts
index dad91f7e..7cddb99f 100644
--- a/app/server/lib/BootProbes.ts
+++ b/app/server/lib/BootProbes.ts
@@ -18,13 +18,16 @@ export class BootProbes {
 
   public constructor(private _app: express.Application,
                      private _server: GristServer,
-                     private _base: string) {
+                     private _base: string,
+                     private _middleware: express.Handler[] = []) {
     this._addProbes();
   }
 
   public addEndpoints() {
     // Return a list of available probes.
-    this._app.use(`${this._base}/probe$`, expressWrap(async (_, res) => {
+    this._app.use(`${this._base}/probe$`,
+                  ...this._middleware,
+                  expressWrap(async (_, res) => {
       res.json({
         'probes': this._probes.map(probe => {
           return { id: probe.id, name: probe.name };
@@ -33,7 +36,9 @@ export class BootProbes {
     }));
 
     // Return result of running an individual probe.
-    this._app.use(`${this._base}/probe/:probeId`, expressWrap(async (req, res) => {
+    this._app.use(`${this._base}/probe/:probeId`,
+                  ...this._middleware,
+                  expressWrap(async (req, res) => {
       const probe = this._probeById.get(req.params.probeId);
       if (!probe) {
         throw new ApiError('unknown probe', 400);
@@ -52,6 +57,7 @@ export class BootProbes {
     this._probes.push(_userProbe);
     this._probes.push(_bootProbe);
     this._probes.push(_hostHeaderProbe);
+    this._probes.push(_sandboxingProbe);
     this._probeById = new Map(this._probes.map(p => [p.id, p]));
   }
 }
@@ -183,3 +189,16 @@ const _hostHeaderProbe: Probe = {
     };
   },
 };
+
+
+const _sandboxingProbe: Probe = {
+  id: 'sandboxing',
+  name: 'Sandboxing is working',
+  apply: async (server, req) => {
+    const details = server.getSandboxInfo();
+    return {
+      success: details?.configured && details?.functional,
+      details,
+    };
+  },
+};
diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts
index 5c10a65c..17ac46a3 100644
--- a/app/server/lib/FlexServer.ts
+++ b/app/server/lib/FlexServer.ts
@@ -9,6 +9,7 @@ import {getOrgUrlInfo} from 'app/common/gristUrls';
 import {isAffirmative, safeJsonParse} from 'app/common/gutil';
 import {InstallProperties} from 'app/common/InstallAPI';
 import {UserProfile} from 'app/common/LoginSessionAPI';
+import {SandboxInfo} from 'app/common/SandboxInfo';
 import {tbind} from 'app/common/tbind';
 import * as version from 'app/common/version';
 import {ApiServer, getOrgFromRequest} from 'app/gen-server/ApiServer';
@@ -23,6 +24,7 @@ import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager';
 import {Housekeeper} from 'app/gen-server/lib/Housekeeper';
 import {Usage} from 'app/gen-server/lib/Usage';
 import {AccessTokens, IAccessTokens} from 'app/server/lib/AccessTokens';
+import {createSandbox} from 'app/server/lib/ActiveDoc';
 import {attachAppEndpoint} from 'app/server/lib/AppEndpoint';
 import {appSettings} from 'app/server/lib/AppSettings';
 import {addRequestUser, getTransitiveHeaders, getUser, getUserId, isAnonymousUser,
@@ -42,7 +44,7 @@ import {expressWrap, jsonErrorHandler, secureJsonErrorHandler} from 'app/server/
 import {Hosts, RequestWithOrg} from 'app/server/lib/extractOrg';
 import {addGoogleAuthEndpoint} from "app/server/lib/GoogleAuth";
 import {DocTemplate, GristLoginMiddleware, GristLoginSystem, GristServer,
-        RequestWithGrist} from 'app/server/lib/GristServer';
+  RequestWithGrist} from 'app/server/lib/GristServer';
 import {initGristSessions, SessionStore} from 'app/server/lib/gristSessions';
 import {HostedStorageManager} from 'app/server/lib/HostedStorageManager';
 import {IBilling} from 'app/server/lib/IBilling';
@@ -181,6 +183,7 @@ export class FlexServer implements GristServer {
   private _isReady: boolean = false;
   private _probes: BootProbes;
   private _updateManager: UpdateManager;
+  private _sandboxInfo: SandboxInfo;
 
   constructor(public port: number, public name: string = 'flexServer',
               public readonly options: FlexServerOptions = {}) {
@@ -1367,6 +1370,47 @@ export class FlexServer implements GristServer {
     }
   }
 
+  public async checkSandbox() {
+    if (this._check('sandbox', 'doc')) { return; }
+    const flavor = process.env.GRIST_SANDBOX_FLAVOR || 'unknown';
+    const info = this._sandboxInfo = {
+      flavor,
+      configured: flavor !== 'unsandboxed',
+      functional: false,
+      effective: false,
+      sandboxed: false,
+      lastSuccessfulStep: 'none',
+    } as SandboxInfo;
+    try {
+      const sandbox = createSandbox({
+        server: this,
+        docId: 'test',  // The id is just used in logging - no
+                        // document is created or read at this level.
+        // In olden times, and in SaaS, Python 2 is supported. In modern
+        // times Python 2 is long since deprecated and defunct.
+        preferredPythonVersion: '3',
+      });
+      info.flavor = sandbox.getFlavor();
+      info.configured = info.flavor !== 'unsandboxed';
+      info.lastSuccessfulStep = 'create';
+      const result = await sandbox.pyCall('get_version');
+      if (typeof result !== 'number') {
+        throw new Error(`Expected a number: ${result}`);
+      }
+      info.lastSuccessfulStep = 'use';
+      await sandbox.shutdown();
+      info.lastSuccessfulStep = 'all';
+      info.functional = true;
+      info.effective = ![ 'skip', 'unsandboxed' ].includes(info.flavor);
+    } catch (e) {
+      info.error = String(e);
+    }
+  }
+
+  public getSandboxInfo(): SandboxInfo|undefined {
+    return this._sandboxInfo;
+  }
+
   public disableExternalStorage() {
     if (this.deps.has('doc')) {
       throw new Error('disableExternalStorage called too late');
@@ -1827,6 +1871,8 @@ export class FlexServer implements GristServer {
     this.app.get('/admin', ...adminPageMiddleware, expressWrap(async (req, resp) => {
       return this.sendAppPage(req, resp, {path: 'app.html', status: 200, config: {}});
     }));
+    const probes = new BootProbes(this.app, this, '/admin', adminPageMiddleware);
+    probes.addEndpoints();
 
     // Restrict this endpoint to install admins too, for the same reason as the /admin page.
     this.app.get('/api/install/prefs', requireInstallAdmin, expressWrap(async (_req, resp) => {
diff --git a/app/server/lib/GristServer.ts b/app/server/lib/GristServer.ts
index b72b3ed5..9c53f347 100644
--- a/app/server/lib/GristServer.ts
+++ b/app/server/lib/GristServer.ts
@@ -1,6 +1,7 @@
 import { ICustomWidget } from 'app/common/CustomWidget';
 import { GristDeploymentType, GristLoadConfig } from 'app/common/gristUrls';
 import { LocalPlugin } from 'app/common/plugin';
+import { SandboxInfo } from 'app/common/SandboxInfo';
 import { UserProfile } from 'app/common/UserAPI';
 import { Document } from 'app/gen-server/entity/Document';
 import { Organization } from 'app/gen-server/entity/Organization';
@@ -64,6 +65,7 @@ export interface GristServer {
   servesPlugins(): boolean;
   getBundledWidgets(): ICustomWidget[];
   hasBoot(): boolean;
+  getSandboxInfo(): SandboxInfo|undefined;
 }
 
 export interface GristLoginSystem {
@@ -154,6 +156,7 @@ export function createDummyGristServer(): GristServer {
     getPlugins() { return []; },
     getBundledWidgets() { return []; },
     hasBoot() { return false; },
+    getSandboxInfo() { return undefined; },
   };
 }
 
diff --git a/app/server/lib/ISandbox.ts b/app/server/lib/ISandbox.ts
index c53583fa..89d09fd8 100644
--- a/app/server/lib/ISandbox.ts
+++ b/app/server/lib/ISandbox.ts
@@ -26,6 +26,7 @@ export interface ISandbox {
   shutdown(): Promise<unknown>;  // TODO: tighten up this type.
   pyCall(funcName: string, ...varArgs: unknown[]): Promise<any>;
   reportMemoryUsage(): Promise<void>;
+  getFlavor(): string;
 }
 
 export interface ISandboxCreator {
diff --git a/app/server/lib/NSandbox.ts b/app/server/lib/NSandbox.ts
index d57aacbe..86a1ded6 100644
--- a/app/server/lib/NSandbox.ts
+++ b/app/server/lib/NSandbox.ts
@@ -230,6 +230,10 @@ export class NSandbox implements ISandbox {
     log.rawDebug('Sandbox memory', {memory, ...this._logMeta});
   }
 
+  public getFlavor() {
+    return this._logMeta.flavor;
+  }
+
   /**
    * Get ready to communicate with a sandbox process using stdin,
    * stdout, and stderr.
@@ -466,6 +470,10 @@ const spawners = {
   gvisor,             // Gvisor's runsc sandbox.
   macSandboxExec,     // Use "sandbox-exec" on Mac.
   pyodide,            // Run data engine using pyodide.
+  skip: unsandboxed,  // Same as unsandboxed. Used to mean that the
+                      // user deliberately doesn't want sandboxing.
+                      // The "unsandboxed" setting is ambiguous in this
+                      // respect.
 };
 
 function isFlavor(flavor: string): flavor is keyof typeof spawners {
diff --git a/app/server/lib/NullSandbox.ts b/app/server/lib/NullSandbox.ts
index 7eadf723..96045972 100644
--- a/app/server/lib/NullSandbox.ts
+++ b/app/server/lib/NullSandbox.ts
@@ -18,4 +18,8 @@ export class NullSandbox implements ISandbox {
   public async reportMemoryUsage() {
     throw new UnavailableSandboxMethodError('reportMemoryUsage is not available');
   }
+
+  public getFlavor() {
+    return 'null';
+  }
 }
diff --git a/app/server/mergedServerMain.ts b/app/server/mergedServerMain.ts
index 0c62010d..8405cd8d 100644
--- a/app/server/mergedServerMain.ts
+++ b/app/server/mergedServerMain.ts
@@ -179,6 +179,12 @@ export async function main(port: number, serverTypes: ServerType[],
     server.checkOptionCombinations();
     server.summary();
     server.ready();
+
+    // Some tests have their timing perturbed by having this earlier
+    // TODO: update those tests.
+    if (includeDocs) {
+      await server.checkSandbox();
+    }
     return server;
   } catch(e) {
     await server.close();
diff --git a/test/nbrowser/AdminPanel.ts b/test/nbrowser/AdminPanel.ts
index 209baf8c..f5d47aa1 100644
--- a/test/nbrowser/AdminPanel.ts
+++ b/test/nbrowser/AdminPanel.ts
@@ -177,6 +177,19 @@ describe('AdminPanel', function() {
     assert.match(await driver.find('.test-admin-panel-item-value-version').getText(), /^Version \d+\./);
   });
 
+  it('should show sandbox', async function() {
+    await driver.get(`${server.getHost()}/admin`);
+    await waitForAdminPanel();
+    assert.equal(await driver.find('.test-admin-panel-item-sandboxing').isDisplayed(), true);
+    await gu.waitToPass(
+      async () => assert.match(await driver.find('.test-admin-panel-item-value-sandboxing').getText(), /^unknown/),
+      3000,
+    );
+    // It would be good to test other scenarios, but we are using
+    // a multi-server setup and the sandbox test isn't useful there
+    // yet.
+  });
+
   const upperCheckNow = () => driver.find('.test-admin-panel-updates-upper-check-now');
   const lowerCheckNow = () => driver.find('.test-admin-panel-updates-lower-check-now');
   const autoCheckToggle = () => driver.find('.test-admin-panel-updates-auto-check');

From b9808944d7a5b790de107f63c0161aa8b8eab04b Mon Sep 17 00:00:00 2001
From: Paul Fitzpatrick <paulfitz@alum.mit.edu>
Date: Mon, 29 Apr 2024 21:57:02 -0400
Subject: [PATCH 45/45] tweak admin test to also work under grist-core settings
 (#960)

---
 test/nbrowser/AdminPanel.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/nbrowser/AdminPanel.ts b/test/nbrowser/AdminPanel.ts
index f5d47aa1..5a78b85c 100644
--- a/test/nbrowser/AdminPanel.ts
+++ b/test/nbrowser/AdminPanel.ts
@@ -182,12 +182,14 @@ describe('AdminPanel', function() {
     await waitForAdminPanel();
     assert.equal(await driver.find('.test-admin-panel-item-sandboxing').isDisplayed(), true);
     await gu.waitToPass(
-      async () => assert.match(await driver.find('.test-admin-panel-item-value-sandboxing').getText(), /^unknown/),
+      // unknown for grist-saas, unconfigured for grist-core.
+      async () => assert.match(await driver.find('.test-admin-panel-item-value-sandboxing').getText(),
+                               /^((unknown)|(unconfigured))/),
       3000,
     );
     // It would be good to test other scenarios, but we are using
-    // a multi-server setup and the sandbox test isn't useful there
-    // yet.
+    // a multi-server setup on grist-saas and the sandbox test isn't
+    // useful there yet.
   });
 
   const upperCheckNow = () => driver.find('.test-admin-panel-updates-upper-check-now');