avo 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94051972be378ea5a77b0577e63ed4cfb619f136dbd45945820dff96603dc1cd
-  data.tar.gz: 25a016f0bdb9028967cedc8c93ffd0d587b310e93d7d476899abdf0e35519f27
+  metadata.gz: a1c24962e7af4aae8d474872c00149aac873f23dbbfad3ddf4c8de53cc4c1f75
+  data.tar.gz: e356866b46a51297a576a79d77cdc45f29c3482409390a95257a36797f4e759d
 SHA512:
-  metadata.gz: 22f72bb7c364b6260b61f2eb87e082fb9ace366c2a2a67999ae17ec72c0a2f9dcde657662d788cedfc965bbbc29fa8bcc261f416f7f4ee5a10eb65710cdd69f9
-  data.tar.gz: cc1e88105640657fa3e60a0234d56c5e51e851e7e6fc7abbace9c95f1534ee9bfe256bd09e2de929f95d47603ecbb1927589e8e6418e764ccb459d5bf3e94063
+  metadata.gz: 5b946132563c3180eefa6eee7417fadb6d85658ffef574560c748ca75da3353c277b978884de218701fedf1e2db732fe129418ae26effad8e4d272223b5aeb25
+  data.tar.gz: 25e18c2e1de5509adfe6a051e64195d5522bfdccceecf9208458d0c0603f3452f818759056c2f24fdaedaa89788bcf00a7e17574bde09265b1c2773fece5e152

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.4.1)
+    avo (2.5.0)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/components/avo/edit/field_wrapper_component.html.erb

@@ -4,8 +4,8 @@
     <% if @model.present? and @model.errors.include? @field.id %>
       <div class="text-red-600 mt-2 text-sm"><%= @model.errors.full_messages_for(@field.id).to_sentence %></div>
     <% end %>
-    <% if @field.help %>
-      <div class="text-gray-600 mt-2 text-sm"><%== @field.help %></div>
+    <% if help.present? %>
+      <div class="text-gray-600 mt-2 text-sm"><%== help %></div>
     <% end %>
   </div>
 <% end %>

data/app/components/avo/edit/field_wrapper_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::Edit::FieldWrapperComponent < ViewComponent::Base
-  def initialize(field: nil, dash_if_blank: true, full_width: false, displayed_in_modal: false, form: nil, resource: {}, label: nil, **args)
+  def initialize(field: nil, dash_if_blank: true, full_width: false, displayed_in_modal: false, form: nil, resource: {}, label: nil, help: nil, **args)
     @field = field
     @dash_if_blank = dash_if_blank
     @classes = args[:class].present? ? args[:class] : ""
@@ -12,5 +12,10 @@ class Avo::Edit::FieldWrapperComponent < ViewComponent::Base
     @model = resource.present? ? resource.model : nil
     @full_width = full_width
     @label = label
+    @help = help
+  end
+
+  def help
+    @help || @field.help
   end
 end

data/app/components/avo/fields/belongs_to_field/autocomplete_component.html.erb

@@ -4,6 +4,9 @@
     data-search-resource="<%= @model_key %>"
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
     data-via-association="belongs_to"
+    data-via-association-id="<%= @field.id %>"
+    data-via-reflection-id="<%= @field.model.id %>"
+    data-via-reflection-class="<%= @field.model.class.to_s %>"
   ></div>
   <div class="relative w-full" autocomplete="off">
     <%= @form.text_field @foreign_key,

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

@@ -34,6 +34,10 @@ class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
     result
   end
 
+  def reflection_class
+    has_polymorphic_association? ? polymorphic_class : @resource.model_class._reflections[@field.id.to_s].klass
+  end
+
   private
 
   def should_prefill?

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

@@ -1,20 +1,19 @@
-<%
-  if is_polymorphic?
-
-  # Set the model keys so we can pass them over
-  model_keys = @field.types.map do |type|
-    resource = Avo::App.get_resource_by_model_name(type.to_s)
-    [type.to_s, resource.model_key]
-  end.to_h
-%>
-<div class="divide-y"
+<% if is_polymorphic? %>
+  <%
+    # Set the model keys so we can pass them over
+    model_keys = @field.types.map do |type|
+      resource = Avo::App.get_resource_by_model_name(type.to_s)
+      [type.to_s, resource.model_key]
+    end.to_h
+  %>
+  <div class="divide-y"
     data-controller="belongs-to-field"
     data-searchable="<%= @field.searchable %>"
     data-association="<%= @field.id %>"
     data-association-class="<%= @field&.target_resource&.model_class || nil %>"
   >
-  <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-    <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
+    <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, help: @field.polymorphic_help || ''  do %>
+      <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
       {
         value: @field.value,
         include_blank: @field.placeholder,
@@ -26,21 +25,21 @@
         'data-action': 'change->belongs-to-field#changeType'
       }
     %>
-    <%
+      <%
         # If the select field is disabled, no value will be sent. It's how HTML works.
         # Thus the extra hidden field to actually send the related id to the server.
         if disabled %>
-      <%= @form.hidden_field @field.type_input_foreign_key %>
+        <%= @form.hidden_field @field.type_input_foreign_key %>
+      <% end %>
     <% end %>
-  <% end %>
-  <% @field.types.each do |type| %>
-    <div class="hidden"
+    <% @field.types.each do |type| %>
+      <div class="hidden"
         data-belongs-to-field-target="type"
         data-type="<%= type %>"
       >
-      <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: type.to_s.underscore.humanize do %>
-        <% if @field.searchable %>
-          <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
+        <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: type.to_s.underscore.humanize do %>
+          <% if @field.searchable %>
+            <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
             field: @field,
             type: type,
             model_key: model_keys[type.to_s],
@@ -49,8 +48,8 @@
             disabled: disabled,
             polymorphic_record: polymorphic_record
           %>
-        <% else %>
-          <%= @form.select @field.id_input_foreign_key,
+          <% else %>
+            <%= @form.select @field.id_input_foreign_key,
             options_for_select(@field.values_for_type(type), @resource.present? && @resource.model.present? ? @resource.model[@field.id_input_foreign_key] : nil),
             {
               value: @resource.model[@field.id_input_foreign_key].to_s,
@@ -61,17 +60,17 @@
               disabled: disabled
             }
           %>
-          <%
+            <%
             # If the select field is disabled, no value will be sent. It's how HTML works.
             # Thus the extra hidden field to actually send the related id to the server.
             if disabled %>
               <%= @form.hidden_field @field.id_input_foreign_key %>
             <% end %>
+          <% end %>
         <% end %>
-      <% end %>
-    </div>
-  <% end %>
-</div>
+      </div>
+    <% end %>
+  </div>
 <% else %>
   <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
     <% if @field.searchable %>

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

@@ -9,12 +9,12 @@
       'data-action': 'click->toggle-panel#togglePanel',
       'data-tippy': 'tooltip' do %>
       <%= t 'avo.filters' %>
-      <% if params[:filters].present? %>
-        <span class="ml-1">(<%=JSON.parse(Base64.decode64(params[:filters])).count%> applied)</span>
+      <% if @applied_filters.present? %>
+        <span class="ml-1">(<%= @applied_filters.count %> applied)</span>
       <% end %>
     <% end %>
     <div
-      class="absolute block inset-auto sm:right-0 top-full bg-white min-w-[300px] mt-2 z-20 shadow-modal rounded hidden divide-y divide-gray-300"
+      class="absolute block inset-auto sm:right-0 top-full bg-white min-w-[300px] mt-2 z-20 shadow-modal rounded divide-y divide-gray-300 <%= 'hidden' unless params[:keep_filters_panel_open] %>"
       data-toggle-panel-target="panel"
     >
       <% @filters.each do |filter| %>

data/app/components/avo/filters_component.rb

@@ -3,9 +3,10 @@
 class Avo::FiltersComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(filters: [], resource: nil)
+  def initialize(filters: [], resource: nil, applied_filters: [])
     @filters = filters
     @resource = resource
+    @applied_filters = applied_filters
   end
 
   def render?

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

@@ -1,7 +1,7 @@
 <%
   per_page_options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, index_params[:per_page].to_i]
 
-  if parent_resource.present?
+  if parent_model.present?
     per_page_options.prepend Avo.configuration.via_per_page
   end
 
@@ -24,8 +24,8 @@
             %> <%= t('avo.per_page').downcase %>
           </div>
           <% per_page_options.each do |option| %>
-            <% if parent_resource.present? %>
-              <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_resource.model_class, resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+            <% if parent_model.present? %>
+              <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
             <% else %>
               <%= link_to "Change to #{option} items per page", helpers.resources_path(resource: resource, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
             <% end %>

data/app/components/avo/paginator_component.rb

@@ -5,13 +5,13 @@ class Avo::PaginatorComponent < ViewComponent::Base
   attr_reader :turbo_frame
   attr_reader :index_params
   attr_reader :resource
-  attr_reader :parent_resource
+  attr_reader :parent_model
 
-  def initialize(resource: nil, parent_resource: nil, pagy:, turbo_frame:, index_params:)
+  def initialize(resource: nil, parent_model: nil, pagy: nil, turbo_frame: nil, index_params: nil)
     @pagy = pagy
     @turbo_frame = turbo_frame
     @index_params = index_params
     @resource = resource
-    @parent_resource = parent_resource
+    @parent_model = parent_model
   end
 end

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

@@ -30,7 +30,7 @@
         <% end %>
         <% if @filters.present? || available_view_types.count > 1 %>
           <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
-            <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource %>
+            <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters %>
             <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
           </div>
         <% end %>
@@ -51,7 +51,7 @@
       <% if view_type.to_sym == :table %>
         <% if @models.present? %>
           <div class="mt-8">
-            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_resource: @parent_resource %>
+            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
           </div>
         <% end %>
       <% end %>
@@ -59,7 +59,7 @@
       <% if view_type.to_sym == :grid %>
         <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
         <div class="mt-14">
-          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_resource: @parent_resource %>
+          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
         </div>
       <% end %>
     <% end %>

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

@@ -14,7 +14,8 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     actions: [],
     reflection: nil,
     turbo_frame: "",
-    parent_model: nil
+    parent_model: nil,
+    applied_filters: []
   )
     @resource = resource
     @resources = resources
@@ -26,6 +27,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @reflection = reflection
     @turbo_frame = turbo_frame
     @parent_model = parent_model
+    @applied_filters = applied_filters
   end
 
   def title
@@ -90,7 +92,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     if @reflection.present?
       args = {
         via_relation_class: reflection_model_class,
-        via_resource_id: @parent_model.id,
+        via_resource_id: @parent_model.id
       }
 
       if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
@@ -126,7 +128,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def description
-    return if @reflection.present?
+    # If this is a has many association, the user can pass a description to be shown just for this association.
+    if @reflection.present?
+      return field.description if field.present? && field.description
+
+      return
+    end
 
     @resource.resource_description
   end

data/app/controllers/avo/associations_controller.rb

@@ -21,7 +21,7 @@ module Avo
       @association_field = @parent_resource.get_field params[:related_name]
 
       if @association_field.present? && @association_field.scope.present?
-        @query = @query.instance_exec(&@association_field.scope)
+        @query = Avo::Hosts::AssociationScopeHost.new(block: @association_field.scope, query: @query, parent: @parent_model).handle
       end
 
       super
@@ -45,6 +45,11 @@ module Avo
       if @field.present? && !@field.searchable
         query = @authorization.apply_policy @attachment_class
 
+        # Add the association scope to the query scope
+        if @field.scope.present?
+          query = Avo::Hosts::AssociationScopeHost.new(block: @field.scope, query: query, parent: @model).handle
+        end
+
         @options = query.all.map do |model|
           [model.send(@attachment_resource.class.title), model.id]
         end

data/app/controllers/avo/base_controller.rb

@@ -310,11 +310,34 @@ module Avo
     end
 
     def set_applied_filters
-      @applied_filters = JSON.parse(Base64.decode64(params[:filters]))
+      @applied_filters = Avo::Filters::BaseFilter.decode_filters(params[Avo::Filters::BaseFilter::PARAM_KEY])
+
+      # Some filters react to others and will have to be merged into this
+      @applied_filters = @applied_filters.merge reactive_filters
     rescue
       @applied_filters = {}
     end
 
+    def reactive_filters
+      filter_reactions = {}
+
+      # Go through all filters
+      @resource.get_filters
+        .select do |filter_class|
+          filter_class.instance_methods(false).include? :react
+        end
+        .each do |filter_class|
+          # Run the react method if it's present
+          reaction = filter_class.new.react
+
+          next if reaction.nil?
+
+          filter_reactions[filter_class.to_s] = filter_class.new.react
+        end
+
+      filter_reactions
+    end
+
     # Get the default state of the filters and override with the user applied filters
     def filters_to_be_applied
       filter_defaults = {}

data/app/controllers/avo/search_controller.rb

@@ -44,7 +44,23 @@ module Avo
     end
 
     def search_resource(resource)
-      results = apply_search_metadata(resource.search_query.call(params: params).limit(8), resource)
+      query = resource.search_query.call(params: params).limit(8)
+
+      # Figure oute if this is a belongs_to search
+      if params[:via_reflection_class].present? && params[:via_reflection_id].present?
+        # Fetch the field
+        field = belongs_to_field
+
+        if field.scope.present?
+          # Fetch the parent
+          parent = params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
+
+          # Add to the query
+          query = Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.scope, query: query, parent: parent).handle
+        end
+      end
+
+      results = apply_search_metadata(query, resource)
 
       result_object = {
         header: resource.name.pluralize,
@@ -75,5 +91,10 @@ module Avo
         result
       end
     end
+
+    def belongs_to_field
+      fields = ::Avo::App.get_resource_by_model_name(params[:via_reflection_class]).get_field_definitions
+      fields.find { |f| f.id.to_s == params[:via_association_id] }
+    end
   end
 end

data/app/helpers/avo/url_helpers.rb

@@ -59,11 +59,11 @@ module Avo
 
     def related_resources_path(
       parent_model,
-      model,
+      record,
       keep_query_params: false,
       **args
     )
-      return if model.nil?
+      return if record.nil?
 
       existing_params = {}
 
@@ -75,7 +75,7 @@ module Avo
       rescue
       end
 
-      avo.resources_associations_index_path(@parent_resource.model_class.model_name.route_key, @parent_resource.model.id, **existing_params, **args )
+      avo.resources_associations_index_path(parent_model.model_name.route_key, record.id, **existing_params, **args)
     end
 
     def order_up_resource_path(model:, resource:, **args)

data/app/javascript/js/controllers/filter_controller.js

@@ -4,6 +4,10 @@ import URI from 'urijs'
 export default class extends Controller {
   static targets = ['urlRedirect']
 
+  static values = {
+    keepFiltersPanelOpen: Boolean,
+  }
+
   // eslint-disable-next-line class-methods-use-this
   uriParams() {
     return URI(window.location.toString()).query(true)
@@ -78,6 +82,11 @@ export default class extends Controller {
       ...url.query(true),
     }
 
+    if (this.keepFiltersPanelOpenValue) {
+      // eslint-disable-next-line camelcase
+      query.keep_filters_panel_open = this.keepFiltersPanelOpenValue
+    }
+
     if (encodedFilters) {
       query.filters = encodedFilters
     } else {

data/app/javascript/js/controllers/search_controller.js

@@ -68,8 +68,15 @@ export default class extends Controller {
     }
 
     if (this.isBelongsToSearch) {
-      // eslint-disable-next-line camelcase
-      params = { ...params, via_association: this.dataset.viaAssociation }
+      params = {
+        ...params,
+        // eslint-disable-next-line camelcase
+        via_association_id: this.dataset.viaAssociationId,
+        // eslint-disable-next-line camelcase
+        via_reflection_class: this.dataset.viaReflectionClass,
+        // eslint-disable-next-line camelcase
+        via_reflection_id: this.dataset.viaReflectionId,
+      }
     }
 
     return url.segment(segments).search(params).toString()

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

@@ -1,20 +1,28 @@
-<div data-controller="boolean-filter" data-filter-name="<%= filter.name %>">
+<div
+  data-controller="boolean-filter"
+  data-filter-name="<%= filter.name %>"
+  data-boolean-filter-keep-filters-panel-open-value="<%= @resource.keep_filters_panel_open %>"
+>
   <%= filter_wrapper name: filter.name do %>
     <div class="flex items-center">
-      <div class="space-y-2">
-        <% filter.options.each do |value, label| %>
-          <label class="flex items-center text-gray-700 text-sm">
-            <%= check_box_tag filter.id, value, filter.selected_value(value.to_s, @applied_filters),
-              class: 'mr-2 text-lg h-4 w-4',
-              id: "avo_filters_#{filter.id.parameterize.underscore}",
-              'data-filter-class': filter.class,
-              'data-boolean-filter-target': 'option',
-              'data-action': 'input->boolean-filter#changeFilter'
-            %>
-            <%= label %>
-          </label>
-        <% end %>
-      </div>
+      <% if filter.options.empty? %>
+        <div class="text-sm text-gray-600"><%= filter.class.empty_message %></div>
+      <% else %>
+        <div class="space-y-2">
+          <% filter.options.each do |value, label| %>
+            <label class="flex items-center text-gray-700 text-sm">
+              <%= check_box_tag filter.id, value, filter.selected_value(value.to_s, @applied_filters),
+                class: 'mr-2 text-lg h-4 w-4',
+                id: "avo_filters_#{filter.id.parameterize.underscore}",
+                'data-filter-class': filter.class,
+                'data-boolean-filter-target': 'option',
+                'data-action': 'input->boolean-filter#changeFilter'
+              %>
+              <%= label %>
+            </label>
+          <% end %>
+        </div>
+      <% end %>
       <%= link_to 'url_redirect', request.url, data: { 'boolean-filter-target': 'urlRedirect', 'turbo-frame': params[:turbo_frame] }, style: 'hidden', class: 'hidden' %>
     </div>
   <% end %>

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

@@ -1,4 +1,8 @@
-<div data-controller="multiple-select-filter" data-filter-name="<%= filter.name %>">
+<div
+  data-controller="multiple-select-filter"
+  data-filter-name="<%= filter.name %>"
+  data-multiple-select-filter-keep-filters-panel-open-value="<%= @resource.keep_filters_panel_open %>"
+>
   <%= filter_wrapper name: filter.name do %>
     <%= select_tag filter.id, options_for_select(filter.options.invert, filter.selected_value(@applied_filters)),
       class: input_classes('w-full mb-0'),

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

@@ -1,4 +1,8 @@
-<div data-controller="select-filter" data-filter-name="<%= filter.name %>">
+<div
+  data-controller="select-filter"
+  data-filter-name="<%= filter.name %>"
+  data-select-filter-keep-filters-panel-open-value="<%= @resource.keep_filters_panel_open %>"
+>
   <%= filter_wrapper name: filter.name do %>
     <%= select_tag filter.id, options_for_select(filter.options.invert, filter.applied_or_default_value(@applied_filters)),
       class: input_classes('w-full mb-0'),

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

@@ -1,4 +1,8 @@
-<div data-controller="text-filter" data-filter-name="<%= filter.name %>">
+<div
+  data-controller="text-filter"
+  data-filter-name="<%= filter.name %>"
+  data-text-filter-keep-filters-panel-open-value="<%= @resource.keep_filters_panel_open %>"
+>
   <%= filter_wrapper name: filter.name do %>
     <%= text_field_tag filter.id, filter.applied_or_default_value(@applied_filters),
       class: input_classes('w-full mb-0'),

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

@@ -10,6 +10,7 @@
       reflection: @reflection,
       turbo_frame: params[:turbo_frame],
       parent_model: @parent_model,
+      applied_filters: @applied_filters,
     )
   %>
 <% end %>

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

@@ -0,0 +1,2 @@
+<%# Example link item below %>
+<%#= render Avo::Sidebar::LinkComponent.new label: 'Label', path: '/path' %>

data/db/factories.rb

@@ -25,7 +25,7 @@ FactoryBot.define do
         Time.now - rand(10...365).days
       end
     end
-    status { 0 }
+    status { ::Post.statuses.keys.sample }
   end
 
   factory :project do
@@ -42,11 +42,11 @@ FactoryBot.define do
   end
 
   factory :comment do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(' ') }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(" ") }
   end
 
   factory :review do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(' ') }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(" ") }
   end
 
   factory :person do
@@ -64,6 +64,8 @@ FactoryBot.define do
 
   factory :course do
     name { Faker::Educator.unique.course_name }
+    country { Course.countries.sample }
+    city { Course.cities.stringify_keys[country].sample }
   end
 
   factory :course_link, class: "Course::Link" do

data/lib/avo/base_resource.rb

@@ -44,6 +44,7 @@ module Avo
     class_attribute :after_update_path, default: :show
     class_attribute :invalid_fields
     class_attribute :record_selector, default: true
+    class_attribute :keep_filters_panel_open, default: false
 
     class << self
       delegate :t, to: ::I18n

data/lib/avo/fields/belongs_to_field.rb

@@ -62,6 +62,8 @@ module Avo
       attr_reader :relation_method
       attr_reader :types # for Polymorphic associations
       attr_reader :allow_via_detaching
+      attr_reader :scope
+      attr_reader :polymorphic_help
 
       def initialize(id, **args, &block)
         args[:placeholder] ||= I18n.t("avo.choose_an_option")
@@ -73,6 +75,8 @@ module Avo
         @types = args[:types]
         @relation_method = id.to_s.parameterize.underscore
         @allow_via_detaching = args[:allow_via_detaching] == true
+        @scope = args[:scope]
+        @polymorphic_help = args[:polymorphic_help]
       end
 
       def searchable
@@ -111,7 +115,13 @@ module Avo
         resource = target_resource
         resource = App.get_resource_by_model_name model if model.present?
 
-        ::Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope).all.map do |model|
+        query = Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope)
+
+        if scope.present?
+          query = Avo::Hosts::AssociationScopeHost.new(block: scope, query: query, parent: get_model).handle
+        end
+
+        query.all.map do |model|
           [model.send(resource.class.title), model.id]
         end
       end