From dd9f2e6675e63be5506514def10dd6d4d2a9e325 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Wed, 2 Jun 2021 19:22:20 -0400
Subject: [PATCH] improve System Update user experience

---
 .../Modules/Admin/Upgrade/Index.razor         | 19 +++++++++----------
 .../Infrastructure/InstallationManager.cs     |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index 2e0104fe..88fcbeeb 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -12,8 +12,9 @@
         <TabPanel Name="Download" ResourceKey="Download">
             @if (_upgradeavailable)
             {
-                <ModuleMessage Type="MessageType.Info" Message="Select The Upgrade Button To Install a New Framework Version"></ModuleMessage>
-                <button type="button" class="btn btn-success" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@Localizer["Upgrade To"] @_package.Version</button>
+                <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Get a New Framework Package And Then Select Upgrade"></ModuleMessage>
+                <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@Localizer["Download"] @_package.Version</button>
+                <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
             }
             else
             {
@@ -21,17 +22,18 @@
             }
         </TabPanel>
         <TabPanel Name="Upload" ResourceKey="Upload">
+            <ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package And Then Select Upgrade"></ModuleMessage>
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label HelpText="Upload a framework package and select Install to complete the installation" ResourceKey="Framework">Framework: </Label>
+                        <Label HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
                     </td>
                     <td>
                         <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
                     </td>
                 </tr>
             </table>
-            <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Install"]</button>
+            <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
         </TabPanel>
     </TabStrip>
 }
@@ -86,17 +88,14 @@
     {
         try
         {
-            ShowProgressIndicator();
             await PackageService.DownloadPackageAsync(packageid, version, "Packages");
             await PackageService.DownloadPackageAsync("Oqtane.Upgrade", version, "Packages");
-            var interop = new Interop(JSRuntime);
-            await interop.RedirectBrowser(NavigateUrl(), 10);
-            await InstallationService.Upgrade();
+            AddModuleMessage(Localizer["Framework Downloaded Successfully... Please Select Upgrade To Complete the Process"], MessageType.Success);
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message);
-            AddModuleMessage(Localizer["Error Downloading Framework"], MessageType.Error);
+            await logger.LogError(ex, "Error Downloading Framework Package {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error Downloading Framework Package"], MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index 14f7806f..d40d63c1 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -221,7 +221,7 @@ namespace Oqtane.Infrastructure
             {
                 // get package with highest version
                 string packagename = "";
-                string[] packages = Directory.GetFiles(folder, "Oqtane.Framework.*.nupkg");
+                string[] packages = Directory.GetFiles(folder, Constants.PackageId + ".*.nupkg");
                 if (packages.Length > 0)
                 {
                     packagename = packages[packages.Length - 1]; // use highest version