kaui 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 87cb8b7da87b9a90782c29d1798aeaaf02e0373fb2b12479d6ea9e705052db28
-  data.tar.gz: 1536ede11cba88fd15fd3a76109b7fe9c3277afb0040d98b8c9a9ab2e1198f04
+SHA1:
+  metadata.gz: e5d858912d18a92b6d29b430c5abcef292407e21
+  data.tar.gz: c9fb2496bc22b4c176cbf491d914be4f2ff794fa
 SHA512:
-  metadata.gz: 908f46db4f8461a2f799c3eb0135824b7827a90da6a4f1e2903106c28c38c62238b93eee95bd120ad56d55a060260dead1a7569dd82bc0af0386478b5c98ee4d
-  data.tar.gz: 91f0d828ee558b7d2710440e3196c52a5fc080b54340569aa27538db0acf3545ccc506376ebfb54e7d786e62cd922ee6c8a3d1aab2c4a1d0a59536af7cbcb7eb
+  metadata.gz: 1b9de048f13170e6ca37fd7656f5c4524e6c72f1820efb4c16d9778f61890fd613a4ab31daa25216792396d636d4df9215638e153f411f7e49fc1f3a17d479cc
+  data.tar.gz: c1f5fca064ec6d5e671f69ab21fccc35d63f02f24c9b05ff897b20466a2980f1c470a3bc11b14df8060b368dc77646d03307ed87b21eac94f828033cae40e295

data/README.md

@@ -22,35 +22,15 @@ Ruby 2.4.2+ or JRuby 9.1.14.0+ required.
 Running Kaui locally
 ---------------------
 
+Note: use Ruby, not JRuby, for running the app locally.
+
 You can run Kaui locally by using the test/dummy app provided:
 
 ```
-export RAILS_ENV=development
-export DATABASE_URL=mysql://root:killbill@<MySQL Host IP>/killbill
+export RAILS_ENV=development DB_HOST=127.0.0.1 DB_USER=root DB_PASSWORD=root DB_PORT=3306
 bundle install
-rails db:migrate
-rails s
-```
-If you experience an error of;
-
-```
-You must use Bundler 2 or greater with this lockfile.
-```
-
-Then run the following commands to update your environment.
-
-Update Rubygems;
-
-```
-gem update --system
-```
-Update bundler;
-```
-gem install bundler
-```
-Update the Gemfile.lock file;
-```
-bundler update --bundler
+bundle exec rails db:migrate
+bundle exec rails s
 ```
 
 The Kill Bill URL can be configured through the `KILLBILL_URL` environment variable, e.g.
@@ -111,10 +91,6 @@ Alternatively, you can run the `kaui` script under `bin` by setting your loadpat
 
     ruby -Ilib bin/kaui /path/to/rails/app --path=$PWD --skip-bundle
 
-Releases
-========
-
-The releases are done using Jruby and require the following property `export JRUBY_OPTS='--2.0 -J-Xmx1024m'`
 
 Multi-Tenancy
 =============

data/app/assets/javascripts/kaui/kaui.js

@@ -205,7 +205,7 @@ jQuery(document).ready(function ($) {
             return;
         }
 
-        var message = 'Request Status: ' + jqxhr.status + ', Status Text: ' + jqxhr.statusText + ': ' + getMessageFromResponse(jqxhr);
+        var message = 'Request error: ' + getMessageFromResponse(jqxhr);
 
         if (jqxhr.status == 200) {
             message = thrownError.message == undefined ? thrownError : thrownError.message;

data/app/assets/stylesheets/kaui/account.less

@@ -37,4 +37,12 @@ h1 span.account-child-label{
       margin: 8px;
     }
   }
-}
+}
+
+.form-force-inline {
+  display: inline;
+}
+
+.form-right {
+  float: right;
+}

data/app/assets/stylesheets/kaui/common.less

@@ -99,7 +99,7 @@ span {
         font-weight: normal;
         color: rgb(119, 119, 119);
 
-        &.label-success, &.label-warning, &.label-danger {
+        &.label-default, &.label-success, &.label-warning, &.label-danger {
             color: #fff;
         }
     }
@@ -497,7 +497,7 @@ table.subtitle {
             }
 
             a {
-                margin: 0 20px;
+                margin: 0 5px;
                 text-transform: uppercase;
                 font-size: 12px;
 
@@ -717,4 +717,47 @@ form[id^="new_tag_definition"] {
 
 .switch-tenant-active {
     color: #00919d;
-}
+}
+
+/* Required for https://github.com/killbill/killbill-admin-ui/issues/262 */
+.ui-autocomplete {
+  position: absolute;
+  z-index: 1000;
+  float: left;
+  display: none;
+  min-width: 160px;
+  padding: 4px 0;
+  margin: 2px 0 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 5px;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  background-clip: padding-box;
+
+  .ui-menu-item {
+    display: block;
+    padding: 3px 15px;
+    clear: both;
+    font-weight: normal;
+    line-height: 18px;
+    color: #555555;
+    white-space: nowrap;
+
+    .ui-state-active, .ui-state-hover {
+      color: #ffffff;
+      text-decoration: none;
+      background-color: #0088cc;
+      border-radius: 0px;
+      -webkit-border-radius: 0px;
+      -moz-border-radius: 0px;
+      background-image: none;
+    }
+  }
+}
+
+.ui-helper-hidden-accessible {
+  display: none;
+}

data/app/controllers/kaui/accounts_controller.rb

@@ -29,12 +29,9 @@ class Kaui::AccountsController < Kaui::EngineController
     data_extractor = lambda do |account, column|
       [
           account.parent_account_id,
-          account.name,
           account.account_id,
           account.external_key,
-          account.account_balance,
-          account.city,
-          account.country
+          account.account_balance
       ][column]
     end
 
@@ -44,12 +41,9 @@ class Kaui::AccountsController < Kaui::EngineController
         child_label = account.parent_account_id.nil? ? '' : view_context.content_tag(:span, 'Child', class: ['label', 'label-info', 'account-child-label'])
       end
 
-      [
-          child_label,
-          view_context.link_to(account.account_id, view_context.url_for(:action => :show, :account_id => account.account_id)),
-          account.external_key,
-          view_context.humanized_money_with_symbol(account.balance_to_money)
-      ]
+      row = [child_label, view_context.link_to(account.account_id, view_context.url_for(:action => :show, :account_id => account.account_id))]
+      row += Kaui.account_search_columns.call(account, view_context)[1]
+      row
     end
 
     paginate searcher, data_extractor, formatter
@@ -83,17 +77,17 @@ class Kaui::AccountsController < Kaui::EngineController
     @account = Kaui::Account::find_by_id_or_key(params.require(:account_id), true, true, cached_options_for_klient)
 
     fetch_children = promise { @account.children(false, false, 'NONE',cached_options_for_klient)}
-    fetch_parent = promise (!@account.parent_account_id.nil?){ Kaui::Account::find_by_id(@account.parent_account_id,false,false,cached_options_for_klient)}
+    fetch_parent = @account.parent_account_id.nil? ? nil : promise { Kaui::Account::find_by_id(@account.parent_account_id,false,false,cached_options_for_klient) }
     fetch_overdue_state = promise { @account.overdue(cached_options_for_klient) }
     fetch_account_tags = promise { @account.tags(false, 'NONE', cached_options_for_klient).sort { |tag_a, tag_b| tag_a <=> tag_b } }
     fetch_account_fields = promise { @account.custom_fields('NONE', cached_options_for_klient).sort { |cf_a, cf_b| cf_a.name.downcase <=> cf_b.name.downcase } }
     fetch_account_emails = promise { Kaui::AccountEmail.find_all_sorted_by_account_id(@account.account_id, 'NONE', cached_options_for_klient) }
     fetch_payments = promise { @account.payments(cached_options_for_klient).map! { |payment| Kaui::Payment.build_from_raw_payment(payment) } }
-    fetch_payment_methods = promise(false) { Kaui::PaymentMethod.find_all_by_account_id(@account.account_id, false, cached_options_for_klient) }
+    fetch_payment_methods = promise { Kaui::PaymentMethod.find_all_by_account_id(@account.account_id, false, cached_options_for_klient) }
 
     # is email notification plugin available
     is_email_notifications_plugin_available = Kenui::EmailNotificationService.email_notification_plugin_available?(cached_options_for_klient).first
-    fetch_email_notification_configuration = promise(is_email_notifications_plugin_available) do
+    fetch_email_notification_configuration = !is_email_notifications_plugin_available ? nil : promise do
       Kenui::EmailNotificationService.get_configuration_per_account(params.require(:account_id),cached_options_for_klient)
     end.then do |configuration|
       if configuration.first.is_a?(FalseClass)
@@ -106,7 +100,7 @@ class Kaui::AccountsController < Kaui::EngineController
     fetch_payment_methods_with_details = fetch_payment_methods.then do |pms|
       ops = []
       pms.each do |pm|
-        ops << promise(false) {
+        ops << promise {
           begin
             Kaui::PaymentMethod.find_by_id(pm.payment_method_id, true, cached_options_for_klient)
           rescue => e
@@ -125,7 +119,7 @@ class Kaui::AccountsController < Kaui::EngineController
     @custom_fields = wait(fetch_account_fields)
     @account_emails = wait(fetch_account_emails)
     wait(fetch_payment_methods)
-    @payment_methods = wait(fetch_payment_methods_with_details).map { |pm_f| pm_f.execute }.map { |pm_f| wait(pm_f) }.reject { |pm| pm.nil? }
+    @payment_methods = wait(fetch_payment_methods_with_details).map{ |pm_f| wait(pm_f) }.reject { |pm| pm.nil? }
     @available_tags = wait(fetch_available_tags)
     @children = wait(fetch_children)
     @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
@@ -183,6 +177,8 @@ class Kaui::AccountsController < Kaui::EngineController
       redirect_to account_path(account_id), :notice => "Nothing to generate for target date #{target_date.nil? ? 'today' : target_date}"
     elsif dry_run
       @invoice = Kaui::Invoice.build_from_raw_invoice(invoice)
+      @invoice_tags = []
+      @available_invoice_tags = []
       @payments = []
       @payment_methods = nil
       @account = Kaui::Account.find_by_id(account_id, false, false, options_for_klient)

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -81,12 +81,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     fetch_overdue = promise { Kaui::Overdue::get_overdue_json(options) rescue @overdue = nil }
     fetch_overdue_xml = promise { Kaui::Overdue::get_tenant_overdue_config('xml', options) rescue @overdue_xml = nil }
 
-    plugin_repository = Kaui::AdminTenant::get_plugin_repository
-    # hack:: replace paypal key with paypal_express, to set configuration and allow the ui to find the right configuration inputs
-    plugin_repository = plugin_repository.inject({}) { |p, (k,v)| p[k.to_s.sub(/\Apaypal/, 'paypal_express').to_sym] = v; p }
-
-    fetch_plugin_config = promise { Kaui::AdminTenant::get_oss_plugin_info(plugin_repository) }
-    fetch_tenant_plugin_config = promise { Kaui::AdminTenant::get_tenant_plugin_config(plugin_repository, options) }
+    fetch_tenant_plugin_config = promise { Kaui::AdminTenant::get_tenant_plugin_config(options) }
 
     @catalog_versions = []
     wait(fetch_catalog_versions).each_with_index do |effective_date, idx|
@@ -98,7 +93,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
     @overdue = wait(fetch_overdue)
     @overdue_xml = wait(fetch_overdue_xml)
-    @plugin_config = wait(fetch_plugin_config) rescue ''
     @tenant_plugin_config = wait(fetch_tenant_plugin_config) rescue ''
 
     # When reloading page from the view, it sends the last tab that was active
@@ -121,27 +115,15 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def new_catalog
-    @tenant = safely_find_tenant_by_id(params[:id])
-
     options = tenant_options_for_client
-    options[:api_key] = @tenant.api_key
-    options[:api_secret] = @tenant.api_secret
-
-    latest_catalog = Kaui::Catalog::get_catalog_json(true, nil, options)
-
-    @ao_mapping = Kaui::Catalog::build_ao_mapping(latest_catalog)
-
-    @available_base_products = latest_catalog && latest_catalog.products ?
-        latest_catalog.products.select { |p| p.type == 'BASE' }.map { |p| p.name } : []
-    @available_ao_products = latest_catalog && latest_catalog.products ?
-        latest_catalog.products.select { |p| p.type == 'ADD_ON' }.map { |p| p.name } : []
-    @available_standalone_products = latest_catalog && latest_catalog.products ?
-        latest_catalog.products.select { |p| p.type == 'STANDALONE' }.map { |p| p.name } : []
-    @product_categories = [:BASE, :ADD_ON, :STANDALONE]
-    @billing_period = [:DAILY, :WEEKLY, :BIWEEKLY, :THIRTY_DAYS, :MONTHLY, :QUARTERLY, :BIANNUAL, :ANNUAL, :BIENNIAL]
-    @time_units = [:UNLIMITED, :DAYS, :WEEKS, :MONTHS, :YEARS]
-
-    @simple_plan = Kaui::SimplePlan.new
+    fetch_state_for_new_catalog_screen(options)
+    @simple_plan = Kaui::SimplePlan.new({
+                                         :product_category => 'BASE',
+                                         :amount => 0,
+                                         :trial_length => 0,
+                                         :currency => 'USD',
+                                         :billing_period => 'MONTHLY'
+                                        })
   end
 
   def delete_catalog
@@ -189,21 +171,55 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def create_simple_plan
-    current_tenant = safely_find_tenant_by_id(params[:id])
-
     options = tenant_options_for_client
-    options[:api_key] = current_tenant.api_key
-    options[:api_secret] = current_tenant.api_secret
+    fetch_state_for_new_catalog_screen(options)
 
     simple_plan = params.require(:simple_plan).delete_if { |e, value| value.blank? }
     # Fix issue in Rails where first entry in the multi-select array is an empty string
     simple_plan["available_base_products"].reject!(&:blank?) if simple_plan["available_base_products"]
 
-    simple_plan = KillBillClient::Model::SimplePlanAttributes.new(simple_plan)
-
-    Kaui::Catalog.add_tenant_catalog_simple_plan(simple_plan, options[:username], nil, comment, options)
+    @simple_plan = Kaui::SimplePlan.new(simple_plan)
+
+    valid = true
+    # Validate new simple plan
+    # https://github.com/killbill/killbill-admin-ui/issues/247
+    if @available_base_products.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: invalid plan name (#{@simple_plan.plan_id} is a BASE product already)"
+      valid = false
+    elsif @available_ao_products.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: invalid plan name (#{@simple_plan.plan_id} is an ADD_ON product already)"
+      valid = false
+    elsif @available_standalone_products.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: invalid plan name (#{@simple_plan.plan_id} is a STANDALONE product already)"
+      valid = false
+    elsif @all_plans.include?(@simple_plan.product_name)
+      flash.now[:error] = "Error while creating plan: invalid product name (#{@simple_plan.product_name} is a plan name already)"
+      valid = false
+    elsif @all_plans.include?(@simple_plan.plan_id)
+      flash.now[:error] = "Error while creating plan: plan #{@simple_plan.plan_id} already exists"
+      valid = false
+    elsif @available_base_products.include?(@simple_plan.product_name) && @simple_plan.product_category != 'BASE'
+      flash.now[:error] = "Error while creating plan: product #{@simple_plan.product_name} is a BASE product"
+      valid = false
+    elsif @available_ao_products.include?(@simple_plan.product_name) && @simple_plan.product_category != 'ADD_ON'
+      flash.now[:error] = "Error while creating plan: product #{@simple_plan.product_name} is an ADD_ON product"
+      valid = false
+    elsif @available_standalone_products.include?(@simple_plan.product_name) && @simple_plan.product_category != 'STANDALONE'
+      flash.now[:error] = "Error while creating plan: product #{@simple_plan.product_name} is a STANDALONE product"
+      valid = false
+    end
 
-    redirect_to admin_tenant_path(current_tenant.id), :notice => 'Catalog plan was successfully added'
+    if valid
+      begin
+        Kaui::Catalog.add_tenant_catalog_simple_plan(@simple_plan, options[:username], nil, comment, options)
+        redirect_to admin_tenant_path(@tenant.id), :notice => 'Catalog plan was successfully added'
+      rescue => e
+        flash.now[:error] = "Error while creating plan: #{as_string(e)}"
+        render :action => :new_catalog
+      end
+    else
+      render :action => :new_catalog
+    end
   end
 
   def new_overdue_config
@@ -307,6 +323,8 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
     if plugin_properties.blank?
       flash[:error] = 'Plugin properties cannot be blank'
+    elsif plugin_name.blank?
+      flash[:error] = 'Plugin name cannot be blank'
     else
       plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, plugin_type, plugin_properties)
 
@@ -314,7 +332,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
       flash[:notice] = 'Config for plugin was successfully uploaded'
     end
 
-    redirect_to admin_tenant_path(current_tenant.id)
+    redirect_to admin_tenant_path(current_tenant.id, :active_tab => 'PluginConfig')
   end
 
   def remove_allowed_user
@@ -406,28 +424,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     end
   end
 
-  def suggest_plugin_name
-    json_response do
-      message = nil
-      entered_plugin_name = params.require(:plugin_name)
-      plugin_repository = view_context.plugin_repository
-
-      found_plugin, weights = fuzzy_match(entered_plugin_name, plugin_repository)
-
-      if weights.size > 0
-        plugin_anchor = view_context.link_to(weights[0][:plugin_name], '#', id: 'suggested',
-                                            data: {
-                                                plugin_name: weights[0][:plugin_name],
-                                                plugin_key: weights[0][:plugin_key],
-                                                plugin_type: weights[0][:plugin_type],
-                                            })
-        message = "Similar plugin already installed: '#{plugin_anchor}'" if weights[0][:worth_weight].to_f >= 1.0 && weights[0][:installed]
-        message = "Did you mean '#{plugin_anchor}'?" if weights[0][:worth_weight].to_f < 1.0 || !weights[0][:installed]
-      end
-      { suggestion: message, plugin: found_plugin }
-    end
-  end
-
   def switch_tenant
     tenant = Kaui::Tenant.find_by_kb_tenant_id(params.require(:kb_tenant_id))
 
@@ -441,6 +437,29 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
   private
 
+  # Share code to handle render on error
+  def fetch_state_for_new_catalog_screen(options)
+    @tenant = safely_find_tenant_by_id(params[:id])
+
+    options[:api_key] = @tenant.api_key
+    options[:api_secret] = @tenant.api_secret
+
+    latest_catalog = Kaui::Catalog::get_catalog_json(true, nil, options)
+    @all_plans = latest_catalog ? (latest_catalog.products || []).map(&:plans).flatten.map(&:name) : []
+
+    @ao_mapping = Kaui::Catalog::build_ao_mapping(latest_catalog)
+
+    @available_base_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'BASE' }.map { |p| p.name } : []
+    @available_ao_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'ADD_ON' }.map { |p| p.name } : []
+    @available_standalone_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'STANDALONE' }.map { |p| p.name } : []
+    @product_categories = [:BASE, :ADD_ON, :STANDALONE]
+    @billing_period = [:DAILY, :WEEKLY, :BIWEEKLY, :THIRTY_DAYS, :MONTHLY, :QUARTERLY, :BIANNUAL, :ANNUAL, :BIENNIAL]
+    @time_units = [:UNLIMITED, :DAYS, :WEEKS, :MONTHS, :YEARS]
+  end
+
   def safely_find_tenant_by_id(tenant_id)
     tenant = Kaui::Tenant.find_by_id(tenant_id)
     raise ActiveRecord::RecordNotFound.new('Could not find tenant ' + tenant_id) unless retrieve_tenants_for_current_user.include?(tenant.kb_tenant_id)
@@ -473,54 +492,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     data.to_s.split(/(?=[A-Z])|(?=[_])|(?=[-])|(?=[ ])/).select {|member| !member.gsub(/[_-]/,'').strip.empty?}.map { |member| member.gsub(/[_-]/,'').strip.downcase }
   end
 
-  def fuzzy_match(entered_plugin_name, plugin_repository)
-    splitted_entered_plugin_name = split_camel_dash_underscore_space(entered_plugin_name)
-    worth_of_non_words = 0.5 / splitted_entered_plugin_name.size.to_i
-
-    weights = []
-
-    plugin_repository.each do |plugin|
-      return plugin, [] if plugin[:plugin_name] == entered_plugin_name || plugin[:plugin_key] == entered_plugin_name
-      weight = { :plugin_name => plugin[:plugin_name], :plugin_key => plugin[:plugin_key],
-                 :plugin_type => plugin[:plugin_type], :installed => plugin[:installed], :worth_weight => 0.0 }
-
-      splitted_plugin_name = split_camel_dash_underscore_space(plugin[:plugin_name])
-      splitted_entered_plugin_name.each do |entered|
-        if splitted_plugin_name.include?(entered)
-          weight[:worth_weight] = weight[:worth_weight] + 1.0
-        end
-
-        splitted_plugin_name.each do |splitted|
-          if entered.chars.all? { |ch| splitted.include?(ch) }
-            weight[:worth_weight] = weight[:worth_weight] + worth_of_non_words
-            break
-          end
-        end
-
-        # perform a plugin key search, if weight is zero
-        next unless weight[:worth_weight] == 0
-        splitted_plugin_key = split_camel_dash_underscore_space(plugin[:plugin_key])
-
-        if splitted_plugin_key.include?(entered)
-          weight[:worth_weight] = weight[:worth_weight] + 1.0
-        end
-
-        splitted_plugin_key.each do |splitted|
-          if entered.chars.all? { |ch| splitted.include?(ch) }
-            weight[:worth_weight] = weight[:worth_weight] + worth_of_non_words
-            break
-          end
-        end
-      end
-
-      weights << weight if weight[:worth_weight] > 0
-
-    end
-
-    weights.sort! { |a,b| b[:worth_weight] <=> a[:worth_weight] } if weights.size > 1
-    return nil, weights
-  end
-
   def fetch_catalog_xml(tenant_id, effective_date)
     current_tenant = safely_find_tenant_by_id(tenant_id)