feat: remove local context (#111)

graasp · Dec 17, 2024 · 46bcfa5 · 46bcfa5
1 parent 3099c8d
commit 46bcfa5
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 356 deletions.
diff --git a/src/context/SettingsContext.tsx b/src/context/SettingsContext.tsx
diff --git a/src/context/SimulationContext.tsx b/src/context/SimulationContext.tsx
@@ -110,7 +110,7 @@ export const SimulationProvider = ({
     unit: TimeUnit.Years,
   });
   const [simulationStatus, setSimulationStatus] = useState<SimulationStatus>(
-    SimulationStatus.LOADING, // waiting for the temperatures...
+    SimulationStatus.INITIAL_LOADING, // waiting for the temperatures...
   );
   const [simulationSpeedIdx, setSimulationSpeedIdx] = useState(0);
 
@@ -150,6 +150,7 @@ export const SimulationProvider = ({
         type: 'load',
         temperatureRows: temperatures.current,
       });
+      setSimulationStatus(SimulationStatus.LOADING);
     });
   }, [csv, csv.measurementFrequency, csv.path, simulationDuration.value]);
 

diff --git a/src/langs/en.json b/src/langs/en.json
@@ -1,4 +1,7 @@
 {
+  "INITIAL_LOADING": {
+    "LOADING_MESSAGE": "Loading House Insulation Simulator..."
+  },
   "DATES": {
     "YEARS_one": "{{count}} year",
     "YEARS_other": "{{count}} years",

diff --git a/src/modules/Root.tsx b/src/modules/Root.tsx
@@ -7,22 +7,14 @@ import { CssBaseline, ThemeProvider, createTheme, styled } from '@mui/material';
 import { grey, orange, pink } from '@mui/material/colors';
 import { StyledEngineProvider } from '@mui/material/styles';
 
-import {
-  GraaspContextDevTool,
-  WithLocalContext,
-  WithTokenContext,
-} from '@graasp/apps-query-client';
+import '@graasp/apps-query-client';
 
 import i18nConfig from '@/config/i18n';
 import {
   QueryClientProvider,
   ReactQueryDevtools,
-  hooks,
   queryClient,
 } from '@/config/queryClient';
-import { defaultMockContext, mockMembers } from '@/mocks/db';
-import Loader from '@/modules/common/Loader';
-import { useObjectState } from '@/utils/hooks';
 
 import ErrorBoundary from './ErrorBoundary';
 import App from './main/App';
@@ -73,59 +65,26 @@ const RootDiv = styled('div')({
   background: '#fafaff',
 });
 
-const Root: FC = () => {
-  const [mockContext, setMockContext] = useObjectState(defaultMockContext);
-
-  return (
-    <RootDiv>
-      {/* Used to define the order of injected properties between JSS and emotion */}
-      <StyledEngineProvider injectFirst>
-        <ThemeProvider theme={theme}>
-          <CssBaseline enableColorScheme />
-          <I18nextProvider i18n={i18nConfig}>
-            <ErrorBoundary>
-              <QueryClientProvider client={queryClient}>
-                <ToastContainer />
-                <WithLocalContext
-                  defaultValue={mockContext}
-                  LoadingComponent={<Loader />}
-                  useGetLocalContext={hooks.useGetLocalContext}
-                  useAutoResize={hooks.useAutoResize}
-                  onError={() => {
-                    console.error(
-                      'An error occurred while fetching the context.',
-                    );
-                  }}
-                >
-                  <WithTokenContext
-                    LoadingComponent={<Loader />}
-                    useAuthToken={hooks.useAuthToken}
-                    onError={() => {
-                      console.error(
-                        'An error occurred while requesting the token.',
-                      );
-                    }}
-                  >
-                    <App />
-                    {import.meta.env.DEV && (
-                      <GraaspContextDevTool
-                        members={mockMembers}
-                        context={mockContext}
-                        setContext={setMockContext}
-                      />
-                    )}
-                  </WithTokenContext>
-                </WithLocalContext>
-                {import.meta.env.DEV && (
-                  <ReactQueryDevtools position="bottom-left" />
-                )}
-              </QueryClientProvider>
-            </ErrorBoundary>
-          </I18nextProvider>
-        </ThemeProvider>
-      </StyledEngineProvider>
-    </RootDiv>
-  );
-};
+const Root: FC = () => (
+  <RootDiv>
+    {/* Used to define the order of injected properties between JSS and emotion */}
+    <StyledEngineProvider injectFirst>
+      <ThemeProvider theme={theme}>
+        <CssBaseline enableColorScheme />
+        <I18nextProvider i18n={i18nConfig}>
+          <ErrorBoundary>
+            <QueryClientProvider client={queryClient}>
+              <ToastContainer />
+              <App />
+              {import.meta.env.DEV && (
+                <ReactQueryDevtools position="bottom-left" />
+              )}
+            </QueryClientProvider>
+          </ErrorBoundary>
+        </I18nextProvider>
+      </ThemeProvider>
+    </StyledEngineProvider>
+  </RootDiv>
+);
 
 export default Root;
diff --git a/src/modules/main/AnalyticsView.tsx b/src/modules/main/AnalyticsView.tsx
diff --git a/src/modules/main/App.tsx b/src/modules/main/App.tsx
@@ -1,13 +1,8 @@
 import { useEffect } from 'react';
 
 import { useLocalContext } from '@graasp/apps-query-client';
-import { Context } from '@graasp/sdk';
-
-import { SettingsProvider } from '@/context/SettingsContext';
 
 import i18n, { DEFAULT_LANGUAGE } from '../../config/i18n';
-import AnalyticsView from './AnalyticsView';
-import BuilderView from './BuilderView';
 import PlayerView from './PlayerView';
 
 const App = (): JSX.Element => {
@@ -21,26 +16,7 @@ const App = (): JSX.Element => {
     }
   }, [context]);
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const renderContent = (): JSX.Element => {
-    switch (context.context) {
-      case Context.Builder:
-        return <BuilderView />;
-
-      case Context.Analytics:
-        return <AnalyticsView />;
-
-      case Context.Player:
-      default:
-        return <PlayerView />;
-    }
-  };
-
-  return (
-    <SettingsProvider>
-      <PlayerView />
-    </SettingsProvider>
-  );
+  return <PlayerView />;
 };
 
 export default App;