From 70a6b65aa5877752c50c3d6773eafba27f97fe48 Mon Sep 17 00:00:00 2001
From: Brendan Allan <brendonovich@outlook.com>
Date: Sat, 18 Nov 2023 22:53:24 +1100
Subject: [PATCH] Use raw search params for search data in url (#1797)

use raw search params
---
 .../$libraryId/Explorer/Search/Context.tsx    | 44 +++++++++++++------
 interface/app/$libraryId/ephemeral.tsx        |  1 +
 interface/hooks/useZodSearchParams.ts         |  2 +-
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/interface/app/$libraryId/Explorer/Search/Context.tsx b/interface/app/$libraryId/Explorer/Search/Context.tsx
index 88fcf6fe0..3690c9210 100644
--- a/interface/app/$libraryId/Explorer/Search/Context.tsx
+++ b/interface/app/$libraryId/Explorer/Search/Context.tsx
@@ -6,6 +6,7 @@ import {
 	useLayoutEffect,
 	useMemo
 } from 'react';
+import { useSearchParams as useRawSearchParams } from 'react-router-dom';
 import { z } from 'zod';
 import { SearchFilterArgs } from '@sd/client';
 import { useZodSearchParams } from '~/hooks';
@@ -22,7 +23,7 @@ const SEARCH_PARAMS = z.object({
 });
 
 function useContextValue() {
-	const [searchParams, setSearchParams] = useZodSearchParams(SEARCH_PARAMS);
+	const [searchParams] = useZodSearchParams(SEARCH_PARAMS);
 	const searchState = useSearchStore();
 
 	const { fixedArgs, setFixedArgs } = useTopBarContext();
@@ -95,17 +96,31 @@ function useContextValue() {
 		updateFilterArgs(() => JSON.parse(filters));
 	}, [searchParams.filters]);
 
+	const [_, setRawSearchParams] = useRawSearchParams();
+
 	useEffect(() => {
 		if (!searchState.filterArgs) return;
 
-		setSearchParams(
-			(p) => ({
-				...p,
-				filters: JSON.stringify(searchState.filterArgs)
-			}),
-			{ replace: true }
-		);
-	}, [searchState.filterArgs, setSearchParams]);
+		if (searchState.filterArgs.length < 1) {
+			setRawSearchParams(
+				(p) => {
+					p.delete('filters');
+					return p;
+				},
+
+				{ replace: true }
+			);
+		} else {
+			setRawSearchParams(
+				(p) => {
+					p.set('filters', JSON.stringify(searchState.filterArgs));
+					return p;
+				},
+
+				{ replace: true }
+			);
+		}
+	}, [searchState.filterArgs, setRawSearchParams]);
 
 	return {
 		setFixedArgs,
@@ -114,12 +129,15 @@ function useContextValue() {
 		allFilterArgs,
 		searchQuery: searchParams.search,
 		setSearchQuery(value: string) {
-			setSearchParams((p) => ({ ...p, search: value }));
+			setRawSearchParams((p) => {
+				p.set('search', value);
+				return p;
+			});
 		},
 		clearSearchQuery() {
-			setSearchParams((p) => {
-				delete p.search;
-				return { ...p };
+			setRawSearchParams((p) => {
+				p.delete('search');
+				return p;
 			});
 		},
 		isSearching: searchParams.search !== undefined
diff --git a/interface/app/$libraryId/ephemeral.tsx b/interface/app/$libraryId/ephemeral.tsx
index 6cacb0a5b..b69fffafc 100644
--- a/interface/app/$libraryId/ephemeral.tsx
+++ b/interface/app/$libraryId/ephemeral.tsx
@@ -3,6 +3,7 @@ import * as Dialog from '@radix-ui/react-dialog';
 import { iconNames } from '@sd/assets/util';
 import clsx from 'clsx';
 import { memo, Suspense, useDeferredValue, useMemo } from 'react';
+import { useLocation } from 'react-router';
 import {
 	ExplorerItem,
 	getExplorerItemData,
diff --git a/interface/hooks/useZodSearchParams.ts b/interface/hooks/useZodSearchParams.ts
index 7592e2150..3e7402a12 100644
--- a/interface/hooks/useZodSearchParams.ts
+++ b/interface/hooks/useZodSearchParams.ts
@@ -21,7 +21,7 @@ export function useZodSearchParams<Z extends z.AnyZodObject>(schema: Z) {
 			) => {
 				if (typeof data === 'function') {
 					setSearchParams((params) => {
-						const typedPrevParams = getParams(params, schema);
+						const typedPrevParams = getParams(params, z.any());
 
 						if (!typedPrevParams.success) throw typedPrevParams.errors;