From 7ad0aa82fca6f0aaff48698e232569ebe647b304 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Sat, 18 Mar 2023 22:36:26 +0100 Subject: [PATCH] Apps become plugins Unified navigation for apps that are now plugins. Part of #4744. --- BTCPayServer.Tests/SeleniumTests.cs | 13 +++---- .../Components/MainNav/Default.cshtml | 28 ++------------- BTCPayServer/Controllers/UIAppsController.cs | 17 ++++++--- .../AppViewModels/CreateAppViewModel.cs | 1 + .../Plugins/Crowdfund/CrowdfundPlugin.cs | 2 +- .../Plugins/PointOfSale/PointOfSalePlugin.cs | 2 +- .../Shared/Crowdfund/NavExtension.cshtml | 26 ++++++++++---- .../Shared/PointOfSale/NavExtension.cshtml | 35 ++++++++++++------- BTCPayServer/Views/UIApps/CreateApp.cshtml | 15 ++++---- BTCPayServer/wwwroot/main/layout.css | 4 +++ 10 files changed, 77 insertions(+), 66 deletions(-) diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs index 8f6ad1b23..bd520e71a 100644 --- a/BTCPayServer.Tests/SeleniumTests.cs +++ b/BTCPayServer.Tests/SeleniumTests.cs @@ -77,8 +77,7 @@ namespace BTCPayServer.Tests s.GenerateWallet(isHotWallet: true); // Point Of Sale - s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click(); - new SelectElement(s.Driver.FindElement(By.Id("SelectedAppType"))).SelectByValue("PointOfSale"); + s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click(); s.Driver.FindElement(By.Id("AppName")).SendKeys(Guid.NewGuid().ToString()); s.Driver.FindElement(By.Id("Create")).Click(); Assert.Contains("App successfully created", s.FindAlertMessage().Text); @@ -939,9 +938,8 @@ namespace BTCPayServer.Tests await s.StartAsync(); var userId = s.RegisterNewUser(true); s.CreateNewStore(); - s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click(); + s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click(); s.Driver.FindElement(By.Name("AppName")).SendKeys("PoS" + Guid.NewGuid()); - s.Driver.FindElement(By.Id("SelectedAppType")).SendKeys("Point of Sale"); s.Driver.FindElement(By.Id("Create")).Click(); Assert.Contains("App successfully created", s.FindAlertMessage().Text); @@ -1027,9 +1025,8 @@ namespace BTCPayServer.Tests s.CreateNewStore(); s.AddDerivationScheme(); - s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click(); + s.Driver.FindElement(By.Id("StoreNav-CreateCrowdfund")).Click(); s.Driver.FindElement(By.Name("AppName")).SendKeys("CF" + Guid.NewGuid()); - s.Driver.FindElement(By.Id("SelectedAppType")).SendKeys("Crowdfund"); s.Driver.FindElement(By.Id("Create")).Click(); Assert.Contains("App successfully created", s.FindAlertMessage().Text); @@ -2006,9 +2003,7 @@ namespace BTCPayServer.Tests s.AddLightningNode(LightningConnectionType.CLightning, false); s.GoToLightningSettings(); s.Driver.SetCheckbox(By.Id("LNURLEnabled"), true); - s.Driver.FindElement(By.Id("StoreNav-CreateApp")).Click(); - s.Driver.FindElement(By.Id("SelectedAppType")).Click(); - s.Driver.FindElement(By.CssSelector("option[value='PointOfSale']")).Click(); + s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click(); s.Driver.FindElement(By.Id("AppName")).SendKeys(Guid.NewGuid().ToString()); s.Driver.FindElement(By.Id("Create")).Click(); TestUtils.Eventually(() => Assert.Contains("App successfully created", s.FindAlertMessage().Text)); diff --git a/BTCPayServer/Components/MainNav/Default.cshtml b/BTCPayServer/Components/MainNav/Default.cshtml index c0bd6a732..530418199 100644 --- a/BTCPayServer/Components/MainNav/Default.cshtml +++ b/BTCPayServer/Components/MainNav/Default.cshtml @@ -155,30 +155,6 @@ -
- - -
}