diff --git a/CHANGELOG.md b/CHANGELOG.md index da2ef3289..1404175db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ # Changelog +## [1.0.8-rc38] - unstable + +* [PostIt/Administration] Rechercher les utilisateurs côté serveur par login ou nom, par pages de 25 résultats maximum avec navigation précédente/suivante. + ## [1.0.8-rc37] - unstable * [PostIt] Telemetry diff --git a/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs b/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs index 429e0ac98..b7805fc53 100644 --- a/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs +++ b/src/PostIt/PostIt.Tests/AdministrationAccessTests.cs @@ -6,6 +6,7 @@ using Avalonia.VisualTree; using PostIt.Services; using PostIt.ViewModels; using PostIt.Views; +using Yavsc.Abstract.Administration; using Yavsc.Abstract.Identity; using Yavsc.Abstract.Resources; using Yavsc.Api.Client; @@ -82,6 +83,42 @@ public class AdministrationAccessTests Assert.DoesNotContain(api.Requests, path => path.EndsWith("/resource-usage/me")); } + [Fact] + public async Task Administration_searches_users_on_the_server_and_pages_results() + { + await using var api = new ProfileTransport("Administrator") { ManyUsers = true }; + var session = new SessionStatusViewModel { Api = api }; + await session.RefreshAsync(); + var vm = new AdministrationPageViewModel(api, api.UsageClient, session); + + await vm.RefreshAsync(); + Assert.Equal(1, vm.UserPage); + Assert.True(vm.HasNextUserPage); + Assert.Equal(25, vm.Users.Count); + Assert.Contains(api.Requests, path => path.Contains( + "/administration/users?page=1&query=", StringComparison.Ordinal)); + + vm.SearchText = "Jean Dupont"; + await vm.SearchUsersCommand.ExecuteAsync(null); + Assert.Equal(1, vm.UserPage); + Assert.False(vm.HasNextUserPage); + Assert.Contains(api.Requests, path => path.Contains( + "/administration/users?page=1&query=Jean", StringComparison.Ordinal)); + + vm.SearchText = ""; + await vm.SearchUsersCommand.ExecuteAsync(null); + Assert.True(vm.HasNextUserPage); + await vm.NextUserPageCommand.ExecuteAsync(null); + Assert.Equal(2, vm.UserPage); + Assert.False(vm.HasNextUserPage); + Assert.Contains(api.Requests, path => path.Contains( + "/administration/users?page=2&query=", StringComparison.Ordinal)); + Assert.False(vm.NextUserPageCommand.CanExecute(null)); + + await vm.PreviousUserPageCommand.ExecuteAsync(null); + Assert.Equal(1, vm.UserPage); + } + [AvaloniaFact] public async Task Administration_displays_both_tabs_and_selected_user_usage() { @@ -232,6 +269,7 @@ public class AdministrationAccessTests public bool FailUsage { get; set; } public bool ExhaustedQuota { get; set; } public bool HideIpAddressInCalls { get; set; } + public bool ManyUsers { get; set; } public ResourceUsageApiClient UsageClient => new(this, Settings.ApiUrl); public ProfileTransport(string role) @@ -278,11 +316,22 @@ public class AdministrationAccessTests }; result = path.EndsWith("/admin") ? new List { usage } : usage; } - else if (path.EndsWith("/users")) + else if (path.Contains("/administration/users", StringComparison.Ordinal)) { if (ExhaustedQuota) throw new HttpRequestException("resource_quota_exceeded", null, System.Net.HttpStatusCode.TooManyRequests); - result = new List { new() { UserId = "alice-id", UserName = "alice" } }; + var matchingQuery = path.Contains("query=Jean", StringComparison.Ordinal); + var page = path.Contains("page=2", StringComparison.Ordinal); + var returnedUsers = !matchingQuery && !page && ManyUsers + ? Enumerable.Range(1, 25).Select(index => new UserInfo + { + UserId = $"alice-id-{index}", UserName = $"alice-{index}" + }).ToList() + : matchingQuery + ? new List { new() { UserId = "jean-id", UserName = "jean", FullName = "Jean Dupont" } } + : page ? new List() + : new List { new() { UserId = "alice-id", UserName = "alice" } }; + result = new AdministrationUserPage(returnedUsers, ManyUsers && !matchingQuery && !page); } else throw new InvalidOperationException($"Unexpected endpoint: {path}"); diff --git a/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs b/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs index 40922f7ae..84a6afb6e 100644 --- a/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs +++ b/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs @@ -43,21 +43,7 @@ public class HomePageProviderFlowTests } [Fact] - public void Administration_page_filters_users_by_search_text() - { - var vm = new AdministrationPageViewModel(); - vm.Users.Add(new Yavsc.Abstract.Identity.UserInfo { UserId = "1", UserName = "alice", FullName = "Alice Example" }); - vm.Users.Add(new Yavsc.Abstract.Identity.UserInfo { UserId = "2", UserName = "bob", FullName = "Bob Jones" }); - vm.Users.Add(new Yavsc.Abstract.Identity.UserInfo { UserId = "3", UserName = "carol", FullName = "Carol Smith" }); - - vm.SearchText = "ali"; - - Assert.Single(vm.FilteredUsers); - Assert.Equal("alice", vm.FilteredUsers[0].UserName); - } - - [Fact] - public void Administration_page_filters_users_by_full_name() + public void Administration_search_text_does_not_filter_the_loaded_page_locally() { var vm = new AdministrationPageViewModel(); vm.Users.Add(new Yavsc.Abstract.Identity.UserInfo { UserId = "1", UserName = "alice", FullName = "Alice Example" }); @@ -65,8 +51,8 @@ public class HomePageProviderFlowTests vm.SearchText = "example"; - Assert.Single(vm.FilteredUsers); - Assert.Equal("alice", vm.FilteredUsers[0].UserName); + Assert.Equal(2, vm.Users.Count); + Assert.Equal("example", vm.SearchText); } [Fact] diff --git a/src/PostIt/PostIt/ViewModels/AdministrationPageViewModel.cs b/src/PostIt/PostIt/ViewModels/AdministrationPageViewModel.cs index fc2750a06..e06eddc7e 100644 --- a/src/PostIt/PostIt/ViewModels/AdministrationPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/AdministrationPageViewModel.cs @@ -22,6 +22,10 @@ public partial class AdministrationPageViewModel : ViewModelBase private readonly ResourceUsageApiClient? _usageClient; private readonly SessionStatusViewModel? _session; private readonly AdministrationApiClient? _administrationClient; + private AdministrationApiClient? UserSearchClient => + _administrationClient ?? (_api is null + ? null + : new AdministrationApiClient(_api, () => _api.Settings.ApiUrl)); public ObservableCollection UsageOverview { get; } = new(); @@ -37,22 +41,20 @@ public partial class AdministrationPageViewModel : ViewModelBase [ObservableProperty] public partial string SearchText { get; set; } = string.Empty; + [ObservableProperty] + public partial int UserPage { get; set; } = 1; + + [ObservableProperty] + public partial bool HasNextUserPage { get; set; } + + public bool HasPreviousUserPage => UserPage > 1; + [ObservableProperty] public partial string StatusMessage { get; set; } = "Chargement…"; [ObservableProperty] public partial UserInfo? SelectedUser { get; set; } - public IReadOnlyList FilteredUsers => - string.IsNullOrWhiteSpace(SearchText) - ? Users.ToList() - : Users.Where(user => - (user.UserName ?? string.Empty).Contains(SearchText, StringComparison.OrdinalIgnoreCase) - || (user.FullName ?? string.Empty).Contains(SearchText, StringComparison.OrdinalIgnoreCase) - || (user.Email ?? string.Empty).Contains(SearchText, StringComparison.OrdinalIgnoreCase) - || (user.UserId ?? string.Empty).Contains(SearchText, StringComparison.OrdinalIgnoreCase)) - .ToList(); - public override bool CanNavigateNext { get => false; protected set { _ = value; } } public override bool CanNavigatePrevious { get => true; protected set { _ = value; } } @@ -107,7 +109,25 @@ public partial class AdministrationPageViewModel : ViewModelBase partial void OnSearchTextChanged(string value) { - OnPropertyChanged(nameof(FilteredUsers)); + UserPage = 1; + HasNextUserPage = false; + } + + partial void OnUserPageChanged(int value) + { + OnPropertyChanged(nameof(HasPreviousUserPage)); + PreviousUserPageCommand.NotifyCanExecuteChanged(); + NextUserPageCommand.NotifyCanExecuteChanged(); + } + + partial void OnHasNextUserPageChanged(bool value) + => NextUserPageCommand.NotifyCanExecuteChanged(); + + partial void OnIsBusyChanged(bool value) + { + SearchUsersCommand.NotifyCanExecuteChanged(); + PreviousUserPageCommand.NotifyCanExecuteChanged(); + NextUserPageCommand.NotifyCanExecuteChanged(); } partial void OnSelectedUserChanged(UserInfo? value) => OnPropertyChanged(nameof(SelectedUsage)); @@ -121,7 +141,7 @@ public partial class AdministrationPageViewModel : ViewModelBase StatusMessage = "Le rôle Administrator est requis."; return; } - if (_api is null || _usageClient is null) + if (_api is null || _usageClient is null || UserSearchClient is null) { StatusMessage = "Client API d’administration indisponible."; return; @@ -141,31 +161,13 @@ public partial class AdministrationPageViewModel : ViewModelBase foreach (var item in usage) UsageOverview.Add(item); - var query = SearchText.Trim(); - var usersEndpoint = string.IsNullOrWhiteSpace(query) - ? new Uri(new Uri(_api.Settings.ApiUrl.TrimEnd('/') + "/", UriKind.Absolute), "users").ToString() - : new Uri(new Uri(_api.Settings.ApiUrl.TrimEnd('/') + "/", UriKind.Absolute), $"users/search/{Uri.EscapeDataString(query)}").ToString(); - - var users = await _api.CallAsync>(HttpMethod.Get, usersEndpoint).ConfigureAwait(true) - ?? throw new InvalidOperationException("Le serveur a renvoyé une liste d’utilisateurs vide."); - - if (!_session.IsAdministrator) - { - ClearAdministrationData(); - StatusMessage = "Le rôle Administrator est requis."; - return; - } - - foreach (var user in users) - { - Users.Add(user); - } - - OnPropertyChanged(nameof(FilteredUsers)); + await LoadUsersPageCoreAsync(1); OnPropertyChanged(nameof(SelectedUsage)); if (_administrationClient is not null) await LoadToolsAsync(); - StatusMessage = Users.Count > 0 ? $"{Users.Count} utilisateur(s) chargé(s)." : "Aucun utilisateur trouvé."; + StatusMessage = Users.Count > 0 + ? $"{Users.Count} utilisateur(s) affiché(s), page {UserPage}." + : "Aucun utilisateur trouvé."; } catch (HttpRequestException ex) when (ex.StatusCode == System.Net.HttpStatusCode.TooManyRequests) { @@ -188,6 +190,83 @@ public partial class AdministrationPageViewModel : ViewModelBase } } + [RelayCommand] + private Task SearchUsersAsync() => LoadUsersPageAsync(1); + + [RelayCommand(CanExecute = nameof(CanGoToPreviousUserPage))] + private Task PreviousUserPageAsync() => LoadUsersPageAsync(UserPage - 1); + + [RelayCommand(CanExecute = nameof(CanGoToNextUserPage))] + private Task NextUserPageAsync() => LoadUsersPageAsync(UserPage + 1); + + private bool CanGoToPreviousUserPage() => !IsBusy && UserPage > 1; + private bool CanGoToNextUserPage() => !IsBusy && HasNextUserPage; + + private async Task LoadUsersPageAsync(int page) + { + if (IsBusy) + return; + if (_session?.IsAdministrator != true) + { + Users.Clear(); + SelectedUser = null; + HasNextUserPage = false; + StatusMessage = "Le rôle Administrator est requis."; + return; + } + if (UserSearchClient is null) + { + StatusMessage = "Client API d’administration indisponible."; + return; + } + + IsBusy = true; + try + { + await LoadUsersPageCoreAsync(page); + StatusMessage = Users.Count > 0 + ? $"{Users.Count} utilisateur(s) affiché(s), page {UserPage}." + : "Aucun utilisateur trouvé."; + } + catch (Exception ex) + { + Users.Clear(); + SelectedUser = null; + HasNextUserPage = false; + StatusMessage = $"Recherche d’utilisateurs indisponible : {ex.Message}"; + } + finally + { + IsBusy = false; + } + } + + private async Task LoadUsersPageCoreAsync(int page) + { + var client = UserSearchClient; + if (client is null) + throw new InvalidOperationException("Client API d’administration indisponible."); + + var result = await client.SearchUsersAsync( + SearchText.Trim(), page).ConfigureAwait(true); + if (_session?.IsAdministrator != true) + { + Users.Clear(); + SelectedUser = null; + HasNextUserPage = false; + StatusMessage = "Le rôle Administrator est requis."; + return; + } + + Users.Clear(); + foreach (var user in result.Users) + Users.Add(user); + SelectedUser = null; + UserPage = page; + HasNextUserPage = result.HasNextPage; + OnPropertyChanged(nameof(SelectedUsage)); + } + private void ClearAdministrationData() { PaymentPurgeReport = ""; @@ -214,7 +293,8 @@ public partial class AdministrationPageViewModel : ViewModelBase EntryValue = ""; EnrollUserId = ""; ConfirmDestructiveAction = false; - OnPropertyChanged(nameof(FilteredUsers)); + UserPage = 1; + HasNextUserPage = false; OnPropertyChanged(nameof(SelectedUsage)); } } diff --git a/src/PostIt/PostIt/Views/Admin/AdministrationPage.axaml b/src/PostIt/PostIt/Views/Admin/AdministrationPage.axaml index 374cdd8af..4e4bd644b 100644 --- a/src/PostIt/PostIt/Views/Admin/AdministrationPage.axaml +++ b/src/PostIt/PostIt/Views/Admin/AdministrationPage.axaml @@ -65,8 +65,6 @@ -