avo 2.11.3.pre.3 → 2.13.0

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

@@ -5,65 +5,151 @@
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <% if @resource.cards.present? %>
-    <%= content_tag :div, class: "mb-6" do %>
-      <%= render Avo::CardsListComponent.new parent: @resource %>
-    <% end %>
-  <% end %>
-  <%= 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 %>
+                <%= control.label %>
+              <% 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 %>
+                <%= control.label %>
+              <% 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/controllers/avo/application_controller.rb

@@ -118,7 +118,7 @@ module Avo
     def set_resource
       raise ActionController::RoutingError.new "No route matches" if resource.nil?
 
-      @resource = resource
+      @resource = resource.hydrate(params: params)
     end
 
     def set_related_resource
@@ -126,7 +126,6 @@ module Avo
     end
 
     def set_model
-      puts ["controller_name->", controller_name].inspect
       @model = eager_load_files(@resource, @resource.class.find_scope).find params[:id]
     end
 
@@ -157,7 +156,7 @@ module Avo
     end
 
     def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model, params: params)
+      @resource.hydrate(view: action_name.to_sym, user: _current_user)
     end
 
     def hydrate_related_resource
@@ -208,6 +207,11 @@ module Avo
     end
 
     def related_resource
+      # Find the field from the parent resource
+      field = @resource.get_field params[:related_name]
+
+      return field.use_resource if field&.use_resource.present?
+
       reflection = @model._reflections[params[:related_name]]
 
       reflected_model = reflection.klass

data/app/controllers/avo/associations_controller.rb

@@ -6,8 +6,8 @@ module Avo
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_reflection_field
-    before_action :set_related_model, only: [:show, :order]
     before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
+    before_action :set_related_model, only: [:show, :order]
     before_action :set_reflection
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy, :order]
@@ -102,7 +102,7 @@ module Avo
     end
 
     def set_attachment_resource
-      @attachment_resource = App.get_resource_by_model_name @attachment_class
+      @attachment_resource = @field.use_resource || (App.get_resource_by_model_name @attachment_class)
     end
 
     def set_attachment_model

data/app/controllers/avo/base_controller.rb

@@ -7,7 +7,6 @@ module Avo
     before_action :hydrate_resource
     before_action :set_applied_filters, only: :index
     before_action :set_model, only: [:show, :edit, :destroy, :update, :order]
-    before_action :hydrate_resource
     before_action :set_model_to_fill
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
@@ -101,7 +100,7 @@ module Avo
 
     def new
       @model = @resource.model_class.new
-      @resource = @resource.hydrate(model: @model, view: :new)
+      @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
       set_actions
 
@@ -116,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
 
@@ -130,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]
@@ -158,6 +150,9 @@ module Avo
         if saved
           format.html { redirect_to after_create_path, notice: "#{@resource.name} #{t("avo.was_successfully_created")}." }
         else
+          add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+          add_breadcrumb t("avo.new").humanize
+          set_actions
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :new, status: :unprocessable_entity }
         end
@@ -171,12 +166,13 @@ module Avo
     def update
       # model gets instantiated and filled in the fill_model method
       saved = save_model
-      @resource = @resource.hydrate(model: @model, view: :edit)
+      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       respond_to do |format|
         if saved
           format.html { redirect_to after_update_path, notice: "#{@resource.name} #{t("avo.was_successfully_updated")}." }
         else
+          set_actions
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :edit, status: :unprocessable_entity }
         end
@@ -210,9 +206,6 @@ module Avo
       end
     end
 
-    def cards
-    end
-
     private
 
     def save_model
@@ -380,7 +373,7 @@ module Avo
     end
 
     def set_edit_title_and_breadcrumbs
-      @resource = @resource.hydrate(model: @model, view: :edit)
+      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
       @page_title = @resource.default_panel_name.to_s
 
       last_crumb_args = {}

data/app/controllers/avo/cards_controller.rb

@@ -2,12 +2,7 @@ require_dependency "avo/application_controller"
 
 module Avo
   class CardsController < ApplicationController
-    before_action :set_dashboard
-    before_action :set_resource_name
-    before_action :set_resource, if: -> { @dashboard.blank? }
-    before_action :set_model, only: :show, if: -> { @resource.present? }
-    before_action :hydrate_resource, if: -> { @resource.present? }
-    before_action :set_parent, only: :show
+    before_action :set_dashboard, only: :show
     before_action :set_card, only: :show
 
     def show
@@ -15,23 +10,15 @@ module Avo
 
     private
 
-    def set_parent
-      @parent = @dashboard || @resource
-    end
-
     def set_dashboard
-      return if params[:dashboard_id].blank?
-
-      @dashboard_class = Avo::App.get_dashboard_by_id params[:dashboard_id]
-
-      raise ActionController::RoutingError.new("Not Found") if @dashboard_class.nil? || @dashboard_class.is_hidden?
+      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
 
-      @dashboard = @dashboard_class.new
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
     end
 
     def set_card
-      @card = @parent.item_at_index(params[:index].to_i).tap do |card|
-        card.hydrate(parent: @parent, params: params)
+      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
+        card.hydrate(dashboard: @dashboard, params: params)
       end
     end
   end

data/app/controllers/avo/dashboards_controller.rb

@@ -10,11 +10,9 @@ module Avo
     private
 
     def set_dashboard
-      @dashboard_class = Avo::App.get_dashboard_by_id params[:id]
+      @dashboard = Avo::App.get_dashboard_by_id params[:id]
 
-      raise ActionController::RoutingError.new("Not Found") if @dashboard_class.nil? || @dashboard_class.is_hidden?
-
-      @dashboard = @dashboard_class.new.hydrate(params: params) if @dashboard_class.present?
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
     end
   end
 end

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

@@ -5,9 +5,9 @@ import ActionsPickerController from './controllers/actions_picker_controller'
 import AttachmentsController from './controllers/attachments_controller'
 import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
 import BooleanFilterController from './controllers/boolean_filter_controller'
-import CardController from './controllers/card_controller'
 import CodeFieldController from './controllers/fields/code_field_controller'
 import CopyToClipboardController from './controllers/copy_to_clipboard_controller'
+import DashboardCardController from './controllers/dashboard_card_controller'
 import DateFieldController from './controllers/fields/date_field_controller'
 import FilterController from './controllers/filter_controller'
 import HiddenInputController from './controllers/hidden_input_controller'
@@ -38,8 +38,8 @@ application.register('action', ActionController)
 application.register('actions-picker', ActionsPickerController)
 application.register('attachments', AttachmentsController)
 application.register('boolean-filter', BooleanFilterController)
-application.register('card', CardController)
 application.register('copy-to-clipboard', CopyToClipboardController)
+application.register('dashboard-card', DashboardCardController)
 application.register('filter', FilterController)
 application.register('hidden-input', HiddenInputController)
 application.register('item-select-all', ItemSelectAllController)

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

@@ -1,5 +1,5 @@
-<div class="flex items-end text-gray-800">
+<div class="flex mt-4 items-end">
   <span class="text-3xl"><%= @card.prefix %></span>
-  <span class="text-5xl font-semibold"><%= @card.result_data %></span>
+  <span class="text-5xl"><%= @card.result_data %></span>
   <span class="text-3xl"><%= @card.suffix %></span>
 </div>