avo 2.40.0 → 2.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2935789c3103001a7d5343604f30ff038dcf422fb19d43dce8920dc47e8d00ec
-  data.tar.gz: 7a85085fb748a296e03677cf52b640f029da373ed2763d8cff3e33c30db58608
+  metadata.gz: 51cdcebc4079db0bc531fbec4a0e9d3872a7270bd7f2e0f1b5e88111af6b9700
+  data.tar.gz: e0520aa64343da6381a016b0b08b471a6b37389e42a8d01f7676f237d37b7525
 SHA512:
-  metadata.gz: 936d25a1817837a8192dca5db6a1b11b1a473023c367ea66ac5bcb48b47a715eb64d1e69ae499866b1364327abfb33dc04d7bd977d2bd6a7b6562890f1b51138
-  data.tar.gz: 90fd512c9a60ef5c58be02884a476dd3bbcc970837920e46cfd51fc7ae3f6db580296d71478f3bb39bd43d68fe3dc1917aa30733a5d98577d600c9176560a80c
+  metadata.gz: a1b077a1cac9372943eec04cc718c6f7a0eabbdd457cf38c5355cbefd3ea3d9908a4713322ad9d24c1ea5a6bcfab509647a3b7f979d3de000ce6dd24e2427f21
+  data.tar.gz: 73aae293a9b3e50178e15fe9e4a2d131928704e64c70822183ac974eefd5efc8209a5862ec61d33d08e76e0f56c7d29f8e16d5376730ba3a819352b72e165455

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.40.0)
+    avo (2.41.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/fields/common/badge_viewer_component.html.erb

@@ -1,25 +1 @@
-<%
-  backgrounds = {
-    info: 'bg-blue-500',
-    success: 'bg-green-500',
-    danger: 'bg-red-500',
-    warning: 'bg-yellow-500',
-    secondary: 'bg-gray-500',
-  }
-
-  label = @value
-  background = :info
-
-  @options.invert.each do |values, type|
-    if [values].flatten.map { |value| value }.include? @value
-      label = @value
-      background = type.to_sym
-      next
-    end
-  end
-
-  classes = 'whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold block text-center truncate '
-
-  classes += "#{backgrounds[background]} text-white" if backgrounds[background].present?
-%>
-<span class="<%= classes %>" style="max-width: 120px;"><%= label %></span>
+<span class="<%= classes %>" style="max-width: 120px;"><%= @value %></span>

data/app/components/avo/fields/common/badge_viewer_component.rb

@@ -4,5 +4,29 @@ class Avo::Fields::Common::BadgeViewerComponent < ViewComponent::Base
   def initialize(value:, options:)
     @value = value
     @options = options
+    @backgrounds = {
+      info: "bg-blue-500",
+      success: "bg-green-500",
+      danger: "bg-red-500",
+      warning: "bg-yellow-500",
+      neutral: "bg-gray-500"
+    }
+  end
+
+  def classes
+    background = :info
+
+    @options.invert.each do |values, type|
+      if [values].flatten.map { |value| value }.include? @value
+        background = type.to_sym
+        next
+      end
+    end
+
+    classes = "whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold block text-center truncate "
+
+    classes += "#{@backgrounds[background]} text-white" if @backgrounds[background].present?
+
+    classes
   end
 end

data/app/controllers/avo/search_controller.rb

@@ -51,14 +51,14 @@ module Avo
         scope: resource.class.scope
       ).handle
 
+      query = apply_scope(query) if should_apply_any_scope?
+
       # Get the count
       results_count = query.reselect(resource.model_class.primary_key).count
 
       # Get the results
       query = query.limit(8)
 
-      query = apply_scope(query) if should_apply_any_scope?
-
       results = apply_search_metadata(query, resource)
 
       header = resource.plural_name

data/lib/avo/fields/badge_field.rb

@@ -8,7 +8,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, secondary: :secondary}
+        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, neutral: :neutral}
         @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.40.0" unless const_defined?(:VERSION)
+  VERSION = "2.41.0" unless const_defined?(:VERSION)
 end

data/public/avo-assets/avo.base.css

@@ -7997,10 +7997,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   text-transform:capitalize
 }
 
-.italic{
-  font-style:italic
-}
-
 .leading-6{
   line-height:1.5rem
 }
@@ -8199,16 +8195,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   color:rgb(22 163 74 / var(--tw-text-opacity))
 }
 
-.\!text-pink-600{
-  --tw-text-opacity:1 !important;
-  color:rgb(219 39 119 / var(--tw-text-opacity)) !important
-}
-
-.underline{
-  -webkit-text-decoration-line:underline;
-          text-decoration-line:underline
-}
-
 .no-underline{
   -webkit-text-decoration-line:none;
           text-decoration-line:none

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.40.0
+  version: 2.41.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord