From 3ecc7f6bee3af8e2a84dea073af348f8f1227772 Mon Sep 17 00:00:00 2001
From: Gregor Lasnibat <gregor@scinote.net>
Date: Thu, 29 Feb 2024 13:51:12 +0100
Subject: [PATCH] (fix) Content from previous file persists on 'Match the
 columns' page after canceling upload [SCI-10204]

---
 app/assets/javascripts/repositories/show.js     | 17 ++++++++++++++++-
 .../_import_repository_records_modal.html.erb   |  2 +-
 .../repositories/_parse_records_modal.html.erb  |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/repositories/show.js b/app/assets/javascripts/repositories/show.js
index 091d42d76..d07c061df 100644
--- a/app/assets/javascripts/repositories/show.js
+++ b/app/assets/javascripts/repositories/show.js
@@ -33,6 +33,15 @@
       $('#parse-records-modal').modal('show');
       repositoryRecordsImporter();
     });
+
+    // Handling cancel click in #parse-records-modal
+    $('#parse-records-modal').on('click', '#parse-records-cancel-btn', () => {
+      $('#parse-records-modal').modal('hide');
+      // remove previous modal (necessary to get the new relevant data instead of old data)
+      setTimeout(() => {
+        $('#parse-records-modal').remove();
+      }, 200);
+    });
   }
 
   function initTable() {
@@ -56,7 +65,7 @@
                                          data.responseJSON.message + '</span>');
     });
 
-    submitBtn.on('click', function(event) {
+    submitBtn.one('click', (event) => {
       var data = new FormData();
       submitBtn.attr('disabled', true);
       $('#parse-sheet-loader').removeClass('hidden');
@@ -79,8 +88,14 @@
   function initImportRecordsModal() {
     $('.repository-show').on('click', '#importRecordsButton', function() {
       $('#modal-import-records').modal('show');
+      $('#modal-import-records').find('#file').val('');
       initParseRecordsModal();
     });
+
+    // Handling cancel click in #modal-import-records
+    $('#modal-import-records').on('click', '#import-records-cancel-btn', () => {
+      $('#modal-import-records').modal('hide');
+    });
   }
 
   $('.repository-title-name .inline-editing-container').on('inlineEditing::updated', function(e, value, viewValue) {
diff --git a/app/views/repositories/_import_repository_records_modal.html.erb b/app/views/repositories/_import_repository_records_modal.html.erb
index 0345c81dc..fc2ab3cc1 100644
--- a/app/views/repositories/_import_repository_records_modal.html.erb
+++ b/app/views/repositories/_import_repository_records_modal.html.erb
@@ -23,7 +23,7 @@
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary close-button" data-dismiss="modal"><%= t('general.cancel')%></button>
+        <button id="import-records-cancel-btn" type="button" class="btn btn-secondary close-button"><%= t('general.cancel')%></button>
         <input type="submit" class="btn btn-success" value="<%= t("repositories.modal_import.upload") %>">
       </div>
       <% end %>
diff --git a/app/views/repositories/_parse_records_modal.html.erb b/app/views/repositories/_parse_records_modal.html.erb
index 8834096cc..0478d4b6d 100644
--- a/app/views/repositories/_parse_records_modal.html.erb
+++ b/app/views/repositories/_parse_records_modal.html.erb
@@ -71,7 +71,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.cancel')%></button>
+        <button id="parse-records-cancel-btn" type="button" class="btn btn-secondary"><%= t('general.cancel')%></button>
         <input type="submit" class="btn btn-success" value="<%= t('repositories.modal_parse.import') %>">
       </div>
       <% end %>