mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-23 03:25:40 +00:00
df05d21fc2
## Description: Continuation from #3276 Adds the complete client-side clan UI as a Lit web component (`<clan-modal>`), a typed API client with Zod-validated responses, shared response schemas, and a reusable `<confirm-dialog>` component. ### New: `ClanModal.ts` | View | What it does | |------|-------------| | **My Clans** | Lists joined clans + pending join requests (built from `/users/@me`, no extra fetches) | | **Browse** | Search by tag (min 3 chars), paginated results, configurable per-page (10/25/50) | | **Clan Detail** | Stats, paginated + searchable member list, role badges, join/leave/request actions | | **Manage** | Edit name (max 35 chars) + description, toggle open/invite-only, disband | | **Transfer** | Leadership transfer with member selector + confirmation | | **Requests** | Approve/deny join requests (leader/officer) | | **Bans** | View and unban (leader/officer) | | **My Requests** | View and withdraw outgoing requests | ### New: `ConfirmDialog.ts` Reusable `<confirm-dialog>` Lit component — replaces native `confirm()`/`prompt()` which are blocked or broken on mobile and CrazyGames iframes. Supports danger/warning variants and an optional textarea (used for ban reasons). Fires `confirm`/`cancel` events. ### New: `ClanApi.ts` Typed API client covering all clan endpoints. Every response is Zod-validated. Auth header is always last in the spread (can't be overridden by callers). Unknown server error messages always fall back to a generic client-side string — never displayed verbatim. ### New: `ClanApiSchemas.ts` (in `src/core/`) Shared Zod schemas for clan API responses with max-length constraints on `name` (35) and `description` (200). Lives in `core/` so it can be consumed by both client code and the leaderboard table. ### Modified: `ApiSchemas.ts` - Added `clans` and `clanRequests` arrays to `UserMeResponseSchema` - Moved clan leaderboard schemas out to `ClanApiSchemas.ts` - Renamed `LeaderboardClanTagSchema` → `RequiredClanTagSchema` ### Modified: `Api.ts` - Added `invalidateUserMe()` to bust the cached `/users/me` response after mutations - Removed `fetchClanLeaderboard` (moved to `ClanApi.ts`) ### Tests - `ClanModal.test.ts` — rendering, view navigation, user actions - `ClanApiQueries.test.ts` — fetch functions, error handling, pagination - `ClanApiMutations.test.ts` — join, leave, kick, ban, promote, transfer, etc. - `ClanApiBans.test.ts` — ban/unban calls and error paths - `ClanApiSchemas.test.ts` — Zod schema validation edge cases - `LeaderboardModal.test.ts` — updated imports ## Notable design decisions - **Not-logged-in state** — shows "Sign in to join clans" instead of false "no clans" empty state - **Rate limit feedback** — reads `Retry-After` header and surfaces wait time to the user ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [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: w.o.n --------- Co-authored-by: evanpelle <evanpelle@gmail.com>
130 lines
4.0 KiB
TypeScript
130 lines
4.0 KiB
TypeScript
import { html, LitElement, render as litRender } from "lit";
|
|
import { customElement, property, state } from "lit/decorators.js";
|
|
import { translateText } from "../Utils";
|
|
|
|
/**
|
|
* A reusable inline confirmation dialog.
|
|
*
|
|
* Usage:
|
|
* ```html
|
|
* <confirm-dialog
|
|
* .message=${"Are you sure?"}
|
|
* variant="danger"
|
|
* @confirm=${() => doThing()}
|
|
* @cancel=${() => {}}
|
|
* ></confirm-dialog>
|
|
* ```
|
|
*
|
|
* For ban-style flows, add a textarea:
|
|
* ```html
|
|
* <confirm-dialog
|
|
* .message=${"Ban this player?"}
|
|
* variant="warning"
|
|
* textareaPlaceholder="Reason (optional)"
|
|
* @confirm=${(e) => ban(e.detail.text)}
|
|
* @cancel=${() => {}}
|
|
* ></confirm-dialog>
|
|
* ```
|
|
*/
|
|
@customElement("confirm-dialog")
|
|
export class ConfirmDialog extends LitElement {
|
|
@property() message = "";
|
|
@property() variant: "danger" | "warning" = "danger";
|
|
@property() textareaPlaceholder = "";
|
|
@property({ type: Boolean }) disabled = false;
|
|
|
|
@state() private text = "";
|
|
|
|
private portal: HTMLDivElement | null = null;
|
|
|
|
createRenderRoot() {
|
|
return this;
|
|
}
|
|
|
|
connectedCallback() {
|
|
super.connectedCallback();
|
|
this.portal = document.createElement("div");
|
|
document.body.appendChild(this.portal);
|
|
}
|
|
|
|
disconnectedCallback() {
|
|
super.disconnectedCallback();
|
|
if (this.portal) {
|
|
litRender(html``, this.portal);
|
|
this.portal.remove();
|
|
this.portal = null;
|
|
}
|
|
}
|
|
|
|
render() {
|
|
if (this.portal) {
|
|
litRender(this.renderOverlay(), this.portal);
|
|
}
|
|
return html``;
|
|
}
|
|
|
|
private renderOverlay() {
|
|
const isDanger = this.variant === "danger";
|
|
const borderColor = isDanger ? "border-red-500/50" : "border-amber-500/50";
|
|
const cardBg = "bg-surface";
|
|
const textColor = isDanger ? "text-red-300" : "text-amber-300";
|
|
const btnClass = isDanger
|
|
? "bg-red-600 text-white hover:bg-red-700"
|
|
: "bg-amber-600 text-white hover:bg-amber-700";
|
|
|
|
return html`
|
|
<div
|
|
class="fixed inset-0 z-[9999] flex items-center justify-center bg-black/80"
|
|
@click=${(e: Event) => {
|
|
if (e.target === e.currentTarget) this.handleCancel();
|
|
}}
|
|
>
|
|
<div
|
|
class="mx-4 w-full max-w-sm p-6 rounded-2xl border ${borderColor} ${cardBg} shadow-2xl"
|
|
>
|
|
<p class="text-sm font-medium ${textColor} mb-5">${this.message}</p>
|
|
${this.textareaPlaceholder
|
|
? html`<textarea
|
|
.value=${this.text}
|
|
@input=${(e: Event) =>
|
|
(this.text = (e.target as HTMLTextAreaElement).value)}
|
|
maxlength="200"
|
|
rows="2"
|
|
placeholder="${this.textareaPlaceholder}"
|
|
class="w-full px-3 py-2 mb-4 bg-white/5 border border-white/10 rounded-lg text-white placeholder-white/30 focus:outline-none focus:ring-2 focus:ring-amber-500/50 text-sm resize-none"
|
|
></textarea>`
|
|
: ""}
|
|
<div class="flex gap-3">
|
|
<button
|
|
@click=${() => this.handleCancel()}
|
|
?disabled=${this.disabled}
|
|
class="flex-1 px-4 py-2.5 text-xs font-bold uppercase tracking-wider rounded-xl bg-white/5 text-white/60 border border-white/10 hover:bg-white/10 hover:text-white/80 transition-all disabled:opacity-50 disabled:pointer-events-none"
|
|
>
|
|
${translateText("common.cancel")}
|
|
</button>
|
|
<button
|
|
@click=${() => this.handleConfirm()}
|
|
?disabled=${this.disabled}
|
|
class="flex-1 px-4 py-2.5 text-xs font-bold uppercase tracking-wider rounded-xl ${btnClass} transition-all disabled:opacity-50 disabled:pointer-events-none border-0"
|
|
>
|
|
${translateText("common.confirm")}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
`;
|
|
}
|
|
|
|
private handleConfirm() {
|
|
this.dispatchEvent(
|
|
new CustomEvent("confirm", { detail: { text: this.text } }),
|
|
);
|
|
this.text = "";
|
|
}
|
|
|
|
private handleCancel() {
|
|
this.dispatchEvent(new CustomEvent("cancel"));
|
|
this.text = "";
|
|
}
|
|
}
|