vease 1.54.0 → 1.55.0-rc.2

package/.build/tests/e2e/utils/fixtures.js

@@ -1,3 +1,4 @@
+import { waitForActionSettled } from "./wait_for_action_settled.js";
 import { navigateToApp } from "./navigate.js";
 import { expect, test as test$1 } from "@playwright/test";
 import { consola } from "consola";
@@ -66,7 +67,10 @@ const test = test$1.extend({
 	autoScreenshot: [async ({ app, screenshotMask }, use, testInfo) => {
 		await use(void 0);
 		const { window } = app;
-		if (testInfo.status === testInfo.expectedStatus) await expect(window).toHaveScreenshot({ mask: [window.getByTestId("accountNavButton"), ...screenshotMask.locators] });
+		if (testInfo.status === testInfo.expectedStatus) {
+			await waitForActionSettled(window);
+			await expect(window).toHaveScreenshot({ mask: [window.getByTestId("accountNavButton"), ...screenshotMask.locators] });
+		}
 	}, { auto: true }]
 });
 //#endregion

package/.build/tests/e2e/utils/wait_for_action_settled.js

@@ -4,13 +4,15 @@ function noopCleanup() {}
 const BUSY_INDICATOR_TEST_ID = "microservicesBusyIndicator";
 const REQUEST_DISPATCH_GRACE_MS = 50;
 const BUSY_INDICATOR_HARD_CEILING_MS = 1e4;
-async function waitForMicroservicesIdle(window, budgetMs) {
-	await window.waitForTimeout(Math.min(REQUEST_DISPATCH_GRACE_MS, budgetMs));
+async function waitForMicroservicesIdle(window, timeoutMs) {
 	await window.getByTestId(BUSY_INDICATOR_TEST_ID).waitFor({
 		state: "hidden",
-		timeout: Math.max(budgetMs, BUSY_INDICATOR_HARD_CEILING_MS)
+		timeout: timeoutMs
 	}).catch(noopCleanup);
 }
+async function isMicroservicesBusy(window) {
+	return await window.getByTestId(BUSY_INDICATOR_TEST_ID).isVisible().catch(() => false);
+}
 const MUTATION_QUIET_MS = 250;
 const MUTATION_POLL_INTERVAL_MS = 20;
 async function waitForDomSettled(window, budgetMs) {
@@ -45,10 +47,16 @@ async function waitForNextPaint(window) {
 		});
 	}).catch(noopCleanup);
 }
+async function waitForIdleAndSettled(window, startedAt, ceilingMs, deadline) {
+	await waitForMicroservicesIdle(window, Math.max(1, deadline - Date.now()));
+	await waitForDomSettled(window, Math.max(MIN_DOM_SETTLE_BUDGET_MS, ceilingMs - (Date.now() - startedAt)));
+	if (Date.now() < deadline && await isMicroservicesBusy(window)) await waitForIdleAndSettled(window, startedAt, ceilingMs, deadline);
+}
 async function waitForActionSettled(window, ceilingMs = afterActionWait) {
 	const startedAt = Date.now();
-	await waitForMicroservicesIdle(window, ceilingMs);
-	await waitForDomSettled(window, Math.max(MIN_DOM_SETTLE_BUDGET_MS, ceilingMs - (Date.now() - startedAt)));
+	const deadline = startedAt + Math.max(ceilingMs, BUSY_INDICATOR_HARD_CEILING_MS);
+	await window.waitForTimeout(Math.min(REQUEST_DISPATCH_GRACE_MS, ceilingMs));
+	await waitForIdleAndSettled(window, startedAt, ceilingMs, deadline);
 	await waitForNextPaint(window);
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vease",
-  "version": "1.54.0",
+  "version": "1.55.0-rc.2",
   "description": "Desktop and cloud software for data visualization",
   "keywords": [
     "Desktop",
@@ -88,12 +88,12 @@
     "@ai-sdk/vue": "4.0.93",
     "@fontsource/michroma": "5.2.6",
     "@fontsource/roboto": "5.2.10",
-    "@geode/cloud-api": "latest",
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-front": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
-    "@geode/vease-back": "latest",
-    "@geode/vease-viewer": "latest",
+    "@geode/cloud-api": "next",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-front": "next",
+    "@geode/opengeodeweb-viewer": "next",
+    "@geode/vease-back": "next",
+    "@geode/vease-viewer": "next",
     "@nuxtjs/mcp-toolkit": "0.18.1",
     "ai": "7.0.93",
     "bowser": "2.14.1",

package/tests/e2e/utils/fixtures.ts

@@ -12,6 +12,7 @@ import { consola } from "consola";
 
 // Local imports
 import { navigateToApp } from "./navigate";
+import { waitForActionSettled } from "./wait_for_action_settled";
 
 const MILLISECONDS_PER_SECOND = 1000;
 
@@ -133,6 +134,8 @@ const test = base.extend<TestFixtures, WorkerFixtures>({
       // Read at teardown: the test may have restarted the app
       const { window } = app;
       if (testInfo.status === testInfo.expectedStatus) {
+        // Never capture while the microservices are still busy (busy indicator bar, half-rendered viewer)
+        await waitForActionSettled(window);
         // The account icon depends on login state (only cloud is logged in)
         await expect(window).toHaveScreenshot({
           mask: [window.getByTestId("accountNavButton"), ...screenshotMask.locators],

package/tests/e2e/utils/wait_for_action_settled.ts

@@ -21,14 +21,21 @@ const REQUEST_DISPATCH_GRACE_MS = 50;
 // Some backend RPCs (attribute-name lookups on a component with many items, for example) occasionally take several seconds under CI load, so the indicator gets generous headroom to clear.
 const BUSY_INDICATOR_HARD_CEILING_MS = 10_000;
 
-async function waitForMicroservicesIdle(window: Page, budgetMs: number): Promise<void> {
-  await window.waitForTimeout(Math.min(REQUEST_DISPATCH_GRACE_MS, budgetMs));
+async function waitForMicroservicesIdle(window: Page, timeoutMs: number): Promise<void> {
   await window
     .getByTestId(BUSY_INDICATOR_TEST_ID)
-    .waitFor({ state: "hidden", timeout: Math.max(budgetMs, BUSY_INDICATOR_HARD_CEILING_MS) })
+    .waitFor({ state: "hidden", timeout: timeoutMs })
     .catch(noopCleanup);
 }
 
+async function isMicroservicesBusy(window: Page): Promise<boolean> {
+  const busy = await window
+    .getByTestId(BUSY_INDICATOR_TEST_ID)
+    .isVisible()
+    .catch(() => false);
+  return busy;
+}
+
 const MUTATION_QUIET_MS = 250;
 const MUTATION_POLL_INTERVAL_MS = 20;
 
@@ -73,11 +80,28 @@ async function waitForNextPaint(window: Page): Promise<void> {
     .catch(noopCleanup);
 }
 
-async function waitForActionSettled(window: Page, ceilingMs = afterActionWait): Promise<void> {
-  const startedAt = Date.now();
-  await waitForMicroservicesIdle(window, ceilingMs);
+// Multi-step actions (project import, for example) chain several requests with short gaps in between: the indicator briefly hides, then shows again.
+// The indeterminate bar animates through CSS only, so the DOM can look quiet while it is visible: re-check it after the DOM settles and start over if it came back.
+async function waitForIdleAndSettled(
+  window: Page,
+  startedAt: number,
+  ceilingMs: number,
+  deadline: number,
+): Promise<void> {
+  // A zero timeout means "no timeout" in Playwright
+  await waitForMicroservicesIdle(window, Math.max(1, deadline - Date.now()));
   const remainingMs = Math.max(MIN_DOM_SETTLE_BUDGET_MS, ceilingMs - (Date.now() - startedAt));
   await waitForDomSettled(window, remainingMs);
+  if (Date.now() < deadline && (await isMicroservicesBusy(window))) {
+    await waitForIdleAndSettled(window, startedAt, ceilingMs, deadline);
+  }
+}
+
+async function waitForActionSettled(window: Page, ceilingMs = afterActionWait): Promise<void> {
+  const startedAt = Date.now();
+  const deadline = startedAt + Math.max(ceilingMs, BUSY_INDICATOR_HARD_CEILING_MS);
+  await window.waitForTimeout(Math.min(REQUEST_DISPATCH_GRACE_MS, ceilingMs));
+  await waitForIdleAndSettled(window, startedAt, ceilingMs, deadline);
   await waitForNextPaint(window);
 }