Merge pull request #4227 from manyfold3d/fix-tubro-upload-behaviour

FIx upload box behaviour on turbo load

Author: Floppy

app/javascript/controllers/upload_controller.ts

@@ -66,4 +66,14 @@ export default class extends Controller {
       event.formData.set('uploads', JSON.stringify(uploads))
     })
   }
+
+  disconnect (): void {
+    this.uppy?.destroy()
+    this.uppy = null
+  }
+
+  reconnect (): void {
+    this.disconnect()
+    this.connect()
+  }
 }

app/views/models/new.html.erb

@@ -17,14 +17,16 @@
     </div>
   <% end %>
 
-  <div class="row mb-3 input-group">
+  <div class="row mb-3 input-group" data-turbo-permanent>
     <%= form.label :files, t(".files.label"), class: "col-sm-2 col-form-label" %>
     <div class='col-sm-10 ps-0'>
-      <%= content_tag :div, nil,
-            "data-controller": "upload",
-            "data-max-file-size": SiteSettings.max_file_upload_size,
-            "data-allowed-file-types": input_accept_string,
-            "data-upload-endpoint": upload_path %>
+      <%= content_tag :div, nil, data: {
+            controller: "upload",
+            action: "turbo:morph@window->upload#reconnect",
+            max_file_size: SiteSettings.max_file_upload_size,
+            allowed_file_types: input_accept_string,
+            upload_endpoint: upload_path
+          } %>
     </div>
   </div>
 

app/views/models/show.html.erb

@@ -181,13 +181,13 @@
     <%= card :warning, t(".upload_card.heading") do %>
       <%= form_with url: model_model_files_path(@model), id: "upload-form", class: "d-grid" do |form| %>
 
-        <%= content_tag :div, nil,
-              class: "mb-3",
-              "data-controller": "upload",
-              "data-max-file-size": SiteSettings.max_file_upload_size,
-              "data-allowed-file-types": input_accept_string,
-              "data-upload-endpoint": upload_path %>
-
+        <%= content_tag :div, nil, class: "mb-3", data: {
+              controller: "upload",
+              action: "turbo:morph@window->upload#reconnect",
+              max_file_size: SiteSettings.max_file_upload_size,
+              allowed_file_types: input_accept_string,
+              upload_endpoint: upload_path
+            } %>
         <%= submit_tag translate(".submit"), class: "btn btn-primary d-block" %>
       <% end %>
     <% end %>