IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASC.Web.Core: WebPluginManager: small fixes

Browse Source
This commit is contained in:
Andrey Savihin 2023-09-19 14:06:04 +03:00
parent 8dc0507a03
commit c1a75f0ae2
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/storage.json
View File

@ -143,7 +143,7 @@
"virtualpath": "~/studio/webplugins",
"appendTenantId": false,
"disableMigrate": true,
"disableEncryption": true
"disableEncryption": true
}
]
}

10
web/ASC.Web.Api/Api/Settings/WebPluginsController.cs
View File

@ -81,15 +81,17 @@ public class WebPluginsController : BaseSettingsController
[HttpGet("webplugins")]
public async Task<IEnumerable<WebPluginDto>> GetWebPluginsAsync(bool? enabled = null)
{
var systemDtoPlugins = await _webPluginManager.GetSystemWebPluginsAsync<WebPluginDto>();
var outDto = await _webPluginManager.GetSystemWebPluginsAsync<WebPluginDto>();
if (enabled.HasValue)
{
outDto = outDto.Where(i => i.Enabled == enabled).ToList();
}
var dbPlugins = await _webPluginManager.GetWebPluginsAsync(Tenant.Id, enabled);
var dbDtoPlugins = _mapper.Map<IEnumerable<DbWebPlugin>, IEnumerable<WebPluginDto>>(dbPlugins);
var outDto = new List<WebPluginDto>();
outDto.AddRange(systemDtoPlugins.Where(i => !enabled.HasValue || i.Enabled == enabled));
outDto.AddRange(dbDtoPlugins);
if (outDto.Any())

1
web/ASC.Web.Core/GlobalUsings.cs
View File

@ -50,7 +50,6 @@ global using ASC.AuditTrail.Repositories;
global using ASC.Common;
global using ASC.Common.Caching;
global using ASC.Common.Log;
global using ASC.Common.Mapping;
global using ASC.Common.Notify.Engine;
global using ASC.Common.Security;
global using ASC.Common.Security.Authentication;

4
web/ASC.Web.Core/WebPluginManager.cs
View File

@ -315,7 +315,7 @@ public class WebPluginManager
}
public async Task<List<T>> GetSystemWebPluginsAsync<T>() where T : IMapFrom<DbWebPlugin>
public async Task<List<T>> GetSystemWebPluginsAsync<T>()
{
var key = GetSystemCacheKey();
@ -331,7 +331,7 @@ public class WebPluginManager
return systemPlugins;
}
private async Task<List<T>> GetSystemWebPluginsFromUrlAsync<T>() where T : IMapFrom<DbWebPlugin>
private async Task<List<T>> GetSystemWebPluginsFromUrlAsync<T>()
{
if (string.IsNullOrEmpty(_webPluginSettings.SystemUrl))
{