kanaui 2.0.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cd2ea6af02abb8c8606e4a716f93ae4174e60281700b637de2f52272aabaa512
-  data.tar.gz: e046e9ea44c7c2c12bae7d4bc342167ce5664a428ac589648f34909cd7985472
+SHA1:
+  metadata.gz: 81ba5da8713d526c0734addf4908b1d3fe6f664a
+  data.tar.gz: 43ebe1b8f84b750674beb6965132121639ece876
 SHA512:
-  metadata.gz: dbcdcb70318254bc916700840a9fb4ffa040724b59b86005ed121437ea8ff8a2e9d95dd817b74e4a774fd0d66b94ab0a6e6d7dff67816774612dba08ed1861b8
-  data.tar.gz: b87d87b1981d4626053369b9eacb94c33d85d26f8f8a22532845f296a3068d573e214e3caf3086505b5cea0d689e20ee174529a0755dc541798b874bf71c89ce
+  metadata.gz: 160fb9a081490a18d9041384916c64aa13102db326baf4a95aa9b46cae71ce3bdea648fa5a111c7b21b4917f45a20c919f558ddc5e12c2ac1e9d86a03e7d389d
+  data.tar.gz: 9680d4d33d605e6572249a38fb9dbebc0bb68a4e4c90818087577acbafaf80d2ed3f253009ce724c3d32b5e5209c683d65e41fb735acc04012ced2d25c9e3b31

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -20,11 +22,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -36,5 +36,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
-task :default => :test
+task default: :test

data/app/assets/javascripts/kanaui/kiddo/kiddo_initialize.js

@@ -8,7 +8,7 @@
       var renderer = new Kiddo.Renderer('#chartAnchor');
 
       if (error) {
-        console.log(error);
+        ajaxErrorAlert(error);
         return renderer.noData();
       }
 

data/app/assets/javascripts/kanaui/reports.dataTables.js

@@ -52,6 +52,7 @@ ReportsDataTables.prototype.buildTable = function(data, wrapper) {
     dataTable.dataTable({
         "aaData": aaData,
         "aoColumns": aoColumns,
+        "scrollX": true,
         "sDom": 'C<"clear">lfrtip'
     });
 

data/app/assets/stylesheets/kanaui/reports.css

@@ -1,3 +1,11 @@
+#reports-table th, #reports-table td,
+#dataTable-api_wrapper th, #dataTable-api_wrapper td {
+    white-space: nowrap;
+}
+
+.sql-query {
+    word-break: break-word;
+}
 
 .axis path,
 .axis line {
@@ -138,6 +146,7 @@ button.ColVis_Button:hover, ul.ColVis_collection li:hover {
     -ms-flex: .5 1 70%;
     -webkit-flex: .5 1 70%;
     flex: .5 1 70%;
+    overflow: scroll;
 }
 
 #date-picker .form-group {
@@ -146,4 +155,4 @@ button.ColVis_Button:hover, ul.ColVis_collection li:hover {
 
 #table-tools {
     padding-bottom: 10px;
-}
+}

data/app/controllers/kanaui/dashboard_controller.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Kanaui
   class DashboardController < Kanaui::EngineController
-
     #
     # Load the dashboard by rendering the view and executing the javascript that will call
     # the reports and available_reports endpoints below.
@@ -25,14 +26,14 @@ module Kanaui
 
       # Redirect also in case the dates have been updated to avoid any confusion in the view
       if query.present? || params[:start_date].blank? || params[:end_date].blank?
-        # TODO Make metrics configurable
+        # TODO: Make metrics configurable
         name = query.present? ? "#{params[:name]}#{query}^metric:count" : params[:name]
-        query_params = {:start_date => @start_date,
-                        :end_date => @end_date,
-                        :name => name,
-                        :smooth => params[:smooth],
-                        :sql_only => params[:sql_only],
-                        :format => params[:format]}
+        query_params = { start_date: @start_date,
+                         end_date: @end_date,
+                         name: name,
+                         smooth: params[:smooth],
+                         sql_only: params[:sql_only],
+                         format: params[:format] }
 
         # Test only
         query_params[:fake] = params[:fake] unless params[:fake].blank?
@@ -47,7 +48,7 @@ module Kanaui
     # Not used anymore as reports are pulled from index
     def available_reports
       available_reports = Kanaui::DashboardHelper::DashboardApi.available_reports(options_for_klient)
-      render :json => available_reports
+      render json: available_reports
     end
 
     def reports
@@ -66,7 +67,18 @@ module Kanaui
       else
         reports = raw_reports
       end
-      render :json => reports
+      respond_to do |fmt|
+        fmt.csv do
+          filename = params[:name]
+          unless params[:start_date].blank?
+            filename += "_#{params[:start_date]}"
+            filename += "-#{params[:end_date]}" unless params[:end_date].blank?
+          end
+          filename += '.csv'
+          send_data(raw_reports, filename: filename)
+        end
+        fmt.all { render json: reports }
+      end
     end
 
     private
@@ -103,7 +115,7 @@ module Kanaui
     end
 
     def build_slice_and_dice_query
-      query = ''
+      query = +''
 
       filters = {}
       groups = {}
@@ -117,6 +129,7 @@ module Kanaui
       filter_query = ''
       filters.each do |k, v|
         next if v.blank?
+
         filter_query << '%26' unless filter_query.blank?
         filter_query << "(#{k}=#{v.join("|#{k}=")})"
       end
@@ -124,10 +137,20 @@ module Kanaui
 
       groups.each do |k, v|
         next if v.blank?
-        # TODO Make "no other" configurable
+
+        # TODO: Make "no other" configurable
         query << "^dimension:#{k}(#{v.join('|')}|-)"
       end
 
+      # Template variables
+      params.each do |k, v|
+        next unless k.starts_with?('variable_')
+        next if v.blank?
+
+        variable_name = k.split('_')[1..-1].join('_')
+        query << "^variable:#{variable_name}=#{v}"
+      end
+
       query
     end
   end

data/app/controllers/kanaui/engine_controller.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Kanaui
   class EngineController < ApplicationController
-
     layout :get_layout
 
     def get_layout
@@ -17,12 +18,46 @@ module Kanaui
     def options_for_klient
       user = current_tenant_user
       {
-          :username => user[:username],
-          :password => user[:password],
-          :session_id => user[:session_id],
-          :api_key => user[:api_key],
-          :api_secret => user[:api_secret]
+        username: user[:username],
+        password: user[:password],
+        session_id: user[:session_id],
+        api_key: user[:api_key],
+        api_secret: user[:api_secret]
       }
     end
+
+    rescue_from(KillBillClient::API::ResponseError) do |killbill_exception|
+      flash[:error] = "Error while communicating with the Kill Bill server: #{as_string(killbill_exception)}"
+      redirect_to dashboard_index_path
+    end
+
+    def as_string(e)
+      if e.is_a?(KillBillClient::API::ResponseError)
+        "Error #{e.response.code}: #{as_string_from_response(e.response.body)}"
+      else
+        log_rescue_error(e)
+        e.message
+      end
+    end
+
+    def log_rescue_error(error)
+      Rails.logger.warn "#{error.class} #{error}. #{error.backtrace.join("\n")}"
+    end
+
+    def as_string_from_response(response)
+      error_message = response
+      begin
+        # BillingExceptionJson?
+        error_message = JSON.parse response
+      rescue StandardError => _e
+      end
+
+      if error_message.respond_to?(:[]) && error_message['message'].present?
+        # Likely BillingExceptionJson
+        error_message = error_message['message']
+      end
+      # Limit the error size to avoid ActionDispatch::Cookies::CookieOverflow
+      error_message[0..1000]
+    end
   end
 end

data/app/controllers/kanaui/reports_controller.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Kanaui
   class ReportsController < Kanaui::EngineController
-
     def index
       @reports = JSON.parse(Kanaui::DashboardHelper::DashboardApi.available_reports(options_for_klient)).map(&:deep_symbolize_keys)
     end
@@ -13,7 +14,7 @@ module Kanaui
       Kanaui::DashboardHelper::DashboardApi.create_report(report_from_params.to_json, options_for_klient)
 
       flash[:notice] = 'Report successfully created'
-      redirect_to :action => :index
+      redirect_to action: :index
     end
 
     def edit
@@ -26,34 +27,36 @@ module Kanaui
       Kanaui::DashboardHelper::DashboardApi.update_report(params.require(:id), report_from_params.to_json, options_for_klient)
 
       flash[:notice] = 'Report successfully updated'
-      redirect_to :action => :index
+      redirect_to action: :index
     end
 
     def refresh
       Kanaui::DashboardHelper::DashboardApi.refresh_report(params.require(:id), options_for_klient)
 
       flash[:notice] = 'Report refresh successfully scheduled'
-      redirect_to :action => :index
+      redirect_to action: :index
     end
 
     def destroy
       Kanaui::DashboardHelper::DashboardApi.delete_report(params.require(:id), options_for_klient)
 
       flash[:notice] = 'Report successfully deleted'
-      redirect_to :action => :index
+      redirect_to action: :index
     end
 
     private
 
     def report_from_params
       {
-          :reportName => params[:report_name],
-          :reportPrettyName => params[:report_pretty_name],
-          :reportType => params[:report_type],
-          :sourceTableName => params[:source_table_name],
-          :refreshProcedureName => params[:refresh_procedure_name],
-          :refreshFrequency => params[:refresh_frequency],
-          :refreshHourOfDayGmt => params[:refresh_hour_of_day_gmt]
+        reportName: params[:report_name],
+        reportPrettyName: params[:report_pretty_name],
+        reportType: params[:report_type],
+        sourceTableName: params[:source_table_name],
+        sourceName: params[:source_name],
+        sourceQuery: params[:source_query],
+        refreshProcedureName: params[:refresh_procedure_name],
+        refreshFrequency: params[:refresh_frequency].presence,
+        refreshHourOfDayGmt: params[:refresh_hour_of_day_gmt]
       }
     end
   end

data/app/controllers/kanaui/settings_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Kanaui
+  class SettingsController < Kanaui::EngineController
+    def index; end
+
+    # update would have been nicer, but it's hard to pass the id in the url
+    def create
+      Kanaui::DashboardHelper::DashboardApi.refresh(params.require(:account_id), options_for_klient)
+      redirect_to({ action: :index }, notice: 'Account successfully refreshed')
+    end
+  end
+end

data/app/helpers/kanaui/application_helper.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
+
 module Kanaui
   module ApplicationHelper
-
-
   end
 end

data/app/helpers/kanaui/dashboard_helper.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 module Kanaui
   module DashboardHelper
-
     class DashboardApi < KillBillClient::Model::Resource
-
-      KILLBILL_ANALYTICS_PREFIX = "/plugins/killbill-analytics"
+      KILLBILL_ANALYTICS_PREFIX = '/plugins/killbill-analytics'
 
       class << self
+        def refresh(account_id, options = {})
+          path = "#{KILLBILL_ANALYTICS_PREFIX}/#{account_id}"
+          KillBillClient::API.put path, {}, {}, options
+        end
 
         def available_reports(options = {})
           path = "#{KILLBILL_ANALYTICS_PREFIX}/reports"
@@ -48,7 +52,5 @@ module Kanaui
         end
       end
     end
-
   end
 end
-

data/app/views/kanaui/dashboard/index.html.erb

@@ -2,33 +2,61 @@
   <!--             MENU        -->
   <div class="reports-options flex-inner-left-panel">
     <div class="row">
-      <% if params[:name] && @report['reportType'] == 'TIMELINE' %>
-        <div id="date-picker" class="col-md-12">
-          <h4>End date</h4>
-          <%= form_tag kanaui_engine.dashboard_index_path, :html => {:class => 'form-horizontal'}, :method => :get do %>
-              <input name="name" type="hidden" value="<%= @raw_name %>">
-              <input name="smooth" type="hidden" value="<%= params[:smooth] %>">
-              <input name="sql_only" type="hidden" value="<%= params[:sql_only] %>">
-              <input name="format" type="hidden" value="<%= params[:format] %>">
-              <input name="delta_days" type="hidden" value="<%= (@end_date.to_date - @start_date.to_date).to_i %>">
+      <% if params[:name] %>
+        <div class="info-wrapper">
+          <div class="tag-bar tag-bar-breathe">
+            <div class="tag-select" onclick="void(0);">
+                <span><i class="fa fa-calendar"></i><i class="fa fa-caret-down"></i></span>
 
-              <div class="form-group">
-                <div class="col-md-12">
-                  <input class="form-control" name="end_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @end_date %>">
-                </div>
-              </div>
-              <div class="form-group">
-                <div class="col-sm-12">
-                  <%= submit_tag 'Refresh', :class => 'btn btn-default' %>
-                </div>
-              </div>
-          <% end %>
-        </div>
+                <div class="tag-select-box">
+                <%= form_tag kanaui_engine.dashboard_index_path, :class => 'form-horizontal', :method => :get do %>
+                    <input name="name" type="hidden" value="<%= @raw_name %>">
+                    <input name="smooth" type="hidden" value="<%= params[:smooth] %>">
+                    <input name="sql_only" type="hidden" value="<%= params[:sql_only] %>">
+                    <input name="format" type="hidden" value="<%= params[:format] %>">
+                    <input name="delta_days" type="hidden" value="<%= (@end_date.to_date - @start_date.to_date).to_i %>">
+
+                    <div class="form-group">
+                      <div class="col-md-7">
+                        <% # TODO datepicker breaks :hover %>
+                        From:<input class="form-control" name="start_date" type="text" data-provide="datepicker-BROKEN" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @start_date %>">
+                      </div>
+                    </div>
+                    <div class="form-group">
+                      <div class="col-md-7">
+                        <% # TODO datepicker breaks :hover %>
+                        To:<input class="form-control" name="end_date" type="text" data-provide="datepicker-BROKEN" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value="<%= @end_date %>">
+                      </div>
+                    </div>
+                    <% ((@report['variables'] || {})['fields'] || []).each do |definition| %>
+                      <div class="form-group">
+                        <div class="col-md-7">
+                          <%= definition['name'].titleize %>:
+                          <% # TODO Not fully implemented server side %>
+                          <% if definition['dataType'] == 'date' %>
+                            <% # TODO datepicker breaks :hover %>
+                            <input class="form-control" name="variable_<%= definition['name'] %>" type="text" data-provide="datepicker-BROKEN" data-date-format="yyyy-mm-dd" data-date-today-highlight="true" value=""/>
+                          <% else %>
+                            <input class="form-control" name="variable_<%= definition['name'] %>" type="text" value=""/>
+                          <% end %>
+                        </div>
+                      </div>
+                    <% end %>
+                    <div class="form-group">
+                      <div class="col-sm-12">
+                        <%= submit_tag 'Refresh', :class => 'btn btn-default' %>
+                      </div>
+                    </div>
+                <% end %>
+                </div><!-- /.tag-select-box -->
+            </div><!-- /.tag-select -->
+          </div><!-- /.tag-bar -->
+        </div><!-- /.info-wrapper -->
       <% end %>
       <div class="col-md-12 col-sm-8">
         <h4><%= link_to 'Available Reports', kanaui_engine.url_for(:controller => :reports) %></h4>
           <ul class="nav nav-tabs nav-stacked">
-            <% if Rails.env.development? %>
+            <% if Rails.env.development? && @reports.empty? %>
               <li class="nav-element">
                 <%= link_to "Fake pie", kanaui_engine.dashboard_index_path(:fake => 1, :name => 'fake_pie', :type => 'pie') %>
               </li>
@@ -45,6 +73,11 @@
         </ul>
       </div>
     </div>
+    <div class="row">
+      <div class="col-md-12 col-sm-8">
+        <h5><%= link_to 'Settings', kanaui_engine.url_for(:controller => :settings) %></h5>
+      </div>
+    </div>
   </div>
 
   <!--             DASHBOARD        -->
@@ -55,16 +88,6 @@
           <h2 class="chart-title">
             <%= @raw_name.titleize %>
           </h2>
-          <% if @report['reportType'] == 'TABLE' %>
-            <input type="hidden" id="visible-table-columns" value="<%= @visible_columns %>">
-
-            <div id="table-tools" class="row">
-              <div class="col-sm-2">
-                <a class="btn btn-default" id="copy-url" data-reports-path="<%= kanaui_engine.dashboard_index_path(params.to_h) %>">Copy URL</a>
-                <input id="url-placeholder" class="form-control hidden">
-              </div>
-            </div>
-          <% end %>
           <div id="loading-spinner"></div>
           <div id="chartAnchor" data-reports-path="<%= kanaui_engine.reports_path(params.to_h) %>"></div>
           <div id="date-controls" style="display: none;">
@@ -76,6 +99,11 @@
           </div>
           <hr>
           <div class="pull-right">
+            <% if @report['reportType'] == 'TABLE' %>
+              <input type="hidden" id="visible-table-columns" value="<%= @visible_columns %>">
+              <a class="btn btn-default" id="copy-url" data-reports-path="<%= kanaui_engine.dashboard_index_path(params.to_h) %>">Copy URL</a>
+              <input id="url-placeholder" class="form-control hidden">
+            <% end %>
             <%= link_to 'Download raw data', kanaui_engine.reports_path(params.to_h.merge(:format => 'csv')), class: 'btn btn-default' %>
           </div>
           <a class="btn btn-default" role="button" data-toggle="collapse" href="#advanced-controls" aria-expanded="false" aria-controls="advanced-controls">

data/app/views/kanaui/reports/_form.html.erb

@@ -1,48 +1,62 @@
 <%= form_tag @report[:reportName].blank? ? url_for(:controller => :reports, :action => :create) : report_path(@report[:reportName]), :method => (@report[:reportName].blank? ? :post : :put), :class => 'form-horizontal' do %>
     <div class="form-group">
-      <%= label_tag :report_name, 'Report name', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+      <%= label_tag :report_name, 'Report name', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= text_field_tag :report_name, @report[:reportName], :class => 'form-control', :disabled => !@report[:reportName].blank?, :read_only => !@report[:reportName].blank? %>
       </div>
     </div>
     <div class="form-group">
-      <%= label_tag :report_pretty_name, 'Pretty name', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+      <%= label_tag :report_pretty_name, 'Pretty name', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= text_field_tag :report_pretty_name, @report[:reportPrettyName], :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
-      <%= label_tag :report_type, 'Type', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+      <%= label_tag :report_type, 'Type', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= select_tag :report_type, options_for_select(%w(TIMELINE COUNTERS TABLE), @report[:reportType] || 'TABLE'), :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
-      <%= label_tag :source_table_name, 'Source', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+      <%= label_tag :source_table_name, 'Source', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= text_field_tag :source_table_name, @report[:sourceTableName], :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
-      <%= label_tag :refresh_procedure_name, 'Refresh procedure', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+      <%= label_tag :source_name, 'Source name', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= text_field_tag :source_name, @report[:sourceName], :class => 'form-control' %>
+        <span>Must match a database configuration entry in the Analytics plugin</span>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :source_query, 'SQL query', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= text_area_tag :source_query, @report[:sourceQuery], rows: 10, cols: 25, :class => 'form-control' %>
+        <span>Don't add a trailing ;</span>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :refresh_procedure_name, 'Refresh procedure', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= text_field_tag :refresh_procedure_name, @report[:refreshProcedureName], :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
-      <%= label_tag :refresh_frequency, 'Refresh frequency', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
-        <%= select_tag :refresh_frequency, options_for_select(%w(HOURLY DAILY), @report[:refreshFrequency] || 'HOURLY'), :class => 'form-control' %>
+      <%= label_tag :refresh_frequency, 'Refresh frequency', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= select_tag :refresh_frequency, options_for_select(%w(HOURLY DAILY), @report[:refreshFrequency]), :class => 'form-control', :include_blank => true %>
       </div>
     </div>
     <div class="form-group">
-      <%= label_tag :refresh_hour_of_day_gmt, 'Refresh hour (GMT)', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+      <%= label_tag :refresh_hour_of_day_gmt, 'Refresh hour (GMT)', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= number_field_tag :refresh_hour_of_day_gmt, @report[:refreshHourOfDayGmt], {:min => 1, :max => 23, :class => 'form-control'} %>
       </div>
     </div>
     <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
+      <div class="col-sm-offset-3 col-sm-9">
         <%= submit_tag 'Save', :class => 'btn btn-default' %>
       </div>
     </div>

data/app/views/kanaui/reports/_reports_table.html.erb

@@ -5,6 +5,8 @@
     <th>Pretty name</th>
     <th>Type</th>
     <th>Source</th>
+    <th>Source Name</th>
+    <th>Source Query</th>
     <th>Refresh procedure</th>
     <th>Refresh frequency</th>
     <th>Refresh hour (GMT)</th>
@@ -19,6 +21,23 @@
         <td><%= report[:reportPrettyName] %></td>
         <td><%= report[:reportType] %></td>
         <td><%= report[:sourceTableName] %></td>
+        <td><%= report[:sourceName] %></td>
+        <td>
+          <% unless report[:sourceQuery].blank? %>
+            <a href="" data-toggle="modal" data-target="#<%= report[:reportName] %>-query-modal">
+              Show SQL
+            </a>
+            <div class="modal fade" id="<%= report[:reportName] %>-query-modal" tabindex="-1" role="dialog">
+              <div class="modal-dialog" role="document">
+                <div class="modal-content column-block">
+                  <div class="modal-body">
+                    <p><pre class="sql-query"><code><%= report[:sourceQuery] %></code></pre></p>
+                  </div>
+                </div><!-- /.modal-content -->
+              </div><!-- /.modal-dialog -->
+            </div><!-- /.modal -->
+          <% end %>
+        </td>
         <td><%= report[:refreshProcedureName] %></td>
         <td><%= report[:refreshFrequency] %></td>
         <td><%= report[:refreshHourOfDayGmt] %></td>
@@ -42,6 +61,7 @@
 <%= javascript_tag do %>
   $(document).ready(function() {
     $('#reports-table').dataTable({
+      "scrollX": true,
       "dom": "t",
       "paging": false,
       "columns": [
@@ -52,6 +72,8 @@
         null,
         null,
         null,
+        null,
+        null,
         { "orderable": false },
         { "orderable": false }
       ]

data/app/views/kanaui/settings/index.html.erb

@@ -0,0 +1,19 @@
+<div class="column-block">
+  <h1>Analytics settings</h1>
+
+  <div>
+    <%= form_tag kanaui_engine.settings_path, :method => :post, :class => 'form-horizontal' do %>
+      <div class='form-group'>
+        <%= label_tag :account_id, 'Account id', :class => 'col-sm-2 control-label' %>
+        <div class="col-sm-4">
+          <%= text_field_tag :account_id, nil, :class => 'form-control' %>
+        </div>
+      </div>
+      <div class="form-group">
+        <div class="col-sm-offset-2 col-sm-10">
+          <%= submit_tag 'Refresh', :class => 'btn btn-default' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/config/routes.rb

@@ -1,14 +1,17 @@
-Kanaui::Engine.routes.draw do
+# frozen_string_literal: true
 
+Kanaui::Engine.routes.draw do
   root to: 'dashboard#index'
-  resources :dashboard, :only => [:index]
-  scope "/dashboard" do
-    match "/available_reports" => "dashboard#available_reports", :via => :get, :as => "available_reports"
-    match "/reports" => "dashboard#reports", :via => :get, :as => "reports"
+  resources :dashboard, only: [:index]
+  scope '/dashboard' do
+    match '/available_reports' => 'dashboard#available_reports', :via => :get, :as => 'available_reports'
+    match '/reports' => 'dashboard#reports', :via => :get, :as => 'reports'
   end
 
-  resources :reports, :only => [:index, :new, :create, :edit, :update, :destroy]
-  scope "/reports" do
-    match "/refresh/:id" => "reports#refresh", :via => :put, :as => "refresh_report"
+  resources :reports, only: %i[index new create edit update destroy]
+  scope '/reports' do
+    match '/refresh/:id' => 'reports#refresh', :via => :put, :as => 'refresh_report'
   end
+
+  resources :settings, only: %i[index create]
 end

data/lib/kanaui/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Dependencies
 #
 # Sigh. Rails autoloads the gems specified in the Gemfile and nothing else.

data/lib/kanaui/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Kanaui
-  VERSION = "2.0.0"
+  VERSION = '2.1.3'
 end

data/lib/kanaui.rb

@@ -1,21 +1,22 @@
-require "kanaui/engine"
+# frozen_string_literal: true
 
-module Kanaui
+require 'kanaui/engine'
 
+module Kanaui
   mattr_accessor :current_tenant_user
   mattr_accessor :layout
 
-  self.current_tenant_user = lambda { |session, user|
-    {:username => 'admin',
-     :password => 'password',
-     :session_id => nil,
-     :api_key => KillBillClient.api_key,
-     :api_secret => KillBillClient.api_secret}
+  self.current_tenant_user = lambda { |_session, _user|
+    { username: 'admin',
+      password: 'password',
+      session_id: nil,
+      api_key: KillBillClient.api_key,
+      api_secret: KillBillClient.api_secret }
   }
 
-  def self.config(&block)
+  def self.config
     {
-        :layout => layout || 'kanaui/layouts/kanaui_application',
+      layout: layout || 'kanaui/layouts/kanaui_application'
     }
   end
 end

data/lib/tasks/kanaui_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :kanaui do
 #   # Task goes here

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+{}

data/test/functional/kanaui/tests_controller_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Kanaui

data/test/integration/navigation_test.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class NavigationTest < ActionDispatch::IntegrationTest
-
   include Kanaui::Engine.routes.url_helpers
 
   test 'can see the dashboard page' do
@@ -9,4 +10,3 @@ class NavigationTest < ActionDispatch::IntegrationTest
     assert_response :redirect
   end
 end
-

data/test/kanaui_test.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class KanauiTest < ActiveSupport::TestCase
-  test "truth" do
+  test 'truth' do
     assert_kind_of Module, Kanaui
   end
 end

data/test/test_helper.rb

@@ -1,15 +1,15 @@
+# frozen_string_literal: true
+
 # Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
+require File.expand_path('dummy/config/environment.rb', __dir__)
+require 'rails/test_help'
 
 Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 # Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end
+ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__) if ActiveSupport::TestCase.method_defined?(:fixture_path=)

data/test/unit/helpers/kanaui/tests_helper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module Kanaui

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: kanaui
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: d3_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
-  name: js-routes
+  name: jquery-datatables-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: jquery-datatables-rails
+  name: js-routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: d3_rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
+  name: bootstrap-datepicker-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,55 +109,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
-  name: spinjs-rails
+  name: killbill-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-datepicker-rails
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: killbill-client
+  name: spinjs-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,7 +165,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.6
+- !ruby/object:Gem::Dependency
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,19 +221,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.88.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.88.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: '0'
 description: Rails UI plugin for the Analytics plugin.
 email: killbilling-users@googlegroups.com
 executables: []
@@ -246,6 +288,7 @@ files:
 - app/controllers/kanaui/dashboard_controller.rb
 - app/controllers/kanaui/engine_controller.rb
 - app/controllers/kanaui/reports_controller.rb
+- app/controllers/kanaui/settings_controller.rb
 - app/helpers/kanaui/application_helper.rb
 - app/helpers/kanaui/dashboard_helper.rb
 - app/views/kanaui/dashboard/index.html.erb
@@ -255,6 +298,7 @@ files:
 - app/views/kanaui/reports/edit.html.erb
 - app/views/kanaui/reports/index.html.erb
 - app/views/kanaui/reports/new.html.erb
+- app/views/kanaui/settings/index.html.erb
 - config/locales/en.bootstrap.yml
 - config/routes.rb
 - lib/kanaui.rb
@@ -265,6 +309,7 @@ files:
 - lib/tasks/kanaui_tasks.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/bin/bundle
@@ -295,7 +340,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -326,52 +370,53 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Kill Bill Analytics UI mountable engine
 test_files:
-- test/kanaui_test.rb
-- test/fixtures/kanaui/dashboards.yml
-- test/unit/helpers/kanaui/tests_helper_test.rb
 - test/test_helper.rb
-- test/integration/navigation_test.rb
-- test/dummy/log/test.log
+- test/fixtures/kanaui/dashboards.yml
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
 - test/dummy/public/404.html
 - test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/config/secrets.yml
-- test/dummy/config/locales/en.yml
+- test/dummy/Rakefile
+- test/dummy/config/application.rb
 - test/dummy/config/environment.rb
 - test/dummy/config/routes.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/initializers/new_framework_defaults_5_1.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/killbill_client.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/boot.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/application_controller_renderer.rb
-- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/new_framework_defaults_5_1.rb
+- test/dummy/config/initializers/application_controller_renderer.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/application.rb
-- test/dummy/Rakefile
-- test/dummy/script/rails
-- test/dummy/README.rdoc
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/config.ru
+- test/dummy/config/initializers/killbill_client.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/bin/rails
+- test/dummy/bin/yarn
 - test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/update
 - test/dummy/bin/setup
-- test/dummy/bin/yarn
-- test/dummy/bin/rails
+- test/dummy/bin/update
+- test/dummy/bin/bundle
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/assets/config/manifest.js
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/script/rails
+- test/dummy/config.ru
+- test/dummy/README.rdoc
+- test/integration/navigation_test.rb
+- test/kanaui_test.rb
+- test/unit/helpers/kanaui/tests_helper_test.rb
 - test/functional/kanaui/tests_controller_test.rb

data/test/dummy/log/test.log

@@ -1,22 +0,0 @@
-----------------------
-KanauiTest: test_truth
-----------------------
------------------------------------------------
-NavigationTest: test_can_see_the_dashboard_page
------------------------------------------------
-Started GET "/kanaui" for 127.0.0.1 at 2018-04-12 15:30:51 +0000
-Processing by Kanaui::DashboardController#index as HTML
-Request method='GET', uri='http://127.0.0.1:8080/plugins/killbill-analytics/reports'
-accept='application/json', user-agent='killbill/2.2.2; ruby 2.4.2p198 (2017-09-14 revision 59899) [x86_64-linux]', accept-encoding='gzip;q=1.0,deflate;q=0.6,identity;q=0.3', x-killbill-apikey='bob', x-killbill-apisecret='lazar', authorization='Basic [FILTERED]'
-Completed 500 Internal Server Error in 1ms
------------------------------------------------
-NavigationTest: test_can_see_the_dashboard_page
------------------------------------------------
-Started GET "/kanaui" for 127.0.0.1 at 2018-05-18 09:28:21 +0000
-Processing by Kanaui::DashboardController#index as HTML
-Request method='GET', uri='http://127.0.0.1:8080/plugins/killbill-analytics/reports'
-accept='application/json', user-agent='killbill/2.2.3; ruby 2.4.2p198 (2017-09-14 revision 59899) [x86_64-linux]', accept-encoding='gzip;q=1.0,deflate;q=0.6,identity;q=0.3', x-killbill-apikey='bob', x-killbill-apisecret='lazar', authorization='Basic [FILTERED]'
-Completed 500 Internal Server Error in 1ms
-----------------------
-KanauiTest: test_truth
-----------------------