avo 3.5.6 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c24c04902a3f17b4a3b396d9ff592290c8b5b8cc3ece5b6000a1baedfa294f4
-  data.tar.gz: 297fbfd4e5d45cd6dc6b8692733b4773ecbd863ff8e5c77dbcfdb16e51885b1a
+  metadata.gz: a39429d6be1a1dfcd0f353896f3eec3cf894d03cdd3aa19ddb7353cf13535f9f
+  data.tar.gz: 19d1c9bedadc87f54cc9601d11732706684b890097e712f4d462e46a86b4aca6
 SHA512:
-  metadata.gz: 6268590bd9d34ebc5a2fd50f22467cee9366b974e4d2ef58e9537d2af4a766146d87cdfee590060df16bec2c1f937cd48b87fab789f412e443426e279f911a5d
-  data.tar.gz: f1e5b8fecc7bbe16d305674e1093bcbca9192698c7a9e478b365bfd749021366451d8300f8c685fcea19c4a1cea4095b25af1e420e563c64d769fbbfe335d273
+  metadata.gz: 7af08e4b3b0682c3ddaa7a407e13ccd06de87aa2b3e28b2c62a99373714a668a4832ebf57f4afa7a91c5878bd8a8c87e175ac4077476384812ed3936f38af77a
+  data.tar.gz: 228d061f6acfb8cce03d06ab8fe8b98178bb7aa3da1e7e717036aa4f4f347b075f27cb4770ae8adb09927f33cf48f884bf636fdc87ef974cd2c5928fff8fa4e8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.5.6)
+    avo (3.5.8)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/fields/select_field/show_component.html.erb

@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
-  <%= @field.label %>
+<%= field_wrapper **field_wrapper_args.merge(dash_if_blank: false) do %>
+  <%= @field.value.nil? ? "—" : @field.label %>
 <% end %>

data/app/components/avo/views/resource_index_component.rb

@@ -135,9 +135,6 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   def authorized_to_search?
     # Hide the search if the authorization prevents it
-    return true unless resource.authorization.respond_to?(:has_action_method?)
-    return false unless resource.authorization.has_action_method?("search")
-
     resource.authorization.authorize_action("search", raise_exception: false)
   end
 

data/app/controllers/avo/base_controller.rb

@@ -8,8 +8,8 @@ module Avo
     before_action :set_resource
     before_action :set_applied_filters, only: :index
     before_action :set_record, only: [:show, :edit, :destroy, :update, :preview]
+    before_action :set_record_to_fill, only: [:new, :edit, :create, :update]
     before_action :detect_fields
-    before_action :set_record_to_fill
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_record, only: [:create, :update]
     # Don't run base authorizations for associations
@@ -102,8 +102,9 @@ module Avo
     end
 
     def new
-      @record = @resource.model_class.new
-      @resource = @resource.hydrate(record: @record, view: :new, user: _current_user)
+      # Record is already hydrated on set_record_to_fill method
+      @record = @resource.record
+      @resource.hydrate(view: :new, user: _current_user)
 
       # Handle special cases when creating a new record via a belongs_to relationship
       if params[:via_belongs_to_resource_class].present?

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.5.6" unless const_defined?(:VERSION)
+  VERSION = "3.5.8" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/concerns/override_controller.rb

@@ -0,0 +1,20 @@
+module Generators
+  module Avo
+    module Concerns
+      module OverrideController
+        extend ActiveSupport::Concern
+
+        def override_controller?
+          return false unless controller_name.in? controllers_list
+
+          say("Avo uses #{controller_class} internally, overriding it would cause malfunctions.", :red)
+          true
+        end
+
+        def controllers_list
+          Dir["app/controllers/avo/*.rb"].map { |file_path| File.basename(file_path, ".rb") }
+        end
+      end
+    end
+  end
+end

data/lib/generators/avo/controller_generator.rb

@@ -1,16 +1,20 @@
 require_relative "named_base_generator"
 require_relative "concerns/parent_controller"
+require_relative "concerns/override_controller"
 
 module Generators
   module Avo
     class ControllerGenerator < NamedBaseGenerator
-      include Generators::Avo::Concerns::ParentController
+      include Concerns::ParentController
+      include Concerns::OverrideController
 
       source_root File.expand_path("templates", __dir__)
 
       namespace "avo:controller"
 
       def create
+        return if override_controller?
+
         template "resource/controller.tt", "app/controllers/avo/#{controller_name}.rb"
       end
 

data/lib/generators/avo/resource_generator.rb

@@ -1,10 +1,12 @@
 require_relative "named_base_generator"
 require_relative "concerns/parent_controller"
+require_relative "concerns/override_controller"
 
 module Generators
   module Avo
     class ResourceGenerator < NamedBaseGenerator
-      include Generators::Avo::Concerns::ParentController
+      include Concerns::ParentController
+      include Concerns::OverrideController
 
       source_root File.expand_path("templates", __dir__)
 
@@ -16,8 +18,10 @@ module Generators
         required: false
 
       def create
+        return if override_controller?
+
         template "resource/resource.tt", "app/avo/resources/#{resource_name}.rb"
-        template "resource/controller.tt", "app/controllers/avo/#{controller_name}.rb"
+        invoke "avo:controller", [resource_name], options
       end
 
       def resource_class

data/lib/generators/rails/avo_resource_generator.rb

@@ -4,7 +4,7 @@ module Rails
   module Generators
     class AvoResourceGenerator < ::Rails::Generators::Base
       def invoke_avo_command
-        invoke "avo:resource", @args, {from_model_generator: true}
+        invoke "avo:resource", @args, {from_model_generator: true}.merge(options)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.5.8
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -2309,6 +2309,7 @@ files:
 - lib/generators/avo/action_generator.rb
 - lib/generators/avo/base_generator.rb
 - lib/generators/avo/card_generator.rb
+- lib/generators/avo/concerns/override_controller.rb
 - lib/generators/avo/concerns/parent_controller.rb
 - lib/generators/avo/controller_generator.rb
 - lib/generators/avo/dashboard_generator.rb