From 282badb127e8256b0b9d9349ea8d12e9ec16f296 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Wed, 16 Sep 2026 13:48:34 -0500
Subject: BugFix: Fix bugs in the common code.

---
 uploader/static/js/files.js                               | 15 +++++++--------
 .../templates/phenotypes/add-phenotypes-raw-files.html    |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/uploader/static/js/files.js b/uploader/static/js/files.js
index 7cb3d0e..23da135 100644
--- a/uploader/static/js/files.js
+++ b/uploader/static/js/files.js
@@ -84,7 +84,8 @@ var errorHandler = makeResumableHandler("error");
 var markResumableDragAndDropElement = (resumable, fileinput, droparea, browsebutton) => {
     if(resumable.support) {
         //Hide file input element and display drag&drop UI
-        add_class(fileinput, "visually-hidden");
+        add_class(
+            fileinput.closest(".non-resumable-elements"), "visually-hidden");
         remove_class(droparea, "visually-hidden");
 
         // Define UI elements for browse and drag&drop
@@ -96,7 +97,7 @@ var markResumableDragAndDropElement = (resumable, fileinput, droparea, browsebut
 };
 
 
-var makeResumableElement = (targeturi, fileinput, droparea, uploadbutton, filetype) => {
+var makeResumableElement = (targeturi, droparea, filetype) => {
     var resumable = Resumable({
         target: targeturi,
         fileType: filetype,
@@ -276,9 +277,9 @@ var uploadSuccess = (file_input_name) => {
 };
 
 
-var uploadError = () => {
+var uploadError = (submitButton) => {
     return (message, file) => {
-        $("#frm-add-phenotypes input[type=submit]").removeAttr("disabled");
+        submitButton.removeAttr("disabled");
         console.log("THE FILE:", file);
         console.log("THE ERROR MESSAGE:", message);
     };
@@ -298,11 +299,9 @@ var makeResumableObject = (form_id, file_input_id, resumable_element_id, preview
                     markResumableDragAndDropElement(
                         makeResumableElement(
                             the_form.attr("data-resumable-target"),
-                            file_input.parent(),
                             $("#" + resumable_element_id),
-                            submit_button,
                             filetypes),
-                        file_input.parent(),
+                        file_input,
                         $("#" + resumable_element_id),
                         $("#" + resumable_element_id + "-browse-button")),
                     (files) => {
@@ -322,7 +321,7 @@ var makeResumableObject = (form_id, file_input_id, resumable_element_id, preview
                             $("#" + resumable_element_id + "-retry-button"),
                             $("#" + resumable_element_id + "-cancel-button"))),
             uploadSuccess(file_input.attr("name"))),
-        uploadError());
+        uploadError(submit_button));
 
     /** Setup progress indicator **/
     progressHandler(
diff --git a/uploader/templates/phenotypes/add-phenotypes-raw-files.html b/uploader/templates/phenotypes/add-phenotypes-raw-files.html
index b1322b2..79556cf 100644
--- a/uploader/templates/phenotypes/add-phenotypes-raw-files.html
+++ b/uploader/templates/phenotypes/add-phenotypes-raw-files.html
@@ -717,9 +717,7 @@
                       markResumableDragAndDropElement(
                           makeResumableElement(
                               the_form.attr("data-resumable-target"),
-                              file_input.parent(),
                               $("#" + resumable_element_id),
-                              submit_button,
                               ["csv", "tsv", "txt"]),
                           file_input.parent(),
                           $("#" + resumable_element_id),
-- 
cgit 1.4.1