From faf11c43ae8de5a28053d06509dd1a5f1d691543 Mon Sep 17 00:00:00 2001 From: Tauqeer Haider Date: Wed, 22 Jul 2020 16:06:26 +0000 Subject: [PATCH 1/2] Prevented unnecessary call to getCultureList method --- .../components/siteLanguageSelector/index.jsx | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx index 0c0a65a74c2..0cf32cdaf40 100644 --- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx +++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx @@ -65,35 +65,37 @@ class SiteLanguageSelector extends Component { onSiteChange(event) { let {state, props} = this; - props.dispatch(SearchActions.getCultureList(event.value, () => { - let culture = this.validateCultureCode(); - if (state.cultureCode !== culture) { - this.setState({ - portalId: event.value, - cultureCode: culture - }); - this.triggerEvent("portalIdCultureCodeChanged", - { + if(event.value !== state.portalId){ + props.dispatch(SearchActions.getCultureList(event.value, () => { + let culture = this.validateCultureCode(); + if (state.cultureCode !== culture) { + this.setState({ portalId: event.value, - cultureCode: culture, - referrer: props.referrer, - referrerText: props.referrerText, - backToReferrerFunc: props.backToReferrerFunc + cultureCode: culture }); - } - else { - this.setState({ - portalId: event.value - }); - this.triggerEvent("portalIdChanged", - { - portalId: event.value, - referrer: props.referrer, - referrerText: props.referrerText, - backToReferrerFunc: props.backToReferrerFunc + this.triggerEvent("portalIdCultureCodeChanged", + { + portalId: event.value, + cultureCode: culture, + referrer: props.referrer, + referrerText: props.referrerText, + backToReferrerFunc: props.backToReferrerFunc + }); + } + else { + this.setState({ + portalId: event.value }); - } - })); + this.triggerEvent("portalIdChanged", + { + portalId: event.value, + referrer: props.referrer, + referrerText: props.referrerText, + backToReferrerFunc: props.backToReferrerFunc + }); + } + })); + } } onLanguageChange(event) { From 936c9945ae1b5b1161ea4a9ccb4e8e38cc453734 Mon Sep 17 00:00:00 2001 From: Tauqeer Haider Date: Thu, 23 Jul 2020 10:02:08 +0000 Subject: [PATCH 2/2] inverted condition to reduce nesting --- .../components/siteLanguageSelector/index.jsx | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx index 0cf32cdaf40..3f4e06022e3 100644 --- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx +++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteLanguageSelector/index.jsx @@ -65,37 +65,40 @@ class SiteLanguageSelector extends Component { onSiteChange(event) { let {state, props} = this; - if(event.value !== state.portalId){ - props.dispatch(SearchActions.getCultureList(event.value, () => { - let culture = this.validateCultureCode(); - if (state.cultureCode !== culture) { - this.setState({ + + if(event.value === state.portalId){ + return; + } + + props.dispatch(SearchActions.getCultureList(event.value, () => { + let culture = this.validateCultureCode(); + if (state.cultureCode !== culture) { + this.setState({ + portalId: event.value, + cultureCode: culture + }); + this.triggerEvent("portalIdCultureCodeChanged", + { portalId: event.value, - cultureCode: culture + cultureCode: culture, + referrer: props.referrer, + referrerText: props.referrerText, + backToReferrerFunc: props.backToReferrerFunc }); - this.triggerEvent("portalIdCultureCodeChanged", - { - portalId: event.value, - cultureCode: culture, - referrer: props.referrer, - referrerText: props.referrerText, - backToReferrerFunc: props.backToReferrerFunc - }); - } - else { - this.setState({ - portalId: event.value + } + else { + this.setState({ + portalId: event.value + }); + this.triggerEvent("portalIdChanged", + { + portalId: event.value, + referrer: props.referrer, + referrerText: props.referrerText, + backToReferrerFunc: props.backToReferrerFunc }); - this.triggerEvent("portalIdChanged", - { - portalId: event.value, - referrer: props.referrer, - referrerText: props.referrerText, - backToReferrerFunc: props.backToReferrerFunc - }); - } - })); - } + } + })); } onLanguageChange(event) {