activeadmin 2.4.0 → 2.5.0

data/app/assets/stylesheets/active_admin/_base.scss

@@ -1,36 +1,36 @@
 /* Active Admin CSS */
 // Normalize
-@import "active_admin/normalize";
+@import "./normalize";
 
 // Partials
-@import "active_admin/typography";
-@import "active_admin/header";
-@import "active_admin/forms";
-@import "active_admin/components/comments";
-@import "active_admin/components/flash_messages";
-@import "active_admin/components/date_picker";
-@import "active_admin/components/tables";
-@import "active_admin/components/batch_actions";
-@import "active_admin/components/modal_dialog";
-@import "active_admin/components/blank_slates";
-@import "active_admin/components/breadcrumbs";
-@import "active_admin/components/dropdown_menu";
-@import "active_admin/components/buttons";
-@import "active_admin/components/grid";
-@import "active_admin/components/links";
-@import "active_admin/components/pagination";
-@import "active_admin/components/panels";
-@import "active_admin/components/columns";
-@import "active_admin/components/scopes";
-@import "active_admin/components/status_tags";
-@import "active_admin/components/table_tools";
-@import "active_admin/components/index_list";
-@import "active_admin/components/unsupported_browser";
-@import "active_admin/components/tabs";
-@import "active_admin/pages/logged_out";
-@import "active_admin/structure/footer";
-@import "active_admin/structure/main_structure";
-@import "active_admin/structure/title_bar";
+@import "./typography";
+@import "./header";
+@import "./forms";
+@import "./components/comments";
+@import "./components/flash_messages";
+@import "./components/date_picker";
+@import "./components/tables";
+@import "./components/batch_actions";
+@import "./components/modal_dialog";
+@import "./components/blank_slates";
+@import "./components/breadcrumbs";
+@import "./components/dropdown_menu";
+@import "./components/buttons";
+@import "./components/grid";
+@import "./components/links";
+@import "./components/pagination";
+@import "./components/panels";
+@import "./components/columns";
+@import "./components/scopes";
+@import "./components/status_tags";
+@import "./components/table_tools";
+@import "./components/index_list";
+@import "./components/unsupported_browser";
+@import "./components/tabs";
+@import "./pages/logged_out";
+@import "./structure/footer";
+@import "./structure/main_structure";
+@import "./structure/title_bar";
 
 body {
   @include sans-family;

data/app/assets/stylesheets/active_admin/_header.scss

@@ -1,5 +1,3 @@
-//= depend_on_asset "active_admin/nested_menu_arrow.gif"
-//= depend_on_asset "active_admin/nested_menu_arrow_dark.gif"
 // ----------------------------------- Header
 #header {
   @include primary-gradient;
@@ -75,12 +73,12 @@
       }
 
       &.has_nested > a {
-        background: image-url('active_admin/nested_menu_arrow.gif') no-repeat calc(100% - 7px) 50%;
+        background: url($menu-arrow-light-icon-url) no-repeat calc(100% - 7px) 50%;
         padding-right: 20px;
       }
 
       &.has_nested.current > a {
-        background: $current-menu-item-background image-url('active_admin/nested_menu_arrow_dark.gif') no-repeat calc(100% - 7px) 50%;
+        background: $current-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%;
         padding-right: 20px;
       }
 
@@ -92,7 +90,7 @@
       &.has_nested:hover > a {
         @include rounded-top(10px);
         border-bottom: 5px solid $hover-menu-item-background;
-        background: $hover-menu-item-background image-url('active_admin/nested_menu_arrow_dark.gif') no-repeat calc(100% - 7px) 50%;
+        background: $hover-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%;
         z-index: 1020;
       }
 

data/app/assets/stylesheets/active_admin/_mixins.scss

@@ -1 +1 @@
-@import "active_admin/mixins/all";
+@import "./mixins/all";

data/app/assets/stylesheets/active_admin/components/_tables.scss

@@ -1,4 +1,3 @@
-//= depend_on_asset "active_admin/orderable.png"
 // ----------------------------------- Tables
 
 table tr {
@@ -33,7 +32,7 @@ table.index_table {
     }
 
     &.sortable a {
-      background: image-url('active_admin/orderable.png') no-repeat 0 4px; padding-left: 13px;
+      background: url($orderable-icon-url) no-repeat 0 4px; padding-left: 13px;
     }
 
     &.sorted-asc a { background-position: 0 -27px; }

data/app/assets/stylesheets/active_admin/mixins/_all.scss

@@ -1,8 +1,8 @@
-@import "active_admin/mixins/variables";
-@import "active_admin/mixins/gradients";
-@import "active_admin/mixins/shadows";
-@import "active_admin/mixins/rounded";
-@import "active_admin/mixins/buttons";
-@import "active_admin/mixins/sections";
-@import "active_admin/mixins/utilities";
-@import "active_admin/mixins/typography";
+@import "./variables";
+@import "./gradients";
+@import "./shadows";
+@import "./rounded";
+@import "./buttons";
+@import "./sections";
+@import "./utilities";
+@import "./typography";

data/app/assets/stylesheets/active_admin/mixins/_variables.scss

@@ -2,6 +2,11 @@
 // They can be overridden by prepending your own
 // to 'app/assets/stylesheets/active_admin.scss'.
 
+// Images
+$menu-arrow-light-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAL6+vry8vIiIiJWVlf///3t7ewAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
+$menu-arrow-dark-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAG1tbWxsbElJSVBQUP///0JCQgAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
+$orderable-icon-url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAABGCAYAAAAAVo4aAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAH5JREFUeNpi3LhlOwMU1AExGxDXwARYoHQLEFdD2cxAXAliMKFJgEAFEHfBJEHGMKLhMpgkTsAEdch/NNwCk2xCdiEQtML4LEgCf6EubUX3Cgh0oNvJ+P//f7wOGpUclRwYSZb41CyidNbB8giNM+9oXhmVHHm5bJjUSAABBgDKKiwMMUxPwgAAAABJRU5ErkJggg==' !default;
+
 // Colors
 $body-background-color: #FFF !default;
 $primary-color: #5E6469 !default;

data/app/assets/stylesheets/active_admin/print.scss

@@ -5,10 +5,10 @@ $primary-color: black;
 $text-color: black;
 
 // Normalize
-@import "active_admin/normalize";
+@import "./normalize";
 
 // Partials
-@import "active_admin/typography";
+@import "./typography";
 
 body {
   font-family: Helvetica, Arial, sans-serif;

data/app/assets/stylesheets/active_admin/structure/_main_structure.scss

@@ -15,7 +15,7 @@
     width: 100%;
 
     #main_content{
-      margin-right: 300px;
+      margin-right: $sidebar-width + ($section-padding * 2);
     }
   }
 

data/app/javascript/active_admin/base.js

@@ -0,0 +1,19 @@
+import "jquery"
+import "jquery-ui/ui/widgets/datepicker"
+import "jquery-ui/ui/widgets/dialog"
+import "jquery-ui/ui/widgets/sortable"
+import "jquery-ui/ui/widgets/tabs"
+import "jquery-ui/ui/widget"
+import "jquery-ujs"
+
+import "./ext/jquery"
+import "./ext/jquery-ui"
+import "./initializers/batch-actions"
+import "./initializers/checkbox-toggler"
+import "./initializers/datepicker"
+import "./initializers/dropdown-menu"
+import "./initializers/filters"
+import "./initializers/has-many"
+import "./initializers/per-page"
+import "./initializers/table-checkbox-toggler"
+import "./initializers/tabs"

data/app/{assets/javascripts/active_admin/lib/batch_actions.es6 → javascript/active_admin/initializers/batch-actions.js}

@@ -1,10 +1,12 @@
+import ModalDialog from "../lib/modal-dialog";
+
 const onDOMReady = function() {
   // Detach any previously attached handlers before re-attaching them.
   // This avoids double-registered handlers when Turbolinks is enabled
   $('.batch_actions_selector li a').off('click confirm:complete');
 
   //
-  // Use ActiveAdmin.modal_dialog to prompt user if
+  // Use ModalDialog to prompt user if
   // confirmation is required for current Batch Action
   //
   $('.batch_actions_selector li a').on('click', function(event){
@@ -12,7 +14,7 @@ const onDOMReady = function() {
     event.stopPropagation(); // prevent Rails UJS click event
     event.preventDefault();
     if ((message = $(this).data('confirm'))) {
-      ActiveAdmin.modal_dialog(message, $(this).data('inputs'), inputs => {
+      ModalDialog(message, $(this).data('inputs'), inputs => {
         $(this).trigger('confirm:complete', inputs);
       });
     } else {

data/app/javascript/active_admin/initializers/checkbox-toggler.js

@@ -0,0 +1,3 @@
+import CheckboxToggler from "../lib/checkbox-toggler";
+
+$.widget.bridge('checkboxToggler', CheckboxToggler);

data/app/javascript/active_admin/initializers/dropdown-menu.js

@@ -0,0 +1,9 @@
+import DropdownMenu from "../lib/dropdown-menu";
+
+$.widget.bridge('aaDropdownMenu', DropdownMenu);
+
+const onDOMReady = () => $('.dropdown_menu').aaDropdownMenu();
+
+$(document).
+  ready(onDOMReady).
+  on('page:load turbolinks:load', onDOMReady);

data/app/javascript/active_admin/initializers/filters.js

@@ -0,0 +1,10 @@
+import Filters from '../lib/filters';
+
+(($) => {
+
+  $(document).
+    on('click', '.clear_filters_btn', Filters._clearForm).
+    on('submit', '.filter_form', Filters._disableEmptyInputFields).
+    on('change', '.filter_form_field.select_and_search select', Filters._setSearchType);
+
+})(jQuery);

data/app/javascript/active_admin/initializers/per-page.js

@@ -0,0 +1,13 @@
+import PerPage from "../lib/per-page";
+
+(($) => {
+
+  $(document).
+    on('change', '.pagination_per_page > select', function(event) {
+      PerPage._jQueryInterface.call($(this), 'update')
+    });
+
+  $.fn['perPage'] = PerPage._jQueryInterface
+  $.fn['perPage'].Constructor = PerPage
+
+})(jQuery);

data/app/javascript/active_admin/initializers/table-checkbox-toggler.js

@@ -0,0 +1,3 @@
+import TableCheckboxToggler from "../lib/table-checkbox-toggler";
+
+$.widget.bridge('tableCheckboxToggler', TableCheckboxToggler);

data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js}

@@ -1,4 +1,4 @@
-ActiveAdmin.CheckboxToggler = class CheckboxToggler {
+class CheckboxToggler {
   constructor(options, container){
     this.options = options;
     this.container = container;
@@ -46,4 +46,4 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
   }
 };
 
-$.widget.bridge('checkboxToggler', ActiveAdmin.CheckboxToggler);
+export default CheckboxToggler;

data/app/{assets/javascripts/active_admin/lib/dropdown-menu.es6 → javascript/active_admin/lib/dropdown-menu.js}

@@ -1,5 +1,4 @@
-ActiveAdmin.DropdownMenu = class DropdownMenu {
-
+class DropdownMenu {
   constructor(options, element) {
     this.options = options;
     this.element = element;
@@ -114,10 +113,4 @@ ActiveAdmin.DropdownMenu = class DropdownMenu {
   }
 };
 
-$.widget.bridge('aaDropdownMenu', ActiveAdmin.DropdownMenu);
-
-const onDOMReady = () => $('.dropdown_menu').aaDropdownMenu();
-
-$(document).
-  ready(onDOMReady).
-  on('page:load turbolinks:load', onDOMReady);
+export default DropdownMenu;

data/app/javascript/active_admin/lib/filters.js

@@ -0,0 +1,39 @@
+import { queryStringToParams, hasTurbolinks, turbolinksVisit, toQueryString } from '../lib/utils';
+
+class Filters {
+
+  static _clearForm(event) {
+    const regex = /^(q\[|q%5B|q%5b|page|utf8|commit)/;
+    const params = queryStringToParams()
+      .filter(({name}) => !name.match(regex));
+
+    event.preventDefault();
+
+    if (hasTurbolinks()) {
+      turbolinksVisit(params);
+    } else {
+      window.location.search = toQueryString(params);
+    }
+  }
+
+  static _disableEmptyInputFields(event) {
+    const params = $(this)
+      .find(':input')
+      .filter((i, input) => input.value === '')
+      .prop({ disabled: true })
+      .end()
+      .serializeArray();
+
+    if (hasTurbolinks()) {
+      event.preventDefault();
+      turbolinksVisit(params);
+    }
+  }
+
+  static _setSearchType() {
+    $(this).siblings('input').prop({name: `q[${this.value}]`});
+  }
+
+}
+
+export default Filters;

data/app/{assets/javascripts/active_admin/lib/modal_dialog.es6 → javascript/active_admin/lib/modal-dialog.js}

@@ -1,4 +1,4 @@
-ActiveAdmin.modal_dialog = function(message, inputs, callback){
+function ModalDialog(message, inputs, callback){
   let html = `<form id="dialog_confirm" title="${message}"><ul>`;
   for (let name in inputs) {
     var elem, opts, wrapper;
@@ -59,3 +59,5 @@ ActiveAdmin.modal_dialog = function(message, inputs, callback){
     }
   });
 };
+
+export default ModalDialog;

data/app/javascript/active_admin/lib/per-page.js

@@ -0,0 +1,38 @@
+import { queryStringToParams, hasTurbolinks, turbolinksVisit, toQueryString } from './utils';
+
+class PerPage {
+  constructor(element) {
+    this.element = element;
+  }
+
+  update() {
+    const params = queryStringToParams()
+      .filter(({name}) => name != 'per_page' || name != 'page')
+
+    params.push({ name: 'per_page', value: this.element.value });
+
+    if (hasTurbolinks()) {
+      turbolinksVisit(params);
+    } else {
+      window.location.search = toQueryString(params);
+    }
+  }
+
+  static _jQueryInterface(config) {
+    return this.each(function () {
+      const $this = $(this)
+      let data = $this.data('perPage')
+
+      if (!data) {
+        data = new PerPage(this)
+        $this.data('perPage', data)
+      }
+
+      if (config === 'update') {
+        data[config]()
+      }
+    })
+  }
+};
+
+export default PerPage;

data/app/{assets/javascripts/active_admin/lib/table-checkbox-toggler.es6 → javascript/active_admin/lib/table-checkbox-toggler.js}

@@ -1,4 +1,6 @@
-ActiveAdmin.TableCheckboxToggler = class TableCheckboxToggler extends ActiveAdmin.CheckboxToggler {
+import CheckboxToggler from "./checkbox-toggler";
+
+class TableCheckboxToggler extends CheckboxToggler {
   _bind() {
     super._bind(...arguments);
 
@@ -33,4 +35,4 @@ ActiveAdmin.TableCheckboxToggler = class TableCheckboxToggler extends ActiveAdmi
   }
 };
 
-$.widget.bridge('tableCheckboxToggler', ActiveAdmin.TableCheckboxToggler);
+export default TableCheckboxToggler;

data/app/javascript/active_admin/lib/utils.js

@@ -0,0 +1,40 @@
+function hasTurbolinks() {
+  return (typeof Turbolinks !== 'undefined' && Turbolinks.supported);
+}
+
+function turbolinksVisit(params) {
+  const path = [window.location.pathname, '?', toQueryString(params)].join('')
+  Turbolinks.visit(path);
+}
+
+function queryString() {
+  return (window.location.search || '').replace(/^\?/, '');
+}
+
+function queryStringToParams() {
+  const decode = (value) => decodeURIComponent((value || '').replace(/\+/g, '%20'));
+
+  return queryString()
+    .split("&")
+    .map(pair => pair.split("="))
+    .map(([key, value]) => {
+      return { name: decode(key), value: decode(value) }
+    });
+}
+
+function toQueryString(params) {
+  const encode = (value) => encodeURIComponent(value || '');
+
+  return params
+    .map(({name, value}) => [ encode(name), encode(value) ])
+    .map(pair => pair.join('='))
+    .join('&')
+}
+
+export {
+  hasTurbolinks,
+  turbolinksVisit,
+  queryString,
+  queryStringToParams,
+  toQueryString
+};