Merge pull request rails#45992 from pinzonjulian/pinzonjulian/allow_activestorage_direct_uploads_to_work_with_engines

allow direct uploads to work within engines

Author: byroot

actionview/lib/action_view/helpers/form_tag_helper.rb

@@ -1013,9 +1013,14 @@ def set_default_disable_with(value, tag_options)
         end
 
         def convert_direct_upload_option_to_url(options)
-          if options.delete(:direct_upload) && respond_to?(:rails_direct_uploads_url)
+          return options unless options.delete(:direct_upload)
+
+          if respond_to?(:rails_direct_uploads_url)
             options["data-direct-upload-url"] = rails_direct_uploads_url
+          elsif respond_to?(:main_app) && main_app.respond_to?(:rails_direct_uploads_url)
+            options["data-direct-upload-url"] = main_app.rails_direct_uploads_url
           end
+
           options
         end
     end

railties/test/railties/mounted_engine_test.rb

@@ -118,6 +118,7 @@ class Engine < ::Rails::Engine
           get '/application_route_in_view', to: 'posts#application_route_in_view'
           get '/engine_polymorphic_path', to: 'posts#engine_polymorphic_path'
           get '/engine_asset_path', to: 'posts#engine_asset_path'
+          get '/file_field_with_direct_upload_path', to: 'posts#file_field_with_direct_upload_path'
         end
       RUBY
 
@@ -150,6 +151,10 @@ def engine_polymorphic_path
             def engine_asset_path
               render inline: "<%= asset_path 'images/foo.png', skip_pipeline: true %>"
             end
+
+            def file_field_with_direct_upload_path
+              render inline: "<%= file_field_tag :image, direct_upload: true %>"
+            end
           end
         end
       RUBY
@@ -268,6 +273,10 @@ def app
       # test that asset path will not get script_name when generated in the engine
       get "/someone/blog/engine_asset_path"
       assert_equal "/images/foo.png", last_response.body
+
+      # test that the active storage direct upload URL is added to a file field that explicitly requires it within en engine's view code
+      get "/someone/blog/file_field_with_direct_upload_path"
+      assert_equal "<input type=\"file\" name=\"image\" id=\"image\" data-direct-upload-url=\"http://example.org/rails/active_storage/direct_uploads\" />", last_response.body
     end
 
     test "route path for controller action when engine is mounted at root" do