Diplomarbeit-Absolventenverein/oqtane.framework
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'oqtane/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer 2023-07-17 11:01:10 +02:00
commit 6b16808207
5 changed files with 117 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,56 +99,64 @@ else
} }
@code { @code {
private List<Language> _languages; private List<Language> _languages;
private List<Package> _packages; private List<Package> _packages;
private Package _package; private Package _package;
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
await GetLanguages(); await GetLanguages();
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{ {
_packages = await PackageService.GetPackagesAsync("translation"); _packages = await PackageService.GetPackagesAsync("translation");
} }
} }
private async Task GetLanguages() private async Task GetLanguages()
{ {
_languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId); _languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
} }
private async Task DeleteLanguage(Language language) private async Task DeleteLanguage(Language language)
{ {
try try
{ {
await LanguageService.DeleteLanguageAsync(language.LanguageId); await LanguageService.DeleteLanguageAsync(language.LanguageId);
await logger.LogInformation("Language Deleted {Language}", language); await logger.LogInformation("Language Deleted {Language}", language);
await GetLanguages(); await GetLanguages();
StateHasChanged(); StateHasChanged();
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Language {Language} {Error}", language, ex.Message); await logger.LogError(ex, "Error Deleting Language {Language} {Error}", language, ex.Message);
AddModuleMessage(Localizer["Error.Language.Delete"], MessageType.Error); AddModuleMessage(Localizer["Error.Language.Delete"], MessageType.Error);
} }
} }
private Package TranslationAvailable(string code, string version) private Package TranslationAvailable(string code, string version)
{ {
return _packages?.FirstOrDefault(item => item.PackageId == (Constants.PackageId + "." + code)); return _packages?.FirstOrDefault(item => item.PackageId == (Constants.PackageId + "." + code));
} }
private async Task GetPackage(string code, string version) private async Task GetPackage(string code, string version)
{ {
try try
{ {
_package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version); _package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version);
StateHasChanged(); if (_package != null)
} {
StateHasChanged();
}
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);
AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
}
}
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version); await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);

7
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -217,8 +217,13 @@
_packagelicense = package.License.Replace("\n", "<br />"); _packagelicense = package.License.Replace("\n", "<br />");
} }
_packageversion = package.Version; _packageversion = package.Version;
StateHasChanged();
}
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
} }
StateHasChanged();
} }
catch (Exception ex) catch (Exception ex)
{ {

100
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -319,55 +319,63 @@
AddModuleMessage(Localizer["Message.DuplicateName"], MessageType.Warning); AddModuleMessage(Localizer["Message.DuplicateName"], MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message); await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error); AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error);
} }
} }
else else
{ {
AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
} }
} }
private void HideModal() private void HideModal()
{ {
_package = null; _package = null;
StateHasChanged(); StateHasChanged();
} }
private string TranslationAvailable(string packagename, string version) private string TranslationAvailable(string packagename, string version)
{ {
if (_packages != null) if (_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)
{ {
if (string.IsNullOrEmpty(version)) if (string.IsNullOrEmpty(version))
{ {
return "install"; return "install";
} }
else else
{ {
if (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0) if (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
{ {
return "upgrade"; return "upgrade";
} }
} }
} }
} }
return ""; return "";
} }
private async Task GetPackage(string packagename) private async Task GetPackage(string packagename)
{ {
var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version; var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
try try
{ {
_package = await PackageService.GetPackageAsync(packagename, version); _package = await PackageService.GetPackageAsync(packagename, version);
StateHasChanged(); if (_package != null)
} {
StateHasChanged();
}
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", packagename, version);
AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
}
}
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packagename, version); await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packagename, version);

7
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -217,8 +217,13 @@
} }
_packageid = package.PackageId; _packageid = package.PackageId;
_version = package.Version; _version = package.Version;
StateHasChanged();
}
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
} }
StateHasChanged();
} }
catch (Exception ex) catch (Exception ex)
{ {

18
Oqtane.Server/Controllers/PackageController.cs
View File

@ -45,16 +45,7 @@ namespace Oqtane.Controllers
client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value); client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version)); client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}"); packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}");
if (packages != null) }
{
var installationid = _configManager.GetInstallationId();
foreach (var _package in packages)
{
_package.PaymentUrl = _package.PaymentUrl.Replace("{InstallationId}", installationid);
_package.SupportUrl = _package.SupportUrl.Replace("{InstallationId}", installationid);
}
}
}
} }
return packages; return packages;
} }
@ -73,13 +64,6 @@ namespace Oqtane.Controllers
client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value); client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version)); client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}"); package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}");
if (package != null)
{
var installationid = _configManager.GetInstallationId();
package.PaymentUrl = package.PaymentUrl.Replace("{InstallationId}", installationid);
package.SupportUrl = package.SupportUrl.Replace("{InstallationId}", installationid);
}
} }
if (package != null) if (package != null)