rails_admin 3.1.4 → 3.3.0

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

@@ -23,19 +23,16 @@ module RailsAdmin
             end
 
             register_instance_option :image? do
-              if value
-                mime_type = Mime::Type.lookup_by_extension(value.filename.extension_without_delimiter)
-                mime_type.to_s.match?(/^image/)
-              end
+              value && (value.representable? || value.content_type.match?(/^image/))
             end
 
             def resource_url(thumb = false)
               return nil unless value
 
-              if thumb && value.variable?
-                variant = value.variant(thumb_method)
+              if thumb && value.representable?
+                representation = value.representation(thumb_method)
                 Rails.application.routes.url_helpers.rails_blob_representation_path(
-                  variant.blob.signed_id, variant.variation.key, variant.blob.filename, only_path: true
+                  representation.blob.signed_id, representation.variation.key, representation.blob.filename, only_path: true
                 )
               else
                 Rails.application.routes.url_helpers.rails_blob_path(value, only_path: true)
@@ -48,7 +45,7 @@ module RailsAdmin
           end
 
           register_instance_option :keep_method do
-            method_name if ::ActiveStorage.replace_on_assign_to_many
+            method_name if ::ActiveStorage.gem_version >= Gem::Version.new('7.1') || ::ActiveStorage.replace_on_assign_to_many
           end
 
           register_instance_option :delete_method do
@@ -70,6 +67,14 @@ module RailsAdmin
               direct? && {data: {direct_upload_url: bindings[:view].main_app.rails_direct_uploads_url}} || {},
             )
           end
+
+          register_instance_option :searchable do
+            false
+          end
+
+          register_instance_option :sortable do
+            false
+          end
         end
       end
     end

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

@@ -47,13 +47,19 @@ module RailsAdmin
             end
 
             register_instance_option :image? do
-              mime_type = Mime::Type.lookup_by_extension(resource_url.to_s.split('.').last)
+              mime_type = Mime::Type.lookup_by_extension(extension)
               mime_type.to_s.match?(/^image/)
             end
 
             def resource_url(_thumb = false)
               raise 'not implemented'
             end
+
+            def extension
+              URI.parse(resource_url).path.split('.').last
+            rescue URI::InvalidURIError
+              nil
+            end
           end
 
           def initialize(*args)

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

@@ -51,26 +51,29 @@ module RailsAdmin
             false
           end
 
-          def associated_collection(type)
-            return [] if type.blank?
+          def associated_model_config
+            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.reject(&:excluded?)
+          end
 
-            config = RailsAdmin.config(type)
-            config.abstract_model.all.collect do |object|
-              [object.send(config.object_label_method), object.id]
+          def collection(_scope = nil)
+            if value
+              [[formatted_value, selected_id]]
+            else
+              [[]]
             end
           end
 
-          def associated_model_config
-            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.reject(&:excluded?)
+          def type_column
+            association.foreign_type.to_s
           end
 
-          def polymorphic_type_collection
+          def type_collection
             associated_model_config.collect do |config|
               [config.label, config.abstract_model.model.name]
             end
           end
 
-          def polymorphic_type_urls
+          def type_urls
             types = associated_model_config.collect do |config|
               [config.abstract_model.model.name, config.abstract_model.to_param]
             end
@@ -82,6 +85,26 @@ module RailsAdmin
             bindings[:object].send(association.name)
           end
 
+          def widget_options_for_types
+            type_collection.inject({}) do |options, model|
+              options.merge(
+                model.second.downcase.gsub('::', '-') => {
+                  xhr: true,
+                  remote_source: bindings[:view].index_path(model.second.underscore, source_object_id: bindings[:object].id, source_abstract_model: abstract_model.to_param, current_action: bindings[:view].current_action, compact: true),
+                  float_left: false,
+                },
+              )
+            end
+          end
+
+          def widget_options
+            widget_options_for_types[selected_type.try(:downcase)] || {float_left: false}
+          end
+
+          def selected_type
+            bindings[:object].send(type_column)
+          end
+
           def parse_input(params)
             if (type_value = params[association.foreign_type.to_sym]).present?
               config = associated_model_config.find { |c| type_value == c.abstract_model.model.name }

data/lib/rails_admin/config.rb

@@ -2,6 +2,7 @@
 
 require 'rails_admin/config/lazy_model'
 require 'rails_admin/config/sections/list'
+require 'rails_admin/support/composite_keys_serializer'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module RailsAdmin
@@ -84,6 +85,9 @@ module RailsAdmin
       # Set where RailsAdmin fetches JS/CSS from, defaults to :sprockets
       attr_writer :asset_source
 
+      # For customization of composite keys representation
+      attr_accessor :composite_keys_serializer
+
       # Setup authentication to be run as a before filter
       # This is run inside the controller instance so you can setup any authentication you need to
       #
@@ -329,6 +333,7 @@ module RailsAdmin
         @navigation_static_links = {}
         @navigation_static_label = nil
         @asset_source = nil
+        @composite_keys_serializer = RailsAdmin::Support::CompositeKeysSerializer
         @parent_controller = '::ActionController::Base'
         @forgery_protection_settings = {with: :exception}
         RailsAdmin::Config::Actions.reset

data/lib/rails_admin/engine.rb

@@ -4,6 +4,7 @@ require 'kaminari'
 require 'nested_form'
 require 'rails'
 require 'rails_admin'
+require 'rails_admin/extensions/url_for_extension'
 require 'rails_admin/version'
 require 'turbo-rails'
 
@@ -15,6 +16,10 @@ module RailsAdmin
 
     config.action_dispatch.rescue_responses['RailsAdmin::ActionNotAllowed'] = :forbidden
 
+    initializer 'RailsAdmin load UrlForExtension' do
+      RailsAdmin::Engine.routes.singleton_class.prepend(RailsAdmin::Extensions::UrlForExtension)
+    end
+
     initializer 'RailsAdmin reload config in development' do |app|
       config.initializer_path = app.root.join('config/initializers/rails_admin.rb')
 

data/lib/rails_admin/extensions/url_for_extension.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RailsAdmin
+  module Extensions
+    module UrlForExtension
+      def url_for(options, *args)
+        case options[:id]
+        when Array
+          options[:id] = RailsAdmin.config.composite_keys_serializer.serialize(options[:id])
+        end
+        super options, *args
+      end
+    end
+  end
+end

data/lib/rails_admin/support/composite_keys_serializer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RailsAdmin
+  module Support
+    module CompositeKeysSerializer
+      def self.serialize(keys)
+        keys.map { |key| key&.to_s&.gsub('_', '__') }.join('_')
+      end
+
+      def self.deserialize(string)
+        string.split('_').map { |key| key&.gsub('__', '_') }
+      end
+    end
+  end
+end

data/lib/rails_admin/support/datetime.rb

@@ -21,6 +21,7 @@ module RailsAdmin
         '%-I' => 'h',      # Hour of the day, 12-hour clock (1..12)
         '%k' => 'H',       # Hour of the day, 24-hour clock (0..23)
         '%l' => 'h',       # Hour of the day, 12-hour clock (1..12)
+        '%-l' => 'h',      # Hour of the day, 12-hour clock (1..12)
         '%M' => 'i',       # Minute of the hour (00..59)
         '%-M' => 'i',      # Minute of the hour (00..59)
         '%m' => 'm',       # Month of the year (01..12)

data/lib/rails_admin/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.1.4",
+  "version": "3.3.0",
   "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",
@@ -22,7 +22,7 @@
     "bootstrap": "^5.1.3",
     "flatpickr": "^4.6.9",
     "jquery": "^3.6.0",
-    "jquery-ui": "^1.12.1"
+    "jquery-ui": "^1.12.1 <1.14.0"
   },
   "devDependencies": {
     "prettier": "^2.4.1"

data/src/rails_admin/abstract-select.js

@@ -0,0 +1,30 @@
+import jQuery from "jquery";
+import "jquery-ui/ui/widget.js";
+
+(function ($) {
+  "use strict";
+
+  $.widget("ra.abstractSelect", {
+    options: {
+      createQuery: function (query) {
+        if ($.isEmptyObject(this.scopeBy)) {
+          return { query: query };
+        } else {
+          const filterQuery = {};
+          for (var field in this.scopeBy) {
+            const targetField = this.scopeBy[field];
+            const targetValue = $(`[name$="[${field}]"]`).val();
+            if (!filterQuery[targetField]) {
+              filterQuery[targetField] = [];
+            }
+            filterQuery[targetField].push(
+              targetValue ? { o: "is", v: targetValue } : { o: "_blank" }
+            );
+          }
+          return { query: query, f: filterQuery };
+        }
+      },
+      scopeBy: {},
+    },
+  });
+})(jQuery);

data/src/rails_admin/base.js

@@ -17,6 +17,7 @@ import "jquery-ui/ui/widget.js";
 import "jquery-ui/ui/widgets/menu.js";
 import "jquery-ui/ui/widgets/mouse.js";
 
+import "./abstract-select";
 import "./filter-box";
 import "./filtering-multiselect";
 import "./filtering-select";
@@ -26,4 +27,6 @@ import "./sidescroll";
 import "./ui";
 import "./widgets";
 
-Rails.start();
+if (!window._rails_loaded) {
+  Rails.start();
+}

data/src/rails_admin/filtering-multiselect.js

@@ -1,13 +1,11 @@
 import jQuery from "jquery";
 import "jquery-ui/ui/widget.js";
 import I18n from "./i18n";
+
 (function ($) {
-  $.widget("ra.filteringMultiselect", {
+  $.widget("ra.filteringMultiselect", $.ra.abstractSelect, {
     _cache: {},
     options: {
-      createQuery: function (query) {
-        return { query: query };
-      },
       sortable: false,
       removable: true,
       regional: {

data/src/rails_admin/filtering-select.js

@@ -6,11 +6,8 @@ import I18n from "./i18n";
 (function ($) {
   "use strict";
 
-  $.widget("ra.filteringSelect", {
+  $.widget("ra.filteringSelect", $.ra.abstractSelect, {
     options: {
-      createQuery: function (query) {
-        return { query: query };
-      },
       minLength: 0,
       searchDelay: 200,
       remote_source: null,
@@ -300,6 +297,7 @@ import I18n from "./i18n";
     destroy: function () {
       this.input.remove();
       this.button.remove();
+      this.element.html($('<option value="" selected="selected"></option>'));
       this.element.show();
       this.filtering_select.remove();
       $.Widget.prototype.destroy.call(this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.3.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
@@ -28,6 +28,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +85,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,21 +95,27 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +210,7 @@ files:
 - lib/generators/rails_admin/templates/initializer.erb
 - lib/generators/rails_admin/templates/rails_admin.js
 - lib/generators/rails_admin/templates/rails_admin.scss.erb
+- lib/generators/rails_admin/templates/rails_admin.vite.js
 - lib/generators/rails_admin/templates/rails_admin.webpacker.js
 - lib/generators/rails_admin/utils.rb
 - lib/rails_admin.rb
@@ -199,8 +220,6 @@ files:
 - lib/rails_admin/adapters/active_record/association.rb
 - lib/rails_admin/adapters/active_record/object_extension.rb
 - lib/rails_admin/adapters/active_record/property.rb
-- lib/rails_admin/adapters/composite_primary_keys.rb
-- lib/rails_admin/adapters/composite_primary_keys/association.rb
 - lib/rails_admin/adapters/mongoid.rb
 - lib/rails_admin/adapters/mongoid/association.rb
 - lib/rails_admin/adapters/mongoid/bson.rb
@@ -226,6 +245,7 @@ files:
 - lib/rails_admin/config/fields.rb
 - lib/rails_admin/config/fields/association.rb
 - lib/rails_admin/config/fields/base.rb
+- lib/rails_admin/config/fields/collection_association.rb
 - lib/rails_admin/config/fields/factories/action_text.rb
 - lib/rails_admin/config/fields/factories/active_storage.rb
 - lib/rails_admin/config/fields/factories/association.rb
@@ -237,6 +257,7 @@ files:
 - lib/rails_admin/config/fields/factories/password.rb
 - lib/rails_admin/config/fields/factories/shrine.rb
 - lib/rails_admin/config/fields/group.rb
+- lib/rails_admin/config/fields/singular_association.rb
 - lib/rails_admin/config/fields/types.rb
 - lib/rails_admin/config/fields/types/action_text.rb
 - lib/rails_admin/config/fields/types/active_record_enum.rb
@@ -250,7 +271,6 @@ files:
 - lib/rails_admin/config/fields/types/ck_editor.rb
 - lib/rails_admin/config/fields/types/code_mirror.rb
 - lib/rails_admin/config/fields/types/color.rb
-- lib/rails_admin/config/fields/types/composite_keys_belongs_to_association.rb
 - lib/rails_admin/config/fields/types/date.rb
 - lib/rails_admin/config/fields/types/datetime.rb
 - lib/rails_admin/config/fields/types/decimal.rb
@@ -312,6 +332,8 @@ files:
 - lib/rails_admin/extensions/paper_trail/auditing_adapter.rb
 - lib/rails_admin/extensions/pundit.rb
 - lib/rails_admin/extensions/pundit/authorization_adapter.rb
+- lib/rails_admin/extensions/url_for_extension.rb
+- lib/rails_admin/support/composite_keys_serializer.rb
 - lib/rails_admin/support/csv_converter.rb
 - lib/rails_admin/support/datetime.rb
 - lib/rails_admin/support/es_module_processor.rb
@@ -319,6 +341,7 @@ files:
 - lib/rails_admin/version.rb
 - lib/tasks/rails_admin.rake
 - package.json
+- src/rails_admin/abstract-select.js
 - src/rails_admin/base.js
 - src/rails_admin/filter-box.js
 - src/rails_admin/filtering-multiselect.js
@@ -447,12 +470,13 @@ homepage: https://github.com/railsadminteam/rails_admin
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\n    ### Upgrading RailsAdmin from 2.x.x to 3.x.x ###\n\n
-  \   Due to introduction of Webpack/Webpacker support, some additional dependencies
-  and configuration will be needed.\n    Running `bin/rails g rails_admin:install`
-  will suggest required changes, based on the current setup of your app.\n\n    For
-  a complete list of changes, see https://github.com/railsadminteam/rails_admin/blob/master/CHANGELOG.md\n
-  \ "
+post_install_message: |
+  ### Upgrading RailsAdmin from 2.x.x to 3.x.x ###
+
+  Due to introduction of Webpack/Webpacker support, some additional dependencies and configuration will be needed.
+  Running `bin/rails g rails_admin:install` will suggest required changes, based on the current setup of your app.
+
+  For a complete list of changes, see https://github.com/railsadminteam/rails_admin/blob/master/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib

data/lib/rails_admin/adapters/composite_primary_keys/association.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module RailsAdmin
-  module Adapters
-    module CompositePrimaryKeys
-      class Association < RailsAdmin::Adapters::ActiveRecord::Association
-        def field_type
-          if type == :belongs_to && association.foreign_key.is_a?(Array)
-            :composite_keys_belongs_to_association
-          else
-            super
-          end
-        end
-
-        def primary_key
-          return nil if polymorphic?
-
-          value = association.association_primary_key
-
-          if value.is_a? Array
-            :id
-          else
-            value.to_sym
-          end
-        end
-
-        def foreign_key
-          if association.foreign_key.is_a? Array
-            association.foreign_key.map(&:to_sym)
-          else
-            super
-          end
-        end
-
-        def key_accessor
-          if type == :belongs_to && foreign_key.is_a?(Array)
-            :"#{name}_id"
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rails_admin/adapters/composite_primary_keys.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_admin/adapters/active_record'
-require 'rails_admin/adapters/composite_primary_keys/association'
-
-module RailsAdmin
-  module Adapters
-    module CompositePrimaryKeys
-      include RailsAdmin::Adapters::ActiveRecord
-
-      def get(id, scope = scoped)
-        begin
-          object = scope.find(id)
-        rescue ::ActiveRecord::RecordNotFound
-          return nil
-        end
-
-        object.extend(RailsAdmin::Adapters::ActiveRecord::ObjectExtension)
-      end
-
-      def associations
-        model.reflect_on_all_associations.collect do |association|
-          RailsAdmin::Adapters::CompositePrimaryKeys::Association.new(association, model)
-        end
-      end
-
-    private
-
-      def bulk_scope(scope, options)
-        if primary_key.is_a? Array
-          options[:bulk_ids].map do |id|
-            scope.where(primary_key.zip(::CompositePrimaryKeys::CompositeKeys.parse(id)).to_h)
-          end.reduce(&:or)
-        else
-          super
-        end
-      end
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_admin/config/fields/types/belongs_to_association'
-
-module RailsAdmin
-  module Config
-    module Fields
-      module Types
-        class CompositeKeysBelongsToAssociation < RailsAdmin::Config::Fields::Types::BelongsToAssociation
-          RailsAdmin::Config::Fields::Types.register(self)
-
-          register_instance_option :allowed_methods do
-            nested_form ? [method_name] : Array(association.foreign_key)
-          end
-
-          def selected_id
-            association.foreign_key.map { |attribute| bindings[:object].safe_send(attribute) }.to_composite_keys.to_s
-          end
-
-          def parse_input(params)
-            return unless params[method_name].present? && association.foreign_key.is_a?(Array) && !nested_form
-
-            association.foreign_key.zip(CompositePrimaryKeys::CompositeKeys.parse(params.delete(method_name))).each do |key, value|
-              params[key] = value
-            end
-          end
-        end
-      end
-    end
-  end
-end