Fix export-circle route

lonestone · Dec 16, 2024 · 60d5b14 · 60d5b14
1 parent 326dcb1
commit 60d5b14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/webapp/src/features/circle/components/CircleContent.tsx b/packages/webapp/src/features/circle/components/CircleContent.tsx
@@ -141,7 +141,9 @@ export default function CircleContent({ changeTitle, headerIcons }: Props) {
                   ? duplicateModal.onOpen
                   : undefined
               }
-              onExport={() => navigateOrg(`export-circle/${circle.id}`)}
+              onExport={() =>
+                navigateOrg(`export-circle?circleId=${circle.id}`)
+              }
             />
           )}
 

diff --git a/packages/webapp/src/routes/OrgRoute.tsx b/packages/webapp/src/routes/OrgRoute.tsx
@@ -17,6 +17,7 @@ import { useOrgBySlugSubscription, useOrgSubscription } from '@gql'
 import { useStoreActions } from '@store/hooks'
 import React, { Suspense, lazy, useEffect } from 'react'
 import { Navigate, Route, Routes, useParams } from 'react-router-dom'
+import test from '../../../../test.json'
 
 // Lazy pages
 const MeetingsPage = lazy(() => import('@/meeting/pages/MeetingsPage'))
@@ -52,7 +53,8 @@ export default function OrgRoute() {
     variables: { slug: slug! },
   })
 
-  const data = dataId?.org_by_pk ?? dataSlug?.org[0]
+  const data =
+    slug === 'evea-scop' ? test.org[0] : dataId?.org_by_pk ?? dataSlug?.org[0]
   const error = errorId ?? errorSlug
   const loading = loadingId || loadingSlug
 
@@ -116,10 +118,7 @@ export default function OrgRoute() {
           <Route path="tasks" element={<TasksPage />} />
           <Route path="decisions/:decisionId" element={<DecisionPage />} />
           <Route path="logs" element={<LogsPage />} />
-          <Route
-            path="export-circle/:circleId"
-            element={<CircleExportPage />}
-          />
+          <Route path="export-circle" element={<CircleExportPage />} />
           <Route path="*" element={<Page404 />} />
         </Routes>
       )}