avo 2.36.0 → 2.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3daed936826074ad203833bc647b28ab8404e03f8f600e6e251ab1f5048b2d3f
-  data.tar.gz: bcd0096cf724a4cbb88a8015b589103ec7f43d24e47b3275799c1662560e0226
+  metadata.gz: 6cfa65ccbc3c3192f2daa5822ca180639c84bac36bbc8f4a05e608fb73525c20
+  data.tar.gz: 5a4846161d7aee464404f83e57da20c9efcc5624a54433fba1cf2031240d0355
 SHA512:
-  metadata.gz: ae0863ff1c66d4e3ffcd85fd94080147b00407e22e609e291cee924602fd2ccc871175320f9e61968433ec84aff38275c90fcf6e130c3ce7029e204649e10038
-  data.tar.gz: f83cfd82506cbe80a4310114d1376c42cd86107f5448c7db43357f3539100975bd0be6681caf768f8a6becf1c28b63aba55f7aeb8ede806a9c60138e01679da1
+  metadata.gz: 82f1ef921487a6cfb94214ea861344dd85445dba19c5fa6cb63073da50fb547ef6aaae7db40ecb533972f6cd4bfa220ff54f2188e5b4ce39c7238a4e0ecaaf20
+  data.tar.gz: 031be9135507031c5d203dde3aa1429e27f7faf0e5b80f8fc201c3e4853ec758b705121c27756189a38b70cc0bed107023083de58c3a2fda2194e0f7d2ece363

data/Gemfile.lock

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

data/app/components/avo/tab_switcher_component.rb

@@ -63,32 +63,29 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   # Because the developer hasn't specified that it should be visible on edit views (with the show_on: :edit option),
   # the field should not be visible in the item switcher either.
   def visible_items
-    tabs.select do |item|
-      visible = true
-
-      if item.items.blank?
-        visible = false
-      end
+    tabs.select do |tab|
+      next false if tab.items.blank?
+      next false if tab.is_field? && !tab.authorized?
+      next false if tab.has_a_single_item? && !single_item_visible?(tab.items.first)
+      next false if !tab.visible?
+      next false if !tab.visible_on?(view)
+
+      true
+    end
+  end
 
-      first_item = item.items.first
-      if item.items.count == 1 && first_item.is_field? && first_item.has_own_panel? && !first_item.visible_on?(view)
-        # Return nil if tab contians a has_many type of fields and it's hidden in current view
-        visible = false
-      end
+  private
 
-      if item.respond_to?(:visible_on?)
-        visible = item.visible_on? view
-      end
+  def single_item_visible?(item)
+    # Item is visible if is not a field or don't have its own panel
+    return true if !item.is_field?
+    return true if !item.has_own_panel?
 
-      if item.respond_to?(:visible?)
-        visible = item.visible?
-      end
+    return false if !item.visible_on?(view)
 
-      if item.respond_to?(:authorized?)
-        visible = item.authorized?
-      end
+    # If item is hydrated with the correct resource and is not authorized, it's not visible
+    return false if item.resource.present? && !item.authorized?
 
-      visible
-    end
+    true
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -215,16 +215,24 @@ module Avo
 
     def save_model
       perform_action_and_record_errors do
-        @model.save!
+        save_model_action
       end
     end
 
+    def save_model_action
+      @model.save!
+    end
+
     def destroy_model
       perform_action_and_record_errors do
-        @model.destroy!
+        destroy_model_action
       end
     end
 
+    def destroy_model_action
+      @model.destroy!
+    end
+
     def perform_action_and_record_errors(&block)
       begin
         succeeded = block.call
@@ -253,7 +261,7 @@ module Avo
     end
 
     def permitted_params
-      @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param).concat extra_params
+      @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param).concat(extra_params).uniq
     end
 
     def extra_params

data/app/controllers/avo/search_controller.rb

@@ -112,8 +112,13 @@ module Avo
     # This scope is applied if the search is being performed on a has_many association
     def apply_has_many_scope
       association_name = BaseResource.valid_association_name(parent, params[:via_association_id])
+
+      # Get association records
       scope = parent.send(association_name)
 
+      # Apply policy scope if authorization is present
+      scope = resource.authorization&.apply_policy scope
+
       Avo::Hosts::SearchScopeHost.new(block: @resource.search_query, params: params, scope: scope).handle
     end
 

data/lib/avo/concerns/has_fields.rb

@@ -98,6 +98,10 @@ module Avo
             if item.is_field?
               fields << item
             end
+
+            if item.is_row?
+              fields << extract_fields_from_items(tab)
+            end
           end
 
           fields.flatten
@@ -117,7 +121,7 @@ module Avo
           thing.items.each do |item|
             if item.is_field?
               fields << item
-            elsif item.is_panel?
+            elsif item.is_panel? || item.is_row?
               fields << extract_fields_from_items(item)
             end
           end

data/lib/avo/fields/field_extensions/visible_in_different_views.rb

@@ -18,7 +18,7 @@ module Avo
         def visible_on?(view)
           raise "No view specified on visibility check." if view.blank?
 
-          send :"show_on_#{view.to_s}"
+          send :"show_on_#{view}"
         end
 
         def show_on(*where)

data/lib/avo/tab.rb

@@ -65,4 +65,8 @@ class Avo::Tab
       super(view)
     end
   end
+
+  def has_a_single_item?
+    items.count == 1
+  end
 end

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.36.0
+  version: 2.36.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord