kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve System Update user experience

Browse Source
This commit is contained in:
Shaun Walker 2021-06-02 19:22:20 -04:00
parent 3db12a225b
commit dd9f2e6675
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Oqtane.Client/Modules/Admin/Upgrade/Index.razor
View File

@ -12,8 +12,9 @@
<TabPanel Name="Download" ResourceKey="Download"> <TabPanel Name="Download" ResourceKey="Download">
@if (_upgradeavailable) @if (_upgradeavailable)
{ {
<ModuleMessage Type="MessageType.Info" Message="Select The Upgrade Button To Install a New Framework Version"></ModuleMessage> <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-success" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@Localizer["Upgrade To"] @_package.Version</button> <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 else
{ {
@ -21,17 +22,18 @@
} }
</TabPanel> </TabPanel>
<TabPanel Name="Upload" ResourceKey="Upload"> <TabPanel Name="Upload" ResourceKey="Upload">
<ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package And Then Select Upgrade"></ModuleMessage>
<table class="table table-borderless"> <table class="table table-borderless">
<tr> <tr>
<td> <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>
<td> <td>
<FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" /> <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
</td> </td>
</tr> </tr>
</table> </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> </TabPanel>
</TabStrip> </TabStrip>
} }
@ -86,17 +88,14 @@
{ {
try try
{ {
ShowProgressIndicator();
await PackageService.DownloadPackageAsync(packageid, version, "Packages"); await PackageService.DownloadPackageAsync(packageid, version, "Packages");
await PackageService.DownloadPackageAsync("Oqtane.Upgrade", version, "Packages"); await PackageService.DownloadPackageAsync("Oqtane.Upgrade", version, "Packages");
var interop = new Interop(JSRuntime); AddModuleMessage(Localizer["Framework Downloaded Successfully... Please Select Upgrade To Complete the Process"], MessageType.Success);
await interop.RedirectBrowser(NavigateUrl(), 10);
await InstallationService.Upgrade();
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message); await logger.LogError(ex, "Error Downloading Framework Package {Error}", ex.Message);
AddModuleMessage(Localizer["Error Downloading Framework"], MessageType.Error); AddModuleMessage(Localizer["Error Downloading Framework Package"], MessageType.Error);
} }
} }
} }

2
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -221,7 +221,7 @@ namespace Oqtane.Infrastructure
{ {
// get package with highest version // get package with highest version
string packagename = ""; string packagename = "";
string[] packages = Directory.GetFiles(folder, "Oqtane.Framework.*.nupkg"); string[] packages = Directory.GetFiles(folder, Constants.PackageId + ".*.nupkg");
if (packages.Length > 0) if (packages.Length > 0)
{ {
packagename = packages[packages.Length - 1]; // use highest version packagename = packages[packages.Length - 1]; // use highest version