avo 2.9.2.pre1 → 2.10.0

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

@@ -0,0 +1,21 @@
+<div class="flex" data-target="tab-switcher">
+  <div class="button-group">
+    <% visible_items.each do |tab| %>
+      <%= a_link tab_path(tab),
+          color: selected?(tab) ? :gray : :primary,
+          rounded: false,
+          size: :sm,
+          class: selected?(tab) ? ' bg-gray-100 border-gray-300' : ' z-20',
+          title: tab.description,
+          data: {
+            tippy: tab.description.present? ? 'tooltip' : '',
+            control: "view-type-toggle-#{tab.name}",
+            selected: selected?(tab),
+            action: 'click->tabs#changeTab',
+            tabs_id_param: tab.name
+          } do %>
+        <%= tab.name %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/components/avo/tab_switcher_component.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+class Avo::TabSwitcherComponent < Avo::BaseComponent
+  include Avo::UrlHelpers
+  include Avo::ApplicationHelper
+
+  attr_reader :active_tab_name
+  attr_reader :group
+  attr_reader :current_tab
+  attr_reader :tabs
+  attr_reader :view
+
+  def initialize(resource:, group:, current_tab:, active_tab_name:, view:)
+    @active_tab_name = active_tab_name
+    @resource = resource
+    @group = group
+    @current_tab = current_tab
+    @tabs = group.items
+    @view = view
+  end
+
+  def tab_path(tab)
+    if is_edit?
+      helpers.edit_resource_path(resource: @resource, model: @resource.model, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
+    elsif is_new?
+      helpers.new_resource_path(resource: @resource, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
+    else
+      helpers.resource_path(resource: @resource, model: @resource.model, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
+    end
+  end
+
+  def is_edit?
+    @view == :edit
+  end
+
+  def is_new?
+    @view == :new
+  end
+
+  def is_initial_load?
+    params[:active_tab_name].blank?
+  end
+
+  # On initial load we want that each tab button to be the selected one.
+  # We do that so we don't get the wrongly selected item for a quick brief when first switching from one panel to another.
+  def selected?(tab)
+    if is_initial_load?
+      current_tab.name.to_s == tab.name.to_s
+    else
+      tab.name.to_s == active_tab_name.to_s
+    end
+  end
+
+  # Goes through all items and removes the ones that are not supposed to be visible.
+  # Example below:
+  # tabs do
+  #   field :comments, as: :has_many
+  # end
+  # Because the developer hasn't specified that it should be visible on edit views (with the show_on: :edit option),
+  # the field should not be visible in the item switcher either.
+  def visible_items
+    tabs.select do |item|
+      visible = true
+
+      if item.items.blank?
+        visible = false
+      end
+
+      first_item = item.items.first
+      if item.items.count == 1 && first_item.is_field? && first_item.has_own_panel? && !first_item.visible_on?(view)
+        # Return nil if tab contians a has_many type of fields and it's hidden in current view
+        visible = false
+      end
+
+      if item.respond_to?(:visible_on?)
+        visible = item.visible_on? view
+      end
+
+      if item.respond_to?(:visible?)
+        visible = item.visible?
+      end
+
+      visible
+    end
+  end
+end

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

@@ -1,77 +1,55 @@
 <%= 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: 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, 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,
+  <%= form_with model: @resource.model,
+    scope: @resource.form_scope,
+    url: form_url,
+    method: form_method,
+    local: true,
+    html: {
+      novalidate: true
+    },
+    multipart: true do |form| %>
+    <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
+    <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) 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,
               loading: true,
               type: :submit,
               icon: 'save' do %>
-              <%= t('avo.save').capitalize %>
-            <% end %>
+            <%= t('avo.save').capitalize %>
           <% 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, loading: true, type: :submit, icon: 'save' do %>
-                <%= t('avo.save').capitalize %>
-              <% 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 %>
-        <% end %>
-        <% c.body do %>
-          <div class="divide-y">
-            <% @resource.get_fields.each_with_index do |field, index| %>
-              <%= render field.component_for_view(:edit).new(field: field, resource: @resource, index: index, form: form) unless field.computed %>
+          <% if can_see_the_save_button? %>
+            <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
+              <%= t('avo.save').capitalize %>
             <% end %>
-          </div>
+          <% end %>
         <% end %>
       <% end %>
     <% end %>
-  <% end %>
-  <% if @reflection.blank? %>
-    <% if has_one_panels.present? %>
-      <% has_one_panels.each_with_index do |field, index| %>
-        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-      <% end %>
-    <% end %>
-    <% if has_many_panels.present? %>
-      <% has_many_panels.each_with_index do |field, index| %>
-        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-      <% end %>
-    <% end %>
-    <% if has_as_belongs_to_many_panels.present? %>
-      <% has_as_belongs_to_many_panels.each_with_index do |field, index| %>
-        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-      <% end %>
-    <% end %>
-    <% if resource_tools.present? %>
-      <% resource_tools.each do |tool, index| %>
-        <%= render tool.partial, tool: tool %>
+    <%= content_tag :div, class: 'space-y-12' do %>
+      <% @resource.get_items.each_with_index do |item, index| %>
+        <% next if item.nil? %>
+        <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: @view, form: form %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -15,6 +15,10 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     split_panel_fields
   end
 
+  def title
+    @resource.default_panel_name
+  end
+
   def back_path
     if via_resource?
       helpers.resource_path(model: params[:via_resource_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
@@ -32,7 +36,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   # The save button is dependent on the edit? policy method.
   # The update? method should be called only when the user clicks the Save button so the developer gets access to the params from the form.
   def can_see_the_save_button?
-    @resource.authorization.authorize_action :edit, raise_exception: false
+    @resource.authorization.authorize_action @view, raise_exception: false
   end
 
   private
@@ -45,6 +49,12 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     view == :edit
   end
 
+  def form_method
+    return :put if is_edit?
+
+    :post
+  end
+
   def form_url
     if is_edit?
       helpers.resource_path(

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

@@ -37,7 +37,7 @@
             <%= 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 %>
+          <%# Offset for the space-y-2 property when the search is missing %>
           <div class="-mb-2"></div>
         <% end %>
         <% if @filters.present? || available_view_types.count > 1 %>

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

@@ -113,11 +113,11 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
       end
     end
 
-    helpers.new_resource_path(model: @resource.model_class, resource: @resource, **args)
+    helpers.new_resource_path(resource: @resource, **args)
   end
 
   def attach_path
-    "#{Avo::App.root_path}#{request.env["PATH_INFO"]}/new"
+    Avo::App.root_path(paths: [request.env["PATH_INFO"], "new"])
   end
 
   def singular_resource_name
@@ -145,7 +145,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @reflection.active_record.to_s
   end
 
-  def name 
+  def name
     field.custom_name? ? field.name : field.plural_name
   end
 

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

@@ -1,105 +1,74 @@
 <%= 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 %>
-        <% if resource_panel[:name] == @resource.default_panel_name %>
-          <% 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 %>
-              <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-            <% end %>
-            <% 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,
-              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,
-                style: :text,
-                title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,
-                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,
-                  'tippy': 'tooltip',
-                } 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 %>
+  <%= render Avo::PanelComponent.new(title: 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 %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
         <% end %>
-      <% end %>
-      <% c.body do %>
-        <% if fields_by_panel[resource_panel[:name]].present? %>
-          <div class="divide-y">
-            <% fields_by_panel[resource_panel[:name]].each_with_index do |field, index| %>
-              <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-            <% end %>
-          </div>
+        <% 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,
+          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,
+            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,
+              'tippy': 'tooltip',
+            } 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 %>
   <% end %>
-  <% if @reflection.blank? %>
-    <% if has_one_panels.present? %>
-      <% has_one_panels.each_with_index do |field, index| %>
-        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-      <% end %>
-    <% end %>
-    <% if has_many_panels.present? %>
-      <% has_many_panels.each_with_index do |field, index| %>
-        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-      <% end %>
-    <% end %>
-    <% if has_as_belongs_to_many_panels.present? %>
-      <% has_as_belongs_to_many_panels.each_with_index do |field, index| %>
-        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-      <% end %>
-    <% end %>
-    <% if resource_tools.present? %>
-      <% resource_tools.each do |tool, index| %>
-        <%= render tool.partial, tool: tool %>
-      <% end %>
+  <%= content_tag :div, class: 'space-y-12' do %>
+    <% @resource.get_items.each_with_index do |item, index| %>
+      <% next if item.nil? %>
+      <%= render Avo::ItemSwitcherComponent.new resource: @resource, reflection: @reflection, item: item, index: index + 1, view: @view %>
     <% end %>
   <% end %>
   <% if should_display_invalid_fields_errors? %>

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

@@ -19,7 +19,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
       return field.name if has_one_field?
       reflection_resource.name
     else
-      @resource.panels.first[:name]
+      @resource.default_panel_name
     end
   end
 
@@ -52,6 +52,6 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   end
 
   def has_one_field?
-    field.present? and field.class == Avo::Fields::HasOneField
+    field.present? and field.instance_of? Avo::Fields::HasOneField
   end
 end

data/app/controllers/avo/actions_controller.rb

@@ -42,7 +42,7 @@ module Avo
         model = @resource.class.find_scope.find params[:id]
       end
 
-      @action = action_class.new(model: model, resource: resource, user: _current_user)
+      @action = action_class.new(model: model, resource: resource, user: _current_user, view: :edit)
     end
 
     def respond(response)

data/app/controllers/avo/application_controller.rb

@@ -13,7 +13,8 @@ module Avo
     protect_from_forgery with: :exception
     before_action :init_app
     before_action :check_avo_license
-    before_action :set_locale
+    before_action :set_default_locale
+    around_action :set_force_locale, if: -> { params[:force_locale].present? }
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -27,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, params: params
+      Avo::App.init request: request, context: context, current_user: _current_user, view_context: view_context, params: params
 
       @license = Avo::App.license
     end
@@ -287,10 +288,26 @@ module Avo
       @resource.form_scope
     end
 
-    def set_locale
+    def set_default_locale
       I18n.locale = params[:set_locale] || I18n.default_locale
 
       I18n.default_locale = I18n.locale
     end
+
+    # Temporary set the locale and reverting at the end of the request.
+    def set_force_locale
+      initial_locale = I18n.locale.to_s.dup
+      I18n.locale = params[:force_locale]
+      yield
+      I18n.locale = initial_locale
+    end
+
+    def default_url_options
+      if params[:force_locale].present?
+        { **super, force_locale: params[:force_locale] }
+      else
+        super
+      end
+    end
   end
 end

data/app/helpers/avo/application_helper.rb

@@ -20,12 +20,6 @@ module Avo
       render Avo::EmptyStateComponent.new **args
     end
 
-    def turbo_frame_wrap(name, &block)
-      render Avo::TurboFrameWrapperComponent.new name do
-        capture(&block)
-      end
-    end
-
     def a_button(**args, &block)
       render Avo::ButtonComponent.new(is_link: false, **args) do
         capture(&block) if block_given?

data/app/helpers/avo/url_helpers.rb

@@ -35,7 +35,7 @@ module Avo
       avo.send :"resources_#{resource.singular_route_key}_path", id, **args
     end
 
-    def new_resource_path(model:, resource:, **args)
+    def new_resource_path(resource:, **args)
       avo.send :"new_resources_#{resource.singular_route_key}_path", **args
     end
 

data/app/javascript/avo.js

@@ -74,7 +74,11 @@ document.addEventListener('turbo:frame-load', () => {
 document.addEventListener('turbo:before-fetch-response', async (e) => {
   if (e.detail.fetchResponse.response.status === 500) {
     const { id, src } = e.target
-    e.target.src = `${window.Avo.configuration.root_path}/failed_to_load?turbo_frame=${id}&src=${src}`
+    // Don't try to redirect to failed to load if this is alread a redirection to failed to load and crashed somewhere.
+    // You'll end up with a request loop.
+    if (!e.detail.fetchResponse?.response?.url?.includes('/failed_to_load')) {
+      e.target.src = `${window.Avo.configuration.root_path}/failed_to_load?turbo_frame=${id}&src=${src}`
+    }
   }
 })