feat: error if /made links added to help text #4246
Conversation
|
Removed vultr server and associated DNS entries |
| text, | ||
| }: { | ||
| marks: | ||
| | { |
There was a problem hiding this comment.
What's this part of the interface doing ? it's a union of some keys or undefined?
There was a problem hiding this comment.
You mean the | character at the start? It's just a union of the two types (the object of keys and undefined), but syntactically looks neater when there is the extra | so that everything is nicely in line :) Otherwise they might be at jaunty angles. My editor puts the extra character in automatically in this case
| @@ -98,6 +99,18 @@ const NodeTypeSelect: React.FC<{ | |||
| ); | |||
| }; | |||
|
|
|||
| const containsMadeLink = (data: any) => { | |||
| // An anchor tag where the href attribute ends with '/made' | |||
| const regexPattern = /<a[^>]*href=["'].*?\/made["'][^>]*>/; | |||
There was a problem hiding this comment.
The matching logic here is not consistent with what you've implemented below in getLegislationLinkError - for example, I can currently trigger this toast with any link ending in /made regardless if it's a www.legislation.gov.uk domain (which is also extra confusing as a user because I won't have the input-level warning icon) ! Can we bring them into sync?
There was a problem hiding this comment.
Thanks for noticing this Jess, you're totally right. This is fixed now!
I also realised my original function was a little too strict so have allowed for e.g. https://legislation.gov.uk... (without the www).
jamdelion
changed the title
There was a problem hiding this comment.
Thanks for picking this one up!
✔️ RichTextInput errors working exactly as expected on pizza (shows warning icon for urls, detects issues if multiple links are present, layers errors if open-in-new-tab issue is also present)
🐛 One issue spotted with how the Toast is identifying links though to please address!
➕ I agree that, for now at least, this is the only error serious enough to prevent continuing per your PR question so we can mitigate need to ever repeat this content migration.
| @@ -98,6 +99,18 @@ const NodeTypeSelect: React.FC<{ | |||
| ); | |||
| }; | |||
|
|
|||
| const containsMadeLink = (data: any) => { | |||
| // An anchor tag where the href attribute ends with '/made' | |||
| const regexPattern = /<a[^>]*href=["'].*?\/made["'][^>]*>/; | |||
There was a problem hiding this comment.
The matching logic here is not consistent with what you've implemented below in getLegislationLinkError - for example, I can currently trigger this toast with any link ending in /made regardless if it's a www.legislation.gov.uk domain (which is also extra confusing as a user because I won't have the input-level warning icon) ! Can we bring them into sync?
editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx
Outdated
Show resolved
Hide resolved
| text?: string; | ||
| }) => boolean | undefined; | ||
| errorMessage: string; | ||
| } |
There was a problem hiding this comment.
This is a handy, clear type 👍
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
🎟️ Trello ticket: https://trello.com/c/Sv8IfEVi/3206-add-validation-to-editor-modals-to-prevent-made-policy-reference-links-from-being-added-to-help-text
What does this PR do?
RichTextInput, similar to the pre-existinggetLinkNewTabError. When a link in the RichTextInput breaks this rule, a warning icon appears on the right side of the input:FormModal.tsxto prevent form submission if the data was found to contain a link ending in/made.Questions
/madelinks I decided yes because I think it's worth trying to reduce the number of data migrations we do!)