diff --git a/src/Pages/Dashboard/partials/SearchResultsTable.tsx b/src/Pages/Dashboard/partials/SearchResultsTable.tsx index 6a17656..94d703e 100644 --- a/src/Pages/Dashboard/partials/SearchResultsTable.tsx +++ b/src/Pages/Dashboard/partials/SearchResultsTable.tsx @@ -135,12 +135,15 @@ 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) { - 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); } }; 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 (