rails_admin 3.0.0.rc3 → 3.1.0.beta

data/lib/rails_admin/version.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   class Version
     MAJOR = 3
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
-    PRE = 'rc3'.freeze
+    PRE = 'beta'
 
     class << self
       # @return [String]
@@ -14,6 +16,39 @@ module RailsAdmin
       def js
         JSON.parse(File.read("#{__dir__}/../../package.json"))['version']
       end
+
+      def actual_js_version
+        case RailsAdmin.config.asset_source
+        when :webpacker, :webpack
+          js_version_from_node_modules
+        else
+          js
+        end
+      end
+
+      def warn_with_js_version
+        return unless Rails.env.development? || Rails.env.test?
+
+        case actual_js_version
+        when js
+          # Good
+        when nil
+          warn "[Warning] Failed to detect RailsAdmin npm package, did you run 'yarn install'?"
+        else
+          warn <<~MSG
+            [Warning] RailsAdmin npm package version inconsistency detected, expected #{js} but actually used is #{actual_js_version}.
+            This may cause partial or total malfunction of RailsAdmin frontend features.
+          MSG
+        end
+      end
+
+    private
+
+      def js_version_from_node_modules
+        JSON.parse(File.read(Rails.root.join('node_modules/rails_admin/package.json')))['version']
+      rescue StandardError
+        nil
+      end
     end
   end
 end

data/lib/rails_admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/engine'
 require 'rails_admin/abstract_model'
 require 'rails_admin/config'
@@ -17,7 +19,7 @@ module RailsAdmin
   #
   # If only a block is passed it is stored to initializer stack to be evaluated
   # on first request in production mode and on each request in development. If
-  # initialization has already occured (in other words RailsAdmin.setup has
+  # initialization has already occurred (in other words RailsAdmin.setup has
   # been called) the block will be added to stack and evaluated at once.
   #
   # Otherwise returns RailsAdmin::Config class.

data/lib/tasks/rails_admin.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :rails_admin do
   desc 'Install rails_admin'
   task :install do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.0.0-rc3",
+  "version": "3.1.0-beta",
   "description": "RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.",
   "homepage": "https://github.com/railsadminteam/rails_admin",
   "license": "MIT",

data/src/rails_admin/base.js

@@ -3,7 +3,19 @@ import "@hotwired/turbo-rails";
 import jQuery from "jquery";
 import "./vendor/jquery_nested_form";
 import "bootstrap";
-import "flatpickr/dist/flatpickr";
+
+// These jQuery-UI indirect dependencies need to be preloaded to be used within Import maps
+import "jquery-ui/ui/version.js";
+import "jquery-ui/ui/keycode.js";
+import "jquery-ui/ui/position.js";
+import "jquery-ui/ui/safe-active-element.js";
+import "jquery-ui/ui/data.js";
+import "jquery-ui/ui/ie.js";
+import "jquery-ui/ui/scroll-parent.js";
+import "jquery-ui/ui/unique-id.js";
+import "jquery-ui/ui/widget.js";
+import "jquery-ui/ui/widgets/menu.js";
+import "jquery-ui/ui/widgets/mouse.js";
 
 import "./filter-box";
 import "./filtering-multiselect";

data/src/rails_admin/filtering-multiselect.js

@@ -1,7 +1,6 @@
 import jQuery from "jquery";
-import "jquery-ui/ui/widget";
+import "jquery-ui/ui/widget.js";
 import I18n from "./i18n";
-
 (function ($) {
   $.widget("ra.filteringMultiselect", {
     _cache: {},
@@ -112,15 +111,11 @@ import I18n from "./i18n";
       }
       if (this.options.sortable) {
         this.up = $(
-          '<a href="#" class="fas fa-chevron-circle-up ra-multiselect-item-up">' +
-            this.options.regional.up +
-            "</a>"
-        );
+          '<a href="#" class="fas fa-chevron-circle-up ra-multiselect-item-up"></a>'
+        ).attr("title", this.options.regional.up);
         this.down = $(
-          '<a href="#" class="fas fa-chevron-circle-down ra-multiselect-item-down">' +
-            this.options.regional.down +
-            "</a>"
-        );
+          '<a href="#" class="fas fa-chevron-circle-down ra-multiselect-item-down"></a>'
+        ).attr("title", this.options.regional.down);
         columns.center.append(this.up).append(this.down);
       }
 

data/src/rails_admin/filtering-select.js

@@ -1,6 +1,6 @@
 import jQuery from "jquery";
-import "jquery-ui/ui/widget";
-import "jquery-ui/ui/widgets/autocomplete";
+import "jquery-ui/ui/widget.js";
+import "jquery-ui/ui/widgets/autocomplete.js";
 import I18n from "./i18n";
 
 (function ($) {

data/src/rails_admin/nested-form-hooks.js

@@ -1,5 +1,5 @@
 import jQuery from "jquery";
-import * as bootstrap from "bootstrap/dist/js/bootstrap.esm";
+import * as bootstrap from "bootstrap";
 
 (function ($) {
   $(document).ready(function () {

data/src/rails_admin/remote-form.js

@@ -1,7 +1,7 @@
 import Rails from "@rails/ujs";
 import jQuery from "jquery";
-import "jquery-ui/ui/widget";
-import * as bootstrap from "bootstrap/dist/js/bootstrap.esm";
+import "jquery-ui/ui/widget.js";
+import * as bootstrap from "bootstrap";
 
 (function ($) {
   $.widget("ra.remoteForm", {
@@ -105,9 +105,8 @@ import * as bootstrap from "bootstrap/dist/js/bootstrap.esm";
       document.dispatchEvent(event);
 
       form.bind("ajax:complete", function (event) {
-        var data = event.detail[0],
-          status = event.detail[1];
-        if (status == "OK") {
+        var data = event.detail[0];
+        if (data.status == 200) {
           var json = $.parseJSON(data.responseText);
           var option =
             '<option value="' +

data/src/rails_admin/styles/base/theming.scss

@@ -42,6 +42,16 @@ body.rails_admin {
     > li > a {
       padding: ($navbar-padding-y / 2) ($grid-gutter-width / 2);
 
+      &.active {
+        background-color: map-get($theme-colors, primary);
+        color: color-contrast(map-get($theme-colors, primary));
+      }
+
+      &:hover {
+        background-color: map-get($theme-colors, primary);
+        color: color-contrast(map-get($theme-colors, primary));
+      }
+
       &.nav-level-1 {
         padding-left: $grid-gutter-width;
       }

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/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 ($) {
@@ -98,6 +98,10 @@ import I18n from "./i18n";
     $.each($("#filters_box").data("options"), function () {
       $.filters.append(this);
     });
+    // Workaround for https://github.com/heartcombo/devise/issues/5458
+    $("a[data-method]").on("click", function (event) {
+      window.Turbo.session.drive = false;
+    });
   });
 
   $(document).on("click", ".bulk-link", function (event) {
@@ -110,10 +114,15 @@ import I18n from "./i18n";
     event.preventDefault();
     $("#filters_box").html("");
     $("hr.filters_box").hide();
-    $(this).parent().siblings("input[type='search']").val("");
+    $(this).siblings("input[type='search']").val("");
     $(this).parents("form").submit();
   });
 
+  $(document).on("click", "th.header", function (event) {
+    event.preventDefault();
+    window.Turbo.visit($(this).data("href"));
+  });
+
   $(document).on(
     "click",
     "#fields_to_export label input#check_all",

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";