Improve admin tab tables

admins/pageflow/user.rb

@@ -61,27 +61,34 @@ module Pageflow
         end
 
         panel I18n.t('activerecord.models.entry.other') do
-          if user.memberships.any?
-            table_for user.memberships, :class => 'memberships', :i18n => Membership do
-              column :entry do |membership|
+          embedded_index_table(user.memberships.includes(:entry).references(:pageflow_entry),
+                               blank_slate_text: I18n.t('pageflow.admin.users.empty')) do
+            table_for_collection sortable: true, class: 'memberships', i18n: Membership do
+              column :entry, sortable: 'pageflow_entries.title' do |membership|
                 link_to(membership.entry.title, admin_entry_path(membership.entry))
               end
+              column :created_at, sortable: 'pageflow_memberships.created_at'
               column do |membership|
                 if authorized?(:destroy, membership)
-                  link_to(I18n.t('pageflow.admin.users.delete'), admin_user_membership_path(user, membership), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation'), :rel => 'delete_membership'})
+                  link_to(I18n.t('pageflow.admin.users.delete'),
+                          admin_user_membership_path(user, membership),
+                          method: :delete,
+                          data: {
+                            confirm: I18n.t('active_admin.delete_confirmation'),
+                            rel: 'delete_membership'
+                          })
                 end
               end
             end
-          else
-            div :class => "blank_slate_container" do
-              span :class => "blank_slate" do
-                I18n.t('pageflow.admin.users.empty')
-              end
-            end
           end
 
           span do
-            link_to I18n.t('pageflow.admin.users.add_entry'), new_admin_user_membership_path(user), :class => 'button', :data => {:rel => 'add_membership'}
+            link_to(I18n.t('pageflow.admin.users.add_entry'),
+                    new_admin_user_membership_path(user),
+                    class: 'button',
+                    data: {
+                      rel: 'add_membership'
+                    })
           end
         end
       end

app/assets/stylesheets/pageflow/admin.css.scss

@@ -1,6 +1,7 @@
 @import "pageflow/mixins";
 
 @import "pageflow/admin/columns";
+@import "pageflow/admin/embedded_index_table";
 @import "pageflow/admin/entries";
 @import "pageflow/admin/forms";
 @import "pageflow/admin/features";
@@ -27,4 +28,4 @@
 
 .blank_slate_container {
   margin: 10px 0;
-}
+}

app/assets/stylesheets/pageflow/admin/embedded_index_table.scss

@@ -0,0 +1,14 @@
+.embedded_index_table {
+  .sortable a {
+    background: url(/assets/active_admin/orderable.png) no-repeat 100% 2px;
+    padding-right: 13px;
+  }
+
+  .sorted-asc a {
+    background-position: 100% -29px;
+  }
+
+  .sorted-desc a {
+    background-position: 100% -58px;
+  }
+}

app/assets/stylesheets/pageflow/admin/tabs_view.css.scss

@@ -38,6 +38,7 @@
   }
 
   > .tab_container {
+    @include clearfix;
     @extend .panel_contents;
 
     display: none;

app/views/components/pageflow/admin/embedded_index_table.rb

@@ -18,9 +18,11 @@ def scope(*args)
 
       def table_for_collection(*args, &block)
         if scopes.any?
-          custom_scopes_renderer(scopes, :default_scope => scopes.first.id)
+          custom_scopes_renderer(scopes, default_scope: scopes.first.id)
         end
 
+        record_sort_columns(&block)
+
         if scoped_collection.any?
           build_table(*args, &block)
         else
@@ -31,15 +33,15 @@ def table_for_collection(*args, &block)
       private
 
       def build_table(*args, &block)
-        paginated_collection(scoped_collection.page(params[:page]).per(10),
-                             :download_links => false) do
+        paginated_collection(paginate(apply_sorting(scoped_collection)),
+                             download_links: false) do
           table_for(collection, *args, &block)
         end
       end
 
       def build_blank_slate
-        div :class => "blank_slate_container" do
-          span :class => "blank_slate" do
+        div class: 'blank_slate_container' do
+          span class: 'blank_slate' do
             @blank_slate_text
           end
         end
@@ -50,10 +52,64 @@ def scoped_collection
       end
 
       def current_scope
-        scopes.find do |scope|
+        scopes.detect do |scope|
           scope.id.to_s == params[:scope]
         end || scopes.first
       end
+
+      def paginate(collection)
+        collection.page(params[:page]).per(10)
+      end
+
+      def apply_sorting(collection)
+        if has_sort_columns?
+          collection.reorder(order_clause)
+        else
+          collection
+        end
+      end
+
+      def has_sort_columns?
+        @sort_columns.any?
+      end
+
+      def order_clause
+        if valid_order?
+          params[:order].gsub('_asc', ' ASC').gsub('_desc', ' DESC')
+        else
+          "#{@sort_columns.first} ASC"
+        end
+      end
+
+      def valid_order?
+        params[:order] &&
+          @sort_columns.include?(params[:order].gsub('_asc', '').gsub('_desc', ''))
+      end
+
+      def record_sort_columns(&block)
+        recorder = SortColumnRecorder.new
+        recorder.instance_eval(&block)
+        @sort_columns = recorder.columns
+      end
+
+      class SortColumnRecorder
+        attr_reader :columns
+
+        def initialize
+          @columns = []
+        end
+
+        def column(name = nil, options = {})
+          if options[:sortable].is_a?(String) || options[:sortable].is_a?(Symbol)
+            @columns << options[:sortable].to_s
+          elsif options[:sortable] != false && name
+            @columns << name.to_s
+          end
+        end
+
+        def row_attributes
+        end
+      end
     end
   end
 end

app/views/components/pageflow/admin/entries_tab.rb

@@ -3,17 +3,14 @@ module Admin
     class EntriesTab < ViewComponent
       def build(theming)
         account = theming.account
-        if account.entries.any?
-          table_for account.entries, :i18n => Pageflow::Entry do
-            column :title do |entry|
+        embedded_index_table(account.entries,
+                             blank_slate_text: I18n.t('pageflow.admin.entries.no_members')) do
+          table_for_collection(sortable: true, class: 'entries', i18n: Pageflow::Entry) do
+            column :title, sortable: :title do |entry|
               link_to(entry.title, admin_entry_path(entry))
             end
-          end
-          else
-            div :class => "blank_slate_container" do
-            span :class => "blank_slate" do
-              I18n.t('pageflow.admin.accounts.no_entries')
-            end
+            column :created_at
+            column :updated_at
           end
         end
       end

app/views/components/pageflow/admin/members_tab.rb

@@ -2,31 +2,38 @@ module Pageflow
   module Admin
     class MembersTab < ViewComponent
       def build(entry)
-        if entry.memberships.any?
-          table_for entry.memberships, :class => 'memberships' do
-            column t('activerecord.attributes.user.full_name'), class: 'name' do |membership|
+        embedded_index_table(entry.memberships.includes(:user).references(:users),
+                             blank_slate_text: I18n.t('pageflow.admin.entries.no_members')) do
+          table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
+            column :user, sortable: 'users.last_name', class: 'name' do |membership|
               if authorized? :manage, User
-                link_to membership.user.full_name, admin_user_path(membership.user), :class => 'view_creator'
+                link_to(membership.user.formal_name, admin_user_path(membership.user),
+                        class: 'view_creator')
               else
                 membership.user.full_name
               end
             end
+            column :created_at, sortable: 'pageflow_memberships.created_at'
             column do |membership|
               if authorized?(:destroy, membership)
-                link_to(I18n.t('pageflow.admin.entries.remove'), admin_entry_membership_path(membership.entry, membership), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation'), :rel => 'delete_membership'})
+                link_to(I18n.t('pageflow.admin.entries.remove'),
+                        admin_entry_membership_path(membership.entry, membership),
+                        method: :delete,
+                        data: {
+                          confirm: I18n.t('active_admin.delete_confirmation'),
+                          rel: 'delete_membership'
+                        })
               end
             end
           end
-        else
-          div :class => "blank_slate_container" do
-            span :class => "blank_slate" do
-              I18n.t('pageflow.admin.entries.no_members')
-            end
-          end
         end
+
         if authorized? :manage, Pageflow::Entry
           span do
-            link_to I18n.t('pageflow.admin.users.add'), new_admin_entry_membership_path(entry), :class => 'button', :data => {:rel => 'add_member'}
+            link_to(I18n.t('pageflow.admin.users.add'),
+                    new_admin_entry_membership_path(entry),
+                    class: 'button',
+                    data: {rel: 'add_member'})
           end
         end
       end

app/views/components/pageflow/admin/revisions_tab.rb

@@ -20,7 +20,7 @@ def build(entry)
                 revision.creator.full_name
               end
             end
-            column :published_until  do |revision|
+            column :published_until do |revision|
               if revision.published_until
                 I18n.l(revision.published_until)
               elsif revision.published?

app/views/components/pageflow/admin/users_tab.rb

@@ -3,17 +3,13 @@ module Admin
     class UsersTab < ViewComponent
       def build(theming)
         account = theming.account
-        if account.users.any?
-          table_for account.users, :i18n => User do
-            column :full_name do |user|
-              link_to user.full_name, admin_user_path(user)
-            end
-          end
-        else
-          div :class => "blank_slate_container" do
-            span :class => "blank_slate" do
-              I18n.t('pageflow.admin.accounts.no_members')
+        embedded_index_table(account.users,
+                             blank_slate_text: I18n.t('pageflow.admin.accounts.no_members')) do
+          table_for_collection sortable: true, class: 'users', i18n: User do
+            column :full_name, sortable: :last_name do |user|
+              link_to user.formal_name, admin_user_path(user)
             end
+            column :created_at
           end
         end
       end

config/locales/new/admin_embedded_index_tables.de.yml

@@ -0,0 +1,5 @@
+de:
+  activerecord:
+    attributes:
+      pageflow/membership:
+        created_at: "Mitglied seit"

config/locales/new/admin_embedded_index_tables.en.yml

@@ -0,0 +1,5 @@
+en:
+  activerecord:
+    attributes:
+      pageflow/membership:
+        created_at: "Member since"

spec/features/account_manager/adding_user_membership_to_entry_spec.rb

@@ -11,6 +11,6 @@
     Dom::Admin::EntryPage.first.add_member_link.click
     Dom::Admin::NewMembershipForm.first.submit_with(:user_id => user.id)
 
-    expect(Dom::Admin::Membership.find_by_user_full_name(user.full_name)).to be_present
+    expect(Dom::Admin::Membership.find_by_user_full_name(user.formal_name)).to be_present
   end
 end

spec/features/admin/adding_user_membership_to_entry_spec.rb

@@ -11,6 +11,6 @@
     Dom::Admin::EntryPage.first.add_member_link.click
     Dom::Admin::NewMembershipForm.first.submit_with(:user_id => user.id)
 
-    expect(Dom::Admin::Membership.find_by_user_full_name(user.full_name)).to be_present
+    expect(Dom::Admin::Membership.find_by_user_full_name(user.formal_name)).to be_present
   end
 end

spec/support/helpers/view_component_example_group.rb

@@ -8,16 +8,20 @@ module ViewComponentExampleGroup
     attr_reader :rendered
   end
 
-  def arbre
-    Arbre::Context.new({}, _view)
+  def arbre(&block)
+    Arbre::Context.new({}, _view, &block)
   end
 
   def helper
     _view
   end
 
-  def render(*args)
-    @rendered = arbre.send(described_class.builder_method_name, *args)
+  def render(*args, &block)
+    if block_given?
+      @rendered = arbre(&block).to_s
+    else
+      @rendered = arbre.send(described_class.builder_method_name, *args, &block)
+    end
   end
 end