avo 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f169116cd6e56e99ff318b5babd7394db5ad846ddc16c2399ce02df980c0edfc
-  data.tar.gz: 4ed87d717ff0f174b4220637fe5b5b31be26fd84b8f383c7812ce7b55f785e8f
+  metadata.gz: 633ca9db11d83d470c185235c921f4c6d5d8c76929443fa459d64f3e10ac6ba3
+  data.tar.gz: 81a6fe46847a7829f88362f39f5a732dce6953a9bc1197e7bdcfae7c80eb644d
 SHA512:
-  metadata.gz: c05244d5032c94bc2912e5ec726975544c3b5a2813a7fd477bc2e5bd5e1718a2fedd04ab53c296b73fd779e6d8dc43a9e711e71cf83260df4972752e456335a7
-  data.tar.gz: a89f9be5b9c1d6f2fbefa344e0335de6823a1f9cebf66077da9b6ab0970a7a6713cbf03f76689344d590df32f946cac73a84ef6157b864a0c2651394d0ac065b
+  metadata.gz: 6f6135bc849ee84b9d637fd9495ff5836fad0c58fc4d1b65504ba7d6eb6b95afd8b7a1724b287ca4857de32920b251d1c749901fc4c28e7cf1f9e6cf2b65a389
+  data.tar.gz: 59e3248675295cbb521f71b7a66e0f80b3433ebe022d6ad05b48138cd93c4907b96a3672e5bfe6d661412ff1f0c7ea52c957445ba16896d63e425a17d734c1b7

data/Gemfile

@@ -30,7 +30,7 @@ gem "rails", "~> 6.1.0"
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
 # Use Puma as the app server
-gem "puma", "~> 5.6.2"
+gem "puma", "~> 5.6.4"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem "jbuilder", "~> 2.7"
 # Use Redis adapter to run Action Cable in production

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.0.0)
+    avo (2.1.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -250,7 +250,7 @@ GEM
       ast (~> 2.4.1)
     pg (1.3.1)
     public_suffix (4.0.6)
-    puma (5.6.2)
+    puma (5.6.4)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
@@ -447,7 +447,7 @@ DEPENDENCIES
   meta-tags
   net-smtp
   pg (>= 0.18, < 2.0)
-  puma (~> 5.6.2)
+  puma (~> 5.6.4)
   pundit
   rails (~> 6.1.0)
   rails-controller-testing

data/app/assets/svgs/save.svg

@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M433.941 129.941l-83.882-83.882A48 48 0 0 0 316.118 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V163.882a48 48 0 0 0-14.059-33.941zM272 80v80H144V80h128zm122 352H54a6 6 0 0 1-6-6V86a6 6 0 0 1 6-6h42v104c0 13.255 10.745 24 24 24h176c13.255 0 24-10.745 24-24V83.882l78.243 78.243a6 6 0 0 1 1.757 4.243V426a6 6 0 0 1-6 6zM224 232c-48.523 0-88 39.477-88 88s39.477 88 88 88 88-39.477 88-88-39.477-88-88-88zm0 128c-22.056 0-40-17.944-40-40s17.944-40 40-40 40 17.944 40 40-17.944 40-40 40z"/></svg>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 515 450" style="enable-background:new 0 0 515 450;" xml:space="preserve">
+<path d="M438.4,116.4l-72.3-72.3c-7.8-7.8-18.3-12.1-29.2-12.1h-231C83,32,64.5,50.5,64.5,73.4v303.3c0,22.8,18.5,41.4,41.4,41.4
+	h303.3c22.8,0,41.4-18.5,41.4-41.4v-231C450.5,134.7,446.1,124.1,438.4,116.4L438.4,116.4z M298.9,73.4v68.9H188.6V73.4H298.9z
+	 M404,376.6H111c-2.9,0-5.2-2.3-5.2-5.2V78.5c0-2.9,2.3-5.2,5.2-5.2h36.2V163c0,11.4,9.3,20.7,20.7,20.7h151.6
+	c11.4,0,20.7-9.3,20.7-20.7V76.7l67.4,67.4c1,1,1.5,2.3,1.5,3.7v223.7C409.1,374.3,406.8,376.6,404,376.6L404,376.6z M257.5,204.3
+	c-41.8,0-75.8,34-75.8,75.8s34,75.8,75.8,75.8s75.8-34,75.8-75.8S299.3,204.3,257.5,204.3z M257.5,314.6c-19,0-34.5-15.5-34.5-34.5
+	s15.5-34.5,34.5-34.5s34.5,15.5,34.5,34.5S276.5,314.6,257.5,314.6z"/>
+</svg>

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

@@ -12,7 +12,7 @@
     <%= t 'avo.actions' %>
   <% end %>
   <div
-    class="absolute flex inset-auto right-0 top-full bg-white w-full sm:w-auto sm:min-w-[300px] mt-2 z-20 shadow-modal rounded overflow-hidden hidden"
+    class="absolute flex inset-auto xl:right-0 top-full bg-white w-full sm:w-auto sm:min-w-[300px] mt-2 z-20 shadow-modal rounded overflow-hidden hidden"
     data-toggle-panel-target="panel"
   >
     <div class="w-full space divide-y">

data/app/components/avo/alert_component.rb

@@ -12,18 +12,18 @@ class Avo::AlertComponent < ViewComponent::Base
   end
 
   def icon
-    return 'x-circle' if is_error?
+    return "x-circle" if is_error?
 
-    'check-circle'
+    "check-circle"
   end
 
   def classes
     result = "max-w-sm w-full shadow-lg rounded px-4 py-3 rounded relative border text-white pointer-events-auto"
 
-    if is_error?
-      result += " bg-red-400 border-red-700"
+    result += if is_error?
+      " bg-red-400 border-red-700"
     else
-      result += " bg-green-400 border-green-700"
+      " bg-green-400 border-green-700"
     end
 
     result

data/app/components/avo/blank_field_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::BlankFieldComponent < ViewComponent::Base
+end

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

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, flush: true do %>
   <%= render Avo::Fields::Common::BadgeViewerComponent.new value: @field.value, options: @field.options %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, dash_if_blank: false, center_content: true do %>
+<%= index_field_wrapper field: @field, dash_if_blank: false, center_content: true, flush: true do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

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

@@ -1,8 +1,7 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, flush: true do %>
   <% if @field.value.present? %>
     <%= image_tag @field.value,
       height: @field.height,
-      width: @field.width,
       style: "border-radius: #{@field.radius}px; max-height: #{@field.height}#{@field.height.to_s&.ends_with?('px') ? '' : 'px'};"
     %>
   <% end %>

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

@@ -1,9 +1,9 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, flush: flush? do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
-      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'max-h-full'), resource_path, class: 'block' %>
+      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_path, class: 'block' %>
     <% elsif @field.value.attached? && @field.is_audio %>
-      <%= link_to_if @field.link_to_resource, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full'), resource_path, class: 'block h-8' %>
+      <%= link_to_if @field.link_to_resource, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full h-10'), resource_path, class: 'block h-8' %>
     <% else %>
       <%= @field.value.filename %>
     <% end %>

data/app/components/avo/fields/file_field/index_component.rb

@@ -1,4 +1,15 @@
 # frozen_string_literal: true
 
 class Avo::Fields::FileField::IndexComponent < Avo::Fields::IndexComponent
+  def flush?
+    has_image_tag? || has_audio_tag?
+  end
+
+  def has_image_tag?
+    @field.value.attached? && @field.value.representable? && @field.is_image
+  end
+
+  def has_audio_tag?
+    @field.value.attached? && @field.is_audio
+  end
 end

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

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, flush: true do %>
   <%= render Avo::Fields::Common::GravatarViewerComponent.new(
     md5: @field.md5,
     default: @field.default,

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

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, flush: true do %>
   <% if @field.display_value %>
     <div class="text-center text-sm font-semibold w-full leading-none mb-1">
       <%= @field.value %><%= @field.value_suffix if @field.value_suffix.present? %>

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

@@ -1,4 +1,4 @@
-<td class="min-h-[3rem] px-4 py-3 leading-tight whitespace-nowrap h-full text-slate-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
+<td class="min-h-[3rem] px-3 leading-tight whitespace-nowrap h-full text-slate-800 <%= classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>

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

@@ -1,11 +1,22 @@
 # frozen_string_literal: true
 
 class Avo::Index::FieldWrapperComponent < ViewComponent::Base
-  def initialize(field: nil, dash_if_blank: true, center_content: false, **args)
+  def initialize(field: nil, dash_if_blank: true, center_content: false, flush: false, **args)
     @field = field
     @dash_if_blank = dash_if_blank
     @center_content = center_content
     @classes = args[:class].present? ? args[:class] : ""
     @args = args
+    @flush = flush
+  end
+
+  def classes
+    result = @classes
+
+    unless @flush
+      result += " py-3"
+    end
+
+    result
   end
 end

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

@@ -28,7 +28,10 @@
   <% end %>
 
   <% if can_detach? %>
-    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {
+    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id),
+      method: :delete,
+      local: true,
+      html: {
         'data-turbo-frame': params[:turbo_frame]
       } do |form| %>
       <%= form.button helpers.svg('detach', class: button_classes),
@@ -51,6 +54,7 @@
     <%= form_with url: helpers.resource_path(model: @resource.model, resource: @resource),
       method: :delete,
       class: 'flex items-center',
+      local: true,
       html: {
         'data-turbo-frame': params[:turbo_frame]
       } do |form| %>

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

@@ -3,7 +3,7 @@
     <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection)} %>
     <tbody class="divide-y">
       <% @resources.each_with_index do |resource, index| %>
-        <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model) do %>
+        <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model), expires_in: 1.day do %>
           <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model) %>
         <% end %>
       <% end %>

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

@@ -1,6 +1,6 @@
 <div <%== data_attributes %>>
   <% if render_header? %>
-    <div class="bg-white rounded shadow p-4 flex-1 flex flex-col xl:flex-row justify-between mb-6">
+    <div class="<%= white_panel_classes %> p-4 flex-1 flex flex-col xl:flex-row justify-between mb-6">
       <div class="overflow-hidden mr-4">
         <% if display_breadcrumbs? %>
           <div class="breadcrumbs truncate mb-2">
@@ -25,7 +25,7 @@
     </div>
   <% end %>
 
-  <div class="relative bg-white rounded shadow <%= @body_classes %>">
+  <div class="relative <%= white_panel_classes %> <%= @body_classes %>">
     <%= body %>
   </div>
 
@@ -33,6 +33,14 @@
     <%= bare_content %>
   </div>
 
+  <% if footer_tools.present? %>
+    <div class="<%= white_panel_classes %> p-4 flex-1 flex flex-col xl:flex-row justify-between mt-6">
+      <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
+        <%= footer_tools %>
+      </div>
+    </div>
+  <% end %>
+
   <div class="flex justify-end w-full">
     <div>
       <%= footer %>

data/app/components/avo/panel_component.rb

@@ -6,6 +6,7 @@ class Avo::PanelComponent < ViewComponent::Base
   renders_one :tools
   renders_one :body
   renders_one :bare_content
+  renders_one :footer_tools
   renders_one :footer
 
   def initialize(title: nil, description: nil, body_classes: nil, data: {}, display_breadcrumbs: false, index: nil)
@@ -19,6 +20,10 @@ class Avo::PanelComponent < ViewComponent::Base
 
   private
 
+  def white_panel_classes
+    'bg-white rounded shadow'
+  end
+
   def data_attributes
     @data.merge({'panel-index': @index}).map do |key, value|
       " data-#{key}=\"#{value}\""
@@ -38,4 +43,8 @@ class Avo::PanelComponent < ViewComponent::Base
   def render_header?
     @title.present? || description.present? || tools.present? || display_breadcrumbs?
   end
+
+  def render_footer_tools?
+    footer_tools.present?
+  end
 end

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

@@ -0,0 +1,4 @@
+<%= hidden_field_tag :via_resource_class, params[:via_resource_class] if params[:via_resource_class] %>
+<%= hidden_field_tag :via_resource_id, params[:via_resource_id] if params[:via_resource_id] %>
+<%= hidden_field_tag :via_relation, params[:via_relation] if params[:via_relation] %>
+<%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>

data/app/components/avo/referrer_params_component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Avo::ReferrerParamsComponent < ViewComponent::Base
+  attr_reader :back_path
+
+  def initialize(back_path: nil)
+    @back_path = back_path
+  end
+end

data/app/components/avo/sidebar_component.rb

@@ -4,7 +4,9 @@ class Avo::SidebarComponent < ViewComponent::Base
   def dashboards
     return [] if Avo::App.license.lacks_with_trial(:dashboards)
 
-    Avo::App.get_dashboards(helpers._current_user)
+    Avo::App.get_dashboards(helpers._current_user).select do |dashboard|
+      dashboard.is_visible?
+    end
   end
 
   def resources

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

@@ -4,8 +4,9 @@
         scope: @resource.form_scope,
         url: helpers.resource_path(model: @resource.model, resource: @resource),
         method: :put,
+        local: true,
         multipart: true do |form| %>
-      <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>
+      <%= 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| %>
         <% c.tools do %>
           <%= a_link back_path, icon: 'arrow-left' do %>
@@ -17,6 +18,18 @@
             <% end %>
           <% end %>
         <% end %>
+        <% if Avo.configuration.buttons_on_form_footers %>
+          <% c.footer_tools do %>
+            <%= a_link back_path, icon: 'arrow-left' do %>
+              <%= t('avo.cancel').capitalize %>
+            <% end %>
+            <% if can_see_the_save_button? %>
+              <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+                <%= t('avo.save').capitalize %>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
         <% c.body do %>
           <div class="divide-y">
             <% @resource.get_fields.each_with_index do |field, index| %>

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

@@ -10,6 +10,7 @@
       ),
       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| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
@@ -23,6 +24,18 @@
             <% end %>
           </div>
         <% end %>
+        <% if Avo.configuration.buttons_on_form_footers %>
+          <% c.footer_tools do %>
+            <%= a_link back_path, icon: 'arrow-left' do %>
+              <%= t('avo.cancel').capitalize %>
+            <% end %>
+            <% if can_see_the_save_button? %>
+              <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+                <%= t('avo.save').capitalize %>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
         <% c.body do %>
           <div class="divide-y">
             <% @resource.get_fields.each_with_index do |field, index| %>

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

@@ -33,6 +33,7 @@
             <% if can_see_the_destroy_button? %>
               <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
                 method: :delete,
+                local: true,
                 title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,
                 spinner: true,
                 color: :red,

data/app/controllers/avo/application_controller.rb

@@ -28,7 +28,7 @@ module Avo
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user, view_context: view_context
+      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user, view_context: view_context, params: params
 
       @license = Avo::App.license
     end

data/app/controllers/avo/base_controller.rb

@@ -7,6 +7,7 @@ module Avo
     before_action :hydrate_resource
     before_action :set_model, only: [:show, :edit, :destroy, :update, :order]
     before_action :set_model_to_fill
+    before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
     before_action :authorize_action
     before_action :reset_pagination_if_filters_changed, only: :index
@@ -91,30 +92,9 @@ module Avo
       add_breadcrumb t("avo.new").humanize
     end
 
-    def edit
-      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
-
-      @page_title = @resource.default_panel_name.to_s
-
-      # If we're accessing this resource via another resource add the parent to the breadcrumbs.
-      if params[:via_resource_class].present? && params[:via_resource_id].present?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_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: @resource)
-        add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
-      else
-        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
-      end
-
-      add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
-      add_breadcrumb t("avo.edit").humanize
-    end
-
     def create
       # model gets instantiated and filled in the fill_model method
-      saved = @model.save
+      saved = save_model
       @resource.hydrate(model: @model, view: :new, user: _current_user)
 
       # This means that the record has been created through another parent record and we need to attach it somehow.
@@ -163,9 +143,12 @@ module Avo
       end
     end
 
+    def edit
+    end
+
     def update
       # model gets instantiated and filled in the fill_model method
-      saved = @model.save
+      saved = save_model
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       respond_to do |format|
@@ -179,11 +162,14 @@ module Avo
     end
 
     def destroy
-      @model.destroy!
-
       respond_to do |format|
-        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) }
-        format.json { head :no_content }
+        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
       end
     end
 
@@ -204,6 +190,31 @@ module Avo
 
     private
 
+    def save_model
+      perform_action_and_record_errors do
+        @model.save!
+      end
+    end
+
+    def destroy_model
+      perform_action_and_record_errors do
+        @model.destroy!
+      end
+    end
+
+    def perform_action_and_record_errors(&block)
+      begin
+        succeeded = block.call
+      rescue => exception
+        # In case there's an error somewhere else than the model
+        # Example: When you save a license that should create a user for it and creating that user throws and error.
+        # Example: When you Try to delete a record and has a foreign key constraint.
+        @errors = Array.wrap(exception.message)
+      end
+
+      succeeded
+    end
+
     def model_params
       request_params = params.require(model_param_key).permit(permitted_params)
 
@@ -327,5 +338,24 @@ module Avo
     def applied_filters_cache_key
       "avo.base_controller.#{@resource.model_key}.applied_filters"
     end
+
+    def set_edit_title_and_breadcrumbs
+      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
+      @page_title = @resource.default_panel_name.to_s
+      # If we're accessing this resource via another resource add the parent to the breadcrumbs.
+      if params[:via_resource_class].present? && params[:via_resource_id].present?
+        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_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: @resource)
+        add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
+      else
+        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+      end
+
+      add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
+      add_breadcrumb t("avo.edit").humanize
+    end
   end
 end

data/app/controllers/avo/dashboards_controller.rb

@@ -22,7 +22,7 @@ module Avo
     def set_dashboard
       @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
 
-      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil?
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
     end
   end
 end

data/app/controllers/avo/search_controller.rb

@@ -10,7 +10,11 @@ module Avo
     def index
       raise ActionController::BadRequest.new("This feature requires the pro license https://avohq.io/purchase/pro") if App.license.lacks_with_trial(:global_search)
 
-      render json: search_resources(Avo::App.resources)
+      resources = Avo::App.resources.reject do |resource|
+        resource.class.search_hide_from_global_search
+      end
+
+      render json: search_resources(resources)
     end
 
     def show

data/app/javascript/avo.js

@@ -71,12 +71,13 @@ document.addEventListener('turbo:frame-load', () => {
   initTippy()
 })
 
-document.addEventListener('turbo:before-fetch-response', (e) => {
+document.addEventListener('turbo:before-fetch-response', async (e) => {
   if (e.detail.fetchResponse.response.status === 500) {
-    const id = e.srcElement.getAttribute('id')
-    e.srcElement.src = `${window.Avo.configuration.root_path}/failed_to_load?turbo_frame=${id}`
+    const { id, src } = e.target
+    e.target.src = `${window.Avo.configuration.root_path}/failed_to_load?turbo_frame=${id}&src=${src}`
   }
 })
+
 document.addEventListener('turbo:visit', () => document.body.classList.add('turbo-loading'))
 document.addEventListener('turbo:submit-start', () => document.body.classList.add('turbo-loading'))
 document.addEventListener('turbo:submit-end', () => document.body.classList.remove('turbo-loading'))

data/app/views/avo/actions/show.html.erb

@@ -10,6 +10,7 @@
     <%= form_with model: @model,
       scope: 'fields',
       url: "#{@resource.records_path}/actions/#{@action.param_id}",
+      local: true,
       data: @action.class.form_data_attributes do |form|
     %>
     <%= render Avo::ModalComponent.new do |c| %>

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

@@ -1,6 +1,7 @@
 <%= turbo_frame_tag 'attach_modal' do %>
   <%= form_with scope: 'fields',
     url: "#{avo.root_path}resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
+    local: true,
     data: {
       'turbo-frame': '_top'
     } do |form| %>

data/app/views/avo/home/failed_to_load.html.erb

@@ -1,3 +1,23 @@
 <%= turbo_frame_wrap(params[:turbo_frame]) do %>
-  <%= render 'avo/partials/failed_state' %>
+  <%
+  classes = 'absolute inset-auto left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2'
+  label = t 'avo.failed_to_load'
+%>
+  <div class="relative flex-1 py-12">
+    <div class="relative block text-gray-300 h-40 w-full">
+      <%= svg 'avocado', class: "#{classes} h-20 text-gray-400" %>
+      <%= svg 'code', class: "#{classes} h-8 -ml-20 -mt-12" %>
+      <%= svg 'fire', class: "#{classes} h-8 -ml-10 -mt-24" %>
+      <%= svg 'color-swatch', class: "#{classes} h-8 ml-8 -mt-24" %>
+      <%= svg 'globe', class: "#{classes} h-8 ml-20 -mt-12" %>
+      <%= svg 'library', class: "#{classes} h-8 -ml-20 mt-4" %>
+      <%= svg 'photograph', class: "#{classes} h-8 ml-20 mt-4" %>
+    </div>
+    <div class="relative block text-center text-lg text-gray-400 font-semibold -mt-10"><%= label %> <span class="border-b-2 border-dashed"><%= params[:turbo_frame].to_s.humanize.downcase if params[:turbo_frame].present? %></span> frame</div>
+  </div>
+  <% if Rails.env.development? %>
+    <div class="text-center text-sm w-full">
+      This is not an issue with Avo. Click <%= link_to 'this link', params[:src], target: :_blank %> to see why this frame failed to load.
+    </div>
+  <% end %>
 <% end %>

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

@@ -42,6 +42,13 @@
 
 <%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-50 pointer-events-none" do %>
   <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+
+  <% # In case we have other general error messages %>
+  <% if @errors.present? %>
+    <% @errors.each do |message| %>
+      <%= render Avo::AlertComponent.new :error, message %>
+    <% end %>
+  <% end %>
 <% end %>
 
 <%= render partial: "avo/partials/scripts" %>