avo 4.1.4 → 4.1.6

data/app/assets/stylesheets/css/components/back_to_top.css

@@ -15,7 +15,7 @@
   opacity: 0;
   visibility: hidden;
   pointer-events: none;
-  transform: translateX(-50%) translateY(-0.5rem);
+  transform: translateX(-50%) translateY(0.5rem);
   transition: opacity 0.2s ease, transform 0.2s ease, visibility 0.2s;
 
   &:hover {

data/app/assets/stylesheets/css/components/breadcrumbs.css

@@ -81,3 +81,23 @@
     }
   }
 }
+
+/* Resource color on the initials chip: reuses the avatar component's --bg/--text
+   tint variables, so the existing color-mix keeps it readable in both themes. */
+.breadcrumb-element--color-red .cado-avatar--initials { --bg: var(--color-red-400); --text: var(--color-red-600); }
+.breadcrumb-element--color-orange .cado-avatar--initials { --bg: var(--color-orange-400); --text: var(--color-orange-600); }
+.breadcrumb-element--color-amber .cado-avatar--initials { --bg: var(--color-amber-400); --text: var(--color-amber-600); }
+.breadcrumb-element--color-yellow .cado-avatar--initials { --bg: var(--color-yellow-400); --text: var(--color-yellow-600); }
+.breadcrumb-element--color-lime .cado-avatar--initials { --bg: var(--color-lime-400); --text: var(--color-lime-600); }
+.breadcrumb-element--color-green .cado-avatar--initials { --bg: var(--color-green-400); --text: var(--color-green-600); }
+.breadcrumb-element--color-emerald .cado-avatar--initials { --bg: var(--color-emerald-400); --text: var(--color-emerald-600); }
+.breadcrumb-element--color-teal .cado-avatar--initials { --bg: var(--color-teal-400); --text: var(--color-teal-600); }
+.breadcrumb-element--color-cyan .cado-avatar--initials { --bg: var(--color-cyan-400); --text: var(--color-cyan-600); }
+.breadcrumb-element--color-sky .cado-avatar--initials { --bg: var(--color-sky-400); --text: var(--color-sky-600); }
+.breadcrumb-element--color-blue .cado-avatar--initials { --bg: var(--color-blue-400); --text: var(--color-blue-600); }
+.breadcrumb-element--color-indigo .cado-avatar--initials { --bg: var(--color-indigo-400); --text: var(--color-indigo-600); }
+.breadcrumb-element--color-violet .cado-avatar--initials { --bg: var(--color-violet-400); --text: var(--color-violet-600); }
+.breadcrumb-element--color-purple .cado-avatar--initials { --bg: var(--color-purple-400); --text: var(--color-purple-600); }
+.breadcrumb-element--color-fuchsia .cado-avatar--initials { --bg: var(--color-fuchsia-400); --text: var(--color-fuchsia-600); }
+.breadcrumb-element--color-pink .cado-avatar--initials { --bg: var(--color-pink-400); --text: var(--color-pink-600); }
+.breadcrumb-element--color-rose .cado-avatar--initials { --bg: var(--color-rose-400); --text: var(--color-rose-600); }

data/app/assets/stylesheets/css/sidebar.css

@@ -210,6 +210,52 @@
 
 .sidebar-link__icon-wrapper {
   @apply shrink-0 flex items-center justify-center;
+  color: var(--sidebar-icon-color, currentColor);
+}
+
+/* Resource color: tints only the icon stroke. Each modifier sets a scoped
+   variable that only the icon wrapper consumes; the link's own color, hover
+   and active rules stay untouched. Light theme uses the 600 shade (700 for
+   the yellow family, which cannot reach 3:1 non-text contrast on the light
+   sidebar otherwise); dark theme overrides to the 400 shade below. */
+.sidebar-link--color-red { --sidebar-icon-color: var(--color-red-600); }
+.sidebar-link--color-orange { --sidebar-icon-color: var(--color-orange-600); }
+.sidebar-link--color-amber { --sidebar-icon-color: var(--color-amber-700); }
+.sidebar-link--color-yellow { --sidebar-icon-color: var(--color-yellow-700); }
+.sidebar-link--color-lime { --sidebar-icon-color: var(--color-lime-700); }
+.sidebar-link--color-green { --sidebar-icon-color: var(--color-green-600); }
+.sidebar-link--color-emerald { --sidebar-icon-color: var(--color-emerald-600); }
+.sidebar-link--color-teal { --sidebar-icon-color: var(--color-teal-600); }
+.sidebar-link--color-cyan { --sidebar-icon-color: var(--color-cyan-600); }
+.sidebar-link--color-sky { --sidebar-icon-color: var(--color-sky-600); }
+.sidebar-link--color-blue { --sidebar-icon-color: var(--color-blue-600); }
+.sidebar-link--color-indigo { --sidebar-icon-color: var(--color-indigo-600); }
+.sidebar-link--color-violet { --sidebar-icon-color: var(--color-violet-600); }
+.sidebar-link--color-purple { --sidebar-icon-color: var(--color-purple-600); }
+.sidebar-link--color-fuchsia { --sidebar-icon-color: var(--color-fuchsia-600); }
+.sidebar-link--color-pink { --sidebar-icon-color: var(--color-pink-600); }
+.sidebar-link--color-rose { --sidebar-icon-color: var(--color-rose-600); }
+
+/* Dark theme: lift the tints to the 400 shade so they stay legible on the
+   dark sidebar background. */
+.dark {
+  .sidebar-link--color-red { --sidebar-icon-color: var(--color-red-400); }
+  .sidebar-link--color-orange { --sidebar-icon-color: var(--color-orange-400); }
+  .sidebar-link--color-amber { --sidebar-icon-color: var(--color-amber-400); }
+  .sidebar-link--color-yellow { --sidebar-icon-color: var(--color-yellow-400); }
+  .sidebar-link--color-lime { --sidebar-icon-color: var(--color-lime-400); }
+  .sidebar-link--color-green { --sidebar-icon-color: var(--color-green-400); }
+  .sidebar-link--color-emerald { --sidebar-icon-color: var(--color-emerald-400); }
+  .sidebar-link--color-teal { --sidebar-icon-color: var(--color-teal-400); }
+  .sidebar-link--color-cyan { --sidebar-icon-color: var(--color-cyan-400); }
+  .sidebar-link--color-sky { --sidebar-icon-color: var(--color-sky-400); }
+  .sidebar-link--color-blue { --sidebar-icon-color: var(--color-blue-400); }
+  .sidebar-link--color-indigo { --sidebar-icon-color: var(--color-indigo-400); }
+  .sidebar-link--color-violet { --sidebar-icon-color: var(--color-violet-400); }
+  .sidebar-link--color-purple { --sidebar-icon-color: var(--color-purple-400); }
+  .sidebar-link--color-fuchsia { --sidebar-icon-color: var(--color-fuchsia-400); }
+  .sidebar-link--color-pink { --sidebar-icon-color: var(--color-pink-400); }
+  .sidebar-link--color-rose { --sidebar-icon-color: var(--color-rose-400); }
 }
 
 /* Reserve same width when group has icons but this link has none (alignment) */

data/app/components/avo/breadcrumb_element_component.html.erb

@@ -1,5 +1,6 @@
 <%= wrapper_element class: class_names(
   "breadcrumb-element",
+  color_class,
   "breadcrumb-element--link": link?
 ) do %>
   <% if @avatar.present? %>

data/app/components/avo/breadcrumb_element_component.rb

@@ -6,6 +6,16 @@ class Avo::BreadcrumbElementComponent < Avo::BaseComponent
   prop :icon, default: nil
   prop :initials, default: nil
   prop :avatar
+  # Resource color: tints the initials chip, same palette as the sidebar icon.
+  prop :color, default: nil do |value|
+    next nil if value.blank?
+    value = value.to_sym if value.respond_to?(:to_sym)
+    Avo::Sidebar::LinkComponent::PALETTE_COLORS.include?(value) ? value : nil
+  end
+
+  def color_class
+    "breadcrumb-element--color-#{@color}" if @color.present?
+  end
 
   def link?
     @url.present?

data/app/components/avo/breadcrumbs_component.html.erb

@@ -8,7 +8,8 @@
         url: item.path,
         icon: item.icon,
         avatar: item.avatar,
-        initials: item.initials
+        initials: item.initials,
+        color: item.respond_to?(:color) ? item.color : nil
       ) %>
 
       <% unless is_last %>

data/app/components/avo/sidebar/link_component.rb

@@ -6,6 +6,10 @@ require "view_component/version"
 # about menus; callers pass the path, label and resolved `active` (a match mode
 # like :inclusive, or a boolean to force it).
 class Avo::Sidebar::LinkComponent < Avo::BaseComponent
+  # The raw Tailwind palette names accepted for the tinted sidebar icon. Each
+  # has a matching `.sidebar-link--color-<name>` rule in css/sidebar.css.
+  PALETTE_COLORS = (Avo::UI::BadgeComponent::VALID_COLORS - %i[neutral success info warning danger]).freeze unless defined?(PALETTE_COLORS)
+
   prop :label
   prop :path
   prop :active, default: :inclusive do |value|
@@ -19,6 +23,14 @@ class Avo::Sidebar::LinkComponent < Avo::BaseComponent
   prop :reserve_icon_space, default: false
   prop :args, kind: :**, default: {}.freeze
   prop :hotkey, default: nil
+  # Resource color: tints only the icon stroke via a CSS modifier; unknown or
+  # blank values normalize to nil, which emits no modifier at all.
+  prop :color, default: nil do |value|
+    next nil if value.blank?
+
+    normalized = value.to_s.to_sym
+    PALETTE_COLORS.include?(normalized) ? normalized : nil
+  end
   prop :variant, default: :default
   prop :bar_class, default: ""
 
@@ -27,11 +39,15 @@ class Avo::Sidebar::LinkComponent < Avo::BaseComponent
   end
 
   def root_css_class
-    return "sidebar-link" unless subitem?
+    return ["sidebar-link", color_class].reject(&:blank?).join(" ") unless subitem?
 
     ["sidebar-subitem", @bar_class].reject(&:blank?).join(" ")
   end
 
+  def color_class
+    "sidebar-link--color-#{@color}" if @color.present?
+  end
+
   # Sub-items don't show icons (for now); top-level links do.
   def show_icon?
     return false if subitem?

data/app/components/avo/sidebar_component.html.erb

@@ -21,7 +21,7 @@
               <%= render Avo::Sidebar::HeadingComponent.new title: t('avo.dashboards'), icon: "tabler/outline/layout-dashboard" %>
 
               <% dashboards.sort_by { |r| r.navigation_label }.each do |dashboard| %>
-                <%= render Avo::Sidebar::LinkComponent.new label: dashboard.navigation_label, path: helpers.avo_dashboards.dashboard_path(dashboard), hotkey: dashboard.try(:hotkey).presence %>
+                <%= render Avo::Sidebar::LinkComponent.new label: dashboard.navigation_label, path: helpers.avo_dashboards.dashboard_path(dashboard), hotkey: dashboard.try(:hotkey).presence, color: dashboard.try(:color) %>
               <% end %>
             </div>
           <% end %>
@@ -30,7 +30,7 @@
             <%= render Avo::Sidebar::HeadingComponent.new title: t('avo.resources'), icon: "tabler/outline/topology-star-3" %>
 
             <% resources.sort_by { |r| r.navigation_label }.each do |resource| %>
-              <%= render Avo::Sidebar::LinkComponent.new label: resource.navigation_label, path: helpers.resources_path(resource: resource), icon: resource.icon, hotkey: resource.try(:hotkey).presence %>
+              <%= render Avo::Sidebar::LinkComponent.new label: resource.navigation_label, path: helpers.resources_path(resource: resource), icon: resource.icon, hotkey: resource.try(:hotkey).presence, color: resource.try(:color) %>
             <% end %>
           </div>
 

data/app/controllers/avo/attachments_controller.rb

@@ -27,8 +27,12 @@ module Avo
     end
 
     def destroy
-      if authorized_to :delete
-        attachment = ActiveStorage::Attachment.find(params[:attachment_id])
+      if attachment_name.blank?
+        flash[:error] = t("avo.failed_to_find_attachment")
+      elsif !authorized_to(:delete)
+        flash[:notice] = t("avo.not_authorized")
+      else
+        attachment = attachment_to_destroy
 
         if attachment.present?
           ActiveRecord::Base.transaction do
@@ -47,10 +51,8 @@ module Avo
             flash[:error] = @record.errors.full_messages.join(", ")
           end
         else
-          t("avo.failed_to_find_attachment")
+          flash[:error] = t("avo.failed_to_find_attachment")
         end
-      else
-        flash[:notice] = t("avo.not_authorized")
       end
 
       respond_to do |format|
@@ -62,8 +64,30 @@ module Avo
 
     private
 
+    # The attachment association named in the URL, validated against the record
+    # it is being requested on. Blank when the name is not an attachment on this
+    # record, which keeps `params[:attachment_name]` out of the policy method
+    # name below.
+    def attachment_name
+      return @attachment_name if defined?(@attachment_name)
+
+      @attachment_name = BaseResource.valid_attachment_name(@record, params[:attachment_name])
+    end
+
+    # Resolve the attachment through the record and association that were
+    # authorized. `params[:attachment_id]` is attacker-controlled and
+    # independent of `params[:id]`, so an unscoped lookup here would let a user
+    # authorized on one record destroy any attachment in the application.
+    def attachment_to_destroy
+      ActiveStorage::Attachment.find_by(
+        id: params[:attachment_id],
+        record: @record,
+        name: attachment_name
+      )
+    end
+
     def authorized_to(action)
-      @resource.authorization.authorize_action("#{action}_#{params[:attachment_name]}?", record: @record, raise_exception: false)
+      @resource.authorization.authorize_action("#{action}_#{attachment_name}?", record: @record, raise_exception: false)
     end
 
     def authorized_to_upload(attachment_name)

data/app/controllers/avo/base_controller.rb

@@ -24,10 +24,10 @@ module Avo
       if @reflection.present? && !turbo_frame_request?
         # A good rule of thumb is that the resource name entry (Users) gets just the initials
         # The record name gets initials and avatar
-        add_breadcrumb title: @record.class.to_s.pluralize, path: resources_path(resource: @parent_resource), initials: @parent_resource.class.initials
-        add_breadcrumb title: @parent_resource.record_title, path: resource_path(record: @record, resource: @parent_resource), initials: @parent_resource.initials, avatar: @parent_resource.avatar
+        add_breadcrumb title: @record.class.to_s.pluralize, path: resources_path(resource: @parent_resource), initials: @parent_resource.class.initials, color: @parent_resource.class.color
+        add_breadcrumb title: @parent_resource.record_title, path: resource_path(record: @record, resource: @parent_resource), initials: @parent_resource.initials, avatar: @parent_resource.avatar, color: @parent_resource.class.color
       end
-      add_breadcrumb title: @resource.plural_name, initials: @resource.class.initials
+      add_breadcrumb title: @resource.plural_name, initials: @resource.class.initials, color: @resource.class.color
 
       set_applied_filters
       set_index_params
@@ -97,7 +97,7 @@ module Avo
 
       add_via_breadcrumbs
 
-      add_breadcrumb title: @resource.record_title, path: nil, avatar: @resource.avatar, initials: @resource.initials
+      add_breadcrumb title: @resource.record_title, path: nil, avatar: @resource.avatar, initials: @resource.initials, color: @resource.class.color
       add_breadcrumb title: I18n.t("avo.details").upcase_first, path: nil
 
       set_component_for __method__
@@ -117,12 +117,12 @@ module Avo
         via_record = via_resource.find_record params[:via_record_id], params: params
         via_resource = via_resource.new record: via_record
 
-        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: via_resource), initials: via_resource.class.initials
-        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials
+        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: via_resource), initials: via_resource.class.initials, color: via_resource.class.color
+        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials, color: via_resource.class.color
 
-        add_breadcrumb title: @resource.plural_name, initials: @resource.class.initials
+        add_breadcrumb title: @resource.plural_name, initials: @resource.class.initials, color: @resource.class.color
       else
-        add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials
+        add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials, color: @resource.class.color
       end
 
       add_breadcrumb title: t("avo.new").humanize
@@ -168,8 +168,8 @@ module Avo
       saved = save_record
       @resource.hydrate(record: @record, view: Avo::ViewInquirer.new(:new), user: _current_user)
 
-      add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials
-      add_breadcrumb title: t("avo.new").humanize, path: nil, avatar: @resource.avatar, initials: @resource.initials
+      add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials, color: @resource.class.color
+      add_breadcrumb title: t("avo.new").humanize, path: nil, avatar: @resource.avatar, initials: @resource.initials, color: @resource.class.color
       set_actions
 
       set_component_for :edit
@@ -416,7 +416,7 @@ module Avo
       # Go through all filters
       @resource.get_filters
         .select do |filter|
-          filter[:class].instance_methods(false).include? :react
+          filter[:class].method_defined?(:react, false)
         end
         .each do |filter|
           # Run the react method if it's present
@@ -446,19 +446,19 @@ module Avo
         via_record = via_resource.find_record params[:via_record_id], params: params
         via_resource = via_resource.new record: via_record
 
-        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: @resource), initials: via_resource.class.initials
-        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials
+        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: @resource), initials: via_resource.class.initials, color: via_resource.class.color
+        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials, color: via_resource.class.color
 
         last_crumb_args = {
           via_resource_class: params[:via_resource_class],
           via_record_id: params[:via_record_id]
         }
-        add_breadcrumb title: @resource.plural_name, initials: @resource.class.initials
+        add_breadcrumb title: @resource.plural_name, initials: @resource.class.initials, color: @resource.class.color
       else
-        add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials
+        add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials, color: @resource.class.color
       end
 
-      add_breadcrumb title: @resource.record_title, path: resource_path(record: @resource.record, resource: @resource, **last_crumb_args), avatar: @resource.avatar, initials: @resource.initials
+      add_breadcrumb title: @resource.record_title, path: resource_path(record: @resource.record, resource: @resource, **last_crumb_args), avatar: @resource.avatar, initials: @resource.initials, color: @resource.class.color
       add_breadcrumb title: t("avo.edit").humanize
     end
 
@@ -611,7 +611,7 @@ module Avo
 
     # Set pagy locale from params or from avo configuration, if both nil locale = "en"
     def set_pagy_locale
-      @pagy_locale = locale.to_s || Avo.configuration.default_locale || "en"
+      @pagy_locale = locale.to_s
       Pagy::I18n.locale = @pagy_locale if defined?(Pagy::I18n) && Pagy::I18n.respond_to?(:locale=)
     end
 
@@ -738,12 +738,12 @@ module Avo
         via_record = via_resource.find_record params[:via_record_id], params: params
         via_resource = via_resource.new record: via_record
 
-        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: via_resource), initials: via_resource.class.initials
-        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials
+        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: via_resource), initials: via_resource.class.initials, color: via_resource.class.color
+        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials, color: via_resource.class.color
 
-        add_breadcrumb title: @resource.plural_name, path: nil, initials: @resource.class.initials
+        add_breadcrumb title: @resource.plural_name, path: nil, initials: @resource.class.initials, color: @resource.class.color
       else
-        add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials
+        add_breadcrumb title: @resource.plural_name, path: resources_path(resource: @resource), initials: @resource.class.initials, color: @resource.class.color
       end
     end
 

data/app/javascript/js/controllers/fields/panel_refresh_controller.js

@@ -3,7 +3,8 @@ import { Controller } from '@hotwired/stimulus'
 export default class extends Controller {
   refresh() {
     const frame = this.context.scope.element.closest('turbo-frame')
-    this.element.querySelector('svg').classList.add('animate-spin')
+    // The tabler refresh icon's arrows point counterclockwise, so the spin must run in reverse to match.
+    this.element.querySelector('svg').classList.add('animate-spin', '[animation-direction:reverse]')
     if (frame) {
       frame.classList.add('opacity-50')
       frame.addEventListener('turbo:frame-load', () => {

data/lib/avo/concerns/breadcrumbs.rb

@@ -15,7 +15,7 @@ module Avo
         helper_method :add_breadcrumb, :avo_breadcrumbs
       end
 
-      Crumb = Data.define(:title, :path, :avatar, :initials, :icon) unless defined?(Crumb)
+      Crumb = Data.define(:title, :path, :avatar, :initials, :icon, :color) unless defined?(Crumb)
 
       class Builder
         extend PropInitializer::Properties
@@ -26,8 +26,8 @@ module Avo
         def breadcrumbs = context.avo_breadcrumbs
       end
 
-      def add_breadcrumb(title: nil, path: nil, avatar: nil, initials: nil, icon: nil)
-        avo_breadcrumbs << Crumb.new(title:, path:, avatar:, initials:, icon:)
+      def add_breadcrumb(title: nil, path: nil, avatar: nil, initials: nil, icon: nil, color: nil)
+        avo_breadcrumbs << Crumb.new(title:, path:, avatar:, initials:, icon:, color:)
       end
 
       def avo_breadcrumbs

data/lib/avo/resources/base.rb

@@ -76,6 +76,7 @@ module Avo
       class_attribute :confirm_on_save, default: false
       class_attribute :visible_on_sidebar, default: true
       class_attribute :hotkey, default: nil
+      class_attribute :color, default: nil
       class_attribute :index_query, default: -> {
         query
       }

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.6
 platform: ruby
 authors:
 - Adrian Marin