From 6e3eff92087092635e28ac58048dcb586c0a2257 Mon Sep 17 00:00:00 2001
From: Amandee Ellawala <amamandee.manushika.e@gmail.com>
Date: Fri, 18 Oct 2024 01:04:03 +0100
Subject: [PATCH] #228 Fix the pagination not resetting issue

---
 .../(public)/repos/[language]/_components/sorter.tsx  | 11 ++++++++---
 .../repos/[language]/_components/stars-filter.tsx     |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/(public)/repos/[language]/_components/sorter.tsx b/src/app/(public)/repos/[language]/_components/sorter.tsx
index bfc903b..22741cd 100644
--- a/src/app/(public)/repos/[language]/_components/sorter.tsx
+++ b/src/app/(public)/repos/[language]/_components/sorter.tsx
@@ -127,13 +127,17 @@ export function Sorter() {
         </Button>
         <div className="z-50 h-64 p-2 overflow-y-scroll shadow dropdown-content hidden group-hover:block bg-base-100 rounded-box w-60">
           <ul tabIndex={0} className="menu menu-vertical">
-            {mainLanguages.sort(sortByName).map(language => (
+            {mainLanguages.sort(sortByName).map(language => {
+              const sp = new URLSearchParams(searchParams);
+              sp.delete('p');
+              return (
               <li key={language} onClick={handleClick}>
-                <Link href={`/repos/${language.toLowerCase()}?${searchParams.toString()}`}>
+                <Link href={`/repos/${language.toLowerCase()}?${sp.toString()}`}>
                   {language}
                 </Link>
               </li>
-            ))}
+              );
+              })}
           </ul>
         </div>
       </div>
@@ -149,6 +153,7 @@ export function Sorter() {
           <ul tabIndex={0} className="menu menu-vertical">
             {navigationItems.map((item, index) => {
               const sp = item.onSelect(new URLSearchParams(searchParams));
+              sp.delete('p');
               if (item.name === SortTypes.BestMatch) {
                 sp.delete('o');
                 sp.delete('s');
diff --git a/src/app/(public)/repos/[language]/_components/stars-filter.tsx b/src/app/(public)/repos/[language]/_components/stars-filter.tsx
index 0386568..8f32d8d 100644
--- a/src/app/(public)/repos/[language]/_components/stars-filter.tsx
+++ b/src/app/(public)/repos/[language]/_components/stars-filter.tsx
@@ -47,6 +47,7 @@ export function StarsFilter() {
       sp.set('startStars', startStars.toString());
       sp.set('endStars', endStars.toString());
     }
+    sp.delete('p');
     router.push(`${pathname}?${sp.toString()}`);
   }