avo 2.35.0 → 2.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5589a9a6b15cb0d2c1eb9371516e20cbbe381f2a200229ddbcaa5403bcae5df
-  data.tar.gz: 9eea597e445b850adcbb069f36582550c8de44394d6cd203ad63fe95ac1bcf12
+  metadata.gz: 6cfa65ccbc3c3192f2daa5822ca180639c84bac36bbc8f4a05e608fb73525c20
+  data.tar.gz: 5a4846161d7aee464404f83e57da20c9efcc5624a54433fba1cf2031240d0355
 SHA512:
-  metadata.gz: f958930dd25efc24c12b04aa9f7986418ea4c230e6e545adce927b664d5861ef97ee3f1cb20a703db0b6e4fa0497d4edd4407aade748b30c345df82f9d1f490e
-  data.tar.gz: bb18b8e42aaac748f63da9a53ce2f7a42f65b4254aea02f7c56e9ad4ff5919c9a9340b9cadd798bd99d7f41c780cdf2c51d734b1e4f18109825d2314391fc9cc
+  metadata.gz: 82f1ef921487a6cfb94214ea861344dd85445dba19c5fa6cb63073da50fb547ef6aaae7db40ecb533972f6cd4bfa220ff54f2188e5b4ce39c7238a4e0ecaaf20
+  data.tar.gz: 031be9135507031c5d203dde3aa1429e27f7faf0e5b80f8fc201c3e4853ec758b705121c27756189a38b70cc0bed107023083de58c3a2fda2194e0f7d2ece363

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.35.0)
+    avo (2.36.1)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -19,40 +19,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailbox (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailer (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      actionview (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionpack (6.1.7.4)
+      actionview (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actiontext (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (6.1.7.4)
+      activesupport (= 6.1.7.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -62,22 +62,22 @@ GEM
       addressable
     active_median (0.3.3)
       activesupport (>= 5.2)
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activejob (6.1.7.4)
+      activesupport (= 6.1.7.4)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activemodel (6.1.7.4)
+      activesupport (= 6.1.7.4)
+    activerecord (6.1.7.4)
+      activemodel (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
+    activestorage (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -204,7 +204,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.12)
       activesupport (>= 4.0.2)
@@ -236,9 +236,9 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.20.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -255,11 +255,11 @@ GEM
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.18.0)
+    mini_portile2 (2.8.2)
+    minitest (5.18.1)
     msgpack (1.5.6)
     multi_xml (0.6.0)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -269,10 +269,10 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.0.4)
@@ -288,24 +288,24 @@ GEM
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.1)
+    rack (2.2.7)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails (6.1.7.4)
+      actioncable (= 6.1.7.4)
+      actionmailbox (= 6.1.7.4)
+      actionmailer (= 6.1.7.4)
+      actionpack (= 6.1.7.4)
+      actiontext (= 6.1.7.4)
+      actionview (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activemodel (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
+      railties (= 6.1.7.4)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -314,14 +314,15 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    railties (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -412,8 +413,8 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     test-prof (1.0.10)
-    thor (1.2.1)
-    timeout (0.3.2)
+    thor (1.2.2)
+    timeout (0.4.0)
     turbo-rails (1.4.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -421,7 +422,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
-    view_component (3.2.0)
+    view_component (3.3.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -445,7 +446,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby

data/app/components/avo/fields/area_field/edit_component.html.erb

@@ -1,7 +1,7 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.text_field @field.id,
-    class: classes("w-full"),
     value: field.value.to_s,
+    class: classes("w-full"),
     placeholder: @field.placeholder,
     disabled: disabled? %>
 <% end %>

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
-  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false)
-    super field: field, resource: resource, index: index, form: form, compact: compact
+  def initialize(**args)
+    super(**args)
 
     @polymorphic_record = nil
   end

data/app/components/avo/fields/boolean_field/edit_component.html.erb

@@ -1,6 +1,7 @@
 <%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
   <div class="h-8 flex items-center">
     <%= @form.check_box @field.id,
+      value: @field.value,
       checked: @field.value,
       class: "text-lg h-4 w-4 checked:bg-primary-400 focus:checked:!bg-primary-400 #{@field.get_html(:classes, view: view, element: :input)}",
       data: @field.get_html(:data, view: view, element: :input),

data/app/components/avo/fields/code_field/edit_component.html.erb

@@ -1,6 +1,7 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
   <div data-controller="code-field">
     <%= @form.text_area @field.id,
+      value: @field.value,
       class: classes("w-full"),
       data: {
         'code-field-target': 'element',

data/app/components/avo/fields/country_field/edit_component.html.erb

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.select @field.id, @field.select_options, {
+      value: @field.value,
       selected: @field.value,
       include_blank: @field.include_blank
     },

data/app/components/avo/fields/markdown_field/edit_component.html.erb

@@ -1,6 +1,7 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
   <div data-controller="easy-mde">
     <%= @form.text_area @field.id,
+      value: @field.value,
       class: classes("w-full js-has-easy-mde-editor"),
       data: {
         view: view,

data/app/components/avo/fields/number_field/edit_component.html.erb

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.number_field @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,

data/app/components/avo/fields/password_field/edit_component.html.erb

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.password_field @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,

data/app/components/avo/fields/progress_bar_field/edit_component.html.erb

@@ -6,6 +6,7 @@
       </div>
     <% end %>
     <%= @form.range_field @field.id,
+      value: @field.value,
       class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
       data: {
         action: "input->progress-bar-field#update",

data/app/components/avo/fields/status_field/edit_component.html.erb

@@ -5,6 +5,6 @@
     disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
-    value: @resource.model.present? ? @resource.model[@field.id] : @field.value
+    value: @field.value
   %>
 <% end %>

data/app/components/avo/fields/text_field/edit_component.html.erb

@@ -1,11 +1,11 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= form.text_field @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
-    # value: @field.value,
     multiple: multiple,
     autocomplete: @field.autocomplete
   %>

data/app/components/avo/fields/textarea_field/edit_component.html.erb

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.text_area @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,

data/app/components/avo/fields/trix_field/edit_component.html.erb

@@ -23,6 +23,7 @@
       <%= sanitize @field.value.to_s %>
     <% end %>
     <%= @form.text_area @field.id,
+      value: @field.value,
       class: classes("w-full hidden"),
       data: @field.get_html(:data, view: view, element: :input),
       disabled: disabled?,

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, data: item.data, icon: item.icon %>
 <% 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), data: item.data, icon: item.icon %>
 <% 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, data: item.data, icon: item.icon %>
 <% 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,5 +1,6 @@
 <% if path.present? %>
   <%= send link_method, path, class: classes, active: active, target: target, data: data do %>
+    <%= helpers.svg icon, class: "h-4 text-gray-700" if icon.present? %>
     <%= label %>
     <% if target == :_blank %>
       <%= helpers.svg('heroicons/outline/external-link', class: 'self-center ml-auto h-3 mr-2') %>
@@ -7,6 +8,7 @@
   <% end %>
 <% else %>
   <%= content_tag :div, class: classes, active: active, target: target, data: data do %>
+    <%= helpers.svg icon, class: "h-4 text-gray-700" if icon.present? %>
     <%= label %>
   <% end %>
 <% end %>

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

@@ -6,13 +6,15 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   attr_reader :label
   attr_reader :path
   attr_reader :data
+  attr_reader :icon
 
-  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {})
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {}, icon: nil)
     @label = label
     @path = path
     @active = active
     @target = target
     @data = data
+    @icon = icon
   end
 
   def is_external?
@@ -28,6 +30,6 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   end
 
   def classes
-    "px-4 pr-0 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-100"
+    "px-4 pr-0 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-100 gap-1"
   end
 end

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/components/avo/views/resource_edit_component.html.erb

@@ -7,7 +7,7 @@
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <%= form_with model: @resource.model,
+  <%= form_with model: @resource.record,
     scope: @resource.form_scope,
     url: form_url,
     method: form_method,

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

@@ -80,6 +80,6 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
 
   # Render :show view for read only trix fields
   def view_for(field)
-    (field.is_a? Avo::Fields::TrixField) && field.is_readonly? ? :show : view
+    (field.is_a?(Avo::Fields::TrixField) && field.is_readonly?) ? :show : view
   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/db/factories.rb

@@ -104,7 +104,8 @@ FactoryBot.define do
   factory :city do
     name { Faker::Address.city }
     population { rand(10000..999000) }
-    coordinates { [Faker::Address.latitude, Faker::Address.longitude] }
+    latitude { Faker::Address.latitude }
+    longitude { Faker::Address.longitude }
     is_capital { [true, false].sample }
     features { Faker::Address.community }
     metadata { Faker::Address.community }

data/lib/avo/base_resource.rb

@@ -151,7 +151,8 @@ module Avo
     def record
       @model
     end
-    alias :model :record
+    alias_method :model, :record
+
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
       @view = view if view.present?
@@ -307,9 +308,9 @@ module Avo
       end
     end
 
-    def fill_model(model, params, extra_params: [])
-      # Map the received params to their actual fields
-      fields_by_database_id = get_field_definitions
+    # Map the received params to their actual fields.
+    def fields_by_database_id
+      get_field_definitions
         .reject do |field|
           field.computed
         end
@@ -317,7 +318,9 @@ module Avo
           [field.database_id.to_s, field]
         end
         .to_h
+    end
 
+    def fill_model(model, params, extra_params: [])
       # Write the field values
       params.each do |key, value|
         field = fields_by_database_id[key]

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
@@ -168,23 +172,9 @@ module Avo
 
         return [] if fields.blank?
 
-        items = fields.map do |field|
+        fields.map do |field|
           field.hydrate(resource: self, user: user, view: view)
         end
-
-        if Avo::App.license.lacks_with_trial(:custom_fields)
-          items = items.reject do |field|
-            field.custom?
-          end
-        end
-
-        if Avo::App.license.lacks_with_trial(:advanced_fields)
-          items = items.reject do |field|
-            field.type == "tags"
-          end
-        end
-
-        items
       end
 
       def get_fields(panel: nil, reflection: nil, only_root: false)

data/lib/avo/execution_context.rb

@@ -0,0 +1,43 @@
+module Avo
+  class ExecutionContext
+    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo
+
+    def initialize(**args)
+      # Extend the class with custom modules if required.
+      if args[:include].present?
+        args[:include].each do |mod|
+          self.class.send(:include, mod)
+        end
+      end
+
+      # If you want this block to behave like a view you can delegate the missing methods to the view_context
+      #
+      # Ex: Avo::ExecutionContext.new(target: ..., delegate_missing_to: :view_context).handle
+      if args[:delegate_missing_to].present?
+        self.class.send(:delegate_missing_to, args[:delegate_missing_to])
+      end
+
+      # If target doesn't respond to call, we don't need to initialize the others attr_accessors.
+      return unless (@target = args[:target]).respond_to? :call
+
+      args.except(:target).each do |key, value|
+        singleton_class.class_eval { attr_accessor key }
+        instance_variable_set("@#{key}", value)
+      end
+
+      # Set defaults on not initialized accessors
+      @context ||= Avo::App.context
+      @params ||= Avo::App.params
+      @view_context ||= Avo::App.view_context
+      @current_user ||= Avo::App.current_user
+      @request ||= view_context.request
+      @main_app ||= view_context.main_app
+      @avo ||= view_context.avo
+    end
+
+    # Return target if target is not callable, otherwise, execute target on this instance context
+    def handle
+      target.respond_to?(:call) ? instance_exec(&target) : target
+    end
+  end
+end

data/lib/avo/fields/base_field.rb

@@ -70,6 +70,7 @@ module Avo
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]
         @format_using = args[:format_using] || nil
+        @update_using = args[:update_using] || nil
         @placeholder = args[:placeholder]
         @autocomplete = args[:autocomplete] || nil
         @help = args[:help] || nil
@@ -183,20 +184,31 @@ module Avo
           final_value = instance_exec(@model, @resource, @view, self, &block)
         end
 
-        # Run the value through resolver if present
-        final_value = instance_exec(final_value, &@format_using) if @format_using.present?
-
-        final_value
+        if @format_using.present?
+          # Apply the changes in the
+          Avo::ExecutionContext.new(target: @format_using, model: model, key: property, value: final_value, resource: resource, view: view, field: self, delegate_missing_to: :view_context).handle
+        else
+          final_value
+        end
       end
 
+      # Fills the model with the received value on create and update actions.
       def fill_field(model, key, value, params)
         return model unless model.methods.include? key.to_sym
 
-        model.send("#{key}=", value)
+        if @update_using.present?
+          value = update_using(model, key, value, params)
+        end
+
+        model.public_send("#{key}=", value)
 
         model
       end
 
+      def update_using(model, key, value, params)
+        Avo::ExecutionContext.new(target: @update_using, model: model, key: key, value: value, resource: resource, field: self).handle
+      end
+
       # Try to see if the field has a different database ID than it's name
       def database_id
         foreign_key

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/fields/location_field.rb

@@ -59,6 +59,14 @@ module Avo
         end
       end
 
+      def value
+        if value_as_array?
+          [@model.send(stored_as.first), @model.send(stored_as.last)]
+        else
+          super
+        end
+      end
+
       def value_present?
         return value.first.present? && value.second.present? if value.is_a?(Array) && value.count == 2
 

data/lib/avo/items_holder.rb

@@ -1,9 +1,23 @@
 module Avo
   class ItemsHolder
     attr_reader :tools
-    attr_accessor :items
+    attr_writer :items
     attr_accessor :invalid_fields
 
+    def items
+      items = @items
+
+      if Avo::App.license.lacks_with_trial(:custom_fields)
+        items.reject! { |item| item.is_field? && item.custom? }
+      end
+
+      if Avo::App.license.lacks_with_trial(:advanced_fields)
+        items.reject! { |item| item.is_field? && item.type == "tags" }
+      end
+
+      items
+    end
+
     def initialize
       @items = []
       @items_index = 0

data/lib/avo/licensing/h_q.rb

@@ -185,7 +185,11 @@ module Avo
       def perform_request
         ::Rails.logger.debug "[Avo] Performing request to avohq.io API to check license availability." if Rails.env.development?
 
-        HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
+        if Rails.env.test?
+          OpenStruct.new({code: 200, parsed_response: {id: "pro", valid: true}})
+        else
+          HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
+        end
       end
 
       def app_name

data/lib/avo/licensing/license.rb

@@ -6,7 +6,7 @@ module Avo
       attr_accessor :valid
       attr_accessor :payload
 
-      def initialize(response)
+      def initialize(response = {})
         @response = response
         @id = response["id"]
         @valid = response["valid"]

data/lib/avo/licensing/license_manager.rb

@@ -12,7 +12,7 @@ module Avo
         when "pro"
           ProLicense.new @hq_response
         else
-          NullLicense.new @hq_response
+          NilLicense.new @hq_response
         end
       end
 

data/lib/avo/licensing/{null_license.rb → nil_license.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Licensing
-    class NullLicense < License
+    class NilLicense < License
       def initialize(response = nil)
         response ||= {
           id: "community",

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.35.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.35.0
+  version: 2.36.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1752,6 +1752,7 @@ files:
 - lib/avo/dsl/field_parser.rb
 - lib/avo/dynamic_router.rb
 - lib/avo/engine.rb
+- lib/avo/execution_context.rb
 - lib/avo/fields/area_field.rb
 - lib/avo/fields/badge_field.rb
 - lib/avo/fields/base_field.rb
@@ -1823,7 +1824,7 @@ files:
 - lib/avo/licensing/h_q.rb
 - lib/avo/licensing/license.rb
 - lib/avo/licensing/license_manager.rb
-- lib/avo/licensing/null_license.rb
+- lib/avo/licensing/nil_license.rb
 - lib/avo/licensing/pro_license.rb
 - lib/avo/loaders/actions_loader.rb
 - lib/avo/loaders/fields_loader.rb