easy-admin-rails 0.2.6 → 0.2.7

data/app/controllers/easy_admin/application_controller.rb

@@ -103,11 +103,6 @@ module EasyAdmin
     private
     
     def handle_authorization_failure(exception)
-      Rails.logger.warn "🚫 Authorization failed: #{exception.message}"
-      Rails.logger.warn "🚫 User: #{current_admin_user&.email} (Role: #{current_admin_user&.role&.name || 'None'})"
-      Rails.logger.warn "🚫 Action: #{action_name} on #{params[:resource_name]}"
-      
-      # Extract meaningful error details
       action_name = extract_action_from_exception(exception)
       resource_name = extract_resource_from_exception(exception)
       

data/app/controllers/easy_admin/batch_actions_controller.rb

@@ -85,7 +85,6 @@ module EasyAdmin
         end
         
       rescue NameError => e
-        Rails.logger.error e.backtrace
         respond_to do |format|
           format.turbo_stream do
             render turbo_stream: turbo_stream.update("notifications",

data/app/controllers/easy_admin/concerns/inline_field_editing.rb

@@ -56,9 +56,7 @@ module EasyAdmin
         if !field_config
           field_config = @resource_class.fields_config.find { |f| f[:association].to_s == params[:field] }
         end
-        
-        Rails.logger.debug "Suggest field_config for #{params[:field]}: #{field_config}"
-        
+
         unless field_config && field_config[:suggest]
           render json: { error: "Field not found or suggest not configured" }, status: :not_found
           return
@@ -237,10 +235,7 @@ module EasyAdmin
         display_method = field_config[:display_method] || :name
         suggest_config = field_config[:suggest] || {}
         search_fields = suggest_config[:search_fields] || [display_method]
-        
-        Rails.logger.debug "HasMany suggest: association=#{association_name}, display_method=#{display_method}, search_fields=#{search_fields}"
-        
-        # Build search query
+
         records = association_class.all
         
         if search_term.present?
@@ -261,7 +256,6 @@ module EasyAdmin
         results = records.limit(limit).map do |record|
           label = if record.respond_to?(display_method)
             raw_label = record.public_send(display_method)
-            Rails.logger.debug "HasMany record #{record.id}: raw_label=#{raw_label.class}:#{raw_label}"
             raw_label.to_s
           elsif record.respond_to?(:name)
             record.name.to_s
@@ -272,8 +266,7 @@ module EasyAdmin
           end
           [label, record.id]
         end
-        
-        Rails.logger.debug "HasMany suggest final results: #{results}"
+
         results
       end
 
@@ -294,4 +287,4 @@ module EasyAdmin
       end
     end
   end
-end
+end

data/app/controllers/easy_admin/concerns/resource_loading.rb

@@ -57,14 +57,12 @@ module EasyAdmin
         # Check both form fields and all fields (including hidden ones)
         all_fields = resource_class.form_fields + resource_class.fields_config
         unique_fields = all_fields.uniq { |f| f[:name] }
-        
-        Rails.logger.debug "🔍 [ResourceLoading] All fields for #{resource_class}:"
+
         unique_fields.each_with_index do |field_config, index|
-          Rails.logger.debug "🔍 [ResourceLoading] Field #{index}: #{field_config[:name]} (type: #{field_config[:type]}, readonly: #{field_config[:readonly]})"
           next if field_config[:readonly]
           
           field_name = field_config[:name]
-          
+
           # Handle different field types that might need special parameter handling
           case field_config[:type]
           when :has_many
@@ -87,8 +85,12 @@ module EasyAdmin
               permitted_attrs << field_name
             end
           when :json
-            # For JSON fields, permit nested parameters as a hash
-            permitted_attrs << { field_name => {} }
+            # For JSON fields, permit as string (JSONEditor submits as JSON string)
+            if field_name == :permissions_cache
+                          permitted_attrs << { field_name => {} }
+                        else
+                          permitted_attrs << field_name
+                        end
           else
             # For regular fields, check if it's the permissions_cache field which needs hash permission
             if field_name == :permissions_cache
@@ -98,8 +100,7 @@ module EasyAdmin
             end
           end
         end
-        
-        Rails.logger.debug "🔍 [ResourceLoading] Final permitted attributes: #{permitted_attrs.inspect}"
+
         permitted_attrs
       end
 
@@ -146,4 +147,4 @@ module EasyAdmin
       end
     end
   end
-end
+end

data/app/controllers/easy_admin/concerns/resource_pagination.rb

@@ -114,6 +114,9 @@ module EasyAdmin
 
       # Check if pagination should reset due to filtering
       def should_reset_pagination?
+        # Don't reset pagination for turbo_stream requests (infinite scroll)
+        return false if request.format.turbo_stream?
+        
         has_active_filters? && !first_page?
       end
 

data/app/controllers/easy_admin/dashboards_controller.rb

@@ -29,7 +29,6 @@ module EasyAdmin
         format.json { render json: @card_data }
       end
     rescue => e
-      Rails.logger.error "Dashboard card error: #{e.message}"
       @error_message = e.message
       
       respond_to do |format|

data/app/controllers/easy_admin/resources_controller.rb

@@ -78,11 +78,7 @@ module EasyAdmin
     end
 
     def update
-      Rails.logger.debug "Update called with params: #{record_params}"
-      Rails.logger.debug "Record before update: #{@record.inspect}"
-      
       if @record.update(record_params)
-        Rails.logger.debug "Record after update: #{@record.reload.inspect}"
         respond_to do |format|
           format.html {
             redirect_to easy_admin.resource_path(@resource_class.route_key, @record),
@@ -183,4 +179,4 @@ module EasyAdmin
       end
     end
   end
-end
+end

data/app/controllers/easy_admin/row_actions_controller.rb

@@ -72,9 +72,6 @@ module EasyAdmin
         end
       end
     rescue => e
-      Rails.logger.error "Row action execution failed: #{e.message}"
-      Rails.logger.error e.backtrace.join("\n")
-      
       respond_to do |format|
         format.turbo_stream do
           render turbo_stream: turbo_stream.update(
@@ -238,4 +235,4 @@ module EasyAdmin
       end
     end
   end
-end
+end

data/app/helpers/easy_admin/fields_helper.rb

@@ -17,43 +17,26 @@ module EasyAdmin
         return ""
       when :custom_content
         if field[:block]
-          Rails.logger.debug "🔍 [FieldsHelper] Processing custom_content block"
-          Rails.logger.debug "🔍 [FieldsHelper] Form present: #{form.present?}"
-          Rails.logger.debug "🔍 [FieldsHelper] Record present: #{record.present?}"
-          
-          # Create a context object with access to form, record, and helpers
           context = OpenStruct.new(form: form, record: record, helpers: self)
-          
-          # Call the block directly to get the result (don't use capture which converts to string)
+
           result = field[:block].call(context)
-          
-          Rails.logger.debug "🔍 [FieldsHelper] Block result class: #{result.class}"
-          Rails.logger.debug "🔍 [FieldsHelper] Result responds to call: #{result.respond_to?(:call)}"
-          Rails.logger.debug "🔍 [FieldsHelper] Result responds to view_template: #{result.respond_to?(:view_template)}"
-          
-          # Handle different types of results
           if result.respond_to?(:call) && result.respond_to?(:view_template)
-            Rails.logger.debug "🔍 [FieldsHelper] Rendering Phlex component"
-            # It's a Phlex component - use Rails render helper
             render(result)
           elsif result.is_a?(String)
-            Rails.logger.debug "🔍 [FieldsHelper] Rendering string result"
             result.html_safe
           elsif result.respond_to?(:to_s)
-            Rails.logger.debug "🔍 [FieldsHelper] Converting to string and rendering"
             result.to_s.html_safe
           else
-            Rails.logger.debug "🔍 [FieldsHelper] No valid result, returning empty string"
             ""
           end
         else
-          Rails.logger.debug "🔍 [FieldsHelper] No block provided for custom_content"
           ""
         end
       else
         # Regular field rendering
+        field_type = field[:type] || field[:field_type] || :text
         component = EasyAdmin::Field.render(
-          field[:type], 
+          field_type, 
           action: action,
           field: field,
           value: value,
@@ -61,13 +44,16 @@ module EasyAdmin
           form: form
         )
 
-        component.call.html_safe
+        result = component.call
+        
+        result.html_safe
       end
     end
 
     def field_component(field, action:, value: nil, record: nil, form: nil)
+      field_type = field[:type] || field[:field_type] || :text
       EasyAdmin::Field.render(
-        field[:type], 
+        field_type, 
         action: action,
         field: field,
         value: value,

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

@@ -19,14 +19,26 @@ export default class extends Controller {
   // Called when the element is replaced by turbo stream
   urlValueChanged() {
     if (this.observer && this.sentinel) {
+      // Reset loading state when URL changes (e.g., when filters are applied)
+      this.isLoading = false
+      this.hideLoading()
+      
       // Re-setup observer with new URL
       this.setupIntersectionObserver()
+      
+      // Re-initialize UI state
+      this.initializeUI()
     }
   }
 
   hasMoreValueChanged() {
     if (!this.hasMoreValue) {
       this.showEndMessage()
+    } else {
+      // Hide end message if we have more pages (e.g., after filters change)
+      if (this.hasEndTarget) {
+        this.endTarget.style.display = 'none'
+      }
     }
   }
 

data/app/views/easy_admin/resources/edit.html.erb

@@ -116,8 +116,8 @@
     <% end %>
 
     <!-- Form Fields -->
-    <% if @resource_class.has_form_tabs? %>
-      <%= EasyAdmin::FormTabsComponent.new(resource_class: @resource_class, form: form, record: @record).call.html_safe %>
+    <% if @resource_class.has_custom_form_layout? %>
+      <%== EasyAdmin::FormLayoutComponent.new(resource_class: @resource_class, form: form, record: @record).call %>
     <% else %>
       <!-- Default Single Card Layout -->
       <div class="bg-white shadow-sm rounded-lg border border-gray-200">

data/app/views/easy_admin/resources/new.html.erb

@@ -65,8 +65,8 @@
     <% end %>
 
     <!-- Form Fields -->
-    <% if @resource_class.has_form_tabs? %>
-      <%= EasyAdmin::FormTabsComponent.new(resource_class: @resource_class, form: form).call.html_safe %>
+    <% if @resource_class.has_custom_form_layout? %>
+      <%== EasyAdmin::FormLayoutComponent.new(resource_class: @resource_class, form: form).call %>
     <% else %>
       <!-- Default Single Card Layout -->
       <div class="bg-white shadow-sm rounded-lg border border-gray-200">

data/app/views/easy_admin/resources/show.html.erb

@@ -27,5 +27,7 @@
 
 <!-- Show Layout Content -->
 <div class="show-content">
-  <%== EasyAdmin::ShowLayoutComponent.new(resource_class: @resource_class, record: @record).call %>
+  <div class="container-fluid">
+    <%== EasyAdmin::ShowLayoutComponent.new(resource_class: @resource_class, record: @record).call %>
+  </div>
 </div>

data/lib/easy_admin/field.rb

@@ -92,9 +92,9 @@ module EasyAdmin
 
         begin
           action_component_name.constantize
-        rescue NameError
+        rescue NameError => e
           # Fallback to base text component for the action
-          case action
+          fallback_class = case action
           when :index
             EasyAdmin::Fields::Index::TextComponent
           when :show
@@ -104,6 +104,7 @@ module EasyAdmin
           else
             EasyAdmin::Fields::Index::TextComponent
           end
+          fallback_class
         end
       end
     end

data/lib/easy_admin/layouts/builders/base_layout_builder.rb

@@ -0,0 +1,245 @@
+module EasyAdmin
+  module Layouts
+    module Builders
+      # Base builder for constructing layout AST
+      class BaseLayoutBuilder
+        attr_reader :root_node, :resource_class
+        attr_accessor :current_container_stack
+        
+        def initialize(layout_type = :show, resource_class: nil)
+          @root_node = Nodes::Root.new(layout_type: layout_type)
+          @current_container_stack = [@root_node]
+          @resource_class = resource_class
+        end
+        
+        # Get current container for adding nodes
+        def current_container
+          @current_container_stack.last
+        end
+        
+        # Add node to current container
+        def add_node(node)
+          current_container.add_child(node)
+          node
+        end
+        
+        # Execute block with new container
+        def with_container(container_node, &block)
+          add_node(container_node)
+          @current_container_stack.push(container_node)
+          instance_exec(&block) if block_given?
+          @current_container_stack.pop
+          container_node
+        end
+        
+        # DSL Methods
+        
+        # Add tabs container
+        def tabs(type: :horizontal, **attributes, &block)
+          tabs_node = Nodes::Tabs.new(attributes.merge(type: type))
+          add_node(tabs_node)
+          
+          if block_given?
+            @current_container_stack.push(tabs_node)
+            tabs_builder = TabsBuilder.new(self, tabs_node)
+            tabs_builder.instance_exec(&block)
+            @current_container_stack.pop
+          end
+          
+          tabs_node
+        end
+        
+        # Add section
+        def section(title = nil, **attributes, &block)
+          section_node = Nodes::Section.new(title, attributes)
+          
+          if block_given?
+            with_container(section_node, &block)
+          else
+            add_node(section_node)
+          end
+          
+          section_node
+        end
+        
+        # Add grid layout
+        def grid(columns: 2, **attributes, &block)
+          grid_node = Nodes::Grid.new(attributes.merge(columns: columns))
+          
+          if block_given?
+            with_container(grid_node, &block)
+          else
+            add_node(grid_node)
+          end
+          
+          grid_node
+        end
+        
+        # Add field
+        def field(name, **options)
+          field_node = Nodes::FieldNode.new(name, options)
+          add_node(field_node)
+        end
+        
+        # Add multiple fields at once
+        def fields(*names, **common_options)
+          names.each do |name|
+            field(name, **common_options)
+          end
+        end
+        
+        # Render custom component
+        def render(component_class, **props)
+          render_node = Nodes::RenderNode.new(component_class, props)
+          add_node(render_node)
+        end
+        
+        # Add divider
+        def divider(**attributes)
+          add_node(Nodes::Divider.new(attributes))
+        end
+        
+        # Add spacer
+        def spacer(size: 4, **attributes)
+          add_node(Nodes::Spacer.new(attributes.merge(size: size)))
+        end
+        
+        # Build and return the AST
+        def build
+          @root_node
+        end
+        
+        # Allow custom DSL extensions
+        def method_missing(method, *args, &block)
+          # Check if it's a registered component type
+          if EasyAdmin::Layouts.registered_components.key?(method)
+            component_class = EasyAdmin::Layouts.registered_components[method]
+            render(component_class, *args)
+          else
+            super
+          end
+        end
+        
+        def respond_to_missing?(method, include_private = false)
+          EasyAdmin::Layouts.registered_components.key?(method) || 
+          field_method?(method) || 
+          super
+        end
+        
+        # Field DSL delegation methods - delegate to resource class
+        
+        def id_field(**options)
+          delegate_to_resource(:id_field, **options)
+          field(:id, type: :number, **options)
+        end
+
+        def text_field(name, **options)
+          delegate_to_resource(:text_field, name, **options)
+          field(name, type: :string, **options)
+        end
+
+        def textarea_field(name, **options)
+          delegate_to_resource(:textarea_field, name, **options)
+          field(name, type: :text, **options)
+        end
+
+        def number_field(name, **options)
+          delegate_to_resource(:number_field, name, **options)
+          field(name, type: :number, **options)
+        end
+
+        def email_field(name, **options)
+          delegate_to_resource(:email_field, name, **options)
+          field(name, type: :email, **options)
+        end
+
+        def date_field(name, **options)
+          delegate_to_resource(:date_field, name, **options)
+          field(name, type: :date, **options)
+        end
+
+        def datetime_field(name, **options)
+          delegate_to_resource(:datetime_field, name, **options)
+          field(name, type: :datetime, **options)
+        end
+
+        def boolean_field(name, **options)
+          delegate_to_resource(:boolean_field, name, **options)
+          field(name, type: :boolean, **options)
+        end
+
+        def select_field(name, **options)
+          delegate_to_resource(:select_field, name, **options)
+          field(name, type: :select, **options)
+        end
+
+        def belongs_to_field(name, **options)
+          delegate_to_resource(:belongs_to_field, name, **options)
+          field(name, type: :belongs_to, **options)
+        end
+
+        def has_many_field(name, **options)
+          delegate_to_resource(:has_many_field, name, **options)
+          field(name, type: :has_many, **options)
+        end
+
+        def file_field(name, **options)
+          delegate_to_resource(:file_field, name, **options)
+          field(name, type: :file, **options)
+        end
+
+        def json_field(name, **options)
+          delegate_to_resource(:json_field, name, **options)
+          field(name, type: :json, **options)
+        end
+
+        def password_field(name = :password, **options)
+          delegate_to_resource(:password_field, name, **options)
+          field(name, type: :password, **options)
+        end
+        
+        # Delegate content method calls 
+        def content(&block)
+          content_node = Nodes::Content.new(block: block)
+          add_node(content_node)
+        end
+        
+        private
+        
+        def field_method?(method)
+          method.to_s.end_with?('_field') && resource_class&.respond_to?(method)
+        end
+        
+        def delegate_to_resource(method, *args, **options)
+          if resource_class
+            resource_class.send(method, *args, **options)
+          else
+            raise "Resource class not available for field delegation"
+          end
+        end
+      end
+      
+      # Specialized builder for tabs
+      class TabsBuilder
+        def initialize(parent_builder, tabs_node)
+          @parent_builder = parent_builder
+          @tabs_node = tabs_node
+        end
+        
+        def tab(name, **attributes, &block)
+          tab_node = Nodes::Tab.new(name, attributes)
+          @tabs_node.add_child(tab_node)
+          
+          if block_given?
+            # Push tab as current container and execute block in parent builder context
+            @parent_builder.current_container_stack.push(tab_node)
+            @parent_builder.instance_exec(&block)
+            @parent_builder.current_container_stack.pop
+          end
+          
+          tab_node
+        end
+      end
+    end
+  end
+end