easy-admin-rails 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4ac8d05fd7b8b98a9b0dbaf91dac4adbe81d74c9810fea9e33109d37ef0cdc
-  data.tar.gz: fb32068394c78d4fe2a0cd937c3a5e7b3c0db314d38f06125408ed4a3e86394d
+  metadata.gz: d516d9564b3e2e33581e101ed5f5fed1fb294407f6de918e2532a3fcef1acea5
+  data.tar.gz: f3f23ffc0489acddce45c29f4324d38397e088fc4b7fc872fb06ed6cf4d07c64
 SHA512:
-  metadata.gz: 250cb7801b3400c293670f50e075391e4b67a7c65a3f34d50d5fe0e0c43b218ac19d81bedf74914f2165082f44c0189ef35e5727056181d81a9372d391ceb627
-  data.tar.gz: 1fd7d7480949532bdbb683e7f1f2ca9539d0ea399d421471a812e629e4af7c2ace5f111d5783a3df72d0541bad5fa543a771ffb73ca8b50a79eda71746a6db3a
+  metadata.gz: 3632ce6f54bb99a75db6a45471f53f01eb34c132480367f84017c90ab45f4605527f2a87f89a4446e41ff3182decf590c9df0e3d6178034cc713421b41d30ff6
+  data.tar.gz: 20b25f16081adfd5eea8cbbf62d96c35aee0b38da356befed86132d576d20819c9985987ae1d04e557f49b61964492f2c714b1fe9dca981c4867b9dce8051d60

data/app/components/easy_admin/combined_filters_component.rb

@@ -171,7 +171,7 @@ module EasyAdmin
 
     def render_filter_field(field)
       component_class = filter_component_for_field(field)
-      render component_class.new(field: field, search_params: @search_params)
+      render component_class.new(field: field, search_params: @search_params, resource_class: @resource_class)
     end
 
     def filter_component_for_field(field)

data/app/components/easy_admin/fields/form/belongs_to_component.rb

@@ -54,8 +54,17 @@ module EasyAdmin
           url
         end
 
-        # Override to always return empty options since we use suggest mode
+        # Override to return empty options for suggest mode unless custom options are provided
         def options
+          # Check if field has custom options (static or proc)
+          if field[:options]
+            opts = field[:options]
+            # If options is a Proc, evaluate it with the form object
+            opts = opts.call(form.object) if opts.is_a?(Proc)
+            return opts
+          end
+          
+          # For suggest mode, return empty array
           []
         end
 

data/app/components/easy_admin/fields/form/has_many_component.rb

@@ -284,6 +284,15 @@ module EasyAdmin
         end
 
         def build_options
+          # Check if field has custom options (static or proc)
+          if field[:options]
+            opts = field[:options]
+            # If options is a Proc, evaluate it with the form object
+            opts = opts.call(form.object) if opts.is_a?(Proc)
+            return opts
+          end
+          
+          # Otherwise build from available records
           available_options.map do |item|
             [display_text_for(item), item.id]
           end

data/app/components/easy_admin/fields/form/select_component.rb

@@ -46,7 +46,13 @@ module EasyAdmin
         end
 
         def options
-          field[:options] || []
+          opts = field[:options] || []
+          # If options is a Proc, evaluate it with the form object
+          if opts.is_a?(Proc)
+            opts.call(form.object)
+          else
+            opts
+          end
         end
 
         def placeholder

data/app/components/easy_admin/fields/index/belongs_to_component.rb

@@ -28,21 +28,50 @@ module EasyAdmin
         end
 
         def load_association_record
-          return nil if value.blank?
+          foreign_key_value = get_foreign_key_value
+          return nil if foreign_key_value.blank?
 
           association_class = determine_association
           
-          if value.respond_to?(:id)
+          if foreign_key_value.respond_to?(:id)
             # Already loaded record
-            value
+            foreign_key_value
           else
             # ID value, need to load the record
-            association_class.find_by(id: value)
+            association_class.find_by(id: foreign_key_value)
+          end
+        end
+        
+        def get_foreign_key_value
+          # If foreign_key is explicitly specified, use that field
+          if field[:foreign_key]
+            @record.public_send(field[:foreign_key])
+          elsif field[:association]
+            # Use Rails association reflection to get the foreign key
+            reflection = @record.class.reflect_on_association(field[:association])
+            if reflection
+              @record.public_send(reflection.foreign_key)
+            else
+              # Fallback to the original value (field name)
+              value
+            end
+          else
+            # Default behavior - use the field value
+            value
           end
         end
 
         def determine_association
-          return field[:association] if field[:association]
+          if field[:association]
+            # If association is specified, get the class from the model's reflection
+            association_name = field[:association].to_s
+            reflection = @record.class.reflect_on_association(association_name)
+            if reflection
+              return reflection.klass
+            else
+              raise ArgumentError, "Association '#{association_name}' not found on #{@record.class}"
+            end
+          end
           
           # Try to determine from attribute name
           if field_name.to_s.end_with?('_id')

data/app/components/easy_admin/fields/index/filters/base_component.rb

@@ -3,9 +3,10 @@ module EasyAdmin
     module Index
       module Filters
         class BaseComponent < Phlex::HTML
-          def initialize(field:, search_params: {})
+          def initialize(field:, search_params: {}, resource_class: nil)
             @field = field
             @search_params = search_params
+            @resource_class = resource_class
           end
 
           def view_template

data/app/components/easy_admin/fields/index/filters/select_component.rb

@@ -4,6 +4,14 @@ module EasyAdmin
       module Filters
         class SelectComponent < BaseComponent
           private
+          
+          def filter_field_name
+            @filter_field_name ||= if @field[:type] == :belongs_to
+              "#{@field[:name]}_id"
+            else
+              @field[:name]
+            end
+          end
 
           def render_filter_input
             div(
@@ -12,22 +20,39 @@ module EasyAdmin
                 controller: "select-field",
                 select_field_multiple_value: "false",
                 select_field_placeholder_value: "Select #{@field[:label].downcase}...",
+                select_field_suggest_value: @field[:suggest].to_s,
+                select_field_suggest_url_value: @field[:suggest] ? suggest_url : "",
                 field_name: @field[:name]
               }
             ) do
-              # Display input
+              # Display/Search input
               div(class: "relative") do
-                input(
-                  type: "text",
-                  class: single_select_input_classes,
-                  placeholder: "Select #{@field[:label].downcase}...",
-                  readonly: true,
-                  value: current_display_value,
-                  data: {
-                    select_field_target: "display",
-                    action: "click->select-field#toggleDropdown"
-                  }
-                )
+                if @field[:suggest]
+                  # For suggest mode, use a search input
+                  input(
+                    type: "text",
+                    class: single_select_input_classes,
+                    placeholder: "Type to search...",
+                    value: current_display_value,
+                    data: {
+                      select_field_target: "search",
+                      action: "input->select-field#filter keydown->select-field#handleKeydown focus->select-field#openDropdown"
+                    }
+                  )
+                else
+                  # For static mode, use display input
+                  input(
+                    type: "text",
+                    class: single_select_input_classes,
+                    placeholder: "Select #{@field[:label].downcase}...",
+                    readonly: true,
+                    value: current_display_value,
+                    data: {
+                      select_field_target: "display",
+                      action: "click->select-field#toggleDropdown"
+                    }
+                  )
+                end
                 # Dropdown arrow
                 div(class: "absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none") do
                   unsafe_raw('<svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>')
@@ -39,27 +64,35 @@ module EasyAdmin
                 class: "select-dropdown absolute z-50 w-full mt-1 bg-white border border-gray-300 rounded-md shadow-lg max-h-60 overflow-auto opacity-0 invisible transform scale-95 transition-all duration-200 ease-out",
                 data: { select_field_target: "dropdown" }
               ) do
-                render_option("", "All")
-                
-                if @field[:options]
-                  @field[:options].each do |option_value, option_label|
-                    render_option(option_value, option_label)
+                if @field[:suggest]
+                  # For suggest mode, options will be loaded dynamically
+                  render_no_results_message
+                  render_loading_message
+                else
+                  # For static mode, render all options
+                  render_option("", "All")
+                  
+                  if @field[:options]
+                    @field[:options].each do |option_value, option_label|
+                      render_option(option_value, option_label)
+                    end
                   end
+                  render_no_results_message
                 end
               end
 
               # Hidden input for the actual value
               input(
                 type: "hidden",
-                name: "q[#{@field[:name]}_eq]",
-                value: @search_params["#{@field[:name]}_eq"] || "",
+                name: "q[#{filter_field_name}_eq]",
+                value: @search_params["#{filter_field_name}_eq"] || "",
                 data: { select_field_target: "hiddenInput" }
               )
             end
           end
 
           def render_option(value, text)
-            selected = @search_params["#{@field[:name]}_eq"].to_s == value.to_s
+            selected = @search_params["#{filter_field_name}_eq"].to_s == value.to_s
             
             div(
               class: "select-option px-3 py-2 text-sm cursor-pointer hover:bg-blue-50 hover:text-blue-900 transition-colors duration-150 #{selected ? 'bg-blue-50 text-blue-900' : 'text-gray-900'}",
@@ -74,15 +107,48 @@ module EasyAdmin
           end
 
           def current_display_value
-            return "All" if @search_params["#{@field[:name]}_eq"].blank?
+            return "All" if @search_params["#{filter_field_name}_eq"].blank?
             
             if @field[:options]
               @field[:options].each do |option_value, option_label|
-                return option_label.to_s if option_value.to_s == @search_params["#{@field[:name]}_eq"].to_s
+                return option_label.to_s if option_value.to_s == @search_params["#{filter_field_name}_eq"].to_s
               end
             end
             
-            @search_params["#{@field[:name]}_eq"].to_s
+            @search_params["#{filter_field_name}_eq"].to_s
+          end
+
+          def render_no_results_message
+            div(
+              class: "select-no-results px-3 py-2 text-sm text-gray-500 text-center",
+              data: { select_field_target: "noResults" },
+              style: "display: none;"
+            ) do
+              plain "No options found"
+            end
+          end
+
+          def render_loading_message
+            div(
+              class: "select-loading px-3 py-2 text-sm text-gray-500 text-center",
+              data: { select_field_target: "loading" },
+              style: "display: none;"
+            ) do
+              plain "Loading..."
+            end
+          end
+
+          def suggest_url
+            return "" unless @field[:suggest]
+            
+            # Use the current resource being filtered (e.g., posts when filtering posts by user)
+            resource_name = @resource_class.route_key
+            
+            easy_admin_url_helpers.suggest_resource_path(resource_name, field: @field[:name])
+          end
+          
+          def easy_admin_url_helpers
+            EasyAdmin::Engine.routes.url_helpers
           end
 
           def single_select_input_classes

data/app/components/easy_admin/filters_component.rb

@@ -76,7 +76,7 @@ module EasyAdmin
 
     def render_filter_field(field)
       component_class = filter_component_for_field(field)
-      render component_class.new(field: field, search_params: @search_params)
+      render component_class.new(field: field, search_params: @search_params, resource_class: @resource_class)
     end
 
     def filter_component_for_field(field)

data/app/components/easy_admin/resources/table_cell_component.rb

@@ -28,7 +28,7 @@ module EasyAdmin
 
       def render_field_value
         # Use the existing field rendering logic from the Rails views
-        field_value = @record.public_send(@field_config[:name])
+        field_value = get_field_value
         
         # Use the same render_field helper that the ERB templates use
         unsafe_raw render_field(
@@ -38,6 +38,15 @@ module EasyAdmin
           record: @record
         )
       end
+      
+      def get_field_value
+        # For belongs_to fields, use the association name if specified
+        if @field_config[:type] == :belongs_to && @field_config[:association]
+          @record.public_send(@field_config[:association])
+        else
+          @record.public_send(@field_config[:name])
+        end
+      end
 
       def render_inline_edit_trigger
         div do

data/app/javascript/easy_admin/controllers/select_field_controller.js

@@ -1,7 +1,7 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["search", "dropdown", "selectedItems", "option", "hiddenInput", "display", "noResults", "loading"]
+  static targets = ["search", "dropdown", "selectedItems", "option", "hiddenInput", "display", "noResults", "loading", "searchInput", "optionsContainer"]
   static values = { multiple: Boolean, placeholder: String, suggest: Boolean, suggestUrl: String }
 
   connect() {
@@ -615,4 +615,40 @@ export default class extends Controller {
       this.loadingTarget.style.display = 'none'
     }
   }
+
+  // Filter options for index page filters
+  filterOptions(event) {
+    const searchTerm = event.target.value.toLowerCase()
+    
+    if (this.hasOptionsContainerTarget) {
+      // For index page filters
+      const options = this.optionsContainerTarget.querySelectorAll('[data-select-field-target="option"]')
+      let visibleCount = 0
+      
+      options.forEach(option => {
+        const text = option.textContent.toLowerCase()
+        if (text.includes(searchTerm)) {
+          option.style.display = 'block'
+          visibleCount++
+        } else {
+          option.style.display = 'none'
+        }
+      })
+      
+      // Show/hide no results message
+      if (visibleCount === 0 && this.hasNoResultsTarget) {
+        this.noResultsTarget.style.display = 'block'
+        this.noResultsTarget.textContent = 'No results found'
+      } else if (this.hasNoResultsTarget) {
+        this.noResultsTarget.style.display = 'none'
+      }
+    } else {
+      // Fallback to existing filter logic
+      this.filter(event)
+    }
+  }
+
+  stopPropagation(event) {
+    event.stopPropagation()
+  }
 }

data/lib/easy_admin/resource.rb

@@ -56,7 +56,9 @@ module EasyAdmin
         suggest: options[:suggest], # for dynamic option loading
         display_method: options[:display_method], # for association fields
         help_text: options[:help_text],
-        editable: options[:editable]
+        editable: options[:editable],
+        association: options[:association],
+        foreign_key: options[:foreign_key] # for belongs_to fields
       }]
     end
 
@@ -321,7 +323,9 @@ module EasyAdmin
           multiple: options[:multiple],
           placeholder: options[:placeholder],
           help_text: options[:help_text],
-          editable: options[:editable]
+          editable: options[:editable],
+          association: options[:association],
+          foreign_key: options[:foreign_key]
         }
 
         if @current_tab

data/lib/easy_admin/version.rb

@@ -1,3 +1,3 @@
 module EasyAdmin
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-admin-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Slaurmagan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails