avo 1.21.0.pre.1 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2009c14b639e720209ef1c2d56c84ac7936cfa96cb71dd4306b02695cae3ade5
-  data.tar.gz: 4e99a479bc58b1da03e2e13f63e1921b1e652724b2d5b8d394964dad6a43a8ae
+  metadata.gz: 629be34248470405b26afdad89b08373587cd4ea00fb10f910315072338b5f39
+  data.tar.gz: ef5eb75f5e6b863af0d69fdefee87455a44283a17333000adcb2ab076f827fb2
 SHA512:
-  metadata.gz: 91a4af05f9cc03bdf76751a140697a0ef6d5782f5a049e39023d7dffba3074c16d01204f36608c2f8d776b6f3f72d885bd91f49b6e38ab14ac7b951df13667c9
-  data.tar.gz: 18d41c5e64b507ab27025b4af7fe7b99987d45897b6e717022fcebe8e5debd32dab26aa96a24611a8534ffcaa0f6744932d277d37421e1865722b0f728234516
+  metadata.gz: 35cc7ab3e7086fd1b701e8600f25a33f3a7b779d03626ea293b75e19f375e4de5bc4ab29dc243d49eeb9bd0afe5411d35c87165aac01ca029b2de9cee6f6e1f1
+  data.tar.gz: 0b4e462976362acfaf3ecf5673a70f474f1c0c4b0e11d7f502c81cf3a9f53def31306988defa28599de643c10f9a4ee27b77182e1f6231d509cd1374e9cebd84

data/Gemfile

@@ -30,7 +30,7 @@ gem "rails", "~> 6.1.0"
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
 # Use Puma as the app server
-gem "puma", "~> 5.5.1"
+gem "puma", "~> 5.6.2"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem "jbuilder", "~> 2.7"
 # Use Redis adapter to run Action Cable in production
@@ -77,6 +77,8 @@ group :development do
   # gem 'ruby-prof'
 
   # gem 'pry-rails'
+
+  gem 'htmlbeautifier'
 end
 
 group :development, :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.21.0.pre.1)
+    avo (1.22.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -19,40 +19,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actioncable (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionmailbox (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionmailer (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.4)
-      actionview (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionpack (6.1.4.6)
+      actionview (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       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.4.4)
-      actionpack (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actiontext (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionview (6.1.4.6)
+      activesupport (= 6.1.4.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -60,22 +60,22 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.1.4.4)
-      activesupport (= 6.1.4.4)
+    activejob (6.1.4.6)
+      activesupport (= 6.1.4.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activestorage (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    activemodel (6.1.4.6)
+      activesupport (= 6.1.4.6)
+    activerecord (6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
+    activestorage (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.4)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -175,10 +175,11 @@ GEM
       rails (>= 6.0.0)
       stimulus-rails
       turbo-rails
+    htmlbeautifier (1.4.1)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
@@ -196,7 +197,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.13.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -229,8 +230,6 @@ GEM
     nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -239,28 +238,28 @@ GEM
       ast (~> 2.4.1)
     pg (1.3.1)
     public_suffix (4.0.6)
-    puma (5.5.2)
+    puma (5.6.2)
       nio4r (~> 2.0)
-    pundit (2.1.1)
+    pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.4)
-      actioncable (= 6.1.4.4)
-      actionmailbox (= 6.1.4.4)
-      actionmailer (= 6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actiontext (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    rails (6.1.4.6)
+      actioncable (= 6.1.4.6)
+      actionmailbox (= 6.1.4.6)
+      actionmailer (= 6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actiontext (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.4)
+      railties (= 6.1.4.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -271,9 +270,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    railties (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -419,6 +418,7 @@ DEPENDENCIES
   fuubar
   gem-release
   hotwire-rails
+  htmlbeautifier
   httparty
   image_processing (~> 1.2)
   iso
@@ -429,7 +429,7 @@ DEPENDENCIES
   meta-tags
   net-smtp
   pg (>= 0.18, < 2.0)
-  puma (~> 5.5.1)
+  puma (~> 5.6.2)
   pundit
   rails (~> 6.1.0)
   rails-controller-testing

data/README.md

@@ -54,7 +54,7 @@ $ bundle install
 
 # Quick Purchase
 
-Use [this](https://buy.stripe.com/9AQ6rX0uIbLF2CQdQQ) link to quickly purchase a Pro license to support this project. Thank you 🙏
+Use [this](https://avohq.io/purchase/pro) link to quickly purchase a Pro license to support this project. Thank you 🙏
 
 # Contributing
 

data/app/assets/svgs/x.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+</svg>

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

@@ -0,0 +1,29 @@
+<div data-controller="search" class="resource-search flex items-center h-full w-full" data-turbo-remove-before-cache>
+  <div class="w-full hidden"
+    data-search-target="autocomplete"
+    data-search-resource="<%= @model_key %>"
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-via-association="belongs_to"
+  ></div>
+  <div class="relative w-full" autocomplete="off">
+    <%= @form.text_field @field.foreign_key,
+      value: field_label,
+      class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+      placeholder: @field.placeholder,
+      'data-search-target': 'button clearValue',
+      # This instructs the search_controller if it should enable/disabled this field when the user switches polymorphic associations
+      # It should not enable the field if the record is being created through an association
+      'data-should-be-disabled': @disabled,
+      disabled: true %>
+    <% unless @disabled %>
+      <div class="absolute top-1/2 left-auto right-3 mr-px -mt-2 cursor-pointer hidden text-gray-500"
+        data-tippy="tooltip"
+        data-search-target="clearButton"
+        title="<%= I18n.translate 'avo.clear_value' %>"
+        data-action="click->search#clearValue"
+        ><%= helpers.svg 'x', class: 'h-4' %>
+      </div>
+    <% end %>
+  </div>
+  <%= @form.hidden_field @foreign_key, value: field_value, 'data-search-target': 'hiddenId clearValue' %>
+</div>

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
+  def initialize(form:, field:, model_key:, foreign_key:, disabled:, type: nil, resource: nil, polymorphic_record: nil)
+    @form = form
+    @field = field
+    @type = type
+    @model_key = model_key
+    @foreign_key = foreign_key
+    @resource = resource
+    @disabled = disabled
+    @polymorphic_record = polymorphic_record
+  end
+
+  def field_label
+    if searchable?
+      # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
+      if new_record? && has_polymorphic_association?
+        @polymorphic_record.send(polymorphic_fields[:label])
+      else
+        @field.value&.class == @type ? @field.field_label : nil
+      end
+    else
+      @field.field_label
+    end
+  end
+
+  def field_value
+    if searchable?
+      # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
+      if new_record? && has_polymorphic_association?
+        @polymorphic_record.send(polymorphic_fields[:id])
+      else
+        @field.value&.class == @type ? @field.field_value : nil
+      end
+    else
+      @field.field_value
+    end
+  end
+
+  private
+
+  def searchable?
+    @type.present?
+  end
+
+  def new_record?
+    @resource.model.new_record?
+  end
+
+  def has_polymorphic_association?
+    polymorphic_class.present? && polymorphic_id.present?
+  end
+
+  # Get the polymorphic class
+  def polymorphic_class
+    @resource.model["#{@field.foreign_key}_type"]
+  end
+
+  # Get the polymorphic id
+  def polymorphic_id
+    @resource.model["#{@field.foreign_key}_id"]
+  end
+
+  # Get the resource for that polymorphic class
+  def polymorphic_resource
+    ::Avo::App.get_resource_by_model_name polymorphic_class
+  end
+
+  # Extract the needed fields to identify the record for polymorphic associations
+  def polymorphic_fields
+    {
+      id: polymorphic_resource.id,
+      label: polymorphic_resource.title
+    }
+  end
+end

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

@@ -1,68 +1,95 @@
-<% if @field.types.present? %>
-  <div data-controller="belongs-to-field">
-    <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-      <%= @form.select "#{@field.foreign_key}_type", @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
-        {
-          include_blank: @field.placeholder,
-        },
-        {
-          class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-          disabled: disabled,
-          'data-belongs-to-field-target': "select",
-          'data-action': 'change->belongs-to-field#changedType'
-        }
-        %>
-      <%
+<%
+  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 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.foreign_key}_type", @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
+      {
+        value: @field.value,
+        include_blank: @field.placeholder,
+      },
+      {
+        class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+        disabled: disabled,
+        'data-belongs-to-field-target': "select",
+        '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.foreign_key}_type" %>
-      <% end %>
+        if disabled %>
+      <%= @form.hidden_field "#{@field.foreign_key}_type" %>
     <% end %>
-    <% @field.types.each do |type| %>
-      <div class="hidden"
+  <% end %>
+  <% @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 %>
-          <%= @form.select "#{@field.foreign_key}_id", @field.values_for_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,
+            field: @field,
+            type: type,
+            model_key: model_keys[type.to_s],
+            foreign_key: "#{@field.foreign_key}_id",
+            resource: @resource,
+            disabled: disabled,
+            polymorphic_record: polymorphic_record
+          %>
+        <% else %>
+          <%= @form.select "#{@field.foreign_key}_id", options_for_select(@field.values_for_type(type), @resource.present? && @resource.model.present? ? @resource.model["#{@field.foreign_key}_id"] : nil),
             {
+              value: @resource.model["#{@field.foreign_key}_id"].to_s,
               include_blank: @field.placeholder,
             },
             {
               class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
               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.foreign_key}_id" %>
-          <% end %>
         <% end %>
-      </div>
-    <% end %>
-  </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
 <% else %>
   <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-    <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
-      {
-        include_blank: @field.placeholder,
-      },
-      {
-        class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+    <% if @field.searchable %>
+      <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
+        field: @field,
+        model_key: @field.target_resource&.model_key,
+        foreign_key: @field.foreign_key,
+        resource: @resource,
         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.foreign_key %>
+    <% else %>
+      <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
+        {
+          include_blank: @field.placeholder,
+        },
+        {
+          class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+          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.foreign_key %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
+  def initialize(field: nil, resource: nil, index: 0, form: nil, displayed_in_modal: false)
+    super field: field, resource: resource, index: index, form: form, displayed_in_modal: displayed_in_modal
+
+    @polymorphic_record = nil
+  end
+
   def disabled
     return true if @field.readonly
     return true if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
@@ -8,4 +14,35 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
     false
   end
+
+  def is_polymorphic?
+    @field.types.present?
+  end
+
+  def has_polymorphic_association?
+    polymorphic_class.present? && polymorphic_id.present?
+  end
+
+  # Get the polymorphic class
+  def polymorphic_class
+    @resource.model["#{@field.foreign_key}_type"]
+  end
+
+  # Get the polymorphic id
+  def polymorphic_id
+    @resource.model["#{@field.foreign_key}_id"]
+  end
+
+  # Get the actual resource
+  def polymorphic_record
+    return unless has_polymorphic_association?
+
+    return unless is_polymorphic?
+
+    return @polymorphic_record if @polymorphic_record.present?
+
+    @polymorphic_record = polymorphic_class.safe_constantize.find polymorphic_id
+
+    @polymorphic_record
+  end
 end

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

@@ -1,3 +1,3 @@
-<%= active_link_to @path, class: 'text-gray-800 py-2 px-4 block font-normal hover:bg-gray-100 rounded-md mb-1 mx-3 text-sm leading-none', active: @active do %>
+<%= active_link_to @path, class: 'text-gray-800 py-2 px-4 block font-normal hover:bg-gray-100 rounded-md mb-1 mx-3 text-sm leading-none', active: @active, target: @target do %>
   <div class="w-4"></div> <%= @label %>
 <% end %>

data/app/components/avo/navigation_link_component.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::NavigationLinkComponent < ViewComponent::Base
-  def initialize(label: nil, path: nil, active: :inclusive, size: :md)
+  def initialize(label: nil, path: nil, active: :inclusive, size: :md, target: "_self")
     @label = label
     @path = path
     @active = active
     @size = size
+    @target = target
   end
 end

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

@@ -24,7 +24,7 @@
         data-selected-resources="[]"
       >
         <div class="flex items-center px-6 w-64">
-          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_class.model_name.plural} if @resource.search_query.present? %>
+          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_key} if @resource.search_query.present? %>
         </div>
         <div class="flex justify-end items-center px-6 space-x-3">
           <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>

data/app/controllers/avo/application_controller.rb

@@ -1,6 +1,11 @@
 module Avo
   class ApplicationController < ::ActionController::Base
-    include Pundit
+    if defined?(Pundit::Authorization)
+      include Pundit::Authorization
+    else
+      include Pundit
+    end
+
     include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
@@ -111,7 +116,12 @@ module Avo
     end
 
     def fill_model
-      @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      # We have to skip filling the the model if this is an attach action
+      is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
+
+      unless is_attach_action
+        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      end
     end
 
     def hydrate_resource
@@ -187,18 +197,6 @@ module Avo
       query
     end
 
-    # def authorize_user
-    #   return if params[:controller] == 'avo/search'
-
-    #   model = record = resource.model
-
-    #   if ['show', 'edit', 'update'].include?(params[:action]) && params[:controller] == 'avo/resources'
-    #     record = resource
-    #   end
-
-    #   # AuthorizationService::authorize_action _current_user, record, params[:action] return render_unauthorized unless
-    # end
-
     def _authenticate!
       instance_eval(&Avo.configuration.authenticate)
     end
@@ -243,5 +241,9 @@ module Avo
     def on_api_path
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
+
+    def model_param_key
+      @resource.form_scope
+    end
   end
 end