[Assistants] Fix/clear searchParams while changing models (#783)

* [Assistants] Fix/clear searchParams while changing models * fix another reactivity bug
huggingface · Feb 5, 2024 · f3c82b6 · f3c82b6
1 parent 2468399
commit f3c82b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/lib/components/Pagination.svelte b/src/lib/components/Pagination.svelte
@@ -12,8 +12,8 @@
 	$: pageIndex = parseInt($page.url.searchParams.get("p") ?? "0");
 	$: pageIndexes = getPageIndexes(pageIndex, numTotalPages);
 
-	function getHref(pageIdx: number) {
-		const newUrl = new URL($page.url);
+	function getHref(url: URL | string, pageIdx: number) {
+		const newUrl = new URL(url);
 		newUrl.searchParams.set("p", pageIdx.toString());
 		return newUrl.toString();
 	}
@@ -66,7 +66,7 @@
 		>
 			<li>
 				<PaginationArrow
-					href={getHref(pageIndex - 1)}
+					href={getHref($page.url, pageIndex - 1)}
 					direction="previous"
 					isDisabled={pageIndex - 1 < 0}
 				/>
@@ -81,15 +81,15 @@
 							: ''}
 						"
 						class:pointer-events-none={pageIdx === ELLIPSIS_IDX || pageIndex === pageIdx}
-						href={getHref(pageIdx)}
+						href={getHref($page.url, pageIdx)}
 					>
 						{pageIdx === ELLIPSIS_IDX ? "..." : pageIdx + 1}
 					</a>
 				</li>
 			{/each}
 			<li>
 				<PaginationArrow
-					href={getHref(pageIndex + 1)}
+					href={getHref($page.url, pageIndex + 1)}
 					direction="next"
 					isDisabled={pageIndex + 1 >= numTotalPages}
 				/>

diff --git a/src/routes/assistants/+page.svelte b/src/routes/assistants/+page.svelte
@@ -18,9 +18,8 @@
 
 	const onModelChange = (e: Event) => {
 		const newUrl = new URL($page.url);
-		if ((e.target as HTMLSelectElement).value === "") {
-			newUrl.searchParams.delete("modelId");
-		} else {
+		newUrl.search = ""; // clear searchParams (such as "p" for pagination)
+		if ((e.target as HTMLSelectElement).value) {
 			newUrl.searchParams.set("modelId", (e.target as HTMLSelectElement).value);
 		}
 		goto(newUrl);