avo 2.13.1 → 2.13.2.pre.1

data/app/controllers/avo/search_controller.rb

@@ -44,13 +44,10 @@ module Avo
     end
 
     def search_resource(resource)
-      query =  Avo::Hosts::SearchScopeHost.new(
-        block: resource.search_query,
-        params: params,
-        scope: resource.class.scope.limit(8)
-      ).handle
+      query = resource.search_query.call(params: params).limit(8)
 
-      query = apply_scope(query) if should_apply_any_scope?
+      # Figure out if this is a belongs_to search
+      query = apply_attach_scope query
 
       results = apply_search_metadata(query, resource)
 
@@ -70,19 +67,22 @@ module Avo
       [resource.name.pluralize.downcase, result_object]
     end
 
-    # When searching in a `has_many` association and will scope out the records against the parent record.
-    # This is also used when looking for `belongs_to` associations, and this method applies the parents `attach_scope` if present.
-    def apply_scope(query)
-      if should_apply_has_many_scope?
-        apply_has_many_scope
-      elsif should_apply_attach_scope?
-        apply_attach_scope(query, parent)
+    # Figure out if it's a belongs to search and if it has the attach_scope block present.
+    # If so, set the parent for those edit view and the parent with the grandparent for the new view.
+    def apply_attach_scope(query)
+      return query if params[:via_reflection_class].blank?
+
+      # Fetch the field
+      field = belongs_to_field
+
+      # No need to modify the query if there's no attach_scope present.
+      return query if field.attach_scope.blank?
+
+      # Try to fetch the parent.
+      if params[:via_reflection_id].present?
+        parent = params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
       end
-    end
 
-    # Parent passed as argument to be used as a variable instead of the method "def parent"
-    # Otherwise parent = params...safe_constantize... will try to call method "def parent="
-    def apply_attach_scope(query, parent)
       # If the parent is nil it probably means that someone's creating the record so it's not attached yet.
       # In these scenarios, try to find the grandparent for the new views where the parent is nil
       # and initialize the parent record with the grandparent attached so the user has the required information
@@ -94,13 +94,8 @@ module Avo
         )
       end
 
-      Avo::Hosts::AssociationScopeHost.new(block: attach_scope, query: query, parent: parent).handle
-    end
-
-    def apply_has_many_scope
-      scope = parent.send(params[:via_association_id])
-
-      Avo::Hosts::SearchScopeHost.new(block: @resource.search_query, params: params, scope: scope).handle
+      # Add to the query
+      Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.attach_scope, query: query, parent: parent).handle
     end
 
     def apply_search_metadata(models, avo_resource)
@@ -123,41 +118,9 @@ module Avo
       end
     end
 
-    private
-
-    def should_apply_has_many_scope?
-      params[:via_association] == "has_many" && @resource.search_query.present?
-    end
-
-    def should_apply_attach_scope?
-      params[:via_association] == "belongs_to" && attach_scope.present?
-    end
-
-    def should_apply_any_scope?
-      should_apply_has_many_scope? || should_apply_attach_scope?
-    end
-
-    def attach_scope
-      @attach_scope ||= field&.attach_scope
-    end
-
-    def field
-      @field ||= fetch_field
-    end
-
-    def parent
-      @parent ||= fetch_parent
-    end
-
-    def fetch_field
+    def belongs_to_field
       fields = ::Avo::App.get_resource_by_model_name(params[:via_reflection_class]).get_field_definitions
       fields.find { |f| f.id.to_s == params[:via_association_id] }
     end
-
-    def fetch_parent
-      return unless params[:via_reflection_id].present?
-
-      params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
-    end
   end
 end

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/javascript/js/controllers/menu_controller.js

@@ -22,8 +22,8 @@ export default class extends Controller {
   }
 
   get initiallyCollapsed() {
-    if (!this.userState) {
-      return this.defaultState === 'collapsed'
+    if (this.defaultState === 'collapsed') {
+      return this.userState === 'collapsed'
     }
 
     return this.userState === 'collapsed'

data/app/javascript/js/controllers/search_controller.js

@@ -48,10 +48,6 @@ export default class extends Controller {
     return this.dataset.viaAssociation === 'belongs_to'
   }
 
-  get isHasManySearch() {
-    return this.dataset.viaAssociation === 'has_many'
-  }
-
   get isGlobalSearch() {
     return this.dataset.searchResource === 'global'
   }
@@ -87,50 +83,27 @@ export default class extends Controller {
       params.global = true
     }
 
-    if (this.isBelongsToSearch || this.isHasManySearch) {
-      params = this.addAssociationParams(params)
-      params = this.addReflectionParams(params)
-
-      if (this.isBelongsToSearch) {
-        params = {
-          ...params,
-          // eslint-disable-next-line camelcase
-          via_parent_resource_id: this.dataset.viaParentResourceId,
-          // eslint-disable-next-line camelcase
-          via_parent_resource_class: this.dataset.viaParentResourceClass,
-          // eslint-disable-next-line camelcase
-          via_relation: this.dataset.viaRelation,
-        }
+    if (this.isBelongsToSearch) {
+      params = {
+        ...params,
+        // eslint-disable-next-line camelcase
+        via_association_id: this.dataset.viaAssociationId,
+        // eslint-disable-next-line camelcase
+        via_reflection_class: this.dataset.viaReflectionClass,
+        // eslint-disable-next-line camelcase
+        via_reflection_id: this.dataset.viaReflectionId,
+        // eslint-disable-next-line camelcase
+        via_parent_resource_id: this.dataset.viaParentResourceId,
+        // eslint-disable-next-line camelcase
+        via_parent_resource_class: this.dataset.viaParentResourceClass,
+        // eslint-disable-next-line camelcase
+        via_relation: this.dataset.viaRelation,
       }
     }
 
     return params
   }
 
-  addAssociationParams(params) {
-    params = {
-      ...params,
-      // eslint-disable-next-line camelcase
-      via_association: this.dataset.viaAssociation,
-      // eslint-disable-next-line camelcase
-      via_association_id: this.dataset.viaAssociationId,
-    }
-
-    return params
-  }
-
-  addReflectionParams(params) {
-    params = {
-      ...params,
-      // eslint-disable-next-line camelcase
-      via_reflection_class: this.dataset.viaReflectionClass,
-      // eslint-disable-next-line camelcase
-      via_reflection_id: this.dataset.viaReflectionId,
-    }
-
-    return params
-  }
-
   handleOnSelect({ item }) {
     if (this.isBelongsToSearch) {
       this.updateFieldAttribute(this.hiddenIdTarget, 'value', item._id)

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

@@ -13,7 +13,6 @@
       <div class="flex-1 flex items-center justify-center px-0 lg:px-8 text-lg mt-8 mb-12">
         <% if @field.searchable %>
           <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: form,
-            classes: input_classes("w-full"),
             field: @field,
             model_key: @field.target_resource&.model_key,
             foreign_key: 'related_id',
@@ -35,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/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/partials/_resource_search.html.erb

@@ -3,12 +3,6 @@
     data-search-target="autocomplete"
     data-search-resource="<%= resource %>"
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
-    <% if via_reflection.present? %>
-      data-via-association="<%= via_reflection[:association] %>"
-      data-via-association-id="<%= via_reflection[:association_id] %>"
-      data-via-reflection-class="<%= via_reflection[:class] %>"
-      data-via-reflection-id="<%= via_reflection[:id] %>"
-    <% end %>
   >
   </div>
   <div class="hidden relative inline-flex text-gray-400 text-sm border border-gray-300 rounded cursor-pointer" data-search-target="button"></div>

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

@@ -6,15 +6,15 @@
       <% 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 %>

data/lib/avo/concerns/has_editable_controls.rb

@@ -24,7 +24,7 @@ module Avo
             resource: self,
             record: model,
             view: view
-          ).handle&.items || []
+          ).handle.items
         else
           []
         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/base_field.rb

@@ -160,7 +160,7 @@ module Avo
         final_value = @model.send(property) if (model_or_class(@model) == "model") && @model.respond_to?(property)
 
         # On new views and actions modals we need to prefill the fields
-        if @view.in?([:new, :create]) || @action.present?
+        if (@view === :new) || @action.present?
           if default.present?
             final_value = if default.respond_to?(:call)
               default.call

data/lib/avo/fields/has_base_field.rb

@@ -6,7 +6,6 @@ module Avo
       attr_accessor :attach_scope
       attr_accessor :description
       attr_accessor :discreet_pagination
-      attr_accessor :hide_search_input
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -15,7 +14,6 @@ module Avo
         @attach_scope = args[:attach_scope].present? ? args[:attach_scope] : nil
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
-        @hide_search_input = args[:hide_search_input] || false
         @description = args[:description]
         @use_resource = args[:use_resource] || nil
         @discreet_pagination = args[:discreet_pagination] || false

data/lib/avo/licensing/pro_license.rb

@@ -16,6 +16,7 @@ module Avo
           :menu_editor,
           :stimulus_js_integration,
           :resource_show_controls,
+          :branding,
           :advanced_fields
         ]
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.13.1" unless const_defined?(:VERSION)
+  VERSION = "2.13.2.pre.1" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -52,6 +52,19 @@ Avo.configure do |config|
   # config.display_license_request_timeout_error = true
   # config.disabled_features = []
   # config.resource_controls = :right
+  # config.buttons_on_form_footers = true
+
+  ## == Branding ==
+  # config.branding = {
+  #   colors: {
+  #     100 => "#CEE7F8",
+  #     400 => "#399EE5",
+  #     500 => "#0886DE",
+  #     600 => "#066BB2",
+  #   },
+  #   logo: "/avo-assets/logo.png"
+  #   logomark: "/avo-assets/logomark.png",
+  # }
 
 
   ## == Breadcrumbs ==

data/lib/generators/avo/templates/resource/resource.tt

@@ -1,7 +1,7 @@
 class <%= resource_class %> < Avo::BaseResource
   self.title = :id
   self.includes = []
-  # self.search_query = -> do
+  # self.search_query = ->(params:) do
   #   scope.ransack(id_eq: params[:q], m: "or").result(distinct: false)
   # end