From dc3c5d7ba822b630bbe2afb30a37462f8d4498cb Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Tue, 9 Jan 2024 14:30:26 +0530 Subject: [PATCH 1/3] TP-53680 | Open incidents in a new tab --- src/Pages/Dashboard/partials/SearchResultsTable.tsx | 2 +- src/Pages/Incidents/Header/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pages/Dashboard/partials/SearchResultsTable.tsx b/src/Pages/Dashboard/partials/SearchResultsTable.tsx index 6a17656..04d2f64 100644 --- a/src/Pages/Dashboard/partials/SearchResultsTable.tsx +++ b/src/Pages/Dashboard/partials/SearchResultsTable.tsx @@ -140,7 +140,7 @@ const SearchResultsTable: FC = ({ screen_name: SCREEN_NAME.DASHBOARD_PAGE, }); if (event?.data) { - navigate(`/incident/${event.data?.id}`); + window.open(`/incident/${event.data?.id}`); } }; diff --git a/src/Pages/Incidents/Header/index.tsx b/src/Pages/Incidents/Header/index.tsx index a260302..2b0b146 100644 --- a/src/Pages/Incidents/Header/index.tsx +++ b/src/Pages/Incidents/Header/index.tsx @@ -16,7 +16,7 @@ interface HeaderProps { const Header: FC = ({ incidentName, title }) => { const navigate = useNavigate(); const handleBacktoDashboard = (): void => { - navigate(-1); + navigate('/'); }; return (
From a2cfbc6282bcc916b62a02adb3d70617975e7726 Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Tue, 9 Jan 2024 15:13:32 +0530 Subject: [PATCH 2/3] TP-53680 | Open incidents in a new tab on cmd+click --- src/Pages/Dashboard/partials/SearchResultsTable.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Pages/Dashboard/partials/SearchResultsTable.tsx b/src/Pages/Dashboard/partials/SearchResultsTable.tsx index 04d2f64..20a2211 100644 --- a/src/Pages/Dashboard/partials/SearchResultsTable.tsx +++ b/src/Pages/Dashboard/partials/SearchResultsTable.tsx @@ -135,12 +135,14 @@ const SearchResultsTable: FC = ({ if (params?.api?.sizeColumnsToFit) params.api.sizeColumnsToFit(); }; - const handleRowClick = (event: any) => { + const handleRowClick = event => { fireEvent(EVENT_NAME.Houston_Check_Incident, { screen_name: SCREEN_NAME.DASHBOARD_PAGE, }); - if (event?.data) { - window.open(`/incident/${event.data?.id}`); + if (event) { + event.event.ctrlKey || event.event.metaKey + ? window.open(`/incident/${event.data?.id}`) + : navigate(`/incident/${event.data?.id}`); } }; From 55435686ee71fbe55ce483f37a0c0dae108630f4 Mon Sep 17 00:00:00 2001 From: pooja-jaiswal_navi Date: Tue, 9 Jan 2024 15:46:10 +0530 Subject: [PATCH 3/3] TP-53680 | Added null checks --- src/Pages/Dashboard/partials/SearchResultsTable.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Pages/Dashboard/partials/SearchResultsTable.tsx b/src/Pages/Dashboard/partials/SearchResultsTable.tsx index 20a2211..94d703e 100644 --- a/src/Pages/Dashboard/partials/SearchResultsTable.tsx +++ b/src/Pages/Dashboard/partials/SearchResultsTable.tsx @@ -139,10 +139,11 @@ const SearchResultsTable: FC = ({ fireEvent(EVENT_NAME.Houston_Check_Incident, { screen_name: SCREEN_NAME.DASHBOARD_PAGE, }); - if (event) { - event.event.ctrlKey || event.event.metaKey - ? window.open(`/incident/${event.data?.id}`) - : navigate(`/incident/${event.data?.id}`); + if (event && event.event && event.data?.id) { + const { ctrlKey = false, metaKey = false } = event.event; + const incidentId = event.data.id; + const url = `/incident/${incidentId}`; + ctrlKey || metaKey ? window.open(url) : navigate(url); } };