From 9db724f5e18354caad0b52c62d89ab82606c9788 Mon Sep 17 00:00:00 2001
From: berkarslan-cs <berkarslan.cs@gmail.com>
Date: Thu, 26 Dec 2019 12:24:02 +0300
Subject: [PATCH] DNN-29164 - Selected page id fix for Pages

---
 .../ClientSide/Pages.Web/src/components/App.jsx             | 2 +-
 Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx
index b3172ce7aac..c5b76841d40 100644
--- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx
+++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx
@@ -93,7 +93,7 @@ class App extends Component {
         window.dnn.utility.setConfirmationDialogPosition();
         window.dnn.utility.closeSocialTasks();
         this.props.getPageList().then(() => {
-            const selectedPageId = utils.getCurrentPageId();
+            const selectedPageId = utils.getSelectedPageId() || utils.getCurrentPageId();
             selectedPageId && !utils.getIsAdminHostSystemPage() && this.onLoadPage(selectedPageId);
         
             if (viewName === "edit") {
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js b/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
index f22f172530b..8b331582a7e 100644
--- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
+++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
@@ -99,6 +99,11 @@ function getCurrentPageId() {
     return parseInt(config.tabId);
 }
 
+function getSelectedPageId() {
+    checkInit();
+    return viewParams && viewParams.pageId ? parseInt(viewParams.pageId) : null;
+}
+
 function getViewName() {
     checkInit();
     return viewName;
@@ -211,6 +216,7 @@ const utils = {
     getUtilities,
     getModuleName,
     getCurrentPageId,
+    getSelectedPageId,
     getViewName,
     closePersonaBar,
     getViewParams,