diff --git a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs deleted file mode 100644 index a721d738..00000000 --- a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs +++ /dev/null @@ -1,118 +0,0 @@ -using System; -using System.Collections.ObjectModel; -using System.Threading; -using System.Threading.Tasks; -using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.Input; -using PostIt.Services; -using Yavsc.Api.Client; - -namespace PostIt.ViewModels; - -/// -/// View model for the "add a Yavsc user to a circle" modal. -/// -/// Resolves users through -/// (which delegates to /api/user-search); the caller -/// (CirclesPage) decides whether to add the picked user to -/// the circle by calling -/// -/// (which is bound to the dialog's "Ajouter" button). -/// -/// The dialog itself doesn't know the target -/// CircleId: that's set by the caller via the -/// constructor and the dialog only triggers -/// against the -/// string. The "Add" command -/// returns the picked via the -/// event, and the hosting -/// CirclesPage then calls -/// . -/// -public partial class AddCircleMemberDialogViewModel : ViewModelBase -{ - private readonly IUserDirectory _directory; - - [ObservableProperty] - public partial string SearchQuery { get; set; } = string.Empty; - - [ObservableProperty] - public partial ObservableCollection Results { get; set; } = new(); - - [ObservableProperty] - public partial UserSummary? Selected { get; set; } - - [ObservableProperty] - public partial bool IsBusy { get; set; } - - [ObservableProperty] - public partial string StatusMessage { get; set; } = string.Empty; - - /// - /// Raised when the user confirms a selection. The hosting - /// CirclesPage subscribes to this event and calls - /// CircleApiClient.AddMemberAsync with the target - /// circle id + the picked user's id. The dialog itself - /// does not know the circle id by design: separation of - /// concerns — the modal is a user picker, not a - /// "circle joiner" form. - /// - public event EventHandler? Confirmed; - - public AddCircleMemberDialogViewModel(IUserDirectory directory) - { - _directory = directory ?? throw new ArgumentNullException(nameof(directory)); - } - - public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); } - public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); } - - /// - /// Search the directory for users matching the current - /// . Triggered explicitly via the - /// "Rechercher" button — no debouncing, so the caller - /// stays in control of how often the network is hit. - /// - [RelayCommand] - public async Task SearchAsync() - { - if (string.IsNullOrWhiteSpace(SearchQuery)) - { - Results.Clear(); - StatusMessage = "Tapez un nom ou un email"; - return; - } - - IsBusy = true; - try - { - var hits = await _directory.SearchAsync(SearchQuery, CancellationToken.None).ConfigureAwait(true); - Results = new ObservableCollection(hits ?? Array.Empty()); - StatusMessage = $"{Results.Count} résultat(s)"; - } - catch (Exception ex) - { - StatusMessage = $"Erreur: {ex.Message}"; - } - finally - { - IsBusy = false; - } - } - - /// - /// Raise for the currently selected - /// user. No-op when no selection has been made — keeps the - /// UI from firing an event with a null payload. - /// - [RelayCommand] - public void Add() - { - if (Selected is null) - { - StatusMessage = "Sélectionnez un utilisateur"; - return; - } - Confirmed?.Invoke(this, Selected); - } -} diff --git a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs index c017c426..17d4c4be 100644 --- a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs @@ -1,10 +1,8 @@ using System; using System.Collections.ObjectModel; -using System.Linq; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using PostIt.Services; using Yavsc.Api.Client; using Yavsc.Api.Client.Dtos; @@ -13,24 +11,13 @@ namespace PostIt.ViewModels; /// /// View model for the "Mes cercles" page. CRUD on the caller's own /// circles (the server scopes every endpoint to the caller's uid -/// since the BlogAcl fix on this branch), plus membership -/// management on the currently selected circle. +/// since the BlogAcl fix on this branch). /// /// The view lists circles in , supports /// create / edit via , and exposes /// per-item Delete and per-item edit commands. /// drives a progress overlay during API calls; /// surfaces success / error feedback in the view footer. -/// -/// When the user selects a circle in the list, -/// fetches its members into -/// . The "Add a member" command -/// () is a UI event the view -/// raises to open AddCircleMemberDialog; the dialog -/// raises a Confirmed event back, which the page's -/// code-behind forwards here via -/// . The "remove" -/// command is per-row and runs inline. /// public partial class CirclesPageViewModel : ViewModelBase { @@ -50,26 +37,12 @@ public partial class CirclesPageViewModel : ViewModelBase [ObservableProperty] public partial bool DraftPublic { get; set; } - /// Members of the currently selected circle. Empty - /// when no circle is selected or after a refresh that - /// produced an empty list. Updated by - /// . - [ObservableProperty] - public partial ObservableCollection Members { get; set; } = new(); - [ObservableProperty] public partial bool IsBusy { get; set; } [ObservableProperty] public partial string StatusMessage { get; set; } = string.Empty; - /// - /// Raised when the user wants to add a member to the - /// currently selected circle. The view listens to this - /// event and opens AddCircleMemberDialog. - /// - public event EventHandler? AddMemberRequested; - public CirclesPageViewModel(CircleApiClient client) { _client = client ?? throw new ArgumentNullException(nameof(client)); @@ -78,24 +51,6 @@ public partial class CirclesPageViewModel : ViewModelBase public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); } public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); } - /// - /// Partial property setter: when the selected circle - /// changes, refresh the members list. The setter is - /// invoked by the [ObservableProperty] source generator - /// for both user selections and programmatic resets. - /// - partial void OnSelectedCircleChanged(CircleDto? value) - { - Members = new ObservableCollection(); - if (value is not null) - { - // Fire-and-forget: load members in the background. - // Errors are routed to StatusMessage inside - // LoadMembersAsync. - _ = LoadMembersAsync(value.Id); - } - } - [RelayCommand] public async Task RefreshAsync() { @@ -116,33 +71,6 @@ public partial class CirclesPageViewModel : ViewModelBase } } - /// - /// Load the members of one of the caller's circles. The - /// server scopes the endpoint with a 404 when the circle - /// doesn't belong to the caller (mirroring the rest of the - /// circle API); that case flattens to an empty list here. - /// - [RelayCommand] - public async Task LoadMembersAsync(long circleId) - { - IsBusy = true; - try - { - var list = await _client.GetMembersAsync(circleId); - Members = new ObservableCollection(list ?? new()); - StatusMessage = $"{Members.Count} membre(s)"; - } - catch (Exception ex) - { - StatusMessage = $"Erreur: {ex.Message}"; - Members = new ObservableCollection(); - } - finally - { - IsBusy = false; - } - } - [RelayCommand] public void StartCreate() { @@ -213,12 +141,6 @@ public partial class CirclesPageViewModel : ViewModelBase { await _client.DeleteCircleAsync(circle.Id); StatusMessage = $"Cercle « {circle.Name} » supprimé"; - // If the deleted circle was the selected one, - // clear the selection so the Members view goes - // empty too (the partial setter on - // SelectedCircle will reset Members). - if (SelectedCircle?.Id == circle.Id) - SelectedCircle = null; await RefreshAsync(); } catch (Exception ex) @@ -230,81 +152,4 @@ public partial class CirclesPageViewModel : ViewModelBase IsBusy = false; } } - - /// - /// Fire the event so - /// the view opens AddCircleMemberDialog. The view - /// forwards the dialog's Confirmed event back to - /// . - /// - [RelayCommand] - public void OpenAddMember() - { - if (SelectedCircle is null) - { - StatusMessage = "Sélectionnez d'abord un cercle"; - return; - } - AddMemberRequested?.Invoke(this, EventArgs.Empty); - } - - /// - /// Called by the view when the dialog confirms a - /// selection. Adds the picked user to the currently - /// selected circle and refreshes the members list. - /// - public async Task OnAddMemberConfirmedAsync(object? sender, UserSummary picked) - { - if (SelectedCircle is null || picked is null) return; - IsBusy = true; - try - { - await _client.AddMemberAsync(SelectedCircle.Id, picked.Id); - StatusMessage = $"« {picked.DisplayName} » ajouté au cercle"; - await LoadMembersAsync(SelectedCircle.Id); - } - catch (Exception ex) - { - // 409 (already a member) is a likely race — surface - // it as a friendly status, not an error. The - // server returns 409 for "already a member"; - // YavscApiClient surfaces that as an exception - // today; future refactors could route 409 into a - // typed result, but for now the message string is - // distinctive enough. - var msg = ex.Message.Contains("409") || ex.Message.Contains("Conflict") - ? "Déjà membre du cercle" - : $"Erreur: {ex.Message}"; - StatusMessage = msg; - } - finally - { - IsBusy = false; - } - } - - /// - /// Per-row "remove" command. Updates the local - /// collection in place so the UI doesn't flash. - /// - [RelayCommand] - public async Task RemoveMemberAsync(CircleMemberDto? member) - { - if (member is null || SelectedCircle is null) return; - IsBusy = true; - try - { - await _client.RemoveMemberAsync(SelectedCircle.Id, member.Id); - Members.Remove(member); - StatusMessage = $"« {member.UserName} » retiré du cercle"; - } - catch (Exception ex) - { - StatusMessage = $"Erreur: {ex.Message}"; - } - finally - { - IsBusy = false; - } - } } diff --git a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml b/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml deleted file mode 100644 index 2c13e99c..00000000 --- a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - -