From a962991759349c152cfc03293f5ce413be9be9d2 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Fri, 25 Apr 2025 12:09:23 -0500 Subject: Fix display of upload errors for samples * Update the uri to fit in with existing paradigm * Pass the species and population to the endpoint --- uploader/samples/views.py | 19 +++++++++++++++---- uploader/templates/samples/upload-failure.html | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'uploader') diff --git a/uploader/samples/views.py b/uploader/samples/views.py index 27e5d3c..c0adb88 100644 --- a/uploader/samples/views.py +++ b/uploader/samples/views.py @@ -221,7 +221,10 @@ def upload_status(species: dict, population: dict, job_id: uuid.UUID, **kwargs): if status == "error": return redirect(url_for( - "species.populations.samples.upload_failure", job_id=job_id)) + "species.populations.samples.upload_failure", + species_id=species["SpeciesId"], + population_id=population["Id"], + job_id=job_id)) error_filename = Path(jobs.error_filename( job_id, f"{app.config['UPLOAD_FOLDER']}/job_errors")) @@ -241,9 +244,14 @@ def upload_status(species: dict, population: dict, job_id: uuid.UUID, **kwargs): species=species, population=population), 400 -@samplesbp.route("/upload/failure/", methods=["GET"]) + +@samplesbp.route("/populations//" + "upload-samples/failure/", + methods=["GET"]) @require_login -def upload_failure(job_id: uuid.UUID): +@with_population(species_redirect_uri="species.populations.samples.index", + redirect_uri="species.populations.samples.select_population") +def upload_failure(species: dict, population: dict, job_id: uuid.UUID, **kwargs): """Display the errors of the samples upload failure.""" job = with_redis_connection(lambda rconn: jobs.job( rconn, jobs.jobsnamespace(), job_id)) @@ -257,4 +265,7 @@ def upload_failure(job_id: uuid.UUID): if stat.st_size > 0: return render_template("worker_failure.html", job_id=job_id) - return render_template("samples/upload-failure.html", job=job) + return render_template("samples/upload-failure.html", + species=species, + population=population, + job=job) diff --git a/uploader/templates/samples/upload-failure.html b/uploader/templates/samples/upload-failure.html index 458ab55..2cf8053 100644 --- a/uploader/templates/samples/upload-failure.html +++ b/uploader/templates/samples/upload-failure.html @@ -15,7 +15,7 @@

Debugging Information

    -
  • job id: {{job.job_id}}
  • +
  • job id: {{job.jobid}}
  • status: {{job.status}}
  • job type: {{job["job-type"]}}
-- cgit v1.2.3