activeadmin 3.2.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff095f14bad831f14bf12c3da9123bae3311d3c94815a73ef3b8ab67d1ca985a
-  data.tar.gz: 1adb7fa85d65339b74b8a0c1ef45c6ba9be9031a743e144d0edf452064e31083
+  metadata.gz: cd51d7cc81eac3cbb01358076ca98368ccd5879f96dd9dfaed3f4e6b5c511648
+  data.tar.gz: 95913536dfd3ccf746a0848545b81685ead621cd2536776ede879a9b02196058
 SHA512:
-  metadata.gz: 54c3193a35539aeb1c6e094cdd7e03b335168116db76a8ab07eb5991de70cba0931d400840815014ee96bad801723fa628962924d3314e3aa855adebaa3d256d
-  data.tar.gz: 2f51a5be0b992925a0b8a77f62e68812ae19ea3d5666f2df514bbbf4b9a6ccb1c09639853878a8e02e4b9b59077f18ad3041642b6abc5ad8e39f0eec359d0db3
+  metadata.gz: 0b296e6597a76172815063ca7b63ba359308b9a13c26874b6ea6b746dbd25bb8d6929c4da2f1b8682dfbd998cc7a752c73d2eca70b356fdfad8362294273aac9
+  data.tar.gz: ac965d5a5b2308a064e0e47816c1739f8482570ce926feb72fcf1031b12ac1e738719571faae48d03128c1d8af790e74e47c04e7f62484e791cd654749373417

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## Unreleased
 
+## 3.2.3 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.2..v3.2.3)
+
+### Enhancements
+
+* Backport better implementation of counter-cache-column check [#8412] by [@plashchynski]
+
+### Bug Fixes
+
+* Remove deprecation warnings when building with dart sass >= 1.77.7 [#8405] by [@mgrunberg]
+
+## 3.2.2 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.1..v3.2.2)
+
+### Security Fixes
+
+* Backport Fix potential XSS issue when rendering form legends [#8349] by
+  [@deivid-rodriguez]
+
+### Enhancements
+
+* Update vendored jQuery UI to 1.13.3 [#8329] by [@tagliala]
+
 ## 3.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.0..v3.2.1)
 
 ### Enhancements
@@ -907,6 +928,10 @@ Please check [0-6-stable] for previous changes.
 [#8167]: https://github.com/activeadmin/activeadmin/pull/8167
 [#8310]: https://github.com/activeadmin/activeadmin/pull/8310
 [#8311]: https://github.com/activeadmin/activeadmin/pull/8311
+[#8329]: https://github.com/activeadmin/activeadmin/pull/8329
+[#8349]: https://github.com/activeadmin/activeadmin/pull/8349
+[#8405]: https://github.com/activeadmin/activeadmin/pull/8405
+[#8412]: https://github.com/activeadmin/activeadmin/pull/8412
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -1001,6 +1026,7 @@ Please check [0-6-stable] for previous changes.
 [@orkhan]: https://github.com/orkhan
 [@panasyuk]: https://github.com/panasyuk
 [@PChambino]: https://github.com/PChambino
+[@plashchynski]: https://github.com/plashchynski
 [@potatosalad]: https://github.com/potatosalad
 [@pranas]: https://github.com/pranas
 [@ray-curran]: https://github.com/ray-curran

data/README.md

@@ -85,8 +85,8 @@ Thanks to [Tidelift][tidelift] and all our Tidelift subscribers.
 Thanks to [Open Collective][opencollective contributors] and all our Open Collective contributors.
 
 [Arbre]: https://github.com/activeadmin/arbre
-[Devise]: https://github.com/plataformatec/devise
-[Formtastic]: https://github.com/justinfrench/formtastic
+[Devise]: https://github.com/heartcombo/devise
+[Formtastic]: https://github.com/formtastic/formtastic
 [Inherited Resources]: https://github.com/activeadmin/inherited_resources
 [Kaminari]: https://github.com/kaminari/kaminari
 [Ransack]: https://github.com/activerecord-hackery/ransack

data/app/assets/stylesheets/active_admin/_forms.scss

@@ -220,9 +220,8 @@ form {
   /* Buttons */
 
   input[type=submit], input[type=button], button {
-    @include dark-button;
     cursor: pointer;
-
+    @include dark-button;
   }
 
   .buttons, .actions {

data/app/assets/stylesheets/active_admin/components/_comments.scss

@@ -2,10 +2,10 @@
 .comments {
 
   .active_admin_comment {
-    @include clearfix;
     margin-top: 10px;
     margin-bottom: 20px;
     max-width: 700px;
+    @include clearfix;
 
     .active_admin_comment_meta {
       width: 130px;

data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss

@@ -3,9 +3,12 @@
 
   .dropdown_menu_button {
     @include light-button;
-    position: relative;
-    padding-right: 22px !important;
-    cursor: pointer;
+
+    & {
+      position: relative;
+      padding-right: 22px !important;
+      cursor: pointer;
+    }
 
     &:before {
       content: ' ';
@@ -139,11 +142,11 @@
         }
 
         &:last-child {
+          border: none;
           a {
             border-bottom-left-radius: 2px;
             border-bottom-right-radius: 2px;
           }
-          border: none;
         }
       }
     }

data/app/assets/stylesheets/active_admin/components/_pagination.scss

@@ -38,8 +38,11 @@
   margin-left: 4px;
   select {
     @include light-button;
-    @include rounded(0px);
-    padding: 1px 5px;
+
+    & {
+      @include rounded(0px);
+      padding: 1px 5px;
+    }
   }
 }
 

data/app/assets/stylesheets/active_admin/components/_table_tools.scss

@@ -1,6 +1,6 @@
 .table_tools {
-  @include clearfix;
   margin-bottom: 16px;
+  @include clearfix;
 }
 
 .table_tools .dropdown_menu {
@@ -9,11 +9,14 @@
 
 a.table_tools_button, .table_tools .dropdown_menu_button {
   @include light-button;
-  @include gradient(#FFFFFF, #F0F0F0);
-  @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
-  font-size: 0.9em;
-  padding: 4px 14px 4px;
-  margin: 0;
+
+  & {
+    @include gradient(#FFFFFF, #F0F0F0);
+    @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
+    font-size: 0.9em;
+    padding: 4px 14px 4px;
+    margin: 0;
+  }
 
   &:not(.disabled) {
     &:hover {

data/app/assets/stylesheets/active_admin/components/_tabs.scss

@@ -28,13 +28,16 @@
 
     a {
       @include light-button;
-      @include gradient(#FFFFFF, #F0F0F0);
-      @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
-      text-decoration: none;
-      border-radius: 0;
-      border-width: 1px .5px 1px .5px;
-      margin-right: 0;
-      padding: 4px 14px 4px;
+
+      & {
+        @include gradient(#FFFFFF, #F0F0F0);
+        @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
+        text-decoration: none;
+        border-radius: 0;
+        border-width: 1px .5px 1px .5px;
+        margin-right: 0;
+        padding: 4px 14px 4px;
+      }
 
       &:not(.disabled) {
         &:hover {

data/app/assets/stylesheets/active_admin/mixins/_buttons.scss

@@ -17,13 +17,13 @@
 }
 
 @mixin default-button {
-  @include basic-button;
   @include gradient(lighten($primary-color, 15%), darken($primary-color, 12%));
   @include text-shadow(#000);
   box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0px rgba(255,255,255, 0.2) inset;
   border: solid 1px #484e53;
   @include border-colors(#616a71, #484e53, #363b3f);
   color: #efefef;
+  @include basic-button;
 
   &:not(.disabled) {
     &:hover{
@@ -38,13 +38,13 @@
 }
 
 @mixin light-button {
-  @include basic-button;
   @include gradient(#FFFFFF, #E7E7E7);
   box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0 rgba(255,255,255, 0.8) inset;
   border: solid 1px #c7c7c7;
   @include border-colors(#d3d3d3, #c7c7c7, #c2c2c2);
   @include text-shadow;
   color: $primary-color;
+  @include basic-button;
 
   &:not(.disabled) {
     &:hover {

data/app/assets/stylesheets/active_admin/pages/_logged_out.scss

@@ -28,13 +28,13 @@ body.logged_out {
         @include no-shadow;
         background: none;
         padding: 0;
+        margin-bottom: 0;
         li { padding: 10px 0; }
 
         input[type=text], input[type=email], input[type=password] {
           width: 70%;
         }
         &.buttons { margin-left: 20%; }
-        margin-bottom: 0;
       }
     }
 

data/app/assets/stylesheets/active_admin/structure/_footer.scss

@@ -10,10 +10,10 @@
 
 // -------------------------------------- Index Footer (Under Table)
 #index_footer {
-  @include clearfix;
   padding-top: 5px;
   text-align: right;
   font-size: 0.85em;
+  @include clearfix;
 }
 
 .index_content { clear: both; }

data/app/assets/stylesheets/active_admin/structure/_title_bar.scss

@@ -1,6 +1,5 @@
 #title_bar {
   @include section-header;
-  @include clearfix;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
   display: table;
   border-bottom-color: #EEE;
@@ -9,6 +8,7 @@
   margin: 0;
   padding: 10px $horizontal-page-margin;
   z-index: 800;
+  @include clearfix;
 
   #titlebar_left, #titlebar_right {
     height: 50px;
@@ -32,8 +32,11 @@
     span.action_item {
       & > a, & > .dropdown_menu > a {
         @include light-button;
-        padding: 12px 17px 10px;
-        margin: 0px;
+
+        & {
+          padding: 12px 17px 10px;
+          margin: 0px;
+        }
       }
     }
   }

data/lib/active_admin/pundit_adapter.rb

@@ -42,7 +42,7 @@ module ActiveAdmin
     end
 
     def format_action(action, subject)
-      # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
+      # https://github.com/varvet/pundit/blob/main/lib/generators/pundit/install/templates/application_policy.rb
       case action
       when Auth::READ then subject.is_a?(Class) ? :index? : :show?
       when Auth::DESTROY then subject.is_a?(Class) ? :destroy_all? : :destroy?

data/lib/active_admin/resource/attributes.rb

@@ -37,7 +37,14 @@ module ActiveAdmin
       end
 
       def counter_cache_col?(c)
-        c.name.end_with?("_count")
+        # This helper is called inside a loop. Let's memoize the result.
+        @counter_cache_columns ||= begin
+          resource_class.reflect_on_all_associations(:has_many)
+                        .select(&:has_cached_counter?)
+                        .map(&:counter_cache_column)
+        end
+
+        @counter_cache_columns.include?(c.name)
       end
 
       def filtered_col?(c)

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "3.2.1"
+  VERSION = "3.2.3"
 end

data/lib/active_admin/views/components/active_admin_form.rb

@@ -127,7 +127,7 @@ module ActiveAdmin
         html_options[:class] ||= "inputs"
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
-        legend_tag = legend ? "<legend><span>#{legend}</span></legend>" : ""
+        legend_tag = legend ? "<legend><span>#{ERB::Util.html_escape(legend)}</span></legend>" : ""
         fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"

data/vendor/assets/javascripts/jquery-ui/data.js

@@ -1,20 +1,22 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI :data 1.12.1
- * http://jqueryui.com
+ * jQuery UI :data 1.13.3
+ * https://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
- * http://jquery.org/license
+ * https://jquery.org/license
  */
 
 //>>label: :data Selector
 //>>group: Core
 //>>description: Selects elements which have data stored under the specified key.
-//>>docs: http://api.jqueryui.com/data-selector/
+//>>docs: https://api.jqueryui.com/data-selector/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -24,8 +26,10 @@
 		// Browser globals
 		factory( jQuery );
 	}
-} ( function( $ ) {
-return $.extend( $.expr[ ":" ], {
+} )( function( $ ) {
+"use strict";
+
+return $.extend( $.expr.pseudos, {
 	data: $.expr.createPseudo ?
 		$.expr.createPseudo( function( dataName ) {
 			return function( elem ) {
@@ -38,4 +42,4 @@ return $.extend( $.expr[ ":" ], {
 			return !!$.data( elem, match[ 3 ] );
 		}
 } );
-} ) );
+} );

data/vendor/assets/javascripts/jquery-ui/disable-selection.js

@@ -1,21 +1,23 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Disable Selection 1.12.1
- * http://jqueryui.com
+ * jQuery UI Disable Selection 1.13.3
+ * https://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
- * http://jquery.org/license
+ * https://jquery.org/license
  */
 
 //>>label: disableSelection
 //>>group: Core
 //>>description: Disable selection of text content within the set of matched elements.
-//>>docs: http://api.jqueryui.com/disableSelection/
+//>>docs: https://api.jqueryui.com/disableSelection/
 
 // This file is deprecated
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -25,7 +27,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-} ( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.fn.extend( {
 	disableSelection: ( function() {
@@ -45,4 +48,4 @@ return $.fn.extend( {
 	}
 } );
 
-} ) );
+} );

data/vendor/assets/javascripts/jquery-ui/focusable.js

@@ -1,20 +1,22 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Focusable 1.12.1
- * http://jqueryui.com
+ * jQuery UI Focusable 1.13.3
+ * https://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
- * http://jquery.org/license
+ * https://jquery.org/license
  */
 
 //>>label: :focusable Selector
 //>>group: Core
 //>>description: Selects elements which can be focused.
-//>>docs: http://api.jqueryui.com/focusable-selector/
+//>>docs: https://api.jqueryui.com/focusable-selector/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -24,7 +26,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-} ( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 // Selectors
 $.ui.focusable = function( element, hasTabindex ) {
@@ -72,10 +75,10 @@ function visible( element ) {
 		element = element.parent();
 		visibility = element.css( "visibility" );
 	}
-	return visibility !== "hidden";
+	return visibility === "visible";
 }
 
-$.extend( $.expr[ ":" ], {
+$.extend( $.expr.pseudos, {
 	focusable: function( element ) {
 		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
 	}
@@ -83,4 +86,4 @@ $.extend( $.expr[ ":" ], {
 
 return $.ui.focusable;
 
-} ) );
+} );

data/vendor/assets/javascripts/jquery-ui/form-reset-mixin.js

@@ -2,79 +2,82 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Form Reset Mixin 1.12.1
- * http://jqueryui.com
+ * jQuery UI Form Reset Mixin 1.13.3
+ * https://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
- * http://jquery.org/license
+ * https://jquery.org/license
  */
 
 //>>label: Form Reset Mixin
 //>>group: Core
 //>>description: Refresh input widgets when their form is reset
-//>>docs: http://api.jqueryui.com/form-reset-mixin/
+//>>docs: https://api.jqueryui.com/form-reset-mixin/
 
 ( function( factory ) {
-  if ( typeof define === "function" && define.amd ) {
+	"use strict";
 
-    // AMD. Register as an anonymous module.
-    define( [
-      "jquery",
-      "./form",
-      "./version"
-    ], factory );
-  } else {
+	if ( typeof define === "function" && define.amd ) {
 
-    // Browser globals
-    factory( jQuery );
-  }
-}( function( $ ) {
+		// AMD. Register as an anonymous module.
+		define( [
+			"jquery",
+			"./form",
+			"./version"
+		], factory );
+	} else {
 
-  return $.ui.formResetMixin = {
-    _formResetHandler: function() {
-      var form = $( this );
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
 
-      // Wait for the form reset to actually happen before refreshing
-      setTimeout( function() {
-        var instances = form.data( "ui-form-reset-instances" );
-        $.each( instances, function() {
-          this.refresh();
-        } );
-      } );
-    },
+return $.ui.formResetMixin = {
+	_formResetHandler: function() {
+		var form = $( this );
 
-    _bindFormResetHandler: function() {
-      this.form = this.element.form();
-      if ( !this.form.length ) {
-        return;
-      }
+		// Wait for the form reset to actually happen before refreshing
+		setTimeout( function() {
+			var instances = form.data( "ui-form-reset-instances" );
+			$.each( instances, function() {
+				this.refresh();
+			} );
+		} );
+	},
 
-      var instances = this.form.data( "ui-form-reset-instances" ) || [];
-      if ( !instances.length ) {
+	_bindFormResetHandler: function() {
+		this.form = this.element._form();
+		if ( !this.form.length ) {
+			return;
+		}
 
-        // We don't use _on() here because we use a single event handler per form
-        this.form.on( "reset.ui-form-reset", this._formResetHandler );
-      }
-      instances.push( this );
-      this.form.data( "ui-form-reset-instances", instances );
-    },
+		var instances = this.form.data( "ui-form-reset-instances" ) || [];
+		if ( !instances.length ) {
 
-    _unbindFormResetHandler: function() {
-      if ( !this.form.length ) {
-        return;
-      }
+			// We don't use _on() here because we use a single event handler per form
+			this.form.on( "reset.ui-form-reset", this._formResetHandler );
+		}
+		instances.push( this );
+		this.form.data( "ui-form-reset-instances", instances );
+	},
 
-      var instances = this.form.data( "ui-form-reset-instances" );
-      instances.splice( $.inArray( this, instances ), 1 );
-      if ( instances.length ) {
-        this.form.data( "ui-form-reset-instances", instances );
-      } else {
-        this.form
-            .removeData( "ui-form-reset-instances" )
-            .off( "reset.ui-form-reset" );
-      }
-    }
-  };
+	_unbindFormResetHandler: function() {
+		if ( !this.form.length ) {
+			return;
+		}
 
-} ) );
+		var instances = this.form.data( "ui-form-reset-instances" );
+		instances.splice( $.inArray( this, instances ), 1 );
+		if ( instances.length ) {
+			this.form.data( "ui-form-reset-instances", instances );
+		} else {
+			this.form
+				.removeData( "ui-form-reset-instances" )
+				.off( "reset.ui-form-reset" );
+		}
+	}
+};
+
+} );

data/vendor/assets/javascripts/jquery-ui/form.js

@@ -1,22 +1,25 @@
 //= require jquery-ui/version
 
 ( function( factory ) {
-  if ( typeof define === "function" && define.amd ) {
+	"use strict";
 
-    // AMD. Register as an anonymous module.
-    define( [ "jquery", "./version" ], factory );
-  } else {
+	if ( typeof define === "function" && define.amd ) {
 
-    // Browser globals
-    factory( jQuery );
-  }
-} ( function( $ ) {
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
 
 // Support: IE8 Only
 // IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
 // with a string, so we need to find the proper form.
-  return $.fn.form = function() {
-    return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
-  };
+return $.fn._form = function() {
+	return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
+};
 
-} ) );
+} );