fix: assets outputted multiple times (#3027)

Co-authored-by: Paul Bob <[email protected]>
avo-hq · Jul 19, 2024 · 6109d2e · 6109d2e
1 parent 0d08ec7
commit 6109d2e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/components/avo/turbo_frame_wrapper_component.html.erb b/app/components/avo/turbo_frame_wrapper_component.html.erb
@@ -4,7 +4,7 @@
   # We're appending it back if it's a turbo_frame_request.
 %>
 <% if helpers.turbo_frame_request? %>
-  <%= helpers.turbo_stream_action_tag :append, target: 'alerts', template: render(Avo::FlashAlertsComponent.new(flashes: helpers.flash)) %>
+  <%= helpers.turbo_stream_action_tag :append, target: "alerts", template: render(Avo::FlashAlertsComponent.new(flashes: helpers.flash)) %>
 <% end %>
 <%= content %>
 <% if name.present? %></turbo-frame><% end %>
diff --git a/lib/avo/asset_manager.rb b/lib/avo/asset_manager.rb
@@ -2,9 +2,6 @@ module Avo
   class AssetManager
     include ActionView::Helpers::AssetTagHelper
 
-    attr_reader :stylesheets
-    attr_reader :javascripts
-
     def initialize
       @stylesheets = []
       @javascripts = []
@@ -22,6 +19,14 @@ def add_stylesheet(path)
     def add_javascript(path)
       @javascripts.push path
     end
+
+    def stylesheets
+      @stylesheets.uniq
+    end
+
+    def javascripts
+      @javascripts.uniq
+    end
   end
 
   def self.asset_manager

diff --git a/lib/generators/avo/eject_generator.rb b/lib/generators/avo/eject_generator.rb
@@ -146,7 +146,7 @@ def eject_component(component_to_eject = options[:component], confirmation: true
             [dest_rb, dest_erb].each do |path|
               if component.starts_with?("avo/views/")
                 modified_content = File.read(path).gsub("Avo::Views::", "Avo::Views::#{options[:scope].camelize}::")
-              elsif component.starts_with?("avo/fields/")
+              elsif component.starts_with?("avo/fields/") && options["field-components"].present?
                 modified_content = File.read(path).gsub("#{options["field-components"].camelize}Field", "#{options[:scope].camelize}::#{options["field-components"].camelize}Field")
               end