easy-admin-rails 0.2.6 → 0.2.7

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

@@ -1,3 +1,3 @@
 module EasyAdmin
-  VERSION = "0.2.6"
+  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

data/lib/generators/easy_admin/permissions/templates/migrations/create_permission_tables.rb

@@ -1,6 +1,6 @@
 class CreateEasyAdminPermissionTables < ActiveRecord::Migration<%= migration_version %>
   def change
-    # Roles table - only table needed, permissions are stored in JSON field
+    # Roles table
     create_table :easy_admin_roles do |t|
       t.string :name, null: false
       t.string :slug, null: false
@@ -13,15 +13,45 @@ class CreateEasyAdminPermissionTables < ActiveRecord::Migration<%= migration_ver
       t.index :active
     end
 
-    # User-Role join table (simplified - no permissions table needed)
+    # User-Role join table with support for scoped and temporary permissions
     create_table :easy_admin_user_roles do |t|
       t.references :user, null: false, foreign_key: true
       t.references :role, null: false, foreign_key: { to_table: :easy_admin_roles }
+      
+      # For scoped permissions (e.g., role applies only to specific organization/project)
+      t.string :context_type
+      t.integer :context_id
+      
+      # For temporary permissions
+      t.datetime :expires_at
+      
+      # Track who granted this role
+      t.integer :granted_by_id
+      
       t.boolean :active, default: true
       t.timestamps
 
-      t.index [:user_id, :role_id], unique: true, name: 'index_easy_admin_user_roles_unique'
+      # Unique constraint for user-role-context combination
+      t.index [:user_id, :role_id, :context_type, :context_id], 
+              unique: true, 
+              name: 'index_easy_admin_user_roles_unique'
+      
+      # Performance indexes
       t.index [:user_id, :active], name: 'index_easy_admin_user_roles_active'
+      t.index [:user_id, :context_type, :context_id], name: 'index_easy_admin_user_roles_context'
+      t.index [:context_type, :context_id], name: 'index_easy_admin_user_roles_on_context'
+      t.index :expires_at
+    end
+    
+    # Add permissions_cache to admin_users if needed
+    unless column_exists?(:easy_admin_admin_users, :permissions_cache)
+      add_column :easy_admin_admin_users, :permissions_cache, :json, default: {}
+      add_index :easy_admin_admin_users, :permissions_cache
+    end
+    
+    # Add role_id to admin_users for default role assignment
+    unless column_exists?(:easy_admin_admin_users, :role_id)
+      add_reference :easy_admin_admin_users, :role, foreign_key: { to_table: :easy_admin_roles }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-admin-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Slaurmagan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-06 00:00:00.000000000 Z
+date: 2025-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -261,6 +261,7 @@ files:
 - app/components/easy_admin/fields/show/text_component.rb
 - app/components/easy_admin/fields/show/textarea_component.rb
 - app/components/easy_admin/filters_component.rb
+- app/components/easy_admin/form_layout_component.rb
 - app/components/easy_admin/form_tabs_component.rb
 - app/components/easy_admin/infinite_scroll_component.rb
 - app/components/easy_admin/lazy_chart_card_component.rb
@@ -425,6 +426,24 @@ files:
 - lib/easy_admin/delete_action.rb
 - lib/easy_admin/engine.rb
 - lib/easy_admin/field.rb
+- lib/easy_admin/layouts.rb
+- lib/easy_admin/layouts/builders/base_layout_builder.rb
+- lib/easy_admin/layouts/builders/form_layout_builder.rb
+- lib/easy_admin/layouts/builders/index_layout_builder.rb
+- lib/easy_admin/layouts/builders/show_layout_builder.rb
+- lib/easy_admin/layouts/dsl.rb
+- lib/easy_admin/layouts/layout_context.rb
+- lib/easy_admin/layouts/nodes/base_node.rb
+- lib/easy_admin/layouts/nodes/divider.rb
+- lib/easy_admin/layouts/nodes/field_node.rb
+- lib/easy_admin/layouts/nodes/grid.rb
+- lib/easy_admin/layouts/nodes/render_node.rb
+- lib/easy_admin/layouts/nodes/root.rb
+- lib/easy_admin/layouts/nodes/section.rb
+- lib/easy_admin/layouts/nodes/spacer.rb
+- lib/easy_admin/layouts/nodes/stubs.rb
+- lib/easy_admin/layouts/nodes/tab.rb
+- lib/easy_admin/layouts/nodes/tabs.rb
 - lib/easy_admin/permissions.rb
 - lib/easy_admin/permissions/component.rb
 - lib/easy_admin/permissions/configuration.rb
@@ -442,10 +461,7 @@ files:
 - lib/easy_admin/resource/configuration.rb
 - lib/easy_admin/resource/dsl.rb
 - lib/easy_admin/resource/field_registry.rb
-- lib/easy_admin/resource/form_builder.rb
-- lib/easy_admin/resource/layout_builder.rb
 - lib/easy_admin/resource/scope_manager.rb
-- lib/easy_admin/resource/show_builder.rb
 - lib/easy_admin/resource_modules.rb
 - lib/easy_admin/resource_registry.rb
 - lib/easy_admin/two_factor_authentication.rb
@@ -461,7 +477,6 @@ files:
 - lib/generators/easy_admin/permissions/install_generator.rb
 - lib/generators/easy_admin/permissions/templates/initializers/permissions.rb
 - lib/generators/easy_admin/permissions/templates/migrations/create_permission_tables.rb
-- lib/generators/easy_admin/permissions/templates/migrations/update_users_for_permissions.rb
 - lib/generators/easy_admin/permissions/templates/models/permission.rb
 - lib/generators/easy_admin/permissions/templates/models/role.rb
 - lib/generators/easy_admin/permissions/templates/models/role_permission.rb
@@ -469,9 +484,6 @@ files:
 - lib/generators/easy_admin/permissions/templates/policies/application_policy.rb
 - lib/generators/easy_admin/permissions/templates/policies/user_policy.rb
 - lib/generators/easy_admin/permissions/templates/seeds/permissions.rb
-- lib/generators/easy_admin/rbac/rbac_generator.rb
-- lib/generators/easy_admin/rbac/templates/add_rbac_to_admin_users.rb
-- lib/generators/easy_admin/rbac/templates/super_admin.rb
 - lib/generators/easy_admin/resource_generator.rb
 - lib/generators/easy_admin/templates/AUTH_README
 - lib/generators/easy_admin/templates/README

data/lib/easy_admin/resource/form_builder.rb

@@ -1,123 +0,0 @@
-module EasyAdmin
-  module ResourceModules
-    # FormBuilder class for form DSL
-    # Handles all form tab and field definitions within forms
-    class FormBuilder
-      def initialize(resource_class)
-        @resource_class = resource_class
-        @current_tab = nil
-      end
-
-      def tab(name = "General", **options, &block)
-        tab_config = {
-          name: name,
-          label: options[:label] || name,
-          icon: options[:icon],
-          fields: []
-        }
-
-        @current_tab = tab_config
-        @resource_class.add_form_tab(tab_config)
-
-        instance_eval(&block) if block_given?
-        @current_tab = nil
-      end
-
-      # Field definition methods within tabs - delegate to resource
-      def field(name, type = :string, **options)
-        field_config = @resource_class.build_field_config(name, type, **options)
-
-        if @current_tab
-          @current_tab[:fields] << field_config
-        end
-
-        # Also add to main fields_config for compatibility
-        @resource_class.add_field_to_registry(field_config)
-      end
-
-      # Convenience methods for form fields
-      def text_field(name, **options)
-        field(name, :string, **options)
-      end
-
-      def textarea_field(name, **options)
-        field(name, :text, **options)
-      end
-
-      def number_field(name, **options)
-        field(name, :number, **options)
-      end
-
-      def email_field(name, **options)
-        field(name, :email, **options)
-      end
-
-      def date_field(name, **options)
-        field(name, :date, **options)
-      end
-
-      def datetime_field(name, **options)
-        field(name, :datetime, **options)
-      end
-
-      def boolean_field(name, **options)
-        field(name, :boolean, **options)
-      end
-
-      def select_field(name, options:, **other_options)
-        field(name, :select, options: options, **other_options)
-      end
-
-      def belongs_to_field(name, **options)
-        field(name, :belongs_to, **options)
-      end
-
-      def has_many_field(name, **options)
-        field(name, :has_many, **options)
-      end
-
-      def file_field(name, **options)
-        field(name, :file, **options)
-      end
-
-      def json_field(name, **options)
-        field(name, :json, **options)
-      end
-
-      def password_field(name = :password, **options)
-        field(name, :password, **options)
-        field("#{name}_confirmation".to_sym, :password, 
-              label: options[:confirmation_label] || "Confirm #{name.to_s.humanize}",
-              **options.except(:confirmation_label))
-      end
-
-      # Support for rendering custom components in forms
-      def render(component_class_or_instance, **options)
-        content_config = {
-          type: :custom_component,
-          component_class: component_class_or_instance.class,
-          component_options: options,
-          component_instance: component_class_or_instance
-        }
-        
-        if @current_tab
-          @current_tab[:fields] << content_config
-        end
-        
-        component_class_or_instance
-      end
-
-      # Support for custom content blocks in forms  
-      def content(&block)
-        content_config = {
-          type: :custom_content,
-          block: block
-        }
-        
-        if @current_tab
-          @current_tab[:fields] << content_config
-        end
-      end
-    end
-  end
-end