rails_admin 3.0.0 → 3.1.2

data/src/rails_admin/styles/base.scss

@@ -7,17 +7,17 @@
 
 /***  Libraries  ***/
 
-@import "~flatpickr/dist/flatpickr";
+@import "flatpickr/dist/flatpickr";
 
 /*** Font-awesome ***/
 
-$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
-@import "~@fortawesome/fontawesome-free/scss/solid";
-@import "~@fortawesome/fontawesome-free/scss/fontawesome";
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts" !default;
+@import "@fortawesome/fontawesome-free/scss/solid";
+@import "@fortawesome/fontawesome-free/scss/fontawesome";
 
 /***  Bootstrap  ***/
 
-@import "~bootstrap/scss/bootstrap";
+@import "bootstrap/scss/bootstrap";
 
 /***  RailsAdmin  ***/
 

data/src/rails_admin/styles/widgets.scss

@@ -21,6 +21,6 @@ iframe.wysihtml5-sandbox,
   display: none;
 }
 
-.links .inline.list-inline .disabled span {
+.links .list-inline .disabled span {
   color: $gray-600;
 }

data/src/rails_admin/ui.js

@@ -1,5 +1,5 @@
 import jQuery from "jquery";
-import "jquery-ui/ui/effect";
+import "jquery-ui/ui/effect.js";
 import I18n from "./i18n";
 
 (function ($) {
@@ -7,6 +7,34 @@ import I18n from "./i18n";
     $("#list [name='bulk_ids[]']").prop("checked", $(this).is(":checked"));
   });
 
+  $(document)
+    .on("turbo:click", function () {
+      $("#loading").show();
+    })
+    .on("turbo:before-render", function (event) {
+      document
+        .querySelectorAll('.sidebar .btn-toggle[aria-expanded="false"]')
+        .forEach((element) => {
+          const newButton = event.detail.newBody.querySelector(
+            `.sidebar [data-bs-target="${element.dataset.bsTarget}"]`
+          );
+          const newMenu = event.detail.newBody.querySelector(
+            element.dataset.bsTarget
+          );
+          if (newButton) {
+            newButton.parentNode.replaceChild(
+              element.cloneNode(true),
+              newButton
+            );
+          }
+          if (newMenu) {
+            newMenu.classList.remove("show");
+          }
+        });
+
+      $("#loading").hide();
+    });
+
   $(document).on("click", "[data-bs-target]", function () {
     if (!$(this).hasClass("disabled")) {
       if ($(this).has("i.fa-chevron-down").length) {
@@ -51,14 +79,16 @@ import I18n from "./i18n";
     }
   );
 
-  document.addEventListener("turbo:load", function () {
+  function triggerDomReady() {
     I18n.init($("html").attr("lang"), $("#admin-js").data("i18nOptions"));
 
     const event = new CustomEvent("rails_admin.dom_ready");
     document.dispatchEvent(event);
-  });
+  }
+  $(document).ready(triggerDomReady);
+  document.addEventListener("turbo:render", triggerDomReady);
 
-  document.addEventListener("rails_admin.dom_ready", function () {
+  document.addEventListener("rails_admin.dom_ready", function (event) {
     $(".nav.nav-pills li.active").removeClass("active");
     $(
       '.nav.nav-pills li[data-model="' + $(".page-header").data("model") + '"]'
@@ -80,21 +110,18 @@ import I18n from "./i18n";
       .each(function () {
         $(this).siblings(".control-group").hide();
       });
-    $('button[name][type="submit"]')
-      .attr("type", "button")
-      .on("click", function () {
-        var form = $(this).closest("form");
-        form.append(
-          $("<input />")
-            .attr("type", "hidden")
-            .attr("name", $(this).attr("name"))
-            .attr("value", true)
-        );
-        if ($(this).is("[formnovalidate]")) {
-          form.attr("novalidate", true);
-        }
-        form.trigger("submit");
-      });
+    $('button[name][type="submit"]').on("click", function () {
+      var form = $(this).closest("form");
+      form.append(
+        $("<input />")
+          .attr("type", "hidden")
+          .attr("name", $(this).attr("name"))
+          .attr("value", $(this).attr("value"))
+      );
+      if ($(this).is("[formnovalidate]")) {
+        form.attr("novalidate", true);
+      }
+    });
     $.each($("#filters_box").data("options"), function () {
       $.filters.append(this);
     });
@@ -102,6 +129,12 @@ import I18n from "./i18n";
     $("a[data-method]").on("click", function (event) {
       window.Turbo.session.drive = false;
     });
+
+    // Trigger via jQuery for compatibility with existing user codes
+    $(document).trigger(
+      "rails_admin.dom_ready",
+      event.detail ? [event.detail] : null
+    );
   });
 
   $(document).on("click", ".bulk-link", function (event) {

data/src/rails_admin/widgets.js

@@ -1,6 +1,6 @@
 import jQuery from "jquery";
-import "jquery-ui/ui/widgets/sortable";
-import * as bootstrap from "bootstrap/dist/js/bootstrap.esm";
+import "jquery-ui/ui/widgets/sortable.js";
+import * as bootstrap from "bootstrap";
 import flatpickr from "flatpickr";
 import I18n from "./i18n";
 
@@ -489,6 +489,11 @@ import I18n from "./i18n";
       return content.find("trix-editor").each(function () {
         if (!window.Trix) {
           options = $(this).data("options");
+          if (options.warn_dynamic_load) {
+            console.warn(
+              "ActionText assets should be loaded statically. Follow instructions in https://github.com/railsadminteam/rails_admin/wiki/ActionText"
+            );
+          }
           $("head").append(
             '<link href="' +
               options["csspath"] +