kadmin 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eff92699a130e18fba90ad39a18ace224525efff
-  data.tar.gz: 3202fc802e89c02a72d4c8b50d676bce010a5e15
+SHA256:
+  metadata.gz: bc941c839a9a08a0ee49c52d60fd634d7a2b09bec14a5a2ded93ed5c2ae12d1e
+  data.tar.gz: 43b77a2767b748968f69b03d949c9bdc93de856914a61568233e5899482b1c7b
 SHA512:
-  metadata.gz: 95b1476d0e4a4cf78376f85a7b131b07cd77a960fe2eb33f2f5c3567f6218aeda3ba10bc5f5180ef6843b7482e9f20f118de1f7dce821765404f7dde8368129e
-  data.tar.gz: 3ca05a7b9230563ac965287cb47873277c881867024d73de77a04275c130803f95ea0d4eb292749df2dd916777cb51fe6dd44e1063a1a5d03dece7e19672f968
+  metadata.gz: c7377a3142c16a114d6ee4d0c4c17eac612db6d2b0805c0ccd7a1be79bb0da58096a0b5435286afd9f5ff40d6746e19942a0e10c84cfc190d68d8e1e9cba880d
+  data.tar.gz: 01bc90cdffb34e6996f82d0878d446f52c1501db32c6f8fa609abe5f2bcb0b70474e78b7ec5154f7e9af3e9ad3cdc3672a39df2843cc5d844e0fc92b0718fb01

data/app/assets/javascripts/kadmin/application.js

@@ -1,3 +1,54 @@
 //= require modular
 //= require jquery_ujs
 //= require_tree .
+
+// sortable tables
+
+$( document ).ready(function() {
+  //commit=Filter&filter_name=test&page_offset=100&page_size=500&sort_asc=true&sort_column=
+  const urlParams = new URLSearchParams(window.location.search);
+  var params = {
+    commit: urlParams.get('commit'),
+  };
+
+  if (urlParams.get('page_size')) {
+    params['page_size'] = urlParams.get('page_size');
+  }
+
+  // adding filter(s)
+  for (let param of urlParams) {
+    if (param[0].startsWith('filter_')) {
+      params[param[0]] = param[1];
+    } 
+  }
+
+  var path = window.location.pathname+'?';
+  
+  $('th[sort-column]').each(function() {
+    var currentColumnName = $(this).attr('sort-column');
+    params['sort_column'] = currentColumnName;
+    
+    params['sort_asc'] = 'true';
+    var sortIndicator = ""; 
+    if (urlParams.get('sort_column') === currentColumnName) {
+      //reverse sort order
+      if (urlParams.get('sort_asc') === 'true') {
+        params['sort_asc'] = 'false';
+        sortIndicator = ' ▴';
+      }
+      else {
+        params['sort_asc'] = 'true';
+        sortIndicator = ' ▾';
+      }
+    } 
+
+    var linkElement = $( "<a/>", {
+      style: "padding:0;",
+      html: $(this).html() + sortIndicator,
+      "class": "btn btn-default",
+      href: path + $.param(params)
+    });
+     
+    $(this).html(linkElement);
+  });
+});

data/app/components/kadmin/finder.rb

@@ -13,6 +13,12 @@ module Kadmin
     # @return [ActiveRecord::Relation] the base relation to find items from
     attr_reader :scope
 
+    # @return [String] name of column that is used in ORDER_BY clause
+    attr_reader :sort_column
+
+    # @return [bool] true if sort order is ASC, false if DESC
+    attr_reader :sort_asc
+
     # @param [ActiveRecord::Relation] scope base relation to page/filter on
     def initialize(scope)
       @scope = scope
@@ -20,6 +26,7 @@ module Kadmin
       @filters = {}
       @results = nil
       @filtering = false
+      @sort_asc = true
     end
 
     # @param [String] name the filter name (should be unique)
@@ -35,6 +42,15 @@ module Kadmin
       return self
     end
 
+    # sets sort order for scope, any existing order is overwritten
+    # @param [String] name of column to sort
+    # @param [bool] true for ASC sort, false otherwise
+    def order(sort_column, sort_asc)
+      @sort_column = sort_column
+      @sort_asc = sort_asc
+      @scope = @scope.reorder("#{sort_column} #{sort_asc ? 'ASC' : 'DESC'}")
+    end
+
     def filtering?
       return @filtering
     end

data/app/controllers/kadmin/concerns/resources.rb

@@ -14,13 +14,18 @@ module Kadmin
       def resources_finder(scope, filters = [])
         filters = Array.wrap(filters)
         filter_params = filters.map { |hash| hash[:param] }
-        permitted = params.permit(:page_size, :page_offset, :format, *filter_params)
+        permitted = params.permit(:page_size, :page_offset, :format, *filter_params, :sort_column, :sort_asc)
 
         page_size = permitted.fetch(:page_size, DEFAULT_FINDER_PAGE_SIZE).to_i
         page_offset = permitted.fetch(:page_offset, 0).to_i
 
         finder = Finder.new(scope)
         finder.paginate(size: page_size, offset: page_offset)
+
+        if permitted[:sort_column].present?
+          finder.order(permitted[:sort_column], ActiveRecord::Type::Boolean.new.deserialize(permitted.fetch(:sort_asc, true)))
+        end
+
         filters.each do |hash|
           value = permitted[hash[:param]]
           filter = if hash[:filter].present?
@@ -43,13 +48,16 @@ module Kadmin
       # allowing you to reference joined tables as well.
       def resources_filter_matches(columns)
         return lambda do |v|
-          pattern = "%#{v}%"
           conditions = Array.wrap(columns).reduce(nil) do |acc, column|
             column = arel_table[column] unless column.is_a?(Arel::Attributes::Attribute)
-            matcher = column.matches(pattern)
+            matcher = if type_for_attribute(column.name).type == :integer
+              column.eq(v)
+            else
+              pattern = "%#{v}%"
+              column.matches(pattern)
+            end
             acc.nil? ? matcher : acc.or(matcher)
           end
-
           where(conditions)
         end
       end

data/app/views/kadmin/components/finder/_form.html.erb

@@ -1,4 +1,6 @@
 <%= form_tag(request.fullpath, method: 'get', class: 'form-inline pull-right') do %>
+  <%= hidden_field_tag 'sort_column', finder&.sort_column %>
+  <%= hidden_field_tag 'sort_asc', finder&.sort_asc %>
   <div class='form-group'>
     <% unless local_assigns.fetch(:hide_create_button, false) %>
       <%= link_to(t('kadmin.components.finder.create'), url_for(action: :new), class: 'btn btn-primary', style: 'margin-right: 20px') %>

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '1.0.9'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Collection of utility, configuration, etc., for admin areas