Skip to content

fix: always show the GitHub endpoint selection #401

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: always show the GitHub endpoint selection #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ public String getIconClassName() {
}

@SuppressWarnings("unused") // jelly
@Deprecated
public boolean isApiUriSelectable() {
return !GitHubConfiguration.get().getEndpoints().isEmpty();
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,6 +1868,7 @@ static ListBoxModel getPossibleApiUriItems() {
* @return {@code true} if there is more than one GitHub endpoint configured.
*/
@SuppressWarnings("unused") // jelly
@Deprecated
public boolean isApiUriSelectable() {
return !GitHubConfiguration.get().getEndpoints().isEmpty();
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2249,6 +2249,7 @@ public ListBoxModel doFillApiUriItems() {
return result;
}

@Deprecated
public boolean isApiUriSelectable() {
return !GitHubConfiguration.get().getEndpoints().isEmpty();
}
Expand Down
13 changes: 3 additions & 10 deletions ...in/resources/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,9 @@
<f:textbox/>
</f:entry>
<j:choose>
<j:when test="${descriptor.apiUriSelectable}">
<f:entry title="${%API endpoint}" field="apiUri">
<f:select/>
</f:entry>
</j:when>
<j:otherwise>
<f:invisibleEntry>
<f:select field="apiUri"/>
</f:invisibleEntry>
</j:otherwise>
<f:entry title="${%API endpoint}" field="apiUri">
<f:select/>
</f:entry>
</j:choose>

<f:entry title="${%Key}" field="privateKey">
Expand Down
1 change: 1 addition & 0 deletions ...esources/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials/help-apiUri.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<p>
<a href="https://developer.github.com/v3/">GitHub API</a> endpoint such as <code>https://github.example.com/api/v3/</code>.
The list of servers is configured in the <strong>Manage Jenkins » Configure System » GitHub Enterprise Servers</strong> screen.
</p>
15 changes: 3 additions & 12 deletions ...main/resources/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:scm="/jenkins/scm/api/form">
<j:choose>
<j:when test="${descriptor.apiUriSelectable}">
<f:entry title="${%API endpoint}" field="apiUri">
<f:select/>
</f:entry>
</j:when>
<j:otherwise>
<f:entry title="${%API endpoint}" field="apiUri">
<f:textbox readonly="readonly"/>
</f:entry>
Comment on lines -11 to -13
Copy link
Member

Choose a reason for hiding this comment

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

Would resolve https://issues.jenkins.io/browse/JENKINS-76052

</j:otherwise>
</j:choose>
<f:entry title="${%API endpoint}" field="apiUri">
<f:select/>
</f:entry>
Comment on lines +4 to +6
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm pretty sure this drop down will also include github.com if the endpoint list is empty. Or did that change at some point?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it does not include github.com

<f:entry title="${%Credentials}" field="credentialsId">
<c:select checkMethod="post"/>
</f:entry>
Expand Down
4 changes: 2 additions & 2 deletions .../resources/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator/help-apiUri.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div>
The server to connect to. The list of servers is configured in the <strong>Manage Jenkins » Configure
System » GitHub Enterprise Servers</strong> screen.
<a href="https://developer.github.com/v3/">GitHub API</a> endpoint such as <code>https://github.example.com/api/v3/</code>.
The list of servers is configured in the <strong>Manage Jenkins » Configure System » GitHub Enterprise Servers</strong> screen.
</div>
10 changes: 3 additions & 7 deletions .../resources/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource/config-detail.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@
</f:radioBlock>
<f:radioBlock name="configuredByUrlRadio" value="false" checked="false" title="${%Repository Scan - Deprecated Visualization}" inline="true">
<f:nested>
<j:choose>
<j:when test="${descriptor.apiUriSelectable}">
<f:entry title="${%API endpoint}" field="apiUri">
<f:select/>
</f:entry>
</j:when>
</j:choose>
<f:entry title="${%API endpoint}" field="apiUri">
<f:select/>
</f:entry>
<f:entry title ="${%Owner}" field="repoOwner">
<f:textbox/>
</f:entry>
Expand Down
4 changes: 2 additions & 2 deletions ...ain/resources/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource/help-apiUri.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div>
The server to connect to. The list of servers is configured in the <strong>Manage Jenkins » Configure
System » GitHub Enterprise Servers</strong> screen.
<a href="https://developer.github.com/v3/">GitHub API</a> endpoint such as <code>https://github.example.com/api/v3/</code>.
The list of servers is configured in the <strong>Manage Jenkins » Configure System » GitHub Enterprise Servers</strong> screen.
</div>
Loading