avo 2.7.0 → 2.9.0

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

@@ -11,13 +11,23 @@
     data-hide-attachment-url="<%= @field.hide_attachment_url %>"
     class="relative block overflow-x-auto max-w-full"
   >
-    <% trix_id = "trix_#{@resource.name.underscore}_#{@field.id}" %>
-    <trix-editor data-trix-field-target="editor" input="<%= trix_id %>" placeholder="<%= @field.placeholder %>"><%== @field.value %></trix-editor>
+    <%= content_tag 'trix-editor',
+      class: 'trix-content',
+      data: {
+        "trix-field-target": "editor",
+        **@field.get_html(:data, view: view, element: :input)
+      },
+      input: trix_id,
+      placeholder: @field.placeholder do %>
+      <%== @field.value %>
+    <% end %>
     <%= @form.text_area @field.id,
+      class: classes("w-full hidden"),
+      data: @field.get_html(:data, view: view, element: :input),
+      disabled: @field.readonly,
       id: trix_id,
-      class: helpers.input_classes('w-full hidden', has_error: (@resource.model.present? and @resource.model.errors.include?(@field.id))),
       placeholder: @field.placeholder,
-      disabled: @field.readonly
+      style: @field.get_html(:style, view: view, element: :input)
     %>
   </div>
 <% end %>

data/app/components/avo/fields/trix_field/edit_component.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
+  def trix_id
+    "trix_#{@resource.name.underscore}_#{@field.id}"
+  end
 end

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

@@ -1,6 +1,6 @@
-<%= show_field_wrapper field: @field, index: @index do %>
+<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
   <%
-    content_classes = 'prose prose-sm'
+    content_classes = 'trix-content py-2'
     content_classes << ' hidden' unless @field.always_show
   %>
   <div data-controller="hidden-input">

data/app/components/avo/index/field_wrapper_component.html.erb

@@ -1,13 +1,20 @@
-<td class="min-h-[3rem] px-3 leading-tight whitespace-nowrap h-full text-slate-800 text-base <%= classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
+<%= content_tag :td,
+  class: "min-h-[3rem] px-3 leading-tight whitespace-nowrap h-full text-slate-800 text-base #{classes}",
+  data: {
+    field_id: @field.id,
+    field_type: @field.type,
+    **stimulus_attributes
+  },
+  style: style do %>
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>
     <% if @center_content %>
-    <div class="flex items-center justify-center">
-      <%= content %>
-    </div>
+      <div class="flex items-center justify-center">
+        <%= content %>
+      </div>
     <% else %>
       <%= content %>
     <% end %>
   <% end %>
-</td>
+<% end %>

data/app/components/avo/index/field_wrapper_component.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 class Avo::Index::FieldWrapperComponent < ViewComponent::Base
-  def initialize(field: nil, dash_if_blank: true, center_content: false, flush: false, **args)
+  attr_reader :view
+
+  def initialize(field: nil, resource: nil, dash_if_blank: true, center_content: false, flush: false, **args)
     @field = field
+    @resource = resource
     @dash_if_blank = dash_if_blank
     @center_content = center_content
     @classes = args[:class].present? ? args[:class] : ""
     @args = args
     @flush = flush
+    @view = :index
   end
 
   def classes
@@ -18,18 +22,38 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
     end
 
     result += " #{text_align_classes}"
+    result += " #{@field.get_html(:classes, view: view, element: :wrapper)}"
 
     result
   end
 
+  def style
+    @field.get_html(:style, view: view, element: :wrapper)
+  end
+
+  def stimulus_attributes
+    attributes = {}
+
+    @resource.get_stimulus_controllers.split(" ").each do |controller|
+      attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
+    end
+
+    wrapper_data_attributes = @field.get_html :data, view: view, element: :wrapper
+    if wrapper_data_attributes.present?
+      attributes.merge! wrapper_data_attributes
+    end
+
+    attributes
+  end
+
   private
 
   def text_align_classes
     case @field.index_text_align.to_sym
     when :right
-      'text-right'
+      "text-right"
     when :center
-      'text-center'
+      "text-center"
     end
   end
 end

data/app/components/avo/panel_component.rb

@@ -25,9 +25,10 @@ class Avo::PanelComponent < ViewComponent::Base
   end
 
   def data_attributes
-    @data.merge({'panel-index': @index}).map do |key, value|
-      " data-#{key}=\"#{value}\""
-    end.join
+    @data.merge({"panel-index": @index})
+      .map do |key, value|
+        " data-#{key}=\"#{value}\""
+      end.join
   end
 
   def display_breadcrumbs?

data/app/components/avo/resource_component.rb

@@ -4,6 +4,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   attr_reader :has_many_panels
   attr_reader :has_as_belongs_to_many_panels
   attr_reader :resource_tools
+  attr_reader :view
 
   def can_create?
     return authorize_association_for(:create) if @reflection.present?

data/app/components/avo/show/field_wrapper_component.html.erb

@@ -1,4 +1,4 @@
-<%= render Avo::CommonFieldWrapperComponent.new(field: @field, dash_if_blank: @dash_if_blank, full_width: @full_width) do %>
+<%= render Avo::CommonFieldWrapperComponent.new(field: @field, resource: @resource, dash_if_blank: @dash_if_blank, full_width: @full_width, view: :show) do %>
   <div class="self-center <% if @full_width %> w-full <% else %> w-full md:w-8/12 <% end %>" data-slot="value">
     <% if @field.value.blank? and @dash_if_blank %>
       —

data/app/components/avo/show/field_wrapper_component.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 class Avo::Show::FieldWrapperComponent < ViewComponent::Base
-  def initialize(field: nil, dash_if_blank: true, full_width: false, **args)
+  def initialize(field: nil, resource: nil, dash_if_blank: true, full_width: false, **args)
     @field = field
+    @resource = resource
     @dash_if_blank = dash_if_blank
     @classes = args[:class].present? ? args[:class] : ""
     @args = args

data/app/components/avo/sidebar/item_switcher_component.html.erb

@@ -2,10 +2,10 @@
   <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target %>
 <% end %>
 <% if item.is_a? Avo::Menu::Resource %>
-  <%= render Avo::Sidebar::LinkComponent.new label: resource.navigation_label, path: helpers.resources_path(resource: resource) %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource) %>
 <% end %>
 <% if item.is_a? Avo::Menu::Dashboard %>
-  <%= render Avo::Sidebar::LinkComponent.new label: dashboard.navigation_label, path: dashboard.navigation_path %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path %>
 <% end %>
 <% if item.is_a? Avo::Menu::Section %>
   <%= render Avo::Sidebar::SectionComponent.new item: item %>

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

@@ -1,21 +1,26 @@
-<div data-model-id="<%= @resource.model.id %>"
-  class="space-y-8"
->
-  <% @resource.panels.each do |resource_panel| %>
+<%= content_tag :div,
+  class: "space-y-12",
+  data: {
+    'model-id': @resource.model.id,
+    selected_resources_name: @resource.model_key,
+    selected_resources: [@resource.model.id],
+    **@resource.stimulus_data_attributes
+  } do %>
+  <% @resource.panels.each_with_index do |resource_panel, index| %>
     <%= form_with model: @resource.model,
         scope: @resource.form_scope,
-        url: helpers.resource_path(model: @resource.model, resource: @resource),
-        method: :put,
+        url: form_url,
         local: true,
         multipart: true do |form| %>
       <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
-      <%= render Avo::PanelComponent.new(title: resource_panel[:name], description: @resource.resource_description, display_breadcrumbs: true) do |c| %>
+      <%= render Avo::PanelComponent.new(title: resource_panel[:name], description: @resource.resource_description, display_breadcrumbs: true, index: index) do |c| %>
         <% c.tools do %>
           <%= a_link back_path,
             style: :text,
             icon: 'arrow-left' do %>
             <%= t('avo.cancel').capitalize %>
           <% end %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
           <% if can_see_the_save_button? %>
             <%= a_button color: :primary,
               style: :primary,
@@ -70,4 +75,4 @@
       <% end %>
     <% end %>
   <% end %>
-</div>
+<% end %>

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

@@ -4,8 +4,13 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil)
+  attr_reader :view
+
+  def initialize(resource: nil, model: nil, actions: [], view: :edit)
     @resource = resource
+    @model = model
+    @actions = actions
+    @view = view
 
     split_panel_fields
   end
@@ -16,7 +21,11 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     elsif via_index?
       helpers.resources_path(resource: @resource)
     else # via resource show page
-      helpers.resource_path(model: @resource.model, resource: @resource)
+      if is_edit?
+        helpers.resource_path(model: @resource.model, resource: @resource)
+      else
+        helpers.resources_path(resource: @resource)
+      end
     end
   end
 
@@ -29,6 +38,26 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   private
 
   def via_index?
-    params[:via_view] == 'index'
+    params[:via_view] == "index"
+  end
+
+  def is_edit?
+    view == :edit
+  end
+
+  def form_url
+    if is_edit?
+      helpers.resource_path(
+        model: @resource.model,
+        resource: @resource
+      )
+    else
+      helpers.resources_path(
+        resource: @resource,
+        via_relation_class: params[:via_relation_class],
+        via_relation: params[:via_relation],
+        via_resource_id: params[:via_resource_id]
+      )
+    end
   end
 end

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

@@ -1,4 +1,7 @@
-<div>
+<%= content_tag :div,
+  data: {
+    **@resource.stimulus_data_attributes
+  } do %>
   <%= render Avo::PanelComponent.new(title: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
     <% c.tools do %>
       <% if can_attach? %>
@@ -12,7 +15,7 @@
         <% end %>
       <% end %>
       <% if can_see_the_actions_button? %>
-        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
       <% end %>
       <% if can_see_the_create_button? %>
         <%= a_link create_path,
@@ -31,7 +34,7 @@
       >
         <% if @resource.search_query.present? %>
           <div class="flex items-center px-4 w-64">
-            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_key} %>
+            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_name.collection} %>
           </div>
         <% else %>
           <%# Offset for the space-y-2 property when the serach is missing %>
@@ -72,4 +75,4 @@
       <% end %>
     <% end %>
   <% end %>
-</div>
+<% end %>

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

@@ -28,11 +28,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @turbo_frame = turbo_frame
     @parent_model = parent_model
     @applied_filters = applied_filters
+    @view = :index
   end
 
   def title
     if @reflection.present?
-      return field.plural_name if field.present?
+      return name if field.present?
 
       reflection_resource.plural_name
     else
@@ -143,4 +144,9 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def reflection_model_class
     @reflection.active_record.to_s
   end
+
+  def name 
+    field.custom_name? ? field.name : field.plural_name
+  end
+
 end

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

@@ -1,8 +1,11 @@
-<div data-model-id="<%= @resource.model.id %>"
-  data-selected-resources-name="<%= @resource.model_key %>"
-  data-selected-resources='["<%= @resource.model.id %>"]'
-  class="space-y-12"
->
+<%= content_tag :div,
+  class: "space-y-12",
+  data: {
+    'model-id': @resource.model.id,
+    selected_resources_name: @resource.model_key,
+    selected_resources: [@resource.model.id],
+    **@resource.stimulus_data_attributes
+  } do %>
   <% @resource.panels.each_with_index do |resource_panel, index| %>
     <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: index) do |c| %>
       <% c.tools do %>
@@ -19,7 +22,7 @@
                 } do %>
                 <%= t('avo.detach_item', item: title).capitalize %>
               <% end %>
-              <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
+              <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
             <% end %>
             <% if can_see_the_edit_button? %>
               <%= a_link edit_path,
@@ -54,7 +57,7 @@
                 <%= t('avo.delete').capitalize %>
               <% end %>
             <% end %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
+            <%= 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,
@@ -99,7 +102,6 @@
       <% end %>
     <% end %>
   <% end %>
-
   <% if should_display_invalid_fields_errors? %>
     <turbo-stream action="append" target="alerts">
       <template>
@@ -109,4 +111,4 @@
       </template>
     </turbo-stream>
   <% end %>
-</div>
+<% end %>

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

@@ -9,6 +9,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     @reflection = reflection
     @resource_panel = resource_panel
     @actions = actions
+    @view = :show
 
     split_panel_fields
   end

data/app/controllers/avo/actions_controller.rb

@@ -85,7 +85,10 @@ module Avo
 
       return [default_message] if response[:messages].blank?
 
-      response[:messages]
+      response[:messages].select do |message|
+        # Remove the silent placeholder messages
+        message[:type] != :silent
+      end
     end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -75,10 +75,10 @@ module Avo
     end
 
     def show
-      set_actions
-
       @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
 
+      set_actions
+
       @page_title = @resource.default_panel_name.to_s
 
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
@@ -101,8 +101,20 @@ module Avo
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
+      set_actions
+
       @page_title = @resource.default_panel_name.to_s
-      add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+
+      if params[:via_relation_class].present? && params[:via_resource_id].present?
+        via_resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
+        via_model = via_resource.class.find_scope.find params[:via_resource_id]
+        via_resource.hydrate model: via_model
+
+        add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
+        add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
+      end
+
+      add_breadcrumb @resource.plural_name.humanize
       add_breadcrumb t("avo.new").humanize
     end
 
@@ -151,6 +163,7 @@ module Avo
     end
 
     def edit
+      set_actions
     end
 
     def update
@@ -302,14 +315,10 @@ module Avo
     end
 
     def set_actions
-      if params[:resource_id].present?
-        model = @resource.class.find_scope.find params[:resource_id]
-      end
-
       @actions = @resource
         .get_actions
         .map do |action|
-          action.new(model: model, resource: @resource, view: @view)
+          action.new(model: @model, resource: @resource, view: @view)
         end
         .select { |action| action.visible_in_view }
     end
@@ -385,20 +394,22 @@ module Avo
         return resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
       end
 
-      redirect_path_from_resource_option || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_create_path) || resource_path(model: @model, resource: @resource)
     end
 
     def after_update_path
       return params[:referrer] if params[:referrer].present?
 
-      redirect_path_from_resource_option || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_update_path) || resource_path(model: @model, resource: @resource)
     end
 
-    def redirect_path_from_resource_option
-      return nil if @resource.class.after_update_path.blank?
+    def redirect_path_from_resource_option(action = :after_update_path)
+      return nil if @resource.class.send(action).blank?
 
-      if @resource.class.after_create_path == :index
+      if @resource.class.send(action) == :index
         resources_path(resource: @resource)
+      elsif @resource.class.send(action) == :edit
+        edit_resource_path(resource: @resource, model: @resource.model)
       else
         resource_path(model: @model, resource: @resource)
       end

data/app/controllers/avo/cards_controller.rb

@@ -0,0 +1,25 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class CardsController < ApplicationController
+    before_action :set_dashboard, only: :show
+    before_action :set_card, only: :show
+
+    def show
+    end
+
+    private
+
+    def set_dashboard
+      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
+    end
+
+    def set_card
+      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
+        card.hydrate(dashboard: @dashboard, params: params)
+      end
+    end
+  end
+end

data/app/controllers/avo/dashboards_controller.rb

@@ -2,21 +2,15 @@ require_dependency "avo/application_controller"
 
 module Avo
   class DashboardsController < ApplicationController
-    before_action :set_dashboard
+    before_action :set_dashboard, only: :show
 
     def show
     end
 
-    def card
-      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
-        card.hydrate(dashboard: @dashboard, params: params)
-      end
-    end
-
     private
 
     def set_dashboard
-      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+      @dashboard = Avo::App.get_dashboard_by_id params[:id]
 
       raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
     end

data/app/controllers/avo/home_controller.rb

@@ -4,7 +4,14 @@ module Avo
   class HomeController < ApplicationController
     def index
       if Avo.configuration.home_path.present?
-        redirect_to Avo.configuration.home_path
+        # If the home_path is a block run it, if not, just use it
+        computed_path = if Avo.configuration.home_path.respond_to? :call
+          instance_exec(&Avo.configuration.home_path)
+        else
+          Avo.configuration.home_path
+        end
+
+        redirect_to computed_path
       elsif !Rails.env.development?
         @page_title = "Get started"
         resource = Avo::App.resources.min_by { |resource| resource.model_key }

data/app/controllers/avo/search_controller.rb

@@ -51,8 +51,14 @@ module Avo
 
       results = apply_search_metadata(query, resource)
 
+      header = resource.plural_name
+
+      if results.length > 0
+        header += " (#{results.length})"
+      end
+
       result_object = {
-        header: resource.name.pluralize,
+        header: header,
         help: resource.class.search_query_help,
         results: results,
         count: results.length

data/app/helpers/avo/url_helpers.rb

@@ -12,10 +12,9 @@ module Avo
         end
       end
 
-      # Create the `route_key` from the model key so the namespaced models get the proper path (SomeModule::Post -> some_module_post).
-      # Add the `_index` suffix for the uncountable models so they get the correct path (`fish_index`)
-      route_key = resource.model_key
-      route_key << "_index" if resource.model_name.singular == resource.model_name.plural
+      route_key = resource.route_key
+      # Add the `_index` suffix for the uncountable names so they get the correct path (`fish_index`)
+      route_key << "_index" if resource.route_key == resource.singular_route_key
 
       avo.send :"resources_#{route_key}_path", **existing_params, **args
     end
@@ -33,19 +32,19 @@ module Avo
         id = resource_id
       end
 
-      avo.send :"resources_#{resource.singular_model_key}_path", id, **args
+      avo.send :"resources_#{resource.singular_route_key}_path", id, **args
     end
 
     def new_resource_path(model:, resource:, **args)
-      avo.send :"new_resources_#{resource.singular_model_key}_path", **args
+      avo.send :"new_resources_#{resource.singular_route_key}_path", **args
     end
 
     def edit_resource_path(model:, resource:, **args)
-      avo.send :"edit_resources_#{resource.singular_model_key}_path", model, **args
+      avo.send :"edit_resources_#{resource.singular_route_key}_path", model, **args
     end
 
     def resource_attach_path(resource, model_id, related_name, related_id = nil)
-      helpers.avo.resources_associations_new_path(resource.singular_model_key, model_id, related_name)
+      helpers.avo.resources_associations_new_path(resource.singular_route_key, model_id, related_name)
     end
 
     def resource_detach_path(
@@ -79,7 +78,7 @@ module Avo
     end
 
     def order_up_resource_path(model:, resource:, **args)
-      avo.send :"order_up_resources_#{resource.singular_model_key}_path", model, **args
+      avo.send :"order_up_resources_#{resource.singular_route_key}_path", model, **args
     end
   end
 end

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

@@ -32,8 +32,14 @@ export default class extends Controller {
       lineNumbers: true,
     }
 
+    const vm = this
+
     setTimeout(() => {
-      CodeMirror.fromTextArea(this.elementTarget, options)
+      CodeMirror.fromTextArea(this.elementTarget, options).on('change', (cm) => {
+        // Add this innerText change and dispatch an event to allow stimulus to pick up the input event.
+        vm.elementTarget.innerText = cm.getValue()
+        vm.elementTarget.dispatchEvent(new Event('input'))
+      })
     }, 1)
   }
 }

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

@@ -72,6 +72,7 @@ export default class extends Controller {
       result = Object.assign(...this.fieldValue.map(([key, val]) => ({ [key]: val })))
     }
     this.inputTarget.innerText = JSON.stringify(result)
+    this.inputTarget.dispatchEvent(new Event('input'))
   }
 
   updateKeyValueComponent() {