From c74aeb5dde0154d784b8ef9e404d8b89502c6897 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 15 Dec 2022 18:48:15 -0500
Subject: [PATCH 1/2] Fix id mismatch zip upload import

---
 .../templates/server/bedrock_wizard.html      | 37 +++++++++++------
 app/frontend/templates/server/wizard.html     | 40 +++++++++++++------
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index a29afcf8..38d0b021 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -424,8 +424,8 @@
                         <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
                       </div>
                     </div>
-                    <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
-                      aria-hidden="true">
+                    <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog"
+                      aria-labelledby="dir_select" aria-hidden="true">
                       <div class="modal-dialog" role="document">
                         <div class="modal-content">
                           <div class="modal-header">
@@ -436,7 +436,7 @@
                             </button>
                           </div>
                           <div class="modal-body">
-                            <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                            <div class="tree-ctx-item" id="main-tree-div-upload" data-path=""
                               style="overflow: scroll; max-height:75%;">
                               <input type="radio" id="main-tree-input-upload" name="root_path" value="" checked>
                               <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
@@ -558,7 +558,7 @@
 
 {% block js%}
 <script>
-
+  var upload;
   var file;
   function sendFile() {
     file = $("#file")[0].files[0]
@@ -597,8 +597,9 @@
 
   document.getElementById("root_upload_button").addEventListener("click", function () {
     if (file) {
+      upload = true;
       if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+        document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir" data-path=""><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')
       }
@@ -692,7 +693,11 @@
   }
 
   function show_file_tree() {
-    $("#dir_select").modal();
+    if (upload) {
+      $("#dir_upload_select").modal();
+    } else {
+      $("#dir_select").modal();
+    }
   }
 
   function getTreeView(path) {
@@ -716,12 +721,20 @@
         dataArr = data.split('\n');
         serverDir = dataArr.shift(); // Remove & return first element (server directory)
         text = dataArr.join('\n');
-
-        try {
-          document.getElementById('main-tree-div').innerHTML += text;
-          document.getElementById('main-tree').parentElement.classList.add("clicked");
-        } catch {
-          document.getElementById('files-tree').innerHTML = text;
+        if (styles.visibility === "hidden") {
+          try {
+            document.getElementById('main-tree-div').innerHTML += text;
+            document.getElementById('main-tree').parentElement.classList.add("clicked");
+          } catch {
+            document.getElementById('files-tree').innerHTML = text;
+          }
+        } else {
+          try {
+            document.getElementById('main-tree-div-upload').innerHTML += text;
+            document.getElementById('main-tree-upload').parentElement.classList.add("clicked");
+          } catch {
+            document.getElementById('files-tree').innerHTML = text;
+          }
         }
 
 
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index fd8d3773..0f70d6b1 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -552,8 +552,8 @@
                         <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
                       </div>
                     </div>
-                    <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
-                      aria-hidden="true">
+                    <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog"
+                      aria-labelledby="dir_select" aria-hidden="true">
                       <div class="modal-dialog" role="document">
                         <div class="modal-content">
                           <div class="modal-header">
@@ -564,10 +564,11 @@
                             </button>
                           </div>
                           <div class="modal-body">
-                            <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                            <div class="tree-ctx-item" id="main-tree-div-upload" data-path=""
                               style="overflow: scroll; max-height:75%;">
                               <input type="radio" id="main-tree-input-upload" name="root_path" value="" checked>
-                              <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
+                              <span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir"
+                                data-path="">
                                 <i class="far fa-folder"></i>
                                 <i class="far fa-folder-open"></i>
                                 {{ translate('serverFiles', 'files', data['lang']) }}
@@ -799,6 +800,7 @@
 
 {% block js %}
 <script>
+    var upload = false;
     var file;
     function sendFile() {
       file = $("#file")[0].files[0]
@@ -862,8 +864,9 @@
 
     document.getElementById("root_upload_button").addEventListener("click", function () {
       if (file) {
+        upload = true;
         if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-          document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+          document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir" data-path=""><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')
         }
@@ -926,7 +929,11 @@
     }
 
     function show_file_tree() {
-      $("#dir_select").modal();
+      if (upload) {
+        $("#dir_upload_select").modal();
+      } else {
+        $("#dir_select").modal();
+      }
     }
 
     function check_sizes(a, b, changed) {
@@ -961,15 +968,22 @@
           dataArr = data.split('\n');
           serverDir = dataArr.shift(); // Remove & return first element (server directory)
           text = dataArr.join('\n');
-
-          try {
-            document.getElementById('main-tree-div').innerHTML += text;
-            document.getElementById('main-tree').parentElement.classList.add("clicked");
-          } catch {
-            document.getElementById('files-tree').innerHTML = text;
+          if (styles.visibility === "hidden") {
+            try {
+              document.getElementById('main-tree-div').innerHTML += text;
+              document.getElementById('main-tree').parentElement.classList.add("clicked");
+            } catch {
+              document.getElementById('files-tree').innerHTML = text;
+            }
+          } else {
+            try {
+              document.getElementById('main-tree-div-upload').innerHTML += text;
+              document.getElementById('main-tree-upload').parentElement.classList.add("clicked");
+            } catch {
+              document.getElementById('files-tree').innerHTML = text;
+            }
           }
 
-
           document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
           document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
 

From 8a32d22f7e3761c3b05b638e8265c0098252cf2b Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 17 Dec 2022 00:10:04 +0000
Subject: [PATCH 2/2] Update changelog !507

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3134dca..390dd0fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ TBD
 - Fix colours on public pages. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/504))
 - Fix bug where public background was not sent to public pages...like the error page resulting in an error...ironic...I know. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/505))
 - Be sure a user cannot server import crafty dir. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/506))
-- Remove Pathlib from sub path check ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/508))
+- Remove Pathlib from sub path check ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/507))
+- Fix root dir selection in Upload Zip Import ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/508))
 ### Tweaks
 TBD
 ### Lang