avo 3.10.6 → 3.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13c4b4bb35ac2adf3418f41602032955893eaf9c7f5575857d5f61808651608
-  data.tar.gz: e76a9aa45330312abf5d0847023a5a143e24871bdad72a42397fbb8775f3eb5f
+  metadata.gz: b6522100491a3502db0cd2f730a0a8135cf567cf17a6d38084d00122b9f4683a
+  data.tar.gz: b878fcd1ad6fb33182ab27b9c16d180fc6324f268f419bf8033f5b41fa7e36f8
 SHA512:
-  metadata.gz: cbf8a7e0c935ab671b5d0cc2ed210ea1495137ee30f3b7aa95aa11721bcc5bfdfc1f854730cd840d39a395e9f3ee6540b17c4bdb81259b4bd439241745ee3cdb
-  data.tar.gz: 25284219c36fe5b9469e8ca0e75fb999d3bdb4cd9dc7fbd986c67f880fbbbf90b785eedee368f856032960e649f76345737c8d7f85dd24c6601e80bd8d871ffa
+  metadata.gz: 5feea15d9c0607c974f687346630fd69109b69fbf874c41d1885c5402f356bbcfdf426c1f25d565f5c103d15ee5fe596f5fe7343468abcc2b6ebf78008f70c41
+  data.tar.gz: c0e12f8faa5c48e9da89f1f5e24fb89db4e9ae9978533ae9e6abda17280f94e41a9da981dfb5a8f663662b02bf307686b683be7043a423e51a03039a64f2195a

data/Gemfile.lock

@@ -115,7 +115,7 @@ GIT
 PATH
   remote: .
   specs:
-    avo (3.10.6)
+    avo (3.10.7)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -484,7 +484,7 @@ GEM
       railties (>= 5.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.3.1)
+    rexml (3.3.2)
       strscan
     ripper-tags (1.0.2)
     rspec-core (3.13.0)

data/README.md

@@ -14,9 +14,6 @@
 <a href="https://github.com/testdouble/standard">
   <img alt="Ruby Style" src="https://img.shields.io/badge/style-standard-168AFE?logo=ruby&logoColor=FE1616" />
 </a>
-<a href="https://discord.com/invite/vuuwFe4Km3">
-  <img alt="Avo Rails Admin Discord Community" src="https://img.shields.io/discord/740892036978442260?color=8892F6&label=discord&logo=discord&logoColor=8892F6">
-</a>
 [![codecov](https://codecov.io/gh/avo-hq/avo/branch/master/graph/badge.svg?token=Q2LMFE4989)](https://codecov.io/gh/avo-hq/avo)
 [![Maintainability](https://api.codeclimate.com/v1/badges/676a0afa2cc79f03aa29/maintainability)](https://codeclimate.com/github/avo-hq/avo/maintainability)
 
@@ -36,15 +33,13 @@ Avo is a very custom Admin Panel Framework, Content Management System, and Inter
 <br>
 🗺 **Roadmap**: [GitHub Roadmap](https://github.com/orgs/avo-hq/projects/14)
 <br>
-🎸 **Demo app**: [Avodemo](https://main.avodemo.com/)
-<br>
-🐤 **Twitter**: [avo_hq](https://twitter.com/avo_hq)
+🎸 **Demo App**: [Avodemo](https://main.avodemo.com/)
 <br>
-💬 **Community chat**: [discord](https://discord.gg/pkTF6y8)
+🐤 **Twitter**: [`avo_hq`](https://twitter.com/avo_hq)
 <br>
-🔧 **Issue tracker**: [GitHub issues](http://github.com/avo-hq/avo/issues)
+🔧 **Issue Tracker**: [GitHub Issues](http://github.com/avo-hq/avo/issues)
 <br>
-🎙 **Discussions and feature requests**: [GitHub issues](http://github.com/avo-hq/avo/discussions)
+🎙 **Discussions and Feature Requests**: [GitHub Discussions](http://github.com/avo-hq/avo/discussions)
 
 ## Features
 

data/app/components/avo/fields/boolean_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

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

@@ -17,7 +17,7 @@ class Avo::Fields::BooleanGroupField::EditComponent < Avo::Fields::EditComponent
     if params[@form_scope].present? && params[@form_scope][@field.id.to_s].present?
       params[@form_scope][@field.id.to_s].include?(id.to_s)
     elsif @field.value.present?
-      @field.value[id.to_s]
+      @field.value.with_indifferent_access[id]
     end
   end
 end

data/app/components/avo/fields/common/boolean_group_component.html.erb

@@ -1,13 +1,10 @@
 <div data-controller="tippy">
-  <%= link_to t('avo.view').humanize, 'javascript:void(0);', data: { 'tippy-target': 'source' } %>
+  <%= link_to t("avo.view").humanize, "javascript:void(0);", data: {"tippy-target": :source} %>
   <div class="hidden" data-tippy-target="content">
     <div class="p-2 space-y-2">
-      <%
-        @options.each do |id, label|
-          checked = @value.present? && @value[id.to_s].present?
-      %>
+      <% @options.each do |id, label| %>
         <div class="flex flex-nowrap">
-          <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: checked %>
+          <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @value.present? && @value&.with_indifferent_access[id].present? %>
           <div class="ml-px text-left py-px"><%= label %></div>
         </div>
       <% end %>

data/app/components/avo/resource_component.rb

@@ -50,8 +50,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def can_see_the_actions_button?
-    return false if @actions.blank?
-
     return authorize_association_for(:act_on) if @reflection.present?
 
     @resource.authorization.authorize_action(:act_on, raise_exception: false) && !has_reflection_and_is_read_only

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

@@ -4,7 +4,7 @@
   # We're appending it back if it's a turbo_frame_request.
 %>
 <% if helpers.turbo_frame_request? %>
-  <%= helpers.turbo_stream_action_tag :append, target: 'alerts', template: render(Avo::FlashAlertsComponent.new(flashes: helpers.flash)) %>
+  <%= helpers.turbo_stream_action_tag :append, target: "alerts", template: render(Avo::FlashAlertsComponent.new(flashes: helpers.flash)) %>
 <% end %>
 <%= content %>
 <% if name.present? %></turbo-frame><% end %>

data/app/controllers/avo/base_controller.rb

@@ -305,8 +305,15 @@ module Avo
       # Sorting
       if params[:sort_by].present?
         @index_params[:sort_by] = params[:sort_by]
-      elsif @resource.model_class.present? && @resource.model_class.column_names.include?("created_at")
-        @index_params[:sort_by] = :created_at
+      elsif @resource.model_class.present?
+        available_columns = @resource.model_class.column_names
+        default_sort_column = @resource.default_sort_column
+
+        if available_columns.include?(default_sort_column.to_s)
+          @index_params[:sort_by] = default_sort_column
+        elsif available_columns.include?("created_at")
+          @index_params[:sort_by] = :created_at
+        end
       end
 
       @index_params[:sort_direction] = params[:sort_direction] || :desc

data/lib/avo/asset_manager.rb

@@ -2,9 +2,6 @@ module Avo
   class AssetManager
     include ActionView::Helpers::AssetTagHelper
 
-    attr_reader :stylesheets
-    attr_reader :javascripts
-
     def initialize
       @stylesheets = []
       @javascripts = []
@@ -22,6 +19,14 @@ module Avo
     def add_javascript(path)
       @javascripts.push path
     end
+
+    def stylesheets
+      @stylesheets.uniq
+    end
+
+    def javascripts
+      @javascripts.uniq
+    end
   end
 
   def self.asset_manager