avo 2.48.0 → 3.0.0.beta1

data/app/components/avo/actions_component.rb

@@ -2,9 +2,9 @@
 
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
-  attr_reader :label
+  attr_reader :label, :size, :as_row_control
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], include: [], style: :outline, color: :primary, label: nil)
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], include: [], style: :outline, color: :primary, label: nil, size: :md, as_row_control: false)
     @actions = actions || []
     @resource = resource
     @view = view
@@ -13,6 +13,8 @@ class Avo::ActionsComponent < ViewComponent::Base
     @color = color
     @style = style
     @label = label || I18n.t("avo.actions")
+    @size = size
+    @as_row_control = as_row_control
   end
 
   def render?
@@ -30,20 +32,21 @@ class Avo::ActionsComponent < ViewComponent::Base
   end
 
   # When running an action for one record we should do it on a special path.
-  # We do that so we get the `model` param inside the action so we can prefill fields.
-  def action_path(id)
-    return many_records_path(id) unless @resource.has_model_id?
+  # We do that so we get the `record` param inside the action so we can prefill fields.
+  def action_path(action)
+    return single_record_path(action) if as_row_control
+    return many_records_path(action) unless @resource.has_record_id?
 
     if on_record_page?
-      single_record_path id
+      single_record_path action
     else
-      many_records_path id
+      many_records_path action
     end
   end
 
   # How should the action be displayed by default
   def is_disabled?(action)
-    return false if action.standalone
+    return false if action.standalone || as_row_control
 
     on_index_page?
   end
@@ -58,17 +61,34 @@ class Avo::ActionsComponent < ViewComponent::Base
     !on_record_page?
   end
 
-  def single_record_path(id)
-    Avo::Services::URIService.parse(@resource.record_path)
-      .append_paths("actions")
-      .append_query("action_id": id)
-      .to_s
+  def single_record_path(action)
+    action_url(action, @resource.record_path)
+  end
+
+  def many_records_path(action)
+    action_url(action, @resource.records_path)
   end
 
-  def many_records_path(id)
-    Avo::Services::URIService.parse(@resource.records_path)
+  def action_url(action, path)
+    Avo::Services::URIService.parse(path)
       .append_paths("actions")
-      .append_query("action_id": id)
-      .to_s
+      .append_query(
+        {
+          action_id: action.param_id,
+          arguments: encrypted_arguments(action)
+        }.compact
+      ).to_s
+  end
+
+  # Encrypt the arguments so we can pass them as a query param.
+  # EncryptionService can generate special characters that can break the URL.
+  # We use Base64 to encode the encrypted string so we can safely pass it as a query param and don't break the URL.
+  def encrypted_arguments(action)
+    return if action.arguments.blank?
+
+    Base64.encode64 Avo::Services::EncryptionService.encrypt(
+      message: action.arguments,
+      purpose: :action_arguments
+    )
   end
 end

data/app/components/avo/asset_manager/javascript_component.html.erb

@@ -0,0 +1,3 @@
+<% javascripts.each do |path| %>
+  <%= javascript_include_tag path, "data-turbo-track": "reload", defer: true %>
+<% end %>

data/app/components/avo/asset_manager/javascript_component.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Avo::AssetManager::JavascriptComponent < ViewComponent::Base
+  attr_reader :asset_manager
+
+  def initialize(asset_manager:)
+    @asset_manager = asset_manager
+  end
+
+  def javascripts
+    asset_manager.javascripts
+  end
+end

data/app/components/avo/asset_manager/stylesheet_component.html.erb

@@ -0,0 +1,3 @@
+<% stylesheets.each do |path| %>
+  <%= stylesheet_link_tag path, "data-turbo-track": "reload", defer: true %>
+<% end %>

data/app/components/avo/asset_manager/stylesheet_component.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Avo::AssetManager::StylesheetComponent < ViewComponent::Base
+  attr_reader :asset_manager
+
+  def initialize(asset_manager:)
+    @asset_manager = asset_manager
+  end
+
+  def stylesheets
+    asset_manager.stylesheets
+  end
+end

data/app/components/avo/base_component.rb

@@ -4,7 +4,7 @@ class Avo::BaseComponent < ViewComponent::Base
   include Turbo::FramesHelper
 
   def has_with_trial(ability)
-    ::Avo::App.license.has_with_trial(ability)
+    Avo.license.has_with_trial(ability)
   end
 
   private
@@ -16,39 +16,42 @@ class Avo::BaseComponent < ViewComponent::Base
     nil
   end
 
-  # Fetch the resource and hydrate it with the model
+  # Fetch the resource and hydrate it with the record
   def association_resource
-    resource = ::Avo::App.get_resource(params[:via_resource_class])
-    model_class_name = params[:via_relation_class] || resource.model_class
+    resource = Avo.resource_manager.get_resource(params[:via_resource_class])
 
-    model_klass = ::Avo::BaseResource.valid_model_class model_class_name
+    model_class = if params[:via_relation_class].present?
+      ::Avo::BaseResource.get_model_by_name params[:via_relation_class]
+    else
+      resource.model_class
+    end
 
-    resource = ::Avo::App.get_resource_by_model_name model_klass if resource.blank?
+    resource = Avo.resource_manager.get_resource_by_model_class model_class if resource.blank?
 
-    model = resource.find_record params[:via_resource_id], query: model_klass, params: params
+    record = resource.find_record params[:via_record_id], query: model_class, params: params
 
-    resource.dup.hydrate model: model
+    resource.new record: record
   end
 
   # Get the resource for the resource using the klass attribute so we get the namespace too
   def reflection_resource
-    ::Avo::App.get_resource_by_model_name(@reflection.klass.to_s)
+    Avo.resource_manager.get_resource_by_model_class(@reflection.klass.to_s)
   rescue
     nil
   end
 
   # Get the resource for the resource using the klass attribute so we get the namespace too
   def reflection_parent_resource
-    ::Avo::App.get_resource_by_model_name(@reflection.active_record.to_s)
+    Avo.resource_manager.get_resource_by_model_class(@reflection.active_record.to_s)
   rescue
     nil
   end
 
   def parent_or_child_resource
     return @resource unless link_to_child_resource_is_enabled?
-    return @resource if @resource.model.class.base_class == @resource.model.class
+    return @resource if @resource.record.class.base_class == @resource.record.class
 
-    ::Avo::App.get_resource_by_model_name(@resource.model.class).dup || @resource
+    Avo.resource_manager.get_resource_by_model_class(@resource.record.class) || @resource
   end
 
   def link_to_child_resource_is_enabled?

data/app/components/avo/button_component.rb

@@ -40,7 +40,10 @@ class Avo::ButtonComponent < ViewComponent::Base
   end
 
   def button_classes
-    classes = "button-component inline-flex flex-grow-0 items-center font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 border justify-center active:outline active:outline-1 #{@class}"
+    classes = "button-component inline-flex flex-grow-0 items-center font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 justify-center #{@class}"
+
+    # For non-icon-styled buttons we should not add borders.
+    classes += " border active:outline active:outline-1" unless is_icon?
 
     classes += " rounded" if @rounded.present?
     classes += style_classes
@@ -55,18 +58,26 @@ class Avo::ButtonComponent < ViewComponent::Base
     @is_link
   end
 
+  def is_icon?
+    @style == :icon
+  end
+
+  def is_not_icon?
+    !is_icon?
+  end
+
   def full_content
     result = ""
     icon_classes = @icon_class
     # space out the icon from the text if text is present
-    icon_classes += " mr-1" if content.present?
+    icon_classes += " mr-1" if content.present? && is_not_icon?
     # add the icon height
     icon_classes += icon_size_classes
 
     # Add the icon
     result += helpers.svg(@icon, class: icon_classes) if @icon.present?
 
-    if content.present?
+    if is_not_icon? && content.present?
       result += "<span>#{content}</span>"
     end
 
@@ -102,6 +113,8 @@ class Avo::ButtonComponent < ViewComponent::Base
   private
 
   def vertical_padding_classes
+    return " py-0" if is_icon?
+
     case @size.to_sym
     when :xs
       " py-0"
@@ -119,6 +132,7 @@ class Avo::ButtonComponent < ViewComponent::Base
   end
 
   def horizontal_padding_classes
+    return " px-0" if is_icon?
     return " px-1" if @compact
 
     case @size.to_sym
@@ -154,6 +168,8 @@ class Avo::ButtonComponent < ViewComponent::Base
       " bg-white text-#{@color}-500 border-#{@color}-500 hover:bg-#{@color}-100 active:bg-#{@color}-100 active:border-#{@color}-500 active:outline-#{@color}-500"
     when :text
       " text-#{@color}-500 active:outline-#{@color}-500 hover:bg-gray-100 border-transparent"
+    when :icon
+      " text-#{@color}-600"
     else
       ""
     end
@@ -161,6 +177,7 @@ class Avo::ButtonComponent < ViewComponent::Base
 
   def icon_size_classes
     icon_classes = ""
+    return icon_classes if is_icon?
 
     case @size
     when :xs

data/app/components/avo/empty_state_component.rb

@@ -21,6 +21,6 @@ class Avo::EmptyStateComponent < ViewComponent::Base
   private
 
   def locale_message
-    helpers.t by_association ? 'avo.no_related_item_found' : 'avo.no_item_found'
+    helpers.t by_association ? "avo.no_related_item_found" : "avo.no_item_found"
   end
 end

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

@@ -2,7 +2,7 @@
   class: classes,
   style: style,
   data: data do %>
-  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 md:h-14 <% end %> pt-4 flex self-start items-center flex-shrink-0 <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 uppercase font-semibold text-gray-500 text-sm" data-slot="label">
+  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 <% if short? %> md:h-10 <% else %> md:h-14 <% end %> <% end %> pt-4 flex self-start items-center flex-shrink-0 <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 uppercase font-semibold text-gray-500 text-sm" data-slot="label">
     <% if form.present? %>
       <%= form.label field.id, label %>
     <% else %>

data/app/components/avo/field_wrapper_component.rb

@@ -19,6 +19,7 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
     full_width: false,
     label: nil, # do we really need it?
     resource: nil,
+    short: false,
     stacked: nil,
     style: "",
     view: :show,
@@ -35,7 +36,7 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
     @full_width = full_width
     @label = label
     @resource = resource
-    @action = field.action
+    @short = short
     @stacked = stacked
     @style = style
     @view = view
@@ -62,17 +63,11 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   end
 
   def help
-    help_value = @help || @field.help
-
-    if help_value.respond_to?(:call)
-      return Avo::Hosts::ResourceViewRecordHost.new(block: help_value, record: record, resource: resource, view: view).handle
-    end
-
-    help_value
+    Avo::ExecutionContext.new(target: @help || @field.help, record: record, resource: resource, view: view).handle
   end
 
   def record
-    resource.present? ? resource.model : nil
+    resource.present? ? resource.record : nil
   end
 
   def data
@@ -82,19 +77,17 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
       **@data
     }
 
-    # Fetch the data attributes off the html option
-    wrapper_data_attributes = @field.get_html :data, view: view, element: :wrapper
-    if wrapper_data_attributes.present?
-      attributes.merge! wrapper_data_attributes
-    end
-
     # Add the built-in stimulus integration data tags.
     if @resource.present?
-      add_stimulus_attributes_for(@resource, attributes)
+      @resource.get_stimulus_controllers.split(" ").each do |controller|
+        attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
+      end
     end
 
-    if @action.present?
-      add_stimulus_attributes_for(@action, attributes)
+    # Fetch the data attributes off the html option
+    wrapper_data_attributes = @field.get_html :data, view: view, element: :wrapper
+    if wrapper_data_attributes.present?
+      attributes.merge! wrapper_data_attributes
     end
 
     attributes
@@ -115,15 +108,11 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
     @compact
   end
 
-  def full_width?
-    @full_width
+  def short?
+    @short
   end
 
-  private
-
-  def add_stimulus_attributes_for(entity, attributes)
-    entity.get_stimulus_controllers.split(" ").each do |controller|
-      attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
-    end
+  def full_width?
+    @full_width
   end
 end

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

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

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

@@ -1,137 +1,115 @@
-<div data-controller="reload-belongs-to-field"
-     data-action="turbo:before-stream-render@document->reload-belongs-to-field#beforeStreamRender"
-     data-reload-belongs-to-field-polymorphic-value="<%= is_polymorphic? %>"
-     data-reload-belongs-to-field-searchable-value="<%= @field.searchable %>"
-     data-reload-belongs-to-field-relation-name-value="<%= @field.id %>"
-     data-reload-belongs-to-field-target-name-value="<%= form.object_name %>[<%= @field.id_input_foreign_key %>]"
->
-  <% 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 %>"
-    >
-      <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
-        <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [::Avo::App.get_resource_by_model_name(type.to_s).name, type.to_s] },
-        {
-          value: @field.value,
-          include_blank: @field.placeholder,
+<% if is_polymorphic? %>
+  <%
+    # Set the model keys so we can pass them over
+    model_keys = @field.types.map do |type|
+      resource = Avo.resource_manager.get_resource_by_model_class(type.to_s)
+      [type.to_s, resource.model_key]
+    end.to_h
+  %>
+  <div class="divide-y"
+    data-controller="belongs-to-field"
+    data-searchable="<%= @field.is_searchable? %>"
+    data-association="<%= @field.id %>"
+    data-association-class="<%= @field&.target_resource&.model_class || nil %>"
+  >
+    <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
+      <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
+      {
+        value: @field.value,
+        include_blank: @field.placeholder,
+      },
+      {
+        class: classes("w-full"),
+        data: {
+          **@field.get_html(:data, view: view, element: :input),
+          action: "change->belongs-to-field#changeType #{field_html_action}",
+          'belongs-to-field-target': "select",
         },
-        {
-          class: classes("w-full"),
-          data: {
-            **@field.get_html(:data, view: view, element: :input),
-            action: "change->belongs-to-field#changeType #{field_html_action}",
-            'belongs-to-field-target': "select",
-          },
-          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.type_input_foreign_key %>
-        <% end %>
-      <% end %>
-      <% @field.types.each do |type| %>
-        <div class="hidden"
-          data-belongs-to-field-target="type"
-          data-type="<%= type %>"
-        >
-          <%= field_wrapper **field_wrapper_args, label: ::Avo::App.get_resource_by_model_name(type.to_s).name do %>
-            <div class="flex flex-col gap-1">
-              <% if @field.searchable %>
-                <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
-                  disabled: disabled,
-                  field: @field,
-                  foreign_key: @field.id_input_foreign_key,
-                  model_key: model_keys[type.to_s],
-                  polymorphic_record: polymorphic_record,
-                  resource: @resource,
-                  style: @field.get_html(:style, view: view, element: :input),
-                  type: type,
-                  classes: classes("w-full"),
-                  view: view
-              %>
-              <% 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,
-                  include_blank: @field.placeholder,
-                },
-                {
-                  class: classes("w-full"),
-                  data: @field.get_html(:data, view: view, element: :input),
-                  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 %>
-              <% create_href = create_path(::Avo::App.get_resource_by_model_name(type.to_s)) %>
-              <% if !disabled && create_href.present? %>
-                <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
-                            create_href,
-                            class: "text-sm"
-                %>
-              <% end %>
-            </div>
-          <% end %>
-        </div>
+        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.type_input_foreign_key %>
       <% end %>
-    </div>
-  <% else %>
-    <%= field_wrapper **field_wrapper_args do %>
-      <div class="flex flex-col gap-1">
-        <% if @field.searchable %>
-          <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
-            field: @field,
-            model_key: @field.target_resource&.model_key,
-            foreign_key: @field.id_input_foreign_key,
-            resource: @resource,
-            disabled: disabled,
-            classes: classes("w-full"),
-            view: view,
-            style: @field.get_html(:style, view: view, element: :input)
+    <% end %>
+    <% @field.types.each do |type| %>
+      <div class="hidden"
+        data-belongs-to-field-target="type"
+        data-type="<%= type %>"
+      >
+        <%= field_wrapper **field_wrapper_args, label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
+          <% if @field.is_searchable? %>
+            <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+              disabled: disabled,
+              field: @field,
+              foreign_key: @field.id_input_foreign_key,
+              model_key: model_keys[type.to_s],
+              polymorphic_record: polymorphic_record,
+              resource: @resource,
+              style: @field.get_html(:style, view: view, element: :input),
+              type: type,
+              classes: classes("w-full"),
+              view: view
           %>
-        <% else %>
-          <%= @form.select @field.id_input_foreign_key, @field.options,
+          <% else %>
+            <%= @form.select @field.id_input_foreign_key,
+            options_for_select(@field.values_for_type(type), @resource.present? && @resource.record.present? ? @resource.record[@field.id_input_foreign_key] : nil),
             {
+              value: @resource.record[@field.id_input_foreign_key].to_s,
               include_blank: @field.placeholder,
-              value: @field.value
             },
             {
               class: classes("w-full"),
               data: @field.get_html(:data, view: view, element: :input),
-              disabled: disabled,
-              style: @field.get_html(:style, view: view, element: :input)
+              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 %>
+              <%= @form.hidden_field @field.id_input_foreign_key %>
+            <% end %>
           <% end %>
         <% end %>
-        <% if !disabled && create_path.present? %>
-          <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
-        <% end %>
       </div>
     <% end %>
+  </div>
+<% else %>
+  <%= field_wrapper **field_wrapper_args do %>
+    <% if @field.is_searchable? %>
+      <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+        field: @field,
+        model_key: @field.target_resource&.model_key,
+        foreign_key: @field.id_input_foreign_key,
+        resource: @resource,
+        disabled: disabled,
+        classes: classes("w-full"),
+        view: view,
+        style: @field.get_html(:style, view: view, element: :input)
+      %>
+    <% else %>
+      <%= @form.select @field.id_input_foreign_key, @field.options,
+        {
+          include_blank: @field.placeholder,
+          value: @field.value
+        },
+        {
+          class: classes("w-full"),
+          data: @field.get_html(:data, view: view, element: :input),
+          disabled: disabled,
+          style: @field.get_html(:style, view: view, element: :input)
+        }
+      %>
+      <%
+        # 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 %>
-</div>
+<% end %>

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
-  def initialize(**args)
-    super(**args)
+  def initialize(...)
+    super(...)
 
     @polymorphic_record = nil
   end
@@ -28,16 +28,16 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
   # Get the polymorphic class
   def polymorphic_class
-    @resource.model["#{@field.foreign_key}_type"]
+    @resource.record["#{@field.foreign_key}_type"]
   end
 
   def polymorphic_resource
-    ::Avo::App.get_resource_by_model_name(polymorphic_class)
+    Avo.resource_manager.get_resource_by_model_class(polymorphic_class)
   end
 
   # Get the polymorphic id
   def polymorphic_id
-    @resource.model["#{@field.foreign_key}_id"]
+    @resource.record["#{@field.foreign_key}_id"]
   end
 
   # Get the actual resource
@@ -57,20 +57,9 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
     @field.get_html(:data, view: view, element: :input).fetch(:action, nil)
   end
 
-  def create_path(target_resource = nil)
-    return nil if @resource.blank?
-
-    helpers.new_resource_path(**{
-      via_relation: @field.id.to_s,
-      resource: target_resource || @field.target_resource,
-      via_resource_id: resource.model.persisted? ? resource.model.to_param : nil,
-      via_belongs_to_resource_class: resource.class.name
-    }.compact)
-  end
-
   private
 
   def visit_through_association?
-    @field.target_resource.class.to_s == params[:via_resource_class].to_s
+    @field.target_resource.to_s == params[:via_resource_class].to_s
   end
 end