From cd09b8262c7996b6034fe9fd1a50743b5f7c527e Mon Sep 17 00:00:00 2001
From: AyushRanjan <ayush.ranjan@navi.com>
Date: Thu, 7 Dec 2023 11:40:20 +0530
Subject: [PATCH] TP-48565 | branch rebased

---
 src/Pages/JiraDashboard/constants.ts |  7 ++++++-
 src/Pages/JiraDashboard/index.tsx    | 22 ++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/Pages/JiraDashboard/constants.ts b/src/Pages/JiraDashboard/constants.ts
index 36444aa..d689c7c 100644
--- a/src/Pages/JiraDashboard/constants.ts
+++ b/src/Pages/JiraDashboard/constants.ts
@@ -1,8 +1,13 @@
+import { createURL } from '@src/services/globalUtils';
+
+const URL_PREFIX = createURL('/houston');
+
 export const DashboardHeaderConstants = {
   title: 'JIRA tickets',
 };
 
 //TO DO: Need to change the API URL
 export const FETCH_JIRA_DATA = (payload: string): string => {
-  return `https://mocki.io/v1/09bc40a5-1e6b-4217-8c82-c1e35f87230f`;
+  return `${URL_PREFIX}/get-jira-statuses?${payload}`;
+  //return `https://mocki.io/v1/09bc40a5-1e6b-4217-8c82-c1e35f87230f`;
 };
diff --git a/src/Pages/JiraDashboard/index.tsx b/src/Pages/JiraDashboard/index.tsx
index f13ba04..abe6f48 100644
--- a/src/Pages/JiraDashboard/index.tsx
+++ b/src/Pages/JiraDashboard/index.tsx
@@ -28,7 +28,7 @@ const JiraDashboard: FC = () => {
   const searchParamRef = useRef('');
   const navigate = useNavigate();
 
-  const startJiraSearch = (param = pageNumberRef.current): void => {
+  const startJiraSearch = (param): void => {
     console.log('param', param);
     const endPoint = FETCH_JIRA_DATA(param);
     setIsLoading(true);
@@ -67,44 +67,30 @@ const JiraDashboard: FC = () => {
     }
     const searchParam = searchParams.toString();
     updateURLAndFetchData(searchParam);
-    console.log('searchParam', searchParam);
-    if (searchParam) {
-      startJiraSearch(`${searchParam}`);
-    } else {
-      startJiraSearch();
-    }
+    //console.log('searchParam', searchParam);
   }, [searchParams.toString()]);
 
   const handlePageNumber = (pageNumber: number): void => {
-    const finalParams = `page_number=${
-      pageNumber - 1
-    }&page_size=${currentPageSize}`;
-    setPageNumber(pageNumber - 1);
-    pageNumberRef.current = `page_number=${
-      pageNumber - 1
-    }&page_size=${currentPageSize}`;
     searchParams.set('page_number', (pageNumber - 1).toString());
     const updatedQuery = searchParams.toString();
     updateURLAndFetchData(updatedQuery);
-    //startJiraSearch(`${searchParamRef.current}`);
   };
 
   const handlePageSize = (pageSize: number): void => {
     searchParams.set('page_size', pageSize.toString());
     const updatedQuery = searchParams.toString();
     updateURLAndFetchData(updatedQuery);
-    //startJiraSearch(`${searchParamRef.current}`);
   };
 
   const fetchJiraData = (props: any): void => {
     const { filterQuery = '', isDrawer = false } = props;
-    const finalParams = filterQuery ? `${filterQuery}&` : '';
+    const finalParams = filterQuery ? `${filterQuery}` : '';
     setPageNumber(0);
     searchParamRef.current = finalParams;
     pageNumberRef.current = `page_number=${
       isDrawer ? currentPageNumber : '0'
     }&page_size=${currentPageSize}`;
-    startJiraSearch(`${finalParams}${pageNumberRef.current}`);
+    startJiraSearch(`${finalParams}`);
   };
 
   const updateURLAndFetchData = (updatedQuery: string) => {