activeadmin 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0548655f225688960699146ba45dcacd0b22375225cd51a835e0226a9347c0a
-  data.tar.gz: accc8e86bd98b8c7d2f1dca258f528e6a36941e3c7cc8633605cfbb05fd652d6
+  metadata.gz: cd51d7cc81eac3cbb01358076ca98368ccd5879f96dd9dfaed3f4e6b5c511648
+  data.tar.gz: 95913536dfd3ccf746a0848545b81685ead621cd2536776ede879a9b02196058
 SHA512:
-  metadata.gz: 9fdd7e6072424d783695be0cf5887800d894bd83a18511177d06bd16604b99b04ae491bcd281efb4acffd425b95fc747e2ede748574c07adc507a18380096184
-  data.tar.gz: 3756bf37298eab6a6227e56a76cf4ebfa4563f718a9f8c67feeb34446c56e1b2bce8243cbf5f267801e3aa42ff12f56acf01e37bef409a80a1f6180072c2aa38
+  metadata.gz: 0b296e6597a76172815063ca7b63ba359308b9a13c26874b6ea6b746dbd25bb8d6929c4da2f1b8682dfbd998cc7a752c73d2eca70b356fdfad8362294273aac9
+  data.tar.gz: ac965d5a5b2308a064e0e47816c1739f8482570ce926feb72fcf1031b12ac1e738719571faae48d03128c1d8af790e74e47c04e7f62484e791cd654749373417

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## 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
@@ -920,6 +930,8 @@ Please check [0-6-stable] for previous changes.
 [#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
@@ -1014,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.2"
+  VERSION = "3.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre