From 54661318302f87d46141d0ebd03b88b25f78fe0d Mon Sep 17 00:00:00 2001
From: sekharpanja <sekhar.panja@digital.trade.gov.uk>
Date: Fri, 20 Sep 2024 12:07:09 +0100
Subject: [PATCH] fixup! show build log url when containers fails to build

---
 dataworkspace/dataworkspace/apps/core/views.py        | 11 ++++++++---
 .../dataworkspace/templates/errors/error_500.html     |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dataworkspace/dataworkspace/apps/core/views.py b/dataworkspace/dataworkspace/apps/core/views.py
index 1113d3d255..e2a510da74 100644
--- a/dataworkspace/dataworkspace/apps/core/views.py
+++ b/dataworkspace/dataworkspace/apps/core/views.py
@@ -125,9 +125,9 @@ def public_error_500_html_view(request):
 
 def public_error_500_application_view(request):
     app_id = request.GET.get("application_id", "")
+    build_log = None
     if app_id != "":
         application = ApplicationInstance.objects.get(pk=app_id)
-        build_log = None
         if request.GET.get("show_build_log", False):
             build_log = f"{settings.GITLAB_URL}/deployment/docker-ecr/-/jobs/{application.spawner_application_instance_id}"
         if application.application_template.include_in_dw_stats:
@@ -139,11 +139,16 @@ def public_error_500_application_view(request):
                     "tool": application.application_template.nice_name,
                     "started": application.spawner_created_at,
                     "failure_message": request.GET.get("failure_message", None),
-                    "build_log_url": build_log,
                 },
             )
     return render(
-        request, "errors/error_500.html", {"message": request.GET.get("message", None)}, status=500
+        request,
+        "errors/error_500.html",
+        {
+            "message": request.GET.get("message", None),
+            "build_log": build_log
+        },
+        status=500
     )
 
 
diff --git a/dataworkspace/dataworkspace/templates/errors/error_500.html b/dataworkspace/dataworkspace/templates/errors/error_500.html
index 0db9030f4c..f20395fb0f 100644
--- a/dataworkspace/dataworkspace/templates/errors/error_500.html
+++ b/dataworkspace/dataworkspace/templates/errors/error_500.html
@@ -11,6 +11,10 @@ <h1 class="govuk-heading-xl">Sorry, there is a problem with the service</h1>
             <p class="govuk-body">{{ message }}</p>
         {% endif %}
 
+        {% if build_log %}
+            <p class="govuk-body">{{ build_log }}</p>
+        {% endif %}
+
         <p class="govuk-body">Please try again.</p>
 
         <p class="govuk-body">If the problem continues, please <a class="govuk-link" href="{% url 'support' %}">contact the Data Workspace Support Team</a>.</p>