avo 2.9.2.pre1 → 2.10.3.pre.1

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

@@ -11,9 +11,11 @@ module Avo
     include Avo::UrlHelpers
 
     protect_from_forgery with: :exception
+    around_action :set_avo_locale
+    around_action :set_force_locale, if: -> { params[:force_locale].present? }
+    before_action :set_default_locale, if: -> { params[:set_locale].present? }
     before_action :init_app
     before_action :check_avo_license
-    before_action :set_locale
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -27,7 +29,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
@@ -260,23 +262,23 @@ module Avo
     end
 
     def on_root_path
-      [Avo::App.root_path, "#{Avo::App.root_path}/"].include?(request.original_fullpath)
+      [Avo.configuration.root_path, "#{Avo.configuration.root_path}/"].include?(request.original_fullpath)
     end
 
     def on_resources_path
-      request.original_url.match?(/.*#{Avo::App.root_path}\/resources\/.*/)
+      request.original_url.match?(/.*#{Avo.configuration.root_path}\/resources\/.*/)
     end
 
     def on_api_path
-      request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
+      request.original_url.match?(/.*#{Avo.configuration.root_path}\/avo_api\/.*/)
     end
 
     def on_dashboards_path
-      request.original_url.match?(/.*#{Avo::App.root_path}\/dashboards\/.*/)
+      request.original_url.match?(/.*#{Avo.configuration.root_path}\/dashboards\/.*/)
     end
 
     def on_debug_path
-      request.original_url.match?(/.*#{Avo::App.root_path}\/avo_private\/debug.*/)
+      request.original_url.match?(/.*#{Avo.configuration.root_path}\/avo_private\/debug.*/)
     end
 
     def on_custom_tool_page
@@ -287,10 +289,31 @@ module Avo
       @resource.form_scope
     end
 
-    def set_locale
-      I18n.locale = params[:set_locale] || I18n.default_locale
+    # Sets the locale set in avo.rb initializer
+    def set_avo_locale(&action)
+      locale = Avo.configuration.locale || I18n.default_locale
+      I18n.with_locale(locale, &action)
+    end
+
+    # Enable the user to change the default locale with the `?set_locale=pt-BR` param
+    def set_default_locale
+      locale = params[:set_locale] || I18n.default_locale
+
+      I18n.default_locale = locale
+    end
 
-      I18n.default_locale = I18n.locale
+    # Temporary set the locale and reverting at the end of the request.
+    def set_force_locale(&action)
+      locale = params[:force_locale] || I18n.default_locale
+      I18n.with_locale(locale, &action)
+    end
+
+    def default_url_options
+      if params[:force_locale].present?
+        { **super, force_locale: params[:force_locale] }
+      else
+        super
+      end
     end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -154,7 +154,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          format.html { redirect_to after_create_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
+          format.html { redirect_to after_create_path, notice: "#{@resource.name} #{t("avo.was_successfully_created")}." }
         else
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :new, status: :unprocessable_entity }
@@ -173,7 +173,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          format.html { redirect_to after_update_path, notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
+          format.html { redirect_to after_update_path, notice: "#{@resource.name} #{t("avo.was_successfully_updated")}." }
         else
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :edit, status: :unprocessable_entity }
@@ -370,6 +370,8 @@ module Avo
     def set_edit_title_and_breadcrumbs
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
       @page_title = @resource.default_panel_name.to_s
+
+      last_crumb_args = {}
       # 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]
@@ -378,11 +380,17 @@ module Avo
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)
         add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
+        puts ["via_resource.model_title->", via_resource.model_title].inspect
+
+        last_crumb_args = {
+          via_resource_class: params[:via_resource_class],
+          via_resource_id: params[:via_resource_id]
+        }
       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 @resource.model_title, resource_path(model: @resource.model, resource: @resource, **last_crumb_args)
       add_breadcrumb t("avo.edit").humanize
     end
 

data/app/controllers/avo/reorder_controller.rb

@@ -0,0 +1,25 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class ReorderController < ApplicationController
+    before_action :set_resource_name
+    before_action :set_resource
+    before_action :hydrate_resource
+    before_action :set_model
+
+    def order
+      direction = params[:direction].to_sym
+
+      if direction.present?
+        @resource
+          .hydrate(model: @model, params: params)
+          .ordering_host
+          .order direction
+      end
+
+      respond_to do |format|
+        format.html { redirect_to params[:referrer] || resources_path(resource: @resource) }
+      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?
@@ -138,5 +132,11 @@ module Avo
         model.class
       end
     end
+
+    def root_path_without_url
+      Avo::App.root_path.to_s.delete_prefix(request.base_url.to_s).delete_suffix "/"
+    rescue
+      Avo.configuration.root_path
+    end
   end
 end

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
 
@@ -76,9 +76,5 @@ module Avo
 
       avo.resources_associations_index_path(parent_model.model_name.route_key, record.id, **existing_params, **args)
     end
-
-    def order_up_resource_path(model:, resource:, **args)
-      avo.send :"order_up_resources_#{resource.singular_route_key}_path", model, **args
-    end
   end
 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}`
+    }
   }
 })
 

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

@@ -18,6 +18,7 @@ export default class extends Controller {
     pickerFormat: String,
     firstDayOfWeek: Number,
     time24Hr: Boolean,
+    disableMobile: Boolean,
   }
 
   get browserZone() {
@@ -86,6 +87,9 @@ export default class extends Controller {
     // Set the format of the displayed input field.
     options.altFormat = this.pickerFormatValue
 
+    // Disable native input in mobile browsers
+    options.disableMobile = this.disableMobileValue
+
     // Set first day of the week.
     options.locale.firstDayOfWeek = this.firstDayOfWeekValue
 
@@ -99,7 +103,7 @@ export default class extends Controller {
 
       options.dateFormat = 'Y-m-d H:i:S'
     } else {
-      // Because the browser treats the date like a timestamp and updates it ot 00:00 hour, when on a western timezone the date will be converted with one day offset.
+      // Because the browser treats the date like a timestamp and updates it at 00:00 hour, when on a western timezone the date will be converted with one day offset.
       // Ex: 2022-01-30 will render as 2022-01-29 on an American timezone
       options.defaultDate = universalTimestamp(this.initialValue)
     }
@@ -111,12 +115,20 @@ export default class extends Controller {
 
   onChange(selectedDates) {
     let time
+    let args = {}
 
     if (this.timezoneValue) {
-      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: true })
+      args = { keepLocalTime: true }
+    } else {
+      args = { keepLocalTime: false }
+    }
+
+    if (this.enableTimeValue) {
+      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', args)
     } else {
-      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: false })
+      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: true })
     }
+
     this.updateRealInput(time)
   }
 

data/app/javascript/js/controllers/loading_button_controller.js

@@ -7,33 +7,37 @@ export default class extends Controller {
   <div class="double-bounce2"></div>
 </div>`;
 
-  confirmed = false
-
-  connect() {
-    this.context.scope.element.addEventListener('click', (e) => {
-      // If the user has to confirm the action
-      if (this.confirmationMessage) {
-        // Intervene only if not confirmed
-        if (!this.confirmed) {
-          e.preventDefault()
-          if (window.confirm(this.confirmationMessage)) {
-            this.applyLoader()
-          }
-        }
-      } else {
+  static values = {
+    confirmationMessage: String,
+    confirmed: Boolean,
+  }
+
+  attemptSubmit(e) {
+    // If the user has to confirm the action
+    if (this.confirmationMessageValue) {
+      this.confirmAndApply(e)
+    } else {
+      this.applyLoader()
+    }
+
+    return null
+  }
+
+  confirmAndApply(e) {
+    // Intervene only if not confirmed
+    if (!this.confirmedValue) {
+      e.preventDefault()
+
+      if (window.confirm(this.confirmationMessageValue)) {
         this.applyLoader()
       }
-    })
+    }
   }
 
   get button() {
     return this.context.scope.element
   }
 
-  get confirmationMessage() {
-    return this.context.scope.element.getAttribute('data-avo-confirm')
-  }
-
   applyLoader() {
     const { button } = this
 
@@ -50,10 +54,10 @@ export default class extends Controller {
   }
 
   markConfirmed() {
-    this.confirmed = true
+    this.confirmedValue = true
   }
 
   markUnconfirmed() {
-    this.confirmed = false
+    this.confirmedValue = false
   }
 }

data/app/javascript/js/controllers/search_controller.js

@@ -147,6 +147,9 @@ export default class extends Controller {
               case 'rounded':
                 classes = 'rounded'
                 break
+              case 'square':
+                classes = 'rounded-none'
+                break
             }
 
             children.push(

data/app/javascript/js/controllers/tabs_controller.js

@@ -0,0 +1,86 @@
+import { AttributeObserver } from '@stimulus/mutation-observers'
+import { Controller } from '@hotwired/stimulus'
+import { castBoolean } from '../helpers/cast_boolean'
+
+export default class extends Controller {
+  static targets = ['tab'];
+
+  static values = {
+    view: String,
+    activeTab: String,
+  };
+
+  get currentTab() {
+    return this.tabTargets.find(
+      (element) => element.dataset.tabId === this.activeTabValue,
+    )
+  }
+
+  targetTab(id) {
+    return this.tabTargets.find((element) => element.dataset.tabId === id)
+  }
+
+  changeTab(e) {
+    e.preventDefault()
+
+    const { params } = e
+    const { id } = params
+
+    this.setTheTargetPanelHeight(id)
+
+    this.hideTabs()
+    this.showTab(id)
+    this.markTabLoaded(id)
+
+    this.activeTabValue = id
+  }
+
+  /**
+   * Sets the target container height to the previous panel height so we don't get jerky tab changes.
+   */
+  setTheTargetPanelHeight(id) {
+    // Ignore this on edit.
+    // All tabs are loaded beforehand, they have their own height, and the page won't jiggle when the user toggles between them.
+    if (this.viewValue === 'edit' || this.viewValue === 'new') {
+      return
+    }
+
+    // We don't need to add a height to this panel because it was loaded before
+    if (castBoolean(this.targetTab(id).dataset.loaded)) {
+      return
+    }
+
+    // Get the height of the active panel
+    const { height } = this.currentTab.getBoundingClientRect()
+    // Set it to the target panel
+    this.targetTab(id).style.height = `${height}px`
+
+    // Wait until the panel loaded it's content and then remove the forced height
+    const observer = new AttributeObserver(this.targetTab(id), 'busy', {
+      elementUnmatchedAttribute: () => {
+        // The content is not available in an instant so delay the height reset a bit.
+        setTimeout(() => {
+          this.targetTab(id).style.height = ''
+        }, 300)
+        if (observer) observer.stop()
+      },
+    })
+    observer.start()
+  }
+
+  markTabLoaded(id) {
+    this.targetTab(id).dataset.loaded = true
+  }
+
+  showTab(id) {
+    this.tabTargets.forEach((element) => {
+      if (element.dataset.tabId === id) {
+        element.classList.remove('hidden')
+      }
+    })
+  }
+
+  hideTabs() {
+    this.tabTargets.map((element) => element.classList.add('hidden'))
+  }
+}

data/app/javascript/js/controllers.js

@@ -27,6 +27,7 @@ import SearchController from './controllers/search_controller'
 import SelectController from './controllers/select_controller'
 import SelectFilterController from './controllers/select_filter_controller'
 import SimpleMdeController from './controllers/fields/simple_mde_controller'
+import TabsController from './controllers/tabs_controller'
 import TagsFieldController from './controllers/fields/tags_field_controller'
 import TextFilterController from './controllers/text_filter_controller'
 import TippyController from './controllers/tippy_controller'
@@ -55,6 +56,7 @@ application.register('resource-show', ResourceShowController)
 application.register('search', SearchController)
 application.register('select', SelectController)
 application.register('select-filter', SelectFilterController)
+application.register('tabs', TabsController)
 application.register('tags-field', TagsFieldController)
 application.register('text-filter', TextFilterController)
 application.register('tippy', TippyController)

data/app/views/avo/base/index.html.erb

@@ -1,4 +1,4 @@
-<%= turbo_frame_wrap(params[:turbo_frame]) do %>
+<%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
   <%= render Avo::Views::ResourceIndexComponent.new(
       resource: @resource,
       resources: @resources,

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

@@ -1,3 +1,3 @@
-<%= turbo_frame_wrap(params[:turbo_frame]) do %>
+<%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
   <%= render Avo::Views::ResourceShowComponent.new(resource: @resource, reflection: @reflection, actions: @actions) %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= turbo_frame_wrap(params[:turbo_frame]) do %>
+<%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
   <%= render Avo::CardComponent.new card: @card %>
 <% end %>