diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index 68af3ec7..4428cabf 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -91,9 +91,9 @@

@_productname

- @if (!string.IsNullOrEmpty(_license)) + @if (!string.IsNullOrEmpty(_packagelicense)) { - @((MarkupString)_license) + @((MarkupString)_packagelicense) } else { @@ -119,9 +119,9 @@ private string _price = "free"; private string _search = ""; private string _productname = ""; - private string _license = ""; private string _packageid = ""; - private string _version = ""; + private string _packagelicense = ""; + private string _packageversion = ""; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; @@ -198,7 +198,7 @@ private void HideModal() { _productname = ""; - _license = ""; + _packagelicense = ""; StateHasChanged(); } @@ -210,12 +210,12 @@ if (package != null) { _productname = package.Name; + _packageid = package.PackageId; if (!string.IsNullOrEmpty(package.License)) { - _license = package.License.Replace("\n", "
"); + _packagelicense = package.License.Replace("\n", "
"); } - _packageid = package.PackageId; - _version = package.Version; + _packageversion = package.Version; } StateHasChanged(); } @@ -230,16 +230,16 @@ { try { - await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder); - await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); + await PackageService.DownloadPackageAsync(_packageid, _packageversion, Constants.PackagesFolder); + await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion); AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success); _productname = ""; - _license = ""; + _packagelicense = ""; StateHasChanged(); } catch (Exception ex) { - await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); + await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _packageversion); AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); } } @@ -253,7 +253,7 @@ } catch (Exception ex) { - await logger.LogError(ex, "Error Installing Module"); + await logger.LogError(ex, "Error Installing Modules"); } } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index 6b9f493d..e514c2ec 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -1,6 +1,7 @@ @namespace Oqtane.Modules.Admin.ModuleDefinitions @inherits ModuleBase @inject IModuleDefinitionService ModuleDefinitionService +@inject IPackageService PackageService @inject NavigationManager NavigationManager @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer @@ -80,7 +81,13 @@
- + +
+ + @SharedLocalizer["Cancel"] +
+
+
@@ -88,13 +95,88 @@
+ + @SharedLocalizer["Cancel"] + + @if (_packages != null) + { + if (_packages.Count > 0) + { + + + +

@context.Name

  by:  @context.Owner
+ @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)
+ @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"]  |   + @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy")  |   + @SharedLocalizer["Search.Version"]: @context.Version + @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "  |  " + SharedLocalizer["Search.Source"] + ": " + new Uri(context.PackageUrl).Host + "" : "")) + @((MarkupString)(context.TrialPeriod > 0 ? "  |  " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : "")) + + + @if (context.Price != null && !string.IsNullOrEmpty(context.PackageUrl)) + { + + } + + + @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl)) + { + @context.Price.Value.ToString("$#,##0.00") + } + else + { + + } + + + + + } + else + { +
+
+ @Localizer["Search.NoResults"] +
+ } + } + - -@SharedLocalizer["Cancel"] -
-
- + +@if (_productname != "") +{ +
+ +
+} @code { private ElementReference form; @@ -121,6 +203,12 @@ private PermissionGrid _permissionGrid; #pragma warning restore 649 + private List _packages; + private string _productname = ""; + private string _packageid = ""; + private string _packagelicense = ""; + private string _packageversion = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() @@ -147,7 +235,9 @@ _createdon = moduleDefinition.CreatedOn; _modifiedby = moduleDefinition.ModifiedBy; _modifiedon = moduleDefinition.ModifiedOn; - } + + _packages = await PackageService.GetPackagesAsync("translation", "", "", moduleDefinition.PackageName); + } } catch (Exception ex) { @@ -193,4 +283,66 @@ AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); } } + + private void HideModal() + { + _productname = ""; + _packagelicense = ""; + StateHasChanged(); + } + + private async Task GetPackage(string packageid, string version) + { + try + { + var package = await PackageService.GetPackageAsync(packageid, version); + if (package != null) + { + _productname = package.Name; + _packageid = package.PackageId; + if (!string.IsNullOrEmpty(package.License)) + { + _packagelicense = package.License.Replace("\n", "
"); + } + _packageversion = package.Version; + } + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); + AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error); + } + } + + private async Task DownloadTranslation() + { + try + { + await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder); + await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); + AddModuleMessage(Localizer["Success.Translation.Download"], MessageType.Success); + _productname = ""; + _packagelicense = ""; + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); + AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error); + } + } + + private async Task InstallTranslations() + { + try + { + await PackageService.InstallPackagesAsync(); + AddModuleMessage(string.Format(Localizer["Success.Translation.Install"], NavigateUrl("admin/system")), MessageType.Success); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Installing Translations"); + } + } } diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx index 8150f4eb..b7ef70df 100644 --- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx +++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx @@ -201,4 +201,19 @@ Package Name: + + Error Downloading Translation + + + No Translations Exist For This Module Or Package Service Is Disabled + + + Translation Downloaded Successfully. Click Install To Complete Installation. + + + Translation Installed Successfully. You Must <a href={0}>Restart</a> Your Application To Apply These Changes. + + + Translations + \ No newline at end of file diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index a402d890..72e013b1 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -268,7 +268,7 @@ namespace Microsoft.Extensions.DependencyInjection if (implementationType.AssemblyQualifiedName != null) { var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}")); - services.AddScoped(serviceType ?? implementationType, implementationType); + services.AddTransient(serviceType ?? implementationType, implementationType); } }