activeadmin 2.6.1 → 3.2.3

data/CONTRIBUTING.md

@@ -25,8 +25,7 @@ git checkout -b 325-add-japanese-translations
 
 ### Get the test suite running
 
-Make sure you're using a recent ruby and have the `bundler` gem installed, at
-least version `1.14.3`.
+Make sure you're using a recent Ruby version.
 
 You'll also need chrome installed in order to run cucumber scenarios.
 
@@ -56,14 +55,14 @@ Now you should be able to run the entire suite using:
 bin/rake
 ```
 
-The test run will generate a sample Rails application in `tmp/test_apps` to run the
-tests against.
+The task will generate a sample Rails application in `tmp/test_apps` to run the
+test suite against.
 
 If you want to test against a Rails version different from the latest, make sure
 you use the correct Gemfile, for example:
 
 ```sh
-export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
+export BUNDLE_GEMFILE=gemfiles/rails_61/Gemfile
 ```
 
 **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
@@ -108,29 +107,6 @@ with the db:
 bin/rake local db:migrate
 ```
 
-### Get the style right
-
-Your patch should follow the same conventions & pass the same code quality
-checks as the rest of the project. `bin/rake lint` will give you feedback in
-this regard. You can check & fix style issues by running each linter
-individually. Run `bin/rake -T lint` to see the available linters.
-
-### Add a changelog entry
-
-If your PR includes user-observable changes, you'll be asked to add a changelog
-entry following the existing changelog format.
-
-The changelog format is the following:
-
-* One line per PR describing your fix or enhancement.
-* Entries end with a dot, followed by "[#pr-number] by [@github-username]".
-* Entries are added under the "Unreleased" section at the top of the file, under
-  the "Bug Fixes" or "Enhancements" subsection.
-* References to github usernames and pull requests use [shortcut reference
-  links].
-* Your github username reference definition is included in the correct
-  alphabetical position at the bottom of the file.
-
 ### Make a Pull Request
 
 At this point, you should switch back to your master branch and make sure it's
@@ -152,12 +128,12 @@ git push --set-upstream origin 325-add-japanese-translations
 
 Finally, go to GitHub and [make a Pull Request][] :D
 
-CircleCI will run our test suite against all supported Rails versions. We care
-about quality, so your PR won't be merged until all tests pass. It's unlikely,
-but it's possible that your changes pass tests in one Rails version but fail in
-another. In that case, you'll have to setup your development environment (as
-explained in step 3) to use the problematic Rails version, and investigate
-what's going on!
+Github Actions will run our test suite against all supported Rails versions. We
+care about quality, so your PR won't be merged until all tests pass. It's
+unlikely, but it's possible that your changes pass tests in one Rails version
+but fail in another. In that case, you'll have to setup your development
+environment (as explained in step 3) to use the problematic Rails version, and
+investigate what's going on!
 
 ### Keeping your Pull Request updated
 
@@ -190,12 +166,12 @@ met.
 
 Maintainers need to do the following to push out a release:
 
-* Make sure all pull requests are in and that changelog is current
 * Switch to the master branch and make sure it's up to date.
 * Make sure you have [chandler] properly configured. Chandler is used to
   automatically submit github release notes from the changelog right after
   pushing the gem to rubygems.
 * Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
+* Review and merge the PR. The generated changelog in the PR should include all user visible changes you intend to ship.
 * Run `bin/rake release` from the target branch once the PR is merged.
 
 [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
@@ -204,7 +180,7 @@ Maintainers need to do the following to push out a release:
 [fork Active Admin]: https://help.github.com/articles/fork-a-repo
 [make a pull request]: https://help.github.com/articles/creating-a-pull-request
 [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
-[interactive rebase]: https://help.github.com/articles/interactive-rebase
+[interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase
 [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
 [Rollup]: https://rollupjs.org/guide/en/#quick-start
 [Yarn]: https://yarnpkg.com/en/docs/install

data/README.md

@@ -4,7 +4,7 @@
 creating elegant backends for website administration.
 
 [![Version         ][rubygems_badge]][rubygems]
-[![Circle CI       ][circle_badge]][circle]
+[![Github Actions  ][actions_badge]][actions]
 [![Coverage        ][coverage_badge]][coverage]
 [![Tidelift        ][tidelift_badge]][tidelift]
 [![Inch CI         ][inch_badge]][inch]
@@ -85,23 +85,23 @@ Thanks to [Tidelift][tidelift] and all our Tidelift subscribers.
 Thanks to [Open Collective][opencollective contributors] and all our Open Collective contributors.
 
 [Arbre]: https://github.com/activeadmin/arbre
-[Devise]: https://github.com/plataformatec/devise
-[Formtastic]: https://github.com/justinfrench/formtastic
+[Devise]: https://github.com/heartcombo/devise
+[Formtastic]: https://github.com/formtastic/formtastic
 [Inherited Resources]: https://github.com/activeadmin/inherited_resources
 [Kaminari]: https://github.com/kaminari/kaminari
 [Ransack]: https://github.com/activerecord-hackery/ransack
 
 [rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg
 [rubygems]: https://rubygems.org/gems/activeadmin
-[circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg?style=svg
-[circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
-[coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
-[coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
+[actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
+[actions]: https://github.com/activeadmin/activeadmin/actions
+[coverage_badge]: https://codecov.io/gh/activeadmin/activeadmin/branch/master/graph/badge.svg?token=NAjeBdkQXW
+[coverage]: https://codecov.io/gh/activeadmin/activeadmin
 [inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master
 [inch]: http://inch-ci.org/github/activeadmin/activeadmin
 [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin
 [tidelift]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme
-[tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=enterprise
+[tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise
 [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
 
 [docs]: http://activeadmin.info/0-installation.html

data/app/assets/javascripts/active_admin/base.js

@@ -11,7 +11,7 @@
 //= require_self
 
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = global || self, 
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
   factory(global.ActiveAdmin = {}));
 })(this, function(exports) {
   "use strict";
@@ -27,18 +27,17 @@
   function ModalDialog(message, inputs, callback) {
     var html = '<form id="dialog_confirm" title="' + message + '"><ul>';
     for (var name in inputs) {
-      var elem, opts, wrapper;
+      var opts, wrapper;
       var type = inputs[name];
       if (/^(datepicker|checkbox|text|number)$/.test(type)) {
         wrapper = "input";
       } else if (type === "textarea") {
         wrapper = "textarea";
       } else if ($.isArray(type)) {
-        var _ref = [ "select", "option", type, "" ];
+        var _ref = [ "select", type, "" ];
         wrapper = _ref[0];
-        elem = _ref[1];
-        opts = _ref[2];
-        type = _ref[3];
+        opts = _ref[1];
+        type = _ref[2];
       } else {
         throw new Error("Unsupported input type: {" + name + ": " + type + "}");
       }
@@ -46,29 +45,28 @@
       html += "<li>\n      <label>" + (name.charAt(0).toUpperCase() + name.slice(1)) + "</label>\n      <" + wrapper + ' name="' + name + '" class="' + klass + '" type="' + type + '">' + (opts ? function() {
         var result = [];
         opts.forEach(function(v) {
-          var $elem = $("<" + elem + "/>");
+          var $elem = $("<option></option>");
           if ($.isArray(v)) {
             $elem.text(v[0]).val(v[1]);
           } else {
             $elem.text(v);
           }
-          result.push($elem.wrap("<div>").parent().html());
+          result.push($elem.wrap("<div></div>").parent().html());
         });
         return result;
       }().join("") : "") + ("</" + wrapper + ">") + "</li>";
       var _ref2 = [];
       wrapper = _ref2[0];
-      elem = _ref2[1];
-      opts = _ref2[2];
-      type = _ref2[3];
-      klass = _ref2[4];
+      opts = _ref2[1];
+      type = _ref2[2];
+      klass = _ref2[3];
     }
     html += "</ul></form>";
     var form = $(html).appendTo("body");
     $("body").trigger("modal_dialog:before_open", [ form ]);
     form.dialog({
       modal: true,
-      open: function open(event, ui) {
+      open: function open(_event, _ui) {
         $("body").trigger("modal_dialog:after_open", [ form ]);
       },
       dialogClass: "active_admin_dialog",
@@ -83,7 +81,7 @@
       }
     });
   }
-  var onDOMReady = function onDOMReady() {
+  var onDOMReady$2 = function onDOMReady() {
     $(".batch_actions_selector li a").off("click confirm:complete");
     $(".batch_actions_selector li a").on("click", function(event) {
       var _this = this;
@@ -127,7 +125,7 @@
       });
     }
   };
-  $(document).ready(onDOMReady).on("page:load turbolinks:load", onDOMReady);
+  $(document).ready(onDOMReady$2).on("page:load turbolinks:load", onDOMReady$2);
   var CheckboxToggler = function() {
     function CheckboxToggler(options, container) {
       this.options = options;
@@ -136,7 +134,7 @@
       this._bind();
     }
     var _proto = CheckboxToggler.prototype;
-    _proto.option = function option(key, value) {};
+    _proto.option = function option(_key, _value) {};
     _proto._init = function _init() {
       if (!this.container) {
         throw new Error("Container element not found");
@@ -159,7 +157,7 @@
         return _this._didChangeToggleAllCheckbox();
       });
     };
-    _proto._didChangeCheckbox = function _didChangeCheckbox(checkbox) {
+    _proto._didChangeCheckbox = function _didChangeCheckbox(_checkbox) {
       var numChecked = this.checkboxes.filter(":checked").length;
       var allChecked = numChecked === this.checkboxes.length;
       var someChecked = numChecked > 0 && numChecked < this.checkboxes.length;
@@ -394,7 +392,6 @@
     $(document).on("change", '.has_many_container[data-sortable] :input[name$="[_destroy]"]', function() {
       recompute_positions($(this).closest(".has_many"));
     });
-    init_sortable();
     $(document).on("has_many_add:after", ".has_many_container", init_sortable);
   });
   var init_sortable = function init_sortable() {
@@ -428,6 +425,7 @@
       }
     });
   };
+  $(document).ready(init_sortable).on("page:load turbolinks:load", init_sortable);
   var PerPage = function() {
     function PerPage(element) {
       this.element = element;
@@ -464,7 +462,7 @@
     return PerPage;
   }();
   (function($) {
-    $(document).on("change", ".pagination_per_page > select", function(event) {
+    $(document).on("change", ".pagination_per_page > select", function(_event) {
       PerPage._jQueryInterface.call($(this), "update");
     });
     $.fn["perPage"] = PerPage._jQueryInterface;
@@ -473,7 +471,14 @@
   function _inheritsLoose(subClass, superClass) {
     subClass.prototype = Object.create(superClass.prototype);
     subClass.prototype.constructor = subClass;
-    subClass.__proto__ = superClass;
+    _setPrototypeOf(subClass, superClass);
+  }
+  function _setPrototypeOf(o, p) {
+    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
+      o.__proto__ = p;
+      return o;
+    };
+    return _setPrototypeOf(o, p);
   }
   var TableCheckboxToggler = function(_CheckboxToggler) {
     _inheritsLoose(TableCheckboxToggler, _CheckboxToggler);
@@ -503,17 +508,14 @@
     return TableCheckboxToggler;
   }(CheckboxToggler);
   $.widget.bridge("tableCheckboxToggler", TableCheckboxToggler);
-  var onDOMReady$2 = function onDOMReady() {
+  var onDOMReady = function onDOMReady() {
     return $("#active_admin_content .tabs").tabs();
   };
-  $(document).ready(onDOMReady$2).on("page:load turbolinks:load", onDOMReady$2);
+  $(document).ready(onDOMReady).on("page:load turbolinks:load", onDOMReady);
   function modal_dialog(message, inputs, callback) {
     console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
     return ModalDialog(message, inputs, callback);
   }
   exports.ModalDialog = ModalDialog;
   exports.modal_dialog = modal_dialog;
-  Object.defineProperty(exports, "__esModule", {
-    value: true
-  });
 });

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

@@ -1,41 +1,57 @@
 /* Active Admin CSS */
-// Normalize
-@import "./normalize";
+@media screen {
+  // Normalize
+  @import "./normalize";
 
-// Partials
-@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";
+  // Partials
+  @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;
-  line-height: 1.5;
-  font-size: 72%;
-  background: $body-background-color;
-  color: $text-color;
+  html {
+    box-sizing: border-box;
+  }
+
+  *,
+  *:before,
+  *:after {
+    box-sizing: inherit;
+  }
+
+  body {
+    @include sans-family;
+    line-height: 1.5;
+    font-size: 72%;
+    background: $body-background-color;
+    color: $text-color;
+  }
+}
+
+@media print {
+  @import "./print";
 }

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

@@ -171,7 +171,7 @@ form {
     &.boolean {
       min-height: 1.1em;
       label {
-        width: 80%;
+        width: 100%;
         padding-left:20%;
         padding-right: 10px;
         text-transform: none !important;
@@ -220,9 +220,8 @@ form {
   /* Buttons */
 
   input[type=submit], input[type=button], button {
-    @include dark-button;
     cursor: pointer;
-
+    @include dark-button;
   }
 
   .buttons, .actions {
@@ -250,8 +249,6 @@ form {
 
 // -------------------------------------- Sidebar Forms
 
-$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
-
 .sidebar_section {
 
   label {
@@ -274,13 +271,6 @@ $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
 
 // -------------------------------------- Filter Forms
 
-$filter-field-seperator-width: 12px;
-
-$side-by-side-filter-input-width: ($sidebar-inner-content-width / 2) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
-$side-by-side-filter-select-width: ($sidebar-inner-content-width / 2) - $filter-field-seperator-width;
-
-$date-range-filter-input-width: ($sidebar-inner-content-width / 2) - ($filter-field-seperator-width / 2);
-
 form.filter_form {
   .filter_form_field {
     margin-bottom: 10px;
@@ -313,7 +303,6 @@ form.filter_form {
 
     &.filter_date_range {
       input[type=text] {
-        box-sizing: border-box;
         width: $date-range-filter-input-width;
 
         + input {

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

@@ -52,6 +52,11 @@
     margin: 0;
     padding: 0;
 
+    li {
+      /* Hover on li, display the ul */
+      &:hover > ul { display: block;}
+    }
+
     & > li {
       display: inline-block;
       margin-right: 4px;
@@ -95,8 +100,6 @@
       }
 
 
-      /* Hover on li, display the ul */
-      &:hover ul { display: block;}
       /* Drop down menus */
       ul {
         background: $hover-menu-item-background;
@@ -114,6 +117,7 @@
         z-index: 1010;
 
         li {
+          position: relative;
           margin: 0px;
           a {
             background: none;
@@ -124,10 +128,40 @@
           &.current {
             a { @include rounded(0) }
           }
+
+          &.has_nested > a {
+            background: url($menu-arrow-right-light-icon-url) no-repeat calc(100% - 7px) 55%;
+            padding-right: 20px;
+          }
+
+          &.has_nested:hover > a {
+            background: url($menu-arrow-right-dark-icon-url) no-repeat calc(100% - 7px) 55%;
+            color: #fff;
+          }
+
+          ul {
+            @include rounded-all(10px,10px,10px,10px);
+            margin-top: 0;
+            top: -3px;
+            left: 100%;
+
+            /* Create an invisible backdrop that adds 8px margin around the dropdown menu or submenu
+               that maintains the hover. This makes it much easier to navigate to submenus in
+               particular without losing hover accientally, especially near rounded corners. */
+            &:after {
+              content: "";
+              display: block;
+              position: absolute;
+              top: -8px;
+              left: -8px;
+              height: calc(100% + 16px);
+              width: calc(100% + 16px);
+              z-index: -2;
+            }
+          }
         }
       }
     }
-
   }
 
   #tabs {