[Languages] Simplify context

No reason to wrap LanguageContext in a CommonContext
UniversityOfHelsinkiCS · Feb 21, 2025 · 29331e1 · 29331e1
1 parent 0358cb4
commit 29331e1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/services/frontend/src/components/App/index.jsx b/services/frontend/src/components/App/index.jsx
@@ -8,6 +8,7 @@ import moment from 'moment'
 import { useEffect } from 'react'
 import { initShibbolethPinger } from 'unfuck-spa-shibboleth-session'
 
+import { LanguageProvider } from '@/components/LanguagePicker/useLanguage'
 import { AccessDenied } from '@/components/material/AccessDenied'
 import { Footer } from '@/components/material/Footer'
 import { NavigationBar } from '@/components/material/NavigationBar'
@@ -55,17 +56,19 @@ const Layout = ({ children }) => (
       minHeight: '100vh',
     }}
   >
-    <LocalizationProvider dateAdapter={AdapterMoment}>
-      <ThemeProvider theme={theme}>
-        <StatusNotificationProvider>
-          <CssBaseline />
-          <NavigationBar />
-          <main style={{ flex: 1 }}>{children}</main>
-          <StatusNotification />
-          <Footer />
-        </StatusNotificationProvider>
-      </ThemeProvider>
-    </LocalizationProvider>
+    <LanguageProvider>
+      <LocalizationProvider dateAdapter={AdapterMoment}>
+        <ThemeProvider theme={theme}>
+          <StatusNotificationProvider>
+            <CssBaseline />
+            <NavigationBar />
+            <main style={{ flex: 1 }}>{children}</main>
+            <StatusNotification />
+            <Footer />
+          </StatusNotificationProvider>
+        </ThemeProvider>
+      </LocalizationProvider>
+    </LanguageProvider>
   </div>
 )
 

diff --git a/services/frontend/src/components/common/CommonContext.jsx b/services/frontend/src/components/common/CommonContext.jsx
diff --git a/services/frontend/src/main.jsx b/services/frontend/src/main.jsx
@@ -7,7 +7,6 @@ import 'semantic-ui-css/semantic.min.css'
 import 'react-datetime/css/react-datetime.css'
 import './styles/custom.css'
 import { App } from './components/App'
-import { CommonContext } from './components/common/CommonContext'
 import { ConnectedErrorBoundary as ErrorBoundary } from './components/ErrorBoundary'
 import { basePath } from './conf'
 import { store } from './redux'
@@ -17,12 +16,10 @@ initializeSentry()
 
 createRoot(document.getElementById('root')).render(
   <Provider store={store}>
-    <CommonContext>
-      <BrowserRouter basename={basePath}>
-        <ErrorBoundary>
-          <App />
-        </ErrorBoundary>
-      </BrowserRouter>
-    </CommonContext>
+    <BrowserRouter basename={basePath}>
+      <ErrorBoundary>
+        <App />
+      </ErrorBoundary>
+    </BrowserRouter>
   </Provider>
 )