avo 1.19.1.pre.1 → 1.19.1.pre.5

data/app/controllers/avo/base_controller.rb

@@ -6,12 +6,12 @@ module Avo
     before_action :set_resource
     before_action :hydrate_resource
     before_action :set_model, only: [:show, :edit, :destroy, :update]
+    before_action :set_model_to_fill
     before_action :authorize_action
     before_action :reset_pagination_if_filters_changed, only: :index
     before_action :cache_applied_filters, only: :index
 
     def index
-      @view = :index
       @page_title = resource_name.humanize
       add_breadcrumb resource_name.humanize
 
@@ -24,8 +24,8 @@ module Avo
         @query = @resource.class.query_scope
       end
 
-      # Remove default_scope for index view
-      if @resource.unscoped_queries_on_index
+      # Remove default_scope for index view if no parent_resource present
+      if @resource.unscoped_queries_on_index && @parent_resource.blank?
         @query = @query.unscoped
       end
 
@@ -59,7 +59,6 @@ module Avo
     end
 
     def show
-      @view = :show
       set_actions
 
       @resource = @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
@@ -82,7 +81,6 @@ module Avo
     end
 
     def new
-      @view = :new
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
@@ -92,7 +90,6 @@ module Avo
     end
 
     def edit
-      @view = :edit
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       @page_title = @resource.default_panel_name
@@ -114,17 +111,47 @@ module Avo
     end
 
     def create
-      @model = @resource.fill_model(@resource.model_class.new, cast_nullable(model_params))
+      # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource.hydrate(model: @model, view: :new, user: _current_user)
 
+      # This means that the record has been created through another parent record and we need to attach it somehow.
+      if params[:via_resource_id].present?
+        @reflection = @model._reflections[params[:via_relation]]
+        # Figure out what kind of association does the record have with the parent record
+
+        # belongs_to
+        # 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)
+          foreign_key = @reflection.foreign_key
+          @model.send("#{foreign_key}=", params[:via_resource_id])
+          @model.save
+        end
+
+        # has_one
+        # has_one_through
+
+        # has_many_through
+        # has_and_belongs_to_many
+        # polymorphic
+        if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
+          # find the record
+          via_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
+          @related_record = via_resource.model_class.find params[:via_resource_id]
+
+          @model.send(params[:via_relation]) << @related_record
+        end
+      end
+
       respond_to do |format|
         if saved
-          redirect_path = if params[:via_relation_class].present? && params[:via_resource_id].present?
+          redirect_path = resource_path(model: @model, resource: @resource)
+
+          if params[:via_relation_class].present? && params[:via_resource_id].present?
             parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class].safe_constantize
-            resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
-          else
-            resource_path(model: @model, resource: @resource)
+            redirect_path = resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
           end
 
           format.html { redirect_to redirect_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
@@ -138,7 +165,8 @@ module Avo
     end
 
     def update
-      @model = @resource.fill_model(@model, cast_nullable(model_params))
+      # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 

data/app/helpers/avo/application_helper.rb

@@ -1,18 +1,7 @@
 module Avo
   module ApplicationHelper
-    include ::Manifester::Helper
     include ::Pagy::Frontend
 
-    def current_webpacker_instance
-      return Avo.webpacker if Avo::IN_DEVELOPMENT
-
-      super
-    end
-
-    def current_manifester_instance
-      Avo.manifester
-    end
-
     def render_license_warnings
       render partial: "avo/sidebar/license_warnings", locals: {
         license: Avo::App.license.properties
@@ -116,7 +105,7 @@ module Avo
       options[:class] += args[:extra_class].present? ? " #{args[:extra_class]}" : ""
 
       # Create the path to the svgs directory
-      file_path = "#{Avo::Engine.root}/app/packs/svgs/#{file_name}"
+      file_path = "#{Avo::Engine.root}/app/assets/svgs/#{file_name}"
       file_path = "#{file_path}.svg" unless file_path.end_with? ".svg"
 
       # Create a cache hash
@@ -146,12 +135,12 @@ module Avo
     end
 
     def input_classes(extra_classes = "", has_error: false)
-      classes = "appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-700 rounded-md py-2 px-3 leading-tight border outline-none outline"
+      classes = "appearance-none inline-flex bg-slate-100 disabled:bg-slate-300 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-700 rounded-md py-2 px-3 leading-tight border outline-none outline"
 
       classes += if has_error
         " border-red-600"
       else
-        " border-blue-gray-300"
+        " border-slate-300"
       end
 
       classes += " #{extra_classes}"

data/app/{packs/entrypoints/application.js → javascript/avo.js}

@@ -4,15 +4,14 @@ import 'core-js/stable'
 import 'regenerator-runtime/runtime'
 import * as ActiveStorage from '@rails/activestorage'
 import * as Mousetrap from 'mousetrap'
-import { Application } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
-import { definitionsFromContext } from 'stimulus/webpack-helpers'
 import Rails from '@rails/ujs'
 import tippy from 'tippy.js'
 
 // Toastr alerts
-import '../js/active-storage'
-import '../js/toastr'
+import './js/active-storage'
+import './js/controllers'
+import './js/toastr'
 
 Rails.start()
 
@@ -20,6 +19,17 @@ window.Turbolinks = Turbo
 
 Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: 'replace' }))
 
+function isMac() {
+  const isMac = window.navigator.userAgent.indexOf('Mac OS X')
+
+  if (isMac) {
+    document.body.classList.add('os-mac')
+    document.body.classList.remove('os-pc')
+  } else {
+    document.body.classList.add('os-pc')
+    document.body.classList.remove('os-mac')
+  }
+}
 function initTippy() {
   tippy('[data-tippy="tooltip"]', {
     theme: 'light',
@@ -33,18 +43,12 @@ function initTippy() {
 }
 window.initTippy = initTippy
 
-const application = Application.start()
 ActiveStorage.start()
 
-const context = require.context('./../js/controllers', true, /\.js$/)
-application.load(definitionsFromContext(context))
-
-const fieldsContext = require.context('./../js/controllers/fields', true, /\.js$/)
-application.load(definitionsFromContext(fieldsContext))
-
 document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
   initTippy()
+  isMac()
 })
 
 document.addEventListener('turbo:before-fetch-response', (e) => {
@@ -58,10 +62,3 @@ document.addEventListener('turbo:submit-start', () => document.body.classList.ad
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('[data-turbo-remove-before-cache]').forEach((element) => element.remove())
 })
-
-// Uncomment to copy all static images under ../images to the output folder and reference
-// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
-// or the `imagePath` JavaScript helper below.
-//
-const images = require.context('../images', true)
-const imagePath = (name) => images(name, true)

data/app/javascript/js/application.js

@@ -0,0 +1,9 @@
+import { Application } from 'stimulus'
+
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus = application
+
+export { application }

data/app/{packs → javascript}/js/controllers/action_controller.js

@@ -1,5 +1,5 @@
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../helpers/cast_boolean'
 
 export default class extends Controller {
   static targets = ['controllerDiv', 'resourceIds', 'form']

data/app/{packs → javascript}/js/controllers/fields/code_field_controller.js

@@ -15,9 +15,10 @@ import 'codemirror/mode/xml/xml'
 import 'codemirror/mode/yaml/yaml'
 
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
 import CodeMirror from 'codemirror'
 
+import { castBoolean } from '../../helpers/cast_boolean'
+
 export default class extends Controller {
   static targets = ['element']
 

data/app/{packs → javascript}/js/controllers/fields/date_field_controller.js

@@ -1,6 +1,6 @@
 import { Controller } from 'stimulus'
 import { DateTime } from 'luxon'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../../helpers/cast_boolean'
 import flatpickr from 'flatpickr'
 
 export default class extends Controller {

data/app/{packs → javascript}/js/controllers/fields/key_value_controller.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../../helpers/cast_boolean'
 
 export default class extends Controller {
   static targets = ['input', 'controller', 'rows']

data/app/{packs → javascript}/js/controllers/fields/trix_field_controller.js

@@ -1,6 +1,6 @@
 import 'trix'
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../../helpers/cast_boolean'
 
 export default class extends Controller {
   static targets = ['editor', 'controller']

data/app/{packs → javascript}/js/controllers/search_controller.js

@@ -3,7 +3,7 @@ import * as Mousetrap from 'mousetrap'
 import { Controller } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
 import { autocomplete } from '@algolia/autocomplete-js'
-import debouncePromise from '@/js/helpers/debounce_promise'
+import debouncePromise from '../helpers/debounce_promise'
 
 export default class extends Controller {
   static targets = ['autocomplete', 'button']

data/app/javascript/js/controllers.js

@@ -0,0 +1,53 @@
+import { application } from './application'
+
+import ActionController from './controllers/action_controller'
+import ActionsPickerController from './controllers/actions_picker_controller'
+import AlertsController from './controllers/alerts_controller'
+import AttachmentsController from './controllers/attachments_controller'
+import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
+import BooleanFilterController from './controllers/boolean_filter_controller'
+import CodeFieldController from './controllers/fields/code_field_controller'
+import DateFieldController from './controllers/fields/date_field_controller'
+import FilterController from './controllers/filter_controller'
+import HiddenInputController from './controllers/hidden_input_controller'
+import ItemSelectAllController from './controllers/item_select_all_controller'
+import ItemSelectorController from './controllers/item_selector_controller'
+import KeyValueController from './controllers/fields/key_value_controller'
+import LoadingButtonController from './controllers/loading_button_controller'
+import ModalController from './controllers/modal_controller'
+import MultipleSelectFilterController from './controllers/multiple_select_filter_controller'
+import PerPageController from './controllers/per_page_controller'
+import SearchController from './controllers/search_controller'
+import SelectFilterController from './controllers/select_filter_controller'
+import SimpleMdeController from './controllers/fields/simple_mde_controller'
+import TextFilterController from './controllers/text_filter_controller'
+import TippyController from './controllers/tippy_controller'
+import TogglePanelController from './controllers/toggle_panel_controller'
+import TrixFieldController from './controllers/fields/trix_field_controller'
+
+application.register('action', ActionController)
+application.register('actions-picker', ActionsPickerController)
+application.register('alerts', AlertsController)
+application.register('attachments', AttachmentsController)
+application.register('boolean-filter', BooleanFilterController)
+application.register('filter', FilterController)
+application.register('hidden-input', HiddenInputController)
+application.register('item-select-all', ItemSelectAllController)
+application.register('item-selector', ItemSelectorController)
+application.register('loading-button', LoadingButtonController)
+application.register('modal', ModalController)
+application.register('multiple-select-filter', MultipleSelectFilterController)
+application.register('per-page', PerPageController)
+application.register('search', SearchController)
+application.register('select-filter', SelectFilterController)
+application.register('text-filter', TextFilterController)
+application.register('tippy', TippyController)
+application.register('toggle-panel', TogglePanelController)
+
+// Field controllers
+application.register('belongs-to-field', BelongsToFieldController)
+application.register('code-field', CodeFieldController)
+application.register('date-field', DateFieldController)
+application.register('key-value', KeyValueController)
+application.register('simple-mde', SimpleMdeController)
+application.register('trix-field', TrixFieldController)

data/app/views/avo/actions/show.html.erb

@@ -5,7 +5,7 @@
     data-action-target="controllerDiv"
     data-resource-name="<%= @resource.model_key %>"
     data-resource-id="<%= params[:id] %>"
-    class="hidden text-blue-gray-800"
+    class="hidden text-slate-800"
   >
     <%= form_with model: @model, scope: 'fields', url: "#{@resource.records_path}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
       <%= render Avo::ModalComponent.new do |c| %>

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

@@ -1,7 +1,7 @@
 <% if @actions.count > 0 %>
   <div class="relative z-40 js-actions-dropdown" data-controller="toggle-panel actions-picker">
     <%= a_button class: "focus:outline-none",
-      color: 'light-blue',
+      color: 'sky',
       'data-action': "click->toggle-panel#togglePanel",
       'data-actions-dropdown-button': @resource.model_key do
     %>

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

@@ -1,7 +1,7 @@
 <div data-controller="toggle-panel">
   <div class="relative w-full flex justify-between z-30">
     <%= a_button class: 'focus:outline-none',
-      color: 'blue-gray',
+      color: 'slate',
       title: t('avo.click_to_reveal_filters'),
       'data-button': 'resource-filters',
       'data-action': 'click->toggle-panel#togglePanel',
@@ -24,9 +24,9 @@
 
       <div class="p-4 border-gray-300 border-t">
         <% if params[:filters].present? %>
-          <%= a_link t('avo.reset_filters'), resources_path(resource: @resource, filters: nil, keep_query_params: true), color: 'blue-gray', class: 'w-full justify-center' %>
+          <%= a_link t('avo.reset_filters'), resources_path(resource: @resource, filters: nil, keep_query_params: true), color: 'slate', class: 'w-full justify-center' %>
         <% else %>
-          <%= a_button t('avo.reset_filters'), color: 'blue-gray', class: 'w-full justify-center', disabled: true %>
+          <%= a_button t('avo.reset_filters'), color: 'slate', class: 'w-full justify-center', disabled: true %>
         <% end %>
       </div>
     </div>

data/app/views/avo/home/_actions.html.erb

@@ -7,7 +7,7 @@
     <div class="mt-2">
       <code class="text-lg">Toggle published</code>
       <div class="mt-1">
-        <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:action toggle_published</code>
+        <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:action toggle_published</code>
       </div>
     </div>
 

data/app/views/avo/home/_filters.html.erb

@@ -7,7 +7,7 @@
     <div class="mt-2">
       <code class="text-lg">Published filter</code>
       <div class="mt-1">
-        <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:filter published_filter</code>
+        <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:filter published_filter</code>
       </div>
     </div>
 

data/app/views/avo/home/_resources.html.erb

@@ -20,7 +20,7 @@
         <% models.each do |model| %>
           <code class="text-lg"><%= model.to_s %></code>
           <div>
-            <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:resource <%= model.to_s %></code>
+            <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:resource <%= model.to_s %></code>
           </div>
         <% end %>
       </div>
@@ -30,7 +30,7 @@
       You may generate a resource using the following command:
       <br>
 
-      <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:resource post</code>
+      <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:resource post</code>
     </div>
   <% end %>
 

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

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

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

@@ -10,7 +10,10 @@
     data-search-target="button"
   >
     <span class="sr-only">Press </span>
-    <kbd class="font-sans"><abbr title="Command" class="no-underline">⌘</abbr></kbd>
+    <kbd class="font-sans">
+      <abbr title="Command" class="no-underline pc:hidden">⌘</abbr>
+      <abbr title="CTRL" class="no-underline mac:hidden">CTRL +&nbsp; </abbr>
+    </kbd>
     <span class="sr-only"> and </span>
     <kbd class="font-sans">K</kbd><span class="sr-only"> to search</span>
   </div>

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

@@ -1 +1 @@
-<%= image_manifest_tag 'logo.png', class: 'h-full', title: 'Avo' %>
+<%= image_tag 'avo/logo.png', class: 'h-full', title: 'Avo' %>

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

@@ -8,17 +8,17 @@
   per_page_options = per_page_options.sort.uniq
 %>
 
-<div class="bg-white px-4 flex items-center justify-between aborder-t aborder-blue-gray-200 sm:px-6 rounded-xl">
+<div class="bg-white px-4 flex items-center justify-between aborder-t aborder-slate-200 sm:px-6 rounded-xl">
   <div class="hidden sm:flex-2 sm:flex sm:items-center sm:justify-between">
     <div>
-      <div class="text-sm leading-5 text-blue-gray-600 flex items-center">
+      <div class="text-sm leading-5 text-slate-600 flex items-center">
         <div class="mr-2"><%== pagy_info @pagy %></div>
 
         <div data-controller="per-page">
           <div class="flex items-center">
             <%= select_tag 'per_page',
               options_for_select(per_page_options, @index_params[:per_page]),
-              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-400 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-600 rounded-md py-1 px-2 leading-tight border border-blue-gray-300 outline-none focus:border-blue-gray-400 outline w-16 mr-1 text-sm',
+              class: 'appearance-none inline-flex bg-slate-100 disabled:bg-slate-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
               data: {
                 'turbo-frame': turbo_frame,
                 'per-page-target': 'selector',

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

@@ -1,5 +1,5 @@
 
-<thead class="bg-blue-gray-100 border-t border-b border-gray-300 pb-1">
+<thead class="bg-slate-100 border-t border-b border-gray-300 pb-1">
   <th>
     <%== item_select_all_input %>
   </th>
@@ -28,7 +28,7 @@
         sort_by = field.id
         sort_direction = 'desc'
       end
-      classes = "text-blue-gray-600 tracking-tight leading-tight text-xs font-semibold"
+      classes = "text-slate-600 tracking-tight leading-tight text-xs font-semibold"
   %>
     <th class="text-left uppercase px-3 py-2 whitespace-nowrap">
       <% if field.sortable %>

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

@@ -9,10 +9,15 @@
   <%= render partial: 'avo/partials/javascript' %>
   <%= render partial: 'avo/partials/head' %>
 
-  <%= javascript_manifest_tag 'application' %>
-  <%= stylesheet_manifest_tag 'application', media: 'all' %>
+  <% if Avo::PACKED %>
+    <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+    <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+  <% else %>
+    <%= javascript_include_tag "avo", "data-turbo-track": "reload", defer: true %>
+    <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
+  <% end %>
 </head>
-<body class="bg-blue-gray-200">
+<body class="bg-slate-200 os-mac">
 
 <div id="app" class="flex min-h-screen flex-row h-full">
   <div class="flex flex-1 w-full">
@@ -24,7 +29,7 @@
           <%= render partial: "avo/partials/header" %>
         </div>
         <div class="flex-1 flex ml-4 pl-4">
-          <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) %>
+          <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
         </div>
         <div class="align-end">
           <%= render partial: "avo/partials/profile_dropdown" %>

data/avo.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
       "public gem pushes."
   end
 
-  spec.post_install_message = "Thank you for using Avo! Docs are available at https://docs.avohq.io"
+  spec.post_install_message = "Thank you for using Avo 💪  Docs are available at https://docs.avohq.io"
 
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
@@ -44,5 +44,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
-  spec.add_dependency "manifester"
 end

data/bin/dev

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if ! command -v foreman &> /dev/null
+then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+foreman start -f Procfile.dev

data/bin/test

@@ -11,7 +11,8 @@ fi;
 
 # Run system tests
 if [[ -z "$1" ]] || [[ "$1" == "system" ]]; then
-  bin/webpack
+  yarn build:js
+  yarn build:css
   bundle exec rspec ./spec --tag type:system
 fi;
 

data/lib/avo/base_resource.rb

@@ -343,8 +343,9 @@ module Avo
 
             reflection = @model._reflections[@params[:via_relation]]
 
-            if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params["via_relation_class"])
-              value = @params["via_relation_class"].safe_constantize.find(@params[:via_resource_id])
+            if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params[:via_relation_class])
+              # 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]
             end
@@ -441,7 +442,7 @@ module Avo
     end
 
     def form_scope
-      model.class.base_class.to_s.downcase
+      model.class.base_class.to_s.underscore.downcase
     end
   end
 end