easy-admin-rails 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714d6b87819aca514f1b6547871b544c36f7ba2d9941b3c235df73c6276fad3e
-  data.tar.gz: 42b81c8f6157e0589d4c39ea6684c836154b1e4d5a0c6ab22c723ad34604ab1d
+  metadata.gz: 8077539734038d6d2f5e76fd811bc6350f48fd9f15854c94bacccc0828d597a9
+  data.tar.gz: 8e21d37b20333eb6cc11ed4c8acb0031bae2c7ad86642e210a0bb5ced98ebd3c
 SHA512:
-  metadata.gz: b347e40183ea5cdfed508bf9921826defddb39f9dcd5701746b3622b44d4917a900df3cf029eb5c2decc5a792a313617127909588377f23cbdd6e977edee8d9e
-  data.tar.gz: feb58175155da2dcb224766ba9be58d3bc2837a7fbee6b64353ef823b3879bd164f95772d05f7695e80ee996b19bb84781c5faf0df770d1626c2d7c4da9adfc4
+  metadata.gz: 7f1035f56aae702e202f742b1ef7a2747f6a53d8c0acb1cdecca91b5d137a6044eff7a07a6879437836ce9a6c9f985ddde53f122377592b01881fe7093b33069
+  data.tar.gz: f94fc0dd71cb0d4b04b3b46c4b19e3e91b413a4be0617273e1900cc2a7a3c7fd9024a3340ee0be064650141060627253b4fc751c100e4f0da0b9a6999562aed1

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

@@ -17,7 +17,18 @@ module EasyAdmin
 
         # Override to handle belongs_to association field name
         def association_key
-          # Convert belongs_to association name to foreign key
+          # If field specifies a custom foreign_key, use that
+          if field[:foreign_key]
+            return field[:foreign_key]
+          end
+          
+          # If field specifies an association, get the foreign key from Rails reflection
+          if field[:association]
+            reflection = form.object.class.reflect_on_association(field[:association])
+            return reflection.foreign_key if reflection
+          end
+          
+          # Default behavior: Convert field name to foreign key
           # e.g., user -> user_id, category -> category_id
           if field_name.to_s.end_with?('_id')
             field_name
@@ -74,6 +85,28 @@ module EasyAdmin
           current_value.present? ? [current_value] : []
         end
 
+        # Override to get current display value for suggest mode
+        def current_display_value
+          # Get the associated record
+          association_name = field[:association] || field_name
+          associated_record = form.object.public_send(association_name) if form.object.respond_to?(association_name)
+          
+          return "" unless associated_record
+          
+          # Determine how to display the associated record
+          if field[:display_method]
+            associated_record.public_send(field[:display_method])
+          elsif associated_record.respond_to?(:name)
+            associated_record.name
+          elsif associated_record.respond_to?(:title)
+            associated_record.title
+          elsif associated_record.respond_to?(:to_label)
+            associated_record.to_label
+          else
+            "##{associated_record.id}"
+          end
+        end
+
         # Override to ensure hidden input uses the foreign key value
         def render_hidden_inputs
           # Single select - one hidden input with foreign key value

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

@@ -133,7 +133,7 @@ module EasyAdmin
               class: single_select_input_classes,
               placeholder: suggest_mode? ? placeholder : (field[:placeholder] || "Select #{field_label.downcase}..."),
               readonly: !suggest_mode?,
-              value: suggest_mode? ? "" : current_display_value,
+              value: current_display_value,
               data: suggest_mode? ? {
                 select_field_target: "search",
                 action: "input->select-field#filter keydown->select-field#handleKeydown focus->select-field#openDropdown"

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/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/controllers/easy_admin/resources_controller.rb

@@ -231,18 +231,21 @@ module EasyAdmin
         return
       end
 
+      # Determine the correct parameter key (handle complex model names)
+      param_key = determine_param_key_for_update_field
+      
       # For belongs_to fields, we need to handle foreign key updates
       if @field_config[:type] == :belongs_to
         association_name = @field_config[:name]
         foreign_key = get_foreign_key_name(association_name)
-        field_value = params.dig(@resource_class.param_key, foreign_key)
+        field_value = params.dig(param_key, foreign_key)
         update_attrs = { foreign_key.to_sym => field_value }
       else
         # Create a field object to handle normalization
         field_obj = EasyAdmin::Field.new(@field_name, @field_config[:type], @field_config)
         
         # Get the field value from params
-        field_value = params.dig(@resource_class.param_key, @field_name)
+        field_value = params.dig(param_key, @field_name)
         
         # Normalize the input
         update_attrs = { @field_name => field_value }
@@ -913,5 +916,18 @@ module EasyAdmin
       params[:period].present? ||
       (params[:scope].present? && params[:scope] != determine_current_scope[:scope])
     end
+    
+    def determine_param_key_for_update_field
+      # Try resource param_key first, then fall back to model's natural param key
+      if params.key?(@resource_class.param_key)
+        @resource_class.param_key
+      elsif params.key?(@resource_class.model_class.model_name.param_key)
+        @resource_class.model_class.model_name.param_key
+      else
+        # Handle namespaced models that use slash format (e.g., "catalog/payment_method")
+        namespaced_param_key = @resource_class.model_class.name.underscore
+        params.key?(namespaced_param_key) ? namespaced_param_key : @resource_class.param_key
+      end
+    end
   end
 end

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.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-admin-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Slaurmagan