From 1f5ff5dd5afdb647677d3d931d044dc6160ce7c6 Mon Sep 17 00:00:00 2001
From: = <mcdeweykp@gmail.com>
Date: Sat, 14 Sep 2024 13:02:19 -0400
Subject: [PATCH 1/2] Fix logic in bedrock server import frontend

---
 .../templates/server/bedrock_wizard.html      | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 7c4789f7..e7d7346a 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -498,24 +498,19 @@
 <script src="../../static/assets/js/shared/upload.js"></script>
 <script>
   document.getElementById("root_upload_button").addEventListener("click", function (event) {
-    if (file) {
-      upload = true;
-      if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-        document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir"><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-      } else {
-        document.getElementById('root_upload_button').classList.add('clicked')
-      }
-      const token = getCookie("_xsrf");
-      var dialog = bootbox.dialog({
-        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-        closeButton: false
-      });
-      setTimeout(function () {
-        getDirView();
-      }, 2000);
+    if (document.getElementById('root_upload_button').classList.contains('clicked')) {
+      show_file_tree();
+      return;
     } else {
-      bootbox.alert("You must input a path before selecting this button");
+      document.getElementById('root_upload_button').classList.add('clicked')
     }
+    bootbox.dialog({
+      message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+      closeButton: false
+    });
+    setTimeout(function () {
+      getDirView();
+    }, 2000);
   });
 
   function eula_confirm() {

From e637a9705badd102e34800243ac4b936c82a3a77 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 2 Oct 2024 21:55:36 +0100
Subject: [PATCH 2/2] Update changelog !797

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2cbea30..b0864666 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Fix logic issue causing bedrock wizard's root files buttons to not respond to user click events ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/797))
 ### Tweaks
 TBD
 ### Lang