From 7e98f3968d582453a7651538395418b217b9164a Mon Sep 17 00:00:00 2001
From: sjaanus <sellinjaanus@gmail.com>
Date: Wed, 10 Jan 2024 11:00:14 +0200
Subject: [PATCH] refactor: move plausible context on top of feedback

---
 frontend/src/component/App.tsx | 112 +++++++++++++++------------------
 frontend/src/index.tsx         |  23 ++++---
 2 files changed, 65 insertions(+), 70 deletions(-)

diff --git a/frontend/src/component/App.tsx b/frontend/src/component/App.tsx
index f1ff13add3..8e99e757e6 100644
--- a/frontend/src/component/App.tsx
+++ b/frontend/src/component/App.tsx
@@ -51,72 +51,64 @@ export const App = () => {
 
     return (
         <ErrorBoundary FallbackComponent={LayoutError}>
-            <PlausibleProvider>
-                <ErrorBoundary FallbackComponent={LayoutError}>
-                    <SWRProvider>
-                        <Suspense fallback={<Loader />}>
-                            <ConditionallyRender
-                                condition={!hasFetchedAuth}
-                                show={<Loader />}
-                                elseShow={
-                                    <>
-                                        <ConditionallyRender
-                                            condition={Boolean(
-                                                uiConfig?.maintenanceMode,
-                                            )}
-                                            show={<MaintenanceBanner />}
-                                        />
-                                        <LicenseBanner />
-                                        <ExternalBanners />
-                                        <InternalBanners />
-                                        <StyledContainer>
-                                            <ToastRenderer />
-                                            <Routes>
-                                                {availableRoutes.map(
-                                                    (route) => (
-                                                        <Route
-                                                            key={route.path}
-                                                            path={route.path}
-                                                            element={
-                                                                <LayoutPicker
-                                                                    isStandalone={
-                                                                        route.isStandalone ===
-                                                                        true
-                                                                    }
-                                                                >
-                                                                    <ProtectedRoute
-                                                                        route={
-                                                                            route
-                                                                        }
-                                                                    />
-                                                                </LayoutPicker>
-                                                            }
-                                                        />
-                                                    ),
-                                                )}
+            <ErrorBoundary FallbackComponent={LayoutError}>
+                <SWRProvider>
+                    <Suspense fallback={<Loader />}>
+                        <ConditionallyRender
+                            condition={!hasFetchedAuth}
+                            show={<Loader />}
+                            elseShow={
+                                <>
+                                    <ConditionallyRender
+                                        condition={Boolean(
+                                            uiConfig?.maintenanceMode,
+                                        )}
+                                        show={<MaintenanceBanner />}
+                                    />
+                                    <LicenseBanner />
+                                    <ExternalBanners />
+                                    <InternalBanners />
+                                    <StyledContainer>
+                                        <ToastRenderer />
+                                        <Routes>
+                                            {availableRoutes.map((route) => (
                                                 <Route
-                                                    path='/'
+                                                    key={route.path}
+                                                    path={route.path}
                                                     element={
-                                                        <InitialRedirect />
+                                                        <LayoutPicker
+                                                            isStandalone={
+                                                                route.isStandalone ===
+                                                                true
+                                                            }
+                                                        >
+                                                            <ProtectedRoute
+                                                                route={route}
+                                                            />
+                                                        </LayoutPicker>
                                                     }
                                                 />
-                                                <Route
-                                                    path='*'
-                                                    element={<NotFound />}
-                                                />
-                                            </Routes>
+                                            ))}
+                                            <Route
+                                                path='/'
+                                                element={<InitialRedirect />}
+                                            />
+                                            <Route
+                                                path='*'
+                                                element={<NotFound />}
+                                            />
+                                        </Routes>
 
-                                            <FeedbackNPS openUrl='http://feedback.unleash.run' />
+                                        <FeedbackNPS openUrl='http://feedback.unleash.run' />
 
-                                            <SplashPageRedirect />
-                                        </StyledContainer>
-                                    </>
-                                }
-                            />
-                        </Suspense>
-                    </SWRProvider>
-                </ErrorBoundary>
-            </PlausibleProvider>
+                                        <SplashPageRedirect />
+                                    </StyledContainer>
+                                </>
+                            }
+                        />
+                    </Suspense>
+                </SWRProvider>
+            </ErrorBoundary>
         </ErrorBoundary>
     );
 };
diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
index 777af87ebe..65c0ef68d3 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -17,6 +17,7 @@ import { InstanceStatus } from 'component/common/InstanceStatus/InstanceStatus';
 import { UIProviderContainer } from 'component/providers/UIProvider/UIProviderContainer';
 import { StickyProvider } from 'component/common/Sticky/StickyProvider';
 import { FeedbackProvider } from './component/feedbackNew/FeedbackProvider';
+import { PlausibleProvider } from './component/providers/PlausibleProvider/PlausibleProvider';
 
 window.global ||= window;
 
@@ -27,16 +28,18 @@ ReactDOM.render(
                 <QueryParamProvider adapter={ReactRouter6Adapter}>
                     <ThemeProvider>
                         <AnnouncerProvider>
-                            <FeedbackProvider>
-                                <FeedbackCESProvider>
-                                    <StickyProvider>
-                                        <InstanceStatus>
-                                            <ScrollTop />
-                                            <App />
-                                        </InstanceStatus>
-                                    </StickyProvider>
-                                </FeedbackCESProvider>
-                            </FeedbackProvider>
+                            <PlausibleProvider>
+                                <FeedbackProvider>
+                                    <FeedbackCESProvider>
+                                        <StickyProvider>
+                                            <InstanceStatus>
+                                                <ScrollTop />
+                                                <App />
+                                            </InstanceStatus>
+                                        </StickyProvider>
+                                    </FeedbackCESProvider>
+                                </FeedbackProvider>
+                            </PlausibleProvider>
                         </AnnouncerProvider>
                     </ThemeProvider>
                 </QueryParamProvider>