feat: actions improvements

Author: Mattia Roccoberton

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'))

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,7 +4,8 @@ module TinyAdmin
   class Context
     include Singleton
 
-    attr_accessor :navbar,
+    attr_accessor :actions,
+                  :navbar,
                   :pages,
                   :reference,
                   :repository,

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

@@ -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

@@ -113,6 +113,7 @@ def add_resource_section(slug, section)
         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

lib/tiny_admin/views/actions/show.rb

@@ -46,8 +46,9 @@ def actions_buttons
             (actions || {}).each do |action, action_class|
               li(class: 'nav-item mx-1') {
                 href = route_for(context.slug, reference: context.reference, action: action)
-                title = action_class.respond_to?(:title) ? action_class.title : action
-                a(href: href, class: 'nav-link btn btn-outline-secondary') { title }
+                a(href: href, class: 'nav-link btn btn-outline-secondary') {
+                  action_class.respond_to?(:title) ? action_class.title : action
+                }
               }
             end
           }

spec/dummy/app/tiny_admin/sample_collection_action.rb

@@ -7,7 +7,7 @@ def template
 end
 
 class SampleCollectionAction < TinyAdmin::Actions::BasicAction
-  def call(app:, context:, options:, actions: [])
+  def call(app:, context:, options:)
     SampleCollectionPage
   end
 end

spec/dummy/app/tiny_admin/sample_member_action.rb

@@ -7,7 +7,7 @@ def template
 end
 
 class SampleMemberAction < TinyAdmin::Actions::BasicAction
-  def call(app:, context:, options:, actions: [])
+  def call(app:, context:, options:)
     SampleMemberPage
   end
 end