From 17f96a5c3a68e6ee3b8a7e5f6615f1a5de4aed74 Mon Sep 17 00:00:00 2001
From: calvin <calvin.lee@harness.io>
Date: Mon, 10 Jul 2023 15:43:43 -0600
Subject: [PATCH] fix: [code-625]: fix url params on repo listing page

---
 web/src/pages/RepositoriesListing/RepositoriesListing.tsx     | 4 +++-
 .../RepositoryBranchesContent/RepositoryBranchesContent.tsx   | 4 +++-
 .../RepositoryTagsContent/RepositoryTagsContent.tsx           | 4 +++-
 web/src/pages/Webhooks/Webhooks.tsx                           | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx
index c326dd701..29eaea210 100644
--- a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx
+++ b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx
@@ -59,7 +59,9 @@ export default function RepositoriesListing() {
 
   useEffect(() => {
     setSearchTerm(undefined)
-    updateQueryParams({ page: page.toString() })
+    if (page > 1) {
+      updateQueryParams({ page: page.toString() })
+    }
   }, [space, setPage]) // eslint-disable-line react-hooks/exhaustive-deps
 
   const columns: Column<TypesRepository>[] = useMemo(
diff --git a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/RepositoryBranchesContent.tsx b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/RepositoryBranchesContent.tsx
index 9aef1517a..73ab4dad5 100644
--- a/web/src/pages/RepositoryBranches/RepositoryBranchesContent/RepositoryBranchesContent.tsx
+++ b/web/src/pages/RepositoryBranches/RepositoryBranchesContent/RepositoryBranchesContent.tsx
@@ -44,7 +44,9 @@ export function RepositoryBranchesContent({ repoMetadata }: Pick<GitInfoProps, '
   })
 
   useEffect(() => {
-    updateQueryParams({ page: page.toString() })
+    if (page > 1) {
+      updateQueryParams({ page: page.toString() })
+    }
   }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useShowRequestError(error)
diff --git a/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx b/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx
index b04958147..a29f7efd2 100644
--- a/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx
+++ b/web/src/pages/RepositoryTags/RepositoryTagsContent/RepositoryTagsContent.tsx
@@ -55,7 +55,9 @@ export function RepositoryTagsContent({ repoMetadata }: Pick<GitInfoProps, 'repo
   })
 
   useEffect(() => {
-    updateQueryParams({ page: page.toString() })
+    if (page > 1) {
+      updateQueryParams({ page: page.toString() })
+    }
   }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useShowRequestError(error)
diff --git a/web/src/pages/Webhooks/Webhooks.tsx b/web/src/pages/Webhooks/Webhooks.tsx
index 554482bc6..03a2c65b7 100644
--- a/web/src/pages/Webhooks/Webhooks.tsx
+++ b/web/src/pages/Webhooks/Webhooks.tsx
@@ -69,7 +69,9 @@ export default function Webhooks() {
     lazy: !repoMetadata
   })
   useEffect(() => {
-    updateQueryParams({ page: page.toString() })
+    if (page > 1) {
+      updateQueryParams({ page: page.toString() })
+    }
   }, [setPage]) // eslint-disable-line react-hooks/exhaustive-deps
 
   const columns: Column<OpenapiWebhookType>[] = useMemo(