Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Fix Illegal invocation on admin Make admin button (#1540)

Joshua Franceda88140d574a
diff --git a/plugins/admin/public/index.html b/plugins/admin/public/index.html
index d15e68c34..c0de41de1 100644
--- a/plugins/admin/public/index.html
+++ b/plugins/admin/public/index.html
@@ -10105,7 +10105,7 @@
fmtTime,
relTime,
labelRole,
- confirm,
+ confirm: (message) => window.confirm(message),
openWebUiAs,
orgScope: "org:" + orgId,
clearCache: () => dataCache.clear(),
@@ -10694,7 +10694,7 @@
plural,
stateToUrl,
go,
- confirm,
+ confirm: (message) => window.confirm(message),
orgId,
webUiAsButton,
current: (principal) =>
diff --git a/plugins/admin/test/services-confirm-binding.test.ts b/plugins/admin/test/services-confirm-binding.test.ts
new file mode 100644
index 000000000..4320b2233
--- /dev/null
+++ b/plugins/admin/test/services-confirm-binding.test.ts
@@ -0,0 +1,22 @@
+import assert from "node:assert/strict";
+import { readAdminSource } from "./admin-source.ts";
+import test from "node:test";
+
+const html = readAdminSource();
+
+test("view services wrap window.confirm instead of passing it detached", () => {
+ assert.doesNotMatch(html, /^\s+confirm,\s*$/m);
+ assert.equal(html.match(/confirm: \(message\) => window\.confirm\(message\)/g)?.length, 2);
+});
+
+test("calling services.confirm as a method reaches window.confirm", () => {
+ const seen: string[] = [];
+ const services = { confirm: (message: string) => window.confirm(message) };
+ (globalThis as any).window = { confirm: (m: string) => (seen.push(m), true) };
+ try {
+ assert.equal(services.confirm("Make x an org admin?"), true);
+ assert.deepEqual(seen, ["Make x an org admin?"]);
+ } finally {
+ delete (globalThis as any).window;
+ }
+});