feat(DHIS2-17002): configure text to display before and after section #2812
Conversation
kabaros
force-pushed
the
DHIS2-17002/after-before-section-text
branch
from
2350d5d
to
700a76f
Compare
kabaros
force-pushed
the
DHIS2-17002/after-before-section-text
branch
2 times, most recently
from
abfcdce
to
6771932
Compare
|
@Birkbjo I made this change based on Michael comment about cleaning the HTML on entry - let me know if it looks ok |
kabaros
force-pushed
the
DHIS2-17002/after-before-section-text
branch
from
6771932
to
66a2504
Compare
| @@ -359,6 +361,17 @@ class SectionDialog extends React.Component { | |||
| }); | |||
| }; | |||
|
|
|||
| handleSectionTextUpdate = (fieldName) => (ev, text) => { | |||
| const cleanHtml = DOMPurify.sanitize(text); | |||
There was a problem hiding this comment.
Should we call this in componentWillReceiveProps as well? So that the initial-value is sanitized as well?
Of course this should ideally be done server-side, but this could help if someone opened a section that has been changed through API or some other means (and don't change the text).
Maybe we should extract it to it's own method?
sanitizeDisplayOptions(displayOptions) //could be static or outside, idk
// in this code:
const newDisplayOption = sanitizeDisplayOptions({ displayOptions: { ...this.state.displayOptions, [fieldName]: cleanHtml }})
// componentWillReceiveProps
displayOptions: props.sectionModel.displayOptions
? this.sanitizeDisplayOptions(JSON.parse(props.sectionModel.displayOptions))
: {},If you think it's unnecessary to always sanitize both keys, I'm fine with also sanitizing them directly.
sanitizeText(text)
const newDisplayOptions = {
...this.state.displayOptions,
[fieldName]: sanitize(text)
}
// would make componentWillReceiveProps handling a bit more convoluted thoughJust a bit more convenient to pass the entire thing.
There was a problem hiding this comment.
Disregard my last comment. I think it would be better to just run sanitization in saveSection, right?
| @@ -359,6 +374,15 @@ class SectionDialog extends React.Component { | |||
| }); | |||
| }; | |||
|
|
|||
| handleSectionTextUpdate = (fieldName) => (ev, text) => { | |||
| this.setState({ | |||
There was a problem hiding this comment.
To be pedantic this should use the callback-style for prevValue, right?
Shouldn't really matter, though...
There was a problem hiding this comment.
I don't think this is necessary anymore, just a nice to have - from the docs:
You don’t have to do this, but it’s handy if you want to update state multiple times during the same event.
f22a0a1
to
f9abe6b
Compare
kabaros
force-pushed
the
DHIS2-17002/after-before-section-text
branch
from
f9abe6b
to
f277164
Compare
# [32.27.0](v32.26.2...v32.27.0) (2024-03-18) ### Features * **DHIS2-17002:** configure text to display before and after section ([#2812](#2812)) ([94ba5d3](94ba5d3))
|
🎉 This PR is included in version 32.27.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
…#2812) * feat(DHIS2-17002): configure text to display before and after section * refactor: apply code review comments
This PR adds the ability to configure custom HTML text before and after a section. This implements DHIS2-17002
Related data-entry PR: dhis2/aggregate-data-entry-app#373
text_before_after_section.webm