avo 2.30.2 → 2.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc6bc41d1c4845492b9ee785b1ccd4895d0369ec54d2b307c67835a112059923
-  data.tar.gz: a04214b31f49e408ecf64166c126dd8a114543f4c3ad01383f33ba1d7216c88d
+  metadata.gz: d2d89325380615d00eeac9d1c507409b602452f320e96ce8818830b580cb5ffd
+  data.tar.gz: 787b185e5f37182a75dec5935ea5cd0a2d1cd1986981b79ff6393bfc021e649d
 SHA512:
-  metadata.gz: e36a294bc70cd7568ea15c7e5d4323b1d261bfeaf7295ae2439cf581bef67ea0efcebe9995d23bfb416904e89810342df73d20591aa6790d128593ffceca7a16
-  data.tar.gz: d2eac35c9568ed230c05155823be7f52add0e4a86fa0f43ec85dbe2c69e84e5cb6188b7799714c739922269ba16b4919e3a0e7e7eb5f8d79cd4220669e0671ba
+  metadata.gz: 02eba26931bf6ea8300df3fc44006ad2390ddb3dd0ca6b474b438bd29953a5203e97f6b301297bc119572a8bef80341b62fcd7cc6c4ecf1dd7b065441ed168ff
+  data.tar.gz: fde51151f29f9c2c06d00cbdb0e16be8d594eb72c20669ad54944adb5d4f105098bf5f84b9a3878b3324837a3ea4086f067dc5030151161409f599699b06ae55

data/Gemfile

@@ -75,7 +75,7 @@ group :development do
 
   gem "htmlbeautifier"
 
-  gem "hotwire-livereload", "~> 1.1"
+  gem "hotwire-livereload", "~> 1.2"
 
   gem "brakeman"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.30.2)
+    avo (2.31.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -13,7 +13,7 @@ PATH
       meta-tags
       pagy
       turbo-rails
-      view_component
+      view_component (>= 2.54.0)
       zeitwerk (>= 2.6.2)
 
 GEM
@@ -196,7 +196,7 @@ GEM
     highline (2.1.0)
     hightop (0.3.0)
       activesupport (>= 5.2)
-    hotwire-livereload (1.2.2)
+    hotwire-livereload (1.2.3)
       listen (>= 3.0.0)
       rails (>= 6.0.0)
     html_tokenizer (0.0.7)
@@ -233,10 +233,10 @@ GEM
     json (2.6.2)
     launchy (2.5.2)
       addressable (~> 2.8)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.8.1)
@@ -268,7 +268,7 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
@@ -331,7 +331,7 @@ GEM
       activerecord (>= 6.0.4)
       activesupport (>= 6.0.4)
       i18n
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.8.1)
@@ -421,7 +421,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
-    view_component (2.82.0)
+    view_component (3.0.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -483,7 +483,7 @@ DEPENDENCIES
   gem-release
   groupdate
   hightop
-  hotwire-livereload (~> 1.1)
+  hotwire-livereload (~> 1.2)
   htmlbeautifier
   httparty
   i18n-tasks (~> 1.0.12)

data/app/components/avo/actions_component.rb

@@ -11,7 +11,7 @@ class Avo::ActionsComponent < ViewComponent::Base
     @exclude = exclude
     @color = color
     @style = style
-    @label = label || t("avo.actions")
+    @label = label || I18n.t("avo.actions")
   end
 
   def render?

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

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

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

@@ -4,7 +4,7 @@
   </turbo-frame>
 <% else %>
   <%= render Avo::PanelComponent.new(name: @field.name) do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
       <% if !@field.is_readonly? && !@field.is_disabled? && can_attach? %>
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
@@ -25,7 +25,7 @@
       <% end %>
     <% end %>
 
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="py-8 flex justify-center items-center">
         <%= empty_state by_association: params[:related_name].present? %>
       </div>

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

@@ -4,7 +4,7 @@
   <% end %>
 <% elsif item.is_panel? %>
   <%= render Avo::PanelComponent.new(name: item.name, description: item.description, index: index) do |c| %>
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="divide-y">
         <% item.visible_items.each_with_index do |field, index| %>
           <%= render field

data/app/components/avo/resource_component.rb

@@ -119,7 +119,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
 
     if filtered_fields.present?
-      filtered_fields.find { |f| f.id == @reflection.name }.readonly
+      filtered_fields.find { |f| f.id == @reflection.name }.is_readonly?
     else
       false
     end

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

@@ -19,7 +19,7 @@
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
     <%= content_tag :div, class: 'space-y-12' do %>
       <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-        <% c.tools do %>
+        <% c.with_tools do %>
           <%= a_link back_path,
             style: :text,
             icon: 'arrow-left' do %>
@@ -56,7 +56,7 @@
         <%# Extract the main panel and display the fields here. %>
         <%# This way we'll be able to render the footer buttons under the main fields. %>
         <% if main_panel.present? %>
-          <% c.body do %>
+          <% c.with_body do %>
             <div class="divide-y">
               <% main_panel.items.each_with_index do |field, index| %>
                 <%= render field
@@ -69,12 +69,12 @@
           <% end %>
         <% end %>
         <% if sidebar.present? %>
-          <% c.sidebar do %>
+          <% c.with_sidebar do %>
             <%= render sidebar_component form: form %>
           <% end %>
         <% end %>
         <% if Avo.configuration.buttons_on_form_footers %>
-          <% c.footer_tools do %>
+          <% c.with_footer_tools do %>
             <div class="mt-4">
               <%= a_link back_path,
               style: :text,

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

@@ -5,7 +5,7 @@
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
       <% if can_attach? %>
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
@@ -29,7 +29,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' if @resource.search_query.nil? && @filters.empty? && available_view_types.count <= 1 %>">
         <% if show_search_input %>
           <div class="flex items-center px-4 w-64">
@@ -56,7 +56,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% c.bare_content do %>
+    <% c.with_bare_content do %>
       <% if view_type.to_sym == :table %>
         <% if @models.present? %>
           <div class="mt-4">

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

@@ -8,7 +8,7 @@
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
       <% if @resource.has_show_controls? %>
         <% @resource.render_show_controls.each do |control| %>
           <% if control.back_button? %>
@@ -155,7 +155,7 @@
       <% end %>
     <% end %>
     <% if main_panel.present? %>
-      <% c.body do %>
+      <% c.with_body do %>
         <%# the overflow helps with long values %>
         <div class="divide-y overflow-auto">
           <% main_panel.items.each_with_index do |field, index| %>
@@ -169,7 +169,7 @@
       <% end %>
     <% end %>
     <% if sidebar.present? %>
-      <% c.sidebar do %>
+      <% c.with_sidebar do %>
         <%= render sidebar_component %>
       <% end %>
     <% end %>

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

@@ -14,7 +14,7 @@
       data: @action.class.form_data_attributes do |form|
     %>
     <%= render Avo::ModalComponent.new do |c| %>
-      <% c.heading do %>
+      <% c.with_heading do %>
         <%= @action.action_name %>
       <% end %>
       <div class="flex-1 flex">
@@ -33,7 +33,7 @@
           <% end %>
         </div>
       <% end %>
-      <% c.controls do %>
+      <% c.with_controls do %>
         <%= a_button type: :button,
           data: { action: 'click->modal#close' },
           size: :sm,

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

@@ -11,7 +11,7 @@
       'turbo-frame': '_top'
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
-      <% c.heading do %>
+      <% c.with_heading do %>
         <%= t 'avo.choose_item', item: @related_resource.name.downcase %>
       <% end %>
 
@@ -39,7 +39,7 @@
         <% end %>
       </div>
 
-      <% c.controls do %>
+      <% c.with_controls do %>
         <%= a_button 'data-action': 'click->modal#close', size: :sm, style: :outline, color: :gray do %>
           <%= t('avo.cancel') %>
         <% end %>

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

@@ -1,5 +1,5 @@
 <%= render Avo::PanelComponent.new(name: @dashboard.name, description: @dashboard.description) do |c| %>
-  <% c.bare_content do %>
+  <% c.with_bare_content do %>
     <% if @dashboard.items.present? %>
       <div class="min-h-24">
         <%= content_tag(:div, class: "grid gap-4 grid-cols-1 #{@dashboard.classes}") do %>
@@ -23,7 +23,7 @@
       <div class="w-full h-full">
         <% if Rails.env.development? %>
           <%= render Avo::PanelComponent.new do |c| %>
-            <% c.body do %>
+            <% c.with_body do %>
               <div class="p-6">
                 <%= t 'avo.empty_dashboard_message' %>. <%= link_to 'Docs', 'https://docs.avohq.io/2.0/dashboards.html', target: '_blank' %>
               </div>

data/app/views/avo/debug/index.html.erb

@@ -15,9 +15,9 @@
 %>
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(name: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
     <% end %>
-    <% c.bare_content do %>
+    <% c.with_bare_content do %>
       <div class="grid gap-4 sm:grid-cols-3">
         <div class="relative flex flex-col bg-white rounded shadow-panel p-4 space-y-4 h-full col-span-1">
         <div class="flex justify-between w-full">

data/app/views/avo/home/index.html.erb

@@ -1,6 +1,6 @@
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">
           <h3>About</h3>

data/app/views/avo/private/design.html.erb

@@ -1,6 +1,6 @@
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
       <%= a_link('/admin', icon: 'arrow-left', color: :green, style: :primary, is_link: true) do %>
         Primary
       <% end %>
@@ -18,7 +18,7 @@
       <% end %>
     <% end %>
 
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <%= render 'links_and_buttons' %>
       </div>

data/avo.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "zeitwerk", ">= 2.6.2"
   spec.add_dependency "httparty"
   spec.add_dependency "active_link_to"
-  spec.add_dependency "view_component"
+  spec.add_dependency "view_component", ">= 2.54.0"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"

data/lib/avo/app.rb

@@ -63,7 +63,7 @@ module Avo
             if Rails::VERSION::MAJOR === 6
               ActiveStorage::Current.host = request.base_url
             elsif Rails::VERSION::MAJOR === 7
-              ActiveStorage::Current.url_options = request.base_url
+              ActiveStorage::Current.url_options = {protocol: request.protocol, host: request.host, port: request.port}
             end
           end
         rescue => exception

data/lib/avo/concerns/policy_helpers.rb

@@ -0,0 +1,31 @@
+module Avo
+  module Concerns
+    module PolicyHelpers
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def inherit_association_from_policy(association_name, policy_class)
+          [:create, :edit, :update, :destroy, :show, :reorder, :act_on].each do |method_action|
+            define_policy_method(method_action, association_name, policy_class)
+          end
+
+          define_policy_method("view", association_name, policy_class, "index")
+        end
+
+        private
+
+        # Define a method for the given action and association name.
+        # Call the policy class with the given action passing the user and record.
+        # Example:
+        #  def create_team_members?
+        #   TeamMemberPolicy.new(user, record).create?
+        #  end
+        def define_policy_method(method_action, association_name, policy_class, policy_action = method_action)
+          define_method "#{method_action}_#{association_name}?" do
+            policy_class.new(user, record).send "#{policy_action}?"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/engine.rb

@@ -14,11 +14,6 @@ Gem.loaded_specs["avo"].dependencies.each do |d|
   end
 end
 
-# In development we should load the engine so we get the autoload for components
-if ENV["RAILS_ENV"] === "development"
-  require "view_component/engine"
-end
-
 module Avo
   class Engine < ::Rails::Engine
     isolate_namespace Avo

data/lib/avo/fields/base_field.rb

@@ -85,7 +85,6 @@ module Avo
 
         @args = args
 
-        @updatable = !readonly
         @computable = true
         @computed = block.present?
         @computed_value = nil
@@ -257,7 +256,7 @@ module Avo
       end
 
       def updatable
-        @updatable && visible?
+        !is_readonly? && visible?
       end
 
       private

data/lib/avo/version.rb

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

data/lib/generators/avo/templates/resource_tools/partial.tt

@@ -1,12 +1,12 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: "<%= human_name %>") do |c| %>
-    <%% c.tools do %>
+    <%% c.with_tools do %>
       <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', color: :primary, style: :primary) do %>
         Dummy link
       <%% end %>
     <%% end %>
 
-    <%% c.body do %>
+    <%% c.with_body do %>
       <div class="flex flex-col p-4 min-h-24">
         <div class="space-y-4">
           <h3>🪧 This partial is waiting to be updated</h3>

data/lib/generators/avo/templates/tool/view.tt

@@ -1,10 +1,10 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: '<%= human_name %>', display_breadcrumbs: true) do |c| %>
-    <%% c.tools do %>
+    <%% c.with_tools do %>
       <div class="text-sm italic">This is the panels tools section.</div>
     <%% end %>
 
-    <%% c.body do %>
+    <%% c.with_body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">
           <h3>What a nice new tool 👋</h3>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.30.2
+  version: 2.31.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.54.0
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1726,6 +1726,7 @@ files:
 - lib/avo/concerns/has_stimulus_controllers.rb
 - lib/avo/concerns/is_resource_item.rb
 - lib/avo/concerns/model_class_constantized.rb
+- lib/avo/concerns/policy_helpers.rb
 - lib/avo/concerns/visible_in_dashboard.rb
 - lib/avo/concerns/visible_items.rb
 - lib/avo/configuration.rb