Skip to content
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.

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

[JENKINS-69489] - Hide restart checkbox if the controller doesn't support it #7740

Merged
merged 2 commits into from
Mar 20, 2023

Conversation

NotMyFault
Copy link
Member

@NotMyFault NotMyFault commented Mar 17, 2023

See JENKINS-69489.

I refactored the existing code a bit to use a Jenkins checkbox rather than labels and inputs and to display the checkbox only, if the controller can be restarted that way through the update center. Instead of displaying a label regardless, the if block above.

Testing done

Looks and works like that on macOS:

Screenshot 2023-03-17 at 09 59 26

Testing on a Windows VM doesn't show the checkbox. As noted by James, Windows controllers don't support that:

Screenshot 2023-03-17 at 10 06 23

Proposed changelog entries

  • Hide 'Restart Jenkins' checkbox in the update center, if the controller doesn't support it.

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples).
    • Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@NotMyFault NotMyFault added regression-fix Pull request that fixes a regression in one of the previous Jenkins releases web-ui The PR includes WebUI changes which may need special expertise labels Mar 17, 2023
@NotMyFault NotMyFault requested a review from a team March 17, 2023 09:15
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@NotMyFault NotMyFault requested a review from a team March 18, 2023 18:00
@timja
Copy link
Member

timja commented Mar 18, 2023

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Mar 18, 2023
@NotMyFault NotMyFault merged commit 1f382cb into jenkinsci:master Mar 20, 2023
krisstern pushed a commit to krisstern/jenkins that referenced this pull request Apr 18, 2023
…port it (jenkinsci#7740)

[JENKINS-69489] Hide restart checkbox if the controller doesn't support it

(cherry picked from commit 1f382cb)
</j:if>
<j:if test="${!app.isQuietingDown() and !it.isRestartScheduled()}">
<input id="scheduleRestartCheckbox" type="checkbox" />
<f:checkbox readonly="true" id="scheduleRestartCheckbox" name="scheduleRestart" title="${%warning}" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NotMyFault Why did you (attempt to) make the checkbox here readonly? It doesn't work because 4cac031#diff-6fbee721e02514a54ede8e6e5ed37d3af538239842117a33b7ee905b0a518c81R6 is wrong. Asking because I want to fix my bug and want to ensure I'm not introducing a different one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, actually. I think the attribute is obsolete and can be removed, given the if-condition represents the default state and the checkbox should work here.

@NotMyFault NotMyFault deleted the update-center-checkbox-fix branch August 23, 2023 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback regression-fix Pull request that fixes a regression in one of the previous Jenkins releases web-ui The PR includes WebUI changes which may need special expertise
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants