active_scaffold 4.4.1 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f92c20382d4b5a33b53bb1525e677d81259a2d89a51996caefcb68ab314ed2
-  data.tar.gz: 2b8b5f59b6bdf856af6bdb4cfd5697caca0095960c41278bdb16ea5d51e0d03b
+  metadata.gz: b212c764ce6307b7968f811cd89c2042b8cb5d1f79b448ddd838360efc8375ab
+  data.tar.gz: 4f44ea2e0e00189d67f4027e95decea8b3589e5f3d372d1c53cd289ca70188c7
 SHA512:
-  metadata.gz: cffce904d4531775442f630fe004153a6ff602fdf7d1d416601712038324d0ad27b75c0e075dca01cefe0cc05d103769de538c2295ae5ab0d670a85944bf59c7
-  data.tar.gz: d7b32cbea9ac2da0d506de89ccd6dd5fbfefd7f3565780e4c93d97308bf2e1808d3a4bf396e63d7f7aeaedef7b72efaa2dd03c1d9f63fb7f49390a23382e8bdf
+  metadata.gz: 264149ca1905e0bae13b93a71a3720d9e09d3b2bae57b15a702474dfb40d2d8fad33ea04a8708991d6c983ef6c45159a5fd7133ad143cf95e3d5c74f5b830a34
+  data.tar.gz: b8bf1c62d6fc8e9063ccb46df88709630a0ce6d1eb9edebcb3058df8e43535f7e0420a4781614bd479197f00f5cdcce423bf1298b15ddd264515701fa7c83b03

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+= 4.4.4
+- Fix the inconsistent behaviour for constraints containing an array with only one value
+- Wait for dynamically loaded plugins and bridges to finish registering their ready and setup callbacks before initial setup, fixing initialization on directly rendered forms
+- Show all association records in select and multi-select search UIs instead of applying form association conditions
+
+= 4.4.3 (yanked)
+- Yanked because it accidentally included unreleased 4.5 functionality
+
+= 4.4.2 (yanked)
+- Yanked because it accidentally included unreleased 4.5 functionality
+
 = 4.4.1
 - Avoid unnecessary DISTINCT in searches without joins or with only belongs_to joins, fixing PostgreSQL searches on models with json columns
 - Update install generator for the supported rails versions and asset pipelines

data/app/assets/javascripts/active_scaffold/active_scaffold.js

@@ -1695,8 +1695,10 @@
 
       // call setup on document.ready if Turbolinks not enabled
       if ((typeof(Turbolinks) == 'undefined' || !Turbolinks.supported) && typeof(Turbo) == 'undefined') {
-        ActiveScaffold.setup_history_state();
-        ActiveScaffold.setup(document);
+        if (!ActiveScaffold.config.deferInitialSetup) {
+          ActiveScaffold.setup_history_state();
+          ActiveScaffold.setup(document);
+        }
       }
       if (ActiveScaffold.config.warn_changes) ActiveScaffold.setup_warn_changes();
       jQuery(document).on('as:element_updated as:element_created', function(e, action_link) {
@@ -1732,7 +1734,7 @@
     });
 
     jQuery(document).on('turbolinks:load turbo:load', function($) {
-      ActiveScaffold.setup(document);
+      if (!ActiveScaffold.config.deferInitialSetup) ActiveScaffold.setup(document);
     });
     jQuery(window).on('scroll resize', ActiveScaffold.update_floating_form_footer);
   };

data/app/assets/javascripts/active_scaffold/load.js

@@ -1,6 +1,10 @@
 // ActiveScaffold main entry point
 (function() {
   const config = window.ActiveScaffold?.config || {};
+  config.deferInitialSetup = true;
+  const scriptLoads = new Map();
+  const readyHeld = typeof window.jQuery?.holdReady === 'function';
+  if (readyHeld) window.jQuery.holdReady(true);
 
   // Load dependencies based on configuration
   const loadDependencies = async () => {
@@ -17,23 +21,14 @@
     await loadScript(RAILS_ASSET_URL('/active_scaffold/active_scaffold.js'));
     await loadScript(RAILS_ASSET_URL('/active_scaffold/jquery.editinplace.js'));
 
-    // Load plugins
-    if (config.plugins) {
-      for (const plugin of config.plugins) {
-        await loadScript(plugin);
-      }
-    }
-
-    // Load bridges
-    if (config.bridges) {
-      for (const bridge of config.bridges) {
-        await loadScript(bridge);
-      }
-    }
+    // Load plugins and bridges in order. Some of them depend on scripts loaded
+    // before them and register callbacks while they are being evaluated.
+    await loadScripts(config.plugins);
+    await loadScripts(config.bridges);
 
     // ALL DEPENDENCIES ARE LOADED NOW
     // Initialize everything
-    initializeActiveScaffold();
+    await initializeActiveScaffold();
   };
 
   const loadJQueryUI = async () => {
@@ -57,8 +52,16 @@
     initializeJQueryUI();
   };
 
+  const loadScripts = async (paths = []) => {
+    for (const path of paths || []) {
+      await loadScript(path);
+    }
+  };
+
   const loadScript = (path) => {
-    return new Promise((resolve, reject) => {
+    if (scriptLoads.has(path)) return scriptLoads.get(path);
+
+    const promise = new Promise((resolve, reject) => {
       // Check if already loaded
       if (document.querySelector(`script[src*="${path}"]`)) {
         resolve();
@@ -72,6 +75,9 @@
       script.onerror = reject;
       document.head.appendChild(script);
     });
+
+    scriptLoads.set(path, promise);
+    return promise;
   };
 
   const initializeJQueryUI = function() {
@@ -100,13 +106,26 @@
     }
   };
 
-  // NEW: Initialize everything after all scripts are loaded
-  const initializeActiveScaffold = () => {
-    // Run any post-load initialization
-    if (window.jQuery) {
-      jQuery(document).trigger('active-scaffold:loaded');
+  // Initialize only after plugins and bridges are available. This is especially
+  // important when this file is loaded as a regular script after DOM ready.
+  const initializeActiveScaffold = () => new Promise((resolve) => {
+    if (!window.jQuery || !window.ActiveScaffold) {
+      resolve();
+      return;
     }
-  };
+
+    jQuery(function() {
+      config.deferInitialSetup = false;
+      if ((typeof(Turbolinks) == 'undefined' || !Turbolinks.supported) && typeof(Turbo) == 'undefined') {
+        ActiveScaffold.setup_history_state();
+      }
+      ActiveScaffold.setup(document);
+      jQuery(document).trigger('active-scaffold:loaded');
+      resolve();
+    });
+
+    if (readyHeld) window.jQuery.holdReady(false);
+  });
 
   // Start loading when DOM is ready
   if (document.readyState === 'loading') {
@@ -114,4 +133,4 @@
   } else {
     loadDependencies();
   }
-})();
+})();

data/lib/active_scaffold/constraints.rb

@@ -163,8 +163,9 @@ module ActiveScaffold
       elsif association.polymorphic?
         apply_constraint_on_polymorphic_association(record, association, value)
       elsif !association.source_reflection&.through? && # regular singular association, or one-level through association
-            !value.is_a?(Array)
-        record.send(:"#{association.name}=", association.klass.find(value))
+            (!value.is_a?(Array) || value.size == 1)
+        constraint_value = value.is_a?(Array) ? value.first : value
+        record.send(:"#{association.name}=", association.klass.find(constraint_value))
 
         # setting the belongs_to side of a has_one isn't safe. if the has_one was already
         # specified, rails won't automatically clear out the previous associated record.

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -93,7 +93,7 @@ module ActiveScaffold
           associated.collect!(&:to_i)
           method = ui_options[:label_method] || :to_label
           helper_method = association_helper_method(column.association, :sorted_association_options_find)
-          select_options = send(helper_method, column.association, nil, record).collect do |r|
+          select_options = send(helper_method, column.association, {}, record).collect do |r|
             [r.send(method), r.id]
           end
         else
@@ -119,7 +119,7 @@ module ActiveScaffold
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
           method = column.association.belongs_to? ? column.association.foreign_key : column.name
           helper_method = association_helper_method(column.association, :sorted_association_options_find)
-          select_options = send(helper_method, column.association, false, record)
+          select_options = send(helper_method, column.association, {}, record)
         else
           method = column.name
           select_options = active_scaffold_translated_enum_options(column, record, ui_options: ui_options)

data/lib/active_scaffold/version.rb

@@ -4,7 +4,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 4
-    PATCH = 1
+    PATCH = 4
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.4
 platform: ruby
 authors:
 - Many, see README