kaui 2.0.0 → 2.1.0

data/app/helpers/kaui/subscription_helper.rb

@@ -10,25 +10,39 @@ module Kaui
     end
 
     def humanized_product_category(product_category)
-      if product_category == 'BASE'
+      if product_category.to_s == 'BASE'
         'Base'
-      elsif product_category == 'ADD_ON'
+      elsif product_category.to_s == 'ADD_ON'
         'Add-on'
       else
-        product_category.downcase.capitalize
+        product_category.to_s.downcase.capitalize
       end
     end
 
-    def humanized_subscription_product_name(sub)
-      if !sub.present? or !sub.product_name.present?
+    def humanized_subscription_product_name(sub, catalog = nil)
+      if !sub.present? || !sub.product_name.present?
         nil
       else
-        humanized_product_name(sub.product_name)
+        product = catalog.nil? ? nil : catalog.products.find { |p| p.name == sub.product_name }
+        humanized_product_name(!product.nil? && !product.pretty_name.blank? ? product.pretty_name : sub.product_name)
+      end
+    end
+
+    def humanized_subscription_pretty_plan_name(sub, catalog = nil)
+      if !sub.present? || !sub.product_name.present?
+        nil
+      else
+        product = catalog.nil? ? nil : catalog.products.find { |p| p.name == sub.product_name }
+        return nil if product.nil?
+
+        plan = product.plans.find { |p| p.name == sub.plan_name }
+        plan.nil? || plan.pretty_name.blank? ? nil : plan.pretty_name
       end
     end
 
     def humanized_product_name(product_name)
-        product_name.downcase.capitalize
+      # Don't change the casing to avoid confusions (could lead to different products with different casing)
+      product_name
     end
 
     def humanized_subscription_billing_period(sub)
@@ -55,8 +69,11 @@ module Kaui
       end
     end
 
-    def humanized_subscription_full_product_name(sub)
-      humanized_product_name   = humanized_subscription_product_name(sub)
+    def humanized_subscription_plan_or_product_name(sub, catalog = nil)
+      pretty_plan_name = humanized_subscription_pretty_plan_name(sub, catalog)
+      return pretty_plan_name unless pretty_plan_name.nil?
+
+      humanized_product_name   = humanized_subscription_product_name(sub, catalog)
       humanized_billing_period = humanized_subscription_billing_period(sub)
       humanized_price_list     = humanized_subscription_price_list(sub, false)
 

data/app/helpers/kaui/uuid_helper.rb

@@ -6,6 +6,7 @@ module Kaui
       split = uuid.split('-')
       split[0] + '-...-' + split[4]
     end
+    module_function :truncate_uuid
 
     def object_id_popover(object_id, placement = 'right', title = nil)
       content_tag(:span, truncate_uuid(object_id),

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/models/kaui/catalog.rb

@@ -4,9 +4,35 @@ class Kaui::Catalog < KillBillClient::Model::Catalog
 
   class << self
 
-    def get_catalog_json(latest, requested_date, options)
+    def get_account_catalog_json(account_id, requested_date = nil, options = {})
+      params = {}
+      params[:accountId] = account_id
+      params[:requestedDate] = requested_date if requested_date
+
+      get KillBillClient::Model::Catalog::KILLBILL_API_CATALOG_PREFIX,
+          params,
+          {
+              :head => {'Accept' => "application/json"},
+              :content_type => "application/json",
+
+          }.merge(options)
+    end
 
-      catalogs = KillBillClient::Model::Catalog.get_tenant_catalog_json(requested_date, options)
+    def get_tenant_catalog_json(requested_date = nil, options = {})
+      super
+    rescue ::KillBillClient::API::InternalServerError => e
+      if !e.response.nil? && !e.response.body.nil?
+        error_message = JSON.parse(e.response.body) rescue nil
+        raise e if error_message.nil? || error_message['message'].nil?
+
+        # Hack for lack of proper Kill Bill messaging (see https://github.com/killbill/killbill-admin-ui/issues/265)
+        return [] if error_message['message'].starts_with?('No existing versions')
+      end
+      raise e
+    end
+
+    def get_catalog_json(latest, requested_date, options)
+      catalogs = get_tenant_catalog_json(requested_date, options)
       return catalogs.length > 0 ? catalogs[catalogs.length - 1] : nil if latest
 
       # Order by latest

data/app/models/kaui/tag.rb

@@ -9,7 +9,7 @@ class Kaui::Tag < KillBillClient::Model::Tag
   end
 
   class << self
-    [:account, :bundle, :subscription].each do |model|
+    [:account, :bundle, :subscription, :invoice].each do |model|
       define_method "all_for_#{model.to_s}" do |model_id, included_deleted, audit, options|
         instance = Kaui.const_get(model.to_s.camelize).new("#{model.to_s}_id".to_sym => model_id)
         instance.tags(included_deleted, audit, options)

data/app/views/kaui/account_emails/_form.html.erb

@@ -2,7 +2,7 @@
     <div class='form-group'>
       <%= f.label :email, 'Email', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.text_field :email, :class => 'form-control', :required => true %>
+        <%= f.email_field :email, :class => 'form-control', :required => true %>
       </div>
     </div>
     <div class="form-group">

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

@@ -25,6 +25,10 @@
                       <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Create charge'.html_safe,
                                   kaui_engine.new_account_charge_path(@account.account_id, :currency => @account.currency) %>
                   <% end %>
+                  <% if deposit_plugin_available? %>
+                      <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Create deposit'.html_safe,
+                                  deposit_engine.collection_index_path(:account_id => @account.account_id, :currency => @account.currency) %>
+                  <% end %>
                 </div>
               </div>
             </div>

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

@@ -38,7 +38,7 @@
     <div class="form-group">
       <%= f.label :email, 'Email', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.text_field :email, :class => 'form-control' %>
+        <%= f.email_field :email, :class => 'form-control' %>
       </div>
     </div>
     <% unless @account.persisted? %>

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

@@ -7,6 +7,9 @@
           <%= link_to '<i class="fa fa-plus-square"></i>'.html_safe,
                       kaui_engine.new_payment_method_path(:account_id => @account.account_id),
                       :class => 'btn btn-xs' %>
+          <%= form_tag kaui_engine.refresh_payment_methods_path(params.to_h), :method => :post, :class => 'form-force-inline form-right' do %>
+              <%= button_tag '<i class="fa fa-refresh"></i>'.html_safe, :class => 'btn btn-xs' %>
+          <% end %>
       <% end %>
     </h1>
 

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

@@ -13,8 +13,9 @@
       <tr>
         <th></th>
         <th>ID</th>
-        <th>External key</th>
-        <th>Balance</th>
+        <% Kaui.account_search_columns.call()[0].each do |title| %>
+          <th><%= title %></th>
+        <% end %>
       </tr>
       </thead>
       <tbody>
@@ -39,8 +40,10 @@ $(document).ready(function() {
     },
     "pageLength": <%= @limit %>,
     "displayStart": <%= @offset %>,
-    <% unless @ordering.blank? %>
-        "order": [[ 1, "<%= @ordering %>" ]],
+    <% if @search_query.blank? %>
+      "ordering": false,
+    <% elsif !@ordering.blank? %>
+      "order": [[ 1, "<%= @ordering %>" ]],
     <% end %>
     "processing": true,
     "serverSide": true,

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-6">
+              <textarea name="plugin_properties[raw_config]" id="raw_config" rows="20" 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,225 +156,50 @@
             }
 
             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) {
             /* Retrieve existing plugin properties for this tenant */
             var existing_props = get_existing_tenant_plugin_properties(plugin_key);
 
-            // try by plugin name for proprietary plugins
-            if (isBlank(existing_props)) {
+            // Try by plugin name for proprietary plugins
+            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] = '';
+                if (isBlank(existing_props)) {
+                    // For proprietary plugins, the killbill- prefix likely doesn't exist (see Kaui::PluginHelper discussion)
+                    plugin_name = plugin_name.replace('killbill-', '');
+                    existing_props = get_existing_tenant_plugin_properties(plugin_name);
+                    if (isBlank(existing_props)) {
+                        // For proprietary plugins, our docs suggest acme:foo as the format for the plugin key, and often the plugin name becomes acme-foo
+                        plugin_name = plugin_name.replace(':', '-');
+                        existing_props = get_existing_tenant_plugin_properties(plugin_name);
                     }
-                });
-            }
-
-            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);
-                });
-
-            } else {
-                $(".plugin-suggestion").html('');
             }
 
-            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);
+            return existing_props;
         }
 
-        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;
+        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_name = $("#entered_plugin_name").val();
             }
 
-            $('#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 %>