From 430ecdb9a8e6718287fd99f1d5ceee1e14e2ab37 Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Thu, 18 Jan 2024 19:27:16 +0530 Subject: [PATCH 1/8] TP-51644 | resolving PR commits --- src/Pages/Dashboard/SearchResultsTable.module.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Pages/Dashboard/SearchResultsTable.module.scss b/src/Pages/Dashboard/SearchResultsTable.module.scss index b22028b..ff92eed 100644 --- a/src/Pages/Dashboard/SearchResultsTable.module.scss +++ b/src/Pages/Dashboard/SearchResultsTable.module.scss @@ -60,7 +60,6 @@ overflow: hidden; width: 110px; } - .tooltipWrapper { display: flex; align-items: center; From 711d92c4e2dac123c41e8b47f99a0a554cc3e91c Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Tue, 16 Jan 2024 18:13:29 +0530 Subject: [PATCH 2/8] TP-53586 | resolving pr comments --- src/Pages/Dashboard/SearchResultsTable.module.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Pages/Dashboard/SearchResultsTable.module.scss b/src/Pages/Dashboard/SearchResultsTable.module.scss index ff92eed..50a4c3f 100644 --- a/src/Pages/Dashboard/SearchResultsTable.module.scss +++ b/src/Pages/Dashboard/SearchResultsTable.module.scss @@ -60,9 +60,12 @@ overflow: hidden; width: 110px; } +:root { + --title-z-index: 1; +} .tooltipWrapper { display: flex; align-items: center; position: fixed; z-index: var(--title-z-index); -} +} \ No newline at end of file From 6ed0474f35864165d7a2a8d00582a445c362826a Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Tue, 16 Jan 2024 18:44:28 +0530 Subject: [PATCH 3/8] TP-53586 | resolving pr comments-2 --- src/Pages/Dashboard/SearchResultsTable.module.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Pages/Dashboard/SearchResultsTable.module.scss b/src/Pages/Dashboard/SearchResultsTable.module.scss index 50a4c3f..840f323 100644 --- a/src/Pages/Dashboard/SearchResultsTable.module.scss +++ b/src/Pages/Dashboard/SearchResultsTable.module.scss @@ -60,9 +60,7 @@ overflow: hidden; width: 110px; } -:root { - --title-z-index: 1; -} + .tooltipWrapper { display: flex; align-items: center; From 245d2c124663c246a1ed71a155bda0a98d0998ac Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Thu, 18 Jan 2024 02:10:21 +0530 Subject: [PATCH 4/8] TP-51644 | fixing date filter bug --- src/Pages/Dashboard/partials/Date.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Pages/Dashboard/partials/Date.tsx b/src/Pages/Dashboard/partials/Date.tsx index a3e6a11..442fff6 100644 --- a/src/Pages/Dashboard/partials/Date.tsx +++ b/src/Pages/Dashboard/partials/Date.tsx @@ -60,15 +60,23 @@ const Date: React.FC = ({ const updatedQuery = searchParams.toString(); updateURLAndFetchData(updatedQuery); }; - + const format = 'DD/MM/YYYY'; const handleApplyClick = () => { fireEvent(EVENT_NAME.Houston_Check_DateFilter, { screen_name: SCREEN_NAME.DASHBOARD_PAGE, }); if (date.length === 2) { const [start_date, end_date] = date; - const formattedStartDate = formatDate(start_date); - const formattedEndDate = formatDate(end_date); + // const formattedStartDate = formatDate(start_date); + const startTimestamp = dayjs(start_date, format).unix() * 1000; + const formattedStartDate = dayjs(startTimestamp).format( + 'YYYY-MM-DD HH:mm:ss [UTC]', + ); + const endTimestamp = dayjs(end_date, format).unix() * 1000; + const formattedEndDate = dayjs(endTimestamp).format( + 'YYYY-MM-DD HH:mm:ss [UTC]', + ); + // const formattedEndDate = formatDate(end_date); searchParams.set('from', formattedStartDate); searchParams.set('to', formattedEndDate); searchParams.delete('incident_name'); From 861037a800a73b4de01b15000c5392a7097e49e5 Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Thu, 18 Jan 2024 18:04:01 +0530 Subject: [PATCH 5/8] TP-51644 | sending timestamp along with date and convert to UTC in api calls --- src/Pages/Dashboard/partials/Date.tsx | 44 ++++++++++++++++----------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/src/Pages/Dashboard/partials/Date.tsx b/src/Pages/Dashboard/partials/Date.tsx index 442fff6..dc4b976 100644 --- a/src/Pages/Dashboard/partials/Date.tsx +++ b/src/Pages/Dashboard/partials/Date.tsx @@ -3,6 +3,9 @@ import { useState, useEffect, useRef } from 'react'; import { useSearchParams } from 'react-router-dom'; import { Dayjs } from 'dayjs'; import dayjs from 'dayjs'; +import utc from 'dayjs/plugin/utc'; + +dayjs.extend(utc); import styles from './DashboardHeader.module.scss'; import { Button } from '@navi/web-ui/lib/primitives'; @@ -60,25 +63,35 @@ const Date: React.FC = ({ const updatedQuery = searchParams.toString(); updateURLAndFetchData(updatedQuery); }; - const format = 'DD/MM/YYYY'; + + const formatDates = (start_date, end_date) => { + const formatDate = date => { + const [day, month, year] = date.split('/'); + return `${year}-${month}-${day}`; + }; + + const fromDate = dayjs(formatDate(start_date)).startOf('day'); + const toDate = dayjs(formatDate(end_date)).endOf('day'); + + return { + formattedFromDate: fromDate.utc().format('YYYY-MM-DD HH:mm:ss'), + formattedToDate: toDate.utc().format('YYYY-MM-DD HH:mm:ss'), + }; + }; + const handleApplyClick = () => { fireEvent(EVENT_NAME.Houston_Check_DateFilter, { screen_name: SCREEN_NAME.DASHBOARD_PAGE, }); - if (date.length === 2) { + + if (date?.length === 2) { const [start_date, end_date] = date; - // const formattedStartDate = formatDate(start_date); - const startTimestamp = dayjs(start_date, format).unix() * 1000; - const formattedStartDate = dayjs(startTimestamp).format( - 'YYYY-MM-DD HH:mm:ss [UTC]', + const { formattedFromDate, formattedToDate } = formatDates( + start_date, + end_date, ); - const endTimestamp = dayjs(end_date, format).unix() * 1000; - const formattedEndDate = dayjs(endTimestamp).format( - 'YYYY-MM-DD HH:mm:ss [UTC]', - ); - // const formattedEndDate = formatDate(end_date); - searchParams.set('from', formattedStartDate); - searchParams.set('to', formattedEndDate); + searchParams.set('from', formattedFromDate); + searchParams.set('to', formattedToDate); searchParams.delete('incident_name'); searchParams.set('page_number', '0'); searchParams.set('page_size', '10'); @@ -89,11 +102,6 @@ const Date: React.FC = ({ setOpen(false); }; - const formatDate = (date: string) => { - const [day, month, year] = date.split('/'); - return `${year}-${month}-${day}`; - }; - return (
Date: Thu, 18 Jan 2024 19:14:21 +0530 Subject: [PATCH 6/8] 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 = ({ }; 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 = ({ } setOpen(false); }; - return (
{ 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}`; +}; From c9511af2ba2cfcb9b4a2be995043371ddc27867d Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Thu, 18 Jan 2024 19:37:51 +0530 Subject: [PATCH 7/8] TP-51644 | Addressing PR comments --- src/Pages/Dashboard/SearchResultsTable.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/Dashboard/SearchResultsTable.module.scss b/src/Pages/Dashboard/SearchResultsTable.module.scss index 840f323..b22028b 100644 --- a/src/Pages/Dashboard/SearchResultsTable.module.scss +++ b/src/Pages/Dashboard/SearchResultsTable.module.scss @@ -66,4 +66,4 @@ align-items: center; position: fixed; z-index: var(--title-z-index); -} \ No newline at end of file +} From 7ffb79a1336c54fd8048eb58bab282e12ea1f76e Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Fri, 19 Jan 2024 18:24:11 +0530 Subject: [PATCH 8/8] TP-51644 | title alignment --- src/Pages/Dashboard/SearchResultsTable.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Pages/Dashboard/SearchResultsTable.module.scss b/src/Pages/Dashboard/SearchResultsTable.module.scss index b22028b..2cbab63 100644 --- a/src/Pages/Dashboard/SearchResultsTable.module.scss +++ b/src/Pages/Dashboard/SearchResultsTable.module.scss @@ -66,4 +66,5 @@ align-items: center; position: fixed; z-index: var(--title-z-index); + line-height: 1; }