Merge pull request #1494 from decentdao/enhancement/1492-dao-identifi…

…er-query-param Enhancement/1492 dao identifier query param
decentdao · Mar 27, 2024 · 0eca025 · 0eca025
2 parents 28ff8be + 869d041
commit 0eca025
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/src/constants/routes.ts b/src/constants/routes.ts
@@ -7,7 +7,6 @@ type RouteInfo = { relative: (...args: any) => string; path: string };
 type RouteIndex = { [key: string]: RouteInfo };
 export interface DAORoutes extends RouteIndex {
   dao: RouteInfo;
-  daos: RouteInfo;
   newSubDao: RouteInfo;
   modifyGovernance: RouteInfo;
   hierarchy: RouteInfo;
@@ -22,58 +21,54 @@ export interface DAORoutes extends RouteIndex {
 }
 
 export const DAO_ROUTES: DAORoutes = {
-  daos: {
-    relative: () => '/daos',
-    path: 'daos/:address/*',
-  },
   dao: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}`,
+    relative: (daoAddress: string) => `/home?dao=${daoAddress}`,
     path: '*',
   },
   newSubDao: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/new`,
+    relative: (daoAddress: string) => `/new?dao=${daoAddress}`,
     path: 'new',
   },
   modifyGovernance: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/edit/governance`,
+    relative: (daoAddress: string) => `/edit/governance?dao=${daoAddress}`,
     path: 'edit/governance',
   },
   hierarchy: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/hierarchy`,
+    relative: (daoAddress: string) => `/hierarchy?dao=${daoAddress}`,
     path: 'hierarchy',
   },
   treasury: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/treasury`,
+    relative: (daoAddress: string) => `/treasury?dao=${daoAddress}`,
     path: 'treasury',
   },
   proposals: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/proposals`,
+    relative: (daoAddress: string) => `/proposals?dao=${daoAddress}`,
     path: 'proposals',
   },
   proposal: {
     relative: (daoAddress: string, proposalId: string) =>
-      `/daos/${daoAddress}/proposals/${proposalId}`,
+      `/proposals/${proposalId}?dao=${daoAddress}`,
     path: 'proposals/:proposalId',
   },
   proposalNew: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/proposals/new`,
+    relative: (daoAddress: string) => `/proposals/new?dao=${daoAddress}`,
     path: 'proposals/new',
   },
   settings: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/settings`,
+    relative: (daoAddress: string) => `/settings?dao=${daoAddress}`,
     path: 'settings',
   },
   proposalTemplates: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/proposal-templates`,
+    relative: (daoAddress: string) => `/proposal-templates?dao=${daoAddress}`,
     path: 'proposal-templates',
   },
   proposalTemplate: {
     relative: (daoAddress: string, proposalTemplateKey: string) =>
-      `/daos/${daoAddress}/proposal-templates/${proposalTemplateKey}`,
+      `/proposal-templates/${proposalTemplateKey}?dao=${daoAddress}`,
     path: 'proposal-templates/:proposalTemplateKey',
   },
   proposalTemplateNew: {
-    relative: (daoAddress: string) => `/daos/${daoAddress}/proposal-templates/new`,
+    relative: (daoAddress: string) => `/proposal-templates/new?dao=${daoAddress}`,
     path: 'proposal-templates/new',
   },
 };
diff --git a/src/hooks/DAO/useDAOController.ts b/src/hooks/DAO/useDAOController.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { useParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
 import { useFractal } from '../../providers/App/AppProvider';
 import { useERC20Claim } from './loaders/governance/useERC20Claim';
 import { useSnapshotProposals } from './loaders/snapshot/useSnapshotProposals';
@@ -11,7 +11,9 @@ import { useFractalTreasury } from './loaders/useFractalTreasury';
 import { useGovernanceContracts } from './loaders/useGovernanceContracts';
 
 export default function useDAOController() {
-  const { daoAddress } = useParams();
+  const [searchParams] = useSearchParams();
+  const daoAddress = searchParams.get('dao');
+
   const {
     node: {
       nodeHierarchy: { parentAddress },
@@ -24,7 +26,7 @@ export default function useDAOController() {
     }
   }, [action, daoAddress]);
 
-  const { nodeLoading, errorLoading } = useFractalNode({ daoAddress });
+  const { nodeLoading, errorLoading } = useFractalNode({ daoAddress: daoAddress || undefined });
   useGovernanceContracts();
   useFractalGuardContracts({});
   useFractalFreeze({ parentSafeAddress: parentAddress });

diff --git a/src/router.tsx b/src/router.tsx
@@ -1,4 +1,4 @@
-import { createBrowserRouter } from 'react-router-dom';
+import { createBrowserRouter, redirect } from 'react-router-dom';
 import { ModalProvider } from './components/ui/modals/ModalProvider';
 import Layout from './components/ui/page/Layout';
 import FourOhFourPage from './pages/404';
@@ -34,15 +34,15 @@ export const router = createBrowserRouter([
         element: <HomePage />,
       },
       {
-        path: '/create',
+        path: 'create',
         element: <DaoCreatePage />,
       },
       {
-        path: 'daos/:daoAddress',
+        path: '/',
         element: <DAOController />,
         children: [
           {
-            index: true,
+            path: 'home',
             element: <DaoDashboardPage />,
           },
           {
@@ -97,6 +97,12 @@ export const router = createBrowserRouter([
           },
         ],
       },
+      {
+        // this exists to keep old links working
+        // /daos/0x0123/* will redirect to /home?dao=0x0123
+        path: 'daos/:daoAddress/*',
+        loader: ({ params: { daoAddress } }) => redirect(`/home?dao=${daoAddress}`),
+      },
       {
         path: '*', // 404
         element: <FourOhFourPage />,

diff --git a/src/utils/azorius.ts b/src/utils/azorius.ts
@@ -103,7 +103,7 @@ export const getProposalVotes = async (
       ...rest,
       voter,
       choice: VOTE_CHOICES[voteType],
-    } as ProposalVote; // This bypasses the type check, but it's fine
+    };
   });
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ export const getProposalVotes = async ( @@
           ...rest,
           voter,
           choice: VOTE_CHOICES[voteType],
-        } as ProposalVote; // This bypasses the type check, but it's fine
+        };
       });
     };
@@ Expand Down @@