avo 2.1.2.pre2 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde8997aaf953104f34a221e6be3c93b6c7f20bc1b9f125615c0ff994cc6791f
-  data.tar.gz: ca3a39976e8046d165cdb66a8aad6260e98d869981e73eba1d6d121bb57a7580
+  metadata.gz: 35ab86df7a30aa58a644902eea79236c3b46f3f77eb86fc791e100dbdfc4c278
+  data.tar.gz: a1c038e4cfd7101b35361638152c60f1ec06d456364909860cb9296ffa1aa99a
 SHA512:
-  metadata.gz: 50c30c580b89ad850a34c0125ad0079d34a1af72eefbb99193644f605692ea5f3e2bb54e1a0032ef04e219ba84888171cfcf6b69c6da045475f21afc50747680
-  data.tar.gz: 0ce0f8be40b683c2c1ef5b8e963bbbb0d8282e4e0b7d193f4acedee530d9618481a036a0c3955214d4c024876a374009c82df85a788708aebf603943595218c1
+  metadata.gz: 9976990e8b22f579579f2e983e1990a058fe8f91e27e40972b8ee745a879d3200eb134a9583fb7c7c7f8991e6e44dd18ba5d832914025b8faa881336a5da2168
+  data.tar.gz: 7f16c6e613a17e130a7c2352ac343da1c29b95be680f697dc51f8f95ffbb779751b7fd73ece5f905d020ca2a275cce4c61c07ebdda97a95321efb87f08a0979e

data/Gemfile

@@ -34,7 +34,7 @@ gem "puma", "~> 5.6.4"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem "jbuilder", "~> 2.7"
 # Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
+gem 'redis', '~> 4.0'
 # Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
@@ -79,10 +79,12 @@ group :development do
   # gem 'pry-rails'
 
   gem 'htmlbeautifier'
+
+  gem "hotwire-livereload", "~> 1.1"
 end
 
 group :development, :test do
-  gem 'ap'
+  gem "awesome_print"
   gem "faker", require: false
 end
 

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    avo (2.1.2.pre2)
+    avo (2.2.2)
       active_link_to
       addressable
       breadcrumbs_on_rails
       chartkick
       countries
+      docile
       dry-initializer
       hotwire-rails
       httparty
@@ -89,13 +90,12 @@ GEM
       activerecord (>= 4.2)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ap (0.1.1)
-      httparty (>= 0.7.7)
     appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    awesome_print (1.9.2)
     aws-eventstream (1.2.0)
     aws-partitions (1.551.0)
     aws-sdk-core (3.125.5)
@@ -183,6 +183,9 @@ GEM
     hashdiff (1.0.1)
     hightop (0.3.0)
       activesupport (>= 5.2)
+    hotwire-livereload (1.1.0)
+      listen (>= 3.0.0)
+      rails (>= 6.0.0)
     hotwire-rails (0.1.3)
       rails (>= 6.0.0)
       stimulus-rails
@@ -239,7 +242,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
@@ -297,6 +300,7 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    redis (4.6.0)
     regexp_parser (2.2.0)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -414,9 +418,9 @@ DEPENDENCIES
   active_median
   acts_as_list
   addressable
-  ap
   appraisal
   avo!
+  awesome_print
   aws-sdk-s3
   bootsnap (>= 1.4.2)
   breadcrumbs_on_rails
@@ -435,6 +439,7 @@ DEPENDENCIES
   gem-release
   groupdate
   hightop
+  hotwire-livereload (~> 1.1)
   hotwire-rails
   htmlbeautifier
   httparty
@@ -452,6 +457,7 @@ DEPENDENCIES
   rails (~> 6.1.0)
   rails-controller-testing
   ransack
+  redis (~> 4.0)
   rspec-rails (~> 4.0.0)
   rubocop
   rubocop-shopify

data/app/assets/svgs/{dashboards-icon.svg → dashboards.svg}

@@ -1,4 +1,4 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M8.4 2H2V8.4H8.4V2Z" stroke="#757D8A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M18 2H11.6V8.4H18V2Z" stroke="#757D8A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M8.4 11.6001H2V18.0001H8.4V11.6001Z" stroke="#757D8A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>

data/app/components/avo/button_component.rb

@@ -24,8 +24,12 @@ class Avo::ButtonComponent < ViewComponent::Base
   end
 
   def args
-    if @args[:spinner]
+    if @args[:loading]
       @args[:"data-controller"] = "loading-button"
+
+      if @args[:confirm]
+        @args[:"data-avo-confirm"] = @args.delete(:confirm)
+      end
     end
 
     @args[:class] = button_classes
@@ -34,7 +38,7 @@ class Avo::ButtonComponent < ViewComponent::Base
   end
 
   def button_classes
-    classes = "button-component inline-flex flex-grow-0 items-center text-sm font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-30 border justify-center active:outline active:outline-1 #{@class}"
+    classes = "button-component inline-flex flex-grow-0 items-center text-sm font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 border justify-center active:outline active:outline-1 #{@class}"
 
     classes += " rounded" if @rounded.present?
 

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

@@ -7,6 +7,7 @@
   ></div>
   <div class="relative w-full" autocomplete="off">
     <%= @form.text_field @foreign_key,
+      type: :text,
       value: field_label,
       class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
       placeholder: @field.placeholder,

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -9,8 +9,11 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
   def disabled
     return true if @field.readonly
-    return true if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
-    return true if @field.id.to_s == params[:via_relation].to_s
+
+    # When visiting the record through it's association we keep the field disabled by default
+    # We make an exception when the user deliberately instructs Avo to allow detaching in this scenario
+    return !@field.allow_via_detaching if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
+    return !@field.allow_via_detaching if @field.id.to_s == params[:via_relation].to_s
 
     false
   end

data/app/components/avo/index/field_wrapper_component.rb

@@ -17,6 +17,19 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
       result += " py-3"
     end
 
+    result += " #{text_align_classes}"
+
     result
   end
+
+  private
+
+  def text_align_classes
+    case @field.index_text_align.to_sym
+    when :right
+      'text-right'
+    when :center
+      'text-center'
+    end
+  end
 end

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

@@ -3,7 +3,9 @@
   <%== item_selector_init @resource %>
 >
   <div class="relative w-full pb-3/4 rounded-t overflow-hidden">
-    <%== item_selector_input floating: true, size: :lg %>
+    <% if @resource.record_selector %>
+      <%== item_selector_input floating: true, size: :lg %>
+    <% end %>
     <% if cover.blank? %>
       <%= link_to cover.link_to_resource do %>
         <%= render Avo::Index::GridCoverEmptyStateComponent.new %>

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

@@ -2,11 +2,13 @@
   class="bg-white hover:bg-blue-50 hover:shadow-row hover:z-[21] relative z-20 border-b"
   <%== item_selector_init @resource %>
 >
-  <td class="w-10">
-    <div class="flex justify-center h-full">
-      <%== item_selector_input floating: false %>
-    </div>
-  </td>
+  <% if @resource.record_selector %>
+    <td class="w-10">
+      <div class="flex justify-center h-full">
+        <%== item_selector_input floating: false %>
+      </div>
+    </td>
+  <% end %>
   <% @resource.get_fields(reflection: @reflection).each_with_index do |field, index| %>
     <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model) %>
   <% end %>

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

@@ -1,19 +1,19 @@
 <div <%== data_attributes %>>
   <% if render_header? %>
     <div class="<%= white_panel_classes %> p-4 flex-1 flex flex-col xl:flex-row justify-between mb-6">
-      <div class="overflow-hidden mr-4">
+      <div class="overflow-hidden mr-4 flex flex-col">
         <% if display_breadcrumbs? %>
           <div class="breadcrumbs truncate mb-2">
             <%= helpers.render_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
           </div>
         <% end %>
 
-        <div class="text-2xl tracking-normal font-semibold text-gray-800 truncate" data-target="title">
-          <%= @title %>
+        <div class="text-2xl tracking-normal font-semibold text-gray-800 truncate items-center flex flex-1" data-target="title">
+          <span><%= @title %></span>
         </div>
 
         <% if description.present? %>
-        <div class="text-base tracking-normal font-medium text-gray-600 truncate" data-target="description">
+        <div class="text-base tracking-normal font-medium text-gray-600" data-target="description">
           <%== description %>
         </div>
         <% end %>

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

@@ -1,3 +1,3 @@
-<%= link_to @path, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-blue-100 block px-4 py-1 w-full py-3 text-center rounded w-full" do %>
-  <%= @icon if @icon.present? %> <%= @label %>
+<%= link_to path, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-blue-100 block px-4 py-1 w-full py-3 text-center rounded w-full", target: target do %>
+  <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
 <% end %>

data/app/components/avo/profile_item_component.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 class Avo::ProfileItemComponent < ViewComponent::Base
+  attr_reader :label
+  attr_reader :icon
+  attr_reader :path
+  attr_reader :active
+  attr_reader :target
+
   def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil)
     @label = label
     @icon = icon

data/app/components/avo/sidebar/base_item_component.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Avo::Sidebar::BaseItemComponent < ViewComponent::Base
+  attr_reader :item
+
+  def initialize(item: nil)
+    @item = item
+  end
+
+  def items
+    item.items
+  end
+
+  def key
+    result = "avo.#{request.host}.main_menu.#{item.name.underscore}"
+
+    if item.icon.present?
+      result += ".#{item.icon.parameterize.underscore}"
+    end
+
+    result
+  end
+
+  def collapsable
+    item.collapsable
+  end
+
+  def collapsed
+    item.collapsed
+  end
+end

data/app/components/avo/sidebar/group_component.html.erb

@@ -0,0 +1,28 @@
+<div class="pb-2 space-y-1"
+  <% if collapsable %>
+    data-controller="menu"
+    data-menu-target="self"
+    data-menu-key-param="<%= key %>"
+    data-menu-collapsed-param="<%= collapsed ? 'collapsed' : 'expanded' %>"
+  <% end %>
+>
+  <div class="flex justify-between px-10 pt-2 pb-0 text-gray-600 ">
+    <div class="flex items-center text-xs uppercase font-semibold leading-none">
+      <%= item.name %>
+    </div>
+    <% if collapsable %>
+      <div class="cursor-pointer"
+        data-action="click->menu#triggerCollapse"
+        data-menu-target="svg"
+        data-menu-key-param="<%= key %>"
+        >
+        <%= helpers.svg 'heroicons/outline/chevron-down', class: 'h-4'%>
+      </div>
+    <% end %>
+  </div>
+  <div class="w-full space-y-1" data-menu-target="items">
+    <% items.each do |item| %>
+      <%= render Avo::Sidebar::ItemSwitcherComponent.new item: item %>
+    <% end %>
+  </div>
+</div>

data/app/components/avo/sidebar/group_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Sidebar::GroupComponent < Avo::Sidebar::BaseItemComponent
+end

data/app/components/avo/sidebar/heading_component.html.erb

@@ -0,0 +1,14 @@
+<div class="flex justify-between p-4 py-2 text-gray-500">
+  <div class="flex items-center text-sm uppercase font-semibold leading-none space-x-1">
+    <span class="min-w-[20px]"><%= icon %></span> <span><%= label %></span>
+  </div>
+  <% if collapsable %>
+    <div class="cursor-pointer"
+      data-action="click->menu#triggerCollapse"
+      data-menu-key-param="<%= key %>"
+      data-menu-target="svg"
+    >
+      <%= helpers.svg 'heroicons/outline/chevron-down', class: 'h-5'%>
+    </div>
+  <% end %>
+</div>

data/app/components/avo/sidebar/heading_component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Avo::Sidebar::HeadingComponent < ViewComponent::Base
+  attr_reader :collapsable
+  attr_reader :icon
+  attr_reader :key
+  attr_reader :label
+
+  def initialize(label: nil, icon: nil, collapsable: false, key: nil)
+    @collapsable = collapsable
+    @icon = icon
+    @key = key
+    @label = label
+  end
+end

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

@@ -0,0 +1,16 @@
+<% if item.is_a? Avo::Menu::Link %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target %>
+<% end %>
+<% if item.is_a? Avo::Menu::Resource %>
+  <%= render Avo::Sidebar::LinkComponent.new label: resource.navigation_label, path: helpers.resources_path(resource: resource) %>
+<% end %>
+<% if item.is_a? Avo::Menu::Dashboard %>
+  <%= render Avo::Sidebar::LinkComponent.new label: dashboard.navigation_label, path: dashboard.navigation_path %>
+<% end %>
+<% if item.is_a? Avo::Menu::Section %>
+  <%= render Avo::Sidebar::SectionComponent.new item: item %>
+<% end %>
+<% if item.is_a? Avo::Menu::Group %>
+  <%= render Avo::Sidebar::GroupComponent.new item: item %>
+<% end %>
+

data/app/components/avo/sidebar/item_switcher_component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Avo::Sidebar::ItemSwitcherComponent < Avo::Sidebar::BaseItemComponent
+  def resource
+    item.parsed_resource
+  end
+
+  def dashboard
+    item.parsed_dashboard
+  end
+
+  def render?
+    item.visible?
+  end
+end

data/app/components/avo/sidebar/link_component.html.erb

@@ -0,0 +1,12 @@
+<% if path.present? %>
+  <%= send link_method, path, class: classes, active: active, target: target do %>
+    <%= label %>
+    <% if target == :_blank %>
+      <%= helpers.svg('heroicons/outline/external-link', class: 'self-center ml-auto h-3') %>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= content_tag :div, class: classes, active: active, target: target do %>
+    <%= label %>
+  <% end %>
+<% end %>

data/app/components/avo/sidebar/link_component.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Avo::Sidebar::LinkComponent < ViewComponent::Base
+  attr_reader :active
+  attr_reader :target
+  attr_reader :label
+  attr_reader :path
+
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil)
+    @label = label
+    @path = path
+    @active = active
+    @target = target
+  end
+
+  def is_external?
+    URI(path).scheme.present?
+  end
+
+  # For external links active_link_to marks them all as active.
+  def link_method
+    is_external? ? :link_to : :active_link_to
+  end
+
+  def classes
+    "px-4 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-150"
+  end
+end

data/app/components/avo/sidebar/section_component.html.erb

@@ -0,0 +1,15 @@
+<div class="space-y-1"
+  <% if collapsable %>
+    data-controller="menu"
+    data-menu-target="self"
+    data-menu-key-param="<%= key %>"
+    data-menu-collapsed-param="<%= collapsed ? 'collapsed' : 'expanded' %>"
+  <% end %>
+>
+  <%= render Avo::Sidebar::HeadingComponent.new label: item.name, icon: helpers.svg(icon, class: 'h-5'), collapsable: item.collapsable, key: key %>
+  <div class="w-full space-y-1" data-menu-target="items">
+    <% items.each do |item| %>
+      <%= render Avo::Sidebar::ItemSwitcherComponent.new item: item %>
+    <% end %>
+  </div>
+</div>

data/app/components/avo/sidebar/section_component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Avo::Sidebar::SectionComponent < Avo::Sidebar::BaseItemComponent
+  def icon
+    return nil if item.icon.nil?
+
+    item.icon
+  end
+end

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

@@ -7,41 +7,50 @@
       </div>
     </div>
     <div class="flex-1 flex flex-col justify-between overflow-auto mt-3">
-      <div class="space-y-6">
-        <%= render Avo::SidebarItemComponent.new label: 'Get started', path: helpers.avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
+      <div class="space-y-6 mb-4">
+        <%= render Avo::Sidebar::LinkComponent.new label: 'Get started', path: helpers.avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil? %>
 
-        <% if dashboards.present? %>
-          <div>
-            <%= render Avo::SidebarHeadingComponent.new label: t('avo.dashboards'), icon: helpers.svg('dashboards-icon', class: 'h-4') %>
-
-            <div class="w-full space-y-1">
-              <% dashboards.sort_by { |r| r.navigation_label }.each do |dashboard| %>
-                <%= render Avo::SidebarItemComponent.new label: dashboard.navigation_label, path: dashboard.navigation_path %>
-              <% end %>
-            </div>
+        <% if Avo::App.license.has_with_trial(:menu_editor) && Avo.configuration.main_menu.present? %>
+          <div class="text-black space-y-4">
+            <% Avo::App.main_menu.items.each do |item| %>
+              <%= render Avo::Sidebar::ItemSwitcherComponent.new item: item %>
+            <% end %>
           </div>
-        <% end %>
+        <% else %>
 
-        <div>
-          <%= render Avo::SidebarHeadingComponent.new label: t('avo.resources'), icon: helpers.svg('resources-icon', class: 'h-4') %>
+          <% if dashboards.present? %>
+            <div>
+              <%= render Avo::Sidebar::HeadingComponent.new label: t('avo.dashboards'), icon: helpers.svg('dashboards', class: 'h-4') %>
 
-          <div class="w-full space-y-1">
-            <% resources.sort_by { |r| r.navigation_label }.each do |resource| %>
-              <%= render Avo::SidebarItemComponent.new label: resource.navigation_label, path: helpers.resources_path(resource: resource) %>
-            <% end %>
-          </div>
-        </div>
+              <div class="w-full space-y-1">
+                <% dashboards.sort_by { |r| r.navigation_label }.each do |dashboard| %>
+                  <%= render Avo::Sidebar::LinkComponent.new label: dashboard.navigation_label, path: dashboard.navigation_path %>
+                <% end %>
+              </div>
+            </div>
+          <% end %>
 
-        <% if tools.present? %>
           <div>
-            <%= render Avo::SidebarHeadingComponent.new label: t('avo.tools'), icon: helpers.svg('tools-icon', class: 'h-4') %>
+            <%= render Avo::Sidebar::HeadingComponent.new label: t('avo.resources'), icon: helpers.svg('resources', class: 'h-4') %>
 
             <div class="w-full space-y-1">
-              <% tools.each do |partial| %>
-                <%= render partial: "/avo/sidebar/items/#{partial}" %>
+              <% resources.sort_by { |r| r.navigation_label }.each do |resource| %>
+                <%= render Avo::Sidebar::LinkComponent.new label: resource.navigation_label, path: helpers.resources_path(resource: resource) %>
               <% end %>
             </div>
           </div>
+
+          <% if tools.present? %>
+            <div>
+              <%= render Avo::Sidebar::HeadingComponent.new label: t('avo.tools'), icon: helpers.svg('tools', class: 'h-4') %>
+
+              <div class="w-full space-y-1">
+                <% tools.each do |partial| %>
+                  <%= render partial: "/avo/sidebar/items/#{partial}" %>
+                <% end %>
+              </div>
+            </div>
+          <% end %>
         <% end %>
 
         <%= render partial: "/avo/partials/sidebar_extra" %>

data/app/components/avo/sidebar_component.rb

@@ -2,20 +2,14 @@
 
 class Avo::SidebarComponent < ViewComponent::Base
   def dashboards
-    return [] if Avo::App.license.lacks_with_trial(:dashboards)
-
-    Avo::App.get_dashboards(helpers._current_user).select do |dashboard|
-      dashboard.is_visible?
-    end
+    Avo::App.dashboards_for_navigation
   end
 
   def resources
-    Avo::App.resources_navigation(helpers._current_user)
+    Avo::App.resources_for_navigation
   end
 
   def tools
-    return [] if Avo::App.license.lacks_with_trial(:custom_tools)
-
-    Avo::App.get_sidebar_partials
+    Avo::App.tools_for_navigation
   end
 end

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

@@ -25,8 +25,17 @@
         class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full"
         data-toggle-panel-target="panel"
       >
+        <% if Avo::App.license.has_with_trial(:menu_editor) && Avo.configuration.profile_menu.present? %>
+          <div class="text-black space-y-4">
+            <% Avo::App.profile_menu.items.each do |item| %>
+              <% if item.is_a? Avo::Menu::Link %>
+                <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon %>
+              <% end %>
+            <% end %>
+          </div>
+        <% end %>
         <%# Example link below %>
-        <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: helpers.svg('user-circle', class: 'h-4 mr-1') %>
+        <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
         <%= button_to helpers.main_app.send(destroy_user_session_path),
           method: :delete,
           form: { "data-turbo" => "false" },

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

@@ -13,7 +13,7 @@
             <%= t('avo.cancel').capitalize %>
           <% end %>
           <% if can_see_the_save_button? %>
-            <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+            <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
               <%= t('avo.save').capitalize %>
             <% end %>
           <% end %>
@@ -24,7 +24,7 @@
               <%= t('avo.cancel').capitalize %>
             <% end %>
             <% if can_see_the_save_button? %>
-              <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+              <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
                 <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>

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

@@ -18,7 +18,7 @@
               <%= t('avo.cancel').capitalize %>
             <% end %>
             <% if can_see_the_save_button? %>
-              <%= a_button color: 'green', spinner: true, type: :submit, icon: 'save' do %>
+              <%= a_button color: 'green', loading: true, type: :submit, icon: 'save' do %>
                 <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>
@@ -30,7 +30,7 @@
               <%= t('avo.cancel').capitalize %>
             <% end %>
             <% if can_see_the_save_button? %>
-              <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+              <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
                 <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>