Skip to content
Snippets Groups Projects
Commit c58d2779 authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

fix: Update GH revalidation logic to use new split repo + org name params

Missed in original change set to resolve an issue with path encoding. This change fixes the revalidation UI to use the proper values as used in the rest of the back end which are now split.

Resolves eclipsefdn/helpdesk#5272
parent c673bf88
No related branches found
No related tags found
1 merge request!212fix: Update GH revalidation logic to use new split repo + org name params
Pipeline #59024 passed
......@@ -120,7 +120,8 @@ public class StatusResource extends CommonResource {
.entity(statusUiTemplate
.data(COMMIT_STATUSES_PARAMETER, statuses)
.data(PULL_REQUEST_NUMBER_PARAMETER, null)
.data("fullRepoName", null)
.data("repoName", null)
.data("orgName", null)
.data("project", ps.isEmpty() ? null : ps.get(0))
.data(REPO_URL_PARAMETER, statuses.get(0).getRepoUrl())
.data("installationId", null)
......@@ -144,8 +145,6 @@ public class StatusResource extends CommonResource {
@Path("gh/{org}/{repoName}/{prNo}")
public Response getCommitValidationForGithub(@PathParam("org") String org, @PathParam("repoName") String repoName,
@PathParam("prNo") Integer prNo) {
// get the repo full name, used in a few lookups
String repoFullName = org + '/' + repoName;
// generate the URL used to retrieve valid projects
String repoUrl = GithubValidationHelper.getRepoUrl(org, repoName);
......@@ -197,7 +196,8 @@ public class StatusResource extends CommonResource {
.entity(statusUiTemplate
.data(COMMIT_STATUSES_PARAMETER, statuses)
.data(PULL_REQUEST_NUMBER_PARAMETER, prNo)
.data("fullRepoName", repoFullName)
.data("repoName", repoName)
.data("orgName", org)
.data("project", ps.isEmpty() ? null : ps.get(0))
.data(REPO_URL_PARAMETER, repoUrl)
.data("installationId", installationId)
......
......@@ -71,9 +71,9 @@
NO
{/if}
</li>
{#if fullRepoName ne null && pullRequestNumber ne null && statuses.0.provider == ProviderType:GITHUB}
{#if orgName ne null && repoName ne null && pullRequestNumber ne null && statuses.0.provider == ProviderType:GITHUB}
<li>
<strong>Pull request:</strong> <a class="underline" href="https://github.com/{fullRepoName}/pull/{pullRequestNumber}" target="_blank" >#{pullRequestNumber}</a>
<strong>Pull request:</strong> <a class="underline" href="https://github.com/{orgName}/{repoName}/pull/{pullRequestNumber}" target="_blank" >#{pullRequestNumber}</a>
</li>
{/if}
</ul>
......@@ -162,9 +162,9 @@
</div>
</div>
{/if}
{#if statuses.0.provider == ProviderType:GITHUB && pullRequestNumber != null && fullRepoName != null}
{#if statuses.0.provider == ProviderType:GITHUB && pullRequestNumber != null && repoName != null && orgName != null}
<div>
<form id="git-eca-hook-revalidation" data-request-number="{pullRequestNumber}" data-request-repo="{fullRepoName}" data-request-installation="{installationId}">
<form id="git-eca-hook-revalidation" data-request-number="{pullRequestNumber}" data-request-repo="{repoName}" data-request-org="{orgName}" data-request-installation="{installationId}">
<div class="captcha">
<div class="h-captcha" data-sitekey="{config:['eclipse.hcaptcha.site-key']}"></div>
</div>
......@@ -302,7 +302,8 @@
$submitButton.attr("disabled", "disabled");
// set up params to set up for revalidation
let params = $.param({
repo_full_name: $form.data('request-repo'),
repo_name: $form.data('request-repo'),
org: $form.data('request-org'),
pull_request_number: $form.data('request-number'),
installation_id: $form.data('request-installation')
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment