Skip to content

chore: move public comment above internal comment #1543

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.

Sign up for GitHub

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
TCMeldrum merged 5 commits into from
Jul 13, 2026
Merged

chore: move public comment above internal comment #1543

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9eff1e
chore: move public comment above internal comment
TCMeldrum May 27, 2026
688bb43
Merge branch 'develop' into 1601-move-public-comment-above-internal
TCMeldrum Jun 2, 2026
2d7d2d3
Merge branch 'develop' into 1601-move-public-comment-above-internal
TCMeldrum Jun 22, 2026
edf5301
Merge branch 'develop' into 1601-move-public-comment-above-internal
TCMeldrum Jul 9, 2026
3431df2
Merge branch 'develop' into 1601-move-public-comment-above-internal
TCMeldrum Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions ...y/questionaryComponents/TechnicalReviewBasis/QuestionaryComponentTechnicalReviewBasis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,45 @@ function QuestionaryComponentTechnicalReviewBasis(props: BasicComponentProps) {
}}
/>
</Grid>
<Grid item xs={12}>
<InputLabel
htmlFor="publicComment"
margin="dense"
sx={{ fontWeight: 'bold', color: 'text.primary' }}
>
{`Comments to be seen by the ${t('FAP')} panels`}
</InputLabel>
<Editor
id="publicComment"
initialValue={state?.technicalReview.publicComment || ''}
value={localPublicComment}
init={{
skin: false,
content_css: false,
plugins: ['link', 'preview', 'code', 'charmap', 'wordcount'],
toolbar: 'bold italic',
branding: false,
}}
onEditorChange={(content, editor) => {
const isStartContentDifferentThanCurrent =
editor.startContent !==
editor.contentDocument.body.innerHTML;

if (isStartContentDifferentThanCurrent || editor.isDirty()) {
setLocalPublicComment(content);
}
}}
onBlur={() =>
dispatch({
type: 'ITEM_WITH_QUESTIONARY_MODIFIED',
itemWithQuestionary: {
publicComment: localPublicComment,
},
})
}
disabled={shouldDisableForm}
/>
</Grid>
{(isUserOfficer ||
isInstrumentScientist ||
fapSecOrChairCanEdit) && (
Expand Down Expand Up @@ -251,45 +290,6 @@ function QuestionaryComponentTechnicalReviewBasis(props: BasicComponentProps) {
/>
</Grid>
)}
<Grid item xs={12}>
<InputLabel
htmlFor="publicComment"
margin="dense"
sx={{ fontWeight: 'bold', color: 'text.primary' }}
>
{`Comments be seen by the ${t('FAP')} panels`}
</InputLabel>
<Editor
id="publicComment"
initialValue={state?.technicalReview.publicComment || ''}
value={localPublicComment}
init={{
skin: false,
content_css: false,
plugins: ['link', 'preview', 'code', 'charmap', 'wordcount'],
toolbar: 'bold italic',
branding: false,
}}
onEditorChange={(content, editor) => {
const isStartContentDifferentThanCurrent =
editor.startContent !==
editor.contentDocument.body.innerHTML;

if (isStartContentDifferentThanCurrent || editor.isDirty()) {
setLocalPublicComment(content);
}
}}
onBlur={() =>
dispatch({
type: 'ITEM_WITH_QUESTIONARY_MODIFIED',
itemWithQuestionary: {
publicComment: localPublicComment,
},
})
}
disabled={shouldDisableForm}
/>
</Grid>
</Grid>
</Box>
</div>
Expand Down
Loading