kaui 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ef571db6b75b46644076075d33cb15e11a3dd8
-  data.tar.gz: 99e00ae3e2183b20bf86572c406fffc8eafa7430
+  metadata.gz: 640b0cf3c6014bcee7e66e2d8c41b65f0a12daa5
+  data.tar.gz: bb749feea622246695e1b323c7b4b6fb5a66f09d
 SHA512:
-  metadata.gz: 32268720a72836539a2c3bf0ea790c0296518d655827201c18811bd65f27efc4bfc1b4fd6623b0e866cd7296356d7195a99530dadb0e22a1d4bfe9e59b4763dd
-  data.tar.gz: fa8f0bddaf0be5b1ed46b279615abd31266ebf6fe6d9573ce3c1f3331918c2d2ca7e6dbdf927ad13875ecf7fc0d54f54031e46eb16c180c619c563ff974e1c76
+  metadata.gz: bd63327cffa882058a5344d1e2df1f6d69f80fe237031436a6d2a08bd3d4c584e6599076d72ed78d775bd4b520cfd92ce7b625340dd53daaa6e789f283b62cab
+  data.tar.gz: ef9411ec7d175aaf73287eb40413d532452748272aba16a74367a61302c7010495491cce0e89e080ed001fae9e30d4c8ccba18a1534e25025c399ea8dd32272d

data/Gemfile

@@ -2,5 +2,5 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'killbill-client', :path => '../killbill-client-ruby'
+#gem 'killbill-client', :path => '../killbill-client-ruby'
 #gem 'killbill-client', :git => 'https://github.com/killbill/killbill-client-ruby.git'

data/app/controllers/kaui/accounts_controller.rb

@@ -13,15 +13,11 @@ class Kaui::AccountsController < Kaui::EngineController
       end
     end
 
-    @limit = 50
-    if @search_query.blank?
-      max_nb_records = Kaui::Account.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records
-      @offset = [0, max_nb_records - @limit].max
-      @ordering = 'desc'
-    else
-      @offset = 0
-      @ordering = 'asc'
-    end
+    @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
+    @offset = params[:offset] || 0
+    @limit = params[:limit] || 50
+
+    @max_nb_records = @search_query.blank? ? Kaui::Account.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records : 0
   end
 
   def pagination

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -17,6 +17,7 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
     existing_user = Kaui::AllowedUser.find_by_kb_username(@allowed_user.kb_username)
     if existing_user
       flash[:error] = "User with name #{@allowed_user.kb_username} already exists!"
+      @roles = roles_for_user(existing_user)
       render :new and return
     else
       roles = params[:roles].split(',')
@@ -31,7 +32,7 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
     @allowed_user = Kaui::AllowedUser.find(params.require(:id))
     raise ActiveRecord::RecordNotFound.new("Could not find user #{@allowed_user.id}") unless (current_user.root? || @allowed_user.kb_username == current_user.kb_username)
 
-    @roles = Kaui::UserRole.find_roles_by_username(@allowed_user.kb_username, options_for_klient).map(&:presence).compact || []
+    @roles = roles_for_user(@allowed_user)
 
     tenants_for_current_user = retrieve_tenants_for_current_user
     @tenants = Kaui::Tenant.all.select { |tenant| tenants_for_current_user.include?(tenant.kb_tenant_id) }
@@ -40,7 +41,7 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
   def edit
     @allowed_user = Kaui::AllowedUser.find(params.require(:id))
 
-    @roles = Kaui::UserRole.find_roles_by_username(@allowed_user.kb_username, options_for_klient).map(&:presence).compact || []
+    @roles = roles_for_user(@allowed_user)
   end
 
   def update
@@ -101,4 +102,8 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
     allowed_user.require(:kb_username)
     allowed_user
   end
+
+  def roles_for_user(allowed_user)
+    Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options_for_klient).map(&:presence).compact || []
+  end
 end

data/app/controllers/kaui/custom_fields_controller.rb

@@ -1,6 +1,13 @@
 class Kaui::CustomFieldsController < Kaui::EngineController
 
   def index
+    @search_query = params[:q]
+
+    @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
+    @offset = params[:offset] || 0
+    @limit = params[:limit] || 50
+
+    @max_nb_records = @search_query.blank? ? Kaui::CustomField.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records : 0
   end
 
   def pagination

data/app/controllers/kaui/engine_controller_util.rb

@@ -1,5 +1,8 @@
 module Kaui::EngineControllerUtil
 
+  # See DefaultPaginationSqlDaoHelper.java
+  SIMPLE_PAGINATION_THRESHOLD = 20000
+
   protected
 
   def get_layout
@@ -11,8 +14,7 @@ module Kaui::EngineControllerUtil
     offset = (params[:start] || 0).to_i
     limit = (params[:length] || 10).to_i
 
-    limit = 2147483647 if limit == -1
-
+    limit = -limit if params[:ordering] == 'desc'
     begin
       pages = searcher.call(search_key, offset, limit)
     rescue => e
@@ -21,8 +23,9 @@ module Kaui::EngineControllerUtil
 
     json = {
         :draw => (params[:draw] || 0).to_i,
-        :recordsTotal => pages.nil? ? 0 : pages.pagination_max_nb_records,
-        :recordsFiltered => pages.nil? ? 0 : pages.pagination_total_nb_records,
+        # We need to fill-in a number to make DataTables happy
+        :recordsTotal => pages.nil? ? 0 : (pages.pagination_max_nb_records || SIMPLE_PAGINATION_THRESHOLD),
+        :recordsFiltered => pages.nil? ? 0 : (pages.pagination_total_nb_records || SIMPLE_PAGINATION_THRESHOLD),
         :data => []
     }
     json[:error] = error unless error.nil?
@@ -39,7 +42,7 @@ module Kaui::EngineControllerUtil
       sort = a <=> b
       sort.nil? ? -1 : sort
     end unless search_key.nil? # Keep DB ordering when listing all entries
-    pages.reverse! if ordering_dir == 'desc'
+    pages.reverse! if ordering_dir == 'desc' && limit >= 0 || ordering_dir == 'asc' && limit < 0
 
     pages.each { |page| json[:data] << formatter.call(page) }
 

data/app/controllers/kaui/invoices_controller.rb

@@ -3,15 +3,11 @@ class Kaui::InvoicesController < Kaui::EngineController
   def index
     @search_query = params[:account_id]
 
-    @limit = 50
-    if @search_query.blank?
-      max_nb_records = Kaui::Invoice.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records
-      @offset = [0, max_nb_records - @limit].max
-      @ordering = 'desc'
-    else
-      @offset = 0
-      @ordering = 'asc'
-    end
+    @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
+    @offset = params[:offset] || 0
+    @limit = params[:limit] || 50
+
+    @max_nb_records = @search_query.blank? ? Kaui::Invoice.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records : 0
   end
 
   def pagination

data/app/controllers/kaui/payments_controller.rb

@@ -3,15 +3,11 @@ class Kaui::PaymentsController < Kaui::EngineController
   def index
     @search_query = params[:q] || params[:account_id]
 
-    @limit = 50
-    if @search_query.blank?
-      max_nb_records = Kaui::Payment.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records
-      @offset = [0, max_nb_records - @limit].max
-      @ordering = 'desc'
-    else
-      @offset = 0
-      @ordering = 'asc'
-    end
+    @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
+    @offset = params[:offset] || 0
+    @limit = params[:limit] || 50
+
+    @max_nb_records = @search_query.blank? ? Kaui::Payment.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records : 0
   end
 
   def pagination

data/app/controllers/kaui/queues_controller.rb

@@ -4,8 +4,9 @@ class Kaui::QueuesController < Kaui::EngineController
     @account_id = params[:account_id]
     @now = Kaui::Admin.get_clock(nil, options_for_klient)['currentUtcTime'].to_datetime
 
-    min_date = params[:min_date]
+    min_date = params[:min_date] || '1970-01-01'
+    max_date = params[:max_date] || '2100-01-01'
     with_history = params[:with_history] || false
-    @queues_entries = Kaui::Admin.get_queues_entries(@account_id, options_for_klient.merge(:withHistory => with_history, :minDate => min_date))
+    @queues_entries = Kaui::Admin.get_queues_entries(@account_id, options_for_klient.merge(:withHistory => with_history, :minDate => min_date, :maxDate => max_date))
   end
 end

data/app/controllers/kaui/tags_controller.rb

@@ -3,15 +3,11 @@ class Kaui::TagsController < Kaui::EngineController
   def index
     @search_query = params[:q]
 
-    @limit = 50
-    if @search_query.blank?
-      max_nb_records = Kaui::Tag.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records
-      @offset = [0, max_nb_records - @limit].max
-      @ordering = 'desc'
-    else
-      @offset = 0
-      @ordering = 'asc'
-    end
+    @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
+    @offset = params[:offset] || 0
+    @limit = params[:limit] || 50
+
+    @max_nb_records = @search_query.blank? ? Kaui::Tag.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records : 0
   end
 
   def pagination

data/app/models/kaui/admin.rb

@@ -11,7 +11,8 @@ class Kaui::Admin < KillBillClient::Model::Resource
                                     {
                                         :accountId => account_id,
                                         :withHistory => options[:withHistory],
-                                        :minDate => options[:minDate]
+                                        :minDate => options[:minDate],
+                                        :maxDate => options[:maxDate]
                                     },
                                     options
       JSON.parse res.body

data/app/views/kaui/accounts/index.html.erb

@@ -32,9 +32,13 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  $('#accounts-table').dataTable({
+  var table = $('#accounts-table').DataTable({
     "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-    "pagingType": "full_numbers",
+    "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+    "language": {
+      <!-- See DefaultPaginationSqlDaoHelper.java -->
+      "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+    },
     "pageLength": <%= @limit %>,
     "displayStart": <%= @offset %>,
     <% unless @ordering.blank? %>
@@ -43,7 +47,18 @@ $(document).ready(function() {
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
-    "ajax": "<%= accounts_pagination_path :format => :json %>"
+    "ajax": "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>"
   });
+
+  <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
+  <% if @max_nb_records.nil? %>
+    $('#accounts-table').on('draw.dt', function() {
+      var noMoreData = table.column(0)
+                            .data()
+                            .length == 0;
+      $(".next.paginate_button").toggleClass("disabled", noMoreData);
+      $(".dataTables_info").toggle(!noMoreData);
+    });
+  <% end %>
 });
 <% end %>

data/app/views/kaui/custom_fields/index.html.erb

@@ -30,12 +30,32 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  $('#custom_fields-table').dataTable({
+  var table = $('#custom_fields-table').DataTable({
     "dom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-    "pagingType": "full_numbers",
+    "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+    "language": {
+      <!-- See DefaultPaginationSqlDaoHelper.java -->
+      "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+    },
+    "pageLength": <%= @limit %>,
+    "displayStart": <%= @offset %>,
+    <% unless @ordering.blank? %>
+        "order": [[ 0, "<%= @ordering %>" ]],
+    <% end %>
     "processing": true,
     "serverSide": true,
-    "ajax": "<%= custom_fields_pagination_path :format => :json %>"
+    "ajax": "<%= custom_fields_pagination_path(:ordering => @ordering, :format => :json) %>"
   });
+
+  <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
+  <% if @max_nb_records.nil? %>
+    $('#custom_fields-table').on('draw.dt', function() {
+      var noMoreData = table.column(0)
+                            .data()
+                            .length == 0;
+      $(".next.paginate_button").toggleClass("disabled", noMoreData);
+      $(".dataTables_info").toggle(!noMoreData);
+    });
+  <% end %>
 });
 <% end %>

data/app/views/kaui/invoices/index.html.erb

@@ -26,16 +26,22 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  $('#invoices-table').dataTable({
+  var table = $('#invoices-table').DataTable({
     <% if @account.account_id.blank? %>
         "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-        "pagingType": "full_numbers",
+        "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+        "language": {
+          <!-- See DefaultPaginationSqlDaoHelper.java -->
+          "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+        },
         "pageLength": <%= @limit %>,
         "displayStart": <%= @offset %>,
+        "ajax": "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>",
     <% else %>
         // No paging for per-account listings
         "dom": "t",
         "paging": false,
+        "ajax": "<%= invoices_pagination_path :format => :json %>",
     <% end %>
     <% unless @ordering.blank? %>
         "order": [[ 0, "<%= @ordering %>" ]],
@@ -43,7 +49,17 @@ $(document).ready(function() {
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
-    "ajax": "<%= invoices_pagination_path :format => :json %>"
   });
+
+  <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
+  <% if @max_nb_records.nil? %>
+    $('#invoices-table').on('draw.dt', function() {
+      var noMoreData = table.column(0)
+                            .data()
+                            .length == 0;
+      $(".next.paginate_button").toggleClass("disabled", noMoreData);
+      $(".dataTables_info").toggle(!noMoreData);
+    });
+  <% end %>
 });
 <% end %>

data/app/views/kaui/payments/index.html.erb

@@ -28,16 +28,22 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  $('#payments-table').dataTable({
+  var table = $('#payments-table').DataTable({
     <% if @account.account_id.blank? %>
         "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-        "pagingType": "full_numbers",
+        "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+        "language": {
+          <!-- See DefaultPaginationSqlDaoHelper.java -->
+          "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+        },
         "pageLength": <%= @limit %>,
         "displayStart": <%= @offset %>,
+        "ajax": "<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>",
     <% else %>
         // No paging for per-account listings
         "dom": "t",
         "paging": false,
+        "ajax": "<%= payments_pagination_path :format => :json %>",
     <% end %>
     <% unless @ordering.blank? %>
         "order": [[ 0, "<%= @ordering %>" ]],
@@ -45,7 +51,17 @@ $(document).ready(function() {
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
-    "ajax": "<%= payments_pagination_path :format => :json %>"
   });
+
+  <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
+  <% if @max_nb_records.nil? %>
+      $('#payments-table').on('draw.dt', function() {
+      var noMoreData = table.column(0)
+                            .data()
+                            .length == 0;
+      $(".next.paginate_button").toggleClass("disabled", noMoreData);
+      $(".dataTables_info").toggle(!noMoreData);
+    });
+  <% end %>
 });
 <% end %>

data/app/views/kaui/queues/index.html.erb

@@ -1,8 +1,10 @@
 <p class="text-center">
-  <%= link_to 'Current or future entries', kaui_engine.queues_path(params.merge(:with_history => false)) %> /
-  <%= link_to 'Historical entries (last week)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.week)) %> /
-  <%= link_to 'Historical entries (last month)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.month)) %> /
-  <%= link_to 'All historical entries', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => '1970-01-01')) %>
+  <%= link_to 'Current or future entries', kaui_engine.queues_path(params.merge(:with_history => false, :max_date => @now + 1.week)) %> /
+  <% unless params[:account_id].present? -%>
+    <%= link_to 'Historical entries (last week)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.week, :max_date => @now + 1.week)) %> /
+    <%= link_to 'Historical entries (last month)', kaui_engine.queues_path(params.merge(:with_history => true, :min_date => @now - 1.month, :max_date => @now + 1.week)) %> /
+  <% end -%>
+  <%= link_to 'All historical entries', kaui_engine.queues_path(params.merge(:with_history => true)) %>
 </p>
 
 <div class="search">

data/app/views/kaui/tags/index.html.erb

@@ -26,9 +26,13 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  $('#tags-table').dataTable({
+  var table = $('#tags-table').DataTable({
     "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-    "pagingType": "full_numbers",
+    "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+    "language": {
+    <!-- See DefaultPaginationSqlDaoHelper.java -->
+      "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+    },
     "pageLength": <%= @limit %>,
     "displayStart": <%= @offset %>,
     <% unless @ordering.blank? %>
@@ -37,7 +41,18 @@ $(document).ready(function() {
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
-    "ajax": "<%= tags_pagination_path :format => :json %>"
+    "ajax": "<%= tags_pagination_path(:ordering => @ordering, :format => :json) %>"
   });
+
+  <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
+  <% if @max_nb_records.nil? %>
+    $('#tags-table').on('draw.dt', function() {
+      var noMoreData = table.column(0)
+                            .data()
+                            .length == 0;
+      $(".next.paginate_button").toggleClass("disabled", noMoreData);
+      $(".dataTables_info").toggle(!noMoreData);
+    });
+  <% end %>
 });
 <% end %>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.15.3'
+  VERSION = '0.15.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement