CSL-20-premises-address-contact-details #3
Merged
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
RobertMcCann
requested review from
dk4g,
jamiecarterHO and
vinodhasamiyappanHO
dk4g
requested changes
Nov 18, 2024
| ] | ||
| }, | ||
| 'premises-address-line-1': { | ||
| mixins: ['input-text'], |
There was a problem hiding this comment.
I would recommend adding a reference to the validation rules for each field, even if they are specified elsewhere, that would help for future maintainers to quickly see that there is validation in place and where to find it.
validate: [], // additional validation rules added in custom-validation.js
| const contactDetails = []; | ||
| contactDetails.push(req.sessionModel.get('premises-telephone')); | ||
| contactDetails.push(req.sessionModel.get('premises-email')); | ||
| req.sessionModel.set('contactDetails', contactDetails.join(', ')); |
There was a problem hiding this comment.
I would recommend leaving this out as it is unlikely to be used in this format
There was a problem hiding this comment.
Right now it matches the figma, but do we know which format will be used?
There was a problem hiding this comment.
I mean, there is no point in storing contactDetails in sessionModel at this point.
Comment on lines
7
to
82
| if (key === 'premises-address-line-1') { | ||
| if (!validators.required(req.form.values[key])) { | ||
| return validationErrorFunc('required'); | ||
| } | ||
| if (req.form.values[key]?.length > 250) { | ||
| return validationErrorFunc('maxlength'); | ||
| } | ||
| if (!validators.notUrl(req.form.values[key])) { | ||
| return validationErrorFunc('notUrl'); | ||
| } | ||
| } | ||
|
|
||
| if (key === 'premises-address-line-2') { | ||
| if (req.form.values[key]?.length > 250) { | ||
| return validationErrorFunc('maxlength'); | ||
| } | ||
| if (!validators.notUrl(req.form.values[key])) { | ||
| return validationErrorFunc('notUrl'); | ||
| } | ||
| } | ||
|
|
||
| if (key === 'premises-town-or-city') { | ||
| if (!validators.required(req.form.values[key])) { | ||
| return validationErrorFunc('required'); | ||
| } | ||
| if (req.form.values[key]?.length > 250) { | ||
| return validationErrorFunc('maxlength'); | ||
| } | ||
| if (!validators.notUrl(req.form.values[key])) { | ||
| return validationErrorFunc('notUrl'); | ||
| } | ||
| } | ||
|
|
||
| if (key === 'premises-postcode') { | ||
| if (!validators.required(req.form.values[key])) { | ||
| return validationErrorFunc('required'); | ||
| } | ||
| if (req.form.values[key]?.length > 250) { | ||
| return validationErrorFunc('maxlength'); | ||
| } | ||
| if (!validators.notUrl(req.form.values[key])) { | ||
| return validationErrorFunc('notUrl'); | ||
| } | ||
|
|
||
| if (!validators.postcode(req.form.values[key])) { | ||
| return validationErrorFunc('postcode'); | ||
| } | ||
| } | ||
|
|
||
| if(key === 'premises-telephone') { | ||
| if (!validators.required(req.form.values[key])) { | ||
| return validationErrorFunc('required'); | ||
| } | ||
|
|
||
| if (req.form.values[key]?.length < 8 || req.form.values[key]?.length > 16) { | ||
| return validationErrorFunc('maxlength'); | ||
| } | ||
|
|
||
| if (!validators.ukPhoneNumber(req.form.values[key])) { | ||
| return validationErrorFunc('ukPhoneNumber'); | ||
| } | ||
| } | ||
|
|
||
| if(key === 'premises-email') { | ||
| if (!validators.required(req.form.values[key])) { | ||
| return validationErrorFunc('required'); | ||
| } | ||
|
|
||
| if (req.form.values[key]?.length < 6 || req.form.values[key]?.length > 256) { | ||
| return validationErrorFunc('maxlength'); | ||
| } | ||
|
|
||
| if (!validators.email(req.form.values[key])) { | ||
| return validationErrorFunc('email'); | ||
| } | ||
| } |
There was a problem hiding this comment.
Technically, we can keep everything in this file, but it would be better to keep it in fields/index if it doesn't require any custom validation. I suggest to move it.
Although it would be useful to keep this custom-validation behaviour, as it will be used later
Comment on lines
61
to
63
| if (req.form.values[key]?.length < 8 || req.form.values[key]?.length > 16) { | ||
| return validationErrorFunc('maxlength'); | ||
| } |
There was a problem hiding this comment.
This is a redundant check, discussion has been held with UCD team to drop this as ukPhoneNumber will cover this.
|
|
||
| {{#input-submit}}continue{{/input-submit}} | ||
| {{/page-content}} | ||
| {{/partials-page}} |
dk4g
approved these changes
Nov 19, 2024
dk4g
changed the base branch from
main
to
feature/CSL-4-about-the-applicants
vinodhasamiyappanHO
approved these changes
Nov 20, 2024
RobertMcCann
merged commit 2e70f8d
into
feature/CSL-4-about-the-applicants
2 checks passed
2 tasks
dk4g
added a commit
that referenced
this pull request
Nov 27, 2024
* CSL-20-premises-address-contact-details (#3) * CSL 13 - PCA - Added Licence holder details and address page (#7) * CSL-21: PCA - Responsible officer details (#6) * CSL-18: Guarantor details (#13) * CSL 28- PCA - Added new pages received criminal convictions, Invoicing address and contact details (#14) --------- Co-authored-by: Vinodha Samiyappan <155738658+vinodhasamiyappanHO@users.noreply.github.com> Co-authored-by: dk4g <157156245+dk4g@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Relates CSL-20
What?
add premises address page
add premises contact details page
Why?
How?
Testing?
Screenshots (optional)
Anything Else? (optional)
Check list