Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use elections api in frontend #171

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Use elections api in frontend #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions frontend/app/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { StrictMode } from "react";
import ReactDOM from "react-dom/client";
import { createBrowserRouter, RouterProvider } from "react-router-dom";

import { ApiProvider, ElectionListProvider, ElectionProvider } from "@kiesraad/api";
import { ApiProvider, ElectionListProvider } from "@kiesraad/api";

// ignore in prod
import { startMockAPI } from "./msw-mock-api.ts";
Expand All @@ -24,9 +24,7 @@ function render() {
<StrictMode>
<ApiProvider host={process.env.API_HOST || ""}>
<ElectionListProvider>
<ElectionProvider>
<RouterProvider router={router} />
</ElectionProvider>
<RouterProvider router={router} />
</ElectionListProvider>
</ApiProvider>
</StrictMode>,
Expand Down
12 changes: 12 additions & 0 deletions frontend/app/module/ElectionLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Outlet, useParams } from "react-router-dom";

import { ElectionProvider } from "@kiesraad/api";

export function ElectionLayout() {
const { electionId } = useParams();
return (
<ElectionProvider electionId={parseInt(electionId ?? "", 10)}>
<Outlet />
</ElectionProvider>
);
}
2 changes: 1 addition & 1 deletion frontend/app/module/input/PollingStation/PollingStationLayout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe("PollingStationLayout", () => {
test("Enter form field values", () => {
render(
<ElectionListProvider>
<ElectionProvider>
<ElectionProvider electionId={1}>
<PollingStationLayout />
</ElectionProvider>
</ElectionListProvider>,
Expand Down
99 changes: 30 additions & 69 deletions frontend/app/module/overview/page/OverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { useNavigate } from "react-router-dom";

import {
IconCheckHeart,
IconCheckVerified,
IconChevronRight,
IconClock,
IconHourglass,
} from "@kiesraad/icon";
import { Election, useElectionList } from "@kiesraad/api";
import { IconCheckHeart, IconChevronRight } from "@kiesraad/icon";
import { WorkStationNumber } from "@kiesraad/ui";

export function OverviewPage() {
const navigate = useNavigate();
const handleRowClick = () => {
navigate(`/1/input`);
const handleRowClick = (election: Election) => {
return () => {
navigate(`/${election.id}/input`);
};
};
const { electionList } = useElectionList();

return (
<>
Expand All @@ -37,66 +35,29 @@ export function OverviewPage() {
</tr>
</thead>
<tbody>
<tr onClick={handleRowClick}>
<td>Provinciale Statenverkiezingen 2026</td>
<td>GSB - Juinen (045)</td>
<td>
<div className="flex_overview">
<IconHourglass />
<span>Invoer opgeschort</span>
</div>
</td>
<td className="link">
<div className="link">
<IconChevronRight />
</div>
</td>
</tr>
<tr onClick={handleRowClick}>
<td>Waterschap Zeegraslanden 2026</td>
<td></td>
<td>
<div className="flex_overview">
<IconClock />
<span>Wachten op coördinator</span>
</div>
</td>
<td className="link">
<div className="link">
<IconChevronRight />
</div>
</td>
</tr>
<tr onClick={handleRowClick}>
<td>Waterschap De Watervenen 2026</td>
<td></td>
<td>
<div className="flex_overview">
<IconCheckHeart />
<span>Invoerders bezig</span>
</div>
</td>
<td className="link">
<div className="link">
<IconChevronRight />
</div>
</td>
</tr>
<tr onClick={handleRowClick}>
<td>Gemeenteraadsverkiezing 2026</td>
<td></td>
<td>
<div className="flex_overview">
<IconCheckVerified />
<span>Steminvoer voltooid</span>
</div>
</td>
<td className="link">
<div className="link">
<IconChevronRight />
</div>
</td>
</tr>
{electionList.map((election) => (
<tr onClick={handleRowClick(election)} key={election.id}>
<td>{election.name}</td>
<td></td>
<td>
<div className="flex_overview">
<IconCheckHeart />
<span>Invoerders bezig</span>
{/* TODO <IconHourglass />
<span>Invoer opgeschort</span>
<IconClock />
<span>Wachten op coördinator</span>
<IconCheckVerified />
<span>Steminvoer voltooid</span> */}
</div>
</td>
<td className="link">
<div className="link">
<IconChevronRight />
</div>
</td>
</tr>
))}
</tbody>
</table>
</article>
Expand Down
19 changes: 11 additions & 8 deletions frontend/app/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { createRoutesFromElements, Route } from "react-router-dom";

import { ElectionLayout } from "./module/ElectionLayout";
import { HomePage } from "./module/HomePage";
import {
CandidatesVotesPage,
Expand All @@ -26,14 +27,16 @@ export const routes = createRoutesFromElements(
<Route path="overview" element={<OverviewLayout />}>
<Route index element={<OverviewPage />} />
</Route>
<Route path=":electionId/input" element={<InputLayout />}>
<Route index element={<InputHomePage />} />
<Route path=":pollingStationId/" element={<PollingStationLayout />}>
<Route index path="recounted" element={<RecountedPage />} />
<Route path="numbers" element={<VotersAndVotesPage />} />
<Route path="differences" element={<DifferencesPage />} />
<Route path="list/:listNumber" element={<CandidatesVotesPage />} />
<Route path="save" element={<div>Placeholder Check and Save Page</div>} />
<Route path=":electionId" element={<ElectionLayout />}>
<Route path="input" element={<InputLayout />}>
<Route index element={<InputHomePage />} />
<Route path=":pollingStationId/" element={<PollingStationLayout />}>
<Route index path="recounted" element={<RecountedPage />} />
<Route path="numbers" element={<VotersAndVotesPage />} />
<Route path="differences" element={<DifferencesPage />} />
<Route path="list/:listNumber" element={<CandidatesVotesPage />} />
<Route path="save" element={<div>Placeholder Check and Save Page</div>} />
</Route>
</Route>
</Route>
</Route>,
Expand Down
8 changes: 3 additions & 5 deletions frontend/lib/api/election/ElectionProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from "react";

import { Election } from "../gen/openapi";
import { useElectionDataRequest } from "../useElectionDataRequest";
import { useElectionList } from "./useElectionList";

export interface iElectionProviderContext {
election: Required<Election>;
Expand All @@ -14,13 +13,12 @@ export const ElectionProviderContext = React.createContext<iElectionProviderCont

export interface ElectionProviderProps {
children: React.ReactNode;
electionId: number;
}

export function ElectionProvider({ children }: ElectionProviderProps) {
const { electionList } = useElectionList();

export function ElectionProvider({ children, electionId }: ElectionProviderProps) {
const { data, loading } = useElectionDataRequest({
election_id: electionList.length && electionList[0] ? electionList[0].id : 0,
election_id: electionId,
});

if (loading) {
Expand Down