From: Marcel Werk Date: Fri, 27 Sep 2024 09:38:39 +0000 (+0200) Subject: Add popstate handling X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b75b223803b8ecdf061153f1c844cdbc2a2e9a2;p=GitHub%2FWoltLab%2FWCF.git Add popstate handling --- diff --git a/ts/WoltLabSuite/Core/Component/GridView.ts b/ts/WoltLabSuite/Core/Component/GridView.ts index 40254fb7ad..75e9fb3e40 100644 --- a/ts/WoltLabSuite/Core/Component/GridView.ts +++ b/ts/WoltLabSuite/Core/Component/GridView.ts @@ -11,6 +11,8 @@ export class GridView { #pageNo: number; #sortField: string; #sortOrder: string; + #defaultSortField: string; + #defaultSortOrder: string; constructor( gridId: string, @@ -27,11 +29,17 @@ export class GridView { this.#pageNo = pageNo; this.#baseUrl = baseUrl; this.#sortField = sortField; + this.#defaultSortField = sortField; this.#sortOrder = sortOrder; + this.#defaultSortOrder = sortOrder; this.#initPagination(); this.#initSorting(); this.#initActions(); + + window.addEventListener("popstate", () => { + this.#handlePopState(); + }); } #initPagination(): void { @@ -81,18 +89,20 @@ export class GridView { }); } - #switchPage(pageNo: number): void { + #switchPage(pageNo: number, updateQueryString: boolean = true): void { this.#topPagination.page = pageNo; this.#bottomPagination.page = pageNo; this.#pageNo = pageNo; - void this.#loadRows(); + void this.#loadRows(updateQueryString); } - async #loadRows(): Promise { + async #loadRows(updateQueryString: boolean = true): Promise { const response = await getRows(this.#gridClassName, this.#pageNo, this.#sortField, this.#sortOrder); DomUtil.setInnerHtml(this.#table.querySelector("tbody")!, response.unwrap().template); - this.#updateQueryString(); + if (updateQueryString) { + this.#updateQueryString(); + } this.#initActions(); } @@ -137,4 +147,28 @@ export class GridView { }); }); } + + #handlePopState(): void { + let pageNo = 1; + this.#sortField = this.#defaultSortField; + this.#sortOrder = this.#defaultSortOrder; + + const url = new URL(window.location.href); + url.searchParams.forEach((value, key) => { + if (key === "pageNo") { + pageNo = parseInt(value, 10); + return; + } + + if (key === "sortField") { + this.#sortField = value; + } + + if (key === "sortOrder") { + this.#sortOrder = value; + } + }); + + this.#switchPage(pageNo, false); + } } diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js index e65b94b4b0..d65ff5e1f0 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js @@ -13,6 +13,8 @@ define(["require", "exports", "tslib", "../Api/GridViews/GetRows", "../Dom/Util" #pageNo; #sortField; #sortOrder; + #defaultSortField; + #defaultSortOrder; constructor(gridId, gridClassName, pageNo, baseUrl = "", sortField = "", sortOrder = "ASC") { this.#gridClassName = gridClassName; this.#table = document.getElementById(`${gridId}_table`); @@ -21,10 +23,15 @@ define(["require", "exports", "tslib", "../Api/GridViews/GetRows", "../Dom/Util" this.#pageNo = pageNo; this.#baseUrl = baseUrl; this.#sortField = sortField; + this.#defaultSortField = sortField; this.#sortOrder = sortOrder; + this.#defaultSortOrder = sortOrder; this.#initPagination(); this.#initSorting(); this.#initActions(); + window.addEventListener("popstate", () => { + this.#handlePopState(); + }); } #initPagination() { this.#topPagination.addEventListener("switchPage", (event) => { @@ -66,16 +73,18 @@ define(["require", "exports", "tslib", "../Api/GridViews/GetRows", "../Dom/Util" } }); } - #switchPage(pageNo) { + #switchPage(pageNo, updateQueryString = true) { this.#topPagination.page = pageNo; this.#bottomPagination.page = pageNo; this.#pageNo = pageNo; - void this.#loadRows(); + void this.#loadRows(updateQueryString); } - async #loadRows() { + async #loadRows(updateQueryString = true) { const response = await (0, GetRows_1.getRows)(this.#gridClassName, this.#pageNo, this.#sortField, this.#sortOrder); Util_1.default.setInnerHtml(this.#table.querySelector("tbody"), response.unwrap().template); - this.#updateQueryString(); + if (updateQueryString) { + this.#updateQueryString(); + } this.#initActions(); } #updateQueryString() { @@ -112,6 +121,25 @@ define(["require", "exports", "tslib", "../Api/GridViews/GetRows", "../Dom/Util" }); }); } + #handlePopState() { + let pageNo = 1; + this.#sortField = this.#defaultSortField; + this.#sortOrder = this.#defaultSortOrder; + const url = new URL(window.location.href); + url.searchParams.forEach((value, key) => { + if (key === "pageNo") { + pageNo = parseInt(value, 10); + return; + } + if (key === "sortField") { + this.#sortField = value; + } + if (key === "sortOrder") { + this.#sortOrder = value; + } + }); + this.#switchPage(pageNo, false); + } } exports.GridView = GridView; });