Skip to content

Commit f3c82b6

Browse files
author
Mishig
authored
[Assistants] Fix/clear searchParams while changing models (#783)
* [Assistants] Fix/clear searchParams while changing models * fix another reactivity bug
1 parent 2468399 commit f3c82b6

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/lib/components/Pagination.svelte

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
$: pageIndex = parseInt($page.url.searchParams.get("p") ?? "0");
1313
$: pageIndexes = getPageIndexes(pageIndex, numTotalPages);
1414
15-
function getHref(pageIdx: number) {
16-
const newUrl = new URL($page.url);
15+
function getHref(url: URL | string, pageIdx: number) {
16+
const newUrl = new URL(url);
1717
newUrl.searchParams.set("p", pageIdx.toString());
1818
return newUrl.toString();
1919
}
@@ -66,7 +66,7 @@
6666
>
6767
<li>
6868
<PaginationArrow
69-
href={getHref(pageIndex - 1)}
69+
href={getHref($page.url, pageIndex - 1)}
7070
direction="previous"
7171
isDisabled={pageIndex - 1 < 0}
7272
/>
@@ -81,15 +81,15 @@
8181
: ''}
8282
"
8383
class:pointer-events-none={pageIdx === ELLIPSIS_IDX || pageIndex === pageIdx}
84-
href={getHref(pageIdx)}
84+
href={getHref($page.url, pageIdx)}
8585
>
8686
{pageIdx === ELLIPSIS_IDX ? "..." : pageIdx + 1}
8787
</a>
8888
</li>
8989
{/each}
9090
<li>
9191
<PaginationArrow
92-
href={getHref(pageIndex + 1)}
92+
href={getHref($page.url, pageIndex + 1)}
9393
direction="next"
9494
isDisabled={pageIndex + 1 >= numTotalPages}
9595
/>

src/routes/assistants/+page.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
1919
const onModelChange = (e: Event) => {
2020
const newUrl = new URL($page.url);
21-
if ((e.target as HTMLSelectElement).value === "") {
22-
newUrl.searchParams.delete("modelId");
23-
} else {
21+
newUrl.search = ""; // clear searchParams (such as "p" for pagination)
22+
if ((e.target as HTMLSelectElement).value) {
2423
newUrl.searchParams.set("modelId", (e.target as HTMLSelectElement).value);
2524
}
2625
goto(newUrl);

0 commit comments

Comments
 (0)