From ad89139e0778adf2b16b00747da7880b02d1ae73 Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Fri, 22 Dec 2023 02:49:40 +0100
Subject: [PATCH] Plugins: Fix missing uninstall button (#5587)

Fixes #5585.
---
 .../Views/UIServer/ListPlugins.cshtml         | 75 +++++++++----------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/BTCPayServer/Views/UIServer/ListPlugins.cshtml b/BTCPayServer/Views/UIServer/ListPlugins.cshtml
index 0bcbacc95..9a1e4b2b5 100644
--- a/BTCPayServer/Views/UIServer/ListPlugins.cshtml
+++ b/BTCPayServer/Views/UIServer/ListPlugins.cshtml
@@ -234,56 +234,53 @@
                     </div>
                     @{
                         var pendingAction = Model.Commands.Any(tuple => tuple.plugin.Equals(plugin.Identifier, StringComparison.InvariantCultureIgnoreCase));
-                    }
-                    @if (pendingAction || (updateAvailable && x != null && !DependentOn(plugin.Identifier)))
-                    {
                         var exclusivePendingAction = true;
-                        <div class="card-footer border-0 pb-3 d-flex gap-2">
-                            @if (pendingAction && updateAvailable)
+                    }
+                    <div class="card-footer border-0 pb-3 d-flex gap-2">
+                        @if (pendingAction && updateAvailable)
+                        {
+                            var isUpdateAction = Model.Commands.Last(tuple => tuple.plugin.Equals(plugin.Identifier, StringComparison.InvariantCultureIgnoreCase)).command == "update";
+                            if (isUpdateAction)
                             {
-                                var isUpdateAction = Model.Commands.Last(tuple => tuple.plugin.Equals(plugin.Identifier, StringComparison.InvariantCultureIgnoreCase)).command == "update";
-                                if (isUpdateAction)
-                                {
-                                    var version = PluginService.GetVersionOfPendingInstall(plugin.Identifier);
-                                    exclusivePendingAction = version == x.Version;
-                                }
+                                var version = PluginService.GetVersionOfPendingInstall(plugin.Identifier);
+                                exclusivePendingAction = version == x.Version;
                             }
-                            @if (pendingAction)
+                        }
+                        @if (pendingAction)
+                        {
+                            <form asp-action="CancelPluginCommands" asp-route-plugin="@plugin.Identifier">
+                                <button type="submit" class="btn btn-outline-secondary">Cancel pending action</button>
+                            </form>
+                        }
+                        @if (!pendingAction || !exclusivePendingAction)
+                        {
+                            @if (updateAvailable && x != null)
                             {
-                                <form asp-action="CancelPluginCommands" asp-route-plugin="@plugin.Identifier">
-                                    <button type="submit" class="btn btn-outline-secondary">Cancel pending action</button>
-                                </form>
-                            }
-                            @if(!pendingAction || !exclusivePendingAction)
-                            {
-                                @if (updateAvailable && x != null)
+                                if (PluginManager.DependenciesMet(x.Dependencies, installed))
                                 {
-                                    if (PluginManager.DependenciesMet(x.Dependencies, installed))
-                                    {
-                                        <form asp-action="InstallPlugin" asp-route-plugin="@plugin.Identifier" asp-route-version="@x.Version" asp-route-update="true" class="me-3">
-                                            <button type="submit" class="btn btn-secondary">Update</button>
-                                        </form>
-                                    }
-                                    else
-                                    {
-                                        <form asp-action="InstallPlugin" asp-route-plugin="@plugin.Identifier" asp-route-version="@x.Version" asp-route-update="true" class="me-3">
-                                            <button title="Schedule upgrade for when the dependencies have been met to ensure a smooth update" data-bs-toggle="tooltip" type="submit" class="btn btn-secondary">Schedule update</button>
-                                        </form>
-                                    }
-                                }
-                                @if (DependentOn(plugin.Identifier))
-                                {
-                                    <button type="button" class="btn btn-outline-danger" data-bs-toggle="tooltip" title="This plugin cannot be uninstalled as it is depended on by other plugins.">Uninstall <span class="fa fa-exclamation"></span></button>
+                                    <form asp-action="InstallPlugin" asp-route-plugin="@plugin.Identifier" asp-route-version="@x.Version" asp-route-update="true" class="me-3">
+                                        <button type="submit" class="btn btn-secondary">Update</button>
+                                    </form>
                                 }
                                 else
                                 {
-                                    <form asp-action="UnInstallPlugin" asp-route-plugin="@plugin.Identifier">
-                                        <button type="submit" class="btn btn-outline-danger">Uninstall</button>
+                                    <form asp-action="InstallPlugin" asp-route-plugin="@plugin.Identifier" asp-route-version="@x.Version" asp-route-update="true" class="me-3">
+                                        <button title="Schedule upgrade for when the dependencies have been met to ensure a smooth update" data-bs-toggle="tooltip" type="submit" class="btn btn-secondary">Schedule update</button>
                                     </form>
                                 }
                             }
-                        </div>
-                    }
+                            @if (DependentOn(plugin.Identifier))
+                            {
+                                <button type="button" class="btn btn-outline-danger" data-bs-toggle="tooltip" title="This plugin cannot be uninstalled as it is depended on by other plugins.">Uninstall <span class="fa fa-exclamation"></span></button>
+                            }
+                            else
+                            {
+                                <form asp-action="UnInstallPlugin" asp-route-plugin="@plugin.Identifier">
+                                    <button type="submit" class="btn btn-outline-danger">Uninstall</button>
+                                </form>
+                            }
+                        }
+                    </div>
                 </div>
             </div>
         }