avo 2.11.3.pre.2 → 2.11.3.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4af2bced12108d7f563a575286b2406816c124175702899f292ff70f037a1b2
-  data.tar.gz: 5dabe5c91bec202127a43a8314344fdf7e9b9dc6d44eb707df3deaf4bfac9cf3
+  metadata.gz: 33a3f78d32b04247f263b94f22dcfbc0e825e3ea99a311c1642866b30a46524f
+  data.tar.gz: 7344cfbc9197ac2537003045a2ab340165ba4964b095ef914e6ca49852881373
 SHA512:
-  metadata.gz: 4b80c8c9697ac3e295b020e3441544ea333fbd31ec21d8fe051cb5385d164cd7a991f714b1ad6c0e19a08bffcaa0eba66b8f1f32f177b49e7f4a6bc1a85ef575
-  data.tar.gz: b77b943063b6830d8371cc09748c85e7c7fef75fbcf4574c53d01cc2af956f510cbfdc2d0381f6cd41ceb38266ff1f226ead36a6ed37061bcd83256a6d256538
+  metadata.gz: 25e7ee4600617e4786e3b0c43e6b1f03fa4e3e14ab861745d5c9915352cdeb2c66e4d1444ebf1e834c6cb82fea7d854f3440b274ca90a946630279370928cc69
+  data.tar.gz: 4363ffce5ed2b2172d0c992d98dd8c9bcc8c68e82e7e48dfec8040efe877f8b2aab9203e538110f1ac3a2f77fa2f2d90caa573fc24f7eddc6af6f619da791966

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.3.pre.2)
+    avo (2.11.3.pre.3)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -17,17 +17,17 @@
             <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
           <% end %>
         <% end %>
-      <% end %>
-      <% if can_see_the_actions_button? %>
-        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-      <% end %>
-      <% if can_see_the_create_button? %>
-        <%= a_link create_path,
+        <% if can_see_the_actions_button? %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+        <% end %>
+        <% if can_see_the_create_button? %>
+          <%= a_link create_path,
           icon: 'heroicons/outline/plus',
           'data-target': 'create',
           style: :primary,
           color: :primary do %>
-          <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
+            <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
+          <% end %>
         <% end %>
       <% end %>
       <% c.body do %>

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

@@ -5,9 +5,11 @@
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <div class="mb-6">
-    <%= render Avo::CardsListComponent.new parent: @resource %>
-  </div>
+  <% if @resource.cards.present? %>
+    <%= content_tag :div, class: "mb-6" do %>
+      <%= render Avo::CardsListComponent.new parent: @resource %>
+    <% end %>
+  <% end %>
   <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
     <% c.tools do %>
       <% if @reflection.present? && @resource.model.present? %>

data/app/controllers/avo/application_controller.rb

@@ -126,6 +126,7 @@ module Avo
     end
 
     def set_model
+      puts ["controller_name->", controller_name].inspect
       @model = eager_load_files(@resource, @resource.class.find_scope).find params[:id]
     end
 

data/app/controllers/avo/associations_controller.rb

@@ -7,7 +7,7 @@ module Avo
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_reflection_field
     before_action :set_related_model, only: [:show, :order]
-    before_action :hydrate_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
     before_action :set_reflection
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy, :order]

data/lib/avo/base_card.rb

@@ -69,7 +69,7 @@ module Avo
       if parent_is_dashboard?
         Avo::App.view_context.avo.dashboard_card_path(dashboard.id, id, turbo_frame: turbo_frame, index: index, range: enforced_range, **params.permit!.to_h)
       elsif parent_is_resource?
-        Avo::App.root_path(paths: ["resources", parent.route_key, parent.model.id, "cards", id], query: {turbo_frame: turbo_frame, index: index, range: enforced_range, **params.permit!.to_h})
+        Avo::App.root_path(paths: ["resources", parent.route_key, parent.model.id, "cards", id], query: {**params.permit!.to_h, turbo_frame: turbo_frame, index: index, range: enforced_range})
       end
     end
 
@@ -87,14 +87,13 @@ module Avo
       }
 
       classes_for_rows = {
-        1 => " min-h-[9rem] row-span-1",
-        2 => " min-h-[18rem] row-span-2",
-        3 => " min-h-[27rem] row-span-3",
-        4 => " min-h-[36rem] row-span-4",
-        5 => " min-h-[45rem] row-span-5",
-        6 => " min-h-[54rem] row-span-6"
+        1 => " min-h-[8rem] row-span-1",
+        2 => " min-h-[16rem] row-span-2",
+        3 => " min-h-[24rem] row-span-3",
+        4 => " min-h-[32rem] row-span-4",
+        5 => " min-h-[40rem] row-span-5",
+        6 => " min-h-[48rem] row-span-6"
       }
-      # puts ["cols->", cols, classes_for_cols, classes_for_rows, classes_for_cols[cols.to_i]].inspect
 
       result += classes_for_cols[cols.to_i] if classes_for_cols[cols.to_i].present?
       result += classes_for_rows[rows.to_i] if classes_for_rows[rows.to_i].present?

data/lib/avo/dashboards/chartkick_card.rb

@@ -24,10 +24,11 @@ module Avo
 
       def chartkick_options
         card_height = 128
-        card_heading = 30
+        card_heading = 32
 
         default = {
-          # figure our the available height for the chart
+          # figure our the available height for the chart.
+          # It's not ideal to work with magic numbers, I know.
           height: "#{(rows * card_height) - card_heading}px",
           colors: %w[#0B8AE2 #34C683 #2AB1EE #34C6A8],
           library: {

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.11.3.pre.2" unless const_defined?(:VERSION)
+  VERSION = "2.11.3.pre.3" unless const_defined?(:VERSION)
 end

data/public/avo-assets/avo.css

@@ -6699,30 +6699,6 @@ trix-editor .attachment__metadata .attachment__size {
   max-height:100%
 }
 
-.min-h-\[9rem\]{
-  min-height:9rem
-}
-
-.min-h-\[18rem\]{
-  min-height:18rem
-}
-
-.min-h-\[27rem\]{
-  min-height:27rem
-}
-
-.min-h-\[36rem\]{
-  min-height:36rem
-}
-
-.min-h-\[45rem\]{
-  min-height:45rem
-}
-
-.min-h-\[54rem\]{
-  min-height:54rem
-}
-
 .min-h-\[8rem\]{
   min-height:8rem
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.11.3.pre.2
+  version: 2.11.3.pre.3
 platform: ruby
 authors:
 - Adrian Marin