Bug/roe 2018 roe 1507 fix duplication of trust #717
Conversation
…or add trust controller
|
Committed a fix for:
|
|
Latest commit is a fix for:
|
| @@ -74,7 +74,7 @@ export function checkTrustValidations(req: Request, res: Response, next: NextFun | |||
| ...req.body, | |||
| beneficialOwners: getBeneficialOwnerList(appData), | |||
| trusts_input: req.body.trusts?.toString(), | |||
| trustsAddedSoFar: req.body.trusts, | |||
| trustsAddedSoFar: (appData.trusts) ? appData.trusts : [], | |||
There was a problem hiding this comment.
Given that it seems to be only the number of trusts (or zero) that is required by the view, could this line be changed to:
trustsAddedSoFar: (appData.trusts) ? appData.trusts.length : 0,
And then the view logic changed accordingly?
| @@ -42,6 +42,7 @@ export enum ErrorMessages { | |||
|
|
|||
| // Trusts | |||
| TRUST_DATA_EMPTY = "Paste the trust information from the Excel document into the box", | |||
| TRUST_DATA_INVALID_FORMAT = "Format of trust information is invalid", | |||
There was a problem hiding this comment.
So we'll need to check the content of this message with UX or an analyst.
views/trust-information.html
Outdated
| @@ -16,7 +16,11 @@ | |||
|
|
|||
| {% set trustAdded %} | |||
| {% if errors and trustsAddedSoFar %} | |||
| ({{trustsAddedSoFar.length}} Trust information added so far) | |||
| {% if trustsAddedSoFar.length > 0 %} | |||
| ({{trustsAddedSoFar.length}} Trust information added so far) | |||
There was a problem hiding this comment.
And this output is the other part that needs checking with UX.
| @@ -33,6 +33,10 @@ export const post = async (req: Request, res: Response, next: NextFunction) => { | |||
| try { | |||
| logger.debugRequest(req, `POST ${config.TRUST_INFO_PAGE}`); | |||
|
|
|||
| if (req.body.submit) { | |||
There was a problem hiding this comment.
looks like moving the submit redirect here means that it will ignore json posted in the json field on teh page and won't add it to the model. This is different behaviour from what was there previously, it might be ok, we'll have to check with the PO tomorrow in the office. It also allows us to move to the check your answers screen with 0 trusts added, so perhaps we should only allow the user to move forward if there is at least one trust in the model/session data. Can discuss in office tomorrow.
src/validation/custom.validation.ts
Outdated
| return action === "submit" && (appData.trusts || [] ).length > 0; | ||
| }; | ||
|
|
||
| export const checkTrustBO = (req) => { |
There was a problem hiding this comment.
I think method name should be checkTrustBOs. It's called from the validator and is linked to the "beneficialOwners" field.
|
Updated to hide submit button when 0 trusts are added. |
|
SonarQube Quality Gate
|
JIRA link
Resolves ROE-1507
Change description
Work checklist