From 95cb5dd66c465d499cb218fd56d8d2089e085647 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Tue, 15 Apr 2025 09:20:18 -0400
Subject: [PATCH] UX improvements for System Update

---
 .../Modules/Admin/Upgrade/Index.razor         | 22 ++++++++++++-------
 .../Modules/Admin/Upgrade/Index.resx          |  7 ++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index 31fee382..aeda1366 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -15,7 +15,7 @@
             {
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will result in a better experience in some environments." ResourceKey="Backup">Backup Files? </Label>
+                        <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
                         <div class="col-sm-9">
                             <select id="backup" class="form-select" @bind="@_backup">
                                 <option value="True">@SharedLocalizer["Yes"]</option>
@@ -24,10 +24,15 @@
                         </div>
                     </div>
                 </div>
-                <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
-                <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
-                <br /><br />
-                <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
+                <br />
+                @if (!_downloaded)
+                {
+                    <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
+                }
+                else
+                {
+                    <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
+                }
             }
             else
             {
@@ -43,7 +48,7 @@
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will result in a better experience in some environments." ResourceKey="Backup">Backup Files? </Label>
+                    <Label Class="col-sm-3" HelpText="Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade." ResourceKey="Backup">Backup Files? </Label>
                     <div class="col-sm-9">
                         <select id="backup" class="form-select" @bind="@_backup">
                             <option value="True">@SharedLocalizer["Yes"]</option>
@@ -52,15 +57,15 @@
                     </div>
                 </div>
             </div>
+            <br />
             <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
-            <br /><br />
-            <ModuleMessage Type="MessageType.Info" Message=@Localizer["MessageUpgrade.Text"]></ModuleMessage>
         </TabPanel>
     </TabStrip>
 }
 
 @code {
     private bool _initialized = false;
+    private bool _downloaded = false;
     private Package _package;
     private bool _upgradeavailable = false;
     private string _backup = "True";
@@ -125,6 +130,7 @@
             ShowProgressIndicator();
             await PackageService.DownloadPackageAsync(packageid, version);
             await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version);
+            _downloaded = true;
             HideProgressIndicator();
             AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }
diff --git a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx
index e609f42a..a38e830c 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx
@@ -124,7 +124,7 @@
     <value>Error Downloading Framework Package</value>
   </data>
   <data name="Framework.HelpText" xml:space="preserve">
-    <value>Upload a framework package and select Install to complete the installation</value>
+    <value>Upload A Framework Package (Oqtane.Framework.#.#.#.nupkg) And Then Select Upgrade</value>
   </data>
   <data name="Framework.Text" xml:space="preserve">
     <value>Framework: </value>
@@ -144,9 +144,6 @@
   <data name="Message.Text" xml:space="preserve">
     <value>Framework Is Already Up To Date</value>
   </data>
-  <data name="MessageUpgrade.Text" xml:space="preserve">
-    <value>Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade</value>
-  </data>
   <data name="Localhost.Text" xml:space="preserve">
     <value>You Cannot Perform A System Update In A Development Environment</value>
   </data>
@@ -157,6 +154,6 @@
     <value>Backup Files?</value>
   </data>
   <data name="Backup.HelpText" xml:space="preserve">
-    <value>Specify if you want to backup files during the upgrade process. Disabling this option will result in a better experience in some environments.</value>
+    <value>Specify if you want to backup files during the upgrade process. Disabling this option will reduce the time required for the upgrade.</value>
   </data>
 </root>
\ No newline at end of file