FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix RVO redirect URL for locale (without loosing queryparms)
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Peter (extern) 2025-03-13 08:38:24 +01:00
parent 758613aa12
commit 39c619a837
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/common/src/fm/effects/app-common.effects.ts
View File

@ -49,7 +49,7 @@ export class AppCommonEffects {
switchMap((action) => { switchMap((action) => {
return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe( return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
switchMap(([user,userInfo]) => { switchMap(([user,userInfo]) => {
if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) if (this.location.path === 'localhost' || user.language === undefined || user.language === this.locale)
{ {
return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo)) return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
} }
@ -63,8 +63,8 @@ export class AppCommonEffects {
ofType(appCommonActions.SWITCHLANGUAGE), ofType(appCommonActions.SWITCHLANGUAGE),
switchMap((action) => { switchMap((action) => {
const a = action as appCommonActions.SwitchLanguage; const a = action as appCommonActions.SwitchLanguage;
if (location.pathname.includes(`/${this.locale}/`)) { if (location.href.includes(`/${this.locale}/`)) {
const newPath = location.pathname.replace(`/${this.locale}/`, `/${a.locale}/`); const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
location.replace(newPath); location.replace(newPath);
} }
return of(undefined); return of(undefined);