Fix importing of react router module

pkg/app/web/.scaffdog/page.md

@@ -11,7 +11,7 @@ ignore: []
 
 ```tsx
 import React, { memo, FC, useEffect } from "react";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
 
 export const {{ input | pascal }}Page: FC = memo(() => {
   return <div>hello</div>;

pkg/app/web/package.json

@@ -32,7 +32,6 @@
     "@types/react": "^16.9.35",
     "@types/react-dom": "^16.9.8",
     "@types/react-redux": "^7.1.9",
-    "@types/react-router": "^5.1.7",
     "@types/react-router-dom": "^5.1.5",
     "@types/recharts": "^1.8.18",
     "@types/redux-mock-store": "^1.0.2",
@@ -88,7 +87,6 @@
     "react-draggable": "^4.4.3",
     "react-intersection-observer": "^8.26.2",
     "react-redux": "^7.2.0",
-    "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "recharts": "^1.8.5",
     "redux": "^4.0.5",

pkg/app/web/src/__fixtures__/dummy-application.ts

@@ -51,4 +51,5 @@ export const dummyApplication: Application = {
   updatedAt: 0,
   deletedAt: 0,
   deleted: false,
+  deploying: false,
 };

pkg/app/web/src/components/application-detail.test.tsx

@@ -1,7 +1,7 @@
 import { DeepPartial } from "@reduxjs/toolkit";
 import userEvent from "@testing-library/user-event";
 import React from "react";
-import { MemoryRouter } from "react-router";
+import { MemoryRouter } from "react-router-dom";
 import { createStore, render, screen, waitFor } from "../../test-utils";
 import { server } from "../mocks/server";
 import { AppState } from "../modules";

pkg/app/web/src/components/deployment-detail.test.tsx

@@ -4,7 +4,7 @@ import { DeploymentDetail } from "./deployment-detail";
 import { dummyDeployment } from "../__fixtures__/dummy-deployment";
 import { dummyEnv } from "../__fixtures__/dummy-environment";
 import { dummyPiped } from "../__fixtures__/dummy-piped";
-import { MemoryRouter } from "react-router";
+import { MemoryRouter } from "react-router-dom";
 import { cancelDeployment, DeploymentStatus } from "../modules/deployments";
 import userEvent from "@testing-library/user-event";
 

pkg/app/web/src/pages/applications/detail.tsx

@@ -1,6 +1,6 @@
 import React, { FC, memo, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
 import { ApplicationDetail } from "../../components/application-detail";
 import { ApplicationStateView } from "../../components/application-state-view";
 import { fetchApplication } from "../../modules/applications";

pkg/app/web/src/pages/deployments/detail.test.tsx

@@ -1,6 +1,6 @@
 import { configureStore } from "@reduxjs/toolkit";
 import React from "react";
-import { MemoryRouter, Route } from "react-router";
+import { MemoryRouter, Route } from "react-router-dom";
 import { render, waitFor } from "../../../test-utils";
 import { server } from "../../mocks/server";
 import { reducers } from "../../modules";

pkg/app/web/src/pages/deployments/detail.tsx

@@ -1,7 +1,7 @@
 import { Box, makeStyles } from "@material-ui/core";
 import React, { FC, memo, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { useParams } from "react-router";
+import { useParams } from "react-router-dom";
 import { DeploymentDetail } from "../../components/deployment-detail";
 import { LogViewer } from "../../components/log-viewer";
 import { Pipeline } from "../../components/pipeline";

pkg/app/web/yarn.lock

@@ -3779,7 +3779,7 @@
     "@types/react" "*"
     "@types/react-router" "*"
 
-"@types/react-router@*", "@types/react-router@^5.1.7":
+"@types/react-router@*":
   version "5.1.7"
   resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz#e9d12ed7dcfc79187e4d36667745b69a5aa11556"
   integrity sha512-2ouP76VQafKjtuc0ShpwUebhHwJo0G6rhahW9Pb8au3tQTjYXd2jta4wv6U2tGLR/I42yuG00+UXjNYY0dTzbg==
@@ -13287,7 +13287,7 @@ react-router-dom@^5.2.0:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-[email protected], react-router@^5.2.0:
+[email protected]:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
   integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==