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

refactor module upgrade logic, implement for themes and translations

Browse Source
This commit is contained in:
Shaun Walker 2022-04-27 19:29:29 -04:00
parent b6c4934123
commit e8464206e7
3 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Languages/Index.razor
View File

@ -84,7 +84,7 @@ else
var package = _packages.Where(item => item.PackageId == (Constants.PackageId + ".Client." + code)).FirstOrDefault(); var package = _packages.Where(item => item.PackageId == (Constants.PackageId + ".Client." + code)).FirstOrDefault();
if (package != null) if (package != null)
{ {
upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) > 0); upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0);
} }
} }

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

@ -50,9 +50,12 @@ else
@((MarkupString)PurchaseLink(context.PackageName)) @((MarkupString)PurchaseLink(context.PackageName))
</td> </td>
<td> <td>
@if (UpgradeAvailable(context.PackageName, context.Version, out var upgradeToVersion)) @{
var version = UpgradeAvailable(context.PackageName, context.Version);
}
@if (version != context.Version)
{ {
<button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, upgradeToVersion))>@SharedLocalizer["Upgrade"]</button> <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
} }
</td> </td>
</Row> </Row>
@ -103,21 +106,17 @@ else
return link; return link;
} }
private bool UpgradeAvailable(string packagename, string version, out string upgradeToVersion) private string UpgradeAvailable(string packagename, string version)
{ {
var upgradeavailable = false;
upgradeToVersion = "";
if (!string.IsNullOrEmpty(packagename) && _packages != null) if (!string.IsNullOrEmpty(packagename) && _packages != null)
{ {
var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault(); var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
if (package != null) if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
{ {
upgradeToVersion = package.Version; return package.Version;
upgradeavailable = (Version.Parse(upgradeToVersion).CompareTo(Version.Parse(version)) > 0);
} }
} }
return upgradeavailable; return version;
} }
private async Task DownloadModule(string packagename, string version) private async Task DownloadModule(string packagename, string version)

16
Oqtane.Client/Modules/Admin/Themes/Index.razor
View File

@ -40,9 +40,12 @@ else
@((MarkupString)PurchaseLink(context.PackageName)) @((MarkupString)PurchaseLink(context.PackageName))
</td> </td>
<td> <td>
@if (UpgradeAvailable(context.PackageName, context.Version)) @{
var version = UpgradeAvailable(context.PackageName, context.Version);
}
@if (version != context.Version)
{ {
<button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, context.Version))>@SharedLocalizer["Upgrade"]</button> <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
} }
</td> </td>
<td></td> <td></td>
@ -94,18 +97,17 @@ else
return link; return link;
} }
private bool UpgradeAvailable(string packagename, string version) private string UpgradeAvailable(string packagename, string version)
{ {
var upgradeavailable = false;
if (!string.IsNullOrEmpty(packagename) && _packages != null) if (!string.IsNullOrEmpty(packagename) && _packages != null)
{ {
var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault(); var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
if (package != null) if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
{ {
upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); return package.Version;
} }
} }
return upgradeavailable; return version;
} }
private async Task DownloadTheme(string packagename, string version) private async Task DownloadTheme(string packagename, string version)