rails_admin 3.0.0 → 3.1.0.beta

data/lib/rails_admin/config/fields/types/polymorphic_association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/serialized.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/shrine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/file_upload'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/simple_mde.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/string_like.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/timestamp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/uuid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/wysihtml5.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/association'

data/lib/rails_admin/config/fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -20,7 +22,7 @@ module RailsAdmin
 
       # Registry of field factories.
       #
-      # Field factory is an anonymous function that recieves the parent object,
+      # Field factory is an anonymous function that receives the parent object,
       # an array of field properties and an array of fields already instantiated.
       #
       # If the factory returns true then that property will not be run through

data/lib/rails_admin/config/groupable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/group'
 
 module RailsAdmin

data/lib/rails_admin/config/has_description.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessor and autoregistering of model's description.

data/lib/rails_admin/config/has_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessors and autoregistering of model's fields.
@@ -42,7 +44,7 @@ module RailsAdmin
         [*name].each { |field_name| field(field_name, type, false, &block) }
       end
 
-      # include fields by name and apply an optionnal block to each (through a call to fields),
+      # include fields by name and apply an optional block to each (through a call to fields),
       # or include fields by conditions if no field names
       def include_fields(*field_names, &block)
         if field_names.empty?

data/lib/rails_admin/config/has_groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/group'
 
 module RailsAdmin

data/lib/rails_admin/config/hideable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Defines a visibility configuration

data/lib/rails_admin/config/inspectable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Inspectable

data/lib/rails_admin/config/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config'
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'

data/lib/rails_admin/config/proxyable/proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Proxyable

data/lib/rails_admin/config/proxyable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/proxyable/proxy'
 module RailsAdmin
   module Config

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/inspectable'

data/lib/rails_admin/config/sections/create.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/edit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/export.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/modal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/nested.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/base'
 
 module RailsAdmin

data/lib/rails_admin/config/sections/update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/sections/edit'
 
 module RailsAdmin

data/lib/rails_admin/config/sections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/sections/base'
 require 'rails_admin/config/sections/edit'

data/lib/rails_admin/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/model'
 require 'rails_admin/config/sections/list'
 require 'active_support/core_ext/module/attribute_accessors'
@@ -73,6 +75,9 @@ module RailsAdmin
       # @see RailsAdmin.config
       attr_reader :registry
 
+      # Bootstrap CSS classes used for Navigation bar
+      attr_accessor :navbar_css_classes
+
       # show Gravatar in Navigation bar
       attr_accessor :show_gravatar
 
@@ -260,7 +265,7 @@ module RailsAdmin
       def asset_source
         @asset_source ||=
           begin
-            warn <<-MSG.gsub(/^ +/, '').freeze
+            warn <<~MSG
               [Warning] After upgrading RailsAdmin to 3.x you haven't set asset_source yet, using :sprockets as the default.
               To suppress this message, run 'rails rails_admin:install' to setup the asset delivery method suitable to you.
             MSG
@@ -334,6 +339,7 @@ module RailsAdmin
         @label_methods = %i[name title]
         @main_app_name = proc { [Rails.application.engine_name.titleize.chomp(' Application'), 'Admin'] }
         @registry = {}
+        @navbar_css_classes = %w[navbar-dark bg-primary border-bottom]
         @show_gravatar = true
         @navigation_static_links = {}
         @navigation_static_label = nil

data/lib/rails_admin/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'kaminari'
 require 'nested_form'
 require 'rails'
@@ -9,19 +11,9 @@ module RailsAdmin
   class Engine < Rails::Engine
     isolate_namespace RailsAdmin
 
-    config.action_dispatch.rescue_responses['RailsAdmin::ActionNotAllowed'] = :forbidden
+    attr_accessor :importmap
 
-    initializer 'RailsAdmin precompile hook', group: :all do |app|
-      if defined?(Sprockets)
-        app.config.assets.precompile += %w[
-          rails_admin/application.js
-          rails_admin/application.css
-        ]
-        app.config.assets.paths << RailsAdmin::Engine.root.join('src')
-        require 'rails_admin/support/esmodule_preprocessor'
-        Sprockets.register_preprocessor 'application/javascript', RailsAdmin::ESModulePreprocessor
-      end
-    end
+    config.action_dispatch.rescue_responses['RailsAdmin::ActionNotAllowed'] = :forbidden
 
     initializer 'RailsAdmin reload config in development' do |app|
       config.initializer_path = app.root.join('config/initializers/rails_admin.rb')
@@ -43,6 +35,30 @@ module RailsAdmin
       end
     end
 
+    initializer 'RailsAdmin apply configuration', after: :eager_load! do |app|
+      RailsAdmin::Config.initialize!
+
+      # Force route reload, since it doesn't reflect RailsAdmin action configuration yet
+      app.reload_routes!
+    end
+
+    initializer 'RailsAdmin precompile hook', group: :all, after: 'RailsAdmin apply configuration' do |app|
+      case RailsAdmin.config.asset_source
+      when :sprockets
+        if defined?(Sprockets)
+          app.config.assets.precompile += %w[
+            rails_admin/application.js
+            rails_admin/application.css
+          ]
+          app.config.assets.paths << RailsAdmin::Engine.root.join('src')
+          require 'rails_admin/support/esmodule_preprocessor'
+          Sprockets.register_preprocessor 'application/javascript', RailsAdmin::ESModulePreprocessor
+        end
+      when :importmap
+        self.importmap = Importmap::Map.new.draw(app.root.join('config/importmap.rails_admin.rb'))
+      end
+    end
+
     # Check for required middlewares, users may forget to use them in Rails API mode
     config.after_initialize do |app|
       has_session_store = app.config.middleware.to_a.any? do |m|
@@ -66,11 +82,6 @@ module RailsAdmin
         ERROR
       end
 
-      RailsAdmin::Config.initialize!
-
-      # Force route reload, since it doesn't reflect RailsAdmin action configuration yet
-      app.reload_routes!
-
       RailsAdmin::Version.warn_with_js_version
     end
   end

data/lib/rails_admin/extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/extensions/controller_extension'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Extensions
     module CanCanCan

data/lib/rails_admin/extensions/cancancan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/extensions/cancancan/authorization_adapter'
 
 RailsAdmin.add_extension(:cancancan, RailsAdmin::Extensions::CanCanCan, authorization: true)

data/lib/rails_admin/extensions/controller_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Extensions
     module ControllerExtension

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/strip'
 
 module RailsAdmin
@@ -49,7 +51,7 @@ module RailsAdmin
           created_at: :created_at,
           message: :event,
         }.freeze
-        E_VERSION_MODEL_NOT_SET = <<-ERROR.strip_heredoc.freeze
+        E_VERSION_MODEL_NOT_SET = <<~ERROR
           Please set up PaperTrail's version model explicitly.
 
               config.audit_with :paper_trail, 'User', 'PaperTrail::Version'

data/lib/rails_admin/extensions/paper_trail.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/extensions/paper_trail/auditing_adapter'
 
 RailsAdmin.add_extension(:paper_trail, RailsAdmin::Extensions::PaperTrail, auditing: true)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Extensions
     module Pundit

data/lib/rails_admin/extensions/pundit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/extensions/pundit/authorization_adapter'
 
 RailsAdmin.add_extension(:pundit, RailsAdmin::Extensions::Pundit, authorization: true)

data/lib/rails_admin/support/csv_converter.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'csv'
 
@@ -40,7 +41,7 @@ module RailsAdmin
 
     def to_csv(options = {})
       if CSV::VERSION == '3.0.2'
-        raise <<-MSG.gsub(/^\s+/, '')
+        raise <<~MSG
           CSV library bundled with Ruby 2.6.0 has encoding issue, please upgrade Ruby to 2.6.1 or later.
           https://github.com/ruby/csv/issues/62
         MSG

data/lib/rails_admin/support/datetime.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Support
     class Datetime
@@ -50,7 +52,7 @@ module RailsAdmin
             when '%z' # Time zone as hour and minute offset from UTC (e.g. +0900)
               Time.zone.formatted_offset(false)
             else
-              FLATPICKR_TRANSLATIONS[match] or raise <<-MSG.gsub(/^\s{16}/, '')
+              FLATPICKR_TRANSLATIONS[match] or raise <<~MSG
                 Unsupported strftime directive '#{match}' was found. Please consider explicitly setting flatpickr_format instance option for the field.
                   field(:name_of_field) { flatpickr_format '...' }
               MSG

data/lib/rails_admin/support/esmodule_preprocessor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   class ESModulePreprocessor
     def self.instance
@@ -11,6 +13,8 @@ module RailsAdmin
     def initialize; end
 
     def call(input)
+      return unless RailsAdmin.config.asset_source == :sprockets
+
       data = input[:data]
 
       if input[:filename].start_with? RailsAdmin::Engine.root.join('src').to_s

data/lib/rails_admin/support/hash_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   class HashHelper
     def self.symbolize(obj)

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 = nil
+    PRE = 'beta'
 
     class << self
       # @return [String]

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",
+  "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;
       }