-
Notifications
You must be signed in to change notification settings - Fork 0
NRF2-414 Navigate to the 'No EDP' page after map page #108
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
Merged
+102
−353
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
88a2dd8
Go to no-edp page
robin-dunn 0d2b908
govukInsetText
robin-dunn 3c2cc31
Merge branch 'main' into NRF2-414-boundary-outside-edp
robin-dunn fd2f9cb
Rename map route to upload-preview-map
robin-dunn 89f3371
Clean up
robin-dunn c6860bd
Merge branch 'main' of github.com:DEFRA/nrf-frontend into NRF2-414-bo…
robin-dunn 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
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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| import { getPageTitle } from '../../common/helpers/page-title.js' | ||
| import { routePath as mapPath } from '../upload-preview-map/routes.js' | ||
|
|
||
| const title = 'Nature Restoration Fund levy is not available in this area' | ||
|
|
||
| export default function getViewModel() { | ||
| return { | ||
| pageTitle: getPageTitle(title), | ||
| pageHeading: title, | ||
| backLinkPath: '#' | ||
| backLinkPath: mapPath | ||
| } | ||
| } |
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
File renamed without changes.
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,44 @@ | ||
| import { createLogger } from '../../common/helpers/logging/logger.js' | ||
| import { saveQuoteDataToCache } from '../helpers/get-quote-session/index.js' | ||
| import { routePath as uploadBoundaryPath } from '../upload-boundary/routes.js' | ||
| import { routePath as noEdpPath } from '../no-edp/routes.js' | ||
| import getViewModel from './get-view-model.js' | ||
|
|
||
| const logger = createLogger() | ||
|
|
||
| export function handler(request, h) { | ||
| const boundaryGeojson = request.yar.get('boundaryGeojson') | ||
|
|
||
| // Session may be missing if it expired or the user navigated here directly | ||
| if (!boundaryGeojson) { | ||
| logger.info('map - no boundary data in session') | ||
| return h.redirect(uploadBoundaryPath) | ||
| } | ||
|
|
||
| const viewModel = getViewModel(boundaryGeojson) | ||
|
|
||
| return h.view('quote/upload-preview-map/index', { | ||
| ...viewModel | ||
| }) | ||
| } | ||
|
|
||
| export function postHandler(request, h) { | ||
| const boundaryGeojson = request.yar.get('boundaryGeojson') | ||
|
|
||
| // Session may be missing if it expired or the user navigated here directly | ||
| if (!boundaryGeojson) { | ||
| return h.redirect(uploadBoundaryPath) | ||
| } | ||
|
|
||
| const intersectsEdp = boundaryGeojson?.intersects_edp ?? false | ||
|
|
||
| saveQuoteDataToCache(request, { boundaryGeojson }) | ||
| request.yar.clear('boundaryGeojson') | ||
|
|
||
| if (intersectsEdp) { | ||
| return h.redirect('/quote/development-types') | ||
| } | ||
|
|
||
| logger.info('map - boundary does not intersect EDP, saved to quote data') | ||
| return h.redirect(noEdpPath) | ||
| } |
Oops, something went wrong.
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.