avo 3.5.7 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bdf3209c63771bace6e51362f1d569640f62f06e997dd0b5d8c2a605619846
-  data.tar.gz: d78d3c50bab5be7bac39e2f1ec5ba99db8f6aaf8c563cf9210445f92afa18678
+  metadata.gz: b24b80baf28fe7848e431079b17b9384ad5f4369e65a4c81bce9f1af68776d1f
+  data.tar.gz: '08b79a4f7fe3c462937099421fc4d90c5b02ce54a6903eaa5cf5b525e56d9f8e'
 SHA512:
-  metadata.gz: 8c740f0a1453120877a435fa43d137a877d2e023d9514cda7f4a09080cec7eb7ec2e1d47067246bf2a8a0820a05c4c87be3af22e64711b00bfc1c4e4cd104d24
-  data.tar.gz: 3a4c45b65648541f82cd350bf5fae3275041c82383967b99824f4952428f7b2946698057a7d99c77071ba8c57f0609f534c55fb4137643be1b020bd8f8c904bb
+  metadata.gz: 71eaebcef5037f4ad99a49c8da1231c40e9aee6279cffc7083ba9f4f16ef344ccfeac970bbbe5358dc576703cb1196180338c18b0b788c1c50ab5c22f09ddc8a
+  data.tar.gz: c5b562841cc86aa1063e393b59a5145018808dbdb524e8e5e5c0e38b99a32893f9349b2cd286c2cded8c237379b6f065bc1b42d669bc01799d58d7aeaeeeb4b3

data/Gemfile.lock

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

data/app/assets/builds/avo.base.css

@@ -8222,10 +8222,6 @@ tag.tagify__tag{
   border-top-width:0px
 }
 
-.border-solid{
-  border-style:solid
-}
-
 .border-dashed{
   border-style:dashed
 }

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

@@ -1,5 +1,5 @@
 <% if @field.value %>
-  <turbo-frame id="<%= @field.turbo_frame %>" src="<%= @field.frame_url %>"  loading=<%= turbo_frame_loading %> target="_top" class="block">
+  <turbo-frame id="<%= @field.turbo_frame %>" src="<%= @field.frame_url %>" loading=<%= turbo_frame_loading %> target="_top" class="block">
     <%= render(Avo::LoadingComponent.new(title: @field.name)) %>
   </turbo-frame>
 <% else %>

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -10,7 +10,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
     if @field.present?
       reflection_resource = @field.target_resource
       if reflection_resource.present? && @resource.present?
-        method_name = "attach_#{@field.id}?".to_sym
+        method_name = :"attach_#{@field.id}?"
 
         if @resource.authorization.has_method?(method_name, raise_exception: false)
           policy_result = @resource.authorization.authorize_action(method_name, raise_exception: false)

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/actions_controller.rb

@@ -12,6 +12,8 @@ module Avo
     before_action :set_action, only: [:show, :handle]
     before_action :verify_authorization, only: [:show, :handle]
 
+    layout "avo/blank"
+
     def show
       # Se the view to :new so the default value gets prefilled
       @view = Avo::ViewInquirer.new("new")

data/app/controllers/avo/application_controller.rb

@@ -51,6 +51,10 @@ module Avo
       super
     end
 
+    def hello
+      puts "Nobody tested me :("
+    end
+
     private
 
     # Get the pluralized resource name for this request
@@ -142,7 +146,13 @@ module Avo
     end
 
     def set_record
-      @record = @resource.find_record(params[:id], query: model_scope, params: params)
+      id = if @resource.model_class.primary_key.is_a?(Array) && params.respond_to?(:extract_value)
+        params.extract_value(:id)
+      else
+        params[:id]
+      end
+
+      @record = @resource.find_record(id, query: model_scope, params:)
       @resource.hydrate(record: @record)
     end
 

data/app/controllers/avo/associations_controller.rb

@@ -16,6 +16,8 @@ module Avo
     before_action :authorize_attach_action, only: :new
     before_action :authorize_detach_action, only: :destroy
 
+    layout "avo/blank"
+
     def index
       @parent_resource = @resource.dup
       @resource = @related_resource
@@ -63,7 +65,7 @@ module Avo
       if reflection_class == "HasManyReflection"
         @record.send(association_name) << @attachment_record
       else
-        @record.send("#{association_name}=", @attachment_record)
+        @record.send(:"#{association_name}=", @attachment_record)
       end
 
       respond_to do |format|

data/app/controllers/avo/base_controller.rb

@@ -516,7 +516,7 @@ module Avo
       redirect_path_from_resource_option(:after_update_path) || resource_view_response_path
     end
 
-    # Needs a different name, otwherwise, in some places, this can be called instead helpers.resource_view_path
+    # Requires a different/special name, otherwise, in some places, this can be called instead helpers.resource_view_path
     def resource_view_response_path
       helpers.resource_view_path(record: @record, resource: @resource)
     end

data/app/helpers/avo/url_helpers.rb

@@ -81,7 +81,7 @@ module Avo
       rescue
       end
 
-      avo.resources_associations_index_path(parent_record.model_name.route_key, record.id, **existing_params, **args)
+      avo.resources_associations_index_path(parent_record.model_name.route_key, record.to_param, **existing_params, **args)
     end
 
     def resource_view_path(**args)

data/app/views/avo/associations/new.html.erb

@@ -41,7 +41,7 @@
       </div>
 
       <% c.with_controls do %>
-        <%= a_button 'data-action': 'click->modal#close', size: :sm, style: :outline, color: :gray do %>
+        <%= a_button 'data-action': 'click->modal#close', type: :button, size: :sm, style: :outline, color: :gray do %>
           <%= t('avo.cancel') %>
         <% end %>
         <%= a_button type: :submit, style: :primary, color: :green, size: :sm do %>

data/app/views/avo/partials/_alerts.html.erb

@@ -0,0 +1,9 @@
+<%= turbo_frame_tag :alerts, class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-[100] pointer-events-none" do %>
+  <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+  <% # In case we have other general error messages %>
+  <% if @errors.present? %>
+    <% @errors.each do |message| %>
+      <%= render Avo::AlertComponent.new :error, message %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/avo/partials/_attach_modal.html.erb

@@ -0,0 +1 @@
+<%= turbo_frame_tag 'attach_modal' %>

data/app/views/layouts/avo/application.html.erb

@@ -51,17 +51,9 @@
       </div>
     </div>
     <%= turbo_frame_tag Avo::ACTIONS_TURBO_FRAME_ID, data: {turbo_temporary: 1} %>
-    <%= turbo_frame_tag 'attach_modal' %>
-    <%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-[100] pointer-events-none" do %>
-      <%= render Avo::FlashAlertsComponent.new flashes: flash %>
-      <% # In case we have other general error messages %>
-      <% if @errors.present? %>
-        <% @errors.each do |message| %>
-          <%= render Avo::AlertComponent.new :error, message %>
-        <% end %>
-      <% end %>
-    <% end %>
-    <%= render partial: "avo/partials/scripts" %>
+    <%= render partial: 'avo/partials/attach_modal' %>
+    <%= render partial: 'avo/partials/alerts' %>
+    <%= render partial: 'avo/partials/scripts' %>
     <!-- Avo version: <%= Avo::VERSION %> -->
     <!-- Environment: <%= Rails.env %> -->
     <!-- License ID: <%= Avo.license.id %> -->

data/app/views/layouts/avo/blank.html.erb

@@ -3,5 +3,6 @@
 <html>
   <body>
     <%= yield.force_encoding('UTF-8') %>
+    <%= render partial: 'avo/partials/alerts' %>
   </body>
 </html>

data/lib/avo/fields/has_one_field.rb

@@ -33,7 +33,7 @@ module Avo
           related_record = related_resource.find_record value
         end
 
-        model.public_send("#{key}=", related_record)
+        model.public_send(:"#{key}=", related_record)
 
         model
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.5.7" unless const_defined?(:VERSION)
+  VERSION = "3.6.0" 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.7
+  version: 3.6.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -2126,6 +2126,8 @@ files:
 - app/views/avo/home/_resources.html.erb
 - app/views/avo/home/failed_to_load.html.erb
 - app/views/avo/home/index.html.erb
+- app/views/avo/partials/_alerts.html.erb
+- app/views/avo/partials/_attach_modal.html.erb
 - app/views/avo/partials/_branding.html.erb
 - app/views/avo/partials/_custom_tools_alert.html.erb
 - app/views/avo/partials/_footer.html.erb
@@ -2309,6 +2311,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