KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Refactor urlParamsHelper.js (#5639)

Browse source
This commit is contained in:
David Kubeš 2022-10-19 22:20:40 +02:00 • committed by GitHub
parent 6bc34db932
commit c542d2e0ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/widget/helpers/specs/urlParamsHelper.spec.js
View file

@ -31,7 +31,7 @@ describe('#getLocale', () => {
expect(getLocale('?test=1&cw_conv=2&website_token=3&locale=fr')).toEqual( expect(getLocale('?test=1&cw_conv=2&website_token=3&locale=fr')).toEqual(
'fr' 'fr'
); );
expect(getLocale('')).toEqual(undefined); expect(getLocale('')).toEqual(null);
}); });
}); });

26
app/javascript/widget/helpers/urlParamsHelper.js
View file

@ -1,22 +1,13 @@
export const buildSearchParamsWithLocale = search => { export const buildSearchParamsWithLocale = search => {
const locale = window.WOOT_WIDGET.$root.$i18n.locale; const locale = window.WOOT_WIDGET.$root.$i18n.locale;
if (search) { const params = new URLSearchParams(search);
search = `${search}&locale=${locale}`; params.append('locale', locale);
} else {
search = `?locale=${locale}`; return `?${params}`;
}
return search;
}; };
export const getLocale = (search = '') => { export const getLocale = (search = '') => {
const searchParamKeyValuePairs = search.split('&'); return new URLSearchParams(search).get('locale');
return searchParamKeyValuePairs.reduce((acc, keyValuePair) => {
const [key, value] = keyValuePair.split('=');
if (key === 'locale') {
return value;
}
return acc;
}, undefined);
}; };
export const buildPopoutURL = ({ export const buildPopoutURL = ({
@ -25,5 +16,10 @@ export const buildPopoutURL = ({
websiteToken, websiteToken,
locale, locale,
}) => { }) => {
return `${origin}/widget?cw_conversation=${conversationCookie}&website_token=${websiteToken}&locale=${locale}`; const popoutUrl = new URL('/widget', origin);
popoutUrl.searchParams.append('cw_conversation', conversationCookie);
popoutUrl.searchParams.append('website_token', websiteToken);
popoutUrl.searchParams.append('locale', locale);
return popoutUrl.toString();
}; };