base usecases

InseeFr · Nov 10, 2023 · 5429697 · 5429697
1 parent 3d792e7
commit 5429697
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 39 deletions.
diff --git a/drama-queen/src/App.tsx b/drama-queen/src/App.tsx
diff --git a/drama-queen/src/bootstrap.tsx b/drama-queen/src/bootstrap.tsx
@@ -1,8 +1,18 @@
 import { createRoot } from "react-dom/client";
 import { type RoutingStrategy, createRouter } from "ui/routing/createRouter";
 import { injectLegacyEntryQueens } from "core/injectLegacyQueens";
-import App from "App";
-
+import CircularProgress from "@mui/material/CircularProgress"
+import { createCoreProvider } from "core";
+import { RouterProvider } from "react-router-dom";
+
+const { CoreProvider } = createCoreProvider({
+  "apiUrl": import.meta.env.VITE_API_URL,
+  "publicUrl": import.meta.env.BASE_URL,
+  "oidcParams": {
+    "issuerUri": import.meta.env.VITE_OIDC_ISSUER,
+    "clientId": import.meta.env.VITE_OIDC_CLIENT_ID,
+  },
+});
 
 const mount = ({
   mountPoint,
@@ -20,8 +30,9 @@ const mount = ({
   const router = createRouter({ strategy: routingStrategy, initialPathname });
   const root = createRoot(mountPoint);
   root.render(
-    <App />
-  );
+    <CoreProvider fallback={<CircularProgress />} >
+      <RouterProvider router={router} />
+    </CoreProvider>);
 
   return () => queueMicrotask(() => root.unmount());
 };

diff --git a/drama-queen/src/ui/auth.tsx b/drama-queen/src/ui/auth.tsx
@@ -1,5 +1,5 @@
 import { ReactNode } from "react";
-import { useCoreFunctions, useCoreState } from "core";
+import { useCoreFunctions } from "core";
 
 
 export function RequiresAuthentication(props:

diff --git a/drama-queen/src/ui/routing/routes.tsx b/drama-queen/src/ui/routing/routes.tsx
@@ -5,6 +5,7 @@ import type { RouteObject } from "react-router-dom";
 import { SynchronizePage } from "ui/pages/synchronize/SynchronizePage";
 import { SurveyMapping } from "ui/pages/queenMapping/SuryveyMapping";
 import { RequiresAuthentication } from "ui/auth";
+import { LoadingData } from "ui/pages/LoadingData";
 
 //ReadOnly path is a bad pattern must be change (affects pearl,moog,queen)
 export const routes: RouteObject[] = [
@@ -25,7 +26,11 @@ export const routes: RouteObject[] = [
     element: <VisualisationMapping />
   },
   {
-    path: "/synchronize",
+    path: "/synchronize-old",
     element: <RequiresAuthentication><SynchronizePage /></RequiresAuthentication>
+  },
+  {
+    path: "/synchronize",
+    element: <RequiresAuthentication><LoadingData /></RequiresAuthentication>
   }
 ]