From ca548e8634d402984561936651e564aaf72f7872 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Sun, 10 Dec 2023 13:01:46 -0600 Subject: [PATCH] Conflicts --- API.Tests/Helpers/SmartFilterHelperTests.cs | 11 +++++++++++ API/Controllers/AccountController.cs | 4 ++-- API/Helpers/SmartFilterHelper.cs | 2 +- .../series-detail/series-detail.component.html | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/API.Tests/Helpers/SmartFilterHelperTests.cs b/API.Tests/Helpers/SmartFilterHelperTests.cs index 5508ab1a7..974cb0ba6 100644 --- a/API.Tests/Helpers/SmartFilterHelperTests.cs +++ b/API.Tests/Helpers/SmartFilterHelperTests.cs @@ -44,6 +44,17 @@ public class SmartFilterHelperTests AssertStatementSame(list[0], FilterField.Genres, FilterComparison.Equal, "95"); } + [Fact] + public void Test_Decode2() + { + const string encoded = """ + name=Test%202&stmts=comparison%253D10%25C2%25A6field%253D1%25C2%25A6value%253DA%EF%BF%BDcomparison%253D0%25C2%25A6field%253D19%25C2%25A6value%253D11&sortOptions=sortField%3D1%C2%A6isAscending%3DTrue&limitTo=0&combination=1 + """; + + var filter = SmartFilterHelper.Decode(encoded); + Assert.True(filter.SortOptions.IsAscending); + } + [Fact] public void Test_EncodeDecode() { diff --git a/API/Controllers/AccountController.cs b/API/Controllers/AccountController.cs index 9d3212389..dce22c979 100644 --- a/API/Controllers/AccountController.cs +++ b/API/Controllers/AccountController.cs @@ -595,7 +595,7 @@ public class AccountController : BaseApiController if (string.IsNullOrEmpty(dto.Email)) return BadRequest(await _localizationService.Translate(userId, "invalid-payload")); - _logger.LogInformation("{User} is inviting {Email} to the server", User.GetUsername(), dto.Email); + _logger.LogInformation("{User} is inviting {Email} to the server", adminUser.UserName, dto.Email); // Check if there is an existing invite var emailValidationErrors = await _accountService.ValidateEmail(dto.Email); @@ -701,7 +701,7 @@ public class AccountController : BaseApiController BackgroundJob.Enqueue(() => _emailService.SendConfirmationEmail(new ConfirmationEmailDto() { EmailAddress = dto.Email, - InvitingUser = User.GetUsername(), + InvitingUser = adminUser.UserName, ServerConfirmationLink = emailLink })); } diff --git a/API/Helpers/SmartFilterHelper.cs b/API/Helpers/SmartFilterHelper.cs index 0749cb29e..4b8e0c8f6 100644 --- a/API/Helpers/SmartFilterHelper.cs +++ b/API/Helpers/SmartFilterHelper.cs @@ -133,7 +133,7 @@ public static class SmartFilterHelper var sortFieldPart = parts.FirstOrDefault(part => part.StartsWith(SortFieldKey)); var isAscendingPart = parts.FirstOrDefault(part => part.StartsWith(IsAscendingKey)); - var isAscending = isAscendingPart?.Substring(11).Equals("true", StringComparison.OrdinalIgnoreCase) ?? false; + var isAscending = isAscendingPart?.Trim().Replace(IsAscendingKey, string.Empty).Equals("true", StringComparison.OrdinalIgnoreCase) ?? false; if (sortFieldPart == null) { return new SortOptions(); diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html index 267f5e09b..7d1976340 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html @@ -51,7 +51,7 @@ -
+