easy-admin-rails 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d516d9564b3e2e33581e101ed5f5fed1fb294407f6de918e2532a3fcef1acea5
-  data.tar.gz: f3f23ffc0489acddce45c29f4324d38397e088fc4b7fc872fb06ed6cf4d07c64
+  metadata.gz: 0fae1a9ba75446f8dc4e7992b6f1ff01fb30a06d081de559df45ad8fb6c2a504
+  data.tar.gz: a157543ef039c9c75057eb66baef77ef7cd81b46462b49809611aab679ab1793
 SHA512:
-  metadata.gz: 3632ce6f54bb99a75db6a45471f53f01eb34c132480367f84017c90ab45f4605527f2a87f89a4446e41ff3182decf590c9df0e3d6178034cc713421b41d30ff6
-  data.tar.gz: 20b25f16081adfd5eea8cbbf62d96c35aee0b38da356befed86132d576d20819c9985987ae1d04e557f49b61964492f2c714b1fe9dca981c4867b9dce8051d60
+  metadata.gz: 26f11cd96fd9e5c390adc97c948a576bc2d6c9c09c9f15fb432082ecc321846cdbcd89d6ae4c19fe92624275cb998974bd3fa82adb968109ea5aa7db653ad66e
+  data.tar.gz: 05b41e08e8e519c6aca2dd6d7f3a19b8da10b47ba8b484852f1069bcbfd34e938b65123e1ed291708a588101316e5ae091e200053668787e839df32b52844f05

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

@@ -78,6 +78,29 @@ module EasyAdmin
         classes.join(" ")
       end
 
+      def field_errors
+        return [] unless form&.object&.errors
+        form.object.errors[field_name]
+      end
+
+      def has_field_errors?
+        field_errors.any?
+      end
+
+      def render_field_errors
+        return unless has_field_errors?
+        
+        div(class: "mt-1") do
+          field_errors.each do |error|
+            p(class: "text-red-600 text-sm") { error }
+          end
+        end
+      end
+
+      def input_error_classes
+        has_field_errors? ? "border-red-300 focus:border-red-500 focus:ring-red-500" : ""
+      end
+
       def format_value(val = value)
         return "" if val.blank?
         

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/boolean_component.rb

@@ -20,6 +20,7 @@ module EasyAdmin
 
               render_toggle_switch
             end
+            render_field_errors
           end
         end
 

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

@@ -18,6 +18,7 @@ module EasyAdmin
               class: input_classes,
               required: required?
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -32,8 +33,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

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

@@ -18,6 +18,7 @@ module EasyAdmin
               class: input_classes,
               required: required?
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -32,8 +33,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

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

@@ -19,6 +19,7 @@ module EasyAdmin
               required: required?,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -33,8 +34,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

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

@@ -8,6 +8,7 @@ module EasyAdmin
           div(class: "mb-6", data: { controller: "file" }) do
             render_label if field_label
             render_file_input
+            render_field_errors
             render_preview_area
             render_help_text if field[:help_text]
             render_current_file if current_file_exists?
@@ -28,7 +29,7 @@ module EasyAdmin
             type: "file",
             id: field_id,
             name: form_field_name,
-            class: css_classes("block w-full text-sm text-gray-900 border border-gray-300 rounded-lg cursor-pointer bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 file:me-4 file:py-2 file:px-4 file:rounded-s-lg file:border-0 file:text-sm file:font-medium file:bg-blue-50 file:text-blue-700 hover:file:bg-blue-100", size_class, validation_classes),
+            class: css_classes("block w-full text-sm text-gray-900 border rounded-lg cursor-pointer bg-gray-50 file:me-4 file:py-2 file:px-4 file:rounded-s-lg file:border-0 file:text-sm file:font-medium file:bg-blue-50 file:text-blue-700 hover:file:bg-blue-100", size_class, file_input_error_classes),
             data: { file_target: "input" },
             **file_input_attributes
           )
@@ -112,13 +113,11 @@ module EasyAdmin
           end
         end
 
-        def validation_classes
-          return "" unless form&.object&.errors
-
-          if form.object.errors[field_name].any?
-            "border-red-300 focus:border-red-500 focus:ring-red-500"
+        def file_input_error_classes
+          if has_field_errors?
+            "border-red-300 focus:border-red-500 focus:ring-2 focus:ring-red-500"
           else
-            ""
+            "border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
           end
         end
 

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

@@ -19,6 +19,7 @@ module EasyAdmin
               required: required?,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -33,8 +34,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

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

@@ -32,6 +32,7 @@ module EasyAdmin
               render_hidden_inputs
             end
             
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -91,7 +92,8 @@ module EasyAdmin
         end
 
         def render_multiple_select_container
-          div(class: "relative border border-gray-300 rounded-md bg-white min-h-10 focus-within:ring-1 focus-within:ring-blue-500 focus-within:border-blue-500 transition-colors duration-200") do
+          error_classes = has_field_errors? ? "border-red-300 focus-within:ring-red-500 focus-within:border-red-500" : "border-gray-300 focus-within:ring-blue-500 focus-within:border-blue-500"
+          div(class: "relative border #{error_classes} rounded-md bg-white min-h-10 focus-within:ring-1 transition-colors duration-200") do
             div(class: "flex flex-wrap items-center gap-1 p-2 pr-8") do
               # Selected items container - will be populated by Stimulus controller
               div(class: "flex flex-wrap items-center gap-1", data: { select_field_target: "selectedItems" }) do
@@ -133,7 +135,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"
@@ -163,8 +165,8 @@ module EasyAdmin
 
         def single_select_input_classes
           base_classes = "block w-full px-3 py-2 pr-10 text-sm border rounded-md cursor-pointer"
-          state_classes = "border-gray-300 placeholder-gray-400 bg-white"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400 bg-white" : "border-gray-300 placeholder-gray-400 bg-white"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

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

@@ -19,6 +19,7 @@ module EasyAdmin
               required: required?,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             )
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -33,8 +34,8 @@ module EasyAdmin
 
         def input_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

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

@@ -18,6 +18,7 @@ module EasyAdmin
               rows: field[:rows] || 4,
               placeholder: field[:placeholder] || "Enter #{field_label.downcase}"
             ) { current_value }
+            render_field_errors
             if field[:help_text]
               p(class: "mt-1 text-sm text-gray-500") { field[:help_text] }
             end
@@ -32,8 +33,8 @@ module EasyAdmin
 
         def textarea_classes
           base_classes = "block w-full px-3 py-2 border rounded-md shadow-sm text-sm resize-y"
-          state_classes = "border-gray-300 placeholder-gray-400"
-          focus_classes = "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
+          state_classes = has_field_errors? ? "border-red-300 placeholder-red-400" : "border-gray-300 placeholder-gray-400"
+          focus_classes = has_field_errors? ? "focus:outline-none focus:ring-1 focus:ring-red-500 focus:border-red-500" : "focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500"
           hover_classes = "hover:border-gray-400"
           transition_classes = "transition-colors duration-200"
           

data/app/controllers/easy_admin/resources_controller.rb

@@ -151,7 +151,7 @@ module EasyAdmin
         redirect_to easy_admin.resource_path(@resource_class.route_key, @record),
                     notice: "#{@resource_class.singular_title} was successfully created."
       else
-        render :new
+        render :new, status: :unprocessable_entity
       end
     end
 
@@ -182,7 +182,7 @@ module EasyAdmin
           }
         end
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 
@@ -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/version.rb

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

metadata

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