trk_datatables 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f18203116549f3dedce931bea8ea8c01d61dd550396899b4cfcb50fc52f779
-  data.tar.gz: 4f85a893e6b8f281caf64472c61ae7bc28635a45c73dfb6fb9b5fa4f44310b2d
+  metadata.gz: 0f8339f6cc77f6372dff2350851b738f1c02bc157496a23fe371795df5c7e379
+  data.tar.gz: a6f7b37a8fb9c7b5a21f3fda2edd5a3a01f4f34a3c209ceb324ea7cdd8c15be2
 SHA512:
-  metadata.gz: 3e1cce7b7e3f561ba68bba76b7a078f9d7d4980a2805976cff1100d4863f20d25d667c4469d08904cf70ee64ef9a49e199385564c94a7a2fd9df44d443014c82
-  data.tar.gz: d1c6ddeb4bc762b7f4af30848466b9478386bfcf9c45cede0f3008cba5772c9ca04d3cd7e2cd2c19fb006e9903078575d51897a174b9cba852045153277ebfc6
+  metadata.gz: a6c9d856519bf89090cdb4fb5b6856b3eb59568f816ffeed838425e23f9bb75a57c94be9afb0155b0064a2c4fa69568d426c949cf5847fb5bdc35577c148e824
+  data.tar.gz: 88432304b3a19c6ac6cb7a683d6ed01919494f61f9b45050b6c3ee7102ef3f610a15852a47f8ce1282fca2d1c24d4192b895e6c66f2b1c92ceb9b4abd706c03f

data/Gemfile.lock

@@ -1,39 +1,45 @@
 PATH
   remote: .
   specs:
-    trk_datatables (0.2.12)
+    trk_datatables (0.2.14)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activerecord (6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
-    database_cleaner (1.7.0)
-    i18n (1.6.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    byebug (11.1.3)
+    concurrent-ruby (1.2.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.12.0)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     minitest-color (0.0.2)
       minitest (~> 5)
-    pg (1.1.4)
+    pg (1.4.5)
     rake (10.5.0)
-    sqlite3 (1.4.1)
-    thread_safe (0.3.6)
-    timecop (0.9.4)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.1.10)
+    sqlite3 (1.6.0)
+      mini_portile2 (~> 2.8.0)
+    timecop (0.9.6)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
@@ -52,4 +58,4 @@ DEPENDENCIES
   trk_datatables!
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/README.md

@@ -96,7 +96,7 @@ module.exports = environment
     <%= 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 %>
+    <%# we use jQuery from wepbacker so asset pipeline should be included later if you use asset pipeline %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
 ```
 
@@ -106,7 +106,7 @@ Than add a gem and sample PostsDatatable
 # Gemfile
 gem 'trk_datatables'
 
-# in console
+# in console you can use rails generator to generate app/datatables/xxx_datatable.rb
 bundle
 rails g trk_datatables post
 vi app/datatables/posts_datatable.rb
@@ -153,7 +153,7 @@ class PostsDatatable < TrkDatatables::ActiveRecord
     Post.left_joins(:user)
   end
 
-  def rows(filtered)
+  def rows(filtered) # rubocop:disable Metrics/MethodLength
     filtered.map do |post|
       [
         @view.link_to(post.title, post),
@@ -217,6 +217,9 @@ method.
 class PostsDatatable < TrkDatatables::ActiveRecord
   def global_search_columns
     # in addition to columns those fields will be used to match global search
+    # instead Post.all you should use Post.joins(:user) or
+    # Post.left_joins(:user) if user is optional. For has_many relations you
+    # need to join them since you will get multiple table rows
     %w[posts.body users.name]
   end
 end
@@ -256,7 +259,9 @@ For specific columns you can use following keys
 * `order: false` disable ordering for this column
 * `select_options: Post.statuses` generate select box instead of text input
 * `predefined_ranges: {}` for datetime fiels add ranges to pick up from
-* `hide: true` hide column with display none, for example `{ hide: @view.params[:user_id].present? }`
+* `hide: true` hide column with display none, for example `{ hide:
+  @view.params[:user_id].present? }`, note that you should send that column data
+  anyway, just it will not be visible
 * `class_name: 'Admin::User'` use different class name than
   `table_name.classify` (in this case of `admin_users` will be `AdminUser`)
 * `column_type_in_db` one of the: `:string`, `:integer`, `:date`, `:datetime`,
@@ -391,6 +396,15 @@ nor in Ruby code.
   end
 ```
 
+You can access filtered items for example
+```
+  def totals
+    filter_by_columns all_items
+    filter_by_search_all filter_by_columns all_items # this is actually filtered_items
+    order_and_paginate_items filter_by_search_all filter_by_columns all_items # this is ordered_paginated_filtered_items
+  end
+```
+
 ### Values calculated in database
 
 There are three types of calculated values (new custom fields that are
@@ -402,22 +416,64 @@ generated based on other columns):
   posts_count FROM "users" LEFT OUTER JOIN "posts" ON "posts"."user_id" =
   "users"."id" GROUP BY users.id`
 
+Simple calculations and subqueries works fine, you can search and order by them.
+Note that when you use join with other table, than you should group by all
+columns that you have used as columns, for example
+```
+# app/datatables/member_profiles_datatable.rb
+  def columns
+    {
+      'member_profiles.full_name': {},
+      'users.email': {},
+      'users.current_sign_in_at': { },
+    }
+  end
+  def all_items
+    MemberProfile
+      .joins(:user)
+      .group("member_profiles.id")
+      .group("users.email")
+      .group("users.current_sign_in_at")
+   end
+```
+otherwise the error like
+`PG::GroupingError: ERROR:  column "users.current_sign_in_at" must appear in the
+GROUP BY clause or be used in an aggregate function`
+You should test by searching and selecting each column as sortable column.
+```
+# test/controllers/admin/member_profiles_controller_test.rb
+  test "#search when order by is by each defined column" do
+    columns = MemberProfilesDatatable.new(OpenStruct.new(params: {})).columns
+
+    columns.each_with_index do |_column_key_option, index|
+      post search_superadmin_member_profiles_path(search: { value: "foo" }, order: { "0": { column: index, dir: "asc" } })
+      assert_response :success
+    end
+  end
+```
+
 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 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` 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`.
+aggregate functions since it requires implementation of `HAVING` so when you use
+aggregate functions you need to 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(comments.body, ' ') comments_body`, in mysql `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
-method is the same as column name `title_and_body` or `comments_count`. For table
-name you should use one of:
+method is the same as column name `title_and_body` or `comments_count`. For
+table name you should use one of:
 `:string_calculated_in_db`, `:integer_calculated_in_db`,
 `:date_calculated_in_db`, `:datetime_calculated_in_db` or
 `:boolean_calculated_in_db`.
@@ -501,8 +557,8 @@ class MostLikedPostsDatatable < TrkDatatables::ActiveRecord
   # you have { search: false }
   def comments_count
     <<~SQL
-      (SELECT COUNT(*) FROM comments
-      WHERE comments.post_id = posts.id)
+      SELECT COUNT(*) FROM comments
+      WHERE comments.post_id = posts.id
     SQL
   end
 
@@ -525,10 +581,138 @@ class MostLikedPostsDatatable < TrkDatatables::ActiveRecord
     end
   end
 
+  # You can use this in config/initializers/trk_datatables.rb
+  # class TrkDatatables::ActiveRecord; def default_order;
+  # or put in specific datatable class like here
   def default_order
-    [[2, :desc]]
+    [[columns.size - 1, :desc]]
+  end
+end
+```
+
+### Table less models
+
+You can use raw sql to fetch the data and use it as a model.
+Here is an example when there is no relations to other models
+```
+# app/models/table_less.rb
+class TableLess < ApplicationRecord
+  self.abstract_class = true
+
+  def self.load_schema!
+    @columns_hash ||= {}
+
+    # From active_record/attributes.rb
+    attributes_to_define_after_schema_loads.each do |name, (type, options)|
+      type = ActiveRecord::Type.lookup(type, **options.except(:default)) if type.is_a?(Symbol)
+
+      define_attribute(name, type, **options.slice(:default))
+
+      # Improve Model#inspect output
+      @columns_hash[name.to_s] = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, options[:default])
+    end
+  end
+end
+```
+
+```
+# app/models/translation.rb
+class Translation < TableLess
+  self.table_name = :translations
+
+  attribute :translateable_type, :string, default: nil
+  attribute :translateable_id, :string, default: nil
+  attribute :column_name, :string, default: nil
+  attribute :column_value, :string, default: nil
+
+  belongs_to :translateable, polymorphic: true
+end
+```
+
+```
+# app/datatables/translations_datatable.rb
+# rubocop:disable Layout/LineLength
+class TranslationsDatatable < BaseDatatable
+  def columns
+    {
+      'translations.translateable_id': {},
+      'translations.translateable_type': {hide: true},
+      'translations.column_name': {},
+      'translations.column_value': {},
+      '': {},
+    }
+  end
+
+  def all_items
+    sql = <<~SQL.squish
+      (
+        (SELECT 'Activity' AS translateable_type, id AS translateable_id, 'name' AS column_name, name AS column_value FROM activities)
+        UNION
+        (SELECT 'Activity' AS translateable_type, id AS translateable_id, 'description' AS column_name, description AS column_value FROM activities)
+      ) as translations
+    SQL
+    Translation.from([Arel.sql(sql)])
+  end
+
+  def rows(filtered)
+    filtered.map do |translation|
+      edit_link = @view.button_tag_open_modal(
+        @view.edit_translation_path(translation.translateable_id, translateable_type: translation.translateable_type, column_name: translation.column_name), title: @view.t_crud('edit', Translation)
+      )
+      [
+        @view.link_to(translation.translateable, translation.translateable),
+        translation.translateable_type,
+        translation.column_name,
+        translation.column_value,
+        edit_link,
+      ]
+    end
   end
 end
+# rubocop:enable Layout/LineLength
+```
+
+For column title we use `table_class.human_attribute_name column_name`. When
+calculated_ columns is used than it can not find translation so better is to:
+```
+      'string_calculated_in_db.column_value_translated': {search: false, title: @view.t('activerecord.attributes.translation.column_value_translated')},
+```
+
+Note that when you have two associations to the same class, for example
+`Interest` has `:from_member_profile` and `:to_member_profile` you can use
+search for the first column, but for the second you should use
+`string_calculated_in_db` and inside method use table name that is generated in
+joins like `to_member_profiles_interests` (trk_datatable can not determine which
+class is this, in order to find its column)
+```
+# app/models/interest.rb
+class Interest < ApplicationRecord
+  belongs_to :from_member_profile, class_name: 'MemberProfile'
+  belongs_to :to_member_profile, class_name: 'MemberProfile'
+end
+
+# app/datatables/interests_datatable.rb
+class InterestsDatatable < TrkDatatables::ActiveRecord
+  def columns
+    {
+      'member_profiles.full_name': {},
+      'string_calculated_in_db.to_member_profiles_interests_full_name': {},
+      # if we want to search by this column than we can not use
+      # "to_member_profiles_interests.full_name": {},
+      # since we can not find that class and its arel_table
+   }
+  end
+
+  def to_member_profiles_interests_full_name
+    "to_member_profiles_interests.full_name"
+  end
+
+  def all_items
+    Interest
+      .joins(:from_member_profile) # this will be "member_profiles" table in sql
+      .joins(:to_member_profile) # this will be "to_member_profiles_interests"
+   end
+end
 ```
 
 ### Default order and page length
@@ -540,10 +724,11 @@ save preferences) and this default values will be used
 ```
 # app/datatables/posts_datatable.rb
 class PostsDatatable
-  # when we show some invoice_no on first column, and that is reset every year
-  # on first april, thatn it is better is to use date column ordering
+  # when we show invoice_no on first column, and that is reset every year
+  # on first april, than it is better is to use date column ordering
+  # column starts from zero 0, 1, 2, 3
   def default_order
-    [[3, :desc]]
+    [[columns.size - 1, :desc]]
   end
 
   def default_page_length
@@ -575,7 +760,18 @@ Default [DOM](https://datatables.net/reference/option/dom) is
 To set parameters that you can use for links to set column search value, use
 this `PostsDatatable.param_set 'users.email', 'my@email.com'`. For between
 search you can use range `Time.zone.today..(Time.zone.today + 1.year)` and for
-in multiple values use array `[Post.statuses[:draft]]`:
+in multiple values use array `[Post.statuses[:draft]]`. Note that in Rails
+`Time.zone.now.to_s` usually returns seconds ('23:59:59') but if you change
+default format like in `config/initializers/time_formats.rb` with
+`Time::DATE_FORMATS[:default] = '%d-%b-%Y %I:%M %p'` than range
+`Time.zone.now.at_beginning_of_day..Time.zone.now.at_end_of_day` will not
+include those at end of day since param will not include seconds ('23:59') so in
+this case you can use range for strings
+`Time.zone.now.at_beginning_of_day.to_s..Time.zone.now.at_end_of_day.to_s(:with_seconds)`
+and config/initializers/time_formats.rb `Time::DATE_FORMATS[:with_seconds] = '%d-%b-%Y %I:%M:%S %p'`
+
+(or use date `Time.zone.today..Time.zone.today` but that will not populate
+datetime fields in dateRangePicker correctly)
 
 ```
 <%= link_to 'Active posts for my@email.com', \
@@ -697,7 +893,7 @@ class PostsDatatable
 end
 ```
 
-It will store order and page lenght inside `dt_preferences` on
+It will store order and page length inside `dt_preferences` on
 `user.preferences`.
 
 ### Additional data to json response
@@ -793,7 +989,7 @@ link_to 'Active', search_posts_path(PostsDatatable.param_set('posts.status',
 Here is example how you can test
 
 ```
-# test/datatables/happ
+# test/datatables/posts_datatable_test.rb
 require 'test_helper'
 
 class PostsDatatableTest < ActiveSupport::TestCase
@@ -812,6 +1008,27 @@ class PostsDatatableTest < ActiveSupport::TestCase
 end
 ```
 
+You can also write controller test
+```
+# test/controllers/posts_controller_test.rb
+require 'test_helper'
+
+class PostsControllerTest < ActiveSupport::TestCase
+  test "#index" do
+    get posts_path
+    assert_response :success
+  end
+
+  test "#search" do
+    post = posts(:post)
+    post search_posts_path(search: { value: post.title })
+    assert_response :success
+    response_json = JSON.parse response.body
+    assert_equal 1, response_json["data"].size
+  end
+end
+```
+
 ## Exceptions
 
 To catch errors from TrkDatables you can
@@ -927,6 +1144,13 @@ rm -rf .yardoc/
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/trkin/trk_datatables. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+## TODOs
+
+Column filtering with dropdowns https://datatables.net/extensions/searchpanes/examples/advanced/columnFilter.html
+Adding graphs https://datatables.net/forums/discussion/comment/123621/#Comment_123621
+https://datatables.net/examples/api/highcharts.html
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/trk_datatables/active_record.rb

@@ -121,7 +121,11 @@ module TrkDatatables
         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}"
+        queries << if column_key_option[:table_class] < TrkDatatables::CalculatedInDb
+                     "#{send(column_key_option[:column_key])} #{direction}"
+                   else
+                     "#{column_key_option[:column_key]} #{direction}"
+                   end
       end
       filtered.order(Arel.sql(order_by.join(', ')))
     end

data/lib/trk_datatables/base.rb

@@ -241,10 +241,7 @@ module TrkDatatables
         'Last Month':
           Time.zone.today.prev_month.beginning_of_month.beginning_of_day...Time.zone.today.prev_month.end_of_month.end_of_day,
         'This Year': Time.zone.today.beginning_of_year.beginning_of_day...Time.zone.today.end_of_day,
-      }.transform_values do |range|
-        # datepicker expects format 2020-11-29 11:59:59
-        range.first.strftime('%F %T')..range.last.strftime('%F %T')
-      end
+      }
     end
   end
 end

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = '0.2.12'.freeze
+  VERSION = '0.2.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Dusan Orlovic
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,7 +205,7 @@ metadata:
   source_code_uri: https://github.com/trkin/trk_datatables
   changelog_uri: https://github.com/trkin/trk_datatables/blob/master/CHANGELOG.md
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Gem that simplify using datatables with Ruby on Rails and Sinatra.
 test_files: []