fix(FN-1339): move executor status bar above mobile nav bar

This commit is contained in:
gsxdsm
2026-04-09 15:49:42 -07:00
parent 0e295c3239
commit 8f50526158
16 changed files with 267 additions and 49 deletions

View File

@@ -199,13 +199,14 @@ describe("runDesktop", () => {
expect(mocks.store.updateSettings).toHaveBeenCalledWith({ enginePaused: true });
expect(mocks.app.listen).toHaveBeenCalledWith(0);
// In production mode (not dev), renderer uses embedded assets, so no FUSION_DASHBOARD_URL
expect(mocks.spawn).toHaveBeenCalledWith(
"electron-bin",
["--enable-source-maps", "/repo/packages/desktop/dist/main.js"],
expect.objectContaining({
cwd: "/repo",
env: expect.objectContaining({
FUSION_DASHBOARD_URL: "http://localhost:4545",
// No FUSION_DASHBOARD_URL in production
FUSION_SERVER_PORT: "4545",
}),
}),

View File

@@ -113,23 +113,28 @@ export async function runDesktop(options: RunDesktopOptions = {}): Promise<void>
}
const runtime = await startDashboardRuntime(rootDir, Boolean(options.paused));
const rendererUrl = options.dev
? process.env.FUSION_DASHBOARD_URL ?? "http://localhost:5173"
: `http://localhost:${runtime.port}`;
const electronBinary = resolveElectronBinary();
const desktopEntry = join(rootDir, "packages", "desktop", "dist", "main.js");
const electronArgs = ["--enable-source-maps", desktopEntry, ...(options.dev ? ["--dev"] : [])];
// Build environment for Electron process
const electronEnv: NodeJS.ProcessEnv = {
...process.env,
FUSION_SERVER_PORT: String(runtime.port),
};
// In dev mode, set FUSION_DASHBOARD_URL to the dashboard runtime URL
// In production mode, renderer uses embedded assets (no FUSION_DASHBOARD_URL needed)
if (options.dev) {
electronEnv.FUSION_DASHBOARD_URL = process.env.FUSION_DASHBOARD_URL ?? "http://localhost:5173";
electronEnv.NODE_ENV = "development";
}
const electronProcess = spawn(electronBinary, electronArgs, {
cwd: rootDir,
stdio: "inherit",
env: {
...process.env,
FUSION_DASHBOARD_URL: rendererUrl,
FUSION_SERVER_PORT: String(runtime.port),
...(options.dev ? { NODE_ENV: "development" } : {}),
},
env: electronEnv,
});
let isShuttingDown = false;