This repository has been archived by the owner on Nov 4, 2024. It is now read-only.
feature/COR-1516-404-page-improvements-multiple-pages #4736
Conversation
This file contains 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
added 24 commits
March 24, 2023 15:58
… it closes upon selecting an icon.
…ages are built at runtime.
APW26
requested review from
VWSCoronaDashboard26,
Jorrik-Klijnsma-Work,
Amber-Taal-Work,
VWSCoronaDashboard25 and
DariaKwork
Amber-Taal-Work
previously approved these changes
Apr 17, 2023
VWSCoronaDashboard26
previously approved these changes
Apr 17, 2023
VWSCoronaDashboard25
previously approved these changes
Apr 17, 2023
APW26
dismissed stale reviews from VWSCoronaDashboard25, VWSCoronaDashboard26, and Amber-Taal-Work
via
060de99
VWSCoronaDashboard26
approved these changes
Apr 17, 2023
Merged
This was referenced Apr 18, 2023
VWSCoronaDashboard25
added a commit
that referenced
this pull request
Apr 20, 2023
* feature/COR-1516-404-page-improvements-multiple-pages-client-side-only (#4727) * feat(404-pages): Remove hardcoded article redirects * feat(404-pages): Enable configuration of 404 pages in Sanity. * feat(404-pages): Adjust schemas. * feat(404-pages): Wrap breadcrumbs with a guard. * feat(404-pages): Middleware redirect logic with parameters for each 404 page. * feat(404-pages): Add new icons. Adjust KpiIconInput component so that it closes upon selecting an icon. * feat(404-pages): Extract query to its own file and adjust not found schema. * feat(404-pages): Update SVG fill * feat(404-pages): Adjust query and schema. Delete old 404 page * feat(404-pages): WIP new 404 pages. * feat(404-pages): Finalize 404 pages. * feat(404-pages): Fine tune implementation. * feat(404-pages): PR Feedback, first round. * feat(404-pages): PR Feedback, second round. * feat(404-pages): Non middleware solution. * feat(404-pages): Client side implementation * feat(404-pages): Add isGm and isGeneralPage. * feat(404-pages): Final tweaks * feat(404-pages): Revert undesired change. --------- Co-authored-by: VWSCoronaDashboard28 <[email protected]> * bugfix(positive-tests): added self_test_overall as metric to metrics array; (#4730) Co-authored-by: VWSCoronaDashboard26 <[email protected]> * feature/COR-1548-tests-page (#4734) * feat(tests-page): added new Tests route component; updated PositivelyTestedPeople route component to remove self tests chart; updated reverse router to add new Tests route and clean up; updated NlLayout component to add new Tests route to sidebar; moved Sanity keys using DELETE and ADD; updated types; * feat(tests-page): sorted mapKeysToReverseRouter entries in useSidebar hook; --------- Co-authored-by: VWSCoronaDashboard26 <[email protected]> * revert-4734-feature/COR-1548-tests-page (#4740) * Revert "feature/COR-1548-tests-page (#4734)" This reverts commit 79b8cec. * chore(revert): updated key-mutations.csv; --------- Co-authored-by: VWSCoronaDashboard26 <[email protected]> * epic/COR-1475-safety-region-removal (#4738) * COR-1505-remove-vr-from-sitemap (#4699) * chore: remove VR from sitemap * fix: PR feedback remove region priority * chore: remove menu item (#4700) * COR-1485-remove-VR-from-GM-sidebar (#4698) * chore: remove VR references from GM sidebar * chore: remove key from sanity * COR-1495-remove-the-VR-sidebar (#4702) * chore: remove sidebar * fix: forgot vr index * chore: cleanup types * fix: type errors * COR-1480-remove-from-footer (#4703) * chore: remove footer link * fix: PR review * COR-1488-remove-searchbar (#4701) * chore: Remove search possibility for VR and check for clean up * fix: solve type error and GitHub check fail * fix: deleted a file to much * fix: PR feedback * fix: PR feedback * feat: COR-1509-removed Gedrag archived section (#4704) * feat: removed gedrag archived section * fix: clean commented lines --------- Co-authored-by: VWSCoronaDashboard27 <[email protected]> * chore: Removed vr-related url (#4712) Co-authored-by: VWSCoronaDashboard27 <[email protected]> * feat(e2e-package): removed entire e2e package; removed any 'e2e', 'cypress' or 'data-cy' references; kept data-testid references for testing-library package; cleaned up modules; (#4710) Co-authored-by: VWSCoronaDashboard26 <[email protected]> * feature/COR-1481-remove-safety-regions-page (#4709) * feat(safety regions page): removed safety regions page and VrComboBox * feat(safety regions page): undo deletion of keys * delete key * delete empty file --------- Co-authored-by: VWSCoronaDashboard21 <[email protected]> * feat: COR-1486-toggle-vr-references-removal (#4714) * feat: removed toggle ans vr references * fix: fixed metadata * fix: remoed thresholds for vr * fix: removed left keys --------- Co-authored-by: VWSCoronaDashboard27 <[email protected]> * feat(kwetsbare-groepen-70-plussers): removed getLink and reverse router for kwetsbareGroepen (#4715) Co-authored-by: VWSCoronaDashboard21 <[email protected]> * COR-1515-remove-VR-pages-part-II (#4705) * chore: remove sewer page * chore: remove deceased page * chore: remove hospital * chore: remove vaccination page * chore: remove elderly-at-home page * chore: deletion of sanity keys * fix: PR Feedback * COR-1489-remove-toggle-view-on-patients-page (#4717) * feature/COR-1502-remove-redirects-vr-pages (#4706) * feat(redirects): removed vr related redirects * feat(redirects): removed redirect * remove VR from comment * feat(redirects): added back gm related redirect --------- Co-authored-by: VWSCoronaDashboard21 <[email protected]> * feature/COR-1482-safety-region-page-removal (#4707) * feat(safety-regions): removed 'brononderzoek', 'gedrag', 'gehandicaptenzorg', 'index', 'kwetsbare-groepen-70-plussers' and 'positief-geteste-mensen' page/route components; removed associated Sanity keys; removed unused situations components (previously used in 'brononderzoek' route); updated behavior components (as parts are unused with the removal); * feat(safety-regions): removed additional ununsed a11y keys; * feat(safety-regions): removed vr-layout component; removed static paths utils for VRs; removed static props utils for VRs; --------- Co-authored-by: VWSCoronaDashboard26 <[email protected]> * COR-1487-remove-toggle-on-positive-tested-page (#4716) * chore: Remove toggle on 'positive tested' page * chore: update lokalize keys * fix: PR feedback about spacing * feat(gehandicaptenzorg): removed getLink and reverse router (#4720) Co-authored-by: VWSCoronaDashboard21 <[email protected]> * feature/COR-1479-contact-tracing-page-removal (#4713) * feat(contact-tracing): removed 'brononderzoek' page/route component from NL level; removed associated components, logic and types; removed (a11y) Sanity keys for page and charts; * feat(contact-tracing): removed associated sitemap contents; removed sidebar contents; removed remaining Sanity keys; --------- Co-authored-by: VWSCoronaDashboard26 <[email protected]> * feat(vaccinations-page): remove planned vaccine content for 'Vaccinated people' graph; update schemas so that vaccine_planned is no longer used; fixed issue caused by previous magic number PRs; (#4697) (#4725) Co-authored-by: VWSCoronaDashboard26 <[email protected]> * feat(elderly-at-home): removed getLink prop from dynamic choropleth; removed any other associated dependencies; (#4721) Co-authored-by: VWSCoronaDashboard26 <[email protected]> * COR-1499-safety-region-removal-navigation-and-router (#4724) * Feature/cor 1498 vaccinations toggle button removal cherrypick (#4728) * fix: merged conflicts * fix: removed left vr * feat: merged two files together * Revert "fix: merged conflicts" This reverts commit 8a14ed0, reversing changes made to 5a152ff. * fix: merged conflicts * fix: removed left vr * feat: merged two files together * fix: conflict --------- Co-authored-by: VWSCoronaDashboard27 <[email protected]> * feat(municipalities): updated GmLayout component to remove unnecessary spacing to achieve consistency; (#4732) Co-authored-by: VWSCoronaDashboard26 <[email protected]> * bugfix/COR-1555-fix-whitespace-add-titles (#4735) * fix(vaccination coverage dropdowns): fixed white space and added titles * fix(vaccination coverage dropdowns): refactored code * fix(vaccination coverage dropdowns): wrapped BoldText in a guard * fix(vaccination coverage dropdowns): fixed gridGap --------- Co-authored-by: VWSCoronaDashboard21 <[email protected]> * Feature/no jira update epic branch with develop (#4741) * feat(vaccinations-page): remove planned vaccine content for 'Vaccinated people' graph; update schemas so that vaccine_planned is no longer used; fixed issue caused by previous magic number PRs; (#4697) Co-authored-by: VWSCoronaDashboard26 <[email protected]> * Chore/update-docs-structure (no related COR) (#4723) * chore: make reference to deletion file doc * fix: removed to much * feature/COR-1516-404-page-improvements-multiple-pages-client-side-only (#4727) * feat(404-pages): Remove hardcoded article redirects * feat(404-pages): Enable configuration of 404 pages in Sanity. * feat(404-pages): Adjust schemas. * feat(404-pages): Wrap breadcrumbs with a guard. * feat(404-pages): Middleware redirect logic with parameters for each 404 page. * feat(404-pages): Add new icons. Adjust KpiIconInput component so that it closes upon selecting an icon. * feat(404-pages): Extract query to its own file and adjust not found schema. * feat(404-pages): Update SVG fill * feat(404-pages): Adjust query and schema. Delete old 404 page * feat(404-pages): WIP new 404 pages. * feat(404-pages): Finalize 404 pages. * feat(404-pages): Fine tune implementation. * feat(404-pages): PR Feedback, first round. * feat(404-pages): PR Feedback, second round. * feat(404-pages): Non middleware solution. * feat(404-pages): Client side implementation * feat(404-pages): Add isGm and isGeneralPage. * feat(404-pages): Final tweaks * feat(404-pages): Revert undesired change. --------- Co-authored-by: VWSCoronaDashboard28 <[email protected]> * bugfix(positive-tests): added self_test_overall as metric to metrics array; (#4730) Co-authored-by: VWSCoronaDashboard26 <[email protected]> * feature/COR-1548-tests-page (#4734) * feat(tests-page): added new Tests route component; updated PositivelyTestedPeople route component to remove self tests chart; updated reverse router to add new Tests route and clean up; updated NlLayout component to add new Tests route to sidebar; moved Sanity keys using DELETE and ADD; updated types; * feat(tests-page): sorted mapKeysToReverseRouter entries in useSidebar hook; --------- Co-authored-by: VWSCoronaDashboard26 <[email protected]> * revert-4734-feature/COR-1548-tests-page (#4740) * Revert "feature/COR-1548-tests-page (#4734)" This reverts commit 79b8cec. * chore(revert): updated key-mutations.csv; --------- Co-authored-by: VWSCoronaDashboard26 <[email protected]> --------- Co-authored-by: LR <[email protected]> Co-authored-by: VWSCoronaDashboard26 <[email protected]> Co-authored-by: J <[email protected]> Co-authored-by: AP <[email protected]> Co-authored-by: VWSCoronaDashboard28 <[email protected]> --------- Co-authored-by: J <[email protected]> Co-authored-by: VWSCoronaDashboard27 <[email protected]> Co-authored-by: VWSCoronaDashboard27 <[email protected]> Co-authored-by: LR <[email protected]> Co-authored-by: VWSCoronaDashboard26 <[email protected]> Co-authored-by: AT <[email protected]> Co-authored-by: VWSCoronaDashboard21 <[email protected]> Co-authored-by: AP <[email protected]> Co-authored-by: VWSCoronaDashboard28 <[email protected]> * feature/COR-1516-404-page-improvements-multiple-pages (#4736) * feat(404-pages): Remove hardcoded article redirects * feat(404-pages): Enable configuration of 404 pages in Sanity. * feat(404-pages): Adjust schemas. * feat(404-pages): Wrap breadcrumbs with a guard. * feat(404-pages): Middleware redirect logic with parameters for each 404 page. * feat(404-pages): Add new icons. Adjust KpiIconInput component so that it closes upon selecting an icon. * feat(404-pages): Extract query to its own file and adjust not found schema. * feat(404-pages): Update SVG fill * feat(404-pages): Adjust query and schema. Delete old 404 page * feat(404-pages): WIP new 404 pages. * feat(404-pages): Finalize 404 pages. * feat(404-pages): Fine tune implementation. * feat(404-pages): PR Feedback, first round. * feat(404-pages): PR Feedback, second round. * feat(404-pages): Non middleware solution. * feat(404-pages): Refactor. * feat(404-pages): PR feedback and a few tweaks. * feat(404 pages): Refactor not found page for general, landelijk, and articles. * feat(404 pages): Change fallback back to blocking so that EN locale pages are built at runtime. * feat(404 pages): Create dedicated GM 404 page with new rewrites. * feat(404 pages): Formatting. * feat(404 pages): Finalize rewrites for all Gemeente scenarios. * feat(404 pages): Refactor and update utils typing. * feat(404-pages): PR feedback - round 1 * feat(404-pages): PR feedback - round 2. --------- Co-authored-by: VWSCoronaDashboard28 <[email protected]> * feat(vaccination page): fix white space (#4745) Co-authored-by: VWSCoronaDashboard21 <[email protected]> * feat(404 pages): Added one more rewrite for reserved route. (#4747) * feat(404 pages): Added one more rewrite for reserved route. * feat(404 pages): Adjusted rewrite destination for reserved route. --------- Co-authored-by: VWSCoronaDashboard28 <[email protected]> * bugfix/COR-1516-404-pages-allow-relative-urls (#4752) * feat(404-pages): Allow relative urls. Translate labels. * feat(404-pages): Styling adjustments. --------- Co-authored-by: VWSCoronaDashboard28 <[email protected]> * bugfix(choropleth-tooltip): fix issue where tooltip flashes then dissapears when clicking on an area. (#4749) Co-authored-by: VWSCoronaDashboard28 <[email protected]> --------- Co-authored-by: AP <[email protected]> Co-authored-by: VWSCoronaDashboard28 <[email protected]> Co-authored-by: LR <[email protected]> Co-authored-by: VWSCoronaDashboard26 <[email protected]> Co-authored-by: J <[email protected]> Co-authored-by: VWSCoronaDashboard27 <[email protected]> Co-authored-by: VWSCoronaDashboard27 <[email protected]> Co-authored-by: AT <[email protected]> Co-authored-by: VWSCoronaDashboard21 <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
Implements the new 404 pages using 2 catch-all routes. There are 4 different 404 pages for generic, national, municipality and article pages.
The generic, national, and article pages use the catch-all route found at
packages/app/src/pages/[...404].tsx.The municipality page uses the catch-all route found at
packages/app/src/pages/gemeente/[code]/[...404].tsx.The municipalities had to be treated differently as they have a structure in which there is a dynamic folder i.e.
/gemeente/[code]/routes. This caused an issue where a route like/gemeente/asdwould go to the_error.tsxpage, instead ofpackages/app/src/pages/[...404].tsx. To work around this, a few rewrites have been created, so that all/gemeente/*route variations which are not valid, are redirected to the catch-all route withinpackages/app/src/pages/gemeente/[code]/[...404].tsx.Screenshots
Before
Toggle before screenshot
After
Toggle After screenshot