avo 2.11.1.pre.1 → 2.11.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4b497f78cd0e73ec8262210e9c08a7363c79e7a26ba50487d2f7c1a276c2759
-  data.tar.gz: 5935abd4525e9c013399f2997b964b0c1b37a44eb120b6ffa6cc263250b3e3fd
+  metadata.gz: 4bc7baa68c6256d8c8a26e4a40be36129d1187451015bc72c0ec2be65c3acd8b
+  data.tar.gz: 57a8ef18222e622ed7d3f45334b46c97183d10ea845b321044648cd1974faf22
 SHA512:
-  metadata.gz: '09eab1ccd43a4c4985305190e0016037bbc8b4943898165464e9c4438243790e3fae6655941a4a412958fb9b1ad5adb4f7a919a216d52a4ec102e7a8220ba86b'
-  data.tar.gz: c74c926431d190ca3c9ecb813d481c80867d8a52d4347bce32b372659d895653dd4bf1ca7a6b82e67e819ef3f0dc7d6baa0d7320ac7ab2fa326059f977cbad6a
+  metadata.gz: 3df946571876e5742a86eb9314fe1122ea2838bedd0c3af3027e754df24ca20a4c9961e62c46f50a399c9265ddbf2b1f2cb9b2fd2ffb43e13bdcf6595634d71c
+  data.tar.gz: 7d9b4560a2069d752f5e82bc66c0d0eb4e1e9df5d95261371e859c8907741ac80a43a7ba09ce5ed6f59da316723b9f1ab9dbb8de3931f98113fc5de1c619ee74

data/Gemfile

@@ -121,8 +121,6 @@ gem "hotwire-rails"
 
 gem "active_link_to"
 
-gem "view_component"
-
 gem "addressable"
 
 gem "appraisal"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.1.pre.1)
+    avo (2.11.1.pre.2)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -16,7 +16,7 @@ PATH
       pagy
       pundit
       rails (>= 6.0)
-      view_component
+      view_component (= 2.60)
       zeitwerk
 
 GEM
@@ -201,7 +201,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
@@ -390,10 +390,10 @@ GEM
     turbo-rails (1.0.1)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    view_component (2.57.1)
+    view_component (2.60.0)
       activesupport (>= 5.0.0, < 8.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -483,7 +483,6 @@ DEPENDENCIES
   standard
   test-prof
   tzinfo-data
-  view_component
   web-console (>= 3.3.0)
   webdrivers
   webmock

data/app/components/avo/item_switcher_component.rb

@@ -28,6 +28,8 @@ class Avo::ItemSwitcherComponent < Avo::BaseComponent
       return false if in_reflection? && item.hidden_in_reflection?
     end
 
+    return false if item.is_main_panel?
+
     true
   end
 

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

@@ -34,10 +34,8 @@
     </div>
   <% end %>
   <% if footer_tools? %>
-    <div class="<%= white_panel_classes %> p-4 flex-1 flex flex-col xl:flex-row justify-between mt-6">
-      <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
-        <%= footer_tools %>
-      </div>
+    <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
+      <%= footer_tools %>
     </div>
   <% end %>
   <% if footer? %>

data/app/components/avo/panel_component.rb

@@ -47,8 +47,4 @@ class Avo::PanelComponent < ViewComponent::Base
   def render_header?
     @name.present? || description.present? || tools.present? || display_breadcrumbs?
   end
-
-  def render_footer_tools?
-    footer_tools.present?
-  end
 end

data/app/components/avo/resource_component.rb

@@ -58,33 +58,14 @@ class Avo::ResourceComponent < Avo::BaseComponent
     association_policy
   end
 
-  def split_panel_fields
-    initialize_panels
-    @resource.get_fields.each do |field|
-      case field.class.to_s
-      when "Avo::Fields::HasOneField"
-        @has_one_panels << field
-      when "Avo::Fields::HasManyField"
-        @has_many_panels << field
-      when "Avo::Fields::HasAndBelongsToManyField"
-        @has_as_belongs_to_many_panels << field
-      else
-        @fields_by_panel[field.panel_name] ||= []
-        @fields_by_panel[field.panel_name] << field
-      end
+  def main_panel
+    @resource.get_items.find do |item|
+      item.is_main_panel?
     end
   end
 
   private
 
-  def initialize_panels
-    @fields_by_panel = {}
-    @has_one_panels = []
-    @has_many_panels = []
-    @has_as_belongs_to_many_panels = []
-    @resource_tools = @resource.tools
-  end
-
   def via_resource?
     params[:via_resource_class].present? && params[:via_resource_id].present?
   end

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

@@ -14,7 +14,10 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   end
 
   def is_external?
-    URI(path).scheme.present?
+    # If the path contains the scheme, check if it includes the root path or not
+    return !path.include?(Avo::App.root_path) if URI(path).scheme.present?
+
+    false
   end
 
   # For external links active_link_to marks them all as active.

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

@@ -5,8 +5,7 @@
     controller: "tabs",
     tabs_view_value: view,
     tabs_active_tab_value: active_tab_name
-  },
-  class: 'space-y-12' do %>
+  } do %>
   <% visible_tabs.each_with_index do |tab, index| %>
     <%
       args = {

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

@@ -33,20 +33,42 @@
           <% end %>
         <% end %>
       <% end %>
+      <%# 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 %>
+          <div class="divide-y">
+            <% main_panel.items.each_with_index do |field, index| %>
+              <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)
+                .component_for_view(view)
+                .new(field: field, resource: @resource, index: index, form: form)
+              %>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
       <% if Avo.configuration.buttons_on_form_footers %>
         <% c.footer_tools do %>
-          <%= a_link back_path, icon: 'arrow-left' do %>
-            <%= t('avo.cancel').capitalize %>
-          <% end %>
-          <% if can_see_the_save_button? %>
-            <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
-              <%= t('avo.save').capitalize %>
+          <div class="mt-4">
+            <%= a_link back_path,
+              style: :text,
+              icon: 'arrow-left' do %>
+              <%= t('avo.cancel').capitalize %>
             <% end %>
-          <% end %>
+            <% if can_see_the_save_button? %>
+              <%= a_button color: :primary,
+                style: :primary,
+                loading: true,
+                type: :submit,
+                icon: 'save' do %>
+                <%= t('avo.save').capitalize %>
+              <% end %>
+            <% end %>
+          </div>
         <% end %>
       <% end %>
     <% end %>
-    <%= content_tag :div, class: 'space-y-12' do %>
+    <%= content_tag :div, class: 'space-y-12 mt-12' do %>
       <% @resource.get_items.each_with_index do |item, index| %>
         <% next if item.nil? %>
         <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: @view, form: form %>

data/app/components/avo/views/resource_edit_component.rb

@@ -11,8 +11,6 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     @model = model
     @actions = actions
     @view = view
-
-    split_panel_fields
   end
 
   def title

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

@@ -64,8 +64,20 @@
         <% end %>
       <% end %>
     <% end %>
+    <% if main_panel.present? %>
+      <% c.body do %>
+        <div class="divide-y">
+          <% main_panel.items.each_with_index do |field, index| %>
+            <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)
+              .component_for_view(view)
+              .new(field: field, resource: @resource, index: index)
+            %>
+          <% end %>
+        </div>
+      <% end %>
+    <% end %>
   <% end %>
-  <%= content_tag :div, class: 'space-y-12' do %>
+  <%= content_tag :div, class: 'space-y-12 mt-12' do %>
     <% @resource.get_items.each_with_index do |item, index| %>
       <% next if item.nil? %>
       <%= render Avo::ItemSwitcherComponent.new resource: @resource, reflection: @reflection, item: item, index: index + 1, view: @view %>

data/app/components/avo/views/resource_show_component.rb

@@ -10,8 +10,6 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     @resource_panel = resource_panel
     @actions = actions
     @view = :show
-
-    split_panel_fields
   end
 
   def title

data/app/controllers/avo/base_controller.rb

@@ -320,7 +320,9 @@ module Avo
         .map do |action|
           action.new(model: @model, resource: @resource, view: @view)
         end
-        .select { |action| action.visible_in_view }
+        .select do |action|
+          action.visible_in_view
+        end
     end
 
     def set_applied_filters
@@ -380,7 +382,6 @@ module Avo
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)
         add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
-        puts ["via_resource.model_title->", via_resource.model_title].inspect
 
         last_crumb_args = {
           via_resource_class: params[:via_resource_class],

data/app/views/avo/base/edit.html.erb

@@ -1,2 +1 @@
 <%= render Avo::Views::ResourceEditComponent.new(resource: @resource, view: @view, actions: @actions) %>
-

data/avo.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "active_link_to"
   spec.add_dependency "image_processing"
-  spec.add_dependency "view_component"
+  spec.add_dependency "view_component", "2.60"
   spec.add_dependency "hotwire-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"

data/lib/avo/version.rb

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

data/public/avo-assets/avo.css

@@ -6461,10 +6461,6 @@ trix-editor .attachment__metadata .attachment__size {
   margin-bottom:0.5rem
 }
 
-.mt-6{
-  margin-top:1.5rem
-}
-
 .ml-1\/2{
   margin-left:50%
 }
@@ -6481,6 +6477,10 @@ trix-editor .attachment__metadata .attachment__size {
   margin-left:auto
 }
 
+.mt-12{
+  margin-top:3rem
+}
+
 .-mb-2{
   margin-bottom:-0.5rem
 }
@@ -6489,6 +6489,10 @@ trix-editor .attachment__metadata .attachment__size {
   margin-top:0px
 }
 
+.mt-6{
+  margin-top:1.5rem
+}
+
 .mr-px{
   margin-right:1px
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.11.1.pre.1
+  version: 2.11.1.pre.2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,16 +127,16 @@ dependencies:
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.60'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.60'
 - !ruby/object:Gem::Dependency
   name: hotwire-rails
   requirement: !ruby/object:Gem::Requirement