easy-admin-rails 0.2.5 → 0.2.7

data/lib/easy_admin/layouts/nodes/section.rb

@@ -0,0 +1,46 @@
+module EasyAdmin
+  module Layouts
+    module Nodes
+      # Section node for grouping content
+      class Section < BaseNode
+        def initialize(title = nil, attributes = {})
+          super(attributes)
+          @attributes[:title] = title
+          @attributes[:description] ||= nil
+          @attributes[:collapsible] ||= false
+          @attributes[:collapsed] ||= false
+          @attributes[:icon] ||= nil
+          @attributes[:css_class] ||= nil
+        end
+        
+        def title
+          @attributes[:title]
+        end
+        
+        def description
+          @attributes[:description]
+        end
+        
+        def collapsible?
+          @attributes[:collapsible]
+        end
+        
+        def collapsed?
+          @attributes[:collapsed]
+        end
+        
+        def icon
+          @attributes[:icon]
+        end
+        
+        def css_class
+          @attributes[:css_class]
+        end
+        
+        def section_id
+          "section-#{(title || 'untitled').parameterize}"
+        end
+      end
+    end
+  end
+end

data/lib/easy_admin/layouts/nodes/spacer.rb

@@ -0,0 +1,17 @@
+module EasyAdmin
+  module Layouts
+    module Nodes
+      # Spacer node for adding vertical space
+      class Spacer < BaseNode
+        def initialize(attributes = {})
+          super
+          @attributes[:size] ||= 4 # Tailwind spacing size
+        end
+        
+        def size
+          @attributes[:size]
+        end
+      end
+    end
+  end
+end

data/lib/easy_admin/layouts/nodes/stubs.rb

@@ -0,0 +1,109 @@
+# Stub node classes - to be fully implemented
+module EasyAdmin
+  module Layouts
+    module Nodes
+      # Show page nodes
+      class DescriptionList < BaseNode; end
+      class Card < BaseNode
+        def initialize(title: nil, **attributes)
+          super(attributes)
+          @attributes[:title] = title
+        end
+      end
+      class MetricCard < BaseNode
+        def initialize(title: nil, label: nil, value: nil, **attributes)
+          super(attributes)
+          @attributes[:title] = title || label
+          @attributes[:value] = value
+        end
+      end
+      class ActionBar < BaseNode; end
+      class Panel < BaseNode
+        def initialize(title, **attributes)
+          super(attributes)
+          @attributes[:title] = title
+        end
+      end
+      class Badge < BaseNode
+        def initialize(text, **attributes)
+          super(attributes)
+          @attributes[:text] = text
+        end
+      end
+      class RelatedResources < BaseNode
+        def initialize(resource_name, **attributes)
+          super(attributes)
+          @attributes[:resource_name] = resource_name
+        end
+      end
+      class Action < BaseNode
+        def initialize(type, **attributes)
+          super(attributes)
+          @attributes[:type] = type
+        end
+      end
+      class Dropdown < BaseNode; end
+      
+      # Form page nodes
+      class Fieldset < BaseNode
+        def initialize(legend = nil, **attributes)
+          super(attributes)
+          @attributes[:legend] = legend
+        end
+      end
+      class FormActions < BaseNode; end
+      class InlineFields < BaseNode; end
+      class ConditionalFields < BaseNode; end
+      class NestedFields < BaseNode
+        def initialize(association, **attributes)
+          super(attributes)
+          @attributes[:association] = association
+        end
+      end
+      class HelpText < BaseNode
+        def initialize(text, **attributes)
+          super(attributes)
+          @attributes[:text] = text
+        end
+      end
+      class ErrorsSummary < BaseNode; end
+      class FormAction < BaseNode
+        def initialize(type, **attributes)
+          super(attributes)
+          @attributes[:type] = type
+        end
+      end
+      
+      # Additional nodes needed by DSL
+      class Content < BaseNode
+        def initialize(attributes = {}, block: nil)
+          @block = block
+          super(attributes)
+        end
+        
+        attr_reader :block
+      end
+      
+      class Row < BaseNode
+        def initialize(attributes = {})
+          super(attributes)
+        end
+      end
+      
+      class Column < BaseNode
+        def initialize(attributes = {})
+          super(attributes)
+        end
+      end
+      
+      class Heading < BaseNode
+        def initialize(text, attributes = {})
+          @text = text
+          super(attributes)
+        end
+        
+        attr_reader :text
+      end
+    end
+  end
+end

data/lib/easy_admin/layouts/nodes/tab.rb

@@ -0,0 +1,40 @@
+module EasyAdmin
+  module Layouts
+    module Nodes
+      # Individual tab within a tabs container
+      class Tab < BaseNode
+        def initialize(name, attributes = {})
+          super(attributes)
+          @attributes[:name] = name.to_s
+          @attributes[:label] ||= name.to_s.humanize
+          @attributes[:icon] ||= nil
+          @attributes[:badge] ||= nil
+        end
+        
+        def name
+          @attributes[:name]
+        end
+        
+        def label
+          @attributes[:label]
+        end
+        
+        def icon
+          @attributes[:icon]
+        end
+        
+        def badge
+          @attributes[:badge]
+        end
+        
+        def tab_id
+          "tab-#{name.parameterize}"
+        end
+        
+        def panel_id
+          "panel-#{name.parameterize}"
+        end
+      end
+    end
+  end
+end

data/lib/easy_admin/layouts/nodes/tabs.rb

@@ -0,0 +1,40 @@
+module EasyAdmin
+  module Layouts
+    module Nodes
+      # Container for tab nodes
+      class Tabs < BaseNode
+        def initialize(attributes = {})
+          super
+          @attributes[:type] ||= :horizontal
+          @attributes[:id] ||= "tabs-#{SecureRandom.hex(4)}"
+        end
+        
+        def horizontal?
+          @attributes[:type] == :horizontal
+        end
+        
+        def vertical?
+          @attributes[:type] == :vertical
+        end
+        
+        def tabs_id
+          @attributes[:id]
+        end
+        
+        def active_tab_index
+          @attributes[:active_tab] || 0
+        end
+        
+        # Get all tab children
+        def tabs
+          @children.select { |child| child.is_a?(Tab) }
+        end
+        
+        # Find tab by name
+        def find_tab(name)
+          tabs.find { |tab| tab[:name] == name.to_s }
+        end
+      end
+    end
+  end
+end

data/lib/easy_admin/layouts.rb

@@ -0,0 +1,28 @@
+module EasyAdmin
+  module Layouts
+    # Registry for custom components
+    mattr_accessor :registered_components, default: {}
+    
+    class << self
+      # Register a custom component for use in DSL
+      def register_component(name, component_class)
+        registered_components[name.to_sym] = component_class
+      end
+      
+      # Unregister a component
+      def unregister_component(name)
+        registered_components.delete(name.to_sym)
+      end
+      
+      # Clear all registered components
+      def clear_registered_components!
+        registered_components.clear
+      end
+      
+      # Check if component is registered
+      def component_registered?(name)
+        registered_components.key?(name.to_sym)
+      end
+    end
+  end
+end

data/lib/easy_admin/permissions/resource_permissions.rb

@@ -74,8 +74,6 @@ module EasyAdmin
         
         # Seed permissions into database
         def seed_permissions!
-          Rails.logger.info "🔐 Seeding EasyAdmin resource permissions..."
-          
           permissions_data = discover_all_permissions
           created_count = 0
           
@@ -90,8 +88,6 @@ module EasyAdmin
             
             created_count += 1 if permission.saved_change_to_id?
           end
-          
-          Rails.logger.info "✅ Seeded #{created_count} new permissions (#{permissions_data.size} total)"
           permissions_data.size
         end
         
@@ -228,4 +224,4 @@ module EasyAdmin
       end
     end
   end
-end
+end

data/lib/easy_admin/resource/base.rb

@@ -10,8 +10,8 @@ module EasyAdmin
         include EasyAdmin::ResourceModules::Configuration
         include EasyAdmin::ResourceModules::DSL
         include EasyAdmin::ResourceModules::FieldRegistry
-        include EasyAdmin::ResourceModules::LayoutBuilder
         include EasyAdmin::ResourceModules::ScopeManager
+        include EasyAdmin::Layouts::DSL
         
         # Class attributes for core functionality
         class_attribute :resource_name, :custom_title
@@ -28,8 +28,8 @@ module EasyAdmin
           self.resource_name = name.demodulize.gsub(/Resource$/, '')
           initialize_configurations
           initialize_field_registry
-          initialize_layout_builder
           initialize_scope_manager
+          # Layout initialization is now handled by EasyAdmin::Layouts::DSL
         end
       end
 

data/lib/easy_admin/resource/dsl.rb

@@ -77,17 +77,8 @@ module EasyAdmin
                 **options.except(:confirmation_label))
         end
 
-        # Form building DSL
-        def form(&block)
-          form_builder = EasyAdmin::ResourceModules::FormBuilder.new(self)
-          form_builder.instance_eval(&block)
-        end
-
-        # Show layout building DSL  
-        def show(&block)
-          show_builder = EasyAdmin::ResourceModules::ShowBuilder.new(self)
-          show_builder.instance_eval(&block)
-        end
+        # Layout DSL is now handled by EasyAdmin::Layouts::DSL module
+        # See lib/easy_admin/layouts/dsl.rb for implementation
 
         # Batch Actions DSL
         def enable_batch_actions

data/lib/easy_admin/resource/field_registry.rb

@@ -55,7 +55,13 @@ module EasyAdmin
 
         # Field categorization methods
         def index_fields
-          fields_config.select { |field| ![:text, :has_many, :file].include?(field[:type]) }
+          # If custom index layout is defined, extract fields from the AST
+          if has_custom_index_layout?
+            extract_index_fields_from_layout
+          else
+            # Default behavior: return fields excluding certain types
+            fields_config.select { |field| ![:text, :has_many, :file].include?(field[:type]) }
+          end
         end
 
         def sortable_fields
@@ -183,7 +189,57 @@ module EasyAdmin
         def association_fields_count
           association_fields.count
         end
+        
+        private
+        
+        # Extract fields from custom index layout AST
+        def extract_index_fields_from_layout
+          return [] unless index_layout_content
+          
+          # Extract field nodes from the index layout AST
+          extract_field_configs_from_ast_node(index_layout_content)
+        end
+        
+        # Helper method to recursively extract field configs from AST nodes
+        def extract_field_configs_from_ast_node(node)
+          field_configs = []
+          
+          if node.is_a?(EasyAdmin::Layouts::Nodes::FieldNode)
+            # For index layouts, look up the field config from registered fields
+            base_field_config = find_field_config(node.field_name)
+            
+            if base_field_config
+              # Use the registered field config with any node-specific overrides
+              # Only merge non-nil values from node attributes to preserve base config
+              field_config = base_field_config.dup
+              node.attributes.each do |key, value|
+                field_config[key] = value unless value.nil?
+              end
+              field_configs << field_config
+            else
+              field_config = {
+                name: node.field_name,
+                type: :string,
+                label: node.field_name.to_s.humanize,
+                sortable: true,
+                searchable: false,
+                filterable: false,
+                readonly: false
+              }.merge(node.attributes)
+              field_configs << field_config
+            end
+          end
+          
+          # Recursively process child nodes
+          if node.respond_to?(:children) && node.children
+            node.children.each do |child_node|
+              field_configs += extract_field_configs_from_ast_node(child_node)
+            end
+          end
+          
+          field_configs
+        end
       end
     end
   end
-end
+end

data/lib/easy_admin/resource.rb

@@ -1,14 +1,5 @@
 module EasyAdmin
   class Resource
     include EasyAdmin::ResourceModules::Base
-
-    # Legacy methods - kept for backward compatibility
-    # These delegate to the appropriate modules
-
-    # Deprecated classes - kept for backward compatibility
-    # Use EasyAdmin::ResourceModules::FormBuilder instead
-    FormBuilder = EasyAdmin::ResourceModules::FormBuilder
-    ShowBuilder = EasyAdmin::ResourceModules::ShowBuilder
-    ChartBuilder = EasyAdmin::ResourceModules::ChartBuilder
   end
 end

data/lib/easy_admin/resource_modules.rb

@@ -4,8 +4,25 @@
 require_relative 'resource/configuration'
 require_relative 'resource/field_registry' 
 require_relative 'resource/scope_manager'
-require_relative 'resource/layout_builder'
-require_relative 'resource/form_builder'
-require_relative 'resource/show_builder'
 require_relative 'resource/dsl'
-require_relative 'resource/base'
+require_relative 'resource/base'
+
+# Layout system modules
+require_relative 'layouts'
+require_relative 'layouts/nodes/base_node'
+require_relative 'layouts/nodes/root'
+require_relative 'layouts/nodes/tabs'
+require_relative 'layouts/nodes/tab'
+require_relative 'layouts/nodes/field_node'
+require_relative 'layouts/nodes/render_node'
+require_relative 'layouts/nodes/section'
+require_relative 'layouts/nodes/grid'
+require_relative 'layouts/nodes/divider'
+require_relative 'layouts/nodes/spacer'
+require_relative 'layouts/nodes/stubs'
+require_relative 'layouts/layout_context'
+require_relative 'layouts/builders/base_layout_builder'
+require_relative 'layouts/builders/show_layout_builder'
+require_relative 'layouts/builders/form_layout_builder'
+require_relative 'layouts/builders/index_layout_builder'
+require_relative 'layouts/dsl'

data/lib/easy_admin/two_factor_authentication.rb

@@ -0,0 +1,156 @@
+module EasyAdmin
+  module TwoFactorAuthentication
+    extend ActiveSupport::Concern
+    
+    # Check if required gems are available
+    def self.available?
+      @available ||= begin
+        require 'rotp'
+        require 'rqrcode'
+        true
+      rescue LoadError
+        false
+      end
+    end
+    
+    included do
+      # Only add validations and callbacks if 2FA gems are available
+      if EasyAdmin::TwoFactorAuthentication.available?
+        validates :otp_secret, presence: true, if: :otp_required_for_login?
+        validates :otp_secret, uniqueness: true, allow_blank: true
+      end
+    end
+
+    def two_factor_available?
+      EasyAdmin::TwoFactorAuthentication.available?
+    end
+
+    def two_factor_enabled?
+      two_factor_available? && otp_required_for_login? && otp_secret.present?
+    end
+
+    def generate_otp_secret!
+      return false unless two_factor_available?
+      
+      require 'rotp'
+      self.otp_secret = ROTP::Base32.random
+      save!
+    end
+
+    def current_otp
+      return nil unless two_factor_available? && otp_secret.present?
+      
+      require 'rotp'
+      ROTP::TOTP.new(otp_secret, issuer: "EasyAdmin").now
+    end
+
+    def validate_and_consume_otp!(token)
+      return false unless two_factor_available? && otp_secret.present?
+      return false if token.blank?
+      
+      require 'rotp'
+      
+      totp = ROTP::TOTP.new(otp_secret, issuer: "EasyAdmin")
+      last_otp_at_timestamp = last_otp_at&.to_i
+      
+      # Verify with 30-second drift tolerance and replay protection
+      if totp.verify(token.to_s, drift_behind: 30, drift_ahead: 30, after: last_otp_at_timestamp)
+        touch(:last_otp_at)
+        true
+      else
+        false
+      end
+    end
+
+    def validate_backup_code!(code)
+      return false unless two_factor_available?
+      return false if code.blank? || otp_backup_codes.blank?
+      
+      normalized_code = code.to_s.upcase.strip
+      
+      if otp_backup_codes.include?(normalized_code)
+        invalidate_backup_code!(normalized_code)
+        true
+      else
+        false
+      end
+    end
+
+    def generate_backup_codes!
+      return false unless two_factor_available?
+      
+      # Generate 10 backup codes (8 characters each)
+      codes = 10.times.map { SecureRandom.hex(4).upcase }
+      self.otp_backup_codes = codes
+      save!
+      codes
+    end
+
+    def invalidate_backup_code!(code)
+      return false unless two_factor_available?
+      
+      normalized_code = code.to_s.upcase.strip
+      self.otp_backup_codes = otp_backup_codes.reject { |c| c == normalized_code }
+      save!
+    end
+
+    def backup_codes_remaining
+      two_factor_available? ? (otp_backup_codes&.length || 0) : 0
+    end
+
+    def provisioning_uri
+      return nil unless two_factor_available? && otp_secret.present?
+      
+      require 'rotp'
+      ROTP::TOTP.new(otp_secret, issuer: "EasyAdmin").provisioning_uri(email)
+    end
+
+    def qr_code_svg(size: 200)
+      return nil unless two_factor_available?
+      
+      uri = provisioning_uri
+      return nil if uri.blank?
+      
+      require 'rqrcode'
+      
+      qr_code = RQRCode::QRCode.new(uri)
+      qr_code.as_svg(
+        viewbox: true,
+        module_size: 4,
+        standalone: true,
+        use_path: true
+      )
+    end
+
+    def enable_two_factor!
+      return false unless two_factor_available? && otp_secret.present?
+      
+      update!(otp_required_for_login: true)
+    end
+
+    def disable_two_factor!
+      update!(
+        otp_required_for_login: false,
+        otp_secret: nil,
+        otp_backup_codes: nil,
+        last_otp_at: nil
+      )
+    end
+
+    # Check if user needs 2FA based on role requirements
+    def two_factor_required?
+      return false unless two_factor_available?
+      
+      # Check if role requires 2FA (if role system exists)
+      if respond_to?(:role) && role.respond_to?(:require_two_factor?)
+        role.require_two_factor?
+      else
+        false
+      end
+    end
+
+    def should_enable_two_factor?
+      two_factor_required? && !two_factor_enabled?
+    end
+  end
+end

data/lib/easy_admin/version.rb

@@ -1,3 +1,3 @@
 module EasyAdmin
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

data/lib/generators/easy_admin/permissions/install_generator.rb

@@ -24,11 +24,6 @@ module EasyAdmin
         def create_migrations
           migration_template 'migrations/create_permission_tables.rb', 
                            'db/migrate/create_easy_admin_permission_tables.rb'
-          
-          if options[:user_model] != 'User' || has_user_model_changes?
-            migration_template 'migrations/update_users_for_permissions.rb',
-                             'db/migrate/update_users_for_easy_admin_permissions.rb'
-          end
         end
 
         def create_initializer
@@ -79,11 +74,6 @@ module EasyAdmin
           options[:contexts]
         end
 
-        def has_user_model_changes?
-          # Check if we need to add permissions_cache column
-          !File.exist?("app/models/#{options[:user_model].underscore}.rb") ||
-          !File.read("app/models/#{options[:user_model].underscore}.rb").include?('permissions_cache')
-        end
       end
     end
   end