avo 2.12.1.pre.1 → 2.13.2.pre.1

data/app/components/avo/views/resource_show_component.html.erb

@@ -5,60 +5,150 @@
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+  <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
     <% c.tools do %>
-      <% if @reflection.present? && @resource.model.present? %>
-        <% if can_detach? %>
-          <%= a_button url: detach_path,
-            icon: 'detach',
-            method: :delete,
-            form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-            style: :text,
-            data: {
-              confirm: "Are you sure you want to detach this #{title}."
-            } do %>
-            <%= t('avo.detach_item', item: title).capitalize %>
-          <% end %>
-        <% end %>
-        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-        <% if can_see_the_edit_button? %>
-          <%= a_link edit_path,
-            color: :primary,
-            style: :primary,
-            icon: 'edit' do %>
-            <%= t('avo.edit').capitalize %>
+      <% if @resource.has_show_controls? %>
+        <% @resource.render_show_controls.each do |control| %>
+          <% if control.back_button? %>
+            <%= a_link back_path,
+                style: :text,
+                title: control.title,
+                data: {
+                  tippy: control.title ? :tooltip : nil,
+                },
+                icon: 'arrow-left' do %>
+              <%= control.label %>
+            <% end %>
+          <% elsif control.delete_button? %>
+            <% if can_see_the_destroy_button? %>
+              <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+                method: :delete,
+                local: true,
+                style: :text,
+                loading: true,
+                confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+                color: :red,
+                icon: 'trash',
+                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+                title: control.title,
+                data: {
+                  control: :destroy,
+                  tippy: control.title ? :tooltip : nil,
+                  'resource-id': @resource.model.id,
+                } do %>
+              <% end %>
+            <% end %>
+          <% elsif control.actions_list? %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, style: control.style, color: control.color %>
+          <% elsif control.edit_button? %>
+            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
+            <% end %>
+            <%= a_link edit_path,
+                color: :primary,
+                style: :primary,
+                title: control.title,
+                data: {
+                  tippy: control.title ? :tooltip : nil,
+                },
+                icon: 'edit' do %>
+              <%= control.label %>
+            <% end %>
+          <% elsif control.action? %>
+            <%= a_link control.path,
+                color: control.color,
+                style: control.style,
+                icon: control.icon,
+                title: control.title,
+                data: {
+                  tippy: control.title ? :tooltip : nil,
+                  'turbo-frame': 'actions_show',
+                  'action': 'click->actions-picker#visitAction',
+                } do %>
+              <%= control.label %>
+            <% end %>
+          <% elsif control.link_to? %>
+            <%= a_link control.path,
+                color: control.color,
+                style: control.style,
+                icon: control.icon,
+                title: control.title,
+                target: control.target,
+                class: control.class,
+                data: {
+                  **control.data,
+                  tippy: control.title ? :tooltip : nil,
+                } do %>
+              <%= control.label %>
+            <% end %>
+          <% elsif control.detach_button? %>
+            <% if @reflection.present? && @resource.model.present? && can_detach? %>
+              <%= a_button url: detach_path,
+                  icon: 'detach',
+                  method: :delete,
+                  form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+                  style: :text,
+                  data: {
+                    confirm: "Are you sure you want to detach this #{title}."
+                  } do %>
+                <%= t('avo.detach_item', item: title).capitalize %>
+              <% end %>
+            <% end %>
           <% end %>
         <% end %>
       <% else %>
-        <%= a_link back_path,
-          style: :text,
-          icon: 'arrow-left' do %>
-          <%= t('avo.go_back') %>
-        <% end %>
-        <% if can_see_the_destroy_button? %>
-          <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
-            method: :delete,
-            local: true,
+        <% if @reflection.present? && @resource.model.present? %>
+          <% if can_detach? %>
+            <%= a_button url: detach_path,
+                icon: 'detach',
+                method: :delete,
+                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+                style: :text,
+                data: {
+                  confirm: "Are you sure you want to detach this #{title}."
+                } do %>
+              <%= t('avo.detach_item', item: title).capitalize %>
+            <% end %>
+          <% end %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+          <% if can_see_the_edit_button? %>
+            <%= a_link edit_path,
+                color: :primary,
+                style: :primary,
+                icon: 'edit' do %>
+              <%= t('avo.edit').capitalize %>
+            <% end %>
+          <% end %>
+        <% else %>
+          <%= a_link back_path,
             style: :text,
-            loading: true,
-            confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-            color: :red,
-            icon: 'trash',
-            form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-            data: {
-              control: :destroy,
-              'resource-id': @resource.model.id,
-            } do %>
-            <%= t('avo.delete').capitalize %>
+            icon: 'arrow-left' do %>
+            <%= t('avo.go_back') %>
           <% end %>
-        <% end %>
-        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-        <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-          <%= a_link edit_path,
-            color: :primary,
-            style: :primary,
-            icon: 'edit' do %>
-            <%= t('avo.edit').capitalize %>
+          <% if can_see_the_destroy_button? %>
+            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+                method: :delete,
+                local: true,
+                style: :text,
+                loading: true,
+                confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+                color: :red,
+                icon: 'trash',
+                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+                data: {
+                  control: :destroy,
+                  'resource-id': @resource.model.id,
+                } do %>
+              <%= t('avo.delete').capitalize %>
+            <% end %>
+          <% end %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+          <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
+            <%= a_link edit_path,
+              color: :primary,
+              style: :primary,
+              icon: 'edit' do %>
+              <%= t('avo.edit').capitalize %>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>

data/app/components/avo/views/resource_show_component.rb

@@ -17,6 +17,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   def title
     if @reflection.present?
       return field.name if has_one_field?
+
       reflection_resource.name
     else
       @resource.default_panel_name

data/app/helpers/avo/resources_helper.rb

@@ -47,7 +47,7 @@ module Avo
 
     def item_selector_input(floating: false, size: :md)
       "<input type='checkbox'
-        class='mx-3 rounded #{"absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block" if floating} #{size.to_sym == :lg ? "w-5 h-5" : "w-4 h-4"}'
+        class='mx-3 rounded checked:bg-primary-400 focus:checked:!bg-primary-400 #{"absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block" if floating} #{size.to_sym == :lg ? "w-5 h-5" : "w-4 h-4"}'
         data-action='input->item-selector#toggle input->item-select-all#update'
         data-item-select-all-target='itemCheckbox'
         name='#{t "avo.select_item"}'
@@ -58,7 +58,7 @@ module Avo
 
     def item_select_all_input
       "<input type='checkbox'
-        class='mx-3 rounded w-4 h-4'
+        class='mx-3 rounded w-4 h-4 checked:bg-primary-400 focus:checked:!bg-primary-400'
         data-action='input->item-select-all#toggle'
         data-item-select-all-target='checkbox'
         name='#{t "avo.select_all"}'

data/app/javascript/avo.js

@@ -10,7 +10,6 @@ import tippy from 'tippy.js'
 
 import 'chartkick/chart.js/chart.esm'
 
-// Toastr alerts
 import './js/active-storage'
 import './js/controllers'
 

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-alert */
 import 'trix'
 import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../../helpers/cast_boolean'
@@ -48,7 +49,7 @@ export default class extends Controller {
         // Prevent file uploads for fields that have attachments disabled.
         if (this.attachmentsDisabled) {
           event.preventDefault()
-          window.toastr.warning('This field has attachments disabled.')
+          alert('This field has attachments disabled.')
 
           return
         }
@@ -56,7 +57,7 @@ export default class extends Controller {
         // Prevent file uploads for resources that haven't been saved yet.
         if (this.resourceId === '') {
           event.preventDefault()
-          window.toastr.warning("You can't upload files into the Trix editor until you save the resource.")
+          alert("You can't upload files into the Trix editor until you save the resource.")
 
           return
         }
@@ -64,7 +65,7 @@ export default class extends Controller {
         // Prevent file uploads for fields without an attachment key.
         if (this.attachmentKey === '') {
           event.preventDefault()
-          window.toastr.warning("You haven't set an <a href='https://google.com' class='!text-blue-700 underline'>attachment_key</a> to this Trix field.")
+          alert("You haven't set an `attachment_key` to this Trix field.")
         }
       }
     })

data/app/javascript/js/controllers/item_selector_controller.js

@@ -5,7 +5,7 @@ export default class extends Controller {
 
   checkbox = {};
 
-  enabledClasses = ['text-black', 'hover:bg-blue-500', 'hover:text-white']
+  enabledClasses = ['text-black']
 
   disabledClasses = ['text-gray-500']
 

data/app/views/avo/associations/new.html.erb

@@ -34,10 +34,10 @@
       </div>
 
       <% c.controls do %>
-        <%= a_button 'data-action': 'click->modal#close', size: :sm do %>
+        <%= a_button 'data-action': 'click->modal#close', size: :sm, style: :outline, color: :primary do %>
           <%= t('avo.cancel') %>
         <% end %>
-        <%= a_button type: :submit, color: :green, size: :sm do %>
+        <%= a_button type: :submit, style: :primary, color: :primary, size: :sm do %>
           <%= t('avo.attach') %>
         <% end %>
       <% end %>

data/app/views/avo/base/_multiple_select_filter.html.erb

@@ -12,7 +12,7 @@
       'data-multiple-select-filter-target': 'selector'
     %>
     <div class="flex justify-end">
-      <%= a_button class: 'mt-4', color: :blue, size: :xs, data: { action: "multiple-select-filter#changeFilter" } do %>
+      <%= a_button class: 'mt-4', color: :primary, size: :xs, data: { action: "multiple-select-filter#changeFilter" } do %>
         Filter by <%=filter.name %>
       <% end %>
     </div>

data/app/views/avo/base/_text_filter.html.erb

@@ -13,7 +13,7 @@
       'data-action': 'keypress->text-filter#tryToSubmit'
     %>
     <div class="flex justify-end">
-      <%= a_button class: 'mt-4', color: :blue, data: { action: "text-filter#changeFilter" }, size: :xs do %>
+      <%= a_button class: 'mt-4', color: :primary, data: { action: "text-filter#changeFilter" }, size: :xs do %>
         <%= filter.button_label || "Filter by #{filter.name}" %>
       <% end %>
     </div>

data/app/views/avo/dashboards/show.html.erb

@@ -1,4 +1,4 @@
-<%= render Avo::PanelComponent.new(title: @dashboard.name, description: @dashboard.description) do |c| %>
+<%= render Avo::PanelComponent.new(name: @dashboard.name, description: @dashboard.description) do |c| %>
   <% c.bare_content do %>
     <% if @dashboard.items.present? %>
       <div class="min-h-24">

data/app/views/avo/debug/index.html.erb

@@ -14,7 +14,7 @@
   hq_payload = Avo::Licensing::HQ.new(request).payload
 %>
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new(title: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
+  <%= render Avo::PanelComponent.new(name: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
     <% c.tools do %>
     <% end %>
     <% c.bare_content do %>

data/app/views/avo/debug/report.html.erb

@@ -9,6 +9,7 @@
   </div>
   <div class="flex justify-end">
     <%= a_button icon: 'heroicons/outline/clipboard',
+      color: :primary,
       style: :primary,
       data: {
         controller: 'copy-to-clipboard',

data/app/views/avo/home/index.html.erb

@@ -1,5 +1,5 @@
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
+  <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">

data/app/views/avo/partials/_branding.html.erb

@@ -0,0 +1,5 @@
+<style>
+  :root {
+    <%= Avo.configuration.branding.css_colors %>
+  }
+</style>

data/app/views/avo/partials/_header.html.erb

@@ -1 +1 @@
-<%= link_to Avo.configuration.app_name, '/', class: 'text-blue-500 font-semibold', target: :_blank %>
+<%= link_to Avo.configuration.app_name, '/', class: 'text-primary-500 font-semibold', target: :_blank %>

data/app/views/avo/partials/_logo.html.erb

@@ -1,4 +1,4 @@
 <%= link_to root_path, class: 'logo-placeholder h-full w-full flex justify-start' do %>
-  <%= image_tag '/avo-assets/logo.png', class: 'hidden sm:block object-contain', title: 'Avo' %>
-  <%= image_tag '/avo-assets/logomark.png', class: 'sm:hidden object-contain', title: 'Avo' %>
+  <%= image_tag Avo.configuration.branding.logo, class: 'hidden sm:block object-contain', title: 'Avo' %>
+  <%= image_tag Avo.configuration.branding.logomark, class: 'sm:hidden object-contain', title: 'Avo' %>
 <% end %>

data/app/views/avo/private/_links_and_buttons.html.erb

@@ -2,7 +2,7 @@
   entities = [:button, :link]
   sizes = [:xl, :lg, :md, :sm, :xs].reverse
   styles = [:primary, :outline, :text]
-  colors = [:primary, :gray, :red, :orange, :green]
+  colors = [:primary, :blue, :gray, :red, :orange, :green]
   states = [:regular, :hover, :disabled, :active]
 %>
 <div class="px-6 space-y-4">

data/app/views/avo/private/design.html.erb

@@ -1,20 +1,20 @@
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
+  <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.tools do %>
-      <%= a_link('/admin', icon: 'arrow-left', style: :primary, is_link: true) do %>
+      <%= a_link('/admin', icon: 'arrow-left', color: :green, style: :primary, is_link: true) do %>
         Primary
       <% end %>
 
       <%= a_link('/admin', icon: 'arrow-left', style: :outline, is_link: true) do %>
-        Secondary
+        Outline
       <% end %>
 
       <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :red, is_link: true) do %>
         Red
       <% end %>
 
-      <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :orange, is_link: true) do %>
-        Red
+      <%= a_link('/admin', icon: 'arrow-left', style: :text, color: :orange, is_link: true) do %>
+        Text
       <% end %>
     <% end %>
 

data/app/views/layouts/avo/application.html.erb

@@ -7,6 +7,7 @@
     <%= csp_meta_tag %>
     <%= render partial: 'avo/partials/javascript' %>
     <%= render partial: 'avo/partials/head' %>
+    <%= render partial: 'avo/partials/branding' %>
     <% if Avo::PACKED %>
       <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
       <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
@@ -18,7 +19,7 @@
       <% end %>
     <% end %>
   </head>
-  <body class="bg-gray-25 os-mac">
+  <body class="bg-application os-mac">
     <div class="relative flex flex-1 w-full min-h-full" data-controller="sidebar" data-sidebar-open-value="<%= @sidebar_open %>">
       <div class="flex-1 flex flex-col max-w-full">
         <%= render partial: "avo/partials/navbar" %>

data/lib/avo/base_resource.rb

@@ -3,8 +3,8 @@ module Avo
     extend ActiveSupport::DescendantsTracker
 
     include ActionView::Helpers::UrlHelper
-    include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
+    include Avo::Concerns::HasEditableControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
 
@@ -439,5 +439,9 @@ module Avo
     def ordering_host(**args)
       Avo::Hosts::Ordering.new resource: self, options: self.class.ordering, **args
     end
+
+    def has_model_id?
+      model.present? && model.id.present?
+    end
   end
 end

data/lib/avo/concerns/has_editable_controls.rb

@@ -0,0 +1,34 @@
+module Avo
+  module Concerns
+    module HasEditableControls
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :show_controls
+        class_attribute :show_controls_holder
+        class_attribute :show_controls_holder_called, default: false
+      end
+
+      def has_show_controls?
+        return false if ::Avo::App.license.lacks_with_trial(:resource_show_controls)
+
+        self.class.show_controls.present?
+      end
+
+      def render_show_controls
+        return [] if ::Avo::App.license.lacks_with_trial(:resource_show_controls)
+
+        if show_controls.present?
+          Avo::Resources::Controls::ExecutionContext.new(
+            block: show_controls,
+            resource: self,
+            record: model,
+            view: view
+          ).handle.items
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/avo/configuration/branding.rb

@@ -0,0 +1,57 @@
+class Avo::Configuration::Branding
+  def initialize(colors: nil, logo: nil, logomark: nil)
+    @colors = colors
+    @logo = logo
+    @logomark = logomark
+
+    @default_colors = {
+      100 => "206 231 248",
+      400 => "57 158 229",
+      500 => "8 134 222",
+      600 => "6 107 178"
+    }
+    @default_logo = "/avo-assets/logo.png"
+    @default_logomark = "/avo-assets/logomark.png"
+  end
+
+  def css_colors
+    rgb_colors.map do |color, value|
+      "--color-primary-#{color}: #{value};"
+    end.join("\n")
+  end
+
+  def logo
+    return @default_logo if Avo::App.license.lacks_with_trial(:branding)
+
+    @logo || @default_logo
+  end
+
+  def logomark
+    return @default_logomark if Avo::App.license.lacks_with_trial(:branding)
+
+    @logomark || @default_logomark
+  end
+
+  private
+
+  def colors
+    return @default_colors if Avo::App.license.lacks_with_trial(:branding)
+
+    @colors || @default_colors
+  end
+
+  def rgb_colors
+    colors.map do |key, value|
+      rgb_value = is_hex?(value) ? hex_to_rgb(value) : value
+      [key, rgb_value]
+    end.to_h
+  end
+
+  def is_hex?(value)
+    value.include? "#"
+  end
+
+  def hex_to_rgb(value)
+    value.to_s.match(/^#(..)(..)(..)$/).captures.map(&:hex).join(" ")
+  end
+end

data/lib/avo/configuration.rb

@@ -34,6 +34,7 @@ module Avo
     attr_accessor :buttons_on_form_footers
     attr_accessor :main_menu
     attr_accessor :profile_menu
+    attr_writer :branding
 
     def initialize
       @root_path = "/avo"
@@ -121,6 +122,10 @@ module Avo
     def feature_enabled?(feature)
       !@disabled_features.map(&:to_sym).include?(feature.to_sym)
     end
+
+    def branding
+      Avo::Configuration::Branding.new(**@branding || {})
+    end
   end
 
   def self.configuration

data/lib/avo/fields/date_field.rb

@@ -5,15 +5,13 @@ module Avo
       attr_reader :picker_format
       attr_reader :disable_mobile
       attr_reader :format
-      attr_reader :relative
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        add_string_prop args, :first_day_of_week, 0
+        add_string_prop args, :first_day_of_week, 1
         add_string_prop args, :picker_format, "Y-m-d"
         add_string_prop args, :format, "yyyy-LL-dd"
-        add_boolean_prop args, :relative
         add_boolean_prop args, :disable_mobile
       end
 

data/lib/avo/fields/field_extensions/has_include_blank.rb

@@ -4,7 +4,7 @@ module Avo
       module HasIncludeBlank
         def include_blank
           if @args[:include_blank] == true
-            placeholder || '—'
+            placeholder || "—"
           elsif @args[:include_blank] == false
             false
           else

data/lib/avo/fields/key_value_field.rb

@@ -12,8 +12,8 @@ module Avo
         hide_on :index
 
         @key_label = args[:key_label] if args[:key_label].present?
-        @value_label = args[:value_label]if args[:value_label].present?
-        @action_text = args[:action_text] if args[:action_text].present?
+        @value_label = args[:value_label] if args[:value_label].present?
+        @action_text = args[:action_text] if args[:action_text].present? # This should be add_row_label
         @delete_text = args[:delete_text] if args[:delete_text].present?
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
@@ -31,25 +31,25 @@ module Avo
       def key_label
         return @key_label if @key_label.present?
 
-        I18n.translate('avo.key_value_field.key')
+        I18n.translate("avo.key_value_field.key")
       end
 
       def value_label
         return @value_label if @value_label.present?
 
-        I18n.translate('avo.key_value_field.value')
+        I18n.translate("avo.key_value_field.value")
       end
 
       def action_text
         return @action_text if @action_text.present?
 
-        I18n.translate('avo.key_value_field.add_row')
+        I18n.translate("avo.key_value_field.add_row")
       end
 
       def delete_text
         return @delete_text if @delete_text.present?
 
-        I18n.translate('avo.key_value_field.delete_row')
+        I18n.translate("avo.key_value_field.delete_row")
       end
 
       def to_permitted_param