avo 2.26.0 → 2.26.2.pre.pr1579

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b61c2b5a2648aa08f89b080fe7f8a8c982ef10c51cb361aa24aa53f979dd060
-  data.tar.gz: 723c552907d3c861383006edea41a9b73da6c609bc87add39f4349569e427b9e
+  metadata.gz: ff9b60d0d2f1fc8e8f3536899e3559d78886342441ab558991dc2b374fbc45ac
+  data.tar.gz: 3bab366736547f5d041c5e1283b76b569d8ae788d25eafc4bf919ffb17d3a3e8
 SHA512:
-  metadata.gz: dfbeee5e9548d1c94fee23facf94685393e0cd58fd0079e980ef67707ac52b0545d5aebd7f4e6b3b6b44962d1a3ca540f966c3586660b4582e92484159ac8a3d
-  data.tar.gz: eebb9b58090526d78af41e3736985788dc69aabe53b0fd9cc02e4b926a7c8debb7daf5b4a9d17e91b357b126500804ef8cf72152d834cfe1b68a04303c1bda88
+  metadata.gz: b159c53be13567f56c149d7cf5d7c16af84dcf1f55f69662d09317c54b5151b628798fc26cf02175a6dd9b19b734e7a4fc3918cbf4b860aff50f53f82d1b9f46
+  data.tar.gz: e74aa9525374ede47f68c0ca70b0ecf4824ddaae4bb2430538462c4226d53a431f35dbfd54ed6dfbd8dad528e21174ada30f9dec34459a5480ad3dd0ebb71a23

data/Gemfile

@@ -162,3 +162,5 @@ gem "sprockets-rails"
 # Avo file filed requires this gem
 # Use Active Storage variant
 gem "image_processing", "~> 1.12"
+
+gem "prefixed_ids"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.26.0)
+    avo (2.26.2.pre.pr1579)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -141,7 +141,6 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     chartkick (4.2.1)
-    childprocess (4.1.0)
     concurrent-ruby (1.2.0)
     countries (4.2.3)
       i18n_data (~> 0.16.0)
@@ -192,6 +191,7 @@ GEM
     groupdate (6.1.0)
       activesupport (>= 5.2)
     hashdiff (1.0.1)
+    hashids (1.0.6)
     highline (2.1.0)
     hightop (0.3.0)
       activesupport (>= 5.2)
@@ -267,10 +267,10 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.14.1)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.14.1-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.0.1)
@@ -278,7 +278,10 @@ GEM
     parser (3.2.0.0)
       ast (~> 2.4.1)
     pg (1.4.5)
-    public_suffix (5.0.0)
+    prefixed_ids (1.3.0)
+      hashids (>= 1.0.0, < 2.0.0)
+      rails (>= 6.0.0)
+    public_suffix (5.0.1)
     puma (5.6.5)
       nio4r (~> 2.0)
     pundit (2.2.0)
@@ -330,7 +333,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.8.0)
-    regexp_parser (2.5.0)
+    regexp_parser (2.7.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -375,10 +378,10 @@ GEM
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 5.0)
+    selenium-webdriver (4.8.1)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     simple_po_parser (1.1.6)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -409,7 +412,7 @@ GEM
     test-prof (1.0.10)
     thor (1.2.1)
     timeout (0.3.0)
-    turbo-rails (1.3.2)
+    turbo-rails (1.3.3)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -435,6 +438,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -491,6 +495,7 @@ DEPENDENCIES
   meta-tags
   net-smtp
   pg (>= 0.18, < 2.0)
+  prefixed_ids
   puma (~> 5.6.4)
   pundit
   rails (~> 6.1.0)

data/app/assets/stylesheets/css/tags.css

@@ -14,6 +14,11 @@ tags.tagify {
 
   span.tagify__input {
     @apply my-1;
+
+    &:after {
+      /* The loader is not centered by default. This will make it look better. */
+      margin-top: 0.25rem;
+    }
   }
 }
 
@@ -21,3 +26,7 @@ tag.tagify__tag {
   @apply text-sm my-1 mb-0;
 }
 
+/* When the tags field is used to select just one value there's a weird ZeroWidthSpace (\u200B) character that breaks the vertical spacing. */
+[data-tags-field-mode-value="select"] tags.tagify {
+  height: 40px;
+}

data/app/components/avo/base_component.rb

@@ -23,10 +23,10 @@ class Avo::BaseComponent < ViewComponent::Base
 
     model_klass = ::Avo::BaseResource.valid_model_class model_class_name
 
-    model = model_klass.find params[:via_resource_id]
-
     resource = ::Avo::App.get_resource_by_model_name model_klass if resource.blank?
 
+    model = resource.find_record params[:via_resource_id], query: model_klass, params: params
+
     resource.dup.hydrate model: model
   end
 

data/app/components/avo/field_wrapper_component.rb

@@ -77,7 +77,8 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   def data
     attributes = {
       field_id: @field.id,
-      field_type: @field.type
+      field_type: @field.type,
+      **@data
     }
 
     # Add the built-in stimulus integration data tags.

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

@@ -44,7 +44,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
     return @polymorphic_record if @polymorphic_record.present?
 
-    @polymorphic_record = polymorphic_class.safe_constantize.find polymorphic_id
+    @polymorphic_record = @resource.find_record polymorphic_id, query: polymorphic_class.safe_constantize, params: params
 
     @polymorphic_record
   end

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

@@ -6,7 +6,7 @@ class Avo::Fields::BelongsToField::ShowComponent < Avo::Fields::ShowComponent
       model: @field.value,
       resource: @field.target_resource,
       via_resource_class: @resource.class.to_s,
-      via_resource_id: @resource.model.id
+      via_resource_id: @resource.model.to_param
     )
   end
 end

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -21,11 +21,11 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def attach_path
-    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.id, @field.id)
+    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.to_param, @field.id)
   end
 
   def can_see_the_create_button?
-    create = "create_#{@field.id.to_s}?"
+    create = "create_#{@field.id}?"
 
     authorization_service = @resource.authorization
 
@@ -39,7 +39,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
     args = {
       via_relation: @resource.singular_model_key,
       via_relation_class: @resource.model_class.to_s,
-      via_resource_id: @resource.model.id
+      via_resource_id: @resource.model.to_param
     }
     helpers.new_resource_path(resource: @field.target_resource, **args)
   end

data/app/components/avo/fields/index_component.rb

@@ -22,7 +22,7 @@ class Avo::Fields::IndexComponent < Avo::BaseComponent
     if @parent_model.present?
       args = {
         via_resource_class: @parent_resource.class,
-        via_resource_id: @parent_model.id
+        via_resource_id: @parent_model.to_param
       }
     end
 

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

@@ -1,10 +1,19 @@
-<%= field_wrapper **field_wrapper_args do %>
-  <div data-controller="tags-field">
+<%= field_wrapper **field_wrapper_args, data: {
+      controller: "tags-field",
+      tags_field_mode_value: @field.mode,
+      tags_field_whitelist_items_value: @field.suggestions.to_json,
+      tags_field_disallowed_items_value: @field.disallowed.to_json,
+      tags_field_enforce_suggestions_value: @field.enforce_suggestions,
+      tags_field_close_on_select_value: @field.close_on_select,
+      tags_field_delimiters_value: @field.delimiters,
+      tags_field_fetch_values_from_value: @field.fetch_values_from,
+    } do %>
+    <%# We use a dummy field so the back action from Turbo does not brake the field %>
     <%# dummy field %>
     <%= text_field_tag "#{@field.id}-dummy", '',
       class: classes("w-full"),
       data: {
-        'tags-field-target': 'fakeInput',
+        tags_field_target: :fakeInput,
       },
       disabled: disabled?,
       placeholder: @field.placeholder,
@@ -15,17 +24,11 @@
     <%= @form.text_field @field.id,
       class: classes("hidden w-full border-primary-500 focus-within:border-primary-500"),
       data: {
-        'tags-field-target': 'input',
-        'whitelist-items': @field.suggestions.to_json,
-        'disallowed-items': @field.disallowed.to_json,
-        'enforce-suggestions': @field.enforce_suggestions ? 1 : 0,
-        'delimiters': @field.delimiters,
-        'close-on-select': @field.close_on_select ? 1 : 0,
+        tags_field_target: :input,
       },
       disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
       value: @field.field_value.to_json
     %>
-  </div>
 <% end %>

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

@@ -33,7 +33,7 @@ class Avo::Index::GridItemComponent < Avo::BaseComponent
     if @parent_model.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.id
+        via_resource_id: @parent_model.to_param
       }
     end
 

data/app/components/avo/index/ordering/button_component.rb

@@ -18,6 +18,6 @@ class Avo::Index::Ordering::ButtonComponent < Avo::Index::Ordering::BaseComponen
   end
 
   def order_path(args)
-    Avo::App.view_context.avo.reorder_order_path(resource.route_key, resource.model.id, **args)
+    Avo::App.view_context.avo.reorder_order_path(resource.route_key, resource.model.to_param, **args)
   end
 end

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

@@ -37,7 +37,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     if @parent_model.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.id
+        via_resource_id: @parent_model.to_param
       }
     end
 
@@ -51,7 +51,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     if @parent_model.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.id
+        via_resource_id: @parent_model.to_param
       }
     end
 

data/app/components/avo/resource_component.rb

@@ -26,7 +26,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   def detach_path
     return "/" if @reflection.blank?
 
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.to_param)
   end
 
   def can_see_the_edit_button?

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

@@ -74,7 +74,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.to_param
       }
 
       if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
@@ -98,7 +98,9 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def attach_path
-    Avo::App.root_path(paths: [request.env["PATH_INFO"], "new"])
+    current_path = CGI.unescape(request.env["PATH_INFO"]).split("/").select(&:present?)
+
+    Avo::App.root_path(paths: [*current_path, "new"])
   end
 
   def singular_resource_name
@@ -142,10 +144,10 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     return unless @reflection.present?
 
     {
-      association: 'has_many',
+      association: "has_many",
       association_id: @reflection.name,
       class: reflection_model_class,
-      id: @parent_model.id
+      id: @parent_model.to_param
     }
   end
 end

data/app/controllers/avo/actions_controller.rb

@@ -35,7 +35,7 @@ module Avo
         args[:models] = if @selected_query.present?
           @resource.model_class.find_by_sql decrypted_query
         else
-          @resource.class.find_scope.find resource_ids
+          @resource.find_record resource_ids, params: params
         end
       end
 

data/app/controllers/avo/application_controller.rb

@@ -128,7 +128,7 @@ module Avo
     end
 
     def set_model
-      @model = model_find_scope.find params[:id]
+      @model = @resource.find_record(params[:id], query: model_find_scope, params: params)
     end
 
     def model_find_scope
@@ -141,11 +141,10 @@ module Avo
 
     def set_related_model
       association_name = BaseResource.valid_association_name(@model, params[:related_name])
-
       @related_model = if @field.is_a? Avo::Fields::HasOneField
         @model.send association_name
       else
-        eager_load_files(@related_resource, @model.send(association_name)).find params[:related_id]
+        @related_resource.find_record params[:related_id], query: eager_load_files(@related_resource, @model.send(association_name)), params: params
       end
     end
 

data/app/controllers/avo/associations_controller.rb

@@ -21,7 +21,7 @@ module Avo
     def index
       @parent_resource = @resource.dup
       @resource = @related_resource
-      @parent_model = @parent_resource.class.find_scope.find(params[:id])
+      @parent_model = @parent_resource.find_record(params[:id], params: params)
       @parent_resource.hydrate(model: @parent_model)
       association_name = BaseResource.valid_association_name(@parent_model, params[:related_name])
       @query = @related_authorization.apply_policy @parent_model.send(association_name)
@@ -113,7 +113,7 @@ module Avo
     end
 
     def set_attachment_model
-      @attachment_model = @attachment_class.find attachment_id
+      @attachment_model = @related_resource.find_record attachment_id, params: params
     end
 
     def set_reflection_field

data/app/controllers/avo/base_controller.rb

@@ -90,7 +90,7 @@ module Avo
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
         via_resource = Avo::App.get_resource(params[:via_resource_class]).dup
-        via_model = via_resource.class.find_scope.find params[:via_resource_id]
+        via_model = via_resource.find_record params[:via_resource_id], params: params
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
@@ -113,7 +113,7 @@ module Avo
 
       if is_associated_record?
         via_resource = Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
-        via_model = via_resource.class.find_scope.find params[:via_resource_id]
+        via_model = via_resource.find_record params[:via_resource_id], params: params
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
@@ -137,7 +137,10 @@ module Avo
         # Fills in the required infor for belongs_to and has_many
         # Get the foreign key and set it to the id we received in the params
         if @reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection) || @reflection.is_a?(ActiveRecord::Reflection::HasManyReflection)
-          @model.send("#{@reflection.foreign_key}=", params[:via_resource_id])
+          related_resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
+          related_record = related_resource.find_record params[:via_resource_id], params: params
+
+          @model.send("#{@reflection.foreign_key}=", related_record.id)
           @model.save
         end
 
@@ -145,7 +148,7 @@ module Avo
         if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
           # find the record
           via_resource = ::Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
-          @related_record = via_resource.model_class.find params[:via_resource_id]
+          @related_record = via_resource.find_record params[:via_resource_id], params: params
           association_name = BaseResource.valid_association_name(@model, params[:via_relation])
 
           @model.send(association_name) << @related_record
@@ -385,7 +388,7 @@ module Avo
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
         via_resource = Avo::App.get_resource(params[:via_resource_class]).dup
-        via_model = via_resource.class.find_scope.find params[:via_resource_id]
+        via_model = via_resource.find_record params[:via_resource_id], params: params
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)

data/app/javascript/js/controllers/fields/tags_field_controller.js

@@ -1,62 +1,64 @@
 import { first, isObject, merge } from 'lodash'
 import Tagify from '@yaireo/tagify'
-
-import BaseController from '../base_controller'
+import URI from 'urijs'
 
 import { suggestionItemTemplate, tagTemplate } from './tags_field_helpers'
+import BaseController from '../base_controller'
+import debouncePromise from '../../helpers/debounce_promise'
 
 export default class extends BaseController {
   static targets = ['input', 'fakeInput'];
 
-  tagify = null;
-
-  get whitelistItems() {
-    return this.getJsonAttribute(this.inputTarget, 'data-whitelist-items', [])
+  static values = {
+    whitelistItems: { type: Array, default: [] },
+    disallowedItems: { type: Array, default: [] },
+    enforceSuggestions: { type: Boolean, default: false },
+    closeOnSelect: { type: Boolean, default: false },
+    delimiters: { type: Array, default: [] },
+    mode: String,
+    fetchValuesFrom: String,
   }
 
-  get disallowedItems() {
-    return this.getJsonAttribute(this.inputTarget, 'data-disallowed-items', [])
-  }
-
-  get enforceSuggestions() {
-    return this.getBooleanAttribute(this.inputTarget, 'data-enforce-suggestions')
-  }
+  tagify = null;
 
-  get closeOnSelect() {
-    return this.getBooleanAttribute(this.inputTarget, 'data-close-on-select')
-  }
+  searchDebounce = 500
 
-  get delimiters() {
-    return this.getJsonAttribute(this.inputTarget, 'data-delimiters', [])
-  }
+  debouncedFetch = debouncePromise(fetch, this.searchDebounce);
 
   get suggestionsAreObjects() {
-    return isObject(first(this.whitelistItems))
+    return isObject(first(this.whitelistItemsValue)) || this.fetchValuesFromValue
   }
 
   get tagifyOptions() {
     let options = {
-      whitelist: this.whitelistItems,
-      blacklist: this.disallowedItems,
-      enforceWhitelist: this.enforceSuggestions,
-      delimiters: this.delimiters.join('|'),
+      whitelist: this.whitelistItemsValue,
+      blacklist: this.disallowedItemsValue,
+      enforceWhitelist: this.enforceSuggestionsValue || this.fetchValuesFromValue,
+      delimiters: this.delimitersValue.join('|'),
       dropdown: {
         maxItems: 20,
         enabled: 0,
-        closeOnSelect: this.closeOnSelect,
+        searchKeys: [this.labelAttributeValue],
+        closeOnSelect: this.closeOnSelectValue,
       },
     }
 
+    if (this.modeValue) {
+      options.mode = this.modeValue // null or "select"
+    }
+
     if (this.suggestionsAreObjects) {
       options = merge(options, {
         tagTextProp: 'label',
         dropdown: {
           searchKeys: ['label'],
+          mapValueTo: 'value',
         },
         templates: {
           tag: tagTemplate,
           dropdownItem: suggestionItemTemplate,
         },
+        originalInputValueFormat: (valuesArr) => valuesArr.map((item) => item.value),
       })
     }
 
@@ -73,6 +75,41 @@ export default class extends BaseController {
 
   initTagify() {
     this.tagify = new Tagify(this.inputTarget, this.tagifyOptions)
+    const that = this
+
+    function onInput(e) {
+      // Create the URL from which to fetch the values
+      const query = e.detail.value
+      const uri = new URI(that.fetchValuesFromValue)
+      uri.addSearch({
+        q: query,
+      })
+
+      // reset current whitelist
+      that.tagify.whitelist = null
+      // show the loader animation
+      that.tagify.loading(true)
+
+      // get new whitelist from a request
+      that.fetchResults(uri.toString())
+        .then((result) => {
+          that.tagify.settings.whitelist = result // add already-existing tags to the new whitelist array
+
+          that.tagify
+            .loading(false)
+            .dropdown.show(e.detail.value) // render the suggestions dropdown.
+        })
+        .catch(() => that.tagify.dropdown.hide())
+    }
+
+    if (this.fetchValuesFromValue) {
+      this.tagify.on('input', onInput)
+    }
+  }
+
+  fetchResults(endpoint) {
+    return this.debouncedFetch(endpoint)
+      .then((response) => response.json())
   }
 
   hideFakeInput() {

data/app/views/avo/associations/new.html.erb

@@ -1,6 +1,11 @@
 <%= turbo_frame_tag 'attach_modal' do %>
+  <%
+    url = Avo::Services::URIService.parse(avo.root_url.to_s)
+      .append_paths('resources', params[:resource_name], params[:id], params[:related_name])
+      .to_s
+  %>
   <%= form_with scope: 'fields',
-    url: "#{avo.root_path}resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
+    url: url,
     local: true,
     data: {
       'turbo-frame': '_top'

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

@@ -1,3 +1,3 @@
 <div class="text-center text-sm text-gray-700 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>">
-  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo::App.license.valid ? 'valid' : 'invalid'%> <%= Avo::App.license.id %> license">v<%= Avo::VERSION %></span>
+  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo::App.license.valid ? 'valid' : 'invalid'%> <%= Avo::App.license.id %> license">v<%= Avo::VERSION %></span> · Current.user.id = <%= Current.user&.id %>
 </div>

data/app/views/layouts/avo/application.html.erb

@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<!-- ✨ Built with Avo • https://www.avohq.io/ -->
 <html>
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -62,3 +63,4 @@
     <!-- License valid?: <%= Avo::App.license.valid ? "valid" : "invalid" %>  -->
   </body>
 </html>
+<!-- ✨ Built with Avo • https://www.avohq.io/ -->

data/config/master.key

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

data/lib/avo/base_resource.rb

@@ -42,6 +42,10 @@ module Avo
     class_attribute :unscoped_queries_on_index, default: false
     class_attribute :resolve_query_scope
     class_attribute :resolve_find_scope
+    # TODO: refactor this into a Host without args
+    class_attribute :find_record_method, default: ->(model_class:, id:, params:) {
+      model_class.find id
+    }
     class_attribute :ordering
     class_attribute :hide_from_global_search, default: false
     class_attribute :after_create_path, default: :show
@@ -379,7 +383,11 @@ module Avo
               # set the value to the actual record
               value = @params[:via_relation_class].safe_constantize.find(@params[:via_resource_id])
             elsif reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
-              value = @params[:via_resource_id]
+              resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
+              model = resource.find_record @params[:via_resource_id], params: params
+              id_param = reflection.options[:primary_key] || :id
+
+              value = model.send(id_param)
             end
           end
 
@@ -488,5 +496,11 @@ module Avo
     def has_model_id?
       model.present? && model.id.present?
     end
+
+    def find_record(id, query: nil, params: nil)
+      query ||= self.class.find_scope
+
+      self.class.find_record_method.call(model_class: query, id: id, params: params)
+    end
   end
 end

data/lib/avo/engine.rb

@@ -54,6 +54,12 @@ module Avo
       # app.config.logger = ::Logger.new(STDOUT)
     end
 
+    initializer "avo.test_buddy" do |app|
+      if Avo::IN_DEVELOPMENT
+        Rails.autoloaders.main.push_dir Avo::Engine.root.join("spec", "helpers")
+      end
+    end
+
     config.app_middleware.use(
       Rack::Static,
       urls: ["/avo-assets"],