rails_admin 3.0.0.rc → 3.0.0.rc4

data/lib/rails_admin/version.rb

@@ -3,7 +3,7 @@ module RailsAdmin
     MAJOR = 3
     MINOR = 0
     PATCH = 0
-    PRE = 'rc'.freeze
+    PRE = 'rc4'.freeze
 
     class << self
       # @return [String]
@@ -14,6 +14,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.0.0-rc",
+  "version": "3.0.0-rc4",
   "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/ui.js

@@ -80,12 +80,28 @@ import I18n from "./i18n";
       .each(function () {
         $(this).siblings(".control-group").hide();
       });
-    $("[formnovalidate]").on("click", function () {
-      $(this).closest("form").attr("novalidate", true);
-    });
+    $('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");
+      });
     $.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) {