Skip to content

chore(site): Use react-query and refactor the workspaces page to use it #5838

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

Merged
merged 10 commits into from
Jan 24, 2023
Merged

chore(site): Use react-query and refactor the workspaces page to use it #5838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f591887
chore: Use react-query
BrunoQuaresma Jan 23, 2023
5ef8460
chore: Use react-query and refactor workspaces page
BrunoQuaresma Jan 24, 2023
d9dcf07
Update depds
BrunoQuaresma Jan 24, 2023
ee7da80
Update providers in test
BrunoQuaresma Jan 24, 2023
8cf28a6
Remove unused func
BrunoQuaresma Jan 24, 2023
d8db704
Handle update version error
BrunoQuaresma Jan 24, 2023
5da5438
Fix empty message
BrunoQuaresma Jan 24, 2023
241d360
Add i18n provider for tests
BrunoQuaresma Jan 24, 2023
0a6ea09
Remoove global snackbar from providers
BrunoQuaresma Jan 24, 2023
4f4638e
Fix empty states
BrunoQuaresma Jan 24, 2023
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
Prev Previous commit
Next Next commit
Update providers in test
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jan 24, 2023
commit ee7da80feca7c528be71ac8960a19a5459dbb2a8
14 changes: 11 additions & 3 deletions site/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import CssBaseline from "@material-ui/core/CssBaseline"
import ThemeProvider from "@material-ui/styles/ThemeProvider"
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
import { AuthProvider } from "components/AuthProvider/AuthProvider"
import { FC } from "react"
import { FC, PropsWithChildren } from "react"
import { HelmetProvider } from "react-helmet-async"
import { AppRouter } from "./AppRouter"
import { ErrorBoundary } from "./components/ErrorBoundary/ErrorBoundary"
Expand All @@ -19,15 +19,15 @@ const queryClient = new QueryClient({
},
})

export const App: FC = () => {
export const AppProviders: FC<PropsWithChildren> = ({ children }) => {
return (
<HelmetProvider>
<ThemeProvider theme={dark}>
<CssBaseline />
<ErrorBoundary>
<QueryClientProvider client={queryClient}>
<AuthProvider>
<AppRouter />
{children}
<GlobalSnackbar />
</AuthProvider>
</QueryClientProvider>
Expand All @@ -36,3 +36,11 @@ export const App: FC = () => {
</HelmetProvider>
)
}

export const App: FC = () => {
return (
<AppProviders>
<AppRouter />
</AppProviders>
)
}
47 changes: 16 additions & 31 deletions site/src/testHelpers/renderHelpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
import ThemeProvider from "@material-ui/styles/ThemeProvider"
import {
render as wrappedRender,
RenderResult,
screen,
waitForElementToBeRemoved,
} from "@testing-library/react"
import { AuthProvider } from "components/AuthProvider/AuthProvider"
import { AppProviders } from "app"
import { DashboardLayout } from "components/Dashboard/DashboardLayout"
import { createMemoryHistory } from "history"
import { i18n } from "i18n"
import { FC, ReactElement } from "react"
import { HelmetProvider } from "react-helmet-async"
import { I18nextProvider } from "react-i18next"
import {
MemoryRouter,
Route,
Routes,
unstable_HistoryRouter as HistoryRouter,
} from "react-router-dom"
import { RequireAuth } from "../components/RequireAuth/RequireAuth"
import { dark } from "../theme"
import { MockUser } from "./entities"

export const history = createMemoryHistory()
Expand All @@ -28,13 +23,9 @@ export const WrapperComponent: FC<React.PropsWithChildren<unknown>> = ({
children,
}) => {
return (
<HelmetProvider>
<ThemeProvider theme={dark}>
<HistoryRouter history={history}>
<AuthProvider>{children}</AuthProvider>
</HistoryRouter>
</ThemeProvider>
</HelmetProvider>
<AppProviders>
<HistoryRouter history={history}>{children}</HistoryRouter>
</AppProviders>
)
}

Expand All @@ -59,24 +50,18 @@ export function renderWithAuth(
}: { route?: string; path?: string; routes?: JSX.Element } = {},
): RenderWithAuthResult {
const renderResult = wrappedRender(
<HelmetProvider>
<I18nextProvider i18n={i18n}>
<ThemeProvider theme={dark}>
<AuthProvider>
<MemoryRouter initialEntries={[route]}>
<Routes>
<Route element={<RequireAuth />}>
<Route element={<DashboardLayout />}>
<Route path={path ?? route} element={ui} />
</Route>
</Route>
{routes}
</Routes>
</MemoryRouter>
</AuthProvider>
</ThemeProvider>
</I18nextProvider>
</HelmetProvider>,
<AppProviders>
<MemoryRouter initialEntries={[route]}>
<Routes>
<Route element={<RequireAuth />}>
<Route element={<DashboardLayout />}>
<Route path={path ?? route} element={ui} />
</Route>
</Route>
{routes}
</Routes>
</MemoryRouter>
</AppProviders>,
)

return {
Expand Down