Processes filtering logic

src/components/Dashboard/Menu/Options.tsx

@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { HiSquares2X2 } from 'react-icons/hi2'
 import { IoIosSettings } from 'react-icons/io'
-import { matchPath, useLocation } from 'react-router-dom'
+import { generatePath, matchPath, useLocation } from 'react-router-dom'
 import { Routes } from '~src/router/routes'
 import { DashboardMenuItem } from './Item'
 
@@ -30,9 +30,9 @@ export const DashboardMenuOptions = () => {
       label: t('voting_processes'),
       icon: HiSquares2X2,
       children: [
-        { label: t('all'), route: Routes.dashboard.processes },
-        { label: t('active'), route: '#active' },
-        { label: t('finished'), route: '#finished' },
+        { label: t('all'), route: generatePath(Routes.dashboard.processes, { page: 1 }) },
+        { label: t('active'), route: generatePath(Routes.dashboard.processes, { status: 'ready', page: 1 }) },
+        { label: t('finished'), route: generatePath(Routes.dashboard.processes, { status: 'results', page: 1 }) },
         // { label: t('draft'), route: '#draft' },
       ],
     },

src/components/Organization/Dashboard/ProcessesList.tsx

@@ -9,13 +9,12 @@ import ProcessCard from './ProcessCard'
 type Election = PublishedElection | InvalidElection
 
 type ProcessesListProps = {
-  error: Error | null
-  loading: boolean
-  limit?: number
+  error?: Error | null
+  loading?: boolean
   processes?: Election[]
 }
 
-const ProcessesList = ({ loading, processes, error, limit }: ProcessesListProps) => {
+const ProcessesList = ({ loading, processes, error }: ProcessesListProps) => {
   const { t } = useTranslation()
 
   return (
@@ -47,13 +46,11 @@ const ProcessesList = ({ loading, processes, error, limit }: ProcessesListProps)
       <VStack w='full'>
         {processes &&
           processes.length &&
-          processes?.map((election, key) =>
-            limit && key >= limit ? null : (
-              <ElectionProvider election={election} id={election.id} key={election.id}>
-                <ProcessCard />
-              </ElectionProvider>
-            )
-          )}
+          processes?.map((election) => (
+            <ElectionProvider election={election} id={election.id} key={election.id}>
+              <ProcessCard />
+            </ElectionProvider>
+          ))}
         {!loading && (!processes || !processes.length) && <NoElections />}
       </VStack>
     </VStack>

src/components/Organization/Dashboard/Votings.tsx

@@ -1,33 +1,30 @@
 import { Flex } from '@chakra-ui/react'
 import { RoutedPagination } from '@vocdoni/chakra-components'
-import { RoutedPaginationProvider, useOrganization, useRoutedPagination } from '@vocdoni/react-providers'
-import { usePaginatedElections } from '~src/queries/organization'
+import { RoutedPaginationProvider, useOrganization } from '@vocdoni/react-providers'
+import { ElectionListWithPagination } from '@vocdoni/sdk'
 import { Routes } from '~src/router/routes'
 import ProcessesList from './ProcessesList'
 
-const Votings = () => {
+const Votings = ({ data }: { data: ElectionListWithPagination }) => {
   const { organization } = useOrganization()
 
   if (!organization) return null
 
   return (
     <RoutedPaginationProvider path={Routes.dashboard.processes}>
-      <VotingsList />
+      <VotingsList data={data} />
     </RoutedPaginationProvider>
   )
 }
 
-const VotingsList = () => {
-  const { page } = useRoutedPagination()
-  const { data, error, isLoading } = usePaginatedElections(page ?? 0)
-
+const VotingsList = ({ data }: { data: ElectionListWithPagination }) => {
   if (!data) return null
 
   const { elections, pagination } = data
 
   return (
     <Flex flexDirection='column' flexGrow={1} gap={5} height='full'>
-      <ProcessesList processes={elections} error={error} loading={isLoading} />
+      <ProcessesList processes={elections} />
       <Flex mt='auto' justifyContent='end'>
         {!!elections?.length && <RoutedPagination pagination={pagination} />}
       </Flex>

src/elements/dashboard/processes/index.tsx

@@ -1,13 +1,15 @@
+import { ElectionListWithPagination } from '@vocdoni/sdk'
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useOutletContext } from 'react-router-dom'
+import { useLoaderData, useOutletContext } from 'react-router-dom'
 import { DashboardContents } from '~components/Layout/Dashboard'
 import Votings from '~components/Organization/Dashboard/Votings'
 import { DashboardLayoutContext } from '~elements/LayoutDashboard'
 
 const OrganizationVotings = () => {
   const { t } = useTranslation()
   const { setBack, setTitle } = useOutletContext<DashboardLayoutContext>()
+  const data = useLoaderData()
 
   // Set page title
   useEffect(() => {
@@ -17,7 +19,7 @@ const OrganizationVotings = () => {
 
   return (
     <DashboardContents>
-      <Votings />
+      <Votings data={data as ElectionListWithPagination} />
     </DashboardContents>
   )
 }

src/queries/organization.ts

@@ -1,5 +1,6 @@
 import { useQuery } from '@tanstack/react-query'
 import { useClient } from '@vocdoni/react-providers'
+import { AccountData, FetchElectionsParameters, VocdoniSDKClient } from '@vocdoni/sdk'
 
 export const useLatestElections = (limit = 5) => {
   const { client, account } = useClient()
@@ -13,12 +14,22 @@ export const useLatestElections = (limit = 5) => {
   })
 }
 
-export const usePaginatedElections = (page: number) => {
-  const { client, account } = useClient()
-
-  return useQuery({
-    enabled: !!account?.address,
-    queryKey: ['organization', 'elections', account?.address, page],
-    queryFn: async () => client.fetchElections({ organizationId: account?.address, page }),
-  })
+type PaginatedElectionsParams = {
+  page?: number
+  status?: FetchElectionsParameters['status']
 }
+
+export const paginatedElectionsQuery = (
+  account: AccountData,
+  client: VocdoniSDKClient,
+  params: PaginatedElectionsParams
+) => ({
+  enabled: !!account?.address,
+  queryKey: ['organization', 'elections', account?.address, params],
+  queryFn: async () =>
+    client.fetchElections({
+      organizationId: account?.address,
+      page: params.page ? Number(params.page) - 1 : 0,
+      status: params.status?.toUpperCase() as FetchElectionsParameters['status'],
+    }),
+})

src/router/routes/dashboard.tsx

@@ -1,11 +1,12 @@
 import { useClient } from '@vocdoni/react-providers'
-import { VocdoniSDKClient } from '@vocdoni/sdk'
 import { lazy } from 'react'
 // These aren't lazy loaded since they are main layouts and related components
+import { useQueryClient } from '@tanstack/react-query'
 import { Params } from 'react-router-dom'
 import { Profile } from '~elements/dashboard/profile'
 import Error from '~elements/Error'
 import LayoutDashboard from '~elements/LayoutDashboard'
+import { paginatedElectionsQuery } from '~src/queries/organization'
 import { Routes } from '.'
 import OrganizationProtectedRoute from '../OrganizationProtectedRoute'
 import { SuspenseLoader } from '../SuspenseLoader'
@@ -19,76 +20,81 @@ const OrganizationTeam = lazy(() => import('~elements/dashboard/team'))
 // others
 const OrganizationDashboard = lazy(() => import('~components/Organization/Dashboard'))
 
-const DashboardElements = (client: VocdoniSDKClient) => [
-  {
+export const useDashboardRoutes = () => {
+  const queryClient = useQueryClient()
+  const { client, account } = useClient()
+
+  return {
     element: (
       <SuspenseLoader>
-        <LayoutDashboard />
+        <OrganizationProtectedRoute />
       </SuspenseLoader>
     ),
     children: [
       {
-        path: Routes.dashboard.base,
-        element: (
-          <SuspenseLoader>
-            <OrganizationDashboard />
-          </SuspenseLoader>
-        ),
-      },
-      {
-        path: Routes.dashboard.process,
-        element: (
-          <SuspenseLoader>
-            <DashboardProcessView />
-          </SuspenseLoader>
-        ),
-        loader: async ({ params }: { params: Params<string> }) => client.fetchElection(params.id),
-        errorElement: <Error />,
-      },
-      {
-        path: Routes.dashboard.organization,
-        element: (
-          <SuspenseLoader>
-            <OrganizationEdit />
-          </SuspenseLoader>
-        ),
-      },
-      {
-        path: Routes.dashboard.profile,
         element: (
           <SuspenseLoader>
-            <Profile />
-          </SuspenseLoader>
-        ),
-      },
-      {
-        path: Routes.dashboard.processes,
-        element: (
-          <SuspenseLoader>
-            <DashboardProcesses />
-          </SuspenseLoader>
-        ),
-      },
-      {
-        path: Routes.dashboard.team,
-        element: (
-          <SuspenseLoader>
-            <OrganizationTeam />
+            <LayoutDashboard />
           </SuspenseLoader>
         ),
+        children: [
+          {
+            path: Routes.dashboard.base,
+            element: (
+              <SuspenseLoader>
+                <OrganizationDashboard />
+              </SuspenseLoader>
+            ),
+          },
+          {
+            path: Routes.dashboard.process,
+            element: (
+              <SuspenseLoader>
+                <DashboardProcessView />
+              </SuspenseLoader>
+            ),
+            loader: async ({ params }: { params: Params<string> }) => client.fetchElection(params.id),
+            errorElement: <Error />,
+          },
+          {
+            path: Routes.dashboard.organization,
+            element: (
+              <SuspenseLoader>
+                <OrganizationEdit />
+              </SuspenseLoader>
+            ),
+          },
+          {
+            path: Routes.dashboard.profile,
+            element: (
+              <SuspenseLoader>
+                <Profile />
+              </SuspenseLoader>
+            ),
+          },
+          {
+            path: Routes.dashboard.processes,
+            element: (
+              <SuspenseLoader>
+                <DashboardProcesses />
+              </SuspenseLoader>
+            ),
+            loader: async ({ params }) => {
+              const query = paginatedElectionsQuery(account, client, params)
+              return queryClient.getQueryData(query.queryKey) ?? (await queryClient.fetchQuery(query))
+            },
+            errorElement: <Error />,
+          },
+          {
+            path: Routes.dashboard.team,
+            element: (
+              <SuspenseLoader>
+                <OrganizationTeam />
+              </SuspenseLoader>
+            ),
+          },
+        ],
       },
     ],
-  },
-]
-
-export const useDashboardRoutes = () => {
-  const { client } = useClient()
-  return {
-    element: (
-      <SuspenseLoader>
-        <OrganizationProtectedRoute />
-      </SuspenseLoader>
-    ),
-    children: DashboardElements(client),
   }
 }