[JENKINS-73885] Remove inline onclick handler from script removal form
#120
Conversation
This file contains 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
yaroslavafenkin
commented
Oct 9, 2024
| e.preventDefault(); | ||
| } | ||
| })); | ||
| }); |
There was a problem hiding this comment.
Content of the script before the change for easier visual comparison:
function confirmDelete(element) {
var name = element.getAttribute('data-name');
if (confirm("Sure you want to delete ["+name+"]?")) {
return true;
}else{
return false;
}
}| removeScriptButtons.forEach(button => button.addEventListener("click", (e) => { | ||
| const name = e.currentTarget.getAttribute('data-name'); | ||
| if (!confirm("Sure you want to delete [" + name + "]?")) { | ||
| e.preventDefault(); |
There was a problem hiding this comment.
We don't have to do anything if confirm is true, just let the form get submitted. If it was cancelled we prevent the form submission. So I thought reverting the if makes sense here.
basil
reviewed
Oct 9, 2024
src/main/resources/org/jenkinsci/plugins/scriptler/ScriptlerManagement/confirm-remove.js
Show resolved
Hide resolved
yaroslavafenkin
added a commit
to yaroslavafenkin/acceptance-test-harness
that referenced
this pull request
Oct 10, 2024
|
ATH passed: jenkinsci/acceptance-test-harness#1778 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://issues.jenkins.io/browse/JENKINS-73885
Testing done
I went to the Scriptler management screen as an admin user, added new script, then removed it. CSP plugin is installed in my Jenkins instance, and it registered multiple CSP violations before the change. After the change the list is clear.
https://www.loom.com/share/690a3867e06a42e7ba160f31701eb38c?sid=2a371698-8b64-4aa2-ad62-83c1d0e9e2ad
https://www.loom.com/share/0336da4251ad4419986f6559771494b7?sid=761d9c6b-69a5-490d-b401-d057646e63cb
Submitter checklist
Link to relevant pull requests, esp. upstream and downstream changes