avo 2.32.2 → 2.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a87cb9ad28dd06e0aa9f183fc1d610f9ebd655108cd9d5053f5f7e6d0c6c2bd
-  data.tar.gz: a983e0f6d719b3e4b61efdfb1bf1e3d74e5fe7e77eed8b30b78ec946136786d9
+  metadata.gz: ca219e472c153396f4f8dd6d4cbe2e44a09d3af4e497585c6dd1d736b25316ba
+  data.tar.gz: 261b1d9f24a6ae175b1941163dbe99194f2af8ac21fed1b73efacdb73d7892c5
 SHA512:
-  metadata.gz: be5ad5ccf47de78f21816ed76abb8ee632d4940823b0132b90c38fe2aba6bfcc1cd824b42963c213ea3a6f447b10f17995215b0b4317faa5021c79637db56f87
-  data.tar.gz: f3a9103c23935739865dfe6e25e5cb388240243eb74cd18f6b6cf858e4bc68fd22672d5d2c517787ff7fe154d454e45a10a0e5c901600d1c311d0310c3d93aa2
+  metadata.gz: c02d665d1bafa6776c3b7066c6d47e78b36ed788b4c89b2908563ce920cbafe60431deeb142394fc446abc38cbb2f8405ff0026d290cba824335a466cd6cd9c6
+  data.tar.gz: 2816d0af24529faaae699eb1fbc0f1f62b7c37fddf4edd59f9fb0bbb86e201d4d665e23be3e469576b7df03664659b124ff87a3af434f058c8b5e37fbeecfe19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.32.2)
+    avo (2.32.4)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/actions_component.rb

@@ -53,13 +53,15 @@ class Avo::ActionsComponent < ViewComponent::Base
 
   def single_record_path(id)
     Avo::Services::URIService.parse(@resource.record_path)
-      .append_paths("actions", id)
+      .append_paths("actions")
+      .append_query("action_id": id)
       .to_s
   end
 
   def many_records_path(id)
     Avo::Services::URIService.parse(@resource.records_path)
-      .append_paths("actions", id)
+      .append_paths("actions")
+      .append_query("action_id": id)
       .to_s
   end
 end

data/app/components/avo/index/resource_map_component.html.erb

@@ -4,7 +4,7 @@
       <%= js_map(resource_location_markers, **resource_mapkick_options) %>
     </div>
     <% if render_table? %>
-      <div class="overflow-auto<%= table_component_order_class %>">
+      <div class="overflow-auto <%= table_component_order_class %>">
         <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
       </div>
     <% end %>

data/app/components/avo/views/resource_index_component.html.erb

@@ -66,7 +66,7 @@
       <% end %>
     <% end %>
     <% c.with_bare_content do %>
-      <% if view_type.to_sym == :table %>
+      <% if view_type.to_sym == :table || view_type.to_sym == :map %>
         <% if @models.present? %>
           <div class="mt-4">
             <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>

data/app/views/avo/actions/show.html.erb

@@ -9,7 +9,7 @@
   >
     <%= form_with model: @model,
       scope: 'fields',
-      url: "#{@resource.records_path}/actions/#{@action.param_id}",
+      url: "#{@resource.records_path}/actions",
       local: true,
       data: @action.class.form_data_attributes do |form|
     %>
@@ -20,6 +20,7 @@
       <div class="flex-1 flex">
         <%= @action.get_message %>
       </div>
+      <%= hidden_field_tag :action_id, @action.param_id %>
       <%= form.hidden_field :avo_resource_ids, value: params[:resource_ids], 'data-action-target': 'resourceIds' %>
       <%= form.hidden_field :avo_selected_query, 'data-action-target': 'selectedAllQuery' %>
       <% if @action.get_fields.present? %>

data/config/routes.rb

@@ -28,8 +28,8 @@ Avo::Engine.routes.draw do
     delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:attachment_id", to: "attachments#destroy"
 
     # Actions
-    get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"
-    post "/:resource_name(/:id)/actions/:action_id", to: "actions#handle"
+    get "/:resource_name(/:id)/actions/(:action_id)", to: "actions#show"
+    post "/:resource_name(/:id)/actions/(:action_id)", to: "actions#handle"
 
     # Generate resource routes as below:
     # resources :posts

data/lib/avo/app.rb

@@ -49,7 +49,7 @@ module Avo
         elsif Rails.env.test?
           Rails.cache
         else
-          ActiveSupport::Cache::MemoryStore.new
+          ActiveSupport::Cache.lookup_store(:memory_store)
         end
       end
 

data/lib/avo/base_action.rb

@@ -145,7 +145,7 @@ module Avo
     end
 
     def param_id
-      self.class.to_s.demodulize.underscore.tr "/", "_"
+      self.class.to_s
     end
 
     def succeed(text)

data/lib/avo/concerns/fetches_things.rb

@@ -15,7 +15,7 @@ module Avo
 
         # Returns the Avo dashboard by name
         #
-        # get_dashboard_by_name(:dashy) -> Dashy
+        # get_dashboard_by_name(:dashy) -> instance of Dashy
         def get_dashboard_by_name(name)
           dashboards.find do |dashboard|
             dashboard.name == name
@@ -29,7 +29,7 @@ module Avo
 
         # Returns the Avo resource by camelized name
         #
-        # get_resource_by_name('User') => UserResource
+        # get_resource_by_name('User') => instance of UserResource
         def get_resource(resource)
           possible_resource = "#{resource}Resource".gsub "ResourceResource", "Resource"
 
@@ -40,7 +40,7 @@ module Avo
 
         # Returns the Avo resource by singular snake_cased name
         #
-        # get_resource_by_name('user') => UserResource
+        # get_resource_by_name('user') => instance of UserResource
         def get_resource_by_name(name)
           get_resource name.singularize.camelize
         end
@@ -48,8 +48,8 @@ module Avo
         # Returns the Avo resource by singular snake_cased name
         # From all the resources that use the same model_class, it will fetch the first one in alphabetical order
         #
-        # get_resource_by_name('User') => UserResource
-        # get_resource_by_name(User) => UserResource
+        # get_resource_by_name('User') => instance of UserResource
+        # get_resource_by_name(User) => instance of UserResource
 
         def get_resource_by_model_name(klass)
           # Fetch the mappings imposed by the user.
@@ -65,8 +65,8 @@ module Avo
 
         # Returns the Avo resource by singular snake_cased name
         #
-        # get_resource_by_controller_name('delayed_backend_active_record_jobs') => DelayedJobResource
-        # get_resource_by_controller_name('users') => UserResource
+        # get_resource_by_controller_name('delayed_backend_active_record_jobs') => instance of DelayedJobResource
+        # get_resource_by_controller_name('users') => instance of UserResource
         def get_resource_by_controller_name(name)
           valid_resources
             .find do |resource|

data/lib/avo/resources/controls/action.rb

@@ -18,7 +18,10 @@ module Avo
         end
 
         def path
-          Avo::Services::URIService.parse(@resource.record_path).append_paths("actions", action.param_id).to_s
+          Avo::Services::URIService.parse(@resource.record_path)
+            .append_paths("actions")
+            .append_query(action_id: action.param_id)
+            .to_s
         end
 
         def label

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.32.2
+  version: 2.32.4
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord