推进 INI 面板 control-page refresh workflow helper

wasm-port/tests/browser/ini_panel_control_page_smoke.html

@@ -64,6 +64,7 @@ TOOL_TABLE = browser-tool.tbl
       if (
         !controlPageApi?.getControlView ||
         !controlPageApi?.getPanelApi ||
+        !controlPageApi?.refreshControlPage ||
         !controlPageApi?.renderControlPage
       ) {
         throw new Error("control page API namespace did not expose control helpers");
@@ -82,6 +83,11 @@ TOOL_TABLE = browser-tool.tbl
         () => controlPageApi.getControlView(),
         "control page API view",
       );
+      assertEqual(
+        controlPageApi.refreshControlPage().phase,
+        "rendered",
+        "control page refresh phase",
+      );
 
       panelDoc.getElementById("ini-editor").value = iniText;
       panelDoc.getElementById("query").click();

wasm-port/tests/ui/node/verify_ini_panel_control_page_controller.mjs

@@ -3,6 +3,9 @@ import assert from "node:assert/strict";
 import {
   createMachineSessionControlPageController,
 } from "../../../runtime/ui/ini-panel/control-page-controller.js";
+import {
+  controlPageStatusText,
+} from "../../../runtime/ui/ini-panel/control-page-refresh-workflow.js";
 
 function createPanelFrame(panelApi = null) {
   const listeners = new Map();
@@ -75,6 +78,9 @@ const renderResult = controller.render();
 assert.deepEqual(renderResult, { statusNode: { textContent: "rendered" } });
 assert.equal(statusNode.textContent, "run-gcode | ok | -");
 assert.deepEqual(rendered, [{ container: viewNode, view: expectedView }]);
+const refreshResult = controller.refresh();
+assert.equal(refreshResult.phase, "rendered");
+assert.equal(refreshResult.statusText, controlPageStatusText(expectedView.status));
 
 const mountedFrame = createPanelFrame(panelApi);
 const mountedStatusNode = { textContent: "" };

wasm-port/tests/ui/node/verify_ini_panel_control_page_refresh_workflow.mjs

@@ -0,0 +1,126 @@
+import assert from "node:assert/strict";
+
+import {
+  controlPageStatusText,
+  createControlPageRefreshState,
+  refreshMachineSessionControlPage,
+} from "../../../runtime/ui/ini-panel/control-page-refresh-workflow.js";
+
+const expectedView = {
+  status: {
+    lastAction: "run-gcode",
+    runStatus: "ok",
+    error: null,
+  },
+  sections: [
+    {
+      id: "run",
+      rows: [
+        { label: "Canonical events", value: 2 },
+      ],
+    },
+  ],
+};
+
+assert.equal(controlPageStatusText(expectedView.status), "run-gcode | ok | -");
+assert.deepEqual(createControlPageRefreshState({ phase: "waiting", statusText: "waiting for panel" }), {
+  phase: "waiting",
+  statusText: "waiting for panel",
+  view: null,
+  renderResult: null,
+  error: null,
+});
+
+const waitingStatusNode = { textContent: "" };
+const waitingViewNode = { textContent: "previous" };
+assert.deepEqual(
+  refreshMachineSessionControlPage({
+    getControlView: () => null,
+    statusNode: waitingStatusNode,
+    viewNode: waitingViewNode,
+    renderControlView: () => "unused",
+  }),
+  {
+    phase: "waiting",
+    statusText: "waiting for panel",
+    view: null,
+    renderResult: null,
+    error: null,
+  },
+);
+assert.equal(waitingStatusNode.textContent, "waiting for panel");
+assert.equal(waitingViewNode.textContent, "");
+
+const renderedStatusNode = { textContent: "" };
+const renderedViewNode = { textContent: "" };
+let renderedInput = null;
+assert.deepEqual(
+  refreshMachineSessionControlPage({
+    getControlView: () => expectedView,
+    statusNode: renderedStatusNode,
+    viewNode: renderedViewNode,
+    renderControlView: (container, view) => {
+      renderedInput = { container, view };
+      return { rendered: true };
+    },
+  }),
+  {
+    phase: "rendered",
+    statusText: "run-gcode | ok | -",
+    view: expectedView,
+    renderResult: { rendered: true },
+    error: null,
+  },
+);
+assert.deepEqual(renderedInput, { container: renderedViewNode, view: expectedView });
+assert.equal(renderedStatusNode.textContent, "run-gcode | ok | -");
+
+const getterErrorStatusNode = { textContent: "" };
+const getterErrorViewNode = { textContent: "previous" };
+assert.deepEqual(
+  refreshMachineSessionControlPage({
+    getControlView: () => {
+      throw new Error("panel unavailable");
+    },
+    statusNode: getterErrorStatusNode,
+    viewNode: getterErrorViewNode,
+    renderControlView: () => "unused",
+  }),
+  {
+    phase: "error",
+    statusText: "refresh failed | - | panel unavailable",
+    view: null,
+    renderResult: null,
+    error: "panel unavailable",
+  },
+);
+assert.equal(getterErrorViewNode.textContent, "");
+
+const renderErrorStatusNode = { textContent: "" };
+const renderErrorViewNode = { textContent: "previous" };
+assert.deepEqual(
+  refreshMachineSessionControlPage({
+    getControlView: () => expectedView,
+    statusNode: renderErrorStatusNode,
+    viewNode: renderErrorViewNode,
+    renderControlView: () => {
+      throw new Error("renderer unavailable");
+    },
+  }),
+  {
+    phase: "error",
+    statusText: "refresh failed | - | renderer unavailable",
+    view: expectedView,
+    renderResult: null,
+    error: "renderer unavailable",
+  },
+);
+assert.equal(renderErrorStatusNode.textContent, "refresh failed | - | renderer unavailable");
+assert.equal(renderErrorViewNode.textContent, "");
+
+assert.throws(
+  () => refreshMachineSessionControlPage(),
+  /control view getter/,
+);
+
+console.log("ini_panel_control_page_refresh_workflow_node_smoke=ok");

wasm-port/tests/ui/node/verify_ini_panel_control_page_refresh_workflow.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "$0")/../../.." && pwd)"
+
+node "$ROOT_DIR/tests/ui/node/verify_ini_panel_control_page_refresh_workflow.mjs"

wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs

@@ -5,8 +5,10 @@ import { dirname, resolve } from "node:path";
 
 import {
   INI_PANEL_ENTRIES,
+  controlPageStatusText,
   createIniPanelLauncherLinkViewModel,
   createIniPanelShellViewModel,
+  refreshMachineSessionControlPage,
   getVisibleIniPanelEntries,
 } from "../../../runtime/ui/ini-panel/ui-shell.js";
 
@@ -14,14 +16,20 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const root = resolve(__dirname, "../../..");
 const docText = readFileSync(resolve(root, "docs/panel-entry.md"), "utf8");
 const shellText = readFileSync(resolve(root, "runtime/ui/ini-panel/ui-shell.js"), "utf8");
+const refreshWorkflowText = readFileSync(
+  resolve(root, "runtime/ui/ini-panel/control-page-refresh-workflow.js"),
+  "utf8",
+);
 
 const requiredShellExports = [
   "INI_PANEL_ENTRIES",
+  "controlPageStatusText",
   "createIniPanelLauncherLinkViewModel",
   "createIniPanelShellViewModel",
   "getIniPanelEntryByHref",
   "getVisibleIniPanelEntries",
   "createMachineSessionControlPageController",
+  "refreshMachineSessionControlPage",
   "renderMachineSessionControlView",
 ];
 
@@ -30,6 +38,15 @@ for (const exportName of requiredShellExports) {
   assert.match(docText, new RegExp(`\\b${exportName}\\b`));
 }
 
+for (const exportName of [
+  "controlPageStatusText",
+  "createControlPageRefreshState",
+  "refreshMachineSessionControlPage",
+]) {
+  assert.match(refreshWorkflowText, new RegExp(`\\bexport function ${exportName}\\b`));
+  assert.match(docText, new RegExp(`\\b${exportName}\\b`));
+}
+
 const requiredPages = [
   ["Launch", "runtime/ui/ini-panel/launch.html"],
   ["Edit and run", "runtime/ui/ini-panel/index.html"],
@@ -51,7 +68,9 @@ assert.deepEqual(
 );
 assert.deepEqual(createIniPanelShellViewModel().pages, getVisibleIniPanelEntries());
 assert.deepEqual(createIniPanelShellViewModel().launcherLinks, createIniPanelLauncherLinkViewModel());
+assert.equal(controlPageStatusText({ lastAction: "run-gcode", runStatus: "ok", error: null }), "run-gcode | ok | -");
 assert.equal(typeof createIniPanelShellViewModel().controlPage.createController, "function");
+assert.equal(createIniPanelShellViewModel().controlPage.refresh, refreshMachineSessionControlPage);
 assert.equal(typeof createIniPanelShellViewModel().controlPage.renderView, "function");
 
 for (const entry of INI_PANEL_ENTRIES) {

wasm-port/tests/ui/node/verify_ini_panel_ui_shell.mjs

@@ -2,19 +2,31 @@ import assert from "node:assert/strict";
 
 import {
   INI_PANEL_ENTRIES,
+  controlPageStatusText,
   createIniPanelLauncherLinkViewModel,
   createIniPanelShellViewModel,
+  createControlPageRefreshState,
   createMachineSessionControlPageController,
   getIniPanelEntryByHref,
   getIniPanelEntryManifest,
   getVisibleIniPanelEntries,
+  refreshMachineSessionControlPage,
   renderMachineSessionControlView,
 } from "../../../runtime/ui/ini-panel/ui-shell.js";
 
 assert.deepEqual(getIniPanelEntryManifest(), INI_PANEL_ENTRIES);
 assert.deepEqual(getVisibleIniPanelEntries(), INI_PANEL_ENTRIES);
+assert.equal(controlPageStatusText({ lastAction: "x", runStatus: "ok", error: null }), "x | ok | -");
+assert.deepEqual(createControlPageRefreshState({ phase: "waiting", statusText: "waiting for panel" }), {
+  phase: "waiting",
+  statusText: "waiting for panel",
+  view: null,
+  renderResult: null,
+  error: null,
+});
 assert.equal(getIniPanelEntryByHref("./index.html")?.id, "edit-run");
 assert.equal(typeof createMachineSessionControlPageController, "function");
+assert.equal(typeof refreshMachineSessionControlPage, "function");
 assert.equal(typeof renderMachineSessionControlView, "function");
 
 const shellManifest = getIniPanelEntryManifest();
@@ -53,6 +65,7 @@ assert.deepEqual(shellViewModel.pages, [
 ]);
 assert.deepEqual(shellViewModel.launcherLinks, createIniPanelLauncherLinkViewModel());
 assert.equal(shellViewModel.controlPage.createController, createMachineSessionControlPageController);
+assert.equal(shellViewModel.controlPage.refresh, refreshMachineSessionControlPage);
 assert.equal(shellViewModel.controlPage.renderView, renderMachineSessionControlView);
 shellViewModel.pages[0].title = "changed";
 shellViewModel.launcherLinks[0].label = "changed";
@@ -89,5 +102,6 @@ const controller = createMachineSessionControlPageController({
 assert.deepEqual(controller.render(), { rendered: true });
 assert.equal(statusNode.textContent, "run-gcode | ok | -");
 assert.equal(renderedView.status.runStatus, "ok");
+assert.equal(controller.refresh().phase, "rendered");
 
 console.log("ini_panel_ui_shell_node_smoke=ok");

wasm-port/tests/ui/node/verify_ui_node_smokes.sh

@@ -10,6 +10,7 @@ ROOT_DIR="$(cd "$(dirname "$0")/../../.." && pwd)"
 "$ROOT_DIR/tests/ui/node/verify_ini_panel_machine_file_summary.sh"
 "$ROOT_DIR/tests/ui/node/verify_ini_panel_state_summary.sh"
 "$ROOT_DIR/tests/ui/node/verify_ini_panel_control_page_controller.sh"
+"$ROOT_DIR/tests/ui/node/verify_ini_panel_control_page_refresh_workflow.sh"
 "$ROOT_DIR/tests/ui/node/verify_ini_panel_entry_manifest.sh"
 "$ROOT_DIR/tests/ui/node/verify_ini_panel_ui_shell.sh"
 "$ROOT_DIR/tests/ui/node/verify_ini_panel_entry_docs.sh"