kaui 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87cb8b7da87b9a90782c29d1798aeaaf02e0373fb2b12479d6ea9e705052db28
-  data.tar.gz: 1536ede11cba88fd15fd3a76109b7fe9c3277afb0040d98b8c9a9ab2e1198f04
+  metadata.gz: 435f5a3c43e225e631222f6342c14a00732cda14be90c36ea499a21a89d4f0dc
+  data.tar.gz: 733ba6cb910b17aaae7764811f1a2861ac0a6e4521fc856e777dcc055fba6e21
 SHA512:
-  metadata.gz: 908f46db4f8461a2f799c3eb0135824b7827a90da6a4f1e2903106c28c38c62238b93eee95bd120ad56d55a060260dead1a7569dd82bc0af0386478b5c98ee4d
-  data.tar.gz: 91f0d828ee558b7d2710440e3196c52a5fc080b54340569aa27538db0acf3545ccc506376ebfb54e7d786e62cd922ee6c8a3d1aab2c4a1d0a59536af7cbcb7eb
+  metadata.gz: 2db883f170a25e9996a7d2378aefe648b1807c2799a88e0bdbc2b5d495f4f926030ffdce7c414c6725ca7c9e0e54d0fb8ad981f3cedd90ec06bc532abd0ce346
+  data.tar.gz: 957b7d9f5e0b90d147ed20b6c14907402a30ef4f1bd29acb0d1a70016d0773212b375ef9d81aa7c56af2005ab45e777923a7689f3d53da697e1b4e3b7f2e8db8

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
@@ -307,6 +301,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 +310,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 +402,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))
 
@@ -473,54 +447,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)
 

data/app/helpers/kaui/payment_method_helper.rb

@@ -1,9 +1,11 @@
 module Kaui
   module PaymentMethodHelper
 
-    def is_json?(string)
-      !string.blank? && !!JSON.parse(string) rescue false
+    def is_json?(value)
+      result = JSON.parse(value)
+      result.is_a?(Hash) || result.is_a?(Array)
+    rescue JSON::ParserError, TypeError
+      false
     end
-
   end
 end

data/app/helpers/kaui/plugin_helper.rb

@@ -1,46 +1,13 @@
 module Kaui
   module PluginHelper
-    # including plugin that are installed
-    def plugin_repository
-      plugins = []
-      plugin_repository = Kaui::AdminTenant.get_plugin_repository
-      plugin_repository.each_pair do |key, info|
-        plugins << {
-          plugin_key: plugin_key(key.to_s, info),
-          plugin_name: plugin_name(key.to_s, info),
-          plugin_type: info[:type],
-          installed: false
-        }
-      end
-
-      installed_plugins = installed_plugins(plugins)
-
-      plugins.sort! { |a, b| a[:plugin_key] <=> b[:plugin_key] }
-      plugins.each { |plugin| installed_plugins << plugin }
 
+    def plugin_repository
       installed_plugins
     end
 
     private
 
-      def plugin_name(key, info)
-        if info[:artifact_id].nil?
-          "killbill-#{key}"
-        else
-          "killbill-#{info[:artifact_id].gsub('killbill-','').gsub('-plugin','')}"
-        end
-      end
-
-      def plugin_key(key, info)
-        # hack:: replace paypal key with paypal_express, to set configuration and allow the ui to find the right configuration inputs
-        if key.eql?('paypal')
-          'paypal_express'
-        else
-          "#{key}"
-        end
-      end
-
-      def installed_plugins(plugins)
+      def installed_plugins
         installed_plugins = []
         nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
         plugins_info = nodes_info.first.plugins_info || []
@@ -49,11 +16,15 @@ module Kaui
           next if plugin.version.nil?
           # do not allow duplicate
           next if installed_plugins.any? { |p| p[:plugin_name].eql?(plugin.plugin_name) }
-          plugin_key = Kaui::AdminTenant.rewrite_plugin_key(plugin.plugin_key) unless plugin.plugin_key.nil?
+          plugin_key = plugin.plugin_key
           installed_plugins << {
+              # Unique identifier chosen by the user and used for kpm operations
               plugin_key: plugin_key,
-              plugin_name: plugin.plugin_name,
-              plugin_type: find_plugin_type(plugins, plugin_key),
+              # Notes:
+              #   * plugin.plugin_name comes from kpm and is arbitrary (see Utils.get_plugin_name_from_file_path in the kpm codebase for instance)
+              #   * plugin_name here is the plugin name as seen by Kill Bill and is typically defined in the Activator.java (this value is the one that matters for plugin configuration)
+              #   * The mapping here is a convention we've used over the years and is no way enforced anywhere - it likely won't work for proprietary plugins (the user would need to specify it by toggling the input on the UI)
+              plugin_name: "killbill-#{plugin_key}",
               installed: true
           }
         end
@@ -61,15 +32,5 @@ module Kaui
         # to_s to handle nil
         installed_plugins.sort! { |a,b| a[:plugin_key].to_s <=> b[:plugin_key].to_s }
       end
-
-      def find_plugin_type(plugins, plugin_key_to_search)
-        plugins.each do |plugin|
-          if plugin[:plugin_key] == plugin_key_to_search
-            return plugin[:plugin_type]
-          end
-        end
-
-        return nil
-      end
   end
 end

data/app/models/kaui/admin_tenant.rb

@@ -26,81 +26,21 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
       KillBillClient::Model::Tenant.upload_tenant_plugin_config(plugin_name, plugin_config, user, reason, comment, options)
     end
 
-    def get_plugin_repository
-      require 'open-uri'
-      require 'yaml'
-
-      source = URI.parse('https://raw.githubusercontent.com/killbill/killbill-cloud/master/kpm/lib/kpm/plugins_directory.yml').read
-      YAML.load(source)
-    rescue
-      # Ignore gracefully
-      {}
-    end
-
-    def get_oss_plugin_info(plugin_directory)
-      # Serialize the plugin state for the view:
-      #  plugin_name#plugin_type:prop1,prop2,prop3;plugin_name#plugin_type:prop1,prop2,prop3;...
-      #
-      plugin_config = plugin_directory.inject({}) do |hsh, (k,v)|
-        hsh["#{k}##{v[:type]}"] = v[:require] || []
-        hsh
-      end
-      plugin_config.map { |e,v| "#{e}:#{v.join(",")}" }.join(";")
-    end
-
-    def get_tenant_plugin_config(plugin_directory, options)
-      require 'yaml'
-
+    # Return a map of plugin_name => config
+    def get_tenant_plugin_config(options)
       raw_tenant_config = KillBillClient::Model::Tenant::search_tenant_config("PLUGIN_CONFIG_", options)
 
       tenant_config = raw_tenant_config.inject({}) do |hsh, e|
         # Strip prefix '/PLUGIN_CONFIG_'
-        killbill_key = e.key.gsub!(/PLUGIN_CONFIG_/, '')
-
-        # Extract killbill key for oss plugins based on convention 'killbill-KEY'
-        plugin_key = killbill_key.gsub(/killbill-/, '') if killbill_key.start_with?('killbill-')
-
-        # hack:: rewrite key, to allow the ui to find the right configuration inputs
-        plugin_key = rewrite_plugin_key(plugin_key) unless plugin_key.nil?
-        # If such key exists, lookup in plugin directory to see if is an official plugin
-        is_an_official_plugin = !plugin_key.nil? && !plugin_directory[plugin_key.to_sym].blank?
-        # Deserialize config based on string possible format, if exist in the official repository
-        if is_an_official_plugin && is_yaml?(e.values[0])
-          yml = YAML.load(e.values[0])
-          # Hash of properties
-          # is plugin key part of the yaml?
-          if yml[plugin_key.to_sym].blank?
-            # if not set it as raw
-            hsh[plugin_key] = {:raw_config => e.values[0]}
-          else
-            hsh[plugin_key] = yml[plugin_key.to_sym]
-          end
-          hsh[plugin_key][:_raw] = e.values[0]
-        elsif is_an_official_plugin && is_kv?(e.values[0])
-          # Construct hash of properties based on java properties (k1=v1\nk2=v2\n...)
-          hsh[plugin_key] = e.values[0].split("\n").inject({}) do |h, p0|
-            k, v = p0.split('=');
-            h[k] = v;
-            h
-          end
-          hsh[plugin_key][:_raw] = e.values[0]
-        else
-          # Construct simple hash with one property :raw_config
-          hsh[killbill_key] = {:raw_config => e.values[0], :_raw => e.values[0]}
-        end
+        plugin_name = e.key.gsub!(/PLUGIN_CONFIG_/, '')
+
+        # Construct simple hash with one property (first value)
+        hsh[plugin_name] = e.values[0]
+
         hsh
       end
 
-      # Serialize the whole thing a as string of the form:
-      # plugin_key1::key1=value1|key2=value2|..;plugin_key2::...
-      tenant_config.map do |plugin_key, props|
-        serialized_props = props.inject("") do |s, (k, v)|
-          e="#{k.to_s}=#{v.to_s}";
-          s == "" ? s="#{e}" : s="#{s}|#{e}";
-          s
-        end
-        "#{plugin_key}::#{serialized_props}"
-      end.join(";")
+      tenant_config
     end
 
     def format_plugin_config(plugin_key, plugin_type, props)
@@ -142,22 +82,6 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
       props
     end
 
-    # hack when the plugin name after killbill is not the same as the plugin key, this mainly affects ruby plugin configuration,
-    # as it use the key to retrieve the configuration.
-    def rewrite_plugin_key(plugin_key)
-      if plugin_key.start_with?('paypal')
-        'paypal_express'
-      elsif plugin_key.start_with?('firstdata')
-        'firstdata_e4'
-      elsif plugin_key.start_with?('bridge')
-        'payment_bridge'
-      elsif plugin_key.start_with?('payu-latam')
-        'payu_latam'
-      else
-        "#{plugin_key}"
-      end
-    end
-
     # checks if string could be parse as yaml
     def is_yaml?(candidate_string)
       is_yaml = false

data/app/views/kaui/admin_tenants/_form_plugin_config.erb

@@ -17,9 +17,10 @@
 
           <div id="plugin" class="form-group">
             <%= label_tag :entered_plugin_name, 'Plugin name', :class => 'col-sm-2 control-label' %>
+
             <div class="col-sm-4">
               <select class="form-control" id="select_plugin_name"></select>
-              <%= text_field_tag :entered_plugin_name, nil, :class => 'form-control', :plugin_config => @plugin_config, :tenant_plugin_config => @tenant_plugin_config %>
+              <%= text_field_tag :entered_plugin_name, nil, :placeholder => 'as defined in the plugin Activator file',  :class => 'form-control', :tenant_plugin_config => @tenant_plugin_config.to_json %>
               <div class="text plugin-suggestion text-danger"></div>
             </div>
             <div class="col-sm-1 spinner"><i class="fa fa-cog fa-2x fa-spin"></i></div>
@@ -29,7 +30,7 @@
                 <span class="slider round"></span>
               </label>
             </label>
-            <label class="col-sm-3 control-label toggle-label text-muted">or toggle plugin name input</label>
+            <label class="col-sm-3 control-label toggle-label text-muted">manual entry</label>
           </div>
 
           <div id="plugin_config_properties_header" class="form-group">
@@ -41,8 +42,11 @@
               </label>
             </label>
           </div>
-          <!-- Anchor DIV that gets thrown away when switching plugins -->
-          <div id="plugin_config_properties" plugin_name="" class="row">
+          <div class="form-group">
+            <%= label_tag :configuration, 'Configuration', :class => 'col-sm-2 control-label' %>
+            <div class="col-sm-4">
+              <textarea name="plugin_properties[raw_config]" id="raw_config" rows="10" class="form-control"></textarea>
+            </div>
           </div>
 
           <div class="form-group">
@@ -54,23 +58,6 @@
     </div>
 <% end %>
 
-<script id="plugin_config_properties_template" type="text/template">
-  <input type="hidden" id="plugin_key_values" value="{{data_json}}" />
-  {{#plugin_props_with_values}}
-  <div class="form-group">
-    <label class="col-sm-offset-1 col-sm-2 control-label" for="{{property}}">{{property_label}}</label>
-    <div class="col-sm-6">
-      {{#is_raw_config}}
-        <textarea name="plugin_properties[raw_config]" id="raw_config" rows="10" class="form-control">{{value}}</textarea>
-      {{/is_raw_config}}
-      {{^is_raw_config}}
-        <input type="text" name="plugin_properties[{{property}}]" id="{{property}}" class="form-control" value="{{value}}" />
-      {{/is_raw_config}}
-    </div>
-  </div>
-  {{/plugin_props_with_values}}
-</script>
-
 <script id="plugin_name_options_template" type="text/template">
   <option></option>
   {{#plugin_repository}}
@@ -101,48 +88,54 @@
             $('#plugin_config_properties').empty();
             $('#plugin_config_properties_header').hide();
             $(".plugin-suggestion").html('');
+            $("#raw_config").val('');
         });
 
-        $("#toggle_raw").on('change', function(e) {
-            if (isBlank($('#plugin_key_values').val())) {
-                return;
+        /* Intercept TAB and potentially display known properties */
+        $('#entered_plugin_name').keydown(function (e) {
+            if (e.keyCode === 9) {
+                $("#plugin_name").val($('#entered_plugin_name').val());
+                $("#plugin_key").val('');
+                render_plugin_key_values();
             }
+        });
+        /* Intercept mouseleave and potentially display known properties */
+        $('#entered_plugin_name').on('mouseleave', function() {
+            $("#plugin_name").val($('#entered_plugin_name').val());
+            $("#plugin_key").val('');
+            render_plugin_key_values();
+        });
 
-            var plugin_key_values = JSON.parse($('#plugin_key_values').val());
-            if ($("#toggle_raw").prop("checked")) {
-                var raw = [];
-                raw.push({ is_raw_config: true, property: "raw_config", property_label: "Raw Config", value: ''});
-
-                var plugin_name = $('#entered_plugin_name').val();
-                var plugin_key = $("#plugin_key").val();
-                var existing_props = get_tenant_plugin_properties(plugin_key, plugin_name);
-                raw[0].value = existing_props['_raw'];
-
-                render_plugin_key_values(raw, plugin_key_values);
-            } else {
-                render_plugin_key_values(plugin_key_values, plugin_key_values);
-            }
+        $("#toggle_raw").on('change', function(e) {
+            $("#plugin_name").val($('#entered_plugin_name').val());
+            $("#plugin_key").val('');
+            render_plugin_key_values();
         });
 
         $('#select_plugin_name').on('change', function(e) {
+            // User has selected a plugin from the dropdown
             var selectedOption = e.target.selectedOptions;
 
             if (selectedOption.length > 0) {
                 var plugin_name = selectedOption[0].value;
                 var plugin_key = selectedOption[0].text;
+
                 $("#plugin_name").val(plugin_name);
                 $("#plugin_key").val(plugin_key);
-                $("#plugin_type").val(selectedOption[0].dataset['pluginType']);
+                $("#plugin_type").val(selectedOption[0].dataset['pluginType']); // java or ruby
                 $('#plugin_config_properties').attr('plugin_name', '');
                 $('#plugin_config_properties_header').hide();
                 $("#toggle_raw").prop('checked', false);
-                add_properties_for_plugin(plugin_key, plugin_name);
+
+                render_plugin_key_values();
             }
         });
 
         populate_plugin_name_options();
         function populate_plugin_name_options(){
-            var plugin_repository = JSON.parse($("#plugin_repository").val());
+            var all_plugins = JSON.parse($("#plugin_repository").val());
+            // We only list installed plugins as to not confuse the user
+            var plugin_repository = all_plugins.filter(plugin => plugin.installed);
             for (var idx = 0, size = plugin_repository.length; idx < size; idx++) {
                 if (idx == 0 && plugin_repository[idx].installed) {
                     plugin_repository[idx]['start_installed'] = true;
@@ -163,57 +156,14 @@
             }
 
             var template = $("#plugin_name_options_template").html();
-            var options_html = Mustache.render( template , { plugin_repository: plugin_repository});
+            var options_html = Mustache.render( template , { plugin_repository: plugin_repository });
             $("#select_plugin_name").html(options_html);
         }
 
         function get_existing_tenant_plugin_properties(entered_plugin_name) {
             var tenant_plugin_properties = $('#entered_plugin_name').attr('tenant_plugin_config');
-            var res = {};
-            if (tenant_plugin_properties != undefined) {
-                $.each(tenant_plugin_properties.split(';'), function(idx, el) {
-                    var el_parts = el.split('::');
-                    var el_plugin_name = el_parts[0];
-                    var el_props = el_parts[1];
-                    if (el_plugin_name === entered_plugin_name) {
-                        if (el_props.split('=')[0] == 'raw_config') {
-                            res['raw_config'] = el_props.replace("raw_config=", "");
-                        } else {
-                            $.map(el_props.split('|'), function(el) {
-                                var parts = el.split('=');
-                                res[parts[0]] = parts.slice(1).join('=');
-                            });
-                        }
-                        return false;
-                    }
-                });
-            }
-            return res;
-        }
-
-        function get_selected_plugin_info(plugin_key) {
-            var plugin_config_str = $('#entered_plugin_name').attr('plugin_config');
-            var res = {}
-            /* Deserialize plugin/properties (see AdminTenant model)*/
-            $.each(plugin_config_str.split(';'), function(idx, el) {
-                var el_parts = el.split(':');
-                var el_parts_key = el_parts[0].split('#');
-                var el_plugin_name = el_parts_key[0];
-                var el_plugin_type = el_parts_key[1];
-                var el_plugin_props = el_parts[1];
-                if (el_plugin_name == plugin_key) {
-                    res['type'] = el_plugin_type;
-                    res['props'] = el_plugin_props == "" ? [] : (el_plugin_type == "" ? ['raw_config'] : el_plugin_props.split(','));
-                    return false;
-                }
-            });
-
-            if (isBlank(res['props'])) {
-                res['type'] = '';
-                res['props'] = ['raw_config'];
-            }
-
-            return res;
+            var res = JSON.parse(tenant_plugin_properties);
+            return res[entered_plugin_name];
         }
 
         function get_tenant_plugin_properties(plugin_key, plugin_name) {
@@ -221,167 +171,25 @@
             var existing_props = get_existing_tenant_plugin_properties(plugin_key);
 
             // try by plugin name for proprietary plugins
-            if (isBlank(existing_props)) {
+            if (isBlank(existing_props) && !isBlank(plugin_name)) {
                 existing_props = get_existing_tenant_plugin_properties(plugin_name);
             }
 
             return existing_props;
         }
 
-        function add_properties_for_plugin(plugin_key, plugin_name) {
-            var plugin_info = get_selected_plugin_info(plugin_key);
-
-            if (isBlank(plugin_name)) {
-                $('#plugin_config_properties').empty();
-                $('#plugin_config_properties').attr('plugin_name', '');
-                return;
-            }
-
-            if ($('#plugin_config_properties').attr('plugin_name') == plugin_name) {
-                /* Already set...*/
-                return;
-            }
-
-            var existing_props = get_tenant_plugin_properties(plugin_key, plugin_name);
-
-            var type = plugin_info['type'];
-            var props = plugin_info['props']
-
-            if (isBlank(type)) {
-                $(".switch-half-container").hide();
-            } else {
-                $(".switch-half-container").show();
-            }
-
-            $('#plugin_type').val(type);
-            /* Prune the tree to restart from scratch */
-            $('#plugin_config_properties_header').show();
-            $('#plugin_config_properties').empty();
-            $('#plugin_config_properties').append('<div id="plugin_config_properties_anchor" class="col-sm-12"></div>');
-
-            var merged_props_with_values = existing_props;
-            if (props != undefined) {
-                $.each(props, function(idx, p) {
-                    if (merged_props_with_values[p] == undefined) {
-                       merged_props_with_values[p] = '';
-                    }
-                });
-            }
-
-            add_property_form_entry(merged_props_with_values);
-
-            $('#plugin_config_properties').attr('plugin_name', plugin_name);
-        }
-
-        function format_label(input) {
-            /* Keep latest piece of a system property to keep it short */
-            var label_name = input.split('.').pop();
-            /* Replace underscore with comma */
-            label_name = label_name.replace(/_/g, ',');
-            /* Replace uppercase with comma + uppercase */
-            label_name = label_name.replace(/([A-Z]+)/g, ",$1");
-            /* Split name make sure each word starts with Uppercase */
-            var tmp1 = label_name.split(',');
-            var label_name_array = [];
-            $.map(tmp1, function(el) { label_name_array.push(el.charAt(0).toUpperCase() + el.slice(1)) });
-            label_name = label_name_array.join(' ');
-            return label_name;
-        }
-
-        function add_property_form_entry(merged_props_with_values) {
-            var plugin_props_with_values = [];
-
-            $.each(merged_props_with_values, function(p, v) {
-                if (p != '_raw') {
-                    plugin_props_with_values.push({ property_label: format_label(p), property: p, value: v, is_raw_config: p == 'raw_config'});
-                }
-            });
-
-            render_plugin_key_values(plugin_props_with_values, plugin_props_with_values);
-        }
-
-        function render_plugin_key_values(plugin_props_with_values, original) {
-            var template = $("#plugin_config_properties_template").html();
-            var plugin_props_with_values_html = Mustache.render( template ,{ plugin_props_with_values: plugin_props_with_values,
-                                                                             data_json: JSON.stringify(original)});
-            $("#plugin_config_properties_anchor").html(plugin_props_with_values_html);
-        }
-
-        // Free text related functions and handlers
-        init_plugin_name_handlers();
-        function init_plugin_name_handlers() {
-            /* Intercept ENTER and potentially display property form if plugin is know */
-            $('#entered_plugin_name').keyup(function (e) {
-                e.preventDefault();
-                if (e.keyCode === 13) {
-                    suggest_plugin_name();
-                }
-            });
-
-            /* Intercept mouseleave and potentially display property form if plugin is know */
-            $('#entered_plugin_name').on('mouseleave', function() {
-                suggest_plugin_name();
-            });
-        }
-
-        function suggested_response(response) {
-            $(".spinner").hide();
-            if (!isBlank(response.suggestion)) {
-                $(".plugin-suggestion").html(response.suggestion);
-
-                $("#suggested").click(function(e) {
-                    var plugin_name = e.currentTarget.dataset['pluginName'];
-                    var plugin_key = e.currentTarget.dataset['pluginKey'];
-
-                    $("#entered_plugin_name").val(plugin_name);
-                    $("#plugin_key").val(plugin_key);
-                    $("#plugin_type").val(e.currentTarget.dataset['pluginType']);
-                    $("#entered_plugin_name").data("last", plugin_name);
-
-                    $(".plugin-suggestion").html('');
-                    add_properties_for_plugin(isBlank(plugin_key) ? plugin_name : plugin_key, plugin_name);
-                });
-
+        function render_plugin_key_values() {
+            var plugin_name = "";
+            var plugin_key         = "";
+            if (isBlank($('#entered_plugin_name').val())) {
+                plugin_name = $("#plugin_name").val();
+                plugin_key = $("#plugin_key").val();
             } else {
-                $(".plugin-suggestion").html('');
+                plugin_name = $("#entered_plugin_name").val();
             }
 
-            var plugin_name = $('#entered_plugin_name').val();
-            var plugin_key = $("#plugin_key").val();
-            $("#plugin_name").val(plugin_name);
-
-            add_properties_for_plugin(isBlank(plugin_key) ? plugin_name : plugin_key, plugin_name);
-        }
-
-        function suggest_plugin_name() {
-            var plugin_name = $("#entered_plugin_name").val();
-            var last_plugin_name = $("#entered_plugin_name").data("last");
-            $("#plugin_key").val(plugin_name);
-
-            if (isBlank(plugin_name)) {
-                return;
-            }
-
-            // no change
-            if ( plugin_name == last_plugin_name) {
-                return;
-            }
-
-            $('#plugin_config_properties').attr('plugin_name', '');
-            $('#plugin_config_properties').empty();
-            $(".plugin-suggestion").html('');
-            $("#entered_plugin_name").data("last", plugin_name);
-            $(".spinner").show();
-            $.ajax({
-                url: '<%= suggest_plugin_name_path() %>',
-                type: "GET",
-                dataType: "json",
-                data: {
-                    "plugin_name": plugin_name,
-                },
-                success: suggested_response
-            });
+            var existing_props = get_tenant_plugin_properties(plugin_key, plugin_name);
+            $("#raw_config").val(existing_props);
         }
-
 });
-<% end %>
+<% end %>

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

@@ -126,8 +126,8 @@
                 <% end %>
                 <% (transaction.properties || []).sort_by { |p| p.key }.each do |property| %>
                     <% next if property.value.blank? %>
-                    <li><%= property.key %>
-                      : <%= is_json?(property.value) ? "<pre>#{JSON.pretty_generate(JSON.parse(property.value))}</pre>".html_safe : property.value %></li>
+                    <li><strong><%= property.key %>:</strong>
+                        <%= is_json?(property.value) ? "<pre>#{JSON.pretty_generate(JSON.parse(property.value))}</pre>".html_safe : property.value %></li>
                 <% end %>
               </ul>
             </td>

data/config/routes.rb

@@ -186,7 +186,6 @@ Kaui::Engine.routes.draw do
     match '/add_allowed_user' => 'admin_tenants#add_allowed_user', :via => :put, :as => 'add_allowed_user'
     match '/allowed_users' => 'admin_tenants#allowed_users', :via => :get, :as => 'admin_tenant_allowed_users'
     match '/catalog_by_effective_date' => 'admin_tenants#catalog_by_effective_date', :via => :get, :as => 'catalog_by_effective_date'
-    match '/suggest_plugin_name' => 'admin_tenants#suggest_plugin_name', :via => :get, :as => 'suggest_plugin_name'
     match '/switch' => 'admin_tenants#switch_tenant', :via => :get, :as => 'switch_tenant'
     match '/:id/download_catalog' => 'admin_tenants#download_catalog_xml', :via => :get, :as => 'download_catalog_xml'
   end

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/test/functional/kaui/admin_tenants_controller_test.rb

@@ -94,7 +94,7 @@ class Kaui::AdminTenantsControllerTest < Kaui::FunctionalTestHelper
     stripe_yml.each { |k, v| stripe_yml[k] = v.to_s }
     post :upload_plugin_config, :id => tenant.id, :plugin_name => 'killbill-stripe', :plugin_key => 'stripe', :plugin_type => 'ruby', :plugin_properties => stripe_yml
 
-    assert_redirected_to admin_tenant_path(tenant.id)
+    assert_redirected_to admin_tenant_path(tenant.id, :active_tab => 'PluginConfig')
     assert_equal 'Config for plugin was successfully uploaded', flash[:notice]
   end
 
@@ -284,26 +284,6 @@ class Kaui::AdminTenantsControllerTest < Kaui::FunctionalTestHelper
 
   end
 
-  test 'should suggest a plugin name' do
-    plugin_anchor = "'<a id=\"suggested\" data-plugin-name=\"killbill-paypal-express\" data-plugin-key=\"paypal_express\" data-plugin-type=\"ruby\" href=\"#\">killbill-paypal-express</a>'"
-
-    # Similar plugin already installed test will run, if there are plugin installed
-    installed_plugins = installed_plugins()
-    unless installed_plugins.blank?
-      installed_plugins.each do |plugin|
-        installed_plugin_anchor = "'<a id=\"suggested\" data-plugin-name=\"#{plugin[:plugin_name]}\" data-plugin-key=\"#{plugin[:plugin_key]}\".*href=\"#\">#{plugin[:plugin_name]}</a>'"
-
-        get :suggest_plugin_name, :plugin_name => plugin[:plugin_name][0, plugin[:plugin_name].length - 1]
-        assert_response :success
-        assert_match /Similar plugin already installed: #{installed_plugin_anchor}/, JSON[@response.body]['suggestion']
-      end
-    end
-
-    get :suggest_plugin_name, :plugin_name => 'pypl'
-    assert_response :success
-    assert_equal "Did you mean #{plugin_anchor}?", JSON[@response.body]['suggestion']
-  end
-
   test 'should switch tenant' do
     other_tenant = setup_and_create_test_tenant(1)
     other_tenant_kaui = Kaui::Tenant.find_by_kb_tenant_id(other_tenant.tenant_id)
@@ -362,7 +342,7 @@ class Kaui::AdminTenantsControllerTest < Kaui::FunctionalTestHelper
       next if plugin.plugin_key.nil? || plugin.version.nil?
       next if installed_plugins.any? { |p| p[:plugin_name].eql?(plugin.plugin_name) }
       installed_plugins << {
-          plugin_key: Kaui::AdminTenant.rewrite_plugin_key(plugin.plugin_key),
+          plugin_key: plugin.plugin_key,
           plugin_name: plugin.plugin_name
       }
     end

data/test/functional/kaui/credits_controller_test.rb

@@ -25,7 +25,7 @@ class Kaui::CreditsControllerTest < Kaui::FunctionalTestHelper
          :account_id => @account.account_id,
          :credit => {
              :invoice_id => invoice_id,
-             :credit_amount => 5.34
+             :amount => 5.34
          }
     assert_redirected_to account_path(@account.account_id)
     assert_equal "Error while communicating with the Kill Bill server: Error 404: Object id=#{invoice_id} type=INVOICE doesn't exist!", flash[:error]
@@ -35,7 +35,7 @@ class Kaui::CreditsControllerTest < Kaui::FunctionalTestHelper
     post :create,
          :account_id => @account.account_id,
          :credit => {
-             :credit_amount => 5.34
+             :amount => 5.34
          }
     assert_redirected_to account_path(@account.account_id)
     assert_equal 'Credit was successfully created', flash[:notice]
@@ -46,7 +46,7 @@ class Kaui::CreditsControllerTest < Kaui::FunctionalTestHelper
          :account_id => @account.account_id,
          :credit => {
              :invoice_id => @invoice_item.invoice_id,
-             :credit_amount => 5.34
+             :amount => 5.34
          }
     assert_redirected_to account_invoice_path(@account.account_id, @invoice_item.invoice_id)
     assert_equal 'Credit was successfully created', flash[:notice]

data/test/functional/kaui/home_controller_test.rb

@@ -188,7 +188,7 @@ class Kaui::HomeControllerTest < Kaui::FunctionalTestHelper
     dummy_uuid = SecureRandom.uuid.to_s
     credit = create_credit
     # search by ID
-    get :search, :q => query_builder('CREDIT',credit.credit_id, 'ID')
+    get :search, :q => query_builder('CREDIT',credit.invoice_item_id, 'ID')
     assert_redirected_to account_invoice_path(credit.account_id, credit.invoice_id)
 
     # search by ID and fails
@@ -202,11 +202,11 @@ class Kaui::HomeControllerTest < Kaui::FunctionalTestHelper
     assert_equal "\"CREDIT\": Search by \"EXTERNAL KEY\" is not supported.", flash[:error]
 
     # search by BLANK only first
-    get :search, :q => query_builder('CREDIT',credit.credit_id, nil, '1')
+    get :search, :q => query_builder('CREDIT',credit.invoice_item_id, nil, '1')
     assert_redirected_to account_invoice_path(credit.account_id, credit.invoice_id)
 
     # search by BLANK
-    get :search, :q => query_builder('CREDIT',credit.credit_id)
+    get :search, :q => query_builder('CREDIT',credit.invoice_item_id)
     assert_redirected_to account_invoice_path(credit.account_id, credit.invoice_id)
 
     # search by BLANK and fails
@@ -376,9 +376,9 @@ class Kaui::HomeControllerTest < Kaui::FunctionalTestHelper
   end
 
   def create_credit
-    credit = KillBillClient::Model::Credit.new(:invoice_id => nil, :account_id => @account.account_id, :credit_amount => 2.22)
+    credit = KillBillClient::Model::Credit.new(:invoice_id => nil, :account_id => @account.account_id, :amount => 2.22)
     credit = credit.create(true, 'kaui search test', nil, nil, build_options(@tenant, USERNAME, PASSWORD))
-    credit
+    credit.first
   end
 
   def create_custom_field

data/test/functional/kaui/subscriptions_controller_test.rb

@@ -96,7 +96,7 @@ class Kaui::SubscriptionsControllerTest < Kaui::FunctionalTestHelper
 
     post :update, :id => @bundle.subscriptions.first.subscription_id, :plan_name => 'not-exists'
     assert_redirected_to edit_subscription_path(@bundle.subscriptions.first.subscription_id)
-    assert_equal "Error while changing subscription: Error 400: Could not find a plan matching spec: (plan: 'not-exists', product: 'undefined', billing period: 'undefined', pricelist 'undefined')", flash[:error]
+    assert_equal "Error while changing subscription: Error 400: Could not find any plans named 'not-exists'", flash[:error]
   end
 
   test 'should update' do

data/test/killbill_test_helper.rb

@@ -28,7 +28,7 @@ module Kaui
       @bundle            = create_bundle(@account, @tenant)
       @invoice_item      = create_charge(@account, @tenant)
       @paid_invoice_item = create_charge(@account, @tenant, true)
-      @bundle_invoice    = @account.invoices(true, build_options(@tenant)).first
+      @bundle_invoice    = @account.invoices(build_options(@tenant)).first
       @payment_method    = create_payment_method(true, @account, @tenant)
       @payment           = create_payment(@paid_invoice_item, @account, @tenant)
 
@@ -159,15 +159,15 @@ module Kaui
       tenant  = create_tenant(user, reason, comment) if tenant.nil?
       account = create_account(tenant, username, password, user, reason, comment) if account.nil?
 
-      credit = KillBillClient::Model::Credit.new(:invoice_id => invoice_id, :account_id => account.account_id, :credit_amount => 23.22)
-      credit = credit.create(true, user, reason, comment, build_options(tenant, username, password))
+      credit = KillBillClient::Model::Credit.new(:invoice_id => invoice_id, :account_id => account.account_id, :amount => 23.22)
+      credit = credit.create(true, user, reason, comment, build_options(tenant, username, password)).first
 
-      invoice = KillBillClient::Model::Invoice.find_by_id(credit.invoice_id, true, 'NONE', build_options(tenant, username, password))
-      invoice.items.find { |ii| ii.amount == -credit.credit_amount }
+      invoice = KillBillClient::Model::Invoice.find_by_id(credit.invoice_id, 'NONE', build_options(tenant, username, password))
+      invoice.items.find { |ii| ii.amount == -credit.amount }
     end
 
     def commit_invoice(invoice_id, tenant, username = USERNAME, password = PASSWORD, user = 'Kaui test', reason = nil, comment = nil)
-      invoice = KillBillClient::Model::Invoice.find_by_id(invoice_id, false, 'NONE', build_options(tenant, username, password))
+      invoice = KillBillClient::Model::Invoice.find_by_id(invoice_id, 'NONE', build_options(tenant, username, password))
       invoice.commit(user, reason, comment, build_options(tenant, username, password))
     end
 

data/test/unit/helpers/kaui/payment_method_helper_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class PaymentMethodHelperTest < ActionView::TestCase
+
+  include Kaui::PaymentMethodHelper
+
+  test 'is_json?' do
+    assert !is_json?(5)
+    assert !is_json?('true')
+    assert !is_json?(false)
+    assert !is_json?("")
+    assert !is_json?(nil)
+    assert is_json?('[1, 2, 3]')
+    assert is_json?('{"value": "New", "onclick": "CreateNewDoc()"}')
+    assert !is_json?('{"value" => "New", "onclick": "CreateNewDoc()"}')
+  end
+end

data/test/unit/kaui/admin_tenant_test.rb

@@ -62,40 +62,6 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     assert_split(splitted)
   end
 
-  test 'can do a fuzzy match of a plugin to suggest a plugin' do
-    plugins_info = plugins_repo
-    adminTenantController = Kaui::AdminTenantsController.new
-
-    %w(killbill-paypal express paypal pay).each do |plugin_name|
-      found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-      assert_nil(found_plugin)
-      assert_equal weights[0][:plugin_name], 'killbill-paypal-express'
-    end
-
-    plugin_name = 'email'
-    found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-    assert_nil(found_plugin)
-    assert_equal weights[0][:plugin_name], 'killbill-email-notifications'
-
-    %w(first firstdata firstdata_e4).each do |plugin_name|
-      found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-      assert_nil(found_plugin)
-      assert_equal weights[0][:plugin_name], 'killbill-firstdata-e4'
-    end
-
-    %w(braintree brain).each do |plugin_name|
-      found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-      assert_nil(found_plugin)
-      assert_equal weights[0][:plugin_name], 'killbill-braintree_blue'
-    end
-
-    # if found weights should be empty
-    plugin_name = 'avatax'
-    found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
-    assert_equal weights.size, 0
-    assert_equal found_plugin[:plugin_name], 'killbill-avatax'
-  end
-
   test 'should fetch proprietary plugin config' do
     tenant = create_tenant()
     assert_not_nil(tenant)
@@ -106,12 +72,11 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     plugin_config = 'key=value'
     Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
 
-    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({}, options)
+    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config(options)
     assert_not_nil(plugins_config)
 
-    plugin_info = plugins_config.split('::')
-    assert_equal plugin_name, plugin_info[0]
-    assert_equal 'key=value|_raw=key=value', plugin_info[1].gsub('raw_config=','')
+    assert_equal plugin_name, plugins_config.keys.first
+    assert_equal 'key=value', plugins_config[plugin_name]
   end
 
   test 'should fetch plugin config' do
@@ -130,15 +95,13 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, 'ruby', plugin_properties)
     Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
 
-    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({ :paypal_express => { 'type' => 'ruby',
-                                                                  'artifact_id' => 'paypal-express-plugin'} }, options)
+    plugins_config = Kaui::AdminTenant.get_tenant_plugin_config(options)
     assert_not_nil(plugins_config)
-    plugin_info = plugins_config.split('::')
-    assert_equal plugin_key, plugin_info[0]
-    response_plugin_properties = plugin_info[1].split('|')
-    assert_equal plugin_properties[:signature], response_plugin_properties[0].split('=')[1]
-    assert_equal plugin_properties[:login], response_plugin_properties[1].split('=')[1]
-    assert_equal plugin_properties[:password], response_plugin_properties[2].split('=')[1]
+    assert_equal plugin_name, plugins_config.keys.first
+    response_plugin_properties = plugins_config[plugin_name].split
+    assert_equal plugin_properties[:signature], response_plugin_properties[3]
+    assert_equal plugin_properties[:login], response_plugin_properties[5]
+    assert_equal plugin_properties[:password], response_plugin_properties[7]
   end
 
   private
@@ -166,4 +129,4 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     assert_equal 'to', splitted[4]
     assert_equal 'split', splitted[5]
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -844,6 +844,7 @@ files:
 - test/test_helper.rb
 - test/unit/helpers/kaui/admin_allowed_users_helper_test.rb
 - test/unit/helpers/kaui/admin_tenants_helper_test.rb
+- test/unit/helpers/kaui/payment_method_helper_test.rb
 - test/unit/helpers/kaui/tenants_helper_test.rb
 - test/unit/helpers/kaui/uuid_helper_test.rb
 - test/unit/kaui/account_email_test.rb
@@ -904,6 +905,7 @@ test_files:
 - test/unit/kaui/tenant_test.rb
 - test/unit/kaui/money_helper_test.rb
 - test/unit/helpers/kaui/tenants_helper_test.rb
+- test/unit/helpers/kaui/payment_method_helper_test.rb
 - test/unit/helpers/kaui/admin_tenants_helper_test.rb
 - test/unit/helpers/kaui/admin_allowed_users_helper_test.rb
 - test/unit/helpers/kaui/uuid_helper_test.rb