mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-18 03:55:02 +00:00
# Pull Request Template
## Description
This PR includes the following improvements:
* **Popular Articles Locale Selection based on Widget Locale**
* Implements priority-based locale matching:
* Exact locale match (e.g., "fr" === "fr")
* Base language match (e.g., "fr" when selected is "fr_CA")
* Variant match (e.g., "fr_BE" when selected is "fr")
* Removes default locale fallback - if no locale match is found, popular
articles section is hidden.
* Fixed **API** filter issue where the locale parameter was previously
ignored
* Hides Popular Articles section completely when no locale match is
found and Only shows relevant articles in the user's language
* **RTL Direction Handling Improvements**
* Now directly reads the `lang` attribute from HTML element `<html
lang="en">` instead of relying on `.locale-switcher` and sets direction
attribute based on language.
* Adds `data-dir-applied` attribute to prevent overlapping direction
settings between global helpers and components (eg case: Insert article
in editor dashboard)
* Update `IframeLoader.vue` to Composition API and improve the **dir**
logic
Fixes
1.
[CW-4505](https://linear.app/chatwoot/issue/CW-4505/popular-articles-not-displayed-based-on-user-locale-in-live-chat),
https://github.com/chatwoot/chatwoot/issues/11745
2. RTL direction is not working in widget article view after merging
this PR https://github.com/chatwoot/chatwoot/pull/11692
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
### Loom video
**Popular Articles**
https://www.loom.com/share/7cecbaaa77eb48e19263398b6ba8ddef?sid=a2452b8e-7d7e-46a3-b5c8-aed5ab5bc801
**RTL improvements**
https://www.loom.com/share/3ccad77174a0412097e802641df5f3e0?sid=e10ac57f-5c49-4084-84d3-5ad58aee54fa
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---------
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
87 lines
2.6 KiB
Ruby
87 lines
2.6 KiB
Ruby
class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
|
|
before_action :ensure_custom_domain_request, only: [:show, :index]
|
|
before_action :portal
|
|
before_action :set_category, except: [:index, :show, :tracking_pixel]
|
|
before_action :set_article, only: [:show]
|
|
layout 'portal'
|
|
|
|
def index
|
|
@articles = @portal.articles.published.includes(:category, :author)
|
|
|
|
@articles = @articles.where(locale: permitted_params[:locale]) if permitted_params[:locale].present?
|
|
|
|
@articles_count = @articles.count
|
|
|
|
search_articles
|
|
order_by_sort_param
|
|
limit_results
|
|
end
|
|
|
|
def show; end
|
|
|
|
def tracking_pixel
|
|
@article = @portal.articles.find_by(slug: permitted_params[:article_slug])
|
|
return head :not_found unless @article
|
|
|
|
@article.increment_view_count if @article.published?
|
|
|
|
# Serve the 1x1 tracking pixel with 24-hour private cache
|
|
# Private cache bypasses CDN but allows browser caching to prevent duplicate views from same user
|
|
expires_in 24.hours, public: false
|
|
response.headers['Content-Type'] = 'image/png'
|
|
|
|
pixel_path = Rails.public_path.join('assets/images/tracking-pixel.png')
|
|
send_file pixel_path, type: 'image/png', disposition: 'inline'
|
|
end
|
|
|
|
private
|
|
|
|
def limit_results
|
|
return if list_params[:per_page].blank?
|
|
|
|
per_page = [list_params[:per_page].to_i, 100].min
|
|
per_page = 25 if per_page < 1
|
|
@articles = @articles.page(list_params[:page]).per(per_page)
|
|
end
|
|
|
|
def search_articles
|
|
@articles = @articles.search(list_params) if list_params.present?
|
|
end
|
|
|
|
def order_by_sort_param
|
|
@articles = if list_params[:sort].present? && list_params[:sort] == 'views'
|
|
@articles.order_by_views
|
|
else
|
|
@articles.order_by_position
|
|
end
|
|
end
|
|
|
|
def set_article
|
|
@article = @portal.articles.find_by(slug: permitted_params[:article_slug])
|
|
@parsed_content = render_article_content(@article.content)
|
|
end
|
|
|
|
def set_category
|
|
return if permitted_params[:category_slug].blank?
|
|
|
|
@category = @portal.categories.find_by!(
|
|
slug: permitted_params[:category_slug],
|
|
locale: permitted_params[:locale]
|
|
)
|
|
end
|
|
|
|
def list_params
|
|
params.permit(:query, :locale, :sort, :status, :page, :per_page)
|
|
end
|
|
|
|
def permitted_params
|
|
params.permit(:slug, :category_slug, :locale, :id, :article_slug)
|
|
end
|
|
|
|
def render_article_content(content)
|
|
ChatwootMarkdownRenderer.new(content).render_article
|
|
end
|
|
end
|
|
|
|
Public::Api::V1::Portals::ArticlesController.prepend_mod_with('Public::Api::V1::Portals::ArticlesController')
|