Background Jobs: Move feature to new UI templates.

5 files changed, 5 insertions, 80 deletions

diff --git a/uploader/background_jobs.py b/uploader/background_jobs.py
index 4e1cd13..2c55272 100644
--- a/uploader/background_jobs.py
+++ b/uploader/background_jobs.py
@@ -15,9 +15,6 @@ from gn_libs import jobs
 from gn_libs import sqlite3
 from gn_libs.jobs.jobs import JobNotFound
 
-
-from uploader.sui import sui_template
-
 from uploader.flask_extensions import url_for
 from uploader.authorisation import require_login
 
@@ -82,7 +79,7 @@ def handler(job: dict, handler_type: str) -> HandlerType:
 
     def __default_success_handler__(_job):
         return render_template(
-            sui_template("background-jobs/default-success-page.html"), job=_job)
+            "background-jobs/default-success-page.html", job=_job)
 
     return __default_success_handler__
 
@@ -107,11 +104,9 @@ def job_status(job_id: uuid.UUID):
             if status == "completed":
                 return success_handler(job)
 
-            return render_template(sui_template("jobs/job-status.html"), job=job)
+            return render_template("jobs/job-status.html", job=job)
         except JobNotFound as _jnf:
-            return render_template(
-                sui_template("jobs/job-not-found.html"),
-                job_id=job_id)
+            return render_template("jobs/job-not-found.html", job_id=job_id)
 
 
 @background_jobs_bp.route("/error/<uuid:job_id>")
@@ -121,7 +116,6 @@ def job_error(job_id: uuid.UUID):
     with sqlite3.connection(app.config["ASYNCHRONOUS_JOBS_SQLITE_DB"]) as conn:
         try:
             job = jobs.job(conn, job_id, fulldetails=True)
-            return render_template(sui_template("jobs/job-error.html"), job=job)
+            return render_template("jobs/job-error.html", job=job)
         except JobNotFound as _jnf:
-            return render_template(sui_template("jobs/job-not-found.html"),
-                                   job_id=job_id)
+            return render_template("jobs/job-not-found.html", job_id=job_id)
diff --git a/uploader/templates/background-jobs/sui-default-success-page.html b/uploader/templates/background-jobs/sui-default-success-page.html
deleted file mode 100644
index 5732456..0000000
--- a/uploader/templates/background-jobs/sui-default-success-page.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{%extends "phenotypes/base.html"%}
-{%from "flash_messages.html" import flash_all_messages%}
-
-{%block title%}Background Jobs: Success{%endblock%}
-
-{%block pagetitle%}Background Jobs: Success{%endblock%}
-
-{%block contents%}
-{{flash_all_messages()}}
-
-<div class="row">
-  <p>Job <strong>{{job.job_id}}</strong>,
-    {%if job.get("metadata", {}).get("job-type")%}
-    of type '<em>{{job.metadata["job-type"]}}</em>
-    {%endif%}' completed successfully.</p>
-</div>
-{%endblock%}
diff --git a/uploader/templates/jobs/sui-job-error.html b/uploader/templates/jobs/sui-job-error.html
deleted file mode 100644
index 1a839a6..0000000
--- a/uploader/templates/jobs/sui-job-error.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{%extends "sui-base.html"%}
-
-{%from "flash_messages.html" import flash_all_messages%}
-
-{%block title%}Background Jobs: Error{%endblock%}
-
-{%block pagetitle%}Background Jobs: Error{%endblock%}
-
-{%block contents%}
-
-<h1>Background Jobs: Error</h1>
-<p>Job <strong>{{job["job_id"]}}</strong> failed!</p>
-<p>The error details are in the "STDERR" section below.</p>
-
-<h2>STDERR</h2>
-<pre>{{job["stderr"]}}</pre>
-{%endblock%}
diff --git a/uploader/templates/jobs/sui-job-not-found.html b/uploader/templates/jobs/sui-job-not-found.html
deleted file mode 100644
index 96c8586..0000000
--- a/uploader/templates/jobs/sui-job-not-found.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{%extends "sui-base.html"%}
-
-{%from "flash_messages.html" import flash_all_messages%}
-
-{%block title%}Background Jobs{%endblock%}
-
-{%block pagetitle%}Background Jobs{%endblock%}
-
-{%block contents%}
-<p>Could not find job with ID: {{job_id}}</p>
-{%endblock%}
diff --git a/uploader/templates/jobs/sui-job-status.html b/uploader/templates/jobs/sui-job-status.html
deleted file mode 100644
index fc5e532..0000000
--- a/uploader/templates/jobs/sui-job-status.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{%extends "sui-base.html"%}
-
-{%from "flash_messages.html" import flash_all_messages%}
-
-{%block extrameta%}
-<meta http-equiv="refresh" content="5" />
-{%endblock%}
-
-{%block title%}Background Jobs{%endblock%}
-
-{%block pagetitle%}Background Jobs{%endblock%}
-
-{%block contents%}
-
-<p>Status: {{job["metadata"]["status"]}}</p>
-<p>Job Type: {{job["metadata"]["job-type"]}}</p>
-
-<h2>STDOUT</h2>
-<pre>{{job["stdout"]}}</pre>
-
-<h2>STDERR</h2>
-<pre>{{job["stderr"]}}</pre>
-
-{%endblock%}