mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 06:21:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove system plugins from the plugin list (#4429)

Browse source
This commit is contained in:
Nicolas Dorier 2022-12-13 18:54:41 +09:00 • committed by GitHub
parent 0c3f819200
commit e2c5e2c7fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
BTCPayServer/Plugins/PluginManager.cs
View file

@ -123,8 +123,12 @@ namespace BTCPayServer.Plugins
_plugins.Add(plugin); _plugins.Add(plugin);
var fileProvider = CreateEmbeddedFileProviderForAssembly(pluginAssembly); var fileProvider = CreateEmbeddedFileProviderForAssembly(pluginAssembly);
loadedPlugins.Add((plugin, pluginAssembly, fileProvider)); loadedPlugins.Add((plugin, pluginAssembly, fileProvider));
plugins.AddRange(GetAllPluginTypesFromAssembly(pluginAssembly) foreach (var p in GetAllPluginTypesFromAssembly(pluginAssembly)
.Select(GetPluginInstanceFromType)); .Select(GetPluginInstanceFromType))
{
p.SystemPlugin = false;
plugins.Add(p);
}
} }
catch (Exception e) catch (Exception e)

1
BTCPayServer/Plugins/PluginService.cs
View file

@ -52,6 +52,7 @@ namespace BTCPayServer.Plugins
{ {
var p = v.ManifestInfo.ToObject<AvailablePlugin>(); var p = v.ManifestInfo.ToObject<AvailablePlugin>();
p.Documentation = v.Documentation; p.Documentation = v.Documentation;
p.SystemPlugin = false;
return p; return p;
}).ToArray(); }).ToArray();
} }

12
BTCPayServer/Views/UIServer/ListPlugins.cshtml
View file

@ -132,11 +132,11 @@
{ {
<h3 class="mb-4">Installed Plugins</h3> <h3 class="mb-4">Installed Plugins</h3>
<div class="row mb-4"> <div class="row mb-4">
@foreach (var plugin in Model.Installed) @foreach (var plugin in Model.Installed.Where(i => !i.SystemPlugin))
{ {
var matchedAvailable = Model.Available.Where(availablePlugin => availablePlugin.Identifier == plugin.Identifier && availablePlugin.Version > plugin.Version).OrderByDescending(availablePlugin => availablePlugin.Version).ToArray(); var matchedAvailable = Model.Available.Where(availablePlugin => availablePlugin.Identifier == plugin.Identifier && availablePlugin.Version > plugin.Version).OrderByDescending(availablePlugin => availablePlugin.Version).ToArray();
var x = matchedAvailable.FirstOrDefault(availablePlugin => DependenciesMet(availablePlugin.Dependencies)) ?? matchedAvailable.FirstOrDefault(); var x = matchedAvailable.FirstOrDefault(availablePlugin => DependenciesMet(availablePlugin.Dependencies)) ?? matchedAvailable.FirstOrDefault();
var updateAvailable = !plugin.SystemPlugin && matchedAvailable.Any(); var updateAvailable = matchedAvailable.Any();
var tabId = plugin.Identifier.ToLowerInvariant().Replace(".", "_"); var tabId = plugin.Identifier.ToLowerInvariant().Replace(".", "_");
<div class="col col-12 col-md-6 col-lg-12 col-xl-6 col-xxl-4 mb-4"> <div class="col col-12 col-md-6 col-lg-12 col-xl-6 col-xxl-4 mb-4">
<div class="card h-100" id="@plugin.Identifier"> <div class="card h-100" id="@plugin.Identifier">
@ -151,11 +151,7 @@
<div class="d-flex flex-wrap align-items-center mb-2"> <div class="d-flex flex-wrap align-items-center mb-2">
<h5 class="text-muted d-flex align-items-center mt-1 gap-3"> <h5 class="text-muted d-flex align-items-center mt-1 gap-3">
@plugin.Version @plugin.Version
@if (plugin.SystemPlugin) @if (updateAvailable && x != null)
{
<div class="badge bg-light">System plugin</div>
}
else if (updateAvailable && x != null)
{ {
<div class="badge bg-info"> <div class="badge bg-info">
@x.Version available @x.Version available
@ -219,7 +215,7 @@
@{ @{
var pendingAction = Model.Commands.Any(tuple => tuple.plugin.Equals(plugin.Identifier, StringComparison.InvariantCultureIgnoreCase)); var pendingAction = Model.Commands.Any(tuple => tuple.plugin.Equals(plugin.Identifier, StringComparison.InvariantCultureIgnoreCase));
} }
@if (!plugin.SystemPlugin && (pendingAction || (updateAvailable && x != null && DependenciesMet(x.Dependencies)) || !DependentOn(plugin.Identifier))) @if (pendingAction || (updateAvailable && x != null && DependenciesMet(x.Dependencies)) || !DependentOn(plugin.Identifier))
{ {
<div class="card-footer border-0 pb-3 d-flex"> <div class="card-footer border-0 pb-3 d-flex">
@if (pendingAction) @if (pendingAction)