order_by fixes including enable_order_by and coerce_order_by

2 files changed, 51 insertions, 20 deletions

diff --git a/lib/Reaction/UI/ViewPort/Collection/Role/Order.pm b/lib/Reaction/UI/ViewPort/Collection/Role/Order.pm
index bb19f05..648b8cd 100644
--- a/lib/Reaction/UI/ViewPort/Collection/Role/Order.pm
+++ b/lib/Reaction/UI/ViewPort/Collection/Role/Order.pm
@@ -4,13 +4,49 @@ use Reaction::Role;
 
 use namespace::clean -except => [ qw(meta) ];
 
+has enable_order_by => (is => 'rw', isa => 'ArrayRef');
+has coerce_order_by => (isa => 'HashRef', is => 'rw');
+
+has order_by => (
+  isa => 'Str',
+  is => 'rw',
+  trigger_adopt('order_by'),
+  clearer => 'clear_order_by'
+);
+
+has order_by_desc => (
+  isa => 'Int',
+  is => 'rw',
+  trigger_adopt('order_by'),
+  lazy_build => 1
+);
+
+sub _build_order_by_desc { 0 }
 
-has order_by      => (isa => 'Str', is => 'rw', trigger_adopt('order_by'), clearer => 'clear_order_by');
-has order_by_desc => (isa => 'Int', is => 'rw', trigger_adopt('order_by'), lazy_build => 1);
-sub _build_order_by_desc { 0 };
 sub adopt_order_by {
   shift->clear_current_collection;
-};
+}
+
+sub can_order_by {
+  my ($self,$order_by) = @_;
+  return 1 unless $self->has_enable_order_by;
+  return scalar grep { $order_by eq $_ } @{ $self->enable_order_by };
+}
+
+sub _order_search_attrs {
+  my $self = shift;
+  my %attrs;
+  if ($self->has_order_by) {
+    my $order_by = $self->order_by;
+    if( $self->has_coerce_order_by ){
+      $order_by = $self->coerce_order_by->{$order_by}
+        if exists $self->coerce_order_by->{$order_by};
+    }
+    my $key = $self->order_by_desc ? '-desc' : '-asc';
+    $attrs{order_by} = { $key => $order_by };
+  }
+  return \%attrs;
+}
 
 after clear_order_by => sub {
   my ($self) = @_;
@@ -22,15 +58,7 @@ around _build_current_collection => sub {
   my $orig = shift;
   my ($self) = @_;
   my $collection = $orig->(@_);
-  my %attrs;
-
-  #XXX DBICism that needs to be fixed
-  if ($self->has_order_by) {
-    $attrs{order_by} = $self->order_by;
-    $attrs{order_by} .= ' DESC' if ($self->order_by_desc);
-  }
-
-  return $collection->where(undef, \%attrs);
+  return $collection->where(undef, $self->_order_search_attrs);
 };
 
 around accept_events => sub { ('order_by', 'order_by_desc', shift->(@_)); };
diff --git a/lib/Reaction/UI/Widget/ListView.pm b/lib/Reaction/UI/Widget/ListView.pm
index 1db21ba..2fa13f8 100644
--- a/lib/Reaction/UI/Widget/ListView.pm
+++ b/lib/Reaction/UI/Widget/ListView.pm
@@ -24,13 +24,16 @@ implements fragment action {
   render 'viewport';
 };
 
-around fragment header_cell {
-  arg order_uri => event_uri {
-    order_by => $_,
-    order_by_desc => ((($_{viewport}->order_by||'') ne $_
-                      || $_{viewport}->order_by_desc) ? 0 : 1)
-  };
-  call_next;
+implements fragment maybe_sortable_header_cell {
+  my $vp = $_{viewport};
+  if( $_{viewport}->can_order_by($_) ){
+    my $current = $vp->order_by;
+    my $desc = ( $vp->order_by_desc || ( $current || '') ne $_) ? 0 : 1;
+    arg order_uri => event_uri { order_by => $_, order_by_desc => $desc };
+    render 'sortable_header_cell';
+  } else {
+    render 'header_cell_contents';
+  }
 };
 
 implements fragment page_list {