rails_admin 3.0.0.rc3 → 3.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed0d71c0798b98c4a0afdff5fa2ed48ffd05d1e0124d52ccdb371012d117479
-  data.tar.gz: ed51dc928885ae4c57e9f02a9e40cf7689731570a78efc7d1bdfbe3afbd7e298
+  metadata.gz: e9316454f8142d78f5723f035c4dae4d4c1e43b1a4f67b9fe3382a46fac7a3a7
+  data.tar.gz: 42019837af600e34a153786615addcc21c1709bdffb78f96dddfd322ad54d5d6
 SHA512:
-  metadata.gz: ff6f4ff15d8722cb44f4bbfeb8375c6c68c24be7cfadaa1e0b2dcf323f43321bc40296c60cdbcd2a9ecc28685261ca5ef00b046481394044d3f6f3970e6ddf86
-  data.tar.gz: a23d415f1987f61dd8d5bf7dcac7d2d7307e602a0afe3d16c94d8a639ad952135154cc31728bd1f41e181e0f1a829d39afb8898c6fc1a301a75fa64649b117d7
+  metadata.gz: 57095a84c563d2b37d54a03ec88a412b32438c7ff0653075380fe86669c9d19206219b896d3827f931f1a1f98434e98b9209ec2fb2a5735f98410fff758cf6a8
+  data.tar.gz: 2d3f9afaaef4ebe8a69793ba8e4da469ee5ea91e1821aa2d82f91884165354a79d0b8b5b08d0988f04584eef4f0aebff985006043ace64e8814c434789f65ffb

data/README.md

@@ -45,7 +45,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', ['>= 3.0.0.rc3', '< 4']`
+1. On your gemfile: `gem 'rails_admin', ['>= 3.0.0.rc4', '< 4']`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked

data/app/helpers/rails_admin/application_helper.rb

@@ -169,7 +169,7 @@ module RailsAdmin
               else
                 'javascript:void(0)'
               end
-            content_tag(:a, label, {href: href, target: action.link_target, class: ['nav-link', current_action?(action) && 'active', !action.enabled? && 'disabled'].compact})
+            content_tag(:a, label, {href: href, target: action.link_target, class: ['nav-link', current_action?(action) && 'active', !action.enabled? && 'disabled'].compact}.merge(action.turbo? ? {} : {data: {turbo: 'false'}}))
           else
             content_tag(:span, label)
           end

data/app/views/layouts/rails_admin/_head.html.erb

@@ -5,13 +5,16 @@
 <%= csrf_meta_tag %>
 <% case RailsAdmin::config.asset_source
    when :webpacker %>
-  <%= stylesheet_pack_tag "rails_admin" %>
-  <%= javascript_pack_tag "rails_admin", async: true %>
-<% when :webpack, :sprockets %>
+  <%= stylesheet_pack_tag "rails_admin", data: {'turbo-track': 'reload'} %>
+  <%= javascript_pack_tag "rails_admin", async: true, data: {'turbo-track': 'reload'} %>
+<% when :sprockets %>
   <% handle_asset_dependency_error do %>
-    <%= stylesheet_link_tag "rails_admin/application.css", media: :all %>
-    <%= javascript_include_tag "rails_admin/application.js", async: true %>
+    <%= stylesheet_link_tag "rails_admin/application.css", media: :all, data: {'turbo-track': 'reload'} %>
+    <%= javascript_include_tag "rails_admin/application.js", async: true, data: {'turbo-track': 'reload'} %>
   <% end %>
+<% when :webpack %>
+  <%= stylesheet_link_tag "rails_admin.css", media: :all, data: {'turbo-track': 'reload'} %>
+  <%= javascript_include_tag "rails_admin.js", async: true, data: {'turbo-track': 'reload'} %>
 <% else
      raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"
    end %>

data/app/views/layouts/rails_admin/_secondary_navigation.html.erb

@@ -1,7 +1,7 @@
 <ul class="navbar-nav ms-auto root_links">
   <% actions(:root).select(&:show_in_navigation).each do |action| %>
     <li class="nav-item <%= action.action_name %>_root_link">
-      <%= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: ['nav-link'] %>
+      <%= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, {class: ['nav-link']}.merge(action.turbo? ? {} : {data: {turbo: 'false'}}) %>
     </li>
   <% end %>
   <% if main_app_root_path = (main_app.root_path rescue false) %>
@@ -17,7 +17,7 @@
     <% end %>
     <% if logout_path.present? %>
       <li class="nav-item">
-        <%= link_to t('admin.misc.log_out'), logout_path, method: logout_method, class: 'nav-link label label-danger' %>
+        <%= link_to t('admin.misc.log_out'), logout_path, method: logout_method, class: 'nav-link label label-danger', data: {turbo: 'false'} %>
       </li>
     <% end %>
   <% end %>

data/app/views/layouts/rails_admin/application.html.erb

@@ -14,7 +14,7 @@
           <%= render "layouts/rails_admin/sidebar_navigation" %>
         </div>
         <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2">
-          <div class="container">
+          <div class="container-fluid">
             <%= render template: 'layouts/rails_admin/content' %>
           </div>
         </div>

data/app/views/rails_admin/main/show.html.erb

@@ -10,16 +10,18 @@
             <%= fieldset.help %>
           </p>
         <% end %>
-        <dl>
+        <div class="list-group">
           <% fields.each_with_index do |field, index| %>
-            <dt>
-              <span class="<%= field.type_css_class %> <%= field.css_class %> label label-info">
-                <%= field.label %>
-              </span>
-            </dt>
-            <dd class="well">
-              <%= field.pretty_value %>
-            </dd>
+            <div class="list-group-item border-0 <%= field.type_css_class %> <%= field.css_class %>">
+              <div class="card">
+                <h5 class="card-header bg-light">
+                  <%= field.label %>
+                </h5>
+                <div class="card-body">
+                  <%= field.pretty_value %>
+                </div>
+              </div>
+            </div>
           <% end %>
         </dl>
       </div>

data/lib/rails_admin/config/actions/base.rb

@@ -78,6 +78,11 @@ module RailsAdmin
           nil
         end
 
+        # Determines whether to navigate via Turbo Drive or not
+        register_instance_option :turbo? do
+          true
+        end
+
         # This block is evaluated in the context of the controller when action is called
         # You can access:
         # - @objects if you're on a model scope

data/lib/rails_admin/config/actions/show_in_app.rb

@@ -25,6 +25,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-eye'
         end
+
+        register_instance_option :turbo? do
+          false
+        end
       end
     end
   end

data/lib/rails_admin/engine.rb

@@ -2,6 +2,7 @@ require 'kaminari'
 require 'nested_form'
 require 'rails'
 require 'rails_admin'
+require 'rails_admin/version'
 require 'turbo-rails'
 
 module RailsAdmin
@@ -11,7 +12,7 @@ module RailsAdmin
     config.action_dispatch.rescue_responses['RailsAdmin::ActionNotAllowed'] = :forbidden
 
     initializer 'RailsAdmin precompile hook', group: :all do |app|
-      if app.config.respond_to?(:assets)
+      if defined?(Sprockets)
         app.config.assets.precompile += %w[
           rails_admin/application.js
           rails_admin/application.css
@@ -69,6 +70,8 @@ module RailsAdmin
 
       # Force route reload, since it doesn't reflect RailsAdmin action configuration yet
       app.reload_routes!
+
+      RailsAdmin::Version.warn_with_js_version
     end
   end
 end

data/lib/rails_admin/extensions/pundit/authorization_adapter.rb

@@ -7,7 +7,7 @@ module RailsAdmin
       class AuthorizationAdapter
         # This method is called first time only and used for setup
         def self.setup
-          RailsAdmin::Extensions::ControllerExtension.include ::Pundit
+          RailsAdmin::Extensions::ControllerExtension.include defined?(::Pundit::Authorization) ? ::Pundit::Authorization : ::Pundit
         end
 
         # See the +authorize_with+ config method for where the initialization happens.

data/lib/rails_admin/version.rb

@@ -3,7 +3,7 @@ module RailsAdmin
     MAJOR = 3
     MINOR = 0
     PATCH = 0
-    PRE = 'rc3'.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-rc3",
+  "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

@@ -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) {