Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-04 00:18:01 +01:00
Code Issues Projects Releases Wiki Activity

refactor: move plausible context on top of feedback (#5824)

Browse Source 
We were unable to send plausible events from feedback. Now we can.
This commit is contained in:
Jaanus Sellin 2024-01-10 11:31:41 +02:00 committed by GitHub
parent 17fe264632
commit d770f624e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/component/App.tsx
View File

@ -9,7 +9,6 @@ import Loader from 'component/common/Loader/Loader';
import NotFound from 'component/common/NotFound/NotFound'; import NotFound from 'component/common/NotFound/NotFound';
import { ProtectedRoute } from 'component/common/ProtectedRoute/ProtectedRoute'; import { ProtectedRoute } from 'component/common/ProtectedRoute/ProtectedRoute';
import { SWRProvider } from 'component/providers/SWRProvider/SWRProvider'; import { SWRProvider } from 'component/providers/SWRProvider/SWRProvider';
import { PlausibleProvider } from 'component/providers/PlausibleProvider/PlausibleProvider';
import ToastRenderer from 'component/common/ToastRenderer/ToastRenderer'; import ToastRenderer from 'component/common/ToastRenderer/ToastRenderer';
import { routes } from 'component/menu/routes'; import { routes } from 'component/menu/routes';
import { useAuthDetails } from 'hooks/api/getters/useAuth/useAuthDetails'; import { useAuthDetails } from 'hooks/api/getters/useAuth/useAuthDetails';
@ -51,8 +50,6 @@ export const App = () => {
}, [authDetails, user]); }, [authDetails, user]);
return ( return (
<ErrorBoundary FallbackComponent={LayoutError}>
<PlausibleProvider>
<ErrorBoundary FallbackComponent={LayoutError}> <ErrorBoundary FallbackComponent={LayoutError}>
<SWRProvider> <SWRProvider>
<Suspense fallback={<Loader />}> <Suspense fallback={<Loader />}>
@ -74,13 +71,10 @@ export const App = () => {
<StyledContainer> <StyledContainer>
<ToastRenderer /> <ToastRenderer />
<Routes> <Routes>
{availableRoutes.map( {availableRoutes.map((route) => (
(route) => (
<Route <Route
key={route.path} key={route.path}
path={ path={route.path}
route.path
}
element={ element={
<LayoutPicker <LayoutPicker
isStandalone={ isStandalone={
@ -89,20 +83,15 @@ export const App = () => {
} }
> >
<ProtectedRoute <ProtectedRoute
route={ route={route}
route
}
/> />
</LayoutPicker> </LayoutPicker>
} }
/> />
), ))}
)}
<Route <Route
path='/' path='/'
element={ element={<InitialRedirect />}
<InitialRedirect />
}
/> />
<Route <Route
path='*' path='*'
@ -121,7 +110,5 @@ export const App = () => {
</Suspense> </Suspense>
</SWRProvider> </SWRProvider>
</ErrorBoundary> </ErrorBoundary>
</PlausibleProvider>
</ErrorBoundary>
); );
}; };

9
frontend/src/index.tsx
View File

@ -16,7 +16,10 @@ import { AnnouncerProvider } from 'component/common/Announcer/AnnouncerProvider/
import { InstanceStatus } from 'component/common/InstanceStatus/InstanceStatus'; import { InstanceStatus } from 'component/common/InstanceStatus/InstanceStatus';
import { UIProviderContainer } from 'component/providers/UIProvider/UIProviderContainer'; import { UIProviderContainer } from 'component/providers/UIProvider/UIProviderContainer';
import { StickyProvider } from 'component/common/Sticky/StickyProvider'; import { StickyProvider } from 'component/common/Sticky/StickyProvider';
import { FeedbackProvider } from './component/feedbackNew/FeedbackProvider'; import { FeedbackProvider } from 'component/feedbackNew/FeedbackProvider';
import { PlausibleProvider } from 'component/providers/PlausibleProvider/PlausibleProvider';
import { Error as LayoutError } from './component/layout/Error/Error';
import { ErrorBoundary } from 'react-error-boundary';
window.global ||= window; window.global ||= window;
@ -27,6 +30,8 @@ ReactDOM.render(
<QueryParamProvider adapter={ReactRouter6Adapter}> <QueryParamProvider adapter={ReactRouter6Adapter}>
<ThemeProvider> <ThemeProvider>
<AnnouncerProvider> <AnnouncerProvider>
<ErrorBoundary FallbackComponent={LayoutError}>
<PlausibleProvider>
<FeedbackProvider> <FeedbackProvider>
<FeedbackCESProvider> <FeedbackCESProvider>
<StickyProvider> <StickyProvider>
@ -37,6 +42,8 @@ ReactDOM.render(
</StickyProvider> </StickyProvider>
</FeedbackCESProvider> </FeedbackCESProvider>
</FeedbackProvider> </FeedbackProvider>
</PlausibleProvider>
</ErrorBoundary>
</AnnouncerProvider> </AnnouncerProvider>
</ThemeProvider> </ThemeProvider>
</QueryParamProvider> </QueryParamProvider>