...

2 files changed, 11 insertions, 5 deletions

diff --git a/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx b/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx
index 68dedf86..606584eb 100644
--- a/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx
+++ b/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { useHistory } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { Trans } from "react-i18next";
 
 import { getHttpTimelineClient, HttpTimelineInfo } from "@/http/timeline";
@@ -13,7 +13,7 @@ interface TimelineDeleteDialog {
 }
 
 const TimelineDeleteDialog: React.FC<TimelineDeleteDialog> = (props) => {
-  const history = useHistory();
+  const navigate = useNavigate();
 
   const { timeline } = props;
 
@@ -46,7 +46,7 @@ const TimelineDeleteDialog: React.FC<TimelineDeleteDialog> = (props) => {
         return getHttpTimelineClient().deleteTimeline(timeline.name);
       }}
       onSuccessAndClose={() => {
-        history.replace("/");
+        navigate("/", { replace: true });
       }}
     />
   );
diff --git a/FrontEnd/src/views/timeline/index.tsx b/FrontEnd/src/views/timeline/index.tsx
index c5bfd7ab..02d773dc 100644
--- a/FrontEnd/src/views/timeline/index.tsx
+++ b/FrontEnd/src/views/timeline/index.tsx
@@ -1,11 +1,17 @@
 import React from "react";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
+
+import { UiLogicError } from "@/common";
 
 import TimelinePageTemplate from "../timeline-common/TimelinePageTemplate";
 import TimelineCard from "./TimelineCard";
 
 const TimelinePage: React.FC = () => {
-  const { name } = useParams<{ name: string }>();
+  const { name } = useParams();
+
+  if (name == null) {
+    throw new UiLogicError("No route param 'name'.");
+  }
 
   const [reloadKey, setReloadKey] = React.useState<number>(0);