avo 2.12.1.pre.1 → 2.13.0

data/app/controllers/avo/search_controller.rb

@@ -44,10 +44,13 @@ module Avo
     end
 
     def search_resource(resource)
-      query = resource.search_query.call(params: params).limit(8)
+      query =  Avo::Hosts::SearchScopeHost.new(
+        block: resource.search_query,
+        params: params,
+        scope: resource.class.scope
+      ).handle
 
-      # Figure out if this is a belongs_to search
-      query = apply_attach_scope query
+      query = apply_scope(query) if should_apply_any_scope?
 
       results = apply_search_metadata(query, resource)
 
@@ -67,22 +70,19 @@ module Avo
       [resource.name.pluralize.downcase, result_object]
     end
 
-    # 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]
+    # 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)
       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,8 +94,13 @@ module Avo
         )
       end
 
-      # Add to the query
-      Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.attach_scope, query: query, parent: parent).handle
+      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
     end
 
     def apply_search_metadata(models, avo_resource)
@@ -118,9 +123,41 @@ module Avo
       end
     end
 
-    def belongs_to_field
+    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
       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/javascript/js/controllers/menu_controller.js

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

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

@@ -48,6 +48,10 @@ 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'
   }
@@ -83,27 +87,50 @@ export default class extends Controller {
       params.global = true
     }
 
-    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,
+    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,
+        }
       }
     }
 
     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,6 +13,7 @@
       <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',

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/_resource_search.html.erb

@@ -3,6 +3,12 @@
     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/design.html.erb

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

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

@@ -18,7 +18,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/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 === :new) || @action.present?
+        if @view.in?([:new, :create]) || @action.present?
           if default.present?
             final_value = if default.respond_to?(:call)
               default.call

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/has_base_field.rb

@@ -6,6 +6,7 @@ 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)
@@ -14,6 +15,7 @@ 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/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

data/lib/avo/hosts/search_scope_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class SearchScopeHost < BaseHost
+      option :scope
+    end
+  end
+end

data/lib/avo/licensing/h_q.rb

@@ -22,16 +22,24 @@ module Avo
       def response
         expire_cache_if_overdue
 
+        # ------------------------------------------------------------------
+        # You could set this to true to become a pro user for free.
+        # I'd rather you didn't. Avo takes time & love to build,
+        # and I can't do that if it doesn't pay my bills!
+        #
+        # If you want Pro, help pay for its development.
+        # Can't afford it? Get in touch: adrian@avohq.io
+        # ------------------------------------------------------------------
         make_request
       end
 
       # Some cache stores don't auto-expire their keys and payloads so we need to do it for them
       def expire_cache_if_overdue
         return unless cached_response.present?
-        return unless cached_response['fetched_at'].present?
+        return unless cached_response["fetched_at"].present?
 
         allowed_time = 1.hour
-        parsed_time = Time.parse(cached_response['fetched_at'].to_s)
+        parsed_time = Time.parse(cached_response["fetched_at"].to_s)
         time_has_passed = parsed_time < Time.now - allowed_time
 
         clear_response if time_has_passed
@@ -159,7 +167,7 @@ module Avo
       def perform_request
         ::Rails.logger.debug "[Avo] Performing request to avohq.io API to check license availability." if Rails.env.development?
 
-        HTTParty.post ENDPOINT, body: payload.to_json, headers: {'Content-type': "application/json"}, timeout: REQUEST_TIMEOUT
+        HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
       end
 
       def app_name
@@ -177,7 +185,7 @@ module Avo
 
         {
           "#{type}_count": type_count,
-          "#{type}_per_resource": type_per_resource,
+          "#{type}_per_resource": type_per_resource
         }
       end
 

data/lib/avo/licensing/pro_license.rb

@@ -15,6 +15,7 @@ module Avo
           :dashboards,
           :menu_editor,
           :stimulus_js_integration,
+          :resource_show_controls,
           :advanced_fields
         ]
       end

data/lib/avo/menu/builder.rb

@@ -11,6 +11,8 @@ class Avo::Menu::Builder
   delegate :request, to: ::Avo::App
   delegate :root_path, to: ::Avo::App
   delegate :view_context, to: ::Avo::App
+  delegate :main_app, to: :view_context
+  delegate :avo, to: :view_context
 
   def initialize(name: nil, items: [])
     @menu = Avo::Menu::Menu.new

data/lib/avo/resources/controls/action.rb

@@ -0,0 +1,32 @@
+module Avo
+  module Resources
+    module Controls
+      class Action < BaseControl
+        attr_reader :klass
+
+        def initialize(klass, model: nil, resource: nil, view: nil, **args)
+          super(**args)
+
+          @klass = klass
+          @resource = resource
+          @model = model
+          @view = view
+        end
+
+        def action
+          return @instance if @instance.present?
+
+          @instance = @klass.new(model: @model, resource: @resource, view: @view)
+        end
+
+        def path
+          Avo::Services::URIService.parse(@resource.record_path).append_paths("actions", action.param_id).to_s
+        end
+
+        def label
+          @args[:label] || action.action_name
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/actions_list.rb

@@ -0,0 +1,19 @@
+module Avo
+  module Resources
+    module Controls
+      class ActionsList < BaseControl
+        def exclude
+          Array.wrap(@args[:exclude]) || []
+        end
+
+        def color
+          @args[:color] || :primary
+        end
+
+        def style
+          @args[:style] || :outline
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/back_button.rb

@@ -0,0 +1,13 @@
+module Avo
+  module Resources
+    module Controls
+      class BackButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          @label = I18n.t("avo.go_back")
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/base_control.rb

@@ -0,0 +1,59 @@
+module Avo
+  module Resources
+    module Controls
+      class BaseControl
+        def initialize(**args)
+          @args = args
+        end
+
+        def label
+          @args[:label] || @label
+        end
+
+        def title
+          @args[:title]
+        end
+
+        def color
+          @args[:color] || :gray
+        end
+
+        def style
+          @args[:style] || :text
+        end
+
+        def icon
+          @args[:icon] || nil
+        end
+
+        def back_button?
+          is_a? Avo::Resources::Controls::BackButton
+        end
+
+        def edit_button?
+          is_a? Avo::Resources::Controls::EditButton
+        end
+
+        def delete_button?
+          is_a? Avo::Resources::Controls::DeleteButton
+        end
+
+        def actions_list?
+          is_a? Avo::Resources::Controls::ActionsList
+        end
+
+        def link_to?
+          is_a? Avo::Resources::Controls::LinkTo
+        end
+
+        def detach_button?
+          is_a? Avo::Resources::Controls::DetachButton
+        end
+
+        def action?
+          is_a? Avo::Resources::Controls::Action
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/delete_button.rb

@@ -0,0 +1,13 @@
+module Avo
+  module Resources
+    module Controls
+      class DeleteButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          @label = I18n.t("avo.delete").capitalize
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/detach_button.rb

@@ -0,0 +1,13 @@
+module Avo
+  module Resources
+    module Controls
+      class DetachButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          @label = I18n.t("avo.detach_item", item: title).capitalize
+        end
+      end
+    end
+  end
+end