From 94d9ac7745ca975434fb71a4bc3b6dff72338b13 Mon Sep 17 00:00:00 2001
From: pooja-jaiswal_navi <pooja.jaiswal@navi.com>
Date: Thu, 18 Jan 2024 19:14:21 +0530
Subject: [PATCH] TP-51644 | resolving PR commits

---
 src/Pages/Dashboard/partials/Date.tsx | 26 +++++++++++++-------------
 src/services/constants.ts             |  1 +
 src/services/globalUtils.ts           |  4 ++++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Pages/Dashboard/partials/Date.tsx b/src/Pages/Dashboard/partials/Date.tsx
index dc4b976..23b4fb2 100644
--- a/src/Pages/Dashboard/partials/Date.tsx
+++ b/src/Pages/Dashboard/partials/Date.tsx
@@ -11,7 +11,8 @@ import { Button } from '@navi/web-ui/lib/primitives';
 
 import useClickStream from '@src/services/clickStream';
 import { CLICK_STREAM_EVENT_FACTORY } from '@src/services/clickStream/constants/values';
-
+import { formatDate } from '@src/services/globalUtils';
+import { DATE_FORMAT } from '@src/services/constants';
 export interface DateProps {
   clearSearchValue: () => void;
   updateURLAndFetchData: (payload: string) => void;
@@ -65,27 +66,27 @@ const Date: React.FC<DateProps> = ({
   };
 
   const formatDates = (start_date, end_date) => {
-    const formatDate = date => {
-      const [day, month, year] = date.split('/');
-      return `${year}-${month}-${day}`;
-    };
+    const fromDate = dayjs(start_date).startOf('day');
+    const toDate = dayjs(end_date).endOf('day');
 
-    const fromDate = dayjs(formatDate(start_date)).startOf('day');
-    const toDate = dayjs(formatDate(end_date)).endOf('day');
+    const formattedFromDate = fromDate.format(DATE_FORMAT);
+    const formattedToDate = toDate.format(DATE_FORMAT);
 
+    const startDateUTC = dayjs(formattedFromDate).utc().format('');
+    const endDateUTC = dayjs(formattedToDate).utc().format('');
     return {
-      formattedFromDate: fromDate.utc().format('YYYY-MM-DD HH:mm:ss'),
-      formattedToDate: toDate.utc().format('YYYY-MM-DD HH:mm:ss'),
+      formattedFromDate: startDateUTC,
+      formattedToDate: endDateUTC,
     };
   };
-
   const handleApplyClick = () => {
     fireEvent(EVENT_NAME.Houston_Check_DateFilter, {
       screen_name: SCREEN_NAME.DASHBOARD_PAGE,
     });
-
     if (date?.length === 2) {
-      const [start_date, end_date] = date;
+      let [start_date, end_date] = date;
+      start_date = formatDate(start_date);
+      end_date = formatDate(end_date);
       const { formattedFromDate, formattedToDate } = formatDates(
         start_date,
         end_date,
@@ -101,7 +102,6 @@ const Date: React.FC<DateProps> = ({
     }
     setOpen(false);
   };
-
   return (
     <div className={styles['date-wrapper']}>
       <ConfigProvider
diff --git a/src/services/constants.ts b/src/services/constants.ts
index ef18768..353899d 100644
--- a/src/services/constants.ts
+++ b/src/services/constants.ts
@@ -1 +1,2 @@
 export const JANUS_API = `/events`;
+export const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
diff --git a/src/services/globalUtils.ts b/src/services/globalUtils.ts
index 47eb489..13b03b1 100644
--- a/src/services/globalUtils.ts
+++ b/src/services/globalUtils.ts
@@ -57,3 +57,7 @@ export const handleCopyClick = (textToCopy: string): void => {
 export const createURL = (endpoint: string): string => {
   return `${window?.config?.BASE_API_URL}${endpoint}`;
 };
+export const formatDate = (date: string) => {
+  const [day, month, year] = date.split('/');
+  return `${year}-${month}-${day}`;
+};