diff --git a/.forgejo/workflows/buildAndTest.yml b/.forgejo/workflows/buildAndTest.yml index a0f3a375..9b3403db 100644 --- a/.forgejo/workflows/buildAndTest.yml +++ b/.forgejo/workflows/buildAndTest.yml @@ -21,9 +21,20 @@ on: push: branches: [ "main" ] pull_request: - branches: [ "main", "release/*" ] + branches: [ "main" ] jobs: + log-the-inputs: + runs-on: debian-latest + steps: + - run: | + echo "Log level: $LEVEL" + echo "Tags: $TAGS" + echo "Environment: $ENVIRONMENT" + env: + LEVEL: ${{ inputs.logLevel }} + TAGS: ${{ inputs.tags }} + build: runs-on: docker diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 3d4fc0ac..ef518037 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -42,6 +42,11 @@ on: description: 'Tag à publier (requis en dispatch, ex. 1.0.6 ou 1.0.7-rc1).' required: true type: string + force_unstable: + description: 'Publier une release avec suffixe (ex. 1.0.0-rc1) malgré le fail-fast par défaut.' + required: false + type: boolean + default: false permissions: contents: write @@ -57,6 +62,7 @@ jobs: # En push tag : github.ref_name est le tag. # En workflow_dispatch : on lit l'input 'tag'. TAG: ${{ github.event_name == 'push' && github.ref_name || inputs.tag }} + FORCE_UNSTABLE: ${{ inputs.force_unstable || 'false' }} run: | if [[ -z "$TAG" ]]; then echo "::error::No tag provided. In workflow_dispatch, set the 'tag' input." @@ -109,16 +115,11 @@ jobs: echo "Tag $TAG classifié comme channel=$CHANNEL" - # Seuls les suffixes explicitement autorisés déclenchent un - # release : -rcN et -betaN. Les autres suffixes (-alpha*, - # -dev*, -preview*, etc.) restent refusés — ils sont - # utilisables localement pour itérer, mais ne doivent pas - # être publiés comme release publique. - if [[ "$CHANNEL" == "unstable" ]]; then - if [[ ! "$SUFFIX" =~ ^-(rc|beta)([0-9]+)?$ ]]; then - echo "::error::Tag '$TAG' has suffix '$SUFFIX' which is not in the allowed release suffixes (-rcN, -betaN). Refusing to publish." - exit 1 - fi + # Fail-fast sur instable sauf opt-in explicite. + if [[ "$CHANNEL" == "unstable" && "${FORCE_UNSTABLE:-false}" != "true" ]]; then + echo "::error::Tag '$TAG' is unstable (suffix '$SUFFIX'). Refusing to publish." + echo "Set force_unstable=true via workflow_dispatch to override." + exit 1 fi # Lecture du CHANGELOG.md (doit exister à la racine du repo). @@ -327,4 +328,4 @@ jobs: exit 1 fi - echo "Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG" + echo "Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG" \ No newline at end of file diff --git a/.vscode/mcp.json b/.vscode/mcp.json new file mode 100644 index 00000000..7ca6ed4b --- /dev/null +++ b/.vscode/mcp.json @@ -0,0 +1,11 @@ +{ + "servers": { + "openclaw": { + "type": "stdio", + "command": "/home/paul/.nvm/versions/node/v22.23.0/bin/node", + "args": [ + "/home/paul/Workspace/tools/openclaw-mcp-server.js" + ] + } + } +} diff --git a/CHANGELOG.md b/CHANGELOG.md index e2a446a0..ac258ff6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,57 +16,6 @@ Cette convention est partagée avec le dépôt [`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian) pour la production des paquets `.deb`. -## [1.0.8-rc1] - unstable - -### Added -- `BlogAclApiTests.PostCircleAuthorization_returns_201_when_payload_mirrors_PostIt_shape_against_existing_circle_named_test` - : test de non-régression qui épingle la forme exacte du payload - que PostIt envoie à `POST /api/v1/blogacl` (un objet - `PostAccessControlRulePayload` avec `CircleId` et `BlogPostId`). - C'est le verrou côté test du fix applicatif PostIt + serveur. -- `BlogAclApiTests.PostCircleAuthorization_never_returns_500` : une - `[Theory]` couvrant quatre shapes de payload (`{ circleId }`, - corps vide, `{ blogPostId }` seul, `{ circleId, blogPostId: 0 }`) - qui doivent tous retourner un statut différent de 500. Toute - réintroduction d'un chemin 500 dans le futur fera rougir ce test. -- `BlogAclApiTests.PostCircleAuthorization_dosent_return_500` et - `..._dosent_return_500_on_success` : entry points `[Fact]` qui - appellent la `[Theory]` ci-dessus avec un payload spécifique - chacun, pour pouvoir filtrer en isolation depuis la ligne de - commande ou le CI. -- Règle « Pas de `object` dans le code source applicatif » ajoutée - à `CONTRIBUTING.md` : types de retour, paramètres, champs, - propriétés, variables locales doivent être typés statiquement. - `dynamic` est interdit pour les mêmes raisons. - -### Changed -- `BlogAclApiController.CheckOwner` devient `CheckOwnerAsync` et - utilise `FirstOrDefaultAsync` au lieu de `First`, supprimant - l'appel LINQ synchrone sur le fil de la requête et retournant - `false` sur cercle manquant (le contrôleur mappe déjà cela vers - `ChallengeResult`). -- `BlogsWebServerFixture` seed `alice`, son `Circle` et son - `BlogPost` une seule fois au démarrage du host, sur la - `SqliteConnection` partagée (`Cache=Shared`). Le précédent - `EnsureDeleted` au début de chaque test fermait la connexion - statique et détruisait le store `:memory:` pour tous les autres - `DbContext` ; il est retiré au profit d'un `EnsureCreated` - idempotent. - -### Fixed -- `POST /api/v1/blogacl` ne retourne plus 500 sur les payloads - dont `BlogPostId` est absent ou à zéro. Le contrôleur rejette - `BlogPostId <= 0` avec `400 BadRequest` avant que la requête - n'atteigne `SaveChangesAsync`. L'incident de prod du 2026-08-21 - sur mercure (PostIt envoyant seulement `circleId`, le serveur - voyant `BlogPostId = default(long) = 0` et EF Core levant - `InvalidOperationException` sur l'INSERT) n'est plus atteignable. -- PostIt `PostAclDialogViewModel.AddAsync` envoie désormais le - payload explicite `PostAccessControlRulePayload { CircleId, - BlogPostId }` au lieu de l'ancien `CircleAuthorization { - CircleId }`. Le DTO serveur `PostAccessControlRulePayload` est - introduit dans `Yavsc.Abstract` pour porter le contrat. - ## [1.0.7] - preview ### Added @@ -170,7 +119,6 @@ pour la production des paquets `.deb`. the same user-visible switch without a schema change. [Unreleased]: https://github.com/pazof/yavsc/compare/HEAD -[1.0.8-rc1]: https://github.com/pazof/yavsc/compare/1.0.7...1.0.8-rc1 [1.0.7]: https://github.com/pazof/yavsc/compare/1.0.6...1.0.7 [1.0.6]: https://github.com/pazof/yavsc/compare/1.0.5...1.0.6 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e528b7a4..4730e18c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,57 +49,6 @@ Les tests sont répartis en : item « Tests d'intégration smoke par BC ». - `src/PostIt.Tests/` — tests unitaires du client desktop PostIt. -## Navigation (PostIt) - -La navigation est centralisée dans -`App.PushPageAsync(ViewModelBase vm)` (`src/PostIt/PostIt/App.axaml.cs`). -Pour ouvrir un écran, un ViewModel (généralement dans une -commande `[RelayCommand]`) appelle -`await ((App)App.Current!).PushPageAsync(targetVm).ConfigureAwait(true);`. -`PushPageAsync` résout la `Control` correspondante via le -`ViewLocator` (un `IDataTemplate` enregistré dans -`Application.DataTemplates` au boot), l'identifie comme -`Page`, lui assigne le VM comme `DataContext`, et appelle -`NavRoot.PushAsync(page)`. Une garde anti-empilement -compare par référence la nouvelle page au sommet courant -de la stack pour éviter un push doublon. - -Pour qu'une nouvelle page soit navigable, il faut *deux* -enregistrements : la page dans le DI (`AddTransient` -ou `AddSingleton`) **et** une case dans le `switch` -de `ViewLocator.Build`. Si l'un manque, l'app affiche -"No view for X" sans crash. - -Règles : - -- On n'instancie jamais une `View` à la main depuis un - ViewModel, on ne récupère jamais une `View` depuis la DI - directement dans un ViewModel. -- Le ViewModel qui déclenche la nav ne pousse pas lui-même - la page ; il appelle `App.PushPageAsync(vm)` et laisse - `App` orchestrer le `PushAsync` physique. -- Le ViewModel qui déclenche la nav ne capture pas de - référence à `MainWindow` ou `NavigationPage`. Il passe - par `App.Current` (l'app Avalonia est un singleton). - -Exemple canonique (depuis `MainPageViewModel`) : - -```csharp -[RelayCommand] -internal async Task OpenSettings() -{ - var settingsVm = ((App)App.Current!).ServiceProvider - .GetRequiredService(); - await ((App)App.Current!).PushPageAsync(settingsVm) - .ConfigureAwait(true); -} -``` - -Cf. [doc/architecture/postit.md](./doc/architecture/postit.md) -pour la topologie complète (host de navigation, -`SessionStatusViewModel`, signaux de cycle de vie vs nav -utilisateur). - ## Conventions de code Le repo applique `.editorconfig` (UTF-8, LF, `indent_size = 4` en @@ -115,13 +64,6 @@ Quelques règles non capturées par `.editorconfig` : - Préférer les types BCL (`int`, `string`) aux types framework (`Int32`, `String`). - Préférer les expressions de pattern matching aux casts explicites. -- **Pas de `object` dans le code source applicatif.** Types de retour, - paramètres, champs, propriétés, variables locales : tout doit être - typé statiquement. `dynamic` est interdit pour les mêmes raisons. - Un cast en `object` est presque toujours le symptôme d'un contrat - qu'on a laissé s'effriter (DTO, payload, handler) — refactore - le contrat (record typé, DTO dédié, méthode dédiée) au lieu de - shimer avec un cast. ## Branches & commits diff --git a/Directory.Packages.props b/Directory.Packages.props index 84380e44..e4b09159 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -18,7 +18,6 @@ - diff --git a/README.md b/README.md index 8e630612..f3ca0e46 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,20 @@ # Yavsc - [![The latest release made in the repository](https://forgejo.pschneider.fr/notazof/yavsc/badges/release.svg)](https://forgejo.pschneider.fr/notazof/yavsc/releases/latest) C'est une application mettant en oeuvre une prise de contact entre un demandeur de services et son éventuel prestataire associé. # Statut actuel des actions Forgejo +[![Build and test](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/buildAndTest.yml/badge.svg)](https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=buildAndTest.yml) -* [![Build and test](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/buildAndTest.yml/badge.svg)](https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=buildAndTest.yml) - -* [![Release](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/release.yml/badge.svg)]( +[![Release](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/release.yml/badge.svg)]( https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=release.yml ) +[![The latest release made in the repository](https://forgejo.pschneider.fr/notazof/yavsc/badges/release.svg)](https://forgejo.pschneider.fr/notazof/yavsc/releases/latest) + + # Statut actuel des actions GitHub * [![Build and Push Yavsc Apk](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml) diff --git a/contrib/Makefile b/contrib/Makefile index 151045db..62e1e22d 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,4 +1,4 @@ -APP_PROJECT_NAMES=Org Blogs +APP_PROJECT_NAMES=Api Org Blogs SLNDIR=.. include $(SLNDIR)/.env @@ -7,6 +7,7 @@ include .env generated/: @mkdir -p $@ +generated/yavscApi.service: generated/yavscOrg.service: generated/yavscBlogs.service: @@ -33,11 +34,12 @@ generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env @echo Created service file: $@ -copy-services: copy-service-Org copy-service-Blogs +copy-services: copy-service-Org copy-service-Api copy-service-Blogs copy-service-Org: /etc/systemd/system/yavscOrg.service +copy-service-Api: /etc/systemd/system/yavscApi.service copy-service-Blogs: /etc/systemd/system/yavscBlogs.service -copy-binaries: build_publish_Org build_publish_Blogs stop-services +copy-binaries: build_publish_Org build_publish_Api build_publish_Blogs stop-services @for project in $(APP_PROJECT_NAMES); \ do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \ echo "$${project} -> $${LCAPI}" ; \ @@ -53,7 +55,7 @@ copy-binaries: build_publish_Org build_publish_Blogs stop-services done @sudo chown -R $(USER_AND_GROUP) $(BASEAPPDIR) -/etc/systemd/system/yavsc%.service: generated/yavsc%.service +/etc/systemd/system/yavsc%.service: generated/yavsc%.service sudo cp $^ $@ sudo chown root:root $@ @@ -63,14 +65,14 @@ build_publish_%: clean_publish_dir_% clean_publish_dir_%: @rm -rf $(SLNDIR)/src/Yavsc.$*/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish -install: build_publish copy-binaries copy-services +install: build_publish copy-binaries copy-services @sudo systemctl daemon-reload @for project in $(APP_PROJECT_NAMES); \ do \ sudo systemctl enable yavsc$${project} ; \ sudo systemctl start yavsc$${project} ; \ done - + reinstall: copy-binaries @sync @for project in $(APP_PROJECT_NAMES); do \ @@ -84,12 +86,13 @@ stop-services: $(SLNDIR)/src/Yavsc.Org/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish $(SLNDIR)/src/Yavsc.Blogs/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish +$(SLNDIR)/src/Yavsc.Api/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish -showConfig: +showConfig: @echo CONFIGURATION: $(CONFIGURATION) @echo BASEAPPDIR: $(BASEAPPDIR) clean: @rm -rf generated -.PHONY: build_publish mep showConfig copy-service-Org copy-service-Blogs reinstall clean +.PHONY: build_publish mep showConfig copy-service-Api copy-service-Org copy-service-Blogs reinstall clean diff --git a/doc/architecture/postit.md b/doc/architecture/postit.md index 70f3f2fd..77d0a252 100644 --- a/doc/architecture/postit.md +++ b/doc/architecture/postit.md @@ -129,51 +129,30 @@ le DI est construit. Ordre, dans cet ordre : ## Navigation Le host de navigation est un `NavigationPage x:Name="NavRoot"` -posé sur `MainWindow.axaml`. La pile est gérée par deux -mécanismes distincts : +posé sur `MainWindow.axaml`. La pile est gérée par les +événements du `SessionStatusViewModel` : -1. **Nav utilisateur (VM-first)** : un ViewModel (souvent dans - une commande `[RelayCommand]`) appelle - `await ((App)App.Current!).PushPageAsync(targetVm).ConfigureAwait(true);`. - `App.PushPageAsync` (`src/PostIt/PostIt/App.axaml.cs`) - résout la `Control` correspondante via le `ViewLocator` - enregistré dans `Application.DataTemplates`, l'identifie - comme `Page`, lui assigne le VM comme `DataContext`, et - appelle `NavRoot.PushAsync(page)`. C'est le seul chemin - pour les boutons de la toolbar, les `OpenSettings` / - `OpenCircles` / `ManageAcl` / `OpenSignatureDev`, et - toute autre nav déclenchée par un ViewModel. - -2. **Signaux de cycle de vie** : le `SessionStatusViewModel` - lève des événements consommés dans - `App.OnFrameworkInitializationCompleted` pour orchestrer - la nav de boot : - - | Événement | Effet | - |---------------------|------------------------------------------------------------------| - | `LoginSucceeded` | `PushAsync(MainPage)` au-dessus de `HomePage` (post-login). | - | `LogoutCompleted` | `PopToRootAsync()` (revient à `HomePage`). | - - Ces events ne sont **pas** un canal de nav utilisateur ; ils - portent une transition d'état applicatif (authentification - établie / perdue) et c'est `App` qui choisit d'en faire une - transition de pile. +| Événement | Effet | +|---------------------------------|------------------------------------------------------------------------| +| `LoginSucceeded` | `PushAsync(MainPage)` au-dessus de `HomePage`. | +| `LogoutCompleted` | `PopToRootAsync()` (revient à `HomePage`). | +| `OpenSettingsRequested` | `PushAsync(SettingsPage)` au-dessus de la page courante. | ### Garde anti-empilement `NavigationPage.PushAsync` n'est pas idempotent : pousser deux fois la même instance l'empile deux fois, et l'utilisateur doit -taper **Retour** N fois pour sortir. La garde est implémentée -dans `App.PushPageAsync` (et consommée par tous les chemins -de nav utilisateur) : +taper **Retour** N fois pour sortir. Le handler +`OpenSettingsRequested` est gardé pour bloquer ce cas : ```csharp -var stack = window.NavRoot.NavigationStack; -if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page)) +var settingsPage = provider.GetRequiredService(); +var stack = w.NavRoot.NavigationStack; +if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], settingsPage)) { - return Task.CompletedTask; // déjà au sommet, no-op silencieux + return; // déjà au sommet, no-op silencieux } -return window.NavRoot.PushAsync(page); +_ = w.NavRoot.PushAsync(settingsPage); ``` La comparaison est par référence, pas par type : on ne veut @@ -199,11 +178,9 @@ qui ne tiendrait plus). - `SessionStatusViewModel` est le seul VM avec une durée de vie **process-entière** (singleton). Il survit à toutes les navigations, expose `HasValidSession` en continu, et porte - les événements de cycle de vie consommés par `App` pour - orchestrer la nav de boot (`LoginSucceeded`, - `LogoutCompleted`). La nav utilisateur déclenchée par - l'utilisateur passe par `App.PushPageAsync(vm)`, pas par - un événement du `SessionStatusViewModel`. + les trois événements qui pilotent la navigation + (`LoginSucceeded`, `LogoutCompleted`, + `OpenSettingsRequested`). - `MainPageViewModel` / `HomePageViewModel` / `SignaturePageViewModel` sont `Transient` — une nouvelle @@ -256,14 +233,10 @@ pour `[RelayCommand]`". `ViewLocator.Build`. Oublier le `ViewLocator` est silencieux (juste un TextBlock "No view for X"), pas une exception. - **Ajouter un événement global de navigation** (par ex. - "Push après payment success") : ne pas capturer `MainWindow` - ni `NavigationPage` depuis le VM. La nav passe par - `App.PushPageAsync(vm)` dans tous les cas : soit le VM - appelle la méthode directement depuis une commande - (`[RelayCommand]`), soit un handler abonné à un événement - d'un singleton (cf. `SessionStatusViewModel`) l'appelle. - Garder les VMs découplés du - `IClassicDesktopStyleApplicationLifetime`. + "Push après payment success") : passer par un événement sur + un VM singleton (cf. `SessionStatusViewModel.OpenSettingsRequested`), + pas par une référence à `MainWindow` depuis le VM. Garder + les VMs découplés du `IClassicDesktopStyleApplicationLifetime`. - **Modifier l'OIDC** : la fiche à lire est [postit-oidc.md](postit-oidc.md), pas celle-ci. Cette fiche ne ré-explique ni le flow, ni le pipe, ni le custom scheme. diff --git a/src/PostIt.Tests/AddCircleMemberDialogTests.cs b/src/PostIt.Tests/AddCircleMemberDialogTests.cs deleted file mode 100644 index 289ff727..00000000 --- a/src/PostIt.Tests/AddCircleMemberDialogTests.cs +++ /dev/null @@ -1,156 +0,0 @@ - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Headless.XUnit; -using Microsoft.Extensions.DependencyInjection; -using PostIt.Services; -using PostIt.ViewModels; -using PostIt.Views; -using Yavsc.Api.Client; - -namespace PostIt.Tests; - -/// -/// Headless coverage for the two interactive buttons of the -/// "add a circle member" modal: "Ajouter" and "Fermer". -/// -/// The dialog is pushed on top of -/// via the canonical App.PushPageAsync pipeline (the -/// same path CirclesPageViewModel.OpenAddMemberAsync -/// uses). The test asserts on NavRoot.NavigationStack -/// size before and after each click — the user's bug was "I -/// click and nothing happens", so the failure mode is a stack -/// that doesn't shrink for "Fermer", and a "Confirmer" event -/// that the host doesn't pick up for "Ajouter" (the dialog -/// stays up = stack doesn't shrink either). -/// -/// Pattern follows MainPageButtonsTests: name -/// every interactive control in XAML with x:Name, -/// click via button.Command?.Execute(...) + flush -/// any async command before asserting. -/// -public class AddCircleMemberDialogTests -{ - /// - /// Stand-in that returns an - /// empty list. The dialog's "Rechercher" button is never - /// exercised in these tests — the picker starts empty and - /// the "Ajouter" button's IsEnabled is bound to a null - /// selection, which keeps the click harmless even when - /// its - /// command does fire. - /// - private sealed class StubUserDirectory : IUserDirectory - { - public Task> SearchAsync(string query, CancellationToken ct = default) - => Task.FromResult>(new List()); - } - - private sealed class ThrowingApi : YavscApiClient - { - public ThrowingApi() : base( - new Settings - { - Authentication = new AuthenticationSettings - { - Authority = "https://stub.invalid", - ClientId = "stub", - Scopes = new[] { "openid" }, - }, - }, - new TokenStore(System.IO.Path.GetTempFileName())) - { } - } - - private static async Task BuildApp() - { - TestAppContext context = new TestAppContext - { - - - }; - - return context; - } - /// - /// Mount a real , build a minimal - /// DI graph, push then the - /// on top of it. - /// Returns the stack size so the test can pin the delta. - /// The graph exposes IUserDirectory (so the dialog - /// VM resolves its dependency) and AddCircleMemberDialog - /// (so ViewLocator can resolve it from the VM). - /// - private static async Task Mount() - { - TestAppContext context = new TestAppContext(); - - var api = new ThrowingApi(); - var circleClient = new CircleApiClient(api, "http://localhost/"); - - var services = new ServiceCollection(); - services.AddSingleton(new Settings()); - services.AddSingleton(new StubUserDirectory()); - services.AddSingleton(circleClient); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - var sp = services.BuildServiceProvider(); - - context.Window = new MainWindow(); - context.App = (PostIt.App)Application.Current!; - context.App.DataTemplates.Clear(); - context.App.DataTemplates.Add(new ViewLocator(sp)); - context.App.AttachMainWindow(context.Window); - context.Window.Show(); - - context.page = sp.GetRequiredService(); - context.Window.NavRoot.PushAsync(context.page).GetAwaiter().GetResult(); - - // The "Ajouter un membre" command on CirclesPage builds - // the dialog VM directly (it knows the directory from - // the service provider) and pushes it via App.PushPage. - await context.App.PushPageAsync(sp.GetRequiredService()); - - context.dialog = context.Window.NavRoot.NavigationStack[^1] as AddCircleMemberDialog - ?? throw new System.InvalidOperationException("Dialog page not at top of stack."); - - return context; - } - - /// - /// Click the "Fermer" button on the dialog and assert the - /// nav stack shrinks by exactly one. - /// - [AvaloniaFact] - public async Task Close_button_pops_dialog_off_nav_stack() - { - // Arrange: stack starts at 2 (CirclesPage + dialog). - var context = await Mount(); - var window = context.Window!; - - var stackBefore = window.NavRoot.NavigationStack.Count; - Assert.Equal(2, stackBefore); - - // Act - var dialog = window.NavRoot.NavigationStack[^1] as AddCircleMemberDialog ?? throw new System.InvalidOperationException(); - // The "Fermer" button uses a Click handler (not a - // Command), so RaiseEvent(Button.ClickEvent) is the - // right way to fire it from headless code. Executing - // Command would no-op because no Command is bound. - - // FIXME Assert.NotNull(dialog.CloseButton): - // in order to click it by its def : - - // dialog.CloseButton.RaiseEvent(new Avalonia.Interactivity.RoutedEventArgs(Button.ClickEvent)); - - // The workaround is to execute the action like it's written : - await context.App!.GoBackAsync(); - - // Assert: stack -1, the top is the CirclesPage again. - Assert.True(window.NavRoot.NavigationStack.Count == stackBefore - 1, - $"Click on 'Fermer' must shrink the nav stack by one. Before: {stackBefore}, after: {window.NavRoot.NavigationStack.Count}."); - Assert.IsType(window.NavRoot.NavigationStack[^1]); - } -} diff --git a/src/PostIt.Tests/BlogPostAuthorDtoTests.cs b/src/PostIt.Tests/BlogPostAuthorDtoTests.cs deleted file mode 100644 index 895f220e..00000000 --- a/src/PostIt.Tests/BlogPostAuthorDtoTests.cs +++ /dev/null @@ -1,169 +0,0 @@ -using System.Text.Json; -using Yavsc.Blogspot; - -namespace PostIt.Tests; - -/// -/// Round-trip tests for the wire shape of a blog post as -/// serialised by Yavsc.Blogs and consumed by PostIt. -/// -/// -/// Background: in 1.0.7, BlogPostDto.Author was typed as -/// the abstract interface IApplicationUser. System.Text.Json -/// cannot materialise an interface without a polymorphic -/// converter, so the "load posts" call from PostIt crashed when -/// the server returned a post with a populated Author -/// object. The fix replaced IApplicationUser with a thin -/// concrete DTO, BlogPostAuthorDto, embedded directly in -/// BlogPostDto.Author. -/// -/// -/// -/// These tests pin the wire shape: a JSON document with an -/// Author object must deserialise without throwing and -/// must round-trip the three fields PostIt exposes in the UI -/// (Id, UserName, Avatar). They are intentionally placed in -/// PostIt.Tests — the client-side assembly — so the -/// regression is caught at the deserialisation boundary, where -/// it actually manifested in production. -/// -/// -public class BlogPostAuthorDtoTests -{ - private static readonly JsonSerializerOptions CaseInsensitiveJson - = new() { PropertyNameCaseInsensitive = true }; - - [Fact] - public void BlogPostDto_deserialises_with_populated_author() - { - // A representative JSON shape the server would emit for - // GET /api/BlogApi. The Author object is fully populated - // — that's the shape that used to break deserialisation - // when Author was typed as the abstract IApplicationUser - // interface. - var json = """ - { - "id": 42, - "title": "Premier billet", - "article": "Contenu", - "photo": null, - "dateCreated": "2026-08-01T12:00:00Z", - "dateModified": "2026-08-02T12:00:00Z", - "userCreated": "alice", - "userModified": "alice", - "authorId": "u-alice", - "isPublished": true, - "author": { - "id": "u-alice", - "userName": "alice", - "avatar": "/avatars/alice.png" - } - } - """; - - var post = JsonSerializer.Deserialize(json, CaseInsensitiveJson); - - Assert.NotNull(post); - Assert.Equal(42, post!.Id); - Assert.Equal("Premier billet", post.Title); - Assert.Equal("u-alice", post.AuthorId); - Assert.True(post.IsPublished); - - // The actual regression coverage: Author must - // materialise as a concrete DTO, not be left null because - // of a JsonException on IApplicationUser. - Assert.NotNull(post.Author); - Assert.Equal("u-alice", post.Author!.Id); - Assert.Equal("alice", post.Author.UserName); - Assert.Equal("/avatars/alice.png", post.Author.Avatar); - } - - [Fact] - public void BlogPostDto_deserialises_when_author_is_null() - { - // The server is allowed to omit Author (the field is - // nullable on the wire — it maps to a navigation - // property that may not have been Included). The client - // must accept that shape without throwing. - var json = """ - { - "id": 7, - "title": "Sans auteur", - "article": null, - "photo": null, - "dateCreated": "2026-08-01T12:00:00Z", - "dateModified": "2026-08-01T12:00:00Z", - "userCreated": "system", - "userModified": "system", - "authorId": "system", - "isPublished": false, - "author": null - } - """; - - var post = JsonSerializer.Deserialize(json, CaseInsensitiveJson); - - Assert.NotNull(post); - Assert.Null(post!.Author); - Assert.Equal("system", post.AuthorId); - } - - [Fact] - public void BlogPostDto_deserialises_when_author_field_is_missing() - { - // Forward-compatibility: an older server that doesn't - // emit the Author field at all. Should not throw. - var json = """ - { - "id": 9, - "title": "Ancien format", - "article": "Pas d'auteur dans la charge utile", - "photo": null, - "dateCreated": "2026-07-01T12:00:00Z", - "dateModified": "2026-07-01T12:00:00Z", - "userCreated": "bob", - "userModified": "bob", - "authorId": "u-bob", - "isPublished": true - } - """; - - var post = JsonSerializer.Deserialize(json, CaseInsensitiveJson); - - Assert.NotNull(post); - Assert.Null(post!.Author); - } - - [Fact] - public void BlogPostAuthorDto_serialises_back_to_expected_json_shape() - { - // Pin the wire shape on the way out too. The server - // builds BlogPostAuthorDto from an ApplicationUser and - // PostIt receives it as JSON; if the field names - // change (e.g. case) the round-trip on the client side - // is what would silently break. - // - // The server emits camelCase (ASP.NET Core's Web - // defaults — PropertyNamingPolicy = CamelCase). We - // mirror that here so the test reflects what the wire - // actually looks like. PropertyNameCaseInsensitive on - // the client deserialiser means we don't have to - // hardcode the casing for the inbound assertions. - var author = new BlogPostAuthorDto - { - Id = "u-alice", - UserName = "alice", - Avatar = "/avatars/alice.png" - }; - - var json = JsonSerializer.Serialize(author, - new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }); - - using var doc = JsonDocument.Parse(json); - var root = doc.RootElement; - - Assert.True(root.TryGetProperty("id", out _)); - Assert.True(root.TryGetProperty("userName", out _)); - Assert.True(root.TryGetProperty("avatar", out _)); - } -} diff --git a/src/PostIt.Tests/MainPageButtonsTests.cs b/src/PostIt.Tests/MainPageButtonsTests.cs deleted file mode 100644 index 767f9c2e..00000000 --- a/src/PostIt.Tests/MainPageButtonsTests.cs +++ /dev/null @@ -1,239 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Headless; -using Avalonia.Headless.XUnit; -using Avalonia.Input; -using Avalonia.Interactivity; -using CommunityToolkit.Mvvm.Input; -using Microsoft.Extensions.DependencyInjection; -using Yavsc.Api.Client; -using Yavsc.Blogspot; -using PostIt.Services; -using PostIt.ViewModels; -using PostIt.Views; - -namespace PostIt.Tests; - -/// -/// Regression coverage for the three toolbar buttons on -/// that the user reported as inoperative: -/// "ACL", "Mes cercles", and "[DEV] Signature". -/// -/// Pattern (per the Avalonia headless testing docs — -/// TestableApp.Headless.XUnit/CalculatorTests): name every -/// interactive control in the XAML with x:Name="...", then -/// in the test focus the named control and raise the click via -/// window.KeyPressQwerty(PhysicalKey.Enter, ...). This is -/// the supported path — searching the visual tree via -/// GetVisualDescendants().OfType<Button>() for a -/// button by Content text is brittle and was tried first; it does -/// not work reliably when the page is hosted inside an -/// , which wraps the -/// pushed page in an internal container that the visual-tree walk -/// does not always expose under headless. -/// -/// The assertion is on the post-click top of -/// : -/// the user's bug is "I click and the dialog / page never opens", -/// so the test fails when the click doesn't push anything onto the -/// stack. We pin γ + sniff léger — the new top must be a non-null -/// , but we do not yet assert the concrete type -/// (that would require a fully stubbed App.ServiceProvider, -/// which is the next iteration of this suite). -/// -/// Each test exercises the bit that would silently break if -/// the wiring was reverted: -/// -/// "ACL" — click with a selected post pushes a page onto -/// the stack. -/// "Mes cercles" — click pushes a page onto the stack. -/// "[DEV] Signature" — click pushes a page onto the -/// stack. -/// -/// -public class MainPageButtonsTests -{ - /// - /// Fake that throws on any - /// wire call. These tests never invoke a command that hits - /// the API — only the click → nav side of the pipeline is - /// asserted. - /// - private sealed class ThrowingApi : YavscApiClient - { - public ThrowingApi() : base( - new Settings - { - Authentication = new AuthenticationSettings - { - Authority = "https://stub.invalid", - ClientId = "stub", - Scopes = new[] { "openid" }, - }, - }, - new TokenStore(System.IO.Path.GetTempFileName())) - { } - } - - private static MainPageViewModel MakeViewModel(BlogPostDto? selectedPost = null) - { - var api = new ThrowingApi(); - var blog = new BlogApiClient(api, "http://localhost/"); - var circle = new CircleApiClient(api, "http://localhost/"); - var acl = new BlogAclApiClient(api, "http://localhost/"); - // Minimal DI graph: only what MainPageViewModel resolves - // when the user clicks a navigation button. Today that's - // SignaturePageViewModel / CirclesPageViewModel / ACL - // dependencies. The graph intentionally stays local to this - // suite to avoid side effects from App.BuildServices() (real - // token-store wiring). - var services = new ServiceCollection(); - services.AddSingleton(new Settings()); - services.AddSingleton(circle); - services.AddSingleton(acl); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - var vm = new MainPageViewModel(blog, services: services.BuildServiceProvider()); - if (selectedPost is not null) vm.SelectedPost = selectedPost; - return vm; - } - - /// - /// Mount a real (as - /// SessionStatusBannerTests does), push a - /// with the given VM onto - /// NavRoot. PushAsync is awaited (via - /// GetAwaiter().GetResult()) so the page is on the - /// nav stack before the test tries to interact with its - /// named buttons. The window is shown so the visual tree is - /// realised and KeyPressQwerty has a real - /// to dispatch against. - /// - private static (MainWindow window, MainPage page) MountMainPage(MainPageViewModel vm) - { - var window = new MainWindow(); - var page = new MainPage { DataContext = vm }; - var app = (PostIt.App)Application.Current!; - if (vm.Services is not null) - { - app.DataTemplates.Clear(); - app.DataTemplates.Add(new ViewLocator(vm.Services)); - } - app.AttachMainWindow(window); - window.Show(); - window.NavRoot.PushAsync(page).GetAwaiter().GetResult(); - return (window, page); - } - - /// - /// Click a button by focusing it and pressing Enter — the - /// supported headless pattern (cf. CalculatorTests in the - /// Avalonia.Samples repo). Returns the nav-stack count - /// before the click so the caller can assert on the delta. - /// KeyPressQwerty is dispatched on the - /// itself — it is the that owns the - /// headless implementation, and routing the key through any - /// descendant TopLevel (e.g. one obtained via - /// TopLevel.GetTopLevel(button)) fails with a - /// NullReferenceException from the headless impl - /// because the descendant does not carry the - /// PlatformHandle the harness expects. - /// - private static int ClickAndCapture(MainWindow window, Button button) - { - var stackBefore = window.NavRoot.NavigationStack.Count; - button.Command?.Execute(button.CommandParameter); - if (button.Command is IAsyncRelayCommand asyncCommand) - { - asyncCommand.ExecutionTask?.GetAwaiter().GetResult(); - } - return stackBefore; - } - - [AvaloniaFact] - public void Acl_button_click_pushes_a_page_onto_nav_stack() - { - // Arrange: a VM whose SelectedPost is non-null so - // CanManageAcl evaluates to true and the button is - // armed. - var post = new BlogPostDto - { - Id = 42, - Title = "An existing post", - AuthorId = "u-alice" - }; - var vm = MakeViewModel(post); - var (window, page) = MountMainPage(vm); - - // Sanity: the button's command is bound and CanExecute - // is true. If this fails, the bug is upstream (XAML - // binding) and the rest of the test is moot. - var aclButton = page.ManageAclButton; - Assert.NotNull(aclButton.Command); - Assert.True(aclButton.Command.CanExecute(null)); - - // Act - var stackBefore = ClickAndCapture(window, aclButton); - - // Assert γ + sniff léger: stack grew, new top is a Page. - Assert.True(window.NavRoot.NavigationStack.Count > stackBefore, - $"Click on ACL must push a new page onto the nav stack. Stack size before: {stackBefore}, after: {window.NavRoot.NavigationStack.Count}."); - var pushed = window.NavRoot.NavigationStack.Last(); - Assert.NotNull(pushed); - Assert.IsAssignableFrom(pushed); - } - - [AvaloniaFact] - public void Circles_button_click_pushes_a_page_onto_nav_stack() - { - // Arrange: OpenCircles has no CanExecute guard today — - // any click should fire it and push the page. - var vm = MakeViewModel(); - var (window, page) = MountMainPage(vm); - - var circlesButton = page.OpenCirclesButton; - Assert.NotNull(circlesButton.Command); - - // Act - var stackBefore = ClickAndCapture(window, circlesButton); - - // Assert - Assert.True(window.NavRoot.NavigationStack.Count > stackBefore, - "Click on 'Mes cercles' must push a new page onto the nav stack."); - var pushed = window.NavRoot.NavigationStack.Last(); - Assert.NotNull(pushed); - Assert.IsAssignableFrom(pushed); - } - - [AvaloniaFact] - public void Signature_dev_button_click_pushes_a_page_onto_nav_stack() - { - // Arrange: the "[DEV] Signature" button is bound to the - // MainPageViewModel.OpenSignatureDevCommand [RelayCommand]. - // The click must push SignaturePage on top of NavRoot. - // The ServiceCollection registered in MakeViewModel provides - // SignaturePageViewModel so the command can resolve it via - // DI and call App.PushPage; the ViewLocator - // then maps SignaturePageViewModel -> SignaturePage and - // the binding pushes the page. - var vm = MakeViewModel(); - var (window, page) = MountMainPage(vm); - - var signatureButton = page.OpenSignatureDevButton; - Assert.NotNull(signatureButton.Command); - Assert.True(signatureButton.Command.CanExecute(null)); - - // Act - var stackBefore = ClickAndCapture(window, signatureButton); - - // Assert - Assert.True(window.NavRoot.NavigationStack.Count > stackBefore, - "Click on '[DEV] Signature' must push a new page onto the nav stack."); - var pushed = window.NavRoot.NavigationStack.Last(); - Assert.NotNull(pushed); - Assert.IsAssignableFrom(pushed); - } -} diff --git a/src/PostIt.Tests/PostAclDialogTests.cs b/src/PostIt.Tests/PostAclDialogTests.cs deleted file mode 100644 index 95576778..00000000 --- a/src/PostIt.Tests/PostAclDialogTests.cs +++ /dev/null @@ -1,234 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Net; -using System.Net.Http; -using System.Text; -using System.Text.Json; -using System.Threading; -using System.Threading.Tasks; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Headless.XUnit; -using Microsoft.Extensions.DependencyInjection; -using PostIt.Services; -using PostIt.ViewModels; -using PostIt.Views; -using Yavsc.Abstract.Identity.Security; -using Yavsc.Api.Client; -using Yavsc.Api.Client.Dtos; -using Yavsc.Blogspot; - -namespace PostIt.Tests; - -/// -/// Regression coverage for the user-reported bug: -/// PostAclDialogViewModel.LoadAsync was never invoked, -/// so MyCircles and AclEntries were empty when the -/// dialog opened (the dropdown showed "Choisir un cercle..." and -/// the list was blank, with no error to hint at why). -/// -/// The fix wires 's constructor -/// to trigger LoadAsync on the first -/// AttachedToVisualTree, and the VM guards re-entry via -/// _loaded. Two tests pin that contract: -/// -/// LoadAsync_runs_once_on_visual_attachment: HTTP -/// traffic shows up after the dialog is mounted. -/// LoadAsync_is_idempotent: a second explicit call -/// to LoadAsync on the same VM hits the HTTP layer only -/// once (the _loaded gate). -/// -/// -/// HTTP is stubbed with a counter -/// that returns canned JSON -/// [] for every request. The handler counts calls so the -/// tests can assert "exactly one round-trip on mount" and -/// "exactly one round-trip after two calls to LoadAsync". This -/// is the same shape used by BearerScopeTests: real -/// subclass, real -/// with an injected handler, real -/// / -/// talking to it. -/// -public class PostAclDialogTests -{ - /// - /// that replies 200 with - /// [] (a valid JSON empty array, which both - /// GetMyAclAsync and GetMyCirclesAsync can - /// deserialize) and counts the number of requests. - /// - private sealed class CountingHttpHandler : HttpMessageHandler - { - public int RequestCount { get; private set; } - - protected override Task SendAsync( - HttpRequestMessage request, CancellationToken cancellationToken) - { - RequestCount++; - var response = new HttpResponseMessage(HttpStatusCode.OK) - { - Content = new StringContent("[]", Encoding.UTF8, "application/json"), - }; - return Task.FromResult(response); - } - } - - /// - /// Subclass of that routes HTTP - /// traffic through a caller-supplied - /// . Same recipe as - /// BearerScopeTests.TestableYavscApiClient — we - /// override CallAsync{T} to talk to our own - /// and skip the OIDC refresh path, - /// because the load-on-attach bug has nothing to do with - /// token refresh. - /// - private sealed class TestableYavscApiClient : YavscApiClient - { - private readonly HttpClient _http; - - public TestableYavscApiClient( - Settings settings, - TokenStore store, - HttpMessageHandler handler) - : base(settings, store, oidc: null!) - { - _http = new HttpClient(handler, disposeHandler: false); - } - - public override Task CallAsync( - HttpMethod method, string path, object? body = null, - CancellationToken ct = default) - { - var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path); - using var req = new HttpRequestMessage(method, absolute); - using var resp = _http.SendAsync(req, ct).GetAwaiter().GetResult(); - resp.EnsureSuccessStatusCode(); - using var stream = resp.Content.ReadAsStream(); - var dto = JsonSerializer.Deserialize(stream, - new JsonSerializerOptions { PropertyNameCaseInsensitive = true }); - return Task.FromResult(dto!); - } - } - - /// - /// Build a minimal DI graph exposing the two API clients - /// (backed by a stub HTTP handler) and the page itself, so - /// ViewLocator can resolve the dialog from the VM. - /// Returns the handler, the API clients, and the window so - /// the test can assert on request counts and push the - /// dialog via the canonical App.PushPageAsync path. - /// The DI graph is built into a local - /// that is NOT attached to : - /// rebinding the global DI mid-test would trample the - /// Settings singleton the rest of the harness depends on. - /// - private static (MainWindow window, BlogAclApiClient aclClient, CircleApiClient circleClient, CountingHttpHandler handler) Mount() - { - var handler = new CountingHttpHandler(); - var settings = new Settings(); - var api = new TestableYavscApiClient(settings, new TokenStore(System.IO.Path.GetTempFileName()), handler); - var aclClient = new BlogAclApiClient(api, settings.BusinessApiUrl); - var circleClient = new CircleApiClient(api, settings.BusinessApiUrl); - - var services = new ServiceCollection(); - services.AddSingleton(settings); - services.AddSingleton(api); - services.AddSingleton(aclClient); - services.AddSingleton(circleClient); - services.AddTransient(); - var sp = services.BuildServiceProvider(); - // Hold the sp alive for the test scope; otherwise the - // GC could collect the singletons between Mount() and - // the assertion below, and we'd lose the wiring to the - // CountingHttpHandler. - GC.KeepAlive(sp); - - var window = new MainWindow(); - var app = (App)Application.Current!; - app.DataTemplates.Clear(); - app.DataTemplates.Add(new ViewLocator(sp)); - app.AttachMainWindow(window); - window.Show(); - - return (window, aclClient, circleClient, handler); - } - - /// - /// The bug: opening the dialog never called LoadAsync, so - /// MyCircles/AclEntries were empty. After the fix, setting - /// the dialog's DataContext to a PostAclDialogViewModel - /// (the same path App.PushPageAsync takes) must trigger - /// exactly one LoadAsync round-trip (the parallel WhenAll - /// inside the VM counts as one request per backend call, - /// hence two HTTP requests total: GET /blogacl and GET - /// /circle). - /// - [AvaloniaFact] - public async Task LoadAsync_runs_once_on_DataContext_changed() - { - // Arrange - var (window, aclClient, circleClient, handler) = Mount(); - var post = new BlogPostDto { Id = 42, Title = "Test post" }; - - // Sanity: handler starts quiet. - Assert.Equal(0, handler.RequestCount); - - // Act: push the dialog via the canonical VM-first pipeline. - // The locator goes through the parameterless ctor of - // PostAclDialog, then App.PushPageAsync assigns DataContext, - // which our hook intercepts to trigger LoadAsync. - var vm = new PostAclDialogViewModel(post, aclClient, circleClient); - await ((App)Application.Current!).PushPageAsync(vm); - - // The dialog must be at the top of the nav stack and - // have its VM as DataContext. - var dialog = window.NavRoot.NavigationStack[^1] as PostAclDialog - ?? throw new InvalidOperationException("Dialog not at top of stack"); - Assert.Same(vm, dialog.DataContext); - - // Drain pending async work. LoadAsync is async and the - // DataContextChanged handler is fire-and-forget; a - // couple of loop turns is enough. We poll the handler - // counter because the dispatch back onto the headless - // dispatcher isn't strict — using a generous-but-bounded - // wait avoids test flakes. - var deadline = DateTime.UtcNow.AddSeconds(2); - while (handler.RequestCount < 2 && DateTime.UtcNow < deadline) - { - await Task.Delay(20); - } - - // Assert: exactly two GETs went out (one to /blogacl, - // one to /circle), both from the LoadAsync call. - Assert.Equal(2, handler.RequestCount); - - // And the VM's idempotency gate has flipped. - Assert.True(vm.Loaded); - } - - /// - /// The fix exposes a guard on the VM too: a second call to - /// LoadAsync on the same instance must NOT issue more HTTP - /// traffic. This protects against the - /// DataContextChanged-firing-twice case (DataContext - /// overwritten mid-life, edge cases in dialog re-use). - /// - [AvaloniaFact] - public async Task LoadAsync_is_idempotent() - { - // Arrange - var (_, aclClient, circleClient, handler) = Mount(); - var post = new BlogPostDto { Id = 99, Title = "Idempotency" }; - var vm = new PostAclDialogViewModel(post, aclClient, circleClient); - - // Act: invoke LoadAsync twice in a row. - await vm.LoadAsync(); - await vm.LoadAsync(); - - // Assert: the second call short-circuited on _loaded. - Assert.Equal(2, handler.RequestCount); - Assert.True(vm.Loaded); - } -} diff --git a/src/PostIt.Tests/PostIt.Tests.csproj b/src/PostIt.Tests/PostIt.Tests.csproj index b12c536e..54c40e8c 100644 --- a/src/PostIt.Tests/PostIt.Tests.csproj +++ b/src/PostIt.Tests/PostIt.Tests.csproj @@ -8,7 +8,7 @@ true 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3 + 1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada 1.1.0-beta.1 diff --git a/src/PostIt.Tests/TestAppContext.cs b/src/PostIt.Tests/TestAppContext.cs deleted file mode 100644 index 2843c965..00000000 --- a/src/PostIt.Tests/TestAppContext.cs +++ /dev/null @@ -1,11 +0,0 @@ -using PostIt.Views; - -namespace PostIt.Tests; - -internal class TestAppContext -{ - public MainWindow? Window {get; set; } - public CirclesPage? page {get; set; } - public AddCircleMemberDialog? dialog { get; set; } - public App? App { get; internal set; } -} diff --git a/src/PostIt.Tests/pslist b/src/PostIt.Tests/pslist deleted file mode 100644 index 0f1d73da..00000000 --- a/src/PostIt.Tests/pslist +++ /dev/null @@ -1,94 +0,0 @@ -UID PID PPID C STIME TTY TIME CMD -paul 1155 1 0 13:18 ? 00:00:00 /usr/lib/systemd/systemd --user -paul 1168 1155 0 13:18 ? 00:00:00 (sd-pam) -paul 1361 1155 0 13:18 ? 00:00:00 /usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only -paul 1364 1155 1 13:18 ? 00:01:19 /home/paul/.nvm/versions/node/v22.23.0/bin/node /home/paul/.nvm/versions/node/v22.23.0/lib/node_modules/openclaw/dist/index.js gateway --port 18789 -paul 1367 1155 0 13:18 ? 00:00:00 /usr/bin/pipewire -paul 1372 1155 0 13:18 ? 00:00:00 /usr/bin/pipewire -c filter-chain.conf -paul 1373 1155 0 13:18 ? 00:00:00 /usr/bin/wireplumber -paul 1374 1155 0 13:18 ? 00:00:00 /usr/bin/pipewire-pulse -paul 1444 1155 0 13:18 ? 00:00:00 /usr/bin/mpris-proxy -paul 2593 1155 0 13:19 ? 00:00:00 /usr/bin/gnome-keyring-daemon --foreground --components=pkcs11,secrets --control-directory=/run/user/1000/keyring -paul 2608 2487 0 13:19 tty2 00:00:00 /usr/libexec/gdm-x-session --run-script /usr/bin/gnome-session -paul 2617 2608 1 13:19 tty2 00:01:12 /usr/lib/xorg/Xorg vt2 -displayfd 3 -auth /run/user/1000/gdm/Xauthority -nolisten tcp -background none -noreset -keeptty -novtswitch -verbose 3 -paul 2647 2608 0 13:19 tty2 00:00:00 /usr/libexec/gnome-session-binary -paul 2785 1155 0 13:19 ? 00:00:00 /usr/libexec/at-spi-bus-launcher -paul 2792 2785 0 13:19 ? 00:00:00 /usr/bin/dbus-daemon --config-file=/usr/share/defaults/at-spi2/accessibility.conf --nofork --print-address 11 --address=unix:path=/run/user/1000/at-spi/bus_1 -paul 2802 1155 0 13:19 ? 00:00:00 /usr/libexec/gcr-ssh-agent --base-dir /run/user/1000/gcr -paul 2803 1155 0 13:19 ? 00:00:00 /usr/libexec/gnome-session-ctl --monitor -paul 2804 1155 0 13:19 ? 00:00:00 /usr/bin/ssh-agent -D -paul 2814 1155 0 13:19 ? 00:00:00 /usr/libexec/gvfsd -paul 2828 1155 0 13:19 ? 00:00:00 /usr/libexec/gvfsd-fuse /run/user/1000/gvfs -f -paul 2838 1155 0 13:19 ? 00:00:00 /usr/libexec/gnome-session-binary --systemd-service --session=gnome -paul 2874 1155 3 13:19 ? 00:02:13 /usr/bin/gnome-shell -paul 2896 2874 0 13:19 ? 00:00:01 /usr/libexec/mutter-x11-frames -paul 2902 1155 0 13:19 ? 00:00:00 /usr/libexec/at-spi2-registryd --use-gnome-session -paul 2918 1155 0 13:19 ? 00:00:00 /usr/libexec/xdg-desktop-portal -paul 2933 1155 0 13:19 ? 00:00:00 /usr/libexec/xdg-permission-store -paul 2938 1155 0 13:19 ? 00:00:00 /usr/libexec/xdg-document-portal -paul 2971 1155 0 13:19 ? 00:00:00 /usr/libexec/gnome-shell-calendar-server -paul 2976 1155 0 13:19 ? 00:00:00 /usr/libexec/dconf-service -paul 2992 1155 0 13:19 ? 00:00:00 /usr/libexec/evolution-source-registry -paul 2994 1155 0 13:19 ? 00:00:00 /usr/bin/gjs -m /usr/share/gnome-shell/org.gnome.Shell.Notifications -paul 3012 1155 0 13:19 ? 00:00:12 /usr/bin/ibus-daemon --panel disable --xim -paul 3013 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-a11y-settings -paul 3014 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-color -paul 3015 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-datetime -paul 3016 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-housekeeping -paul 3018 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-keyboard -paul 3024 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-media-keys -paul 3025 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-power -paul 3027 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-print-notifications -paul 3029 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-rfkill -paul 3030 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-screensaver-proxy -paul 3035 2838 0 13:19 ? 00:00:05 /usr/bin/gnome-software --gapplication-service -paul 3037 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-sharing -paul 3042 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-smartcard -paul 3048 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-sound -paul 3054 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-usb-protection -paul 3057 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-wacom -paul 3058 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-xsettings -paul 3059 2838 0 13:19 ? 00:00:00 /usr/libexec/evolution-data-server/evolution-alarm-notify -paul 3064 2838 0 13:19 ? 00:00:00 /usr/bin/kalendarac -paul 3070 2838 0 13:19 ? 00:00:00 /usr/libexec/gsd-disk-utility-notify -paul 3088 2838 0 13:19 ? 00:00:00 /usr/bin/kdeconnectd -paul 3168 1155 0 13:19 ? 00:00:00 /usr/bin/gjs -m /usr/share/gnome-shell/org.gnome.ScreenSaver -paul 3172 1155 0 13:19 ? 00:00:00 /usr/libexec/gsd-printer -paul 3207 3012 0 13:19 ? 00:00:00 /usr/libexec/ibus-memconf -paul 3208 3012 0 13:19 ? 00:00:06 /usr/libexec/ibus-extension-gtk3 -paul 3214 1155 0 13:19 ? 00:00:00 /usr/libexec/ibus-x11 --kill-daemon -paul 3216 1155 0 13:19 ? 00:00:00 /usr/libexec/ibus-portal -paul 3218 1155 0 13:19 ? 00:00:00 /usr/libexec/localsearch-3 -paul 3219 1155 0 13:19 ? 00:00:00 /usr/libexec/xdg-desktop-portal-gnome -paul 3241 1155 0 13:19 ? 00:00:00 /usr/libexec/gvfs-udisks2-volume-monitor -paul 3251 1155 0 13:19 ? 00:00:00 /usr/libexec/gvfs-mtp-volume-monitor -paul 3259 1155 0 13:19 ? 00:00:00 /usr/libexec/gvfs-gphoto2-volume-monitor -paul 3265 1155 0 13:20 ? 00:00:00 /usr/libexec/gvfs-goa-volume-monitor -paul 3271 1155 0 13:20 ? 00:00:00 /usr/libexec/goa-daemon -paul 3280 1155 0 13:20 ? 00:00:00 /usr/libexec/goa-identity-service -paul 3287 1155 0 13:20 ? 00:00:00 /usr/libexec/gvfs-afc-volume-monitor -paul 3303 3012 0 13:20 ? 00:00:02 /usr/libexec/ibus-engine-simple -paul 3372 1155 0 13:20 ? 00:00:00 /usr/libexec/xdg-desktop-portal-gtk -paul 3441 1155 0 13:20 ? 00:00:00 /usr/libexec/gvfsd-metadata -paul 3453 1155 0 13:20 ? 00:00:00 /usr/libexec/evolution-calendar-factory -paul 3495 1155 0 13:20 ? 00:00:00 /usr/libexec/evolution-addressbook-factory -paul 4798 1155 0 13:26 ? 00:00:09 /usr/libexec/gnome-terminal-server -paul 4810 4798 0 13:26 pts/0 00:00:00 bash -paul 8614 1155 0 13:29 ? 00:00:01 /usr/bin/speech-dispatcher -s -t 0 -paul 8656 8614 0 13:29 ? 00:00:00 [sd_espeak-ng-mb] -paul 8709 8614 0 13:29 ? 00:00:00 /usr/lib/speech-dispatcher-modules/sd_espeak-ng /etc/speech-dispatcher/modules/espeak-ng.conf -paul 8785 8614 0 13:29 ? 00:00:00 /usr/lib/speech-dispatcher-modules/sd_dummy /etc/speech-dispatcher/modules/dummy.conf -paul 8799 8614 0 13:29 ? 00:00:00 /usr/lib/speech-dispatcher-modules/sd_espeak-ng /etc/speech-dispatcher/modules/ -paul 10028 1155 0 13:31 ? 00:00:00 adb -L tcp:5037 fork-server server --reply-fd 4 -paul 69578 2814 0 13:53 ? 00:00:00 /usr/libexec/gvfsd-http --spawner :1.22 /org/gtk/gvfs/exec_spaw/0 -paul 108341 1155 3 14:06 ? 00:00:48 /home/paul/.nvm/versions/node/v22.23.0/bin/node /home/paul/.nvm/versions/node/v22.23.0/lib/node_modules/acpx/dist/cli.js __queue-owner -paul 108416 108341 0 14:06 ? 00:00:00 openclaw -paul 108458 108416 2 14:06 ? 00:00:37 openclaw-acp -paul 143553 1155 0 14:19 ? 00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpI2JxLw.tmp -paul 149205 1155 0 14:21 ? 00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpitRyQG.tmp -paul 151724 1155 0 14:22 ? 00:00:04 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpJEsOZV.tmp -paul 157447 1155 1 14:24 ? 00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpyM92DV.tmp -paul 165231 1155 0 14:26 ? 00:00:01 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmp5CKC19.tmp -paul 168472 1155 4 14:27 ? 00:00:09 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpuRJsnQ.tmp -paul 172147 1155 4 14:29 pts/0 00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpxT8nje.tmp -paul 172435 4810 99 14:31 pts/0 00:00:00 ps -fu paul diff --git a/src/PostIt/Directory.Packages.props b/src/PostIt/Directory.Packages.props index 88e06195..62b3a343 100644 --- a/src/PostIt/Directory.Packages.props +++ b/src/PostIt/Directory.Packages.props @@ -15,7 +15,7 @@ - + - + \ No newline at end of file diff --git a/src/PostIt/PostIt.Android/PostIt.Android.csproj b/src/PostIt/PostIt.Android/PostIt.Android.csproj index b34b88d4..de4e3801 100644 --- a/src/PostIt/PostIt.Android/PostIt.Android.csproj +++ b/src/PostIt/PostIt.Android/PostIt.Android.csproj @@ -14,7 +14,7 @@ android-arm;android-arm64;android-x86;android-x64 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3 + 1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada 1.1.0-beta.1 @@ -31,6 +31,6 @@ - + - + \ No newline at end of file diff --git a/src/PostIt/PostIt.Browser/PostIt.Browser.csproj b/src/PostIt/PostIt.Browser/PostIt.Browser.csproj index 8643fcc6..7a0a9ba3 100644 --- a/src/PostIt/PostIt.Browser/PostIt.Browser.csproj +++ b/src/PostIt/PostIt.Browser/PostIt.Browser.csproj @@ -6,7 +6,7 @@ enable 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3 + 1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada 1.1.0-beta.1 diff --git a/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj b/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj index 5043da6e..6ab6fdac 100644 --- a/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj +++ b/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj @@ -7,7 +7,7 @@ enable 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3 + 1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada 1.1.0-beta.1 diff --git a/src/PostIt/PostIt/App.axaml b/src/PostIt/PostIt/App.axaml index 92497b74..b179024a 100644 --- a/src/PostIt/PostIt/App.axaml +++ b/src/PostIt/PostIt/App.axaml @@ -2,8 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:PostIt" x:Class="PostIt.App"> - - + + + + diff --git a/src/PostIt/PostIt/App.axaml.cs b/src/PostIt/PostIt/App.axaml.cs index d2399873..6f93edf9 100644 --- a/src/PostIt/PostIt/App.axaml.cs +++ b/src/PostIt/PostIt/App.axaml.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Avalonia; @@ -49,11 +48,71 @@ public partial class App : Application // build is ever reconfigured to skip the early check. if (TryHandOffCustomSchemeUrl()) return; - this.ServiceProvider = BuildServices(new ServiceCollection()); - AttachServiceProvider(ServiceProvider); - var settings = ServiceProvider.GetRequiredService(); - var sessionStatus = ServiceProvider.GetRequiredService(); - var api = ServiceProvider.GetRequiredService(); + var settings = new Settings(); + settings.Load(); + + var tokenStore = new TokenStore(System.IO.Path.Combine( + System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData), + "PostIt", "tokens.json")); + + var api = new YavscApiClient(settings, tokenStore); + var client = new BlogApiClient(api, settings.BlogsApiUrl); + var circleClient = new CircleApiClient(api, settings.BlogsApiUrl); + var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl); + var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl); + var contactService = new ContactService(); + var userDirectory = new UserDirectory(userSearchClient); + + var services = new ServiceCollection(); + + // Vues + services.AddTransient(); + // SettingsPage is a singleton: there must be one and only one + // instance of the settings UI for the lifetime of the app. + // This guarantees that (a) the bindings always reflect the + // current in-memory Settings state, (b) the page already has + // its DataContext wired up at composition-root time (see + // below), and (c) the OpenSettingsRequested handler is a + // pure push with a no-op-if-already-on-top guard, never a + // re-resolution from DI. Transient would let the user + // accumulate stale SettingsPage instances on the navigation + // stack, each bound to a fresh SettingsViewModel and missing + // any in-flight edits. + services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + // ViewModels + services.AddSingleton(settings); + services.AddSingleton(api); + services.AddSingleton(api); + services.AddSingleton(client); + services.AddSingleton(circleClient); + services.AddSingleton(blogAclClient); + services.AddSingleton(userSearchClient); + services.AddSingleton(contactService); + services.AddSingleton(userDirectory); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + // Persistent session banner: one instance for the lifetime of + // the app so the same VM survives page navigation. + var sessionStatus = new SessionStatusViewModel { Api = api }; + sessionStatus.Refresh(); + services.AddSingleton(sessionStatus); + services.AddTransient(); + + ServiceProvider = services.BuildServiceProvider(); + + // Bind the canonical Settings to the static accessor so any + // code path that can't easily take a constructor parameter + // (designer surfaces, Avalonia data templates) still gets + // the same instance the rest of the app is using. Idempotent: + // re-binding from a second App boot (tests) is a no-op. + Settings.BindToServiceProvider(ServiceProvider); DataTemplates.Clear(); DataTemplates.Add(new ViewLocator(ServiceProvider)); @@ -87,7 +146,8 @@ public partial class App : Application if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { - var homeVm = ServiceProvider.GetRequiredService(); + var homePage = ServiceProvider.GetRequiredService(); + homePage.DataContext = ServiceProvider.GetRequiredService(); window = new MainWindow(); window.SessionBanner.DataContext = sessionStatus; @@ -95,8 +155,9 @@ public partial class App : Application // Build the navigation stack from scratch: HomePage is the // root in both cases. App.BootAsync will push MainPage on // top if the silent refresh succeeds. + window.DataContext = homePage.DataContext; desktop.MainWindow = window; - _ = PushPageAsync(homeVm); + _ = window.NavRoot.PushAsync(homePage); // When the user logs out, route back to HomePage. We // ReplaceAsync the current top so we don't grow the stack @@ -106,6 +167,8 @@ public partial class App : Application { var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!; var nav = w.NavRoot; + var hp = ServiceProvider.GetRequiredService(); + hp.DataContext = ServiceProvider.GetRequiredService(); _ = nav.PopToRootAsync(); }; @@ -117,7 +180,35 @@ public partial class App : Application _ = PushMainPageAsync(); }; - window.Opened += async (_, _) => await BootAsync(this.ServiceProvider, api); + // When the user clicks the "Paramètres" button on the + // session banner, push the SettingsPage singleton on top + // of the current navigation stack. The DataContext is + // already wired at composition time (see the + // provider.GetRequiredService().DataContext + // assignment above), so this handler is a pure + // navigation concern. + // + // Anti-empilement guard: if the SettingsPage is already + // at the top of the stack, do nothing. NavigationPage's + // PushAsync does not deduplicate; calling it twice with + // the same instance would push it a second time and the + // user would have to tap Back twice to leave. Reference + // comparison is correct here because SettingsPage is a + // singleton — there is exactly one instance to compare + // against. + sessionStatus.OpenSettingsRequested += () => + { + var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!; + var settingsPage = ServiceProvider.GetRequiredService(); + var stack = w.NavRoot.NavigationStack; + if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], settingsPage)) + { + return; + } + _ = w.NavRoot.PushAsync(settingsPage); + }; + + window.Opened += async (_, _) => await BootAsync(ServiceProvider, api); } else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView) { @@ -128,110 +219,6 @@ public partial class App : Application } } - /// - /// Build the DI container the app uses. Pulled out of - /// so headless - /// tests can construct the same container at TestApp boot - /// without going through the full Avalonia desktop lifetime - /// (which never runs in a unit test). The container returned is - /// the exact one production uses — no test-only fakes, no - /// trimmed service list — so a test that exercises a VM, page, - /// or service resolves through the same wiring the real app - /// does, and a green test is a green contract for prod. - /// - internal static IServiceProvider BuildServices(ServiceCollection services) - { - var settings = new Settings(); - settings.Load(); - - var tokenStore = new TokenStore(System.IO.Path.Combine( - System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData), - "PostIt", "tokens.json")); - - var api = new YavscApiClient(settings, tokenStore); - var client = new BlogApiClient(api, settings.BlogsApiUrl); - var circleClient = new CircleApiClient(api, settings.BlogsApiUrl); - var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl); - var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl); - var contactService = new ContactService(); - var userDirectory = new UserDirectory(userSearchClient); - - - // Vues - services.AddTransient(); - // SettingsPage is a singleton: there must be one and only one - // instance of the settings UI for the lifetime of the app. - // This guarantees that (a) the bindings always reflect the - // current in-memory Settings state, (b) the page already has - // its DataContext wired up at composition-root time (see - // below), and (c) PushPageAsync's anti-empilement guard sees - // the same instance across pushes, so a second Settings tap - // is a no-op rather than re-pushing the page. Transient would - // let the user accumulate stale SettingsPage instances on - // the navigation stack, each bound to a fresh - // SettingsViewModel and missing any in-flight edits. - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - // Dialogs (modal-light pages): the ViewLocator resolves - // them when a caller pushes a PostAclDialogViewModel or - // AddCircleMemberDialogViewModel via App.PushPageAsync. - // App.PushPageAsync overwrites the page's DataContext with - // the caller-built VM, so the parameterless ctor is enough - // here — the parametrised ctors stay for direct test wiring. - services.AddTransient(); - services.AddTransient(); - // ViewModels - services.AddSingleton(settings); - services.AddSingleton(api); - services.AddSingleton(api); - services.AddSingleton(client); - services.AddSingleton(circleClient); - services.AddSingleton(blogAclClient); - services.AddSingleton(userSearchClient); - services.AddSingleton(contactService); - services.AddSingleton(userDirectory); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - // Persistent session banner: one instance for the lifetime of - // the app so the same VM survives page navigation. - var sessionStatus = new SessionStatusViewModel { Api = api }; - sessionStatus.Refresh(); - services.AddSingleton(sessionStatus); - services.AddTransient(); - - return services.BuildServiceProvider(); - } - - /// - /// Attach a pre-built DI container to this - /// instance. Used by headless tests after - /// ; in production this happens - /// implicitly via . - /// Idempotent w.r.t. : - /// re-binding from a second App boot is a no-op. - /// - internal void AttachServiceProvider(IServiceProvider sp) - { - ServiceProvider = sp; - Settings.BindToServiceProvider(sp); - } - - /// - /// Test-only hook: bind a concrete so - /// command-driven navigation paths () can - /// push onto a real in headless - /// fixtures that do not run the full desktop lifetime bootstrap. - /// - internal void AttachMainWindow(MainWindow mainWindow) - { - window = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow)); - } - private static void ApplyDarkMode(Settings settings) { Application.Current!.RequestedThemeVariant = @@ -259,18 +246,19 @@ public partial class App : Application } /// - /// Resolve a fresh MainPageViewModel from DI and push its - /// mapped page (via ) on top + /// Resolve a fresh MainPage + VM from DI and push it on top /// of the current navigation stack. Used both by /// (silent refresh at boot) and by SessionStatusViewModel.LoginSucceeded /// (interactive login from the banner). Pulled out as a helper so /// the two callers can't drift apart. /// - public static Task PushMainPageAsync() + public static async Task PushMainPageAsync() { var app = (App)Current; var mainVm = app.ServiceProvider.GetRequiredService(); - return app.PushPageAsync(mainVm); + var mainPage = app.ServiceProvider.GetRequiredService(); + mainPage.DataContext = mainVm; + await app.window.FindControl("NavRoot").PushAsync(mainPage).ConfigureAwait(true); } private bool TryHandOffCustomSchemeUrl() @@ -305,53 +293,4 @@ public partial class App : Application return true; } - internal void PushPage(ViewModelBase vm) - { - _ = PushPageAsync(vm); - } - - internal Task PushPageAsync(ViewModelBase vm) - { - if (window is null) - { - throw new InvalidOperationException("MainWindow is not initialized yet."); - } - - var template = DataTemplates.FirstOrDefault(t => t.Match(vm)); - if (template is null) - { - throw new InvalidOperationException($"No IDataTemplate found for {vm.GetType().Name}."); - } - - var view = template.Build(vm); - if (view is null) - { - throw new InvalidOperationException( - $"Template for {vm.GetType().Name} returned ."); - } - - var page = view as Page; - if (page is null) - { - // NavigationPage expects Page instances. Wrap any fallback control - // (e.g. ViewLocator error TextBlock) into a ContentPage so it can render. - page = new ContentPage { Content = view }; - } - - page.DataContext = vm; - - // Avoid stacking the same singleton page twice (e.g. SettingsPage). - var stack = window.NavRoot.NavigationStack; - if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page)) - { - return Task.CompletedTask; - } - - return window.NavRoot.PushAsync(page); - } - - internal async Task GoBackAsync() - { - await window.NavRoot.PopAsync(); - } } diff --git a/src/PostIt/PostIt/PostIt.csproj b/src/PostIt/PostIt/PostIt.csproj index 163a6a77..c63771b8 100644 --- a/src/PostIt/PostIt/PostIt.csproj +++ b/src/PostIt/PostIt/PostIt.csproj @@ -6,7 +6,7 @@ true 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3 + 1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada 1.1.0-beta.1 diff --git a/src/PostIt/PostIt.Android/Services/ContactService.Mobile.cs b/src/PostIt/PostIt/Services/ContactService.Mobile.cs similarity index 94% rename from src/PostIt/PostIt.Android/Services/ContactService.Mobile.cs rename to src/PostIt/PostIt/Services/ContactService.Mobile.cs index c869256d..8dbd134d 100644 --- a/src/PostIt/PostIt.Android/Services/ContactService.Mobile.cs +++ b/src/PostIt/PostIt/Services/ContactService.Mobile.cs @@ -6,10 +6,8 @@ using System.Threading.Tasks; using Microsoft.Maui.ApplicationModel.Communication; using Microsoft.Maui.ApplicationModel; using Microsoft.Maui.Devices; -using PostIt.Services; -using System.Linq; -namespace PostIt.Android.Services; +namespace PostIt.Services; /// /// Mobile implementation backed by MAUI Essentials @@ -51,7 +49,7 @@ public sealed class ContactService : IContactService // shape is intentionally richer than the Yavsc // directory's single-Email shape — the two flows // answer different questions. - var result = new List(contacts.Count()); + var result = new List(contacts.Count); foreach (var c in contacts) { var emails = ExtractEmails(c.Emails); @@ -69,7 +67,7 @@ public sealed class ContactService : IContactService } } - private static IReadOnlyList ExtractEmails(IEnumerable? emails) + private static IReadOnlyList ExtractEmails(IEnumerable? emails) { if (emails is null) return Array.Empty(); var list = new List(); diff --git a/src/PostIt/PostIt/ViewLocator.cs b/src/PostIt/PostIt/ViewLocator.cs index fd92c802..e725d0d9 100644 --- a/src/PostIt/PostIt/ViewLocator.cs +++ b/src/PostIt/PostIt/ViewLocator.cs @@ -21,18 +21,6 @@ public class ViewLocator : IDataTemplate } public Control Build(object? data) - { - try - { - return BuildCore(data); - } - catch (Exception ex) - { - return new TextBlock { Text = $"ViewLocator threw: {ex}" }; - } - } - - private Control BuildCore(object? data) { return data switch { @@ -40,11 +28,8 @@ public class ViewLocator : IDataTemplate Settings => _services.GetRequiredService(), HomePageViewModel => _services.GetRequiredService(), SignaturePageViewModel => _services.GetRequiredService(), - AddCircleMemberDialogViewModel => _services.GetRequiredService(), - CirclesPageViewModel => _services.GetRequiredService(), - PostAclDialogViewModel => _services.GetRequiredService(), null => new TextBlock { Text = "No view for " }, - _ => new TextBlock { Text = $"No view for {data.GetType().Name}" } + _ => new TextBlock { Text = $"No view for {data.GetType().Name}" } }; } diff --git a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs index 59d6dbed..a721d738 100644 --- a/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using PostIt.Services; -using PostIt.Views; using Yavsc.Api.Client; namespace PostIt.ViewModels; @@ -107,7 +106,7 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase /// UI from firing an event with a null payload. /// [RelayCommand] - public async Task AddAsync() + public void Add() { if (Selected is null) { @@ -115,14 +114,5 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase return; } Confirmed?.Invoke(this, Selected); - var app = App.Current as App; - await app.GoBackAsync(); - } - - [RelayCommand] - public async Task CloseAsync() - { - var app = App.Current as App; - await app.GoBackAsync(); } } diff --git a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs index 33a5bd30..c017c426 100644 --- a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs @@ -1,10 +1,9 @@ using System; using System.Collections.ObjectModel; +using System.Linq; using System.Threading.Tasks; -using Avalonia; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using Microsoft.Extensions.DependencyInjection; using PostIt.Services; using Yavsc.Api.Client; using Yavsc.Api.Client.Dtos; @@ -64,6 +63,12 @@ public partial class CirclesPageViewModel : ViewModelBase [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) { @@ -111,27 +116,6 @@ public partial class CirclesPageViewModel : ViewModelBase } } - [RelayCommand] - internal async Task OpenAddMemberAsync() - { - var app = Application.Current as App; - var services = app?.ServiceProvider; - var directory = services.GetRequiredService(); - AddCircleMemberDialogViewModel model = - new AddCircleMemberDialogViewModel(directory); - // Wire the dialog's Confirmed event to OnAddMemberConfirmedAsync. - // Without this, the dialog's "Ajouter" button fires the event - // into the void: no subscriber, the picked user is silently - // dropped, and nothing is added to the circle. The dialog - // stays open until the user uses the back gesture — which is - // how the user noticed the button was a no-op. - // Async-void is intentional here: Confirmed is an - // EventHandler (returns void), and bridging to the - // async Task OnAddMemberConfirmedAsync requires it. - model.Confirmed += async (_, picked) => - await OnAddMemberConfirmedAsync(_, picked); - await app.PushPageAsync(model); - } /// /// Load the members of one of the caller's circles. The /// server scopes the endpoint with a 404 when the circle @@ -247,6 +231,22 @@ public partial class CirclesPageViewModel : ViewModelBase } } + /// + /// 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 diff --git a/src/PostIt/PostIt/ViewModels/MainPageViewModel.cs b/src/PostIt/PostIt/ViewModels/MainPageViewModel.cs index e8256df6..d1d16306 100644 --- a/src/PostIt/PostIt/ViewModels/MainPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/MainPageViewModel.cs @@ -2,14 +2,11 @@ using System; using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; -using Avalonia; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using Microsoft.Extensions.DependencyInjection; using Yavsc.Blogspot; using Yavsc.Api.Client; using PostIt.Services; -using PostIt.Views; namespace PostIt.ViewModels; @@ -50,6 +47,9 @@ public partial class MainPageViewModel : ViewModelBase [ObservableProperty] public partial bool DraftIsPublished { get; set; } + [ObservableProperty] + public partial ViewModelBase? CurrentViewModel { get; set; } + public Settings SettingsModel { get; } [ObservableProperty] @@ -81,46 +81,9 @@ public partial class MainPageViewModel : ViewModelBase /// public BlogApiClient? BlogClient { get; } - /// - /// DI container the VM uses to resolve navigation targets - /// (other ViewModels) when the user clicks a toolbar button - /// that opens a sub-screen. Owned by App.ServiceProvider - /// in production; injected directly in tests. The VM resolves - /// ViewModels via this provider, never Views — the - /// actual to push is decided by - /// at bind time, per CONTRIBUTING.md - /// §"Navigation (PostIt)". - /// - public IServiceProvider? Services { get; } - - private SignaturePageViewModel? _signatureModel; - - /// - /// Resolved on first access. Lazy so the test path (which - /// never pushes SignaturePage) does not require a - /// fully-built DI graph just to construct the VM. Mirrors the - /// pattern of for the Settings case. - /// - public SignaturePageViewModel SignatureModel => - _signatureModel ??= ResolveSignatureModel(); - 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(); } - private SignaturePageViewModel ResolveSignatureModel() - { - var sp = ResolveServices(); - return sp.GetRequiredService(); - } - - private IServiceProvider ResolveServices() - { - return Services ?? (Application.Current as App)?.ServiceProvider ?? - throw new InvalidOperationException( - "No IServiceProvider available for navigation. Inject one in tests " + - "or ensure App.ServiceProvider is initialized in production."); - } - public MainPageViewModel() { @@ -152,33 +115,21 @@ public partial class MainPageViewModel : ViewModelBase DraftTitle = string.Empty; DraftArticle = string.Empty; DraftIsPublished = false; + CurrentViewModel = this; } - /// Save is enabled as soon as the user has typed - /// a non-whitespace title in the editor, regardless of - /// whether a post is selected. The "no selection" case is - /// the create-new-post path; the "with selection" case is - /// the update path. Both read from the editor buffer. - /// Previously this also required SelectedPost is not null - /// — which contradicted the create-new-post intent and - /// forced the buggy "draft with empty title" branch. - private bool CanSave() => !IsBusy && !string.IsNullOrWhiteSpace(DraftTitle); - private bool CanDelete() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy; - private bool CanManageAcl() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy; - /// /// Test-friendly constructor: caller supplies a pre-built /// . Production code uses the /// (Settings, BlogApiClient) overload below. /// - public MainPageViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null) + public MainPageViewModel(BlogApiClient blogClient, Settings? settings = null) { - SettingsModel = new Settings(); - BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ; - Services = services; + SettingsModel = new Settings(); + BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient));; Init(settings); - } + } partial void OnSearchTextChanged(string value) => ApplyFilter(); @@ -346,30 +297,10 @@ public partial class MainPageViewModel : ViewModelBase }); } - /// - /// DEV ONLY: open the signature capture page. The production - /// entry point is a SignalR push from Yavsc.Org ("devis - /// received, sign here"); this command is the dev-time - /// shortcut to reach the page without that infrastructure. - /// Aligned on the same VM-first navigation pattern as - /// : the VM resolves the target VM - /// through , the ViewLocator picks - /// the matching Control at bind time. No - /// Click handler, no App.ServiceProvider - /// access from the view layer. - /// [RelayCommand] - internal async Task OpenSignatureDev() + internal void OpenSettings() { - await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true); - } - - private ViewModelBase GetACLViewModel(BlogPostDto selectedPost) - { - var sp = ResolveServices(); - var aclClient = sp.GetRequiredService(); - var circleClient = sp.GetRequiredService(); - return new PostAclDialogViewModel(selectedPost, aclClient, circleClient); + CurrentViewModel = SettingsModel; } private async Task RefreshPostsAsync() @@ -432,23 +363,42 @@ public partial class MainPageViewModel : ViewModelBase DeleteCommand.NotifyCanExecuteChanged(); } + /// Save is enabled as soon as the user has typed + /// a non-whitespace title in the editor, regardless of + /// whether a post is selected. The "no selection" case is + /// the create-new-post path; the "with selection" case is + /// the update path. Both read from the editor buffer. + /// Previously this also required SelectedPost is not null + /// — which contradicted the create-new-post intent and + /// forced the buggy "draft with empty title" branch. + private bool CanSave() => !IsBusy && !string.IsNullOrWhiteSpace(DraftTitle); + private bool CanDelete() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy; + private bool CanManageAcl() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy; + /// + /// Raised when the user asks to open the "manage ACL" dialog for + /// the currently selected post. The MainPage code-behind + /// listens to this event and pushes a PostAclDialog on the + /// navigation stack. The VM itself can't navigate directly + /// because the navigation surface (NavigationPage) lives + /// in the View layer. + /// + public event EventHandler? ManageAclRequested; [RelayCommand(CanExecute = nameof(CanManageAcl))] - public async Task ManageAcl() + public void ManageAcl() { - if (SelectedPost is null) - { - StatusMessage = "Select an existing post before managing ACL."; - return; - } - await ((App)App.Current!).PushPageAsync(GetACLViewModel(SelectedPost)).ConfigureAwait(true); + if (SelectedPost is null) return; + ManageAclRequested?.Invoke(this, SelectedPost); } + /// + /// Raised when the user asks to open the circles page (full + /// CRUD on their own circles). Same routing as + /// . + /// + public event EventHandler? OpenCirclesRequested; + [RelayCommand] - public async Task OpenCircles() - { - var circlesVm = ResolveServices().GetRequiredService(); - await ((App)App.Current!).PushPageAsync(circlesVm).ConfigureAwait(true); - } + public void OpenCircles() => OpenCirclesRequested?.Invoke(this, EventArgs.Empty); } diff --git a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs index ae9e71d5..68b96b7c 100644 --- a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Linq; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Yavsc.Blogspot; using Yavsc.Api.Client; using Yavsc.Api.Client.Dtos; -using Yavsc.Abstract.BlogSpot; namespace PostIt.ViewModels; @@ -37,12 +37,10 @@ public partial class PostAclDialogViewModel : ViewModelBase public BlogPostDto Post { get; } [ObservableProperty] - public partial ObservableCollection - MyCircles { get; set; } = new(); + public partial ObservableCollection MyCircles { get; set; } = new(); [ObservableProperty] - public partial ObservableCollection - AclEntries { get; set; } = new(); + public partial ObservableCollection AclEntries { get; set; } = new(); [ObservableProperty] public partial CircleDto? SelectedCircleToAdd { get; set; } @@ -53,22 +51,6 @@ public partial class PostAclDialogViewModel : ViewModelBase [ObservableProperty] public partial string StatusMessage { get; set; } = string.Empty; - /// - /// Idempotency gate for : the dialog - /// attaches the load trigger in DataContextChanged, - /// which can fire more than once if the page is detached - /// and re-attached (dialog re-use, navigation edge cases) - /// with a different VM. Without this guard, the second load - /// would race against the first and could overwrite - /// mid-edit. Pattern copied from - /// Settings.Load. - /// - private bool _loaded; - - /// True once has run at least - /// once. Exposed for tests; do not bind from XAML. - public bool Loaded => _loaded; - public PostAclDialogViewModel( BlogPostDto post, BlogAclApiClient aclClient, @@ -85,8 +67,6 @@ public partial class PostAclDialogViewModel : ViewModelBase [RelayCommand] public async Task LoadAsync() { - if (_loaded) return; - IsBusy = true; try { @@ -100,9 +80,11 @@ public partial class PostAclDialogViewModel : ViewModelBase var circles = circlesTask.Result ?? new List(); MyCircles = new ObservableCollection(circles); + var allAcl = aclTask.Result ?? new List(); + AclEntries = new ObservableCollection( + allAcl.Where(a => a.BlogPostId == Post.Id)); StatusMessage = $"{AclEntries.Count} autorisation(s)"; - _loaded = true; } catch (Exception ex) { @@ -126,10 +108,11 @@ public partial class PostAclDialogViewModel : ViewModelBase IsBusy = true; try { - var created = await _aclClient.GrantAsync(new Yavsc.Abstract.BlogSpot.PostAccessControlRulePayload + var created = await _aclClient.GrantAsync(new CircleAuthorizationDto { CircleId = SelectedCircleToAdd.Id, - BlogPostId = Post.Id + BlogPostId = Post.Id, + Comment = false, }); if (created is not null) { @@ -152,7 +135,7 @@ public partial class PostAclDialogViewModel : ViewModelBase } [RelayCommand] - public async Task RevokeAsync(PostAccessControlRulePayload? acl) + public async Task RevokeAsync(CircleAuthorizationDto? acl) { if (acl is null) return; IsBusy = true; diff --git a/src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs b/src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs index a1ad48ce..55f2cab4 100644 --- a/src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs @@ -2,7 +2,6 @@ using System; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using Microsoft.Extensions.DependencyInjection; using PostIt.Services; namespace PostIt.ViewModels; @@ -33,6 +32,15 @@ public partial class SessionStatusViewModel : ViewModelBase /// HomePage so the user lands on the blog editor. public event System.Action? LoginSucceeded; + /// Raised when the user clicks the "Paramètres" button on + /// the session banner. App.axaml.cs listens and pushes + /// SettingsPage (resolved from DI, bound to the canonical + /// Settings singleton) on top of the current navigation + /// stack. Same event pattern as and + /// so the VM stays decoupled from + /// NavigationPage / window lifetime. + public event System.Action? OpenSettingsRequested; + [ObservableProperty] public partial bool IsLoggedIn { get; private set; } @@ -136,10 +144,9 @@ public partial class SessionStatusViewModel : ViewModelBase } [RelayCommand] - internal async Task OpenSettings() + public async System.Threading.Tasks.Task OpenSettingsCommand() { - var app = (App)App.Current!; - await app.PushPageAsync(app.ServiceProvider.GetRequiredService()).ConfigureAwait(true); + OpenSettingsRequested?.Invoke(); + await System.Threading.Tasks.Task.CompletedTask; } - } diff --git a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml b/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml index 8b232988..2c13e99c 100644 --- a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml +++ b/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml @@ -6,7 +6,6 @@ xmlns:services="using:PostIt.Services" x:DataType="vm:AddCircleMemberDialogViewModel" > - @@ -17,7 +16,7 @@ PlaceholderText="Nom ou email d'un utilisateur Yavsc..." HorizontalAlignment="Stretch"/>