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

(core) Fixes compilation issues from grist-core

Browse Source 
Test Plan: SaaS CI

Reviewers: paulfitz

Reviewed By: paulfitz

Differential Revision: https://phab.getgrist.com/D4351
This commit is contained in:
Spoffy 2024-09-17 20:33:32 +01:00
parent 5b26c84f0d
commit 839bf63b9f
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/client/ui/ImportProgress.ts
View File

@ -55,4 +55,3 @@ export class ImportProgress extends Disposable {
this._progressUI.setProgress(100 * progress); this._progressUI.setProgress(100 * progress);
} }
} }

6
app/server/devServerMain.ts
View File

@ -97,8 +97,8 @@ export async function main() {
process.env.APP_HOME_URL = `http://localhost:${port}`; process.env.APP_HOME_URL = `http://localhost:${port}`;
} }
const mergedServer = await MergedServer.create(port, ["home", "docs", "static"]); const mergedServer = await MergedServer.create(port, ["home", "docs", "static"]);
await mergedServer.flexServer.addTestingHooks();
await mergedServer.run(); await mergedServer.run();
await mergedServer.flexServer.addTestingHooks();
return; return;
} }
@ -149,7 +149,9 @@ export async function main() {
} }
const workers = new Array<FlexServer>(); const workers = new Array<FlexServer>();
for (const port of ports) { 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); await homeServer.flexServer.addTestingHooks(workers);

1
app/server/lib/FlexServer.ts
View File

@ -1295,6 +1295,7 @@ export class FlexServer implements GristServer {
} }
public async addTestingHooks(workerServers?: FlexServer[]) { public async addTestingHooks(workerServers?: FlexServer[]) {
this._check('testinghooks', 'comm');
if (process.env.GRIST_TESTING_SOCKET) { if (process.env.GRIST_TESTING_SOCKET) {
await startTestingHooks(process.env.GRIST_TESTING_SOCKET, this.port, this._comm, this, await startTestingHooks(process.env.GRIST_TESTING_SOCKET, this.port, this._comm, this,
workerServers || []); workerServers || []);

1
app/server/lib/ICreate.ts
View File

@ -245,4 +245,3 @@ const createDefaultHostedStorageManager: HostedDocStorageManagerCreator = async
const createDefaultLocalStorageManager: LocalDocStorageManagerCreator = async ( const createDefaultLocalStorageManager: LocalDocStorageManagerCreator = async (
docsRoot, samplesRoot, comm, shell docsRoot, samplesRoot, comm, shell
) => new DocStorageManager(docsRoot, samplesRoot, comm, shell); ) => new DocStorageManager(docsRoot, samplesRoot, comm, shell);

2
test/gen-server/lib/mergedOrgs.ts
View File

@ -1,7 +1,7 @@
import {Workspace} from 'app/common/UserAPI'; import {Workspace} from 'app/common/UserAPI';
import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager'; import {HomeDBManager} from 'app/gen-server/lib/homedb/HomeDBManager';
import {FlexServer} from 'app/server/lib/FlexServer'; import {FlexServer} from 'app/server/lib/FlexServer';
import {MergedServer} from "app/server/MergedServer"; import {MergedServer} from 'app/server/MergedServer';
import axios from 'axios'; import axios from 'axios';
import {assert} from 'chai'; import {assert} from 'chai';
import {createInitialDb, removeConnection, setUpDB} from 'test/gen-server/seed'; import {createInitialDb, removeConnection, setUpDB} from 'test/gen-server/seed';