rails_admin 3.1.2 → 3.3.0

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 = 2
+    MINOR = 3
+    PATCH = 0
     PRE = nil
 
     class << self

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.1.2",
+  "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.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 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,16 +210,16 @@ 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
 - lib/rails_admin/abstract_model.rb
 - lib/rails_admin/adapters/active_record.rb
+- lib/rails_admin/adapters/active_record.rb.bak
 - 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
@@ -225,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
@@ -236,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
@@ -249,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
@@ -311,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
@@ -318,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
@@ -446,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
@@ -466,7 +491,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Admin for Rails

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