avo 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb42ab88f48186d0bb1c3f058e0ef460bbe8adfa928b6de1dc7b44709a0cc3b2
-  data.tar.gz: b7538d63d82cccf98f9f225487df2030d6a423c2e2297d49443f869f2b0fed41
+  metadata.gz: bd49dafaf80ec79f2e45eab2d26786c9cfa9d65c2f3608ab61540f7d40038b35
+  data.tar.gz: 5750e2b37680c30a6732ec99af57e08ae504ac8ddffa2a75d78c00bf14dd39ae
 SHA512:
-  metadata.gz: c6d2389378b306156b20cea6983509f1eca9f6923b026b4d66f8736524b129b59570286d463bcdb64105911e195920bed8b8576066623f91153062c27170d12f
-  data.tar.gz: 5fd227e9d5eefc30bbaf66ffccde8d00acebe300854d4ad971f34b49fb95cccb6b4ea42e8fd0de59cc61e193f270892428939a8978268414a15c2a50f5a4ab3b
+  metadata.gz: 2ad055e02c197a6c50af642c782a585c5e8584d8d90f7171f83a94acb9b4f5c19edb109d8037c2bfd338224b9e21a8bf92f41f7a7295c0caddd1a554f79741c3
+  data.tar.gz: d82297c31658bc94638a4f9504eaac9dedd59843db4580c6b09231748dd1ba61697b2c008dce6c2b6ad759b46542d8a0ffd55cdd2a5b3e50ab28be55f8769c84

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.4.2)
+    avo (3.4.3)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -534,7 +534,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.34)
+    yard (0.9.35)
     zeitwerk (2.6.13)
 
 PLATFORMS

data/app/components/avo/actions_component.html.erb

@@ -32,16 +32,16 @@
   >
     <div data-target="actions-list" class="w-full space divide-y">
       <% actions.each_with_index do |action, index| %>
-        <% link, data = action.class.link_arguments(resource: @resource, arguments: action.arguments) %>
-        <%= link_to link,
+        <%= link_to action_path(action),
           data: {
             action_name: action.action_name,
+            'turbo-frame': Avo::ACTIONS_TURBO_FRAME_ID,
             'action': 'click->actions-picker#visitAction',
             'actions-picker-target': action.standalone ? 'standaloneAction' : 'resourceAction',
             'disabled': is_disabled?(action),
             # for some reason InstantClick fetches the URL even if it's prefetched.
             turbo_prefetch: false,
-          }.merge(data),
+          },
           title: action.action_name,
           class: "flex items-center px-4 py-3 w-full font-semibold text-sm hover:bg-primary-100 #{is_disabled?(action) ? 'text-gray-500' : 'text-black'}" do %>
           <%= svg 'play', class: 'h-5 mr-1 inline pointer-events-none' %> <%= action.action_name %>

data/app/components/avo/actions_component.rb

@@ -31,6 +31,19 @@ class Avo::ActionsComponent < ViewComponent::Base
     end
   end
 
+  # When running an action for one record we should do it on a special path.
+  # We do that so we get the `record` param inside the action so we can prefill fields.
+  def action_path(action)
+    return single_record_path(action) if as_row_control
+    return many_records_path(action) unless @resource.has_record_id?
+
+    if on_record_page?
+      single_record_path action
+    else
+      many_records_path action
+    end
+  end
+
   # How should the action be displayed by default
   def is_disabled?(action)
     return false if action.standalone || as_row_control
@@ -47,4 +60,23 @@ class Avo::ActionsComponent < ViewComponent::Base
   def on_index_page?
     !on_record_page?
   end
+
+  def single_record_path(action)
+    action_url(action, @resource.record_path)
+  end
+
+  def many_records_path(action)
+    action_url(action, @resource.records_path)
+  end
+
+  def action_url(action, path)
+    Avo::Services::URIService.parse(path)
+      .append_paths("actions")
+      .append_query(
+        {
+          action_id: action.to_param,
+          arguments: Avo::BaseAction.encode_arguments(action.arguments)
+        }.compact
+      ).to_s
+  end
 end

data/app/components/avo/fields/belongs_to_field/edit_component.html.erb

@@ -71,8 +71,11 @@
             <% create_href = create_path(Avo.resource_manager.get_resource_by_model_class(type.to_s)) %>
             <% if !disabled && create_href.present? %>
               <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
-                          create_href,
-                          class: "text-sm"
+                    create_href,
+                    class: "text-sm",
+                    data: {
+                      turbo_prefetch: false
+                    }
               %>
             <% end %>
           <% end %>
@@ -115,7 +118,13 @@
     <% end %>
     <% if field.can_create? %>
       <% if !disabled && create_path.present? %>
-        <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
+        <%= link_to t("avo.create_new_item", item: @field.name.downcase),
+              create_path,
+              class: "text-sm",
+              data: {
+                turbo_prefetch: false
+              }
+        %>
       <% end %>
     <% end %>
   <% end %>

data/app/controllers/avo/base_controller.rb

@@ -63,10 +63,16 @@ module Avo
 
       # Create resources for each record
       # Duplicate the @resource before hydration to avoid @resource keeping last record.
+      @resource.hydrate(params: params)
       @resources = @records.map do |record|
-        @resource.dup.hydrate(record: record, params: params)
+        @resource.dup.hydrate(record: record)
       end
 
+      # Temporary fix for visible blocks when geting fields for header
+      # Hydrating with last record so resource.record != nil
+      # This is keeping same behavior from <= 3.4.1
+      @resource.hydrate(record: @records.last)
+
       set_component_for __method__
     end
 

data/app/helpers/avo/turbo_stream_actions_helper.rb

@@ -13,7 +13,7 @@ module Avo
     def close_action_modal
       turbo_stream_action_tag :replace,
         target: Avo::ACTIONS_TURBO_FRAME_ID,
-        html: @view_context.turbo_frame_tag(Avo::ACTIONS_TURBO_FRAME_ID)
+        template: @view_context.turbo_frame_tag(Avo::ACTIONS_TURBO_FRAME_ID, data: {turbo_temporary: 1})
     end
   end
 end

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

@@ -12,7 +12,6 @@
       data: {
         action_target: :form,
         **@action.class.form_data_attributes,
-        turbo_frame: Avo::ACTIONS_TURBO_FRAME_ID,
       } do |form|
     %>
     <%= render Avo::ModalComponent.new do |c| %>

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

@@ -1,11 +1 @@
-<div class="flex">
-  <%= link_to Avo.configuration.app_name, '/', class: 'text-primary-500 font-semibold', target: :_blank %>
-
-  <% if false %>
-    <div class="ml-12">
-      <% current_user.accounts.each do |account| %>
-        <%= link_to account.name, switch_account_path(account.id), class: class_names({"underline": session[:tenant_id].to_s == account.id.to_s}), data: {turbo_method: :put} %>
-      <% end %>
-    </div>
-  <% end %>
-</div>
+<%= link_to Avo.configuration.app_name, '/', class: 'text-primary-500 font-semibold', target: :_blank %>

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

@@ -3,7 +3,7 @@
 <html>
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <% if !Avo.configuration.turbo[:instantclick] %>
+    <% if !Avo.configuration.turbo[:instant_click] %>
       <meta name="turbo-prefetch" content="false">
     <% end %>
     <%= display_meta_tags site: Avo.configuration.app_name, reverse: true, separator: "—" %>

data/lib/avo/configuration.rb

@@ -228,7 +228,7 @@ module Avo
     def default_turbo
       -> do
         {
-          instantclick: true
+          instant_click: true
         }
       end
     end

data/lib/avo/version.rb

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

data/lib/avo.rb

@@ -40,7 +40,7 @@ module Avo
     private
 
     def missing_resource_message(resource_name)
-      name = resource_name.to_s.downcase
+      name = resource_name.to_s.underscore
 
       "Failed to find a resource while rendering the :#{name} field.\n" \
       "You may generate a resource for it by running 'rails generate avo:resource #{name.singularize}'.\n" \

data/lib/generators/avo/templates/initializer/avo.tt

@@ -68,7 +68,7 @@ Avo.configure do |config|
   ## == Turbo options ==
   # config.turbo = -> do
   #   {
-  #     instantclick: true
+  #     instant_click: true
   #   }
   # end
 

data/public/avo-assets/avo.base.css

@@ -7102,10 +7102,6 @@ tag.tagify__tag{
   margin-left:2.5rem
 }
 
-.ml-12{
-  margin-left:3rem
-}
-
 .ml-2{
   margin-left:0.5rem
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord