Skip to content

Commit

Permalink
Merge pull request #136 from MadhuMosip/MOSIP-32336
Browse files Browse the repository at this point in the history
MOSIP-34393 removed warning popup when change the language
  • Loading branch information
ckm007 authored Jul 30, 2024
2 parents 943b226 + 93da035 commit eb42091
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import langIcon from './assets/language_FILL0_wght300_GRAD0_opsz24.svg';
import polygon from './assets/Polygon.svg';
import polygonRev from './assets/Polygon2.svg';
import rightTick from './assets/check_circle_FILL0_wght400_GRAD0_opsz48.svg';
import closeIcon from './assets/close_icon.svg'
import closeIcon from './assets/close_icon.svg';

export default function Template(props: TemplateProps<KcContext, I18n>) {
const {
Expand Down Expand Up @@ -54,6 +54,9 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
});

useEffect(() => {
if(localStorage.getItem("isLocaleopen")){
localStorage.removeItem("isLocaleopen")
}
console.log(`Value of MY_ENV_VARIABLE on the Keycloak server: "${kcContext.properties.MY_ENV_VARIABLE}"`);
}, []);

Expand All @@ -69,7 +72,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
<div> {realm.internationalizationEnabled && (assert(locale !== undefined), true) && locale.supported.length > 1 && (
<div id="kc-locale">
<div id="kc-locale-wrapper" className={getClassName("kcLocaleWrapperClass")}>
<div onMouseOver={() => { setLocaleOpen(true) }} onMouseOut={() => { setLocaleOpen(false) }} className="kc-dropdown flex flex-row content-center" id="kc-locale-dropdown">
<div onMouseOver={() => { setLocaleOpen(true); localStorage.setItem("isLocaleopen", 'true') }} onMouseOut={() => { setLocaleOpen(false); localStorage.removeItem("isLocaleopen") }} className="kc-dropdown flex flex-row content-center" id="kc-locale-dropdown">
<img alt="langIcon" src={langIcon} />
<a className="font-semibold text-xl mx-2" href="#" id="kc-current-locale-link">
{labelBySupportedLanguageTag[currentLanguageTag]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
});

window.onbeforeunload = function() {
if(!isReloadBtn){
if(!isReloadBtn && !localStorage.getItem("isLocaleopen")){
return 'Do you want to leave this page?'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
const [isReloadBtn, setReloadBtn] = useState(false);

window.onbeforeunload = function() {
if(!isReloadBtn){
if(!isReloadBtn && !localStorage.getItem("isLocaleopen")){
return 'Do you want to leave this page?'
}
}
Expand Down Expand Up @@ -106,7 +106,7 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
<div className={(getClassName("kcFormOptionsWrapperClass"), 'text-center font-inter')}>
<span>
<p className="inline">{msg('rememberPW')}</p>
<a href={url.loginUrl} className="text-hLinkColor font-bold text-xl"> {msg("doLogIn")}</a>
<a href={url.loginUrl} onClick={() => setReloadBtn(true)} className="text-hLinkColor font-bold text-xl"> {msg("doLogIn")}</a>
</span>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
}

window.onbeforeunload = function() {
if(!isReloadBtn){
if(!isReloadBtn && !localStorage.getItem("isLocaleopen")){
return 'Do you want to leave this page?'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export default function Register(props: PageProps<Extract<KcContext, { pageId: "
})

window.onbeforeunload = function() {
if(!isReloadBtn){
if(!isReloadBtn && !localStorage.getItem("isLocaleopen")){
return 'Do you want to leave this page?'
}
}
Expand Down

0 comments on commit eb42091

Please sign in to comment.