diff --git a/apps/web/src/components/Pagination.astro b/apps/web/src/components/Pagination.astro
index 4b0aa21..4aae2d9 100644
--- a/apps/web/src/components/Pagination.astro
+++ b/apps/web/src/components/Pagination.astro
@@ -7,21 +7,22 @@ interface Props {
total: number;
limit: number;
offset: number;
+ offsetParam?: string;
anchor?: string;
itemLabel?: string;
}
-const { path, params, total, limit, offset, anchor = "", itemLabel = "записей" } = Astro.props;
+const { path, params, total, limit, offset, offsetParam = "offset", anchor = "", itemLabel = "записей" } = Astro.props;
const state = pageWindow(total, limit, offset);
---
{total > limit && }
diff --git a/apps/web/src/lib/pagination.ts b/apps/web/src/lib/pagination.ts
index 6b80996..9767c21 100644
--- a/apps/web/src/lib/pagination.ts
+++ b/apps/web/src/lib/pagination.ts
@@ -22,10 +22,10 @@ export const pageWindow = (total: number, limit: number, offset: number): PageWi
};
};
-export const pageHref = (path: string, search: URLSearchParams, offset: number, anchor = "") => {
+export const pageHref = (path: string, search: URLSearchParams, offset: number, anchor = "", offsetParam = "offset") => {
const params = new URLSearchParams(search);
- if (offset > 0) params.set("offset", String(offset));
- else params.delete("offset");
+ if (offset > 0) params.set(offsetParam, String(offset));
+ else params.delete(offsetParam);
const query = params.toString();
return `${path}${query ? `?${query}` : ""}${anchor}`;
};
diff --git a/apps/web/src/pages/tackle/index.astro b/apps/web/src/pages/tackle/index.astro
index 02fbe24..b7c08d0 100644
--- a/apps/web/src/pages/tackle/index.astro
+++ b/apps/web/src/pages/tackle/index.astro
@@ -5,7 +5,7 @@ import StatePanel from "../../components/StatePanel.astro";
import Pagination from "../../components/Pagination.astro";
import TackleGlyph from "../../components/TackleGlyph.astro";
import DataPassport from "../../components/DataPassport.astro";
-import { api, type PaginatedRigs, type PaginatedTackleItems } from "../../lib/api";
+import { api, ApiError, type PaginatedRigs, type PaginatedTackleItems } from "../../lib/api";
const params = Astro.url.searchParams;
const category = params.get("category") ?? "";
@@ -14,23 +14,34 @@ const brand = params.get("brand") ?? "";
const family = params.get("family") ?? "";
const unlockLevelParam = params.get("unlock_level") ?? "";
const unlockLevel = /^\d+$/.test(unlockLevelParam) ? unlockLevelParam : "";
-const requestedOffset = Number(params.get("offset") ?? 0);
+const requestedItemsOffset = Number(params.get("items_offset") ?? 0);
+const requestedRigsOffset = Number(params.get("rigs_offset") ?? 0);
const limit = 48;
-const offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
-const query = new URLSearchParams({ limit: String(limit), offset: String(offset) });
+const itemsOffset = Number.isInteger(requestedItemsOffset) && requestedItemsOffset >= 0 ? requestedItemsOffset : 0;
+const rigsOffset = Number.isInteger(requestedRigsOffset) && requestedRigsOffset >= 0 ? requestedRigsOffset : 0;
+const query = new URLSearchParams({ limit: String(limit), offset: String(itemsOffset) });
if (category) query.set("category", category);
if (search) query.set("q", search);
if (brand) query.set("brand", brand);
if (family) query.set("family", family);
if (unlockLevel) query.set("unlock_level", unlockLevel);
-let result: PaginatedTackleItems = { items: [], total: 0, limit, offset }, rigs: PaginatedRigs = { items: [], total: 0, limit, offset }, unavailable = false, rigsUnavailable = false;
+let result: PaginatedTackleItems = { items: [], total: 0, limit, offset: itemsOffset }, rigs: PaginatedRigs = { items: [], total: 0, limit, offset: rigsOffset };
const [itemsResult, rigsResult] = await Promise.allSettled([
api(`/api/v1/tackle/items?${query}`),
- api(`/api/v1/tackle/rigs?limit=${limit}&offset=${offset}${search ? `&q=${encodeURIComponent(search)}` : ""}`),
+ api(`/api/v1/tackle/rigs?limit=${limit}&offset=${rigsOffset}${search ? `&q=${encodeURIComponent(search)}` : ""}`),
]);
-if (itemsResult.status === "fulfilled") result = itemsResult.value; else unavailable = true;
-if (rigsResult.status === "fulfilled") rigs = rigsResult.value; else rigsUnavailable = true;
-if (unavailable) { Astro.response.status = 503; Astro.response.headers.set("Retry-After", "60"); Astro.response.headers.set("Cache-Control", "no-store"); }
+const itemsError = itemsResult.status === "rejected" ? itemsResult.reason : null;
+const rigsError = rigsResult.status === "rejected" ? rigsResult.reason : null;
+const itemsInvalid = itemsError instanceof ApiError && itemsError.status === 422;
+const rigsInvalid = rigsError instanceof ApiError && rigsError.status === 422;
+const itemsUnavailable = Boolean(itemsError) && !itemsInvalid;
+const rigsUnavailable = Boolean(rigsError) && !rigsInvalid;
+const invalidFilters = itemsInvalid || rigsInvalid;
+const unavailable = itemsUnavailable || rigsUnavailable;
+if (itemsResult.status === "fulfilled") result = itemsResult.value;
+if (rigsResult.status === "fulfilled") rigs = rigsResult.value;
+if (invalidFilters) Astro.response.status = 422;
+else if (unavailable) { Astro.response.status = 503; Astro.response.headers.set("Retry-After", "60"); Astro.response.headers.set("Cache-Control", "no-store"); }
const categoryLabels: Record = { bait: "Наживка", lure: "Приманка", rod: "Удилище", reel: "Катушка", line: "Леска", hook: "Крючок", rig: "Сборка", float: "Поплавок", sinker: "Груз", other: "Другое" };
const filterParams = new URLSearchParams();
if (category) filterParams.set("category", category);
@@ -38,8 +49,10 @@ if (search) filterParams.set("q", search);
if (brand) filterParams.set("brand", brand);
if (family) filterParams.set("family", family);
if (unlockLevel) filterParams.set("unlock_level", unlockLevel);
+const itemsParams = new URLSearchParams(filterParams);
+const rigsParams = new URLSearchParams(search ? { q: search } : {});
---
-
+
- {unavailable ? : result.items.length ? : }
- {!unavailable && Сборки снастей
Сборки
{rigs.total} всего
)} : }
+ {!itemsUnavailable && }
+ Сборки снастей
Сборки
{rigs.total} всего{rigs.items.map(rig =>
Сборка · {rig.component_count} компонентов{rig.name}{rig.source_system ?? "Источник не указан"}
)}