Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(rr6): remove CompatRouter imports #5375

Merged
merged 2 commits into from
Mar 26, 2024
Merged

chore(rr6): remove CompatRouter imports #5375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c4862e
remove CompatRouter and run lint fix
ndv99 Mar 26, 2024
80f98b3
actually run lint fix
ndv99 Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import { createMemoryHistory } from "history";
import { Provider } from "react-redux";
import {
BrowserRouter,
Router,
CompatRouter,
Route,
Routes,
} from "react-router-dom";
import { BrowserRouter, Router, Route, Routes } from "react-router-dom";
import configureStore from "redux-mock-store";

import AppSideNavigation from "./AppSideNavigation";
Expand Down Expand Up @@ -107,9 +101,7 @@ describe("GlobalSideNav", () => {
render(
<Provider store={store}>
<BrowserRouter>
<CompatRouter>
<AppSideNavigation />
</CompatRouter>
<AppSideNavigation />
</BrowserRouter>
</Provider>
);
Expand Down Expand Up @@ -344,11 +336,9 @@ describe("GlobalSideNav", () => {
render(
<Provider store={store}>
<Router history={history}>
<CompatRouter>
<Routes>
<Route element={<AppSideNavigation />} path="*" />
</Routes>
</CompatRouter>
<Routes>
<Route element={<AppSideNavigation />} path="*" />
</Routes>
</Router>
</Provider>
);
Expand Down
13 changes: 3 additions & 10 deletions src/app/base/components/ControllerLink/ControllerLink.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Provider } from "react-redux";
import { MemoryRouter } from "react-router-dom";
import { CompatRouter } from "react-router-dom";
import configureStore from "redux-mock-store";

import ControllerLink, { Labels } from "./ControllerLink";
Expand All @@ -19,9 +18,7 @@ it("handles when controllers are loading", () => {
render(
<Provider store={store}>
<MemoryRouter>
<CompatRouter>
<ControllerLink systemId="abc123" />
</CompatRouter>
<ControllerLink systemId="abc123" />
</MemoryRouter>
</Provider>
);
Expand All @@ -37,9 +34,7 @@ it("handles when a controller does not exist", () => {
const { container } = render(
<Provider store={store}>
<MemoryRouter>
<CompatRouter>
<ControllerLink systemId="abc123" />
</CompatRouter>
<ControllerLink systemId="abc123" />
</MemoryRouter>
</Provider>
);
Expand All @@ -62,9 +57,7 @@ it("renders a link if controllers have loaded and it exists", () => {
render(
<Provider store={store}>
<MemoryRouter>
<CompatRouter>
<ControllerLink systemId={controller.system_id} />
</CompatRouter>
<ControllerLink systemId={controller.system_id} />
</MemoryRouter>
</Provider>
);
Expand Down
35 changes: 13 additions & 22 deletions src/app/base/components/DHCPTable/DHCPTable.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Provider } from "react-redux";
import { MemoryRouter } from "react-router-dom";
import { CompatRouter } from "react-router-dom";
import configureStore from "redux-mock-store";

import DHCPTable, { TestIds } from "./DHCPTable";
Expand Down Expand Up @@ -51,12 +50,10 @@ describe("DHCPTable", () => {
<MemoryRouter
initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
>
<CompatRouter>
<DHCPTable
modelName={MachineMeta.MODEL}
node={state.machine.items[0]}
/>
</CompatRouter>
<DHCPTable
modelName={MachineMeta.MODEL}
node={state.machine.items[0]}
/>
</MemoryRouter>
</Provider>
);
Expand All @@ -79,12 +76,10 @@ describe("DHCPTable", () => {
<MemoryRouter
initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
>
<CompatRouter>
<DHCPTable
modelName={MachineMeta.MODEL}
node={state.machine.items[0]}
/>
</CompatRouter>
<DHCPTable
modelName={MachineMeta.MODEL}
node={state.machine.items[0]}
/>
</MemoryRouter>
</Provider>
);
Expand All @@ -108,9 +103,7 @@ describe("DHCPTable", () => {
<MemoryRouter
initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
>
<CompatRouter>
<DHCPTable modelName={MachineMeta.MODEL} subnets={subnets} />
</CompatRouter>
<DHCPTable modelName={MachineMeta.MODEL} subnets={subnets} />
</MemoryRouter>
</Provider>
);
Expand Down Expand Up @@ -139,12 +132,10 @@ describe("DHCPTable", () => {
<MemoryRouter
initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]}
>
<CompatRouter>
<DHCPTable
modelName={MachineMeta.MODEL}
node={state.machine.items[0]}
/>
</CompatRouter>
<DHCPTable
modelName={MachineMeta.MODEL}
node={state.machine.items[0]}
/>
</MemoryRouter>
</Provider>
);
Expand Down
14 changes: 4 additions & 10 deletions src/app/base/components/DeviceLink/DeviceLink.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Provider } from "react-redux";
import { MemoryRouter, CompatRouter } from "react-router-dom";
import { MemoryRouter } from "react-router-dom";
import configureStore from "redux-mock-store";

import DeviceLink, { Labels } from "./DeviceLink";
Expand All @@ -18,9 +18,7 @@ it("handles when devices are loading", () => {
render(
<Provider store={store}>
<MemoryRouter>
<CompatRouter>
<DeviceLink systemId="abc123" />
</CompatRouter>
<DeviceLink systemId="abc123" />
</MemoryRouter>
</Provider>
);
Expand All @@ -36,9 +34,7 @@ it("handles when a device does not exist", () => {
const { container } = render(
<Provider store={store}>
<MemoryRouter>
<CompatRouter>
<DeviceLink systemId="abc123" />
</CompatRouter>
<DeviceLink systemId="abc123" />
</MemoryRouter>
</Provider>
);
Expand All @@ -55,9 +51,7 @@ it("renders a link if devices have loaded and it exists", () => {
render(
<Provider store={store}>
<MemoryRouter>
<CompatRouter>
<DeviceLink systemId={device.system_id} />
</CompatRouter>
<DeviceLink systemId={device.system_id} />
</MemoryRouter>
</Provider>
);
Expand Down
45 changes: 14 additions & 31 deletions src/app/base/components/DhcpForm/DhcpForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Provider } from "react-redux";
import { MemoryRouter } from "react-router-dom";
import { CompatRouter } from "react-router-dom";
import configureStore from "redux-mock-store";

import { Labels as FieldLabels } from "../DhcpFormFields";
Expand Down Expand Up @@ -50,9 +49,7 @@ describe("DhcpForm", () => {
const { unmount } = render(
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" />
</CompatRouter>
<DhcpForm analyticsCategory="settings" />
</MemoryRouter>
</Provider>
);
Expand All @@ -71,9 +68,7 @@ describe("DhcpForm", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" id={dhcpSnippet.id} />
</CompatRouter>
<DhcpForm analyticsCategory="settings" id={dhcpSnippet.id} />
</MemoryRouter>
</Provider>
);
Expand Down Expand Up @@ -104,9 +99,7 @@ describe("DhcpForm", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" />
</CompatRouter>
<DhcpForm analyticsCategory="settings" />
</MemoryRouter>
</Provider>
);
Expand Down Expand Up @@ -146,9 +139,7 @@ describe("DhcpForm", () => {
const Proxy = ({ analyticsCategory }: { analyticsCategory: string }) => (
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm analyticsCategory={analyticsCategory} onSave={onSave} />
</CompatRouter>
<DhcpForm analyticsCategory={analyticsCategory} onSave={onSave} />
</MemoryRouter>
</Provider>
);
Expand All @@ -172,9 +163,7 @@ describe("DhcpForm", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" onSave={onSave} />
</CompatRouter>
<DhcpForm analyticsCategory="settings" onSave={onSave} />
</MemoryRouter>
</Provider>
);
Expand All @@ -194,9 +183,7 @@ describe("DhcpForm", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" />
</CompatRouter>
<DhcpForm analyticsCategory="settings" />
</MemoryRouter>
</Provider>
);
Expand All @@ -212,12 +199,10 @@ describe("DhcpForm", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm
analyticsCategory="settings"
id={state.dhcpsnippet.items[0].id}
/>
</CompatRouter>
<DhcpForm
analyticsCategory="settings"
id={state.dhcpsnippet.items[0].id}
/>
</MemoryRouter>
</Provider>
);
Expand Down Expand Up @@ -246,12 +231,10 @@ describe("DhcpForm", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={["/"]}>
<CompatRouter>
<DhcpForm
analyticsCategory="settings"
id={state.dhcpsnippet.items[0].id}
/>
</CompatRouter>
<DhcpForm
analyticsCategory="settings"
id={state.dhcpsnippet.items[0].id}
/>
</MemoryRouter>
</Provider>
);
Expand Down
27 changes: 8 additions & 19 deletions src/app/base/components/DhcpFormFields/DhcpFormFields.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as reduxToolkit from "@reduxjs/toolkit";
import { Provider } from "react-redux";
import { MemoryRouter } from "react-router-dom";
import { CompatRouter } from "react-router-dom";
import configureStore from "redux-mock-store";

import { Labels } from "./DhcpFormFields";
Expand Down Expand Up @@ -94,12 +93,10 @@ describe("DhcpFormFields", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
<CompatRouter>
<DhcpForm
analyticsCategory="settings"
id={state.dhcpsnippet.items[0].id}
/>
</CompatRouter>
<DhcpForm
analyticsCategory="settings"
id={state.dhcpsnippet.items[0].id}
/>
</MemoryRouter>
</Provider>
);
Expand All @@ -120,9 +117,7 @@ describe("DhcpFormFields", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" />
</CompatRouter>
<DhcpForm analyticsCategory="settings" />
</MemoryRouter>
</Provider>
);
Expand All @@ -143,9 +138,7 @@ describe("DhcpFormFields", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" />
</CompatRouter>
<DhcpForm analyticsCategory="settings" />
</MemoryRouter>
</Provider>
);
Expand All @@ -166,9 +159,7 @@ describe("DhcpFormFields", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" />
</CompatRouter>
<DhcpForm analyticsCategory="settings" />
</MemoryRouter>
</Provider>
);
Expand All @@ -193,9 +184,7 @@ describe("DhcpFormFields", () => {
render(
<Provider store={store}>
<MemoryRouter initialEntries={[{ pathname: "/", key: "testKey" }]}>
<CompatRouter>
<DhcpForm analyticsCategory="settings" />
</CompatRouter>
<DhcpForm analyticsCategory="settings" />
</MemoryRouter>
</Provider>
);
Expand Down
Loading
Loading