avo 2.15.3.pre.1.data.attrs.to.sidebar.items → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64729fc8e5570fcc659daa51c57938d6b75690ab2952fa054149e7208c064e5a
-  data.tar.gz: 373621511d2f61b098add0594a1cfdfb687f1587ac7a6e3c1f1c388b663146fd
+  metadata.gz: 68cfd9efb2f52f774b347c404afe6b68e8e0e21102500e234184a11a4b8dd104
+  data.tar.gz: b8f9fc9d7a24fc30a453f0643aeae48c2e4bb9ecce27b59679e246bd55054fa3
 SHA512:
-  metadata.gz: 36b5950de108a20d8fa2dd24e68022d7eee35d16bb9cd07e926748c887e3bc42d42fb6ef36d3932e60c31fbbf2860a1aee6af035287515393e20619be4c59f62
-  data.tar.gz: e047c958831467741cb77c330b8fe62df5349b40fee2f5de42e2965e11587dc193d2266883c217d1d9b529536264101aa76fb41d884008e9ca8d192b0d33928d
+  metadata.gz: c80aedbf84f25b6b53e99d51c6ba3e603eaa619e9963ae988b4f76469f3f14c92e9e5f8045234bb7746cbed3008b9656d598effc0d49c742665acbbd4d35390a
+  data.tar.gz: c116b5296b79976867bd3f3342d334d355e7a5acb012b5bbb7e2965b65d98794f08b6f747d07e1598b144ff78c5c1fcfcf0e978ab681166ea67ca8a86abf9b4c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.15.3.pre.1.data.attrs.to.sidebar.items)
+    avo (2.15.3)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -38,7 +38,7 @@
       </div>
     </div>
     <div class="w-full place-self-end">
-      <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, view_type: :grid)) %>
+      <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, view_type: :grid)) %>
     </div>
   </div>
 </div>

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

@@ -3,11 +3,12 @@
 class Avo::Index::GridItemComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
-  def initialize(resource: nil, reflection: nil, parent_model: nil)
+  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
     @resource = resource
     @reflection = reflection
     @grid_fields = resource.get_grid_fields
     @parent_model = parent_model
+    @parent_resource = parent_resource
   end
 
   private

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

@@ -3,7 +3,7 @@
   data-selected-resources-name="<%= @resource.model_key %>" data-selected-resources="[]">
     <% @resources.each_with_index do |resource, index| %>
       <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model) do %>
-        <%= render(Avo::Index::GridItemComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model)) %>
+        <%= render(Avo::Index::GridItemComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
       <% end %>
     <% end %>
   </div>

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceGridComponent < ViewComponent::Base
-  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil)
+  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: @parent_resource)
     @resources = resources
     @resource = resource
     @reflection = reflection
     @parent_model = parent_model
+    @parent_resource = parent_resource
   end
 end

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

@@ -1,11 +1,11 @@
 <% if item.is_a? Avo::Menu::Link %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target, data: item.data %>
+  <%= 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: item.navigation_label, path: helpers.resources_path(resource: resource), data: item.data %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource) %>
 <% end %>
 <% if item.is_a? Avo::Menu::Dashboard %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path, data: item.data %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path %>
 <% end %>
 <% if item.is_a? Avo::Menu::Section %>
   <%= render Avo::Sidebar::SectionComponent.new item: item %>

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

@@ -1,12 +1,12 @@
 <% if path.present? %>
-  <%= send link_method, path, class: classes, active: active, target: target, data: data do %>
+  <%= 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 mr-2') %>
     <% end %>
   <% end %>
 <% else %>
-  <%= content_tag :div, class: classes, active: active, target: target, data: data do %>
+  <%= content_tag :div, class: classes, active: active, target: target do %>
     <%= label %>
   <% end %>
 <% end %>

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

@@ -5,14 +5,12 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   attr_reader :target
   attr_reader :label
   attr_reader :path
-  attr_reader :data
 
-  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {})
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil)
     @label = label
     @path = path
     @active = active
     @target = target
-    @data = data
   end
 
   def is_external?

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

@@ -65,7 +65,7 @@
         <% end %>
       <% end %>
       <% if view_type.to_sym == :grid %>
-        <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
+        <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource) %>
         <div class="mt-6">
           <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
         </div>

data/lib/avo/menu/base_item.rb

@@ -9,7 +9,6 @@ class Avo::Menu::BaseItem
   option :items, default: proc { [] }
   option :name, default: proc { "" }
   option :visible, default: proc { true }
-  option :data, default: proc { {} }
 
   def visible?
     return visible if visible.in? [true, false]

data/lib/avo/menu/builder.rb

@@ -22,11 +22,9 @@ class Avo::Menu::Builder
   end
 
   # Adds a link
-  def link(name, path = nil, **args)
-    path ||= args[:path]
-    @menu.items << Avo::Menu::Link.new(name: name, path: path, **args)
+  def link(name, **args)
+    @menu.items << Avo::Menu::Link.new(name: name, **args)
   end
-  alias_method :link_to, :link
 
   # Validates and adds a resource
   def resource(name, **args)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.15.3.pre.1.data.attrs.to.sidebar.items" unless const_defined?(:VERSION)
+  VERSION = "2.15.3" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.15.3.pre.1.data.attrs.to.sidebar.items
+  version: 2.15.3
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1743,7 +1743,6 @@ files:
 - config/cable.yml
 - config/credentials.yml.enc
 - config/initializers/pagy.rb
-- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1976,9 +1975,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.3
 signing_key: 

data/config/master.key

@@ -1 +0,0 @@
-2aeb23d82b909d9c6b5abb62f7058c2a