kaui 1.4.0 → 2.0.3

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/_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/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/admin_tenants/_show_catalog_simple.erb

@@ -88,6 +88,10 @@
         var template = $("#currencies_template").html();
         var currencies_html = Mustache.render(template,data);
         $("#currency_select").html(currencies_html);
+
+        $('[id^="select_currencies"]').change(function() {
+            displayAmountsForCurrency();
+        });
     }
 
     function renderCatalog(data){
@@ -102,8 +106,8 @@
                 plan['new_plan_currency_path'] = Routes.kaui_engine_admin_tenant_new_plan_currency_path(<%= @tenant.id %>, {plan_id: plan['plan_id']});
                 plan['humanized_product_name'] = function(){
                     return function (input, render) {
-                        var product_name = render(input);
-                        return product_name.toLowerCase().replace(/\b\w/g, function(l){ return l.toUpperCase() });
+                        // Keep the product name as-is to avoid confusing with casing
+                        return render(input);
                     }
                 }
 
@@ -183,10 +187,6 @@
         $("#select_catalog").change(function() {
             fetchCatalog(this.value);
         });
-
-        $('[id^="select_currencies"]').change(function() {
-            displayAmountsForCurrency();
-        });
     });
 <% end %>
 

data/app/views/kaui/admin_tenants/new_catalog.html.erb

@@ -11,7 +11,7 @@
       <div class="form-group" id="form_category">
         <%= f.label :product_category, 'Product Category', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :product_category, options_for_select(@product_categories.map {|p| [humanized_product_category(p), p] }, :Base), :class => 'form-control' %>
+          <%= f.select :product_category, options_for_select(@product_categories.map {|p| [humanized_product_category(p), p] }, @simple_plan.product_category), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
@@ -47,31 +47,31 @@
       <div class="form-group">
         <%= f.label :amount, 'Amount', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.number_field :amount, :class => 'form-control', :value => 0, :step => :any %>
+          <%= f.number_field :amount, :class => 'form-control', :step => :any %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :currency, 'Currency', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :currency, currencies, {:selected => 'USD'}, :class => 'form-control' %>
+          <%= f.select :currency, currencies, {:selected => @simple_plan.currency}, :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :billing_period, 'Billing Period', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :billing_period, options_for_select(@billing_period.map {|bp| [humanized_billing_period(bp), bp] }, :MONTHLY), :class => 'form-control' %>
+          <%= f.select :billing_period, options_for_select(@billing_period.map {|bp| [humanized_billing_period(bp), bp] }, @simple_plan.billing_period), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :trial_length, 'Trial Length', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.number_field :trial_length, :class => 'form-control', :value => 0 %>
+          <%= f.number_field :trial_length, :class => 'form-control', :type => 'number', :min => 0, :step => 1 %>
         </div>
       </div>
       <div class="form-group">
         <%= f.label :trial_time_unit, 'Trial Time Unit', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-4">
-          <%= f.select :trial_time_unit, options_for_select(@time_units.map {|tu| [humanized_time_unit(tu), tu]}, :UNLIMITED), :class => 'form-control' %>
+          <%= f.select :trial_time_unit, options_for_select(@time_units.map {|tu| [humanized_time_unit(tu), tu]}, @simple_plan.trial_time_unit), :class => 'form-control' %>
         </div>
       </div>
       <div class="form-group">
@@ -111,15 +111,19 @@
 
 function known_products() {
     var result = [];
-    var selected_category = $("#simple_plan_product_category option:selected" ).text();
-    if (selected_category == 'Base') {
+    var selected_category = $("#simple_plan_product_category option:selected").val();
+    if (selected_category == 'BASE') {
         result = $('#simple_plan_product_name').attr('known_base');
-    } else if (selected_category == 'Add_on') {
+    } else if (selected_category == 'ADD_ON') {
         result = $('#simple_plan_product_name').attr('known_ao');
     } else {
         result = $('#simple_plan_product_name').attr('known_std');
     }
-    return result.split(",");
+    if (result) {
+      return result.split(",");
+    } else {
+      return [];
+    }
 }
 
 function switch_xml_config() {
@@ -128,7 +132,7 @@ function switch_xml_config() {
 }
 
 function recompute_available_base_products_for_ao() {
-    if ($("#simple_plan_product_category option:selected" ).text() != 'Add_on') {
+    if ($("#simple_plan_product_category option:selected" ).val() != 'ADD_ON') {
         return;
     }
     var product_name = $('#simple_plan_product_name').val();
@@ -147,10 +151,7 @@ function recompute_available_base_products_for_ao() {
 }
 
 function display_available_base_products_for_ao() {
-    /* Reset prodcut name value; known_products from auto completion will also be updated accordingly */
-    $('#simple_plan_product_name').val('');
-
-    if ($("#simple_plan_product_category option:selected" ).text() == 'Add_on') {
+    if ($("#simple_plan_product_category option:selected" ).val() == 'ADD_ON') {
         $('#form_base_products').show();
     } else {
         $('#form_base_products').hide();