mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-03 12:37:56 +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>
81 lines
2.5 KiB
Vue
81 lines
2.5 KiB
Vue
<script setup>
|
|
import { computed, onMounted } from 'vue';
|
|
import ArticleBlock from 'widget/components/pageComponents/Home/Article/ArticleBlock.vue';
|
|
import ArticleCardSkeletonLoader from 'widget/components/pageComponents/Home/Article/SkeletonLoader.vue';
|
|
import { useI18n } from 'vue-i18n';
|
|
import { useRouter } from 'vue-router';
|
|
import { useStore } from 'dashboard/composables/store';
|
|
import { useMapGetter } from 'dashboard/composables/store.js';
|
|
import { useDarkMode } from 'widget/composables/useDarkMode';
|
|
import { getMatchingLocale } from 'shared/helpers/portalHelper';
|
|
|
|
const store = useStore();
|
|
const router = useRouter();
|
|
const i18n = useI18n();
|
|
const { prefersDarkMode } = useDarkMode();
|
|
|
|
const portal = computed(() => window.chatwootWebChannel.portal);
|
|
|
|
const popularArticles = useMapGetter('article/popularArticles');
|
|
const articleUiFlags = useMapGetter('article/uiFlags');
|
|
|
|
const locale = computed(() => {
|
|
const { locale: selectedLocale } = i18n;
|
|
const { allowed_locales: allowedLocales } = portal.value.config;
|
|
return getMatchingLocale(selectedLocale.value, allowedLocales);
|
|
});
|
|
|
|
const fetchArticles = () => {
|
|
if (portal.value && !popularArticles.value.length) {
|
|
store.dispatch('article/fetch', {
|
|
slug: portal.value.slug,
|
|
locale: locale.value,
|
|
});
|
|
}
|
|
};
|
|
|
|
const openArticleInArticleViewer = link => {
|
|
const params = new URLSearchParams({
|
|
show_plain_layout: 'true',
|
|
theme: prefersDarkMode.value ? 'dark' : 'light',
|
|
...(locale.value && { locale: locale.value }),
|
|
});
|
|
|
|
// Combine link with query parameters
|
|
const linkToOpen = `${link}?${params.toString()}`;
|
|
router.push({ name: 'article-viewer', query: { link: linkToOpen } });
|
|
};
|
|
|
|
const viewAllArticles = () => {
|
|
const {
|
|
portal: { slug },
|
|
} = window.chatwootWebChannel;
|
|
openArticleInArticleViewer(`/hc/${slug}/${locale.value}`);
|
|
};
|
|
|
|
const hasArticles = computed(
|
|
() =>
|
|
!articleUiFlags.value.isFetching &&
|
|
!articleUiFlags.value.isError &&
|
|
!!popularArticles.value.length &&
|
|
!!locale.value
|
|
);
|
|
onMounted(() => fetchArticles());
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
v-if="portal && (articleUiFlags.isFetching || !!popularArticles.length)"
|
|
class="w-full shadow outline-1 outline outline-n-container rounded-xl bg-n-background dark:bg-n-solid-2 px-5 py-4"
|
|
>
|
|
<ArticleBlock
|
|
v-if="hasArticles"
|
|
:articles="popularArticles"
|
|
@view="openArticleInArticleViewer"
|
|
@view-all="viewAllArticles"
|
|
/>
|
|
<ArticleCardSkeletonLoader v-if="articleUiFlags.isFetching" />
|
|
</div>
|
|
<div v-else class="hidden" />
|
|
</template>
|