fix: set_locale param not setting the locale properly (#2855)

* fix: `set_locale` param not setting the locale properly

* fix: set_locale distinct from the default locale

* fix specs

app/components/avo/divider_component.html.erb

@@ -1,7 +1,7 @@
-<div class="relative flex justify-center items-center w-full !border-b-2 border-gray-200 border-solid">
- <div class="absolute inset-auto z-20 text-xs font-semibold uppercase leading-none text-gray-500 bg-white px-2">
- <%if label.present?%>
- <%=label%>
- <%end%>
- </div>
+<div class="relative flex justify-center items-center w-full !border-b-2 border-gray-200 border-solid" data-component-name="<%= self.class.to_s.underscore %>">
+ <% if label.present? %>
+ <div class="absolute inset-auto z-20 text-xs font-semibold uppercase leading-none text-gray-500 bg-white px-2 border py-1 rounded">
+ <%= label %>
+ </div>
+ <% end %>
 </div>

app/controllers/avo/application_controller.rb

@@ -15,7 +15,6 @@ class ApplicationController < ::ActionController::Base
  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 :set_active_storage_current_host
  before_action :set_resource_name
@@ -52,10 +51,6 @@ def turbo_frame_request?
  super
  end
 
- def hello
- puts "Nobody tested me :("
- end
-
  private
 
  # Get the pluralized resource name for this request
@@ -279,23 +274,21 @@ def model_param_key
  @resource.form_scope
  end
 
- # Sets the locale set in avo.rb initializer
+ # Sets the locale set in avo.rb initializer or if to something that the user set using the `?set_locale=pt-BR` param
  def set_avo_locale(&action)
- locale = Avo.configuration.locale || I18n.default_locale
- I18n.with_locale(locale, &action)
- end
+ locale = Avo.configuration.default_locale
 
- # 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
+ if params[:set_locale].present?
+ locale = params[:set_locale]
+ Avo.configuration.locale = locale
+ end
 
- I18n.default_locale = locale
+ I18n.with_locale(locale, &action)
  end
 
  # 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)
+ I18n.with_locale(params[:force_locale], &action)
  end
 
  def set_sidebar_open
@@ -327,8 +320,6 @@ def set_stylesheet_assets_path
  end
  end
 
- private
-
  def choose_layout
  if turbo_frame_request?
  "avo/blank"

app/controllers/avo/base_controller.rb

@@ -558,7 +558,7 @@ def is_associated_record?
 
  # Set pagy locale from params or from avo configuration, if both nil locale = "en"
  def set_pagy_locale
- @pagy_locale = locale.to_s || Avo.configuration.locale || "en"
+ @pagy_locale = locale.to_s || Avo.configuration.default_locale || "en"
  end
 
  def safe_call(method)

lib/avo/configuration.rb

@@ -238,6 +238,10 @@ def default_turbo
  def pagination
  Avo::ExecutionContext.new(target: @pagination).handle
  end
+
+ def default_locale
+ @locale || I18n.default_locale
+ end
  end
 
  def self.configuration

spec/dummy/app/avo/resources/project.rb

@@ -6,7 +6,7 @@ class Avo::Resources::Project < Avo::BaseResource
  query.ransack(id_eq: params[:q], name_cont: params[:q], country_cont: params[:q], m: "or").result(distinct: false)
  }
  }
- self.includes = [:users, :files_attachments]
+ self.includes = [files_attachments: :blob, users: [:comments, :teams, post: [comments: :user]]]
  self.index_query = -> {
  query.unscoped
  }

spec/dummy/config/initializers/avo.rb

@@ -27,6 +27,7 @@
  params: request.params
  }
  end
+ config.locale = :en
  # config.raise_error_on_missing_policy = true
  # config.authorization_client = "Avo::Services::AuthorizationClients::ExtraPunditClient"
 

spec/features/action_icon_and_divider_spec.rb

@@ -12,7 +12,7 @@
  expect(page).to have_css("path[stroke-linecap='round'][stroke-linejoin='round'][d*='M3.055 11']")
  expect(page).to have_css("path[stroke-linecap='round'][stroke-linejoin='round'][d*='M10.5 19.5']")
 
- expect(page).to have_css(".relative.col-span-full.border-t.border-gray-300.border-solid")
+ expect(page).to have_css("[data-component-name='avo/divider_component']")
  end
  end
 end

spec/features/avo/divider_spec.rb

@@ -10,15 +10,14 @@
 
  describe "Divider in actions" do
  it "renders divider without label" do
- dividers = page.all(".relative.col-span-full.border-t")
+ dividers = page.all("[data-component-name='avo/divider_component']")
  second_divider = dividers[1]
- expect(second_divider).to have_css(".absolute", text: "")
+ expect(second_divider).not_to have_selector(".absolute.inset-auto.rounded")
  end
 
  it "renders divider with label" do
- expect(page).to have_css ".relative.col-span-full.border-t"
- dividers = page.all(".relative.col-span-full.border-t")
- expect(dividers.first.find(".absolute").text.strip).to eq "Other actions"
+ dividers = page.all("[data-component-name='avo/divider_component']")
+ expect(dividers.first.find(".absolute.inset-auto.rounded").text.strip).to eq "Other actions"
  expect(page).to have_content "Other actions"
  end
  end