From 839bf63b9fa9db0aeabb98bdd8242442d884034e Mon Sep 17 00:00:00 2001
From: Spoffy <contact@spoffy.net>
Date: Tue, 17 Sep 2024 20:33:32 +0100
Subject: [PATCH] (core) Fixes compilation issues from grist-core

Test Plan: SaaS CI

Reviewers: paulfitz

Reviewed By: paulfitz

Differential Revision: https://phab.getgrist.com/D4351
---
 app/client/ui/ImportProgress.ts   | 1 -
 app/server/devServerMain.ts       | 6 ++++--
 app/server/lib/FlexServer.ts      | 1 +
 app/server/lib/ICreate.ts         | 1 -
 test/gen-server/lib/mergedOrgs.ts | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/client/ui/ImportProgress.ts b/app/client/ui/ImportProgress.ts
index ce6d52a2..e2cb7dfe 100644
--- a/app/client/ui/ImportProgress.ts
+++ b/app/client/ui/ImportProgress.ts
@@ -55,4 +55,3 @@ export class ImportProgress extends Disposable {
     this._progressUI.setProgress(100 * progress);
   }
 }
-
diff --git a/app/server/devServerMain.ts b/app/server/devServerMain.ts
index c2b3960b..57b06902 100644
--- a/app/server/devServerMain.ts
+++ b/app/server/devServerMain.ts
@@ -97,8 +97,8 @@ export async function main() {
       process.env.APP_HOME_URL = `http://localhost:${port}`;
     }
     const mergedServer = await MergedServer.create(port, ["home", "docs", "static"]);
-    await mergedServer.flexServer.addTestingHooks();
     await mergedServer.run();
+    await mergedServer.flexServer.addTestingHooks();
     return;
   }
 
@@ -149,7 +149,9 @@ export async function main() {
   }
   const workers = new Array<FlexServer>();
   for (const port of ports) {
-    workers.push((await MergedServer.create(port, ["docs"])).flexServer);
+    const mergedServer = await MergedServer.create(port, ["docs"]);
+    workers.push(mergedServer.flexServer);
+    await mergedServer.run();
   }
 
   await homeServer.flexServer.addTestingHooks(workers);
diff --git a/app/server/lib/FlexServer.ts b/app/server/lib/FlexServer.ts
index b295ca96..4bdf5369 100644
--- a/app/server/lib/FlexServer.ts
+++ b/app/server/lib/FlexServer.ts
@@ -1295,6 +1295,7 @@ export class FlexServer implements GristServer {
   }
 
   public async addTestingHooks(workerServers?: FlexServer[]) {
+    this._check('testinghooks', 'comm');
     if (process.env.GRIST_TESTING_SOCKET) {
       await startTestingHooks(process.env.GRIST_TESTING_SOCKET, this.port, this._comm, this,
                               workerServers || []);
diff --git a/app/server/lib/ICreate.ts b/app/server/lib/ICreate.ts
index af234f39..1886ad81 100644
--- a/app/server/lib/ICreate.ts
+++ b/app/server/lib/ICreate.ts
@@ -245,4 +245,3 @@ const createDefaultHostedStorageManager: HostedDocStorageManagerCreator = async
 const createDefaultLocalStorageManager: LocalDocStorageManagerCreator = async (
   docsRoot, samplesRoot, comm, shell
 ) => new DocStorageManager(docsRoot, samplesRoot, comm, shell);
-
diff --git a/test/gen-server/lib/mergedOrgs.ts b/test/gen-server/lib/mergedOrgs.ts
index eb71fd61..42fefa30 100644
--- a/test/gen-server/lib/mergedOrgs.ts
+++ b/test/gen-server/lib/mergedOrgs.ts
@@ -1,7 +1,7 @@
 import {Workspace} from 'app/common/UserAPI';
 import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
 import {FlexServer} from 'app/server/lib/FlexServer';
-import {MergedServer} from "app/server/MergedServer";
+import {MergedServer} from 'app/server/MergedServer';
 import axios from 'axios';
 import {assert} from 'chai';
 import {createInitialDb, removeConnection, setUpDB} from 'test/gen-server/seed';