From 27c22d5e33a0251292c70e473e1cd837fa026721 Mon Sep 17 00:00:00 2001 From: d11n Date: Thu, 2 Nov 2023 08:12:28 +0100 Subject: [PATCH] Unify list views (#5399) --- BTCPayServer.Tests/GreenfieldAPITests.cs | 2 +- BTCPayServer.Tests/SeleniumTests.cs | 55 ++--- .../Controllers/UIInvoiceController.UI.cs | 96 +++++---- .../Shared/Crowdfund/UpdateCrowdfund.cshtml | 1 - BTCPayServer/Views/Shared/ListRoles.cshtml | 1 - .../PointOfSale/UpdatePointOfSale.cshtml | 1 - BTCPayServer/Views/UIApps/ListApps.cshtml | 2 +- .../ViewCustodianAccount.cshtml | 1 - BTCPayServer/Views/UIForms/FormsList.cshtml | 1 - .../Views/UIInvoice/CreateInvoice.cshtml | 1 - BTCPayServer/Views/UIInvoice/Invoice.cshtml | 1 - .../Views/UIInvoice/ListInvoices.cshtml | 191 ++++++++---------- .../Views/UILNURL/EditLightningAddress.cshtml | 1 - BTCPayServer/Views/UIManage/APIKeys.cshtml | 1 - .../UIManage/TwoFactorAuthentication.cshtml | 1 - BTCPayServer/Views/UIManage/_Nav.cshtml | 1 - .../Views/UINotifications/Index.cshtml | 123 +++++------ .../EditPaymentRequest.cshtml | 1 - .../GetPaymentRequests.cshtml | 101 ++++----- .../UIPullPayment/EditPullPayment.cshtml | 1 - .../Views/UIReports/StoreReports.cshtml | 63 +++--- .../Views/UIServer/DynamicDnsServices.cshtml | 2 +- BTCPayServer/Views/UIServer/ListUsers.cshtml | 1 - BTCPayServer/Views/UIServer/Policies.cshtml | 1 - BTCPayServer/Views/UIServer/_Nav.cshtml | 1 - .../UIStorePullPayments/NewPullPayment.cshtml | 1 - .../Views/UIStorePullPayments/Payouts.cshtml | 98 +++++---- .../UIStorePullPayments/PullPayments.cshtml | 78 +++---- BTCPayServer/Views/UIStores/ListTokens.cshtml | 1 - .../Views/UIStores/StoreEmails.cshtml | 1 - BTCPayServer/Views/UIStores/StoreUsers.cshtml | 2 +- BTCPayServer/Views/UIStores/Webhooks.cshtml | 1 - BTCPayServer/Views/UIStores/_Nav.cshtml | 1 - .../Views/UIWallets/WalletTransactions.cshtml | 75 +++---- BTCPayServer/Views/UIWallets/_Nav.cshtml | 1 - .../UIWallets/_WalletTransactionsList.cshtml | 24 +-- BTCPayServer/wwwroot/main/layout.css | 3 + BTCPayServer/wwwroot/main/site.css | 93 ++++++++- BTCPayServer/wwwroot/main/site.js | 49 ++++- BTCPayServer/wwwroot/main/utils.js | 6 + 40 files changed, 581 insertions(+), 504 deletions(-) diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs index 47e8117dd..dff4275d4 100644 --- a/BTCPayServer.Tests/GreenfieldAPITests.cs +++ b/BTCPayServer.Tests/GreenfieldAPITests.cs @@ -1457,7 +1457,7 @@ namespace BTCPayServer.Tests [Trait("Integration", "Integration")] public async Task CanUseWebhooks() { - void AssertHook(FakeServer fakeServer, Client.Models.StoreWebhookData hook) + void AssertHook(FakeServer fakeServer, StoreWebhookData hook) { Assert.True(hook.Enabled); Assert.True(hook.AuthorizedEvents.Everything); diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs index 846ba2dc3..a986f45f0 100644 --- a/BTCPayServer.Tests/SeleniumTests.cs +++ b/BTCPayServer.Tests/SeleniumTests.cs @@ -196,7 +196,6 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id("StoreNav-PaymentRequests")).Click(); s.Driver.FindElement(By.Id("CreatePaymentRequest")).Click(); Assert.Equal(4, new SelectElement(s.Driver.FindElement(By.Id("FormId"))).Options.Count); - } [Fact(Timeout = TestTimeout)] @@ -216,8 +215,7 @@ namespace BTCPayServer.Tests s.GoToInvoices(s.StoreId); } // Let's CPFP from the invoices page - s.Driver.SetCheckbox(By.Id("selectAllCheckbox"), true); - s.Driver.FindElement(By.Id("ActionsDropdownToggle")).Click(); + s.Driver.SetCheckbox(By.CssSelector(".mass-action-select-all"), true); s.Driver.FindElement(By.Id("BumpFee")).Click(); s.Driver.FindElement(By.Id("BroadcastTransaction")).Click(); s.FindAlertMessage(); @@ -225,16 +223,14 @@ namespace BTCPayServer.Tests // CPFP again should fail because all invoices got bumped s.GoToInvoices(); - s.Driver.SetCheckbox(By.Id("selectAllCheckbox"), true); - s.Driver.FindElement(By.Id("ActionsDropdownToggle")).Click(); + s.Driver.SetCheckbox(By.CssSelector(".mass-action-select-all"), true); s.Driver.FindElement(By.Id("BumpFee")).Click(); Assert.Contains($"/stores/{s.StoreId}/invoices", s.Driver.Url); Assert.Contains("any UTXO available", s.FindAlertMessage(StatusMessageModel.StatusSeverity.Error).Text); // But we should be able to bump from the wallet's page s.GoToWallet(navPages: WalletsNavPages.Transactions); - s.Driver.SetCheckbox(By.Id("selectAllCheckbox"), true); - s.Driver.FindElement(By.Id("ActionsDropdownToggle")).Click(); + s.Driver.SetCheckbox(By.CssSelector(".mass-action-select-all"), true); s.Driver.FindElement(By.Id("BumpFee")).Click(); s.Driver.FindElement(By.Id("BroadcastTransaction")).Click(); Assert.Contains($"/wallets/{s.WalletId}", s.Driver.Url); @@ -730,9 +726,8 @@ namespace BTCPayServer.Tests Assert.Contains(invoiceId, s.Driver.PageSource); // archive via list - s.Driver.FindElement(By.CssSelector($".selector[value=\"{invoiceId}\"]")).Click(); - s.Driver.FindElement(By.Id("ActionsDropdownToggle")).Click(); - s.Driver.FindElement(By.Id("ActionsDropdownArchive")).Click(); + s.Driver.FindElement(By.CssSelector($".mass-action-select[value=\"{invoiceId}\"]")).Click(); + s.Driver.FindElement(By.Id("ArchiveSelected")).Click(); Assert.Contains("1 invoice archived", s.FindAlertMessage().Text); Assert.DoesNotContain(invoiceId, s.Driver.PageSource); @@ -740,9 +735,8 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id("StatusOptionsToggle")).Click(); s.Driver.FindElement(By.Id("StatusOptionsIncludeArchived")).Click(); Assert.Contains(invoiceId, s.Driver.PageSource); - s.Driver.FindElement(By.CssSelector($".selector[value=\"{invoiceId}\"]")).Click(); - s.Driver.FindElement(By.Id("ActionsDropdownToggle")).Click(); - s.Driver.FindElement(By.Id("ActionsDropdownUnarchive")).Click(); + s.Driver.FindElement(By.CssSelector($".mass-action-select[value=\"{invoiceId}\"]")).Click(); + s.Driver.FindElement(By.Id("UnarchiveSelected")).Click(); Assert.Contains("1 invoice unarchived", s.FindAlertMessage().Text); Assert.Contains(invoiceId, s.Driver.PageSource); @@ -1377,7 +1371,7 @@ namespace BTCPayServer.Tests TestLogs.LogInformation("Let's try to update one of them"); s.Driver.FindElement(By.LinkText("Modify")).Click(); - using FakeServer server = new FakeServer(); + using var server = new FakeServer(); await server.Start(); s.Driver.FindElement(By.Name("PayloadUrl")).Clear(); s.Driver.FindElement(By.Name("PayloadUrl")).SendKeys(server.ServerUri.AbsoluteUri); @@ -1419,7 +1413,7 @@ namespace BTCPayServer.Tests server.Done(); TestLogs.LogInformation("Let's make a failed event"); - s.CreateInvoice(); + var invoiceId = s.CreateInvoice(); request = await server.GetNextRequest(); request.Response.StatusCode = 404; server.Done(); @@ -1444,7 +1438,7 @@ namespace BTCPayServer.Tests CanBrowseContent(s); s.GoToInvoices(); - s.Driver.FindElement(By.LinkText("Details")).Click(); + s.Driver.FindElement(By.LinkText(invoiceId)).Click(); CanBrowseContent(s); var element = s.Driver.FindElement(By.ClassName("redeliver")); element.Click(); @@ -1697,13 +1691,14 @@ namespace BTCPayServer.Tests // no previous page in the wizard, hence no back button Assert.True(s.Driver.ElementDoesNotExist(By.Id("GoBack"))); s.Driver.FindElement(By.Id("CancelWizard")).Click(); - Assert.Equal(settingsUri.ToString(), s.Driver.Url); - - // Transactions list contains export and action, ensure functions are present. + Assert.Equal(settingsUri.ToString(), s.Driver.Url); + + // Transactions list contains export, ensure functions are present. s.Driver.FindElement(By.Id($"StoreNav-Wallet{cryptoCode}")).Click(); - s.Driver.FindElement(By.Id("ActionsDropdownToggle")).Click(); + + s.Driver.FindElement(By.ClassName("mass-action-select-all")).Click(); s.Driver.FindElement(By.Id("BumpFee")); - + // JSON export s.Driver.FindElement(By.Id("ExportDropdownToggle")).Click(); s.Driver.FindElement(By.Id("ExportJSON")).Click(); @@ -1859,8 +1854,7 @@ namespace BTCPayServer.Tests payouts[0].Click(); Assert.NotEmpty(s.Driver.FindElements(By.ClassName("payout"))); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-selectAllCheckbox")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-actions")).Click(); + s.Driver.FindElement(By.ClassName("mass-action-select-all")).Click(); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-approve-pay")).Click(); s.Driver.FindElement(By.Id("SignTransaction")).Click(); @@ -1935,8 +1929,7 @@ namespace BTCPayServer.Tests Assert.Contains(PayoutState.AwaitingApproval.GetStateString(), s.Driver.PageSource); s.GoToStore(s.StoreId, StoreNavPages.Payouts); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-view")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-selectAllCheckbox")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-actions")).Click(); + s.Driver.FindElement(By.ClassName("mass-action-select-all")).Click(); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-approve")).Click(); s.FindAlertMessage(); var tx = await s.Server.ExplorerNode.SendToAddressAsync(address, Money.FromUnit(0.001m, MoneyUnit.BTC)); @@ -1945,8 +1938,7 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-view")).Click(); Assert.Contains(PayoutState.AwaitingPayment.GetStateString(), s.Driver.PageSource); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-selectAllCheckbox")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-actions")).Click(); + s.Driver.FindElement(By.ClassName("mass-action-select-all")).Click(); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-mark-paid")).Click(); s.FindAlertMessage(); @@ -2006,8 +1998,7 @@ namespace BTCPayServer.Tests s.GoToStore(newStore.storeId, StoreNavPages.Payouts); s.Driver.FindElement(By.Id($"{new PaymentMethodId("BTC", PaymentTypes.LightningLike)}-view")).Click(); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-view")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-selectAllCheckbox")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-actions")).Click(); + s.Driver.FindElement(By.ClassName("mass-action-select-all")).Click(); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-approve-pay")).Click(); Assert.Contains(bolt, s.Driver.PageSource); Assert.Contains($"{payoutAmount.ToString()} BTC", s.Driver.PageSource); @@ -2023,8 +2014,7 @@ namespace BTCPayServer.Tests s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-view")).Click(); Assert.Contains(bolt, s.Driver.PageSource); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-selectAllCheckbox")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-actions")).Click(); + s.Driver.FindElement(By.ClassName("mass-action-select-all")).Click(); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingPayment}-mark-paid")).Click(); s.Driver.FindElement(By.Id($"{new PaymentMethodId("BTC", PaymentTypes.LightningLike)}-view")).Click(); @@ -2553,8 +2543,7 @@ namespace BTCPayServer.Tests payouts[0].Click(); s.Driver.FindElement(By.Id("BTC_LightningLike-view")).Click(); Assert.NotEmpty(s.Driver.FindElements(By.ClassName("payout"))); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-selectAllCheckbox")).Click(); - s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-actions")).Click(); + s.Driver.FindElement(By.ClassName("mass-action-select-all")).Click(); s.Driver.FindElement(By.Id($"{PayoutState.AwaitingApproval}-approve-pay")).Click(); Assert.Contains(lnurl, s.Driver.PageSource); diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs index 6dee7840c..b9f57bd52 100644 --- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs +++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs @@ -634,58 +634,56 @@ namespace BTCPayServer.Controllers [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanViewInvoices)] public async Task MassAction(string command, string[] selectedItems, string? storeId = null) { - if (selectedItems != null) + IActionResult NotSupported(string err) { - switch (command) - { - case "archive": - await _InvoiceRepository.MassArchive(selectedItems); - TempData[WellKnownTempData.SuccessMessage] = $"{selectedItems.Length} invoice{(selectedItems.Length == 1 ? "" : "s")} archived."; - break; + TempData[WellKnownTempData.ErrorMessage] = err; + return RedirectToAction(nameof(ListInvoices), new { storeId }); + } + if (selectedItems.Length == 0) + return NotSupported("No invoice has been selected"); - case "unarchive": - await _InvoiceRepository.MassArchive(selectedItems, false); - TempData[WellKnownTempData.SuccessMessage] = $"{selectedItems.Length} invoice{(selectedItems.Length == 1 ? "" : "s")} unarchived."; - break; - case "cpfp": - if (selectedItems.Length == 0) - return NotSupported("No invoice has been selected"); - var network = _NetworkProvider.DefaultNetwork; - var explorer = _ExplorerClients.GetExplorerClient(network); - IActionResult NotSupported(string err) - { - TempData[WellKnownTempData.ErrorMessage] = err; - return RedirectToAction(nameof(ListInvoices), new { storeId }); - } - if (explorer is null) - return NotSupported("This feature is only available to BTC wallets"); - if (!GetCurrentStore().HasPermission(GetUserId(), Policies.CanModifyStoreSettings)) - return Forbid(); + switch (command) + { + case "archive": + await _InvoiceRepository.MassArchive(selectedItems); + TempData[WellKnownTempData.SuccessMessage] = $"{selectedItems.Length} invoice{(selectedItems.Length == 1 ? "" : "s")} archived."; + break; - var derivationScheme = (this.GetCurrentStore().GetDerivationSchemeSettings(_NetworkProvider, network.CryptoCode))?.AccountDerivation; - if (derivationScheme is null) - return NotSupported("This feature is only available to BTC wallets"); - var bumpableAddresses = (await GetAddresses(selectedItems)) - .Where(p => p.GetPaymentMethodId().IsBTCOnChain) - .Select(p => p.GetAddress()).ToHashSet(); - var utxos = await explorer.GetUTXOsAsync(derivationScheme); - var bumpableUTXOs = utxos.GetUnspentUTXOs().Where(u => u.Confirmations == 0 && bumpableAddresses.Contains(u.ScriptPubKey.Hash.ToString())).ToArray(); - var parameters = new MultiValueDictionary(); - foreach (var utxo in bumpableUTXOs) - { - parameters.Add($"outpoints[]", utxo.Outpoint.ToString()); - } - return View("PostRedirect", new PostRedirectViewModel - { - AspController = "UIWallets", - AspAction = nameof(UIWalletsController.WalletCPFP), - RouteParameters = { - { "walletId", new WalletId(storeId, network.CryptoCode).ToString() }, - { "returnUrl", Url.Action(nameof(ListInvoices), new { storeId }) } - }, - FormParameters = parameters, - }); - } + case "unarchive": + await _InvoiceRepository.MassArchive(selectedItems, false); + TempData[WellKnownTempData.SuccessMessage] = $"{selectedItems.Length} invoice{(selectedItems.Length == 1 ? "" : "s")} unarchived."; + break; + case "cpfp": + var network = _NetworkProvider.DefaultNetwork; + var explorer = _ExplorerClients.GetExplorerClient(network); + if (explorer is null) + return NotSupported("This feature is only available to BTC wallets"); + if (!GetCurrentStore().HasPermission(GetUserId(), Policies.CanModifyStoreSettings)) + return Forbid(); + + var derivationScheme = (this.GetCurrentStore().GetDerivationSchemeSettings(_NetworkProvider, network.CryptoCode))?.AccountDerivation; + if (derivationScheme is null) + return NotSupported("This feature is only available to BTC wallets"); + var bumpableAddresses = (await GetAddresses(selectedItems)) + .Where(p => p.GetPaymentMethodId().IsBTCOnChain) + .Select(p => p.GetAddress()).ToHashSet(); + var utxos = await explorer.GetUTXOsAsync(derivationScheme); + var bumpableUTXOs = utxos.GetUnspentUTXOs().Where(u => u.Confirmations == 0 && bumpableAddresses.Contains(u.ScriptPubKey.Hash.ToString())).ToArray(); + var parameters = new MultiValueDictionary(); + foreach (var utxo in bumpableUTXOs) + { + parameters.Add($"outpoints[]", utxo.Outpoint.ToString()); + } + return View("PostRedirect", new PostRedirectViewModel + { + AspController = "UIWallets", + AspAction = nameof(UIWalletsController.WalletCPFP), + RouteParameters = { + { "walletId", new WalletId(storeId, network.CryptoCode).ToString() }, + { "returnUrl", Url.Action(nameof(ListInvoices), new { storeId }) } + }, + FormParameters = parameters, + }); } return RedirectToAction(nameof(ListInvoices), new { storeId }); } diff --git a/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml index 8b5367f10..ab5ee672a 100644 --- a/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml +++ b/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml @@ -26,7 +26,6 @@ }
-

@ViewData["Title"]

diff --git a/BTCPayServer/Views/Shared/ListRoles.cshtml b/BTCPayServer/Views/Shared/ListRoles.cshtml index 6f21691cf..17372358e 100644 --- a/BTCPayServer/Views/Shared/ListRoles.cshtml +++ b/BTCPayServer/Views/Shared/ListRoles.cshtml @@ -44,7 +44,6 @@

@ViewData["Title"]

- Add Role
diff --git a/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml index 05cf10ced..158804374 100644 --- a/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml +++ b/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml @@ -13,7 +13,6 @@ } -

@ViewData["Title"]

diff --git a/BTCPayServer/Views/UIApps/ListApps.cshtml b/BTCPayServer/Views/UIApps/ListApps.cshtml index 54ee1a66e..374e09e0a 100644 --- a/BTCPayServer/Views/UIApps/ListApps.cshtml +++ b/BTCPayServer/Views/UIApps/ListApps.cshtml @@ -23,7 +23,7 @@ - Create a new app + Create a new app
diff --git a/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml b/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml index 4ba9dda45..1714be782 100644 --- a/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml +++ b/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml @@ -24,7 +24,6 @@
-

@ViewData["Title"] diff --git a/BTCPayServer/Views/UIForms/FormsList.cshtml b/BTCPayServer/Views/UIForms/FormsList.cshtml index 7119608fa..d71a8d2b7 100644 --- a/BTCPayServer/Views/UIForms/FormsList.cshtml +++ b/BTCPayServer/Views/UIForms/FormsList.cshtml @@ -18,7 +18,6 @@

- Create Form
diff --git a/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml b/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml index 22f4b3e17..bc79960d2 100644 --- a/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml +++ b/BTCPayServer/Views/UIInvoice/CreateInvoice.cshtml @@ -29,7 +29,6 @@ } -

@ViewData["Title"]

diff --git a/BTCPayServer/Views/UIInvoice/Invoice.cshtml b/BTCPayServer/Views/UIInvoice/Invoice.cshtml index 15539f6b3..e97a33b0b 100644 --- a/BTCPayServer/Views/UIInvoice/Invoice.cshtml +++ b/BTCPayServer/Views/UIInvoice/Invoice.cshtml @@ -169,7 +169,6 @@
} -

@ViewData["Title"]

diff --git a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml index c4b90dff4..2e9c753c9 100644 --- a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml +++ b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml @@ -1,13 +1,10 @@ @using BTCPayServer.Client @using BTCPayServer.Client.Models @using BTCPayServer.Services - +@using SetPasswordViewModel = BTCPayServer.Models.ManageViewModels.SetPasswordViewModel @inject DisplayFormatter DisplayFormatter -@inject ReportService ReportService -@inject PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary @model InvoicesModel @{ - var reportNames = ReportService.ReportProviders.Select(p => p.Value.Name).OrderBy(c => c).ToArray(); ViewData.SetActivePage(InvoiceNavPages.Index, "Invoices"); var statusFilterCount = CountArrayFilter("status") + CountArrayFilter("exceptionstatus") + (HasBooleanFilter("includearchived") ? 1 : 0) + (HasBooleanFilter("unusual") ? 1 : 0); var hasDateFilter = HasArrayFilter("startdate") || HasArrayFilter("enddate"); @@ -32,8 +29,11 @@ @section PageHeadContent { } -

@ViewData["Title"] @@ -47,7 +46,7 @@

- Create Pull Payment + Create Pull Payment
@@ -104,27 +103,30 @@ - - + @foreach (var pp in Model.PullPayments) { - - + + } diff --git a/BTCPayServer/Views/UIStores/ListTokens.cshtml b/BTCPayServer/Views/UIStores/ListTokens.cshtml index c732e7ada..7793ecdc3 100644 --- a/BTCPayServer/Views/UIStores/ListTokens.cshtml +++ b/BTCPayServer/Views/UIStores/ListTokens.cshtml @@ -21,7 +21,6 @@

@ViewData["Title"]

- Create Token
diff --git a/BTCPayServer/Views/UIStores/StoreEmails.cshtml b/BTCPayServer/Views/UIStores/StoreEmails.cshtml index b21452f75..35871070c 100644 --- a/BTCPayServer/Views/UIStores/StoreEmails.cshtml +++ b/BTCPayServer/Views/UIStores/StoreEmails.cshtml @@ -22,7 +22,6 @@ } diff --git a/BTCPayServer/Views/UIStores/StoreUsers.cshtml b/BTCPayServer/Views/UIStores/StoreUsers.cshtml index f871625f2..a8375c335 100644 --- a/BTCPayServer/Views/UIStores/StoreUsers.cshtml +++ b/BTCPayServer/Views/UIStores/StoreUsers.cshtml @@ -33,7 +33,7 @@
- +
diff --git a/BTCPayServer/Views/UIStores/Webhooks.cshtml b/BTCPayServer/Views/UIStores/Webhooks.cshtml index 7efcd2e38..bae6b1af0 100644 --- a/BTCPayServer/Views/UIStores/Webhooks.cshtml +++ b/BTCPayServer/Views/UIStores/Webhooks.cshtml @@ -9,7 +9,6 @@

@ViewData["Title"]

- Create Webhook
diff --git a/BTCPayServer/Views/UIStores/_Nav.cshtml b/BTCPayServer/Views/UIStores/_Nav.cshtml index 64dd6e5f4..a01d43324 100644 --- a/BTCPayServer/Views/UIStores/_Nav.cshtml +++ b/BTCPayServer/Views/UIStores/_Nav.cshtml @@ -4,7 +4,6 @@ var storeId = Context.GetStoreData()?.Id; } -

Store Settings

- - Start - - + +
+ + Start + + + +
Name Automatically Approved RefundedActions
@pp.StartDate.ToBrowserDate()
@pp.StartDate.ToBrowserDate() - - Payouts - - @if (!pp.Archived) - { - - - - Archive +
+ + View - } - - - - View - + + Payouts + + @if (!pp.Archived) + { + + Archive + + } +
- - - - - - - - - +
- - -
- Date - -
- 		LabelTransaction IdAmount
+ + + + + + + + + + + + + + + diff --git a/BTCPayServer/Views/UIWallets/_Nav.cshtml b/BTCPayServer/Views/UIWallets/_Nav.cshtml index b774ca58b..1aa50431d 100644 --- a/BTCPayServer/Views/UIWallets/_Nav.cshtml +++ b/BTCPayServer/Views/UIWallets/_Nav.cshtml @@ -5,7 +5,6 @@ var wallet = walletId != null ? WalletId.Parse(walletId) : new WalletId(storeId, cryptoCode); } -
diff --git a/BTCPayServer/Views/UIWallets/_WalletTransactionsList.cshtml b/BTCPayServer/Views/UIWallets/_WalletTransactionsList.cshtml index 46ff8a5a4..75d177e86 100644 --- a/BTCPayServer/Views/UIWallets/_WalletTransactionsList.cshtml +++ b/BTCPayServer/Views/UIWallets/_WalletTransactionsList.cshtml @@ -1,5 +1,4 @@ @using BTCPayServer.Services -@using Microsoft.AspNetCore.Mvc.TagHelpers @using BTCPayServer.Components.LabelManager @model ListTransactionsViewModel @{ @@ -7,11 +6,11 @@ } @foreach (var transaction in Model.Transactions) { - - + - - @if (transaction.Positive) - { - - } - else - { - - } +
+ + +
+ Date + +
+ 		LabelTransaction IdAmount
+ + +
+
+ 0 + selected +
+
+ +
+
+
- +
+ + @transaction.Timestamp.ToBrowserDate() @@ -27,18 +26,9 @@ @transaction.Id - @transaction.Balance - - @transaction.Balance - + @transaction.Balance +
@if (string.IsNullOrEmpty(transaction.Comment)) diff --git a/BTCPayServer/wwwroot/main/layout.css b/BTCPayServer/wwwroot/main/layout.css index caa4288ae..0eb764d76 100644 --- a/BTCPayServer/wwwroot/main/layout.css +++ b/BTCPayServer/wwwroot/main/layout.css @@ -9,6 +9,9 @@ --mobile-header-height: 4rem; --desktop-header-height: 8rem; --sidebar-width: 280px; + --sticky-header-height: 0; /* gets dynamically set via JavaScript */ + + scroll-padding-top: calc(var(--sticky-header-height) + var(--btcpay-space-m)); } /* Main Menu */ diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css index 6cf4db720..225cc86e4 100644 --- a/BTCPayServer/wwwroot/main/site.css +++ b/BTCPayServer/wwwroot/main/site.css @@ -154,11 +154,7 @@ h2 svg.icon.icon-info { cursor: pointer; padding: 0; } -@media (min-width: 1400px) { - #MassAction { - margin-top: -4rem; - } -} + /* Prevent layout from breaking on hyperlinks with very long URLs as the visible text */ .invoice-details a { word-break: break-word; @@ -1060,3 +1056,90 @@ input.ts-wrapper.form-control:not(.ts-hidden-accessible,.ts-inline) { height: .75rem; } +/* Tables */ +.date-col { + min-width: 8rem; +} +.amount-col { + text-align: right; + white-space: nowrap; +} + +/* Mass Actions */ +.mass-action-head, +.mass-action-actions { + position: -webkit-sticky; + position: sticky; + top: var(--sticky-header-height); + z-index: 10; + background-color: var(--btcpay-body-bg); +} +.mass-action thead th::after { + content: ''; + position: absolute; + top: -1px; + left: -1px; + right: -1px; + bottom: 0; + border-bottom: 1px solid; + border-color: inherit; + pointer-events: none; +} +.mass-action > .mass-action-actions, +.mass-action[data-selected] > .mass-action-head { + display: none; +} +.mass-action[data-selected] > .mass-action-actions { + display: table-header-group; + border-top-width: 0; +} +.mass-action > .mass-action-actions button { + display: inline-flex; + align-items: center; + height: 1.4rem; + padding: 0; + font-weight: var(--btcpay-font-weight-semibold); +} +.mass-action > .mass-action-actions button .icon { + --btn-icon-size: 1.75rem; +} +.mass-action .mass-action-select-col { + width: 2rem; +} + +/* + Responsive table adjustments: Reset sticky header height, + because it doesn't work in containers with overflow auto. +*/ +.table-responsive{ + --sticky-header-height: 0; +} +@media (max-width: 575.98px) { + .table-responsive-sm { + --sticky-header-height: 0; + } +} + +@media (max-width: 767.98px) { + .table-responsive-md { + --sticky-header-height: 0; + } +} + +@media (max-width: 991.98px) { + .table-responsive-lg { + --sticky-header-height: 0; + } +} + +@media (max-width: 1199.98px) { + .table-responsive-xl { + --sticky-header-height: 0; + } +} + +@media (max-width: 1399.98px) { + .table-responsive-xxl { + --sticky-header-height: 0; + } +} diff --git a/BTCPayServer/wwwroot/main/site.js b/BTCPayServer/wwwroot/main/site.js index 76ec7c8b3..3f3f7d3f5 100644 --- a/BTCPayServer/wwwroot/main/site.js +++ b/BTCPayServer/wwwroot/main/site.js @@ -157,7 +157,14 @@ document.addEventListener("DOMContentLoaded", () => { // sticky header const stickyHeader = document.querySelector('#mainContent > section > .sticky-header'); if (stickyHeader) { - document.documentElement.style.scrollPaddingTop = `calc(${stickyHeader.offsetHeight}px + var(--btcpay-space-m))`; + const setStickyHeaderHeight = () => { + document.documentElement.style.setProperty('--sticky-header-height', `${stickyHeader.offsetHeight}px`) + } + window.addEventListener('resize', e => { + debounce('resize', setStickyHeaderHeight, 50) + }); + setStickyHeaderHeight(); + } // initialize timezone offset value if field is present in page @@ -355,6 +362,46 @@ document.addEventListener("DOMContentLoaded", () => { window.localStorage.setItem(COLLAPSED_KEY, JSON.stringify(collapsed)) }) } + + // Mass Action Tables + const updateSelectedCount = ($table) => { + const selectedCount = document.querySelectorAll('.mass-action-select:checked').length; + const $selectedCount = $table.querySelector('.mass-action-selected-count'); + if ($selectedCount) $selectedCount.innerText = selectedCount; + if (selectedCount === 0) { + $table.removeAttribute('data-selected'); + } else { + $table.setAttribute('data-selected', selectedCount.toString()); + } + } + + delegate('click', '.mass-action .mass-action-select-all', e => { + const $table = e.target.closest('.mass-action'); + const { checked } = e.target; + $table.querySelectorAll('.mass-action-select,.mass-action-select-all').forEach($checkbox => { + $checkbox.checked = checked; + }); + updateSelectedCount($table); + }); + + delegate('change', '.mass-action .mass-action-select', e => { + const $table = e.target.closest('.mass-action'); + const selectedCount = $table.querySelectorAll('.mass-action-select:checked').length; + if (selectedCount === 0) { + $table.querySelectorAll('.mass-action-select-all').forEach(checkbox => { + checkbox.checked = false; + }); + } + updateSelectedCount($table); + }); + + delegate('click', '.mass-action .mass-action-row', e => { + const $target = e.target + if ($target.matches('td,time,span[data-sensitive]')) { + const $row = $target.closest('.mass-action-row'); + $row.querySelector('.mass-action-select').click(); + } + }); }); // Initialize Blazor diff --git a/BTCPayServer/wwwroot/main/utils.js b/BTCPayServer/wwwroot/main/utils.js index 4836a9a01..7bda6caed 100644 --- a/BTCPayServer/wwwroot/main/utils.js +++ b/BTCPayServer/wwwroot/main/utils.js @@ -9,3 +9,9 @@ function delegate(eventType, selector, handler, root) { } }) } + +const DEBOUNCE_TIMERS = {} +function debounce(key, fn, delay = 250) { + clearTimeout(DEBOUNCE_TIMERS[key]) + DEBOUNCE_TIMERS[key] = setTimeout(fn, delay) +}