trk_datatables 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ccb77ab8bb5b29b22c346044bdb06171bed27a50721873cd1d5ec619c8ef1f1
-  data.tar.gz: 0d747920ac2dd280c0274dd46af82c59afd7c55151910e598d97d64ac2447a6d
+  metadata.gz: 2dc7cec68c0ec6e71ac428ac6a966f3db8ddc102d63c226dc52f619f10a5d41d
+  data.tar.gz: 8ba50a886703bced435b29b696e35915215bfe018b6a5bd2a77c2b48568b0e4e
 SHA512:
-  metadata.gz: a2ce8344fdb8912d0116b5c21695b62cc83292f91a2987917ac78b3ff30c45793be8634b46354d9bb50e5181fa30469d4dcfddf4ed8de64deaba938eaaac29d4
-  data.tar.gz: a4e65f172f9916df7b79fcfc9d084975564623f915dacbfef017521dd8c7a66a5b54a885fab14362b049a6f43b9f30caa1f7e2e4d13e4b16aaed0e145a40dc86
+  metadata.gz: e1931363aa5fceb1393d961203b7c67d27e5dbe7ad8f4c45875e2c919ec1547257f0309ce68208f1cbfe58ad494168223c8958727cc5f875d15d702522aaf113
+  data.tar.gz: e15ac3cc6eab551c55010e10fa9f39d465a35266ed07d2e9817f39d72c978e20648e8fef43d8a23467cb515d7ab83e2b33908b46e9d8813c65a3c6659923da44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trk_datatables (0.2.2)
+    trk_datatables (0.2.3)
       activesupport
 
 GEM

data/README.md

@@ -62,9 +62,10 @@ import 'bootstrap'
 
 // our stuff
 import 'stylesheet/application'
-import 'turbolinks.load'
 
-# app/javascript/turbolinks.load.js
+// attach jQuery so it is available for javascript included with asset pipeline
+window.$ = window.jQuery = jQuery;
+
 const trkDatatables = require('trk_datatables')
 
 document.addEventListener('turbolinks:load', () => {
@@ -88,7 +89,11 @@ environment.plugins.append('Provide', new webpack.ProvidePlugin({
 module.exports = environment
 
 # app/views/layouts/application.html.erb
+    <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%# we need stylesheet for production server, locally it could work without stylesheet_pack_tag even in production mode %>
     <%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%# we use jQuery from wepbacker so asset pipeline should be included later %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
 ```
 
 Than add a gem and sample PostsDatatable
@@ -408,13 +413,17 @@ generated based on other columns):
   posts_count FROM "users" LEFT OUTER JOIN "posts" ON "posts"."user_id" =
   "users"."id" GROUP BY users.id`
 
-Since in SQL you can not use aggregate functions in WHERE (we can repeat
+Since in SQL you can not use aggregate functions in WHERE (we should repeat
 calculation and subqueries), currently TrkDatatables does not support using
 aggregate functions since it requires implementation of `HAVING` (unless you
-disable search and order `'users.posts_count': { search: false, order: false }`).
+disable search and order for those fields with aggregate functions
+`'users.posts_count': { search: false, order: false }`).
 You can use concatenation aggregate function: in postgres `STRING_AGG`, in mysql
-`GROUP_CONCAT` since we search in real columns and show concatenation (we do not
-search concatenation like we need to search new field `post_count`).
+`GROUP_CONCAT` so in this case we search on real columns. For example let's we
+have `Post.select(%(posts.*, GROUP_CONCAT(comments.body) AS
+comments_body)).left_outer_joins(:comments) .group('posts.id')` and that we have
+a row `postName, comment1, comment2` than when we searh for `comment2` we will
+get a row `postName, comment2`.
 
 Simple calculations and subqueries works fine, just you have to use public
 method to define calculation (that method is also used in filtering). Name of
@@ -424,8 +433,12 @@ name you should use one of:
 `:date_calculated_in_db`, `:datetime_calculated_in_db` or
 `:boolean_calculated_in_db`.
 
-Before we give an example there is an issue in calling `all.count` if you are
-using subquery so we need to patch ActiveRecord
+There is an issue in calling `all.count` when you are using subquery, or
+selecting two columns `User.select(:id, :email).count`, or using star in string
+`User.select('users.*').count` (although `User.select(Arel.star).count` works),
+using AS `User.select('users.id AS i').count` (here arel does not help, still
+raise exception `User.select(User.arel_table[:email].as('imejl')).count`).
+We need to patch ActiveRecord to define `returns_count_sum`:
 ```
 # config/initializers/active_record_group_count.rb
 # When you are using subquery or joins/group_by than all.count does not work
@@ -774,8 +787,8 @@ release a new version, update the version number and then publish with
 
 ```
 vi lib/trk_datatables/version.rb
-git commit -am'...'
 bundle
+git commit -am'...'
 bundle exec rake release
 ```
 

data/lib/trk_datatables/active_record.rb

@@ -5,7 +5,7 @@ module TrkDatatables
     def filter_by_search_all(filtered)
       conditions = @dt_params.search_all.split(' ').map do |search_string|
         @column_key_options.searchable_and_global_search.map do |column_key_option|
-          filter_column_as_string column_key_option, search_string
+          _filter_column_as_string column_key_option, search_string
         end.reduce(:or) # any searchable column is 'or'-ed
       end.reduce(:and) # 'and' for each search_string
 
@@ -40,11 +40,11 @@ module TrkDatatables
         from, to = search_value.split BETWEEN_SEPARATOR
         filter_column_as_between(column_key_option, from, to)
       else
-        filter_column_as_string(column_key_option, search_value)
+        _filter_column_as_string(column_key_option, search_value)
       end
     end
 
-    def filter_column_as_string(column_key_option, search_value)
+    def _filter_column_as_string(column_key_option, search_value)
       search_value.split(' ').map do |search_string|
         casted_column = ::Arel::Nodes::NamedFunction.new(
           'CAST',

data/lib/trk_datatables/neo4j.rb

@@ -1,7 +1,14 @@
 module TrkDatatables
   class Neo4j < Base
     def filter_by_search_all(filtered)
-      filtered
+      return filtered unless @dt_params.search_all.present?
+
+      # https://neo4jrb.readthedocs.io/en/stable/QueryClauseMethods.html?highlight=where#where
+      sql = @column_key_options.searchable_and_global_search.map do |column_key_option|
+        "#{column_key_option[:column_key]} =~ ?"
+      end.join(' or ')
+
+      filtered.where sql, ".*#{@dt_params.search_all}.*"
     end
 
     def filter_by_columns(all)
@@ -15,7 +22,13 @@ module TrkDatatables
     end
 
     def order_items(filtered)
-      filtered
+      order_by = dt_orders_or_default_index_and_direction.each_with_object([]) do |(index, direction), queries|
+        column_key_option = @column_key_options[index]
+        next if column_key_option[:column_options][ColumnKeyOptions::ORDER_OPTION] == false
+
+        queries << "#{column_key_option[:column_key]} #{direction}"
+      end
+      filtered.order(order_by.join(', '))
     end
   end
 end

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dusan Orlovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport