Disable judgments when timeline is disabled #6459
Closed
Conversation
This file contains hidden or 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
ThiefMaster
reviewed
Aug 8, 2024
Member
|
shouldn't this also be disabled? (saving it failed of course, since it was outdated because i reverted a revision in the other tab) |
Member
Author
indeed it should, I'll fix it |
duartegalvao
commented
Aug 9, 2024
| <Popup | ||
| trigger={ | ||
| <div className="flexrow f-a-center" styleName="judgment-form"> | ||
| <CommentForm onSubmit={createComment} onToggleExpand={setCommentFormVisible} /> |
Member
Author
There was a problem hiding this comment.
I can't find a way to pass a disabled prop to the CommentForm without resetting its state...
Member
There was a problem hiding this comment.
Isn't this what you need here? (didn't bother with proptypes to test this ;))
diff --git a/indico/modules/events/editing/client/js/editing/timeline/CommentForm.jsx b/indico/modules/events/editing/client/js/editing/timeline/CommentForm.jsx
index 2378acd0ba..0da6e66771 100644
--- a/indico/modules/events/editing/client/js/editing/timeline/CommentForm.jsx
+++ b/indico/modules/events/editing/client/js/editing/timeline/CommentForm.jsx
@@ -18,7 +18,7 @@ import {getDetails} from './selectors';
import './CommentForm.module.scss';
-export default function CommentForm({onSubmit, onToggleExpand, initialValues, expanded}) {
+export default function CommentForm({onSubmit, onToggleExpand, initialValues, expanded, disabled}) {
const {canCreateInternalComments} = useSelector(getDetails);
const [commentFormVisible, setCommentFormVisible] = useState(expanded);
@@ -67,7 +67,7 @@ export default function CommentForm({onSubmit, onToggleExpand, initialValues, ex
/>
)}
<Form.Group styleName="submit-buttons" inline>
- <FinalSubmitButton label={Translate.string('Comment')} />
+ <FinalSubmitButton label={Translate.string('Comment')} disabled={disabled} />
<Button
disabled={fprops.submitting}
content={Translate.string('Cancel')}
diff --git a/indico/modules/events/editing/client/js/editing/timeline/ReviewForm.jsx b/indico/modules/events/editing/client/js/editing/timeline/ReviewForm.jsx
index 0817eddea6..2be19abfe6 100644
--- a/indico/modules/events/editing/client/js/editing/timeline/ReviewForm.jsx
+++ b/indico/modules/events/editing/client/js/editing/timeline/ReviewForm.jsx
@@ -102,7 +102,11 @@ export default function ReviewForm() {
<Popup
trigger={
<div className="flexrow f-a-center" styleName="judgment-form">
- <CommentForm onSubmit={createComment} onToggleExpand={setCommentFormVisible} />
+ <CommentForm
+ onSubmit={createComment}
+ onToggleExpand={setCommentFormVisible}
+ disabled={isOutdated}
+ />
{canPerformSubmitterActions && canReview && !editor && (
<>
<span className="comment-or-review">
Member
Author
There was a problem hiding this comment.
thats what I did, at least for me this clears the form when the timeline becomes outdated. not sure why
micsucmed
force-pushed
the
disable-outdated-timeline
branch
from
0c0a8ee to
17b400b
Compare
Improve notification placement
github-project-automation
bot
moved this from Under Review
to Done 🚀
in JACoW suggestions to Indico
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR disables all editing actions on the timeline when it is detected that it became outdated, avoiding errors due to editing actions on the wrong revision.
