easy-admin-rails 0.1.15 → 0.2.0

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

@@ -0,0 +1,135 @@
+module EasyAdmin
+  module Concerns
+    # ResourcePagination concern handles pagination and related logic
+    # Provides methods for applying pagination with pagy gem
+    module ResourcePagination
+      extend ActiveSupport::Concern
+
+      private
+
+      # Apply pagination to records using Pagy
+      def apply_pagination(records)
+        # Apply pagination using Pagy with resource-specific configuration
+        items_per_page = @resource_class.respond_to?(:items_per_page) ? @resource_class.items_per_page : 20
+        
+        # Reset to page 1 if filtering/searching is applied to avoid overflow
+        current_page = if has_active_filters?
+          1
+        else
+          params[:page] || 1
+        end
+        
+        pagination_options = {
+          items: items_per_page,
+          limit: items_per_page,
+          page: current_page,
+          overflow: :last_page  # Handle overflow by redirecting to last valid page
+        }
+
+        # Use countless pagination if enabled for performance
+        if @resource_class.respond_to?(:countless_enabled?) && @resource_class.countless_enabled?
+          pagy_countless(records, **pagination_options)
+        else
+          pagy(records, **pagination_options)
+        end
+      end
+
+      # Setup sorting parameters with defaults
+      def setup_sorting_params
+        # Set up data needed for both HTML and turbo stream
+        # Default to id DESC if no sort params provided
+        sort_field = params[:sort] || 'id'
+        sort_direction = params[:direction] || (params[:sort] ? 'asc' : 'desc')
+        
+        [sort_field, sort_direction]
+      end
+
+      # Set current sorting state for views
+      def set_current_sorting_state(sort_field, sort_direction)
+        @current_sort_field = sort_field
+        @current_sort_direction = sort_direction
+        @current_period = params[:period]
+      end
+
+      # Build Turbo Stream response for infinite scroll
+      def build_infinite_scroll_turbo_stream
+        # For infinite scroll - append new rows to existing table
+        table_rows_html = @records.map do |record|
+          EasyAdmin::Resources::TableRowComponent.new(
+            record: record,
+            resource_class: @resource_class
+          ).call
+        end.join.html_safe
+
+        current_params = params.permit(:search, :scope, :sort, :direction, :period, :page, q: {})
+
+        [
+          turbo_stream.append("records-container", table_rows_html),
+          turbo_stream.replace("infinite-scroll-container", EasyAdmin::InfiniteScrollComponent.new(
+            pagy: @pagy,
+            resource_class: @resource_class,
+            current_params: current_params,
+            current_path: request.path
+          ).call),
+          turbo_stream.replace("combined-filters", EasyAdmin::CombinedFiltersComponent.new(
+            resource_class: @resource_class,
+            current_params: current_params,
+            search_params: params[:q] || {},
+            current_period: @current_period
+          ).call)
+        ]
+      end
+
+      # Prepare pagination data for index action
+      def prepare_index_pagination_data
+        sort_field, sort_direction = setup_sorting_params
+        
+        # Handle scope filtering
+        @current_scope = determine_current_scope
+        
+        # Only calculate scope counts for HTML requests, not for infinite scroll (turbo_stream)
+        if @resource_class.has_scopes? && !request.format.turbo_stream?
+          @scope_counts = calculate_scope_counts
+        end
+
+        # Build filtered records
+        @records = build_filtered_records(sort_field, sort_direction)
+
+        # Apply pagination
+        @pagy, @records = apply_pagination(@records)
+
+        # Set current state for views
+        set_current_sorting_state(sort_field, sort_direction)
+      end
+
+      # Handle pagination-related parameters
+      def pagination_params
+        params.permit(:search, :scope, :sort, :direction, :period, :page, q: {})
+      end
+
+      # Check if we're on first page
+      def first_page?
+        !params[:page].present? || params[:page].to_i <= 1
+      end
+
+      # Check if pagination should reset due to filtering
+      def should_reset_pagination?
+        has_active_filters? && !first_page?
+      end
+
+      # Get pagination info for views
+      def pagination_info
+        return {} unless @pagy
+        
+        {
+          current_page: @pagy.page,
+          total_pages: @pagy.pages,
+          total_count: @pagy.count,
+          per_page: @pagy.items,
+          from: @pagy.from,
+          to: @pagy.to
+        }
+      end
+    end
+  end
+end

data/app/controllers/easy_admin/dashboard_controller.rb

@@ -1,6 +1,7 @@
 module EasyAdmin
   class DashboardController < ApplicationController
+    # Skip ActionPolicy authorization for dashboard
     def index
     end
   end
-end
+end

data/app/controllers/easy_admin/dashboards_controller.rb

@@ -7,16 +7,7 @@ module EasyAdmin
       
       respond_to do |format|
         format.html
-        format.turbo_stream do
-          render turbo_stream: turbo_stream.replace(
-            "dashboard-grid",
-            EasyAdmin::Dashboards::ShowComponent.new(
-              dashboard_class: @dashboard_class,
-              params: dashboard_params,
-              request_path: request.path
-            ).call
-          )
-        end
+        format.turbo_stream
         format.json { render json: dashboard_data }
       end
     end
@@ -33,42 +24,17 @@ module EasyAdmin
       @card_data = @dashboard_instance.card_data(@card[:name])
 
       respond_to do |format|
-        format.html do
-          render plain: EasyAdmin::Dashboards::CardStreamComponent.new(
-            card: @card,
-            card_data: @card_data,
-            dashboard_class: @dashboard_class
-          ).call
-        end
-        format.turbo_stream do
-          render turbo_stream: turbo_stream.replace(
-            "card_#{@card[:name]}",
-            EasyAdmin::Dashboards::CardStreamComponent.new(
-              card: @card,
-              card_data: @card_data,
-              dashboard_class: @dashboard_class
-            ).call
-          )
-        end
+        format.html
+        format.turbo_stream
         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|
-        format.html do
-          render plain: view_context.turbo_frame_tag("card_#{params[:card_name]}") do
-            EasyAdmin::Dashboards::CardErrorComponent.new(error: e.message).call
-          end
-        end
-        format.turbo_stream do
-          render turbo_stream: turbo_stream.replace(
-            "card_#{params[:card_name]}",
-            view_context.turbo_frame_tag("card_#{params[:card_name]}") do
-              EasyAdmin::Dashboards::CardErrorComponent.new(error: e.message).call
-            end
-          )
-        end
+        format.html { render template: 'easy_admin/dashboards/card_error' }
+        format.turbo_stream { render template: 'easy_admin/dashboards/card_error' }
         format.json { render json: { error: e.message }, status: :server_error }
       end
     end