Merge pull request #19 from blocknotes/feat/internal-improvements-2

feat: internal improvements 2

Author: blocknotes

lib/tiny_admin/actions/index.rb

@@ -13,7 +13,7 @@ class Index < BasicAction
                   :repository,
                   :sort
 
-      def call(app:, context:, options:, actions:)
+      def call(app:, context:, options:)
         evaluate_options(options)
         fields = repository.fields(options: fields_options)
         filters = prepare_filters(fields, filters_list)
@@ -22,7 +22,7 @@ def call(app:, context:, options:, actions:)
         prepare_page(Views::Actions::Index) do |page|
           setup_pagination(page, settings.components[:pagination], total_count: total_count)
           page.update_attributes(
-            actions: actions,
+            actions: context.actions,
             fields: fields,
             filters: filters,
             prepare_record: ->(record) { repository.index_record_attrs(record, fields: fields_options) },
@@ -40,7 +40,7 @@ def evaluate_options(options)
         @repository = context.repository
         @filters_list = options[:filters]
         @pagination = options[:pagination] || 10
-        @sort = options[:sort] || ['id']
+        @sort = options[:sort]
 
         @current_page = (params['p'] || 1).to_i
         @query_string = params_to_s(params.except('p'))
@@ -60,7 +60,7 @@ def setup_pagination(page, pagination_component_class, total_count:)
         return if pages <= 1 || !pagination_component_class
 
         page.pagination_component = pagination_component_class.new
-        page.pagination_component.update(current: current_page, pages: pages, query_string: query_string)
+        page.pagination_component.update_attributes(current: current_page, pages: pages, query_string: query_string)
       end
     end
   end

lib/tiny_admin/actions/show.rb

@@ -3,18 +3,17 @@
 module TinyAdmin
   module Actions
     class Show < BasicAction
-      attr_reader :repository
-
-      def call(app:, context:, options:, actions:)
-        @repository = context.repository
+      def call(app:, context:, options:)
         fields_options = attribute_options(options[:attributes])
+        repository = context.repository
         record = repository.find(context.reference)
+        prepare_record = ->(record_data) { repository.show_record_attrs(record_data, fields: fields_options) }
 
         prepare_page(Views::Actions::Show) do |page|
           page.update_attributes(
-            actions: actions,
+            actions: context.actions,
             fields: repository.fields(options: fields_options),
-            prepare_record: ->(record_data) { repository.show_record_attrs(record_data, fields: fields_options) },
+            prepare_record: prepare_record,
             record: record,
             title: repository.show_title(record)
           )

lib/tiny_admin/context.rb

@@ -4,6 +4,15 @@ module TinyAdmin
   class Context
     include Singleton
 
-    attr_accessor :reference, :repository, :request, :router, :settings, :slug
+    attr_accessor :actions,
+                  :navbar,
+                  :pages,
+                  :reference,
+                  :repository,
+                  :request,
+                  :resources,
+                  :router,
+                  :settings,
+                  :slug
   end
 end

lib/tiny_admin/field.rb

@@ -7,19 +7,20 @@ class Field
     def initialize(name:, title:, type:, options: {})
       @type = type
       @name = name
-      @title = title || name
+      @title = title
       @options = options
     end
 
+    def apply_call_option(target)
+      messages = (options[:call] || '').split(',').map(&:strip)
+      messages.inject(target) { |result, msg| result&.send(msg) } if messages.any?
+    end
+
     class << self
       def create_field(name:, title: nil, type: nil, options: {})
         field_name = name.to_s
-        new(
-          name: field_name,
-          title: title || field_name.respond_to?(:humanize) ? field_name.humanize : field_name.tr('_', ' ').capitalize,
-          type: type || :string,
-          options: options
-        )
+        field_title = field_name.respond_to?(:humanize) ? field_name.humanize : field_name.tr('_', ' ').capitalize
+        new(name: field_name, title: title || field_title, type: type || :string, options: options || {})
       end
     end
   end

lib/tiny_admin/plugins/active_record_repository.rb

@@ -42,8 +42,8 @@ def find(reference)
         raise BaseRepository::RecordNotFound, e.message
       end
 
-      def list(page: 1, limit: 10, sort: ['id'], filters: nil)
-        query = model.all.order(sort)
+      def list(page: 1, limit: 10, sort: nil, filters: nil)
+        query = sort ? model.all.order(sort) : model.all
         query = apply_filters(query, filters) if filters
         page_offset = page.positive? ? (page - 1) * limit : 0
         records = query.offset(page_offset).limit(limit).to_a

lib/tiny_admin/router.rb

@@ -29,11 +29,11 @@ class Router < BasicApp
         r.redirect settings.root_path
       end
 
-      context.settings.pages.each do |slug, data|
+      context.pages.each do |slug, data|
         setup_page_route(r, slug, data)
       end
 
-      context.settings.resources.each do |slug, options|
+      context.resources.each do |slug, options|
         setup_resource_routes(r, slug, options: options || {})
       end
 
@@ -88,12 +88,12 @@ def setup_collection_routes(router, options:)
       )
 
       # Index
-      actions = options[:only]
-      if !actions || actions.include?(:index) || actions.include?('index')
+      if options[:only].include?(:index) || options[:only].include?('index')
         router.is do
+          context.actions = custom_actions
           context.request = request
           index_action = TinyAdmin::Actions::Index.new
-          render_page index_action.call(app: self, context: context, options: action_options, actions: custom_actions)
+          render_page index_action.call(app: self, context: context, options: action_options)
         end
       end
     end
@@ -114,12 +114,12 @@ def setup_member_routes(router, options:)
         )
 
         # Show
-        actions = options[:only]
-        if !actions || actions.include?(:show) || actions.include?('show')
+        if options[:only].include?(:show) || options[:only].include?('show')
           router.is do
+            context.actions = custom_actions
             context.request = request
             show_action = TinyAdmin::Actions::Show.new
-            render_page show_action.call(app: self, context: context, options: action_options, actions: custom_actions)
+            render_page show_action.call(app: self, context: context, options: action_options)
           end
         end
       end
@@ -132,6 +132,7 @@ def setup_custom_actions(router, custom_actions, repository:, options:)
         action_class = action.is_a?(String) ? Object.const_get(action) : action
 
         router.get action_slug.to_s do
+          context.actions = {}
           context.request = request
           custom_action = action_class.new
           render_page custom_action.call(app: self, context: context, options: options)

lib/tiny_admin/settings.rb

@@ -25,7 +25,6 @@ class Settings
                   :components,
                   :extra_styles,
                   :helper_class,
-                  :navbar,
                   :page_not_found,
                   :record_not_found,
                   :repository,
@@ -35,8 +34,6 @@ class Settings
                   :scripts,
                   :style_links
 
-    attr_reader :pages, :resources
-
     def [](key)
       send(key)
     end
@@ -57,39 +54,15 @@ def load_settings
         end
       end
 
-      @pages ||= {}
-      @resources ||= {}
+      context.pages ||= {}
+      context.resources ||= {}
       @sections ||= []
       @root_path = '/' if @root_path == ''
-      if @authentication[:plugin] == Plugins::SimpleAuth
-        @authentication[:logout] ||= ['logout', "#{root_path}/auth/logout"]
-      end
-      @navbar = prepare_navbar(sections, logout: authentication[:logout])
-    end
 
-    def prepare_navbar(sections, logout:)
-      items = sections.each_with_object({}) do |section, list|
-        slug = section[:slug]
-        case section[:type]&.to_sym
-        when :url
-          list[slug] = [section[:name], section[:url], section[:options]]
-        when :page
-          page = section[:page]
-          pages[slug] = page.is_a?(String) ? Object.const_get(page) : page
-          list[slug] = [section[:name], route_for(slug)]
-        when :resource
-          repository = section[:repository] || settings.repository
-          resources[slug] = {
-            model: section[:model].is_a?(String) ? Object.const_get(section[:model]) : section[:model],
-            repository: repository.is_a?(String) ? Object.const_get(repository) : repository
-          }
-          resources[slug].merge! section.slice(:resource, :only, :index, :show, :collection_actions, :member_actions)
-          hidden = section[:options] && (section[:options].include?(:hidden) || section[:options].include?('hidden'))
-          list[slug] = [section[:name], route_for(slug)] unless hidden
-        end
+      if @authentication[:plugin] <= Plugins::SimpleAuth
+        @authentication[:logout] ||= { name: 'logout', path: "#{root_path}/auth/logout" }
       end
-      items['auth/logout'] = logout if logout
-      items
+      context.navbar = prepare_navbar(sections, logout: authentication[:logout])
     end
 
     private
@@ -106,5 +79,44 @@ def convert_value(key, value)
         self[key] = Object.const_get(self[key])
       end
     end
+
+    def prepare_navbar(sections, logout:)
+      items = sections.each_with_object({}) do |section, list|
+        slug = section[:slug]
+        case section[:type]&.to_sym
+        when :url
+          list[slug] = add_url_section(slug, section)
+        when :page
+          list[slug] = add_page_section(slug, section)
+        when :resource
+          list[slug] = add_resource_section(slug, section)
+        end
+      end
+      items['auth/logout'] = logout if logout
+      items
+    end
+
+    def add_url_section(_slug, section)
+      section.slice(:name, :options).tap { _1[:path] = section[:url] }
+    end
+
+    def add_page_section(slug, section)
+      page = section[:page]
+      context.pages[slug] = page.is_a?(String) ? Object.const_get(page) : page
+      { name: section[:name], path: route_for(slug), class: context.pages[slug] }
+    end
+
+    def add_resource_section(slug, section)
+      repository = section[:repository] || settings.repository
+      context.resources[slug] = {
+        model: section[:model].is_a?(String) ? Object.const_get(section[:model]) : section[:model],
+        repository: repository.is_a?(String) ? Object.const_get(repository) : repository
+      }
+      resource_options = section.slice(:resource, :only, :index, :show, :collection_actions, :member_actions)
+      resource_options[:only] ||= %i[index show]
+      context.resources[slug].merge!(resource_options)
+      hidden = section[:options] && (section[:options].include?(:hidden) || section[:options].include?('hidden'))
+      { name: section[:name], path: route_for(slug) } unless hidden
+    end
   end
 end

lib/tiny_admin/support.rb

@@ -4,27 +4,27 @@ module TinyAdmin
   class Support
     class << self
       def call(value, options: [])
-        value && options&.any? ? options.inject(value) { |result, message| result&.send(message) } : value
+        options.inject(value) { |result, message| result&.send(message) } if value && options&.any?
       end
 
       def downcase(value, options: [])
         value&.downcase
       end
 
       def format(value, options: [])
-        value && options&.any? ? Kernel.format(options.first, value) : value
+        Kernel.format(options.first, value) if value && options&.any?
       end
 
       def round(value, options: [])
         value&.round(options&.first&.to_i || 2)
       end
 
       def strftime(value, options: [])
-        value ? value.strftime(options&.first || '%Y-%m-%d %H:%M') : ''
+        value&.strftime(options&.first || '%Y-%m-%d %H:%M')
       end
 
       def to_date(value, options: [])
-        value ? value.to_date.to_s : value
+        value.to_date.to_s if value
       end
 
       def upcase(value, options: [])

lib/tiny_admin/utils.rb

@@ -5,7 +5,8 @@ module Utils
     def params_to_s(params)
       list = params.each_with_object([]) do |(param, value), result|
         if value.is_a?(Hash)
-          result.concat(value.map { |k, v| "#{param}[#{k}]=#{v}" })
+          values = value.map { |key, val| "#{param}[#{key}]=#{val}" }
+          result.concat(values)
         else
           result.push(["#{param}=#{value}"])
         end
@@ -18,13 +19,13 @@ def prepare_page(page_class, options: nil)
         page.options = options
         page.head_component = settings.components[:head]&.new
         page.flash_component = settings.components[:flash]&.new
-        page.navbar_component = settings.components[:navbar]&.new(
+        page.navbar_component = settings.components[:navbar]&.new
+        page.navbar_component&.update_attributes(
           current_slug: context&.slug,
           root_path: settings.root_path,
           root_title: settings.root[:title],
-          items: options&.include?(:no_menu) ? [] : settings.navbar
+          items: options&.include?(:no_menu) ? [] : context&.navbar
         )
-
         yield(page) if block_given?
       end
     end

lib/tiny_admin/views/actions/index.rb

@@ -30,8 +30,9 @@ def template
 
                 if filters&.any?
                   div(class: 'col-3') {
-                    filters_form_attrs = { section_path: route_for(context.slug), filters: filters }
-                    render TinyAdmin::Views::Components::FiltersForm.new(**filters_form_attrs)
+                    filters_form = TinyAdmin::Views::Components::FiltersForm.new
+                    filters_form.update_attributes(section_path: route_for(context.slug), filters: filters)
+                    render filters_form
                   }
                 end
               }
@@ -65,9 +66,9 @@ def table_body
                   field = fields[key]
                   td(class: "field-value-#{field.name} field-value-type-#{field.type}") {
                     if field.options && field.options[:link_to]
-                      messages = (field.options[:call] || '').split(',').map(&:strip)
-                      label = messages.any? ? messages.inject(record) { |result, msg| result&.send(msg) } : value
-                      a(href: route_for(field.options[:link_to], reference: value)) { label }
+                      a(href: route_for(field.options[:link_to], reference: value)) {
+                        field.apply_call_option(record) || value
+                      }
                     else
                       value
                     end