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

Add link to github diff on JobRequest detail page #4130

Merged
merged 15 commits into from Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions jobserver/views/job_requests.py
Expand Up @@ -235,6 +235,15 @@ def get(self, request, *args, **kwargs):

is_missing_updates = incomplete and over_30_minutes_ago

previous_jobrequest = JobRequest.objects.previous(job_request)
code_compare_url = (
job_request.workspace.repo.get_compare_url(
previous_jobrequest.sha, job_request.sha
)
if previous_jobrequest
else None
)

context = {
"honeycomb_can_view_links": honeycomb_can_view_links,
"honeycomb_links": {},
Expand All @@ -243,6 +252,7 @@ def get(self, request, *args, **kwargs):
"job_request": job_request,
"jobs": jobs,
"project_yaml": self.get_project_yaml(job_request),
"code_compare_url": code_compare_url,
"user_can_cancel_jobs": can_cancel_jobs,
"view": self,
}
Expand Down
14 changes: 14 additions & 0 deletions templates/job_request/detail.html
Expand Up @@ -298,6 +298,20 @@ <h1 class="text-3xl tracking-tight break-words font-bold text-slate-900 sm:text-
</dl>
{% /card %}

{% #card title="Code comparison" subtitle="Compare the code used in this Job Request" %}
{% #list_group small=True %}
{% if code_compare_url %}
{% #list_group_item href=code_compare_url %}
Compare to the previous Job Request
{% /list_group_item %}
{% else %}
{% #list_group_item disabled=True small=True %}
No previous job requests available for comparison
Jongmassey marked this conversation as resolved.
Show resolved Hide resolved
{% /list_group_item %}
{% endif %}
{% /list_group %}
{% /card %}

{% if honeycomb_can_view_links %}
{% #card title="Monitoring" subtitle="Honeycomb login required" %}
{% #list_group small=True %}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/jobserver/views/test_job_requests.py
Expand Up @@ -922,7 +922,7 @@ def test_jobrequestdetail_with_permission(
request = rf.get("/")
request.user = user

with django_assert_num_queries(8):
with django_assert_num_queries(9):
response = JobRequestDetail.as_view()(
request,
project_slug=job_request.workspace.project.slug,
Expand Down