-
Notifications
You must be signed in to change notification settings - Fork 11
feat: Add base routes for Map View, Admin Dashboard, and Workflow page #5
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| import React from 'react'; | ||
| import ReactDOM from 'react-dom/client'; | ||
| import { BrowserRouter } from 'react-router-dom'; | ||
| import App from './App.tsx'; | ||
|
|
||
| ReactDOM.createRoot(document.getElementById('root')!).render( | ||
| <React.StrictMode> | ||
| <App /> | ||
| <BrowserRouter> | ||
| <App /> | ||
| </BrowserRouter> | ||
| </React.StrictMode>, | ||
| ); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import React from 'react'; | ||
| import '@/styles/pages.css'; | ||
|
|
||
| /** | ||
| * Admin Dashboard placeholder page | ||
| * This page will be expanded with admin functionality | ||
| * such as user management and data oversight in future iterations. | ||
| * @component | ||
| * @returns {JSX.Element} The admin dashboard placeholder | ||
| */ | ||
| export const AdminPage: React.FC = () => { | ||
| return ( | ||
| <div className="page-placeholder"> | ||
| <div className="page-placeholder__icon">🛠️</div> | ||
| <h1 className="page-placeholder__title">Admin Dashboard</h1> | ||
| <p className="page-placeholder__description"> | ||
| Administrative tools and user management will appear here. | ||
| </p> | ||
| <div className="page-placeholder__badge">Coming Soon</div> | ||
| </div> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import { useEffect, useState } from 'react'; | ||
| import { MapContainer } from '@/components/Map/MapContainer'; | ||
| import { LayerControls } from '@/components/Map/LayerControls'; | ||
| import { FixtureReader } from '@/data/fixture-reader'; | ||
| import type { LayerVisibilityMap } from '@/types/map'; | ||
| import type { FeatureCollection } from '@/types/geometry'; | ||
|
|
||
| /** | ||
| * Map Page - renders the interactive map with layer controls | ||
| * This is the primary view of the application, displaying | ||
| * geospatial data via Leaflet and allowing users to toggle layers. | ||
| * @component | ||
| * @returns {JSX.Element} The map view with layer controls | ||
| */ | ||
| export const MapPage = () => { | ||
| const [layers, setLayers] = useState<FeatureCollection[]>([]); | ||
| const [layerVisibility, setLayerVisibility] = useState<LayerVisibilityMap>({}); | ||
|
|
||
| useEffect(() => { | ||
| FixtureReader.collections() | ||
| .then(collections => { | ||
| setLayers([...collections]); | ||
|
|
||
| // Take the name property of each collection and set it's initial visibility to true | ||
| const layerNames = collections.map((fc) => fc.name); | ||
| const visibilityMap = layerNames.reduce((map, name) => { map[name] = true; return map; }, {} as LayerVisibilityMap); | ||
| setLayerVisibility({ ...visibilityMap }); | ||
| }); | ||
| }, []); | ||
|
|
||
| const layersToRender = layers.filter((fc) => layerVisibility[fc.name]); | ||
|
|
||
| return ( | ||
| <> | ||
| <MapContainer layers={layersToRender} /> | ||
| {/*<MapLegend />*/} | ||
| <LayerControls | ||
| visibilityMap={layerVisibility} | ||
| onLayerChange={setLayerVisibility} | ||
| /> | ||
| </> | ||
| ); | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: OpenSourceFellows/map_dashboard_hackathon
Length of output: 187
🏁 Script executed:
cat -n src/pages/MapPage.tsx | head -50Repository: OpenSourceFellows/map_dashboard_hackathon
Length of output: 1940
🏁 Script executed:
rg -n 'FixtureReader' src/ -A 5 -B 2Repository: OpenSourceFellows/map_dashboard_hackathon
Length of output: 2305
🏁 Script executed:
fd -t ts -name 'FixtureReader*'Repository: OpenSourceFellows/map_dashboard_hackathon
Length of output: 316
🏁 Script executed:
Repository: OpenSourceFellows/map_dashboard_hackathon
Length of output: 909
Handle fixture loading failures and unmounts.
FixtureReader.collections()is fire-and-forget here: a rejected fetch (line 13 offixture-reader.tsthrows on failed response) will surface as an unhandled promise rejection, and state updates can still run after the user navigates away from the map. Add a cleanup guard and.catch()handler before settinglayersandlayerVisibility.♻️ Suggested fix
useEffect(() => { - FixtureReader.collections() - .then(collections => { - setLayers([...collections]); - - // Take the name property of each collection and set it's initial visibility to true - const layerNames = collections.map((fc) => fc.name); - const visibilityMap = layerNames.reduce((map, name) => { map[name] = true; return map; }, {} as LayerVisibilityMap); - setLayerVisibility({ ...visibilityMap }); - }); + let cancelled = false; + + FixtureReader.collections() + .then((collections) => { + if (cancelled) return; + + setLayers(collections); + const visibilityMap = collections.reduce((map, fc) => { + map[fc.name] = true; + return map; + }, {} as LayerVisibilityMap); + setLayerVisibility(visibilityMap); + }) + .catch((error) => { + console.error('Failed to load map layers', error); + }); + + return () => { + cancelled = true; + }; }, []);📝 Committable suggestion
🤖 Prompt for AI Agents
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@SAUMILDHANKAR and @DietBepis1 how helpful would adding a catch clause for this be?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@antaerus, weighing in since I flagged it: it's a small, low-risk addition but genuinely useful here..catch(): if the fixture fetch fails (e.g., missing/renamed file, network hiccup in dev), the rejection is unhandled — it'll show as a console error/warning and users will just see a blank map with no indication of why the layers didn't load..catch(): you get a clear log point (or could set an error/empty state to show a "failed to load layers" message), and it stops the rejection from bubbling up as unhandled.cancelled/cleanup flag is the other half of the fix — it avoids callingsetLayers/setLayerVisibilityif the component unmounts before the fetch resolves (e.g., user navigates away from/mapquickly), which would otherwise trigger a React "can't perform a state update on an unmounted component" warning.Given
MapPageis now reached via routing and can be mounted/unmounted as users navigate between/map,/admin,/workflow, this scenario is more likely than before, so I'd lean toward including at least the cleanup guard, with the.catch()as a cheap safety net. That said, it's a minor/defensive improvement rather than a blocker — happy to defer to the team's call on priority for this PR.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@antaerus thanks for noticing that, taking help from copilot I would say if not added in this PR it would be a valuable addition in a later one for code maintainability. But if Ngole is pressed for time, I will merge this in the meantime.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.