activeadmin_addons 0.12.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7b657178df2d8d9aa225ff46d4cd07e178a82e1
-  data.tar.gz: c439b4bb6dc8835f8264d80f9bad2e9786860551
+  metadata.gz: fa31c78bc883475ce2612e17cbe6df64673aaeb1
+  data.tar.gz: 3288dd697cb86f8443f0a54ed4908d95e54b20a6
 SHA512:
-  metadata.gz: a3f1a38e47deaac87e470163dc80056f89cb1b446cc5c834f94883d541ce3d757041ed2dea7bbdf619f8ff5eb7005bbc3fc0f3e36c781d49eea612ec87fa89a2
-  data.tar.gz: 355f3a995e4771798d5ac0667037b45e356cab4541a98545587f7e33013f4b3886e137d147f586699ac9a8d8b2a444d9e85176457a2f2b32e2f646d9aff26310
+  metadata.gz: 50bb5c8a8c6ef359a20d25d22a04fad97a84eaf983da55d7131fead15d2707d56aa4ab43d7d707c3b945c9026dd5f91cd9256e5f6f66a87fcc83d9e279fa8f5d
+  data.tar.gz: 76b358cfb0f0994d3998530e87cb76a390cfa9f8d637d723f3615618c540d813a148abc832973f82a82347e274057094223c83906da8b95bf480a52097f31524

data/app/assets/javascripts/activeadmin_addons/all.js.coffee

@@ -1,5 +1,12 @@
+#= require select2-full
+#= require jquery.xdan.datetimepicker.full
+#= require palette-color-picker
+
 #= require ./config
-#= require ./select2
-#= require ./selected-list
-#= require ./date-time-picker
-#= require ./color-picker
+#= require ./inputs/select2
+#= require ./inputs/search-select
+#= require ./inputs/nested-select
+#= require ./inputs/tags
+#= require ./inputs/selected-list
+#= require ./inputs/date-time-picker
+#= require ./inputs/color-picker

data/app/assets/javascripts/activeadmin_addons/config.js

@@ -1,7 +1,7 @@
 $(function() {
   ActiveadminAddons = {
     config: {
-      defaultSelect: $('body').data('default-select')
-    }
-  }
+      defaultSelect: $('body').data('default-select'),
+    },
+  };
 });

data/app/assets/javascripts/activeadmin_addons/{color-picker.js → inputs/color-picker.js}

@@ -1,16 +1,12 @@
-//= require ../palette-color-picker
-//= require_self
-
 $(function() {
-
   setupColorPicker();
 
   $(document).on('has_many_add:after', setupColorPicker);
 
   function setupColorPicker() {
-    $('.color-picker').each(function(i, el) {
+    $('.color-picker-input').each(function(i, el) {
       $(el).paletteColorPicker({
-        clear_btn: 'last'
+        'clear_btn': 'last',
       });
     });
   }

data/app/assets/javascripts/activeadmin_addons/{date-time-picker.js → inputs/date-time-picker.js}

@@ -1,5 +1,3 @@
-//= require jquery.xdan.datetimepicker.full
-
 $(function() {
   setupDateTimePicker(document);
 
@@ -8,18 +6,19 @@ $(function() {
   });
 
   function setupDateTimePicker(container) {
-    var defaults, entries;
-    defaults = {
+    var defaults = {
       formatDate: 'y-m-d',
       format: 'Y-m-d H:i',
       allowBlank: true,
       defaultSelect: false,
-      validateOnBlur: false
+      validateOnBlur: false,
     };
-    entries = $(container).find('input.date-time-picker');
+
+    var entries = $(container).find('input.date-time-picker-input');
     return entries.each(function(index, entry) {
       var options = $(entry).data('picker-options');
-      return $(entry).datetimepicker($.extend(defaults, options));
+      var mixedOptions = $.extend(defaults, options);
+      return $(entry).datetimepicker(mixedOptions);
     });
   }
 });

data/app/assets/javascripts/activeadmin_addons/inputs/nested-select.js

@@ -0,0 +1,160 @@
+$.fn.select2.amd.define('select2/data/nestedCustomAdapter', ['select2/data/array', 'select2/utils'], function(ArrayData, Utils) {
+  function CustomData($element, options) {
+    CustomData.__super__.constructor.call(this, $element, options);
+  }
+
+  Utils.Extend(CustomData, ArrayData);
+
+  CustomData.prototype.query = function(params, callback) {
+    var data = { results: [] };
+    var element = this.$element;
+    var collection = element.data('collection');
+    var parent = element.data('parent');
+    var parentId = element.data('parent-id');
+
+    collection.forEach(function(record) {
+      var regex = new RegExp(params.term, 'i');
+      var matched = !!record.text.match(regex);
+
+      if ((!parent || record[parent] == parentId) && matched) {
+        data.results.push(record);
+      }
+    });
+
+    callback(data);
+  };
+
+  CustomData.prototype.current = function(callback) {
+    var currentOption = null;
+    var element = this.$element;
+    var selectedOption = element.data('selected');
+    var collection = element.data('collection');
+    var data = [];
+
+    $.each(collection, function(index, option) {
+      if (!!selectedOption && option.id == selectedOption.id) {
+        currentOption = option;
+        element.data('selected', null);
+        return;
+      }
+
+      if (element.val() == option.id) {
+        currentOption = option;
+        return;
+      }
+    });
+
+    if (currentOption) {
+      data.push(currentOption);
+    }
+
+    callback(data);
+  };
+
+  return CustomData;
+});
+
+$(function() {
+  configureSelect2(document);
+
+  $(document).on('has_many_add:after', function(event, container) {
+    configureSelect2(container);
+  });
+
+  function configureSelect2(container) {
+    var INVALID_PARENT_ID = -1;
+
+    $('.nested-level-input', container).each(function(i, el) {
+      var element = $(el);
+      var url = element.data('url');
+      var fields = element.data('fields');
+      var displayName = element.data('display-name');
+      var parent = element.data('parent');
+      var width = element.data('width');
+      var model = element.data('model');
+      var responseRoot = element.data('response-root');
+      var collection = element.data('collection');
+      var minimumInputLength = element.data('minimum-input-length');
+      var order = element.data('order');
+      var parentId = element.data('parent-id');
+      var selectInstance;
+
+      var select2Config = {
+        width: width,
+        minimumInputLength: minimumInputLength,
+        placeholder: '',
+        allowClear: true,
+      };
+
+      if (collection) {
+        select2Config.dataAdapter = $.fn.select2.amd.require('select2/data/nestedCustomAdapter');
+      } else {
+        var ajaxConfig = {
+          url: url,
+          dataType: 'json',
+          delay: 250,
+          cache: true,
+          data: function(params) {
+            var textQuery = { m: 'or' };
+            fields.forEach(function(field) {
+              if (field == 'id') {
+                textQuery[field + '_eq'] = params.term;
+              } else {
+                textQuery[field + '_contains'] = params.term;
+              }
+            });
+
+            var query = {
+              order: order,
+              q: {
+                groupings: [textQuery],
+                combinator: 'and',
+              },
+            };
+
+            if (!!parent) {
+              query.q[parent + '_eq'] = parentId;
+            }
+
+            return query;
+          },
+          processResults: function(data) {
+            if (data.constructor == Object) {
+              data = data[responseRoot];
+            }
+
+            return {
+              results: jQuery.map(data, function(resource) {
+                if (!resource[displayName]) {
+                  resource[displayName] = 'No display name for id #' + resource.id.toString();
+                }
+                return {
+                  id: resource.id,
+                  text: resource[displayName].toString(),
+                };
+              }),
+            };
+          },
+        };
+
+        select2Config.ajax = ajaxConfig;
+      }
+
+      selectInstance = element.select2(select2Config);
+
+      function setParentValue(e) {
+        selectInstance.val(null).trigger('select2:select').trigger('change');
+        parentId = (e.params && e.params.data.id) ? e.params.data.id : INVALID_PARENT_ID;
+        element.data('parent-id', parentId);
+      }
+
+      if (!!parent) {
+        var parentSelectorId = '#' + model + '_' + parent;
+        var parentSelector = $(parentSelectorId)[0];
+
+        $(parentSelector).on('select2:select', setParentValue);
+        $(parentSelector).on('select2:unselect', setParentValue);
+      }
+    });
+  }
+});

data/app/assets/javascripts/activeadmin_addons/inputs/search-select.js

@@ -0,0 +1,71 @@
+$(function() {
+  setupSearchSelect(document);
+
+  $(document).on('has_many_add:after', function(event, container) {
+    setupSearchSelect(container);
+  });
+
+  function setupSearchSelect(container) {
+    $('.search-select-input, .search-select-filter-input, ajax-filter-input', container).each(function(i, el) {
+      var url = $(el).data('url');
+      var fields = $(el).data('fields');
+      var displayName = $(el).data('display-name');
+      var width = $(el).data('width');
+      var responseRoot = $(el).data('response-root');
+      var minimumInputLength = $(el).data('minimum-input-length');
+      var order = $(el).data('order');
+
+      var selectOptions = {
+        width: width,
+        minimumInputLength: minimumInputLength,
+        placeholder: '',
+        allowClear: true,
+        ajax: {
+          url: url,
+          dataType: 'json',
+          delay: 250,
+          cache: true,
+          data: function(params) {
+            var textQuery = { m: 'or' };
+            fields.forEach(function(field) {
+              if (field == 'id') {
+                textQuery[field + '_eq'] = params.term;
+              } else {
+                textQuery[field + '_contains'] = params.term;
+              }
+            });
+
+            var query = {
+              order: order,
+              q: {
+                groupings: [textQuery],
+                combinator: 'and',
+              },
+            };
+
+            return query;
+          },
+          processResults: function(data) {
+            if (data.constructor == Object) {
+              data = data[responseRoot];
+            }
+
+            return {
+              results: jQuery.map(data, function(resource) {
+                if (!resource[displayName]) {
+                  resource[displayName] = 'No display name for id #' + resource.id.toString();
+                }
+                return {
+                  id: resource.id,
+                  text: resource[displayName].toString(),
+                };
+              }),
+            };
+          },
+        },
+      };
+
+      $(el).select2(selectOptions);
+    });
+  }
+});

data/app/assets/javascripts/activeadmin_addons/inputs/select2.js

@@ -0,0 +1,49 @@
+$(function() {
+  configureSelect2(document);
+
+  $(document).on('has_many_add:after', function(event, container) {
+    configureSelect2(container);
+  });
+
+  function configureSelect2(container) {
+    if (ActiveadminAddons.config.defaultSelect == 'select2') {
+      $('select:not(.default-select)', container).each(function(i, el) {
+        setupSelect2(el);
+      });
+    }
+
+    $('select.select2', container).each(function(i, el) {
+      setupSelect2(el);
+    });
+
+    function setupSelect2(select) {
+      var selectConfig = {
+        placeholder: '',
+        width: '80%',
+        allowClear: true,
+      };
+
+      function isFilter(path) {
+        return $(select).closest(path).length > 0;
+      }
+
+      if (isFilter('.select_and_search')) {
+        selectConfig.width = 'resolve';
+        selectConfig.allowClear = false;
+      } else if (isFilter('.filter_select')) {
+        selectConfig.width = 'resolve';
+      }
+
+      $(select).select2(selectConfig);
+
+      // Related with https://github.com/select2/select2/issues/3320
+      $(select).on('select2:unselecting', function() {
+        $(this).data('unselecting', true);
+      }).on('select2:open', function() {
+        if ($(this).data('unselecting')) {
+          $(this).select2('close').removeData('unselecting');
+        }
+      });
+    }
+  }
+});

data/app/assets/javascripts/activeadmin_addons/{selected-list.js → inputs/selected-list.js}

@@ -1,10 +1,7 @@
-//= require select2
-//= require_self
-
 $(function() {
   setupSelectedList(document);
 
-  $(document).on('has_many_add:after', function(event, container){
+  $(document).on('has_many_add:after', function(event, container) {
     setupSelectedList(container);
   });
 
@@ -16,48 +13,43 @@ $(function() {
       }
     });
 
-    $('.selected-list', container).each(function(i, el) {
-      var url = $(el).data('url'),
-          fields = $(el).data('fields'),
-          displayName = $(el).data('display_name'),
-          width = $(el).data('width') || '100%',
-          method = $(el).data('method'),
-          model = $(el).data('model'),
-          prefix = model + '_' + method,
-          responseRoot = $(el).data('response_root'),
-          minimumInputLength = $(el).data('minimum_input_length'),
-          order = $(el).data('order') || (fields[0] + '_desc');
-
+    $('.selected-list-input', container).each(function(i, el) {
+      var url = $(el).data('url');
+      var fields = $(el).data('fields');
+      var displayName = $(el).data('display-name');
+      var method = $(el).data('method');
+      var model = $(el).data('model');
+      var prefix = model + '_' + method;
+      var responseRoot = $(el).data('response-root');
+      var minimumInputLength = $(el).data('minimum-input-length');
+      var order = $(el).data('order');
 
       var selectOptions = {
-        width: width,
         minimumInputLength: minimumInputLength,
         allowClear: true,
-        multiple: true,
-        createSearchChoice: function() { return null; },
         ajax: {
           url: url,
           dataType: 'json',
           delay: 250,
           cache: true,
-          data: function(term) {
+          data: function(params) {
             var textQuery = { m: 'or' };
             fields.forEach(function(field) {
-              textQuery[field + '_contains'] = term;
+              textQuery[field + '_contains'] = params.term;
             });
 
-            var query =  {
+            var query = {
               order: order,
               q: {
                 groupings: [textQuery],
-                combinator: 'and'
-              }
+                combinator: 'and',
+              },
             };
 
             return query;
           },
-          results: function(data, page) {
-            if(data.constructor == Object) {
+          processResults: function(data) {
+            if (data.constructor == Object) {
               data = data[responseRoot];
             }
 
@@ -65,46 +57,46 @@ $(function() {
               results: jQuery.map(data, function(resource) {
                 return {
                   id: resource.id,
-                  text: resource[displayName].toString()
+                  text: resource[displayName].toString(),
                 };
-              })
+              }),
             };
           },
         },
       };
 
+      $(el).on('select2:select', onItemSelected);
+      $(el).on('select2:close', onSelectClosed);
+      $(el).select2(selectOptions);
+
       function onItemSelected(event) {
-        var selectedItemsContainer = $("[id='" + prefix + "_selected_values']"),
-          itemName = model + '[' + method + '][]',
-          itemId = prefix + '_' + event.val;
+        var data = event.params.data;
+        var selectedItemsContainer = $("[id='" + prefix + "_selected_values']");
+        var itemName = model + '[' + method + '][]';
+        var itemId = prefix + '_' + data.id;
 
-        if ($("#" + itemId).length > 0) {
+        if ($('#' + itemId).length > 0) {
           return;
         }
 
-        var item = $('<div>' + event.object.text + '</div>').attr({
+        var item = $('<div>' + data.text + '</div>').attr({
           class: 'selected-item',
           id: itemId,
         });
 
-        var hidden_input = $('<input>').attr({
+        var hiddenInput = $('<input>').attr({
           name: itemName,
           type: 'hidden',
-          value: event.val
+          value: data.id,
         });
 
         item.appendTo(selectedItemsContainer);
-        hidden_input.appendTo(item);
+        hiddenInput.appendTo(item);
       }
 
       function onSelectClosed() {
-        $(el).select2('val', '');
+        $(el).val(null).trigger('change');
       }
-
-      $(el).on('select2-selecting', onItemSelected);
-      $(el).on('select2-close', onSelectClosed);
-
-      $(el).select2(selectOptions);
     });
   }
 });