avo 2.13.2.pre.2 → 2.13.3.pre.3

data/app/components/avo/fields/password_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.password_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.readonly,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input)
     %>

data/app/components/avo/fields/progress_bar_field/edit_component.html.erb

@@ -7,7 +7,7 @@
   <%= @form.range_field @field.id,
     class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.readonly,
+    disabled: @field.is_readonly?,
     max: @field.max,
     min: 0,
     placeholder: @field.placeholder,

data/app/components/avo/fields/progress_bar_field/index_component.html.erb

@@ -4,5 +4,5 @@
       <%= @field.value %><%= @field.value_suffix if @field.value_suffix.present? %>
     </div>
   <% end %>
-  <progress min="0" max="<%= @field.max %>" value="<%= @field.value %>" class="block w-auto"></progress>
+  <progress min="0" max="<%= @field.max %>" value="<%= @field.value %>" class="block w-24"></progress>
 <% end %>

data/app/components/avo/fields/progress_bar_field/show_component.html.erb

@@ -4,5 +4,5 @@
       <%= @field.value %><%= @field.value_suffix if @field.value_suffix.present? %>
     </div>
   <% end %>
-  <progress min="0" max="<%= @field.max %>" value="<%= @field.value %>" class="block h-3 w-full"></progress>
+  <progress min="0" max="<%= @field.max %>" value="<%= @field.value %>" class="block w-full"></progress>
 <% end %>

data/app/components/avo/fields/select_field/edit_component.html.erb

@@ -8,7 +8,7 @@
     },
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.readonly,
+    disabled: @field.is_readonly?,
     style: @field.get_html(:style, view: view, element: :input),
     value: @field.model.present? ? @field.model[@field.id] : @field.value,
     placeholder: @field.include_blank.present? ? nil : @field.placeholder

data/app/components/avo/fields/status_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.readonly,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
     value: @resource.model.present? ? @resource.model[@field.id] : @field.value

data/app/components/avo/fields/tags_field/edit_component.html.erb

@@ -10,14 +10,14 @@
       data: {
         'tags-field-target': 'fakeInput',
       },
-      disabled: @field.readonly,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
       value: ''
     %>
     <%# real field %>
     <%= @form.text_field @field.id,
-      class: classes("hidden w-full border-primary-500 focus-within:border-primary-500"),
+      class: classes("hidden w-full"),
       data: {
         'tags-field-target': 'input',
         'whitelist-items': @field.suggestions.to_json,
@@ -26,7 +26,7 @@
         'delimiters': @field.delimiters,
         'close-on-select': @field.close_on_select ? 1 : 0,
       },
-      disabled: @field.readonly,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
       value: @field.field_value.to_json

data/app/components/avo/fields/tags_field/show_component.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# require_relative 'item_labels'
-
 class Avo::Fields::TagsField::ShowComponent < Avo::Fields::ShowComponent
   include Avo::Fields::Concerns::ItemLabels
 end

data/app/components/avo/fields/text_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.readonly,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input)
   %>

data/app/components/avo/fields/textarea_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.text_area @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.readonly,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     rows: @field.rows,
     style: @field.get_html(:style, view: view, element: :input)

data/app/components/avo/fields/trix_field/edit_component.html.erb

@@ -24,7 +24,7 @@
     <%= @form.text_area @field.id,
       class: classes("w-full hidden"),
       data: @field.get_html(:data, view: view, element: :input),
-      disabled: @field.readonly,
+      disabled: @field.is_readonly?,
       id: trix_id,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)

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

@@ -1,3 +1,3 @@
-<%= link_to path, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full", target: target, title: title do %>
+<%= link_to path, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-blue-100 block px-4 py-1 w-full py-3 text-center rounded w-full", target: target, title: title do %>
   <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
 <% end %>

data/app/components/avo/resource_component.rb

@@ -36,6 +36,14 @@ class Avo::ResourceComponent < Avo::BaseComponent
     @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
+  def can_see_the_actions_button?
+    return false if @actions.blank?
+
+    return authorize_association_for(:act_on) if @reflection.present?
+
+    @resource.authorization.authorize_action(:act_on, raise_exception: false) && !has_reflection_and_is_read_only
+  end
+
   def destroy_path
     helpers.resource_path(model: @resource.model, resource: @resource)
   end
@@ -72,6 +80,21 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
   end
 
+  def has_reflection_and_is_read_only
+    if @reflection.present? && @reflection.active_record.name && @reflection.name
+      fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
+      filtered_fields = fields.filter { |f| f.id == @reflection.name }
+    else
+      return false
+    end
+
+    if filtered_fields.present?
+      filtered_fields.find { |f| f.id == @reflection.name }.readonly
+    else
+      false
+    end
+  end
+
   private
 
   def via_resource?

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

@@ -25,7 +25,7 @@
       # On edit screens we want to load each tab because we wnst the DOM to have the fields present on form submission.
       # If you have a field which is in the second tab and it's required, the form submission will fail because the required field is not in view, and we don't want that.
       # We also want to load the current tab
-      should_lazy_load = if @view.to_s.in?(['edit', 'new'])
+      should_lazy_load = if @view.to_s.in?(['edit', 'new', 'update', 'create'])
         false
       else
         !is_current_tab

data/app/components/avo/tab_switcher_component.rb

@@ -30,11 +30,11 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   end
 
   def is_edit?
-    @view == :edit
+    @view.in?([:edit, :update])
   end
 
   def is_new?
-    @view == :new
+    @view.in?([:new, :create])
   end
 
   def is_initial_load?

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

@@ -22,7 +22,9 @@
         icon: 'arrow-left' do %>
           <%= t('avo.cancel').capitalize %>
         <% end %>
-        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+        <% if can_see_the_actions_button? %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+        <% end %>
         <% if can_see_the_save_button? %>
           <%= a_button color: :primary,
               style: :primary,

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

@@ -42,7 +42,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def is_edit?
-    view == :edit
+    view.in?([:edit, :update])
   end
 
   def form_method

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

@@ -32,9 +32,9 @@
         data-selected-resources-name="<%= @resource.model_key %>"
         data-selected-resources="[]"
       >
-        <% if @resource.search_query.present? %>
+        <% unless hide_search_input %>
           <div class="flex items-center px-4 w-64">
-            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} %>
+            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key, via_reflection: via_reflection} %>
           </div>
         <% else %>
           <%# Offset for the space-y-2 property when the search is missing %>

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

@@ -59,14 +59,6 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @resource.authorization.authorize_action(:new, raise_exception: false) && !has_reflection_and_is_read_only
   end
 
-  def can_see_the_actions_button?
-    return false if @actions.blank?
-
-    return authorize_association_for(:act_on) if @reflection.present?
-
-    @resource.authorization.authorize_action(:act_on, raise_exception: false) && !has_reflection_and_is_read_only
-  end
-
   def can_attach?
     klass = @reflection
     klass = @reflection.through_reflection if klass.is_a? ::ActiveRecord::Reflection::ThroughReflection
@@ -74,21 +66,6 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for(:attach)
   end
 
-  def has_reflection_and_is_read_only
-    if @reflection.present? && @reflection.active_record.name && @reflection.name
-      fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
-      filtered_fields = fields.filter { |f| f.id == @reflection.name }
-    else
-      return false
-    end
-
-    if filtered_fields.present?
-      filtered_fields.find { |f| f.id == @reflection.name }.readonly
-    else
-      false
-    end
-  end
-
   def create_path
     args = {}
 
@@ -143,6 +120,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @resource.resource_description
   end
 
+  def hide_search_input
+    return true unless @resource.search_query.present?
+
+    field&.hide_search_input || false
+  end
+
   private
 
   def reflection_model_class
@@ -153,4 +136,15 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     field.custom_name? ? field.name : field.plural_name
   end
 
+  def via_reflection
+    return unless @reflection.present?
+
+    {
+      association: 'has_many',
+      association_id: @reflection.name,
+      class: reflection_model_class,
+      id: @parent_model.id
+    }
+  end
+
 end

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

@@ -36,9 +36,10 @@
                   tippy: control.title ? :tooltip : nil,
                   'resource-id': @resource.model.id,
                 } do %>
+                <%= control.label %>
               <% end %>
             <% end %>
-          <% elsif control.actions_list? %>
+          <% elsif can_see_the_actions_button? && 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) %>
@@ -90,7 +91,7 @@
                   data: {
                     confirm: "Are you sure you want to detach this #{title}."
                   } do %>
-                <%= t('avo.detach_item', item: title).capitalize %>
+                <%= control.label %>
               <% end %>
             <% end %>
           <% end %>
@@ -125,7 +126,7 @@
             <%= t('avo.go_back') %>
           <% end %>
           <% if can_see_the_destroy_button? %>
-            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+            <%= a_button url: destroy_path,
                 method: :delete,
                 local: true,
                 style: :text,
@@ -141,7 +142,9 @@
               <%= t('avo.delete').capitalize %>
             <% end %>
           <% end %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+          <% if can_see_the_actions_button? %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+          <% end %>
           <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
             <%= a_link edit_path,
               color: :primary,

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

@@ -45,6 +45,14 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
   end
 
+  def destroy_path
+    if params[:via_resource_class].present?
+      helpers.resource_path(model: @resource.model, resource: @resource, referrer: back_path)
+    else
+      helpers.resource_path(model: @resource.model, resource: @resource)
+    end
+  end
+
   private
 
   # In development and test environments we shoudl show the invalid field errors

data/app/controllers/avo/base_controller.rb

@@ -115,7 +115,7 @@ module Avo
         add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
       end
 
-      add_breadcrumb @resource.plural_name.humanize
+      add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       add_breadcrumb t("avo.new").humanize
     end
 
@@ -129,21 +129,14 @@ module Avo
         @reflection = @model._reflections[params[:via_relation]]
         # Figure out what kind of association does the record have with the parent record
 
-        # belongs_to
-        # has_many
+        # Fills in the required infor for belongs_to and has_many
         # Get the foreign key and set it to the id we received in the params
         if @reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection) || @reflection.is_a?(ActiveRecord::Reflection::HasManyReflection)
-          foreign_key = @reflection.foreign_key
-          @model.send("#{foreign_key}=", params[:via_resource_id])
+          @model.send("#{@reflection.foreign_key}=", params[:via_resource_id])
           @model.save
         end
 
-        # has_one
-        # has_one_through
-
-        # has_many_through
-        # has_and_belongs_to_many
-        # polymorphic
+        # For when working with has_one, has_one_through, has_many_through, has_and_belongs_to_many, polymorphic
         if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
           # find the record
           via_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
@@ -153,13 +146,14 @@ module Avo
         end
       end
 
-      respond_to do |format|
-        if saved
-          format.html { redirect_to after_create_path, notice: "#{@resource.name} #{t("avo.was_successfully_created")}." }
-        else
-          flash.now[:error] = t "avo.you_missed_something_check_form"
-          format.html { render :new, status: :unprocessable_entity }
-        end
+      add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+      add_breadcrumb t("avo.new").humanize
+      set_actions
+
+      if saved
+        create_success_action
+      else
+        create_fail_action
       end
     end
 
@@ -171,26 +165,20 @@ module Avo
       # model gets instantiated and filled in the fill_model method
       saved = save_model
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
+      set_actions
 
-      respond_to do |format|
-        if saved
-          format.html { redirect_to after_update_path, notice: "#{@resource.name} #{t("avo.was_successfully_updated")}." }
-        else
-          flash.now[:error] = t "avo.you_missed_something_check_form"
-          format.html { render :edit, status: :unprocessable_entity }
-        end
+      if saved
+        update_success_action
+      else
+        update_fail_action
       end
     end
 
     def destroy
-      respond_to do |format|
-        if destroy_model
-          format.html { redirect_to params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t("avo.resource_destroyed", attachment_class: @attachment_class) }
-        else
-          error_message = @errors.present? ? @errors.first : t("avo.failed")
-
-          format.html { redirect_back fallback_location: params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), error: error_message }
-        end
+      if destroy_model
+        destroy_success_action
+      else
+        destroy_fail_action
       end
     end
 
@@ -401,6 +389,27 @@ module Avo
       add_breadcrumb t("avo.edit").humanize
     end
 
+    def create_success_action
+      respond_to do |format|
+        format.html { redirect_to after_create_path, notice: create_success_message}
+      end
+    end
+
+    def create_fail_action
+      respond_to do |format|
+        flash.now[:error] = create_fail_message
+        format.html { render :new, status: :unprocessable_entity }
+      end
+    end
+
+    def create_success_message
+      "#{@resource.name} #{t("avo.was_successfully_created")}."
+    end
+
+    def create_fail_message
+      t "avo.you_missed_something_check_form"
+    end
+
     def after_create_path
       # If this is an associated record return to the association show page
       if params[:via_relation_class].present? && params[:via_resource_id].present?
@@ -412,12 +421,57 @@ module Avo
       redirect_path_from_resource_option(:after_create_path) || resource_path(model: @model, resource: @resource)
     end
 
+    def update_success_action
+      respond_to do |format|
+        format.html { redirect_to after_update_path, notice: update_success_message }
+      end
+    end
+
+    def update_fail_action
+      respond_to do |format|
+        flash.now[:error] = update_fail_message
+        format.html { render :edit, status: :unprocessable_entity }
+      end
+    end
+
+    def update_success_message
+      "#{@resource.name} #{t("avo.was_successfully_updated")}."
+    end
+
+    def update_fail_message
+      t "avo.you_missed_something_check_form"
+    end
+
     def after_update_path
       return params[:referrer] if params[:referrer].present?
 
       redirect_path_from_resource_option(:after_update_path) || resource_path(model: @model, resource: @resource)
     end
 
+    def destroy_success_action
+      respond_to do |format|
+        format.html { redirect_to after_destroy_path, notice: destroy_success_message }
+      end
+    end
+
+    def destroy_fail_action
+      respond_to do |format|
+        format.html { redirect_back fallback_location: params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), error: destroy_fail_message }
+      end
+    end
+
+    def destroy_success_message
+      t("avo.resource_destroyed", attachment_class: @attachment_class)
+    end
+
+    def destroy_fail_message
+      @errors.present? ? @errors.first : t("avo.failed")
+    end
+
+    def after_destroy_path
+      params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type])
+    end
+
     def redirect_path_from_resource_option(action = :after_update_path)
       return nil if @resource.class.send(action).blank?
 

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.limit(8)
+      ).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/helpers/avo/actions_helper.rb

@@ -0,0 +1,4 @@
+module Avo
+  module ActionsHelper
+  end
+end