avo 2.34.0 → 2.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce48ff1282bab4437a07c321a0099ce1755e92c96d0b82a29e2d91577b33da4
-  data.tar.gz: de4b93b760c5177e9631c51957eda7915f817b3ab60ed8a24c8fe9be739e19f8
+  metadata.gz: 7b1b2bdba8e863c5c01a069056bf4fd5ac98fd45ebfb8ed9e70c3f5a9da05380
+  data.tar.gz: cb6e887b63ea5992da6233b8323df13427478f37e0805945903d1d52c2302342
 SHA512:
-  metadata.gz: 50614474a512b8b8f22eb0a10c2c225fbe13b122bd7719109a842af0e82beccbe7d3f1977f966cd5a1316f31a08d894467afb1cf9dbd9e99745b7bf21560a281
-  data.tar.gz: 7331125c451330a2926e980b51e8dba2e6b9072b97965aa40a1a2b7afb6367c1822185088749e55c011e0666ce4d50c95a111b51e5f1ddf175e95c8caaca5a7a
+  metadata.gz: 86d3aa5189e477e66095b2d648010fbbe9ee5b7d5cc4b38c1c5b10b709a139dff14a60bb9a1cab97ceea62edc5c37d48bb40c657fc6f774412911cc00474d098
+  data.tar.gz: 64b9694b95826f77faf2a1e56023522809923c9aedcf646f2622db44da537403bcadded775d3935bb91226d1eb5868c8c6f967195c4957ad18f95e1efdba95e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.34.0)
+    avo (2.34.2)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

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

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

data/app/components/avo/profile_item_component.rb

@@ -6,17 +6,29 @@ class Avo::ProfileItemComponent < ViewComponent::Base
   attr_reader :path
   attr_reader :active
   attr_reader :target
+  attr_reader :method
+  attr_reader :params
+  attr_reader :classes
 
-  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil)
+  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil, method: nil, params: {}, classes: "")
     @label = label
     @icon = icon
     @path = path
     @active = active
     @target = target
     @title = title
+    @method = method
+    @params = params
+    @classes = classes
   end
 
   def title
     @title || @label
   end
+
+  private
+
+  def button_classes
+    "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full"
+  end
 end

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

@@ -16,26 +16,25 @@
       <% end %>
     </div>
   </div>
-  <% if can_destroy_user? %>
-    <div class="relative" data-controller="toggle-panel">
-      <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle-panel#togglePanel">
-        <%= helpers.svg 'three-dots', class: 'h-4' %>
-      </a>
-      <div
-        class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full z-40"
-        data-toggle-panel-target="panel"
-      >
-        <% if Avo::App.has_profile_menu? %>
-          <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 %>
+  <div class="relative" data-controller="toggle-panel">
+    <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle-panel#togglePanel">
+      <%= helpers.svg 'three-dots', class: 'h-4' %>
+    </a>
+    <div
+      class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full z-40"
+      data-toggle-panel-target="panel"
+    >
+      <% if Avo::App.has_profile_menu? %>
+        <div class="text-black">
+          <% 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, method: item.method, params: item.params %>
             <% end %>
-          </div>
-        <% end %>
-        <%# Example link below %>
-        <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
+          <% end %>
+        </div>
+      <% end %>
+      <%= render "avo/partials/profile_menu_extra" %>
+      <% if can_destroy_user? %>
         <%= button_to helpers.main_app.send(destroy_user_session_path),
           form: { "data-turbo" => "false" },
           method: :delete,
@@ -46,7 +45,7 @@
           form_class: 'flex-1' do %>
           <%= helpers.svg 'logout', class: 'h-4 mr-1' %> <%= t('avo.sign_out') %>
         <% end %>
-      </div>
+      <% end %>
     </div>
-  <% end %>
+  </div>
 </div>

data/app/views/avo/partials/_profile_menu_extra.html.erb

@@ -0,0 +1,2 @@
+<%# Example link below %>
+<%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>

data/lib/avo/fields/belongs_to_field.rb

@@ -199,9 +199,9 @@ module Avo
       def fill_field(model, key, value, params)
         return model unless model.methods.include? key.to_sym
 
-        valid_model_class = valid_polymorphic_class params["#{polymorphic_as}_type"]
-
         if polymorphic_as.present?
+          valid_model_class = valid_polymorphic_class params["#{polymorphic_as}_type"]
+
           model.send("#{polymorphic_as}_type=", valid_model_class)
 
           # If the type is blank, reset the id too.

data/lib/avo/menu/link.rb

@@ -1,4 +1,6 @@
 class Avo::Menu::Link < Avo::Menu::BaseItem
   option :path, default: proc { "" }
   option :target, optional: true
+  option :method, optional: true
+  option :params, optional: true
 end

data/lib/avo/version.rb

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

data/lib/generators/avo/eject_generator.rb

@@ -17,6 +17,7 @@ module Generators
         pre_head: "app/views/avo/partials/_pre_head.html.erb",
         scripts: "app/views/avo/partials/_scripts.html.erb",
         sidebar_extra: "app/views/avo/partials/_sidebar_extra.html.erb",
+        profile_menu_extra: "app/views/avo/partials/_profile_menu_extra.html.erb",
       }
 
       def handle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.34.0
+  version: 2.34.2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1687,6 +1687,7 @@ files:
 - app/views/avo/partials/_logo.html.erb
 - app/views/avo/partials/_navbar.html.erb
 - app/views/avo/partials/_pre_head.html.erb
+- app/views/avo/partials/_profile_menu_extra.html.erb
 - app/views/avo/partials/_resource_search.html.erb
 - app/views/avo/partials/_scripts.html.erb
 - app/views/avo/partials/_sidebar_extra.html.erb