From a1eb3251eab252b38119e4a9c11744da24279e9b Mon Sep 17 00:00:00 2001
From: Daniel Aguilera <daniel.aguilera@aurea.com>
Date: Wed, 8 Apr 2020 18:04:09 -0300
Subject: [PATCH] DNN-36093: fixed portal alias update on website change

---
 .../siteAliasSettings/siteAliases/index.jsx   | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteAliasSettings/siteAliases/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteAliasSettings/siteAliases/index.jsx
index 840680481bf..997dee7bf2e 100644
--- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteAliasSettings/siteAliases/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/siteAliasSettings/siteAliases/index.jsx
@@ -23,26 +23,11 @@ class SiteAliasesPanel extends Component {
 
     loadData() {
         const {props} = this;
-        if (props.siteAliases) {
-            if (props.portalId === undefined || props.siteAliases.PortalId === props.portalId) {
-                return false;
-            }
-            else {
-                return true;
-            }
-        }
-        else {
-            return true;
-        }
+        props.dispatch(SiteBehaviorActions.getSiteAliases(props.portalId));
     }
 
     componentDidMount() {
-        const {props} = this;
-
-        if (!this.loadData()) {
-            return;
-        }
-        props.dispatch(SiteBehaviorActions.getSiteAliases(props.portalId));
+        this.loadData();
     }
 
     componentDidUpdate(prevProps) {
@@ -59,6 +44,11 @@ class SiteAliasesPanel extends Component {
                 tableFields.push({ "name": resx.get("Primary.Header"), "id": "Primary" });
             }
             this.setState({tableFields});
+
+            if (!props.siteAliases ||
+                props.portalId !== undefined && props.siteAliases.PortalId !== props.portalId) {
+                this.loadData();
+            }
         }
     }