From 09545b1db50b819680d32d7200829de33571b7fa Mon Sep 17 00:00:00 2001
From: David Poindexter <dpoindexter@nvisionative.com>
Date: Wed, 10 Jun 2020 20:25:07 -0400
Subject: [PATCH 1/3] Change upgrade URL to extension manifest URL instead of
 the upgrade service redirect

---
 .../common/ExtensionDetailRow/index.jsx               | 11 ++++++++---
 .../common/ExtensionDetailRow/style.less              |  2 +-
 .../Components/Extensions/Dto/PackageInfoSlimDto.cs   |  4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
index 74b114b2d8a..24691ce1cd0 100644
--- a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
@@ -35,6 +35,13 @@ class ExtensionDetailRow extends Component {
         }
     }
 
+    getUpgradeDisplay() {
+        const {props} = this;
+        if (props._package.upgradeIndicator !== null) {
+            return <div className="upgrade-possible" onClick={() => window.open(props._package.url, "_blank", "noopener,noreferrer")}>Check</div>;
+        }
+    }
+
     /* eslint-disable react/no-danger */
     render() {
         const {props, state} = this;
@@ -55,9 +62,7 @@ class ExtensionDetailRow extends Component {
                         {this.getInUseDisplay(props._package.friendlyName, props._package.packageId)}
                     </GridCell>
                     <GridCell columnSize={ColumnSizes[4]}>
-                        <a href={props._package.upgradeUrl} target="_blank" rel="noopener noreferrer" aria-label="Update">
-                            <img src={props._package.upgradeIndicator} alt="Update"/>
-                        </a>
+                        {this.getUpgradeDisplay()}
                     </GridCell>
                     <GridCell columnSize={ColumnSizes[5]} style={{ paddingRight: 0 }}>
                         {(props._package.canDelete && props.isHost) && <div className="extension-action" dangerouslySetInnerHTML={{ __html: SvgIcons.TrashIcon }} onClick={props.onDelete}></div>}
diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
index bea5c486fc2..75fb7c4eda3 100644
--- a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
@@ -21,7 +21,7 @@
         font-weight: bold;
         margin-bottom: 3px;
     }
-    .in-use{
+    .in-use, .upgrade-possible {
         color: @curiousBlue;
         cursor: pointer;
     }
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs
index 845f2d75042..a19b9c6eba5 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs
@@ -47,6 +47,9 @@ public class PackageInfoSlimDto
         [JsonProperty("packageIcon")]
         public string PackageIcon { get; set; }
 
+        [JsonProperty("url")]
+        public string Url { get; set; }
+
         [JsonProperty("canDelete")]
         public bool CanDelete { get; set; }
 
@@ -70,6 +73,7 @@ public PackageInfoSlimDto(int portalId, PackageInfo package)
             UpgradeUrl = ExtensionsController.UpgradeRedirect(package.Version, package.PackageType, package.Name);
             UpgradeIndicator = ExtensionsController.UpgradeIndicator(package.Version, package.PackageType, package.Name);
             PackageIcon = ExtensionsController.GetPackageIcon(package);
+            Url = package.Url;
             CanDelete = package.PackageID != Null.NullInteger && !package.IsSystemPackage && PackageController.CanDeletePackage(package, PortalSettings.Current);
 
             if (package.PackageID != Null.NullInteger)

From 925d6fc02f1866bfd8af5d6f952378f5019ac67a Mon Sep 17 00:00:00 2001
From: David Poindexter <dpoindexter@nvisionative.com>
Date: Wed, 10 Jun 2020 21:18:48 -0400
Subject: [PATCH 2/3] Add back in the version image from the Update Service

---
 .../common/ExtensionDetailRow/index.jsx               | 11 +++--------
 .../common/ExtensionDetailRow/style.less              |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
index 24691ce1cd0..b1d04328caf 100644
--- a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
@@ -35,13 +35,6 @@ class ExtensionDetailRow extends Component {
         }
     }
 
-    getUpgradeDisplay() {
-        const {props} = this;
-        if (props._package.upgradeIndicator !== null) {
-            return <div className="upgrade-possible" onClick={() => window.open(props._package.url, "_blank", "noopener,noreferrer")}>Check</div>;
-        }
-    }
-
     /* eslint-disable react/no-danger */
     render() {
         const {props, state} = this;
@@ -62,7 +55,9 @@ class ExtensionDetailRow extends Component {
                         {this.getInUseDisplay(props._package.friendlyName, props._package.packageId)}
                     </GridCell>
                     <GridCell columnSize={ColumnSizes[4]}>
-                        {this.getUpgradeDisplay()}
+                        <a href={props._package.url} target="_blank" rel="noopener noreferrer" aria-label="Update">
+                            <img src={props._package.upgradeIndicator} alt="Update"/>
+                        </a>
                     </GridCell>
                     <GridCell columnSize={ColumnSizes[5]} style={{ paddingRight: 0 }}>
                         {(props._package.canDelete && props.isHost) && <div className="extension-action" dangerouslySetInnerHTML={{ __html: SvgIcons.TrashIcon }} onClick={props.onDelete}></div>}
diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
index 75fb7c4eda3..bea5c486fc2 100644
--- a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
@@ -21,7 +21,7 @@
         font-weight: bold;
         margin-bottom: 3px;
     }
-    .in-use, .upgrade-possible {
+    .in-use{
         color: @curiousBlue;
         cursor: pointer;
     }

From c1955b1b8415ed277d8c1dfc604a4348d157fb57 Mon Sep 17 00:00:00 2001
From: David Poindexter <dpoindexter@nvisionative.com>
Date: Wed, 10 Jun 2020 21:25:14 -0400
Subject: [PATCH 3/3] Add back in the version image from the Update Service

---
 .../InstalledExtensions/common/ExtensionDetailRow/index.jsx     | 2 +-
 .../InstalledExtensions/common/ExtensionDetailRow/style.less    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
index b1d04328caf..c7d1b3b857d 100644
--- a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
@@ -56,7 +56,7 @@ class ExtensionDetailRow extends Component {
                     </GridCell>
                     <GridCell columnSize={ColumnSizes[4]}>
                         <a href={props._package.url} target="_blank" rel="noopener noreferrer" aria-label="Update">
-                            <img src={props._package.upgradeIndicator} alt="Update"/>
+                            <img src={props._package.upgradeIndicator} alt="Update" />
                         </a>
                     </GridCell>
                     <GridCell columnSize={ColumnSizes[5]} style={{ paddingRight: 0 }}>
diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
index bea5c486fc2..9d4a19f545b 100644
--- a/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
+++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
@@ -21,7 +21,7 @@
         font-weight: bold;
         margin-bottom: 3px;
     }
-    .in-use{
+    .in-use {
         color: @curiousBlue;
         cursor: pointer;
     }