rails_admin 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4703829ff74c1be721a1622986bfe87c98c07e908991e997c903070c12216255
-  data.tar.gz: 3eddba360a94a4bd0a3d3e0c1eb62af9752b90e4637082b3ce6e3d576274c7b8
+  metadata.gz: 32f625ca21a5c94c2fc91766ae74ef690a92ff7f882068b70d617ad7b1e1ff3a
+  data.tar.gz: ed3af9f17b3277f11a4b17db9beffe03d80294b453bb086d7aa819c46ce9cc1d
 SHA512:
-  metadata.gz: b13e1468096711b8dfc4217563f26524512e2e219cdf69bf56aece88400bce7a3b2ec958fc1676f1fd253745c86ca1739f35f0e199983e0597fce986cda41484
-  data.tar.gz: bdb5a417cd53c3e301358ce96452b3d96acc73ccdd752a81187429aaabaa969c7c77fa02ee72be201c8303e61a3f6ffc3f07aea77ac1fb3a8d70da717c117647
+  metadata.gz: 2ad917ef318789585952a8e82084d3042960037a441ce1197f752f036e4f581107c37b0dab9466627fbe60e3f22e03d9a62f9af2f92ab9d77b1f5e02cfc85167
+  data.tar.gz: 02225217c1f2997fccfce31605d494bdc5668778482ccb8c84231cf431efaafa4a830988526c1bfae88cac4a0342d41d1d7bd10b9507a8c60c2da2f1131d3250

data/app/helpers/rails_admin/application_helper.rb

@@ -122,7 +122,7 @@ module RailsAdmin
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
         css_classes = ['nav-link']
         css_classes.push("nav-level-#{level}") if level > 0
-        css_classes.push('active') if defined?(@action) && current_action?(@action, model_param)
+        css_classes.push('active') if @action && current_action?(@action, model_param)
         li = content_tag :li, data: {model: model_param} do
           link_to nav_icon + " " + node.label_plural, url, class: css_classes.join(' ')
         end

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

@@ -1,4 +1,4 @@
-<ul class="sidebar col-sm-3 col-md-2 nav btn-toggle-nav flex-column bg-light">
+<ul class="sidebar col-sm-3 col-md-2 nav btn-toggle-nav flex-column flex-nowrap bg-light">
   <%= main_navigation %>
   <%= root_navigation %>
   <%= static_navigation %>

data/lib/generators/rails_admin/install_generator.rb

@@ -64,6 +64,8 @@ module RailsAdmin
       run "yarn add rails_admin@#{RailsAdmin::Version.js}"
       template 'rails_admin.webpacker.js', 'app/javascript/packs/rails_admin.js'
       template 'rails_admin.scss.erb', 'app/javascript/stylesheets/rails_admin.scss'
+      # To work around https://github.com/railsadminteam/rails_admin/issues/3565
+      add_package_json_field('resolutions', {'rails_admin/@fortawesome/fontawesome-free' => '^5.15.0'})
     end
 
     def configure_for_webpack
@@ -99,28 +101,29 @@ module RailsAdmin
       else
         add_file 'config/initializers/assets.rb', asset_config
       end
-      add_scripts(additional_script_entries.merge({'build:css' => 'sass ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules'}))
+      add_package_json_field('scripts', additional_script_entries.merge({'build:css' => 'sass ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules'}), <<~INSTRUCTION)
+        Taking 'build:css' as an example, if you're already have application.sass.css for the sass build, the resulting script would look like:
+          sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules
+      INSTRUCTION
     end
 
-    def add_scripts(entries)
-      display 'Add scripts to package.json'
+    def add_package_json_field(name, entries, instruction = nil)
+      display "Add #{name} to package.json"
       package = begin
         JSON.parse(File.read(File.join(destination_root, 'package.json')))
       rescue Errno::ENOENT, JSON::ParserError
         {}
       end
-      if package['scripts'] && (package['scripts'].keys & entries.keys).any?
-        say <<-MESSAGE.gsub(/^ {10}/, ''), :red
-          You need to merge "scripts": #{JSON.pretty_generate(entries)} into the existing scripts in your package.json .
-          Taking 'build:css' as an example, if you're already have application.sass.css for the sass build, the resulting script would look like:
-            sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules
+      if package[name] && (package[name].keys & entries.keys).any?
+        say <<~MESSAGE, :red
+          You need to merge "#{name}": #{JSON.pretty_generate(entries)} into the existing #{name} in your package.json.#{instruction && "\n#{instruction}"}
         MESSAGE
       else
-        package['scripts'] ||= {}
-        entries.each do |entry, build_script|
-          package['scripts'][entry] = build_script
+        package[name] ||= {}
+        entries.each do |entry, value|
+          package[name][entry] = value
         end
-        add_file 'package.json', JSON.pretty_generate(package)
+        add_file 'package.json', "#{JSON.pretty_generate(package)}\n"
       end
     end
   end

data/lib/generators/rails_admin/templates/rails_admin.scss.erb

@@ -1 +1 @@
-<%= instance_variable_defined?(:@fa_font_path) ? %{$fa-font-path: "#{@fa_font_path}";\n} : '' %>@import "rails_admin/src/rails_admin/styles/base";
+<%= @fa_font_path ? %{$fa-font-path: "#{@fa_font_path}";\n} : '' %>@import "rails_admin/src/rails_admin/styles/base";

data/lib/generators/rails_admin/templates/rails_admin.webpacker.js

@@ -1,2 +1,2 @@
 import "rails_admin/src/rails_admin/base";
-import "../stylesheets/rails_admin.scss";
+import "../stylesheets/rails_admin.scss";

data/lib/rails_admin/config/lazy_model.rb

@@ -48,7 +48,7 @@ module RailsAdmin
         #       :
         #     end
         #
-        # Thus, sort all blocks to excute for a resource by Proc.source_path,
+        # Thus, sort all blocks to execute for a resource by Proc.source_path,
         # to guarantee that blocks from 'config/initializers' evaluate before
         # blocks defined within a model class.
         unless @deferred_blocks.empty?

data/lib/rails_admin/config/model.rb

@@ -48,9 +48,7 @@ module RailsAdmin
       end
 
       def excluded?
-        return @excluded if defined?(@excluded)
-
-        @excluded = !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
+        @excluded ||= !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
       end
 
       def object_label

data/lib/rails_admin/version.rb

@@ -4,7 +4,7 @@ module RailsAdmin
   class Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     class << self

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "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",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@fortawesome/fontawesome-free": "^6.1.1",
+    "@fortawesome/fontawesome-free": ">=5.15.0 <7.0.0",
     "@hotwired/turbo-rails": "^7.1.0",
     "@popperjs/core": "^2.11.0",
     "@rails/ujs": "^6.1.4-1",

data/src/rails_admin/base.js

@@ -1,6 +1,6 @@
 import Rails from "@rails/ujs";
 import "@hotwired/turbo-rails";
-import jQuery from "jquery";
+import "./jquery";
 import "./vendor/jquery_nested_form";
 import "bootstrap";
 
@@ -27,4 +27,3 @@ import "./ui";
 import "./widgets";
 
 Rails.start();
-window.$ = window.jQuery = jQuery;

data/src/rails_admin/filter-box.js

@@ -172,7 +172,7 @@ import flatpickr from "flatpickr";
       }
 
       var filterContainerId = field_name + "-" + index + "-filter-container";
-      $("p#" + filterContainerId).remove();
+      $("#" + filterContainerId).remove();
 
       var $content = $("<div>")
         .attr("id", filterContainerId)

data/src/rails_admin/jquery.js

@@ -0,0 +1,3 @@
+import jQuery from "jquery";
+
+window.$ = window.jQuery = jQuery;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2022-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
@@ -323,6 +323,7 @@ files:
 - src/rails_admin/filtering-multiselect.js
 - src/rails_admin/filtering-select.js
 - src/rails_admin/i18n.js
+- src/rails_admin/jquery.js
 - src/rails_admin/nested-form-hooks.js
 - src/rails_admin/remote-form.js
 - src/rails_admin/sidescroll.js
@@ -339,8 +340,6 @@ files:
 - src/rails_admin/widgets.js
 - vendor/assets/fonts/rails_admin/fa-solid-900.ttf
 - vendor/assets/fonts/rails_admin/fa-solid-900.woff2
-- vendor/assets/images/rails_admin/bootstrap/glyphicons-halflings-white.png
-- vendor/assets/images/rails_admin/bootstrap/glyphicons-halflings.png
 - vendor/assets/javascripts/rails_admin/bootstrap.js
 - vendor/assets/javascripts/rails_admin/flatpickr-with-locales.js
 - vendor/assets/javascripts/rails_admin/jquery-ui/data.js