mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 18:50:55 +00:00
bcc453e8cf
## Description Adds a modal URL router so modals can be opened, deep-linked, and bookmarked via the hash. URLs of the form `#modal=<name>&tab=<key>&...` open the named modal and pass remaining keys as args to `onOpen`. The reverse direction also syncs: opening a modal via the UI updates the URL, closing it clears the hash, and switching tabs updates `&tab=`. Builds on the BaseModal refactor from #3923. ### What's new **`ModalRouter.ts`** — small registry + two-way sync helper. - `register(name, { tag, pageId? })` declares a modal as router-managed - `routeFromHash()` parses `#modal=...` and dispatches to `modal.open(args)` - `syncOpened/syncClosed/syncTab` push state back into the URL via `history.replaceState` (no history entries) - A `routingFromUrl` flag prevents URL→modal→URL feedback loops - Unknown modal names silently strip the hash **`BaseModal`** — opt-in URL sync via a `routerName` property. - When set, BaseModal calls into `modalRouter.syncOpened/syncClosed/syncTab` from `open` / `close` / `setActiveTab` - Modals that own their own URL state (lobby modals) just leave `routerName` undefined **`Main.ts`** — registers all routable modals and wires the router. - `handleUrl()`: adds a `modalRouter.routeFromHash()` branch after the path-based lobby join - `onHashUpdate`: when the hash is router-managed, routes via the router instead of tearing down lobby state ### Routable modals 13 inline modals: store, settings, leaderboard, clan, account, help, news, language, single-player, ranked, troubleshooting, territory-patterns, flag-input. Excluded by design: join-lobby, host-lobby (own URL state via `/game/<id>`), matchmaking (no URL state). ### Example uses - Deep link to store flags tab: `/#modal=store&tab=flags` - Settings keybinds tab: `/#modal=settings&tab=keybinds` - Cosmetics.ts now redirects to `#modal=store&tab=packs` when a hard-currency purchase fails for insufficient plutonium (after the alert), so users can top up directly ### URL behavior - `replaceState` everywhere — no history entries added when modals open / close / switch tabs - Browser back/forward still works for the existing path-based game flow - `hashchange` events are router-aware so external hash changes (back button, manual edit) correctly switch between routed modals without tearing down lobby state ## Please complete the following: - [x] I have added screenshots for all UI updates _(no visual changes; smoke-tested in dev)_ - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file _(no new user-visible strings)_ - [ ] I have added relevant tests to the test directory _(no test coverage; manually tested URL load, UI open, tab switch, close, hashchange, insufficient-plutonium redirect)_ - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: DISCORD_USERNAME
230 lines
7.1 KiB
TypeScript
230 lines
7.1 KiB
TypeScript
import { html } from "lit";
|
|
import { customElement, property } from "lit/decorators.js";
|
|
import { assetUrl } from "../core/AssetUrls";
|
|
import { translateText } from "./Utils";
|
|
import { BaseModal } from "./components/BaseModal";
|
|
import { modalHeader } from "./components/ui/ModalHeader";
|
|
import {
|
|
collectGraphicsDiagnostics,
|
|
GraphicsDiagnostics,
|
|
} from "./utilities/Diagnostic";
|
|
const infoIcon = assetUrl("images/InfoIcon.svg");
|
|
|
|
@customElement("troubleshooting-modal")
|
|
export class TroubleshootingModal extends BaseModal {
|
|
protected routerName = "troubleshooting";
|
|
|
|
@property({ type: String }) markdown = "Loading...";
|
|
|
|
@property({ type: Object })
|
|
diagnostics?: GraphicsDiagnostics;
|
|
|
|
@property({ type: Boolean }) loading = true;
|
|
|
|
private initialized: boolean = false;
|
|
|
|
private async loadDiagnostics() {
|
|
const canvas = document.createElement("canvas");
|
|
this.diagnostics = await collectGraphicsDiagnostics(canvas);
|
|
this.loading = false;
|
|
this.initialized = true;
|
|
}
|
|
|
|
protected renderHeaderSlot() {
|
|
return modalHeader({
|
|
titleContent: html` <div
|
|
class="w-full flex flex-col sm:flex-row justify-between gap-2"
|
|
>
|
|
<span
|
|
class="text-white text-xl sm:text-2xl md:text-3xl font-bold uppercase tracking-widest break-words hyphens-auto"
|
|
>
|
|
<a
|
|
class="hover:text-blue-200 text-blue-400 cursor-pointer"
|
|
@click=${this.close}
|
|
>${translateText("main.help")}</a
|
|
>
|
|
/ ${translateText("troubleshooting.title")}
|
|
</span>
|
|
<o-button
|
|
variant="primary"
|
|
size="sm"
|
|
translationKey="common.copy"
|
|
@click=${this.copyDiagnostics}
|
|
></o-button>
|
|
</div>`,
|
|
onBack: () => this.close(),
|
|
ariaLabel: translateText("common.back"),
|
|
});
|
|
}
|
|
|
|
protected renderBody() {
|
|
if (this.loading) return html``;
|
|
return html`
|
|
<div class="px-1">
|
|
${this.section(
|
|
"",
|
|
html`${this.infoTip(
|
|
translateText("troubleshooting.hardware_acceleration_tip"),
|
|
true,
|
|
)}`,
|
|
)}
|
|
${this.section(
|
|
translateText("troubleshooting.environment"),
|
|
html`
|
|
${this.row(
|
|
translateText("troubleshooting.browser"),
|
|
this.diagnostics!.browser.engine,
|
|
)}
|
|
${this.row(
|
|
translateText("troubleshooting.platform"),
|
|
this.diagnostics!.browser.platform,
|
|
)}
|
|
${this.row(
|
|
translateText("troubleshooting.os"),
|
|
this.diagnostics!.browser.os,
|
|
)}
|
|
${this.row(
|
|
translateText("troubleshooting.device_pixel_ratio"),
|
|
this.diagnostics!.browser.dpr,
|
|
)}
|
|
${this.infoTip(translateText("troubleshooting.chromium_tip"))}
|
|
`,
|
|
)}
|
|
${this.section(
|
|
translateText("troubleshooting.rendering"),
|
|
html`
|
|
${this.row(
|
|
translateText("troubleshooting.renderer"),
|
|
this.describeRenderer(this.diagnostics!.rendering),
|
|
)}
|
|
${this.row(
|
|
translateText("troubleshooting.max_texture_size"),
|
|
this.diagnostics!.rendering.maxTextureSize ??
|
|
translateText("troubleshooting.unknown"),
|
|
)}
|
|
${this.row(
|
|
translateText("troubleshooting.high_precision_shaders"),
|
|
this.diagnostics!.rendering.shaderHighp === true
|
|
? translateText("troubleshooting.yes")
|
|
: translateText("troubleshooting.no"),
|
|
)}${this.row(
|
|
translateText("troubleshooting.gpu"),
|
|
!this.diagnostics!.rendering.gpu ||
|
|
this.diagnostics!.rendering.gpu.unavailable
|
|
? translateText("troubleshooting.unavailable")
|
|
: `${this.diagnostics!.rendering.gpu.vendor} — ${this.diagnostics!.rendering.gpu.renderer}`,
|
|
)}
|
|
${this.infoTip(translateText("troubleshooting.gpu_tip"))}
|
|
`,
|
|
)}
|
|
${this.section(
|
|
translateText("troubleshooting.power"),
|
|
html`
|
|
${this.diagnostics!.power.unavailable
|
|
? this.row(
|
|
translateText("troubleshooting.battery"),
|
|
translateText("troubleshooting.unavailable"),
|
|
)
|
|
: html`
|
|
${this.row(
|
|
translateText("troubleshooting.charging"),
|
|
this.diagnostics!.power.charging
|
|
? translateText("troubleshooting.yes")
|
|
: translateText("troubleshooting.no"),
|
|
)}
|
|
${this.row(
|
|
translateText("troubleshooting.battery_level"),
|
|
this.diagnostics!.power.level,
|
|
)}
|
|
`}
|
|
${this.infoTip(translateText("troubleshooting.power_saving_tip"))}
|
|
`,
|
|
)}
|
|
</div>
|
|
`;
|
|
}
|
|
|
|
private infoTip(text: string, warning?: boolean): unknown {
|
|
return html`
|
|
<div
|
|
class="mt-2 ${warning
|
|
? "bg-orange-500/10"
|
|
: "bg-white/10"} flex gap-2 text-white py-1 px-3 rounded-sm border-1 ${warning
|
|
? "border-orange-400"
|
|
: "border-white/40"}"
|
|
>
|
|
<img src="${infoIcon}" class="w-4" />
|
|
${text}
|
|
</div>
|
|
`;
|
|
}
|
|
|
|
protected onOpen(): void {
|
|
if (!this.initialized) {
|
|
this.initialized = true;
|
|
this.loadDiagnostics();
|
|
}
|
|
}
|
|
|
|
private section(title: string, content: unknown) {
|
|
return html`
|
|
<div class="px-4 py-3">
|
|
<h4
|
|
class="mb-2 text-xs font-semibold uppercase tracking-wide text-slate-400"
|
|
>
|
|
${title}
|
|
</h4>
|
|
<div class="space-y-1">${content}</div>
|
|
</div>
|
|
`;
|
|
}
|
|
|
|
private row(label: string, value: unknown) {
|
|
return html`
|
|
<div class="flex justify-between gap-4 text-sm">
|
|
<span class="text-slate-400">${label}</span>
|
|
<span class="text-right text-white max-w-100">${value}</span>
|
|
</div>
|
|
`;
|
|
}
|
|
|
|
private async copyDiagnostics() {
|
|
if (!this.diagnostics) return;
|
|
const formatted =
|
|
"```json\n" + JSON.stringify(this.diagnostics, null, 2) + "\n```";
|
|
await navigator.clipboard.writeText(formatted);
|
|
window.dispatchEvent(
|
|
new CustomEvent("show-message", {
|
|
detail: {
|
|
message: html`${translateText("troubleshooting.copied_to_clipboard")}`,
|
|
type: "info",
|
|
duration: 3000,
|
|
},
|
|
}),
|
|
);
|
|
}
|
|
|
|
private describeRenderer(rendering: any): string {
|
|
if (rendering.gpu?.software) {
|
|
return translateText("troubleshooting.software_rendering");
|
|
}
|
|
if (rendering.type === "Canvas2D") {
|
|
return translateText("troubleshooting.canvas_2d_no_gpu");
|
|
}
|
|
return `${rendering.type}`;
|
|
}
|
|
|
|
public close(): void {
|
|
// Override BaseModal.close() to navigate back to Help (this modal is
|
|
// opened from inside HelpModal), not to page-play like other inline modals.
|
|
this.unregisterEscapeHandler();
|
|
this.onClose();
|
|
if (this.inline) {
|
|
this.style.pointerEvents = "none";
|
|
window.showPage?.("page-help");
|
|
} else {
|
|
this.modalEl?.close();
|
|
}
|
|
}
|
|
}
|