.forgejo/workflows/buildAndTest.yml

@@ -31,7 +31,6 @@ jobs:
     steps:
     - name: Clone yavsc
       run: |
-        set -e
         cd /src
         git clone https://forgejo.pschneider.fr/notazof/yavsc.git _src
         cd _src
@@ -41,23 +40,12 @@ jobs:
         fi
         git submodule update --init --recursive
         echo "✅ Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
-    - name: Secret scan
+
-      run: |
-        echo "🔍 Scanning for secrets..."
-        cd /src/_src && dotnet tool restore && dotnet picket git --verbose --redact --exit-code 1 --log-opts -n10 \
-    - name: Build
-      run: |
-        echo "🏗️ Building the solution..."
-        cd /src/_src && dotnet build --verbosity normal
-    - name: Install SkiaSharp native dependencies
-      run: |
-        echo "📦 Installing libfontconfig/libfreetype for SkiaSharp (Avalonia.Headless)..."
-        apt-get update && apt-get install -y --no-install-recommends \
-          libfontconfig1 libfreetype6 libexpat1 zlib1g libbz2-1.0 libpng16-16 libbrotli1 \
-          && rm -rf /var/lib/apt/lists/*
     - name: Test
       run: |
         echo "🚀 Lancement des tests..."
         cd /src/_src && dotnet test \
           --verbosity normal \
-          --filter="Category!=Platform-Android"
+          --filter="Category!=Platform-Android" \
+          --logger "xunit;LogFileName=test-results.xml" \
+          && echo "✅ Success !" || echo "❌ Fail ($?)!"

.forgejo/workflows/release.yml

@@ -175,12 +175,6 @@ jobs:
         run: |
           cd /src/_src
           dotnet restore
-      - name: Test
-        run: |
-          cd /src/_src && dotnet test \
-          --verbosity normal \
-          --filter="Category!=Platform-Android" \
-          --logger "xunit;LogFileName=test-results.xml"
 
       - name: Build de PostIt.Android ARM64
         run: |
@@ -206,7 +200,6 @@ jobs:
           RELEASE_BODY: ${{ env.RELEASE_BODY }}
           IS_PRERELEASE: ${{ env.IS_PRERELEASE }}
         run: |
-          set -e
           if [[ -z "$TAG" ]]; then
             echo "::error::No tag resolved for the API call."
             exit 1

.gitignore

@@ -35,7 +35,6 @@ appsettings-*.*.json
 
 generated/
 *.tmp
-tmp/
 DataDir/
 
 *.tests.trx

.gitleaksignore

@@ -1,45 +0,0 @@
-# Exclure uniquement les dossiers de sortie de compilation
-bin/
-obj/
-src/*/bin/
-src/*/obj/
-test/*/bin/
-test/*/obj/
-
-# Toolchain front (Node / esbuild)
-node_modules/
-build/
-package-lock.json
-
-# Exclure les caches lourds
-.git/
-.vs/
-
-.env
-
-.*.env
-
-*.csproj.lscache
-data/
-appsettings.*.json
-appsettings-*.*.json
-
-# Exception: the Testing-environment override for Yavsc.Org is a tracked
-# configuration source, not a secrets file. TestWebApplicationFactory
-# (Yavsc.Org.Tests) flips ASPNETCORE_ENVIRONMENT to "Testing" so
-# AddConfiguration("org") in Program.Main loads this file as the
-# last in the chain (it is optional). It overrides the connection
-# string and SMTP section for the in-memory test host and contains
-# no production secrets.
-!src/Yavsc.Org/appsettings-org.Testing.json
-
-generated/
-*.tmp
-tmp/
-DataDir/
-
-*.tests.trx
-*.tests.html
-
-*.log
-

.vscode/launch.json

@@ -4,22 +4,6 @@
   // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-    {
-      "name": "PostIt Desktop",
-      "type": "dotnet",
-      "request": "launch",
-      "projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj"
-    },
-    {
-      "name": "PostIt Desktop local",
-      "type": "coreclr",
-      "request": "launch",
-      "program": "${workspaceFolder}/src/PostIt/PostIt.Desktop/bin/Debug/net10.0/PostIt.Desktop.dll",
-      "env": {
-        "POSTIT_SETTINGS_JSON": "/home/paul/Workspace/yavsc/src/PostIt/PostIt/postit-settings.json"
-      },
-      "preLaunchTask": "dotnet: build-postit-desktop"
-    },
     {
       "name": "Android Debug",
       "type": "mono",
@@ -36,10 +20,10 @@
       "port": 55555
     },
     {
-      "name": "Yavsc API",
+      "name": "API",
       "type": "dotnet",
       "request": "launch",
-      "projectPath": "${workspaceFolder}/src/Yavsc.Api/Yavsc.Api.csproj"
+      "projectPath": "${workspaceFolder}/src/Api/Api.csproj"
     },
     {
       "name": "Yavsc Org",
@@ -53,7 +37,12 @@
       "request": "launch",
       "projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
     },
-
+    {
+      "name": "PostIt Desktop",
+      "type": "dotnet",
+      "request": "launch",
+      "projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
+    },
     {
       "name": "Test PostIt.Android launch (Xamarin.UITest)",
       "type": "coreclr",

.vscode/tasks.json

@@ -7,7 +7,7 @@
           "fileLocation": ["relative", "${workspaceFolder}"],
           "source": "dotnet",
           "pattern": {
-            "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+(error|warning) (.*)$",
+            "regexp": "^\\s+(.*)\\((\\d+),(\\d+)\\):\\s+(error|warning) (.+): (.*)$",
             "file": 1,
             "line": 2,
             "column": 3,
@@ -47,10 +47,7 @@
       "group": "build",
       "isBuildCommand": true,
       "isTestCommand": false,
-      "isBackground": true,
+      "isBackground": true
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
     },
     {
       "label": "test blogs backend",
@@ -66,28 +63,6 @@
         "isDefault": false
       }
     },
-    {
-      "label": "test api backend (npgsql)",
-      "type": "process",
-      "problemMatcher": "$msCompile",
-      "command": "dotnet",
-      "args": [
-        "test",
-        "Yavsc.Api.Test.csproj",
-        "-v",
-        "minimal"
-      ],
-      "options": {
-        "cwd": "src/Yavsc.Api.Test",
-        "env": {
-          "YAVSC_API_TEST_DB_PROVIDER": "npgsql"
-        }
-      },
-      "group": {
-        "kind": "test",
-        "isDefault": false
-      }
-    },
     {
       "label": "build-webapi",
       "type": "process",
@@ -101,21 +76,6 @@
         "kind": "build"
       },
       "isBackground": true
-    },
-    {
-      "label": "dotnet: build-postit-desktop",
-      "type": "process",
-      "isBuildCommand": true,
-      "isTestCommand": false,
-      "isBackground": true,
-      "command": "dotnet",
-      "args": ["build", "/property:GenerateFullPaths=true"],
-      "options": {
-        "cwd": "src/PostIt/PostIt.Desktop"
-      },
-      "group": {
-        "kind": "build"
-      }
     }
   ]
 }

CHANGELOG.md

@@ -1,80 +1,5 @@
 # Changelog
 
-## [1.0.8-rc14] - unstable
-
-### Added
-
-* [PostIt] Ajout d'un `BillingQueryDetailsPageViewModel` et de sa page associee pour afficher le detail d'une commande billing depuis l'historique.
-* [PostIt] Ajout d'un mode detail avec section metier (statut, date, description, motif, infos) et section technique repliable (code, client, provision, lieu, prestations).
-* [PostIt] Ajout d'un badge de statut enrichi (couleur + pictogramme) sur le detail d'une commande pour visualiser l'etat en un coup d'oeil.
-* [PostIt] Ajout d'un bloc d'actions rapide en tete du detail (`Retour`, `Ouvrir en edition`) pour eviter le scroll jusqu'au bas de page.
-* [PostIt] Ajout d'un style monospace sur les metadonnees techniques (code billing, client, provision, lieu, prestations) pour faciliter la lecture des identifiants et valeurs brutes.
-
-### Changed
-
-* [PostIt] Le bouton d'ouverture depuis la liste billing ouvre maintenant une page de detail dediee avant l'eventuelle edition.
-* [PostIt] Amelioration UX des pages billing: badges de statut colores, actions remontees en haut de page, et typographie monospace sur les metadonnees techniques.
-
-### Fixed
-
-* [Yavsc.Api] Correction d'un 500 sur le refresh du catalogue d'activites lorsque `Activity.Description` est `NULL` en base (nullabilite explicite + projection null-safe + gardes sur codes vides).
-* [Yavsc.Api] Correction des erreurs 400/500 sur les routes billing (`Rdv`, `Brush`, `MBrush`) en imposant `ClientId` depuis l'utilisateur authentifie et en ignorant les champs server-owned lors de la validation modele.
-* [Yavsc.Api] Correction du `PUT /api/v1/billing/Rdv/{id}`: mise a jour controlee de l'entite existante (et non remplacement brut du graphe JSON), ce qui supprime les `BadRequest` parasites.
-* [Yavsc.Api] Correction PostgreSQL `timestamptz` sur RDV: normalisation UTC de `EventDate` sur `POST/PUT /api/v1/billing/Rdv` pour eviter l'erreur `Cannot write DateTime with Kind=Local`.
-* [Yavsc.Api] Correction du flux FrontOffice accept/reject de query: sauvegarde avec contexte utilisateur et fallback d'injection pour `IBillingService` afin d'eviter les erreurs serveur en environnement de test.
-* [Yavsc.Blogs] Correction des `BadRequest` sur `POST/PUT /api/v1/blogspot` avec payload JSON (PostIt): les proprietes de navigation/serveur (`Author`, `Tags`, `Comments`, audit) ne bloquent plus la validation.
-* [Yavsc.Org] Correction du flux MVC de creation de commentaire: `SaveChangesAsync(userId)` est utilise pour renseigner les champs d'audit requis (`UserCreated`/`UserModified`).
-* [Yavsc.Api.Test] Stabilisation des fixtures de seed billing: remplissage des metadonnees d'audit (`UserCreated`, `UserModified`, dates) pour eviter les echecs SQLite `NOT NULL`.
-
-## [1.0.8-rc13] - unstable
-
-### Added
-
-* [PostIt] Integration d'un selecteur de lieu RDV base sur Mapsui (carte interactive dans le formulaire `Rdv`).
-* [PostIt] Ajout d'un marqueur de position et d'une action de recentrage sur la carte RDV.
-* [PostIt] Ajout d'un service de reverse geocoding pour suggerer une adresse a partir des coordonnees carte.
-* [PostIt] Cache et debounce des resolutions d'adresse RDV pour limiter les appels reseau et lisser l'UX.
-* [PostIt.Tests] Nouvelles non-regressions sur le panneau d'adresse suggeree RDV et le comportement de la carte.
-* [Yavsc.Abstract] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable.
-* [Yavsc.Server] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable.
-
-### Changed
-
-* [PostIt] Generalisation de la barre de statut d'action (severite explicite) sur pages principales, dialogues et formulaires billing.
-* [PostIt] Harmonisation des messages de statut utilisateur en francais.
-* [PostIt] Renforcement des gardes de navigation dans les flux de gestion des membres de cercle.
-* [PostIt] Le flux RDV conserve l'adresse saisie manuellement et propose l'adresse resolue comme suggestion explicite.
-* [PostIt] Le flux de geolocalisation RDV tolere les positions proches dans le cache de suggestion d'adresse.
-
-### Fixed
-
-* [PostIt.Desktop] Correction d'un crash au demarrage OIDC (`No authority specified`) via durcissement des valeurs par defaut de configuration d'authentification.
-* [PostIt] Correction de la persistance des settings: l'etat runtime de statut n'est plus serialize dans le JSON utilisateur.
-* [PostIt.Tests] Ajout d'un verrou de non-regression sur le premier chargement des settings.
-* [PostIt] Correction du binding de la date RDV: `DatePicker.SelectedDate` est aligne sur un proxy `DateTimeOffset?` (`EventDateSelection`).
-
-## [1.0.8-rc12] - unstable
-
-### Added
-
-* [PostIt] Nouveau helper d'image `ImageHelper` pour charger des bitmaps depuis les ressources et depuis le web.
-* [PostIt] Affichage de l'avatar XS dans la liste des performers d'activites, avec fallback visuel (initiale utilisateur).
-* [PostIt.Tests] Nouveaux tests autour des URLs avatar et de la source d'autorite.
-* [contrib] Ajout d'un `README.md` utilitaire pour les symboles/icones.
-
-### Changed
-
-* [PostIt] Les avatars ne sont plus relies en string sur `Image.Source`: ils sont telecharges et lies en `Bitmap`.
-* [Yavsc.Api.Client] `ActivityApiClient` accepte une base d'avatar dediee et construit les URLs avatar depuis l'autorite d'identification.
-* [PostIt] Les clients Activites/Billing utilisent maintenant `ApiUrl` en lecture dynamique: un changement via Parametres prend effet sans redemarrer l'application (apres sauvegarde et rafraichissement de la page).
-* [PostIt] Le header de `MainPage` n'utilise plus `ScrollViewer`; remplacement par une barre de commandes basee sur `WrapPanel`.
-* [PostIt] Alignement de la navigation blogs: renommage `PushMainPageAsync` -> `PushBlogsPageAsync` et ajustement de `HomePageViewModel`.
-
-### Fixed
-
-* [PostIt.Android] Correction d'un 404 sur la page Activites au premier lancement: la configuration embarquee pointait `ApiUrl` vers le host Blogs au lieu de l'API metier.
-* [PostIt] Correction du bouton Sauver de la page Parametres: binding vers `SaveCommand` pour persister correctement `ApiUrl`/`BlogsApiUrl`.
-
 ## [1.0.8-rc11] - unstable
 
 ### Added

CONTRIBUTING.md

@@ -49,19 +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.
 
-## Onboarding assiste par agents IA
-
-Pour accelerer la prise en main du depot avec Copilot/Plan/Explore :
-
-- Parcours pas-a-pas : [doc/onboarding-agents.md](./doc/onboarding-agents.md)
-- Playbook d'usage des agents : [doc/agent-playbook.md](./doc/agent-playbook.md)
-- Matrice intentions -> agent -> preuves : [doc/agent-intent-matrix.md](./doc/agent-intent-matrix.md)
-
-Regle minimale en contribution assistee par agent :
-- expliciter l'impact architecture,
-- justifier le niveau de tests execute,
-- documenter les risques residuels.
-
 ## Le CHANGELOG.md
 
 Le `CHANGELOG.md` est un document de changement de version
@@ -74,8 +61,8 @@ et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 À noter : la **parité du numéro de patch** porte une signification de canal :
 
-- **patch pair** (ex. `1.0.0`, `1.0.2`) → **preview**
+- **patch pair** (ex. `1.0.0`, `1.0.2`) → **stable**
-- **patch impair** (ex. `1.0.1`, `1.0.3`) → **stable**
+- **patch impair** (ex. `1.0.1`, `1.0.3`) → **preview**
 - **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable**
 
 Cette convention est partagée avec le dépôt

Directory.Packages.props

@@ -1,17 +1,16 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <IdentityServer8Version>8.1.0-pazofrc007</IdentityServer8Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.9" />
 
-    <PackageVersion Include="HigginsSoft.IdentityServer8" Version="$(IdentityServer8Version)" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8" Version="8.1.0-pazofrc004" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="$(IdentityServer8Version)" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="8.1.0-pazofrc004" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="$(IdentityServer8Version)" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="8.1.0-pazofrc004" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework.Storage" Version="$(IdentityServer8Version)" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework.Storage" Version="8.1.0-pazofrc004" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8.Security" Version="$(IdentityServer8Version)" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.Security" Version="8.1.0-pazofrc004" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8.Storage" Version="$(IdentityServer8Version)" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.Storage" Version="8.1.0-pazofrc004" />
 
     <PackageVersion Include="AsciiDocSharp" Version="0.1.0" />
     <PackageVersion Include="AsciiDocSharp.Converters.Html" Version="0.1.0" />

Makefile

@@ -48,4 +48,70 @@ docker-build:
 docker-run:
 	docker run -d -p 5000:5000 --name yavsc yavsc
 
-.PHONY: test install docker-image docker-build docker-run
+# Crée une branche release/<V> depuis main, met à jour les
+# `<Version>` des .csproj via dotnet-gitversion, et la
+# pousse sur origin.
+#
+# Usage : make release V=1.0.7-rc1
+#
+# Pré-requis : être sur main, working tree clean. La cible
+# vérifie les deux et refuse sinon — elle ne fait JAMAIS
+# de checkout automatique, c'est à l'opérateur de s'être
+# positionné sur la bonne branche au préalable (sinon le
+# bump pourrait partir sur une branche tierce par accident).
+#
+# Notes :
+# - Le nom de branche vient de l'argument V (ex: 1.0.7-rc1
+#   donne release/1.0.7-rc1). C'est une étiquette d'intention,
+#   pas la version assembly.
+# - La version dans les .csproj vient de GitVersion qui la
+#   calcule depuis l'historique git (tag le plus proche +
+#   nombre de commits). C'est la version assembly réelle.
+# - L'ordre (fetch → branche → bump → push) garantit qu'on
+#   part d'un main synchro et qu'on ne pollue pas main avec
+#   le bump (qui vit sur la branche release).
+# - Fail-fast si la branche existe déjà en local ou sur origin.
+release:
+	@if [ -z "$(V)" ]; then \
+		echo "Usage: make release V=<version>"; \
+		echo "  V : version semver (ex. 1.0.7-rc1) — sert à nommer la branche."; \
+		exit 1; \
+	fi
+	@if [ -n "$$(git status --porcelain)" ]; then \
+		echo "Working tree sale, refus de créer une branche release."; \
+		git status --short; \
+		exit 1; \
+	fi
+	@BRANCH="release/$(V)"; \
+	if git show-ref --verify --quiet "refs/heads/$$BRANCH"; then \
+		echo "La branche $$BRANCH existe déjà en local."; \
+		echo "  Pour la supprimer : git branch -D $$BRANCH"; \
+		exit 1; \
+	fi; \
+	if git ls-remote --exit-code --heads origin "$$BRANCH" >/dev/null 2>&1; then \
+		echo "La branche $$BRANCH existe déjà sur origin."; \
+		exit 1; \
+	fi; \
+	echo "==> Fetch + vérification synchro main"; \
+	git fetch origin main; \
+	if ! git merge-base --is-ancestor origin/main HEAD; then \
+		echo "main a avancé plus loin que HEAD. Fais :"; \
+		echo "  git pull --ff-only origin main"; \
+		exit 1; \
+	fi; \
+	echo "==> Création de $$BRANCH depuis main"; \
+	git checkout -b "$$BRANCH"; \
+	echo "==> dotnet-gitversion /updateprojectfiles"; \
+	dotnet-gitversion /updateprojectfiles; \
+	echo "==> Commit du bump"; \
+	git add .; \
+	if git diff --cached --quiet; then \
+		echo "Pas de changements à committer (gitversion n'a produit aucune diff)."; \
+	else \
+		git commit -m "chore(release): bump version via gitversion for $(V)"; \
+	fi; \
+	echo "==> Push de $$BRANCH sur origin"; \
+	git push -u origin "$$BRANCH"; \
+	echo "==> Terminé. Branche $$BRANCH live sur origin."
+
+.PHONY: test release

README.md

@@ -28,10 +28,6 @@ sous [`doc/`](./doc/). Voir l'[index de la documentation](./doc/README.md)
 pour le sommaire complet. La racine de l'architecture est
 [Architecture.md](./doc/Architecture.md).
 
-Pour une prise en main guidee avec agents IA:
-- parcours onboarding: [doc/onboarding-agents.md](./doc/onboarding-agents.md)
-- playbook d'usage: [doc/agent-playbook.md](./doc/agent-playbook.md)
-
 
 # Construction et déploiement
 

contrib/Makefile

@@ -95,15 +95,6 @@ showConfig:
 	@echo CONFIGURATION: $(CONFIGURATION)
 	@echo BASEAPPDIR: $(BASEAPPDIR)
 
-showApiLogs:
-	@sudo journalctl -u yavscApi.service -S "2 min ago" | tee yavscApi.log
-
-showOrgLogs:
-	@sudo journalctl -u yavscOrg.service -S "2 min ago" | tee yavscOrg.log
-
-showBlogsLogs:
-	@sudo journalctl -u yavscBlogs.service -S "2 min ago" | tee yavscBlogs.log
-
 clean:
 	@rm -rf generated
 

doc/README.md

@@ -18,9 +18,6 @@ La racine de l'architecture est [Architecture.md](Architecture.md).
 | [architecture/postit.md](architecture/postit.md) | PostIt — topologie des projets, ViewLocator custo, navigation, DI, conventions de binding |
 | [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
 | [testing.md](testing.md) | Stratégie de test : conventions des dossiers, EF Core in-memory, auth stubs, scaffold partagé |
-| [onboarding-agents.md](onboarding-agents.md) | Parcours pas-à-pas pour prise en main agents IA + architecture + tests |
-| [agent-playbook.md](agent-playbook.md) | Playbook d'usage de Copilot, Plan, Explore avec scénarios et anti-patterns |
-| [agent-intent-matrix.md](agent-intent-matrix.md) | Matrice intentions développeur -> agent -> preuves attendues |
 
 ## Roadmap & design exploration
 

doc/agent-intent-matrix.md

@@ -1,20 +0,0 @@
-# Matrice intentions -> agent -> preuves
-
-Cette matrice aide a choisir rapidement l'agent adapte et a exiger
-une sortie verifiable.
-
-| Intention developpeur | Agent principal | Entrees minimales | Sortie minimale attendue | Verification |
-|---|---|---|---|---|
-| Comprendre un BC avant changement | Explore | BC cible, profondeur, contrainte de perimetre | Composants, points d'entree, tests relies, risques | Lire les fichiers cites + confirmer tests proposes |
-| Decomposer une tache transverse | Plan | Objectif, contraintes, definition of done | Etapes ordonnees, dependances, criteres de verif | Verifier que chaque etape a une preuve observable |
-| Implementer une modif locale | Copilot | Fichier cible, comportement attendu, conventions | Patch minimal, justification courte | Build/test du projet impacte |
-| Ajouter un test smoke | Copilot (+Explore) | Route/endpoint, projet de test cible | Test + commande cible | Execution test cible |
-| Corriger une regression | Plan + Copilot | Symptome, zone suspecte, test attendu | Fix + test NonRegression | Test rouge avant, vert apres |
-| Diagnostiquer flux PostIt/OIDC | Explore + Plan | Flux, symptome, plateforme | Carte du flux + hypotheses testables | Verification manuelle + tests existants |
-
-## Regles d'arbitrage
-
-- Si l'intention est "comprendre": commencer par Explore.
-- Si l'intention est "orchestrer": commencer par Plan.
-- Si l'intention est "produire": utiliser Copilot apres cadrage.
-- Si une sortie n'inclut pas de preuve, elle est incomplete.

doc/agent-playbook.md

@@ -1,101 +0,0 @@
-# Playbook d'usage des agents IA (Yavsc)
-
-Ce playbook normalise l'usage de Copilot, Plan et Explore dans le depot.
-Il privilegie des sorties verifiables: fichiers, commandes tests, risques.
-
-## Quand utiliser quel agent
-
-- Plan: quand la tache est ambigue, transverse ou risquee.
-- Explore: quand il faut cartographier rapidement des zones du code.
-- Copilot: quand les specifications sont claires et localisees.
-
-## Prompt type (base)
-
-Utiliser ce squelette avant toute tache non triviale:
-
-```text
-Contexte: <projet/fichier/fonction>
-Objectif: <resultat observable>
-Contraintes: <style, archi, perimetre>
-Verification: <tests exacts a lancer>
-Sortie attendue: <fichiers modifies + risques>
-```
-
-## 4 scenarios de reference
-
-## 1) Explorer un bounded context
-
-Intention:
-- Comprendre ou implementer un changement dans un BC sans regression laterale.
-
-Prompt minimal:
-```text
-Explore le BC <nom> avec profondeur medium.
-Retour: composants touches, points d'entree, tests existants et risques.
-```
-
-Preuves attendues:
-- Carte des fichiers a modifier.
-- Test(s) smoke/mandatory proposes.
-
-## 2) Ajouter un smoke test
-
-Intention:
-- Couvrir rapidement un endpoint ou une route publique.
-
-Prompt minimal:
-```text
-Propose un smoke test pour <route/endpoint> dans le projet de test approprie.
-Respecte les conventions de doc/testing.md.
-```
-
-Preuves attendues:
-- Fichier test cree/modifie.
-- Commande precise pour executer le test cible.
-
-## 3) Corriger une regression backend API
-
-Intention:
-- Corriger un bug sans casser un flux voisin.
-
-Prompt minimal:
-```text
-Planifie puis implemente un fix de <symptome> dans <projet>.
-Ajoute/ajuste un test NonRegression rouge puis vert.
-```
-
-Preuves attendues:
-- Explication cause racine.
-- Test non-regression associe.
-- Commande d'execution et resultat attendu.
-
-## 4) Tracer un flux PostIt/OIDC
-
-Intention:
-- Localiser une cassure d'authentification entre client et serveur.
-
-Prompt minimal:
-```text
-Cartographie le flux OIDC PostIt: entrypoints, callback, stockage token,
-refresh. Donne points de rupture probables et tests/verification proposes.
-```
-
-Preuves attendues:
-- Liste ordonnee des etapes du flux.
-- Fichiers critiques.
-- Hypotheses testables.
-
-## Anti-patterns a eviter
-
-- Prompt sans objectif verifiable.
-- Demande trop large sans perimetre de fichiers.
-- Validation basee uniquement sur "ca semble correct".
-- Pas de lien entre changement et niveau de test.
-
-## Gate PR minimale (agent-assiste)
-
-Avant validation:
-- Impact architecture explicite.
-- Rationale de choix agent explicite.
-- Test(s) executes et justifies.
-- Risques residuels documentes.

doc/onboarding-agents.md

@@ -1,73 +0,0 @@
-# Onboarding guide: agents IA + architecture + tests
-
-Ce guide est optimise pour accelerer la prise en main des agents IA
-(Copilot, Plan, Explore) dans Yavsc, avec une verification rapide
-par les tests.
-
-## Resultat attendu
-
-A la fin du parcours, un contributeur doit pouvoir:
-- Identifier les projets impactes par une modification.
-- Choisir l'agent adapte a l'intention de travail.
-- Produire une proposition de changement verifiable par les tests.
-
-## Parcours en 3 modules
-
-## Module A - Comprendre le terrain (30-45 min)
-
-Objectif: acquerir une lecture fiable de l'architecture.
-
-1. Lire [README.md](../README.md) puis [Architecture.md](Architecture.md).
-2. Lire [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md).
-3. Selon le domaine:
-   - Backend/API: [architecture/workflow-multi-parties.md](architecture/workflow-multi-parties.md)
-   - PostIt: [architecture/postit.md](architecture/postit.md) puis [architecture/postit-oidc.md](architecture/postit-oidc.md)
-
-Definition of done:
-- Expliquer en 5 phrases quelles couches sont touchees.
-- Citer le ou les points d'entree applicatifs a verifier.
-
-## Module B - Boucle tests rapide (20-30 min)
-
-Objectif: verifier rapidement sans lancer toute la suite.
-
-1. Lire [testing.md](testing.md).
-2. Lancer les smoke tests d'abord, puis mandatory selon le projet.
-3. N'elargir au test complet que si le scope depasse le BC touche.
-
-Definition of done:
-- Fournir la commande test executee.
-- Expliquer pourquoi ce niveau de test est suffisant.
-
-## Module C - Usage agentique en production (30-40 min)
-
-Objectif: utiliser les agents comme accelerateurs, pas comme boites noires.
-
-1. Plan: decomposer la tache en etapes verifiables.
-2. Explore: collecter le contexte code/doc precise.
-3. Copilot: implementer localement et verifier.
-
-Regles:
-- Toujours donner un contexte explicite (fichier, but, contrainte).
-- Demander des preuves observables (fichiers modifies, tests, risques).
-- Refuser toute sortie non verifiable.
-
-Definition of done:
-- Une tache simple est livree avec:
-  - Plan
-  - Changement local
-  - Preuve par test
-
-## Routine continue (sans echeance fixe)
-
-Rituels recommandes:
-- Hebdo: revue des prompts qui ont bien fonctionne.
-- Mensuel: mise a jour du present guide et du playbook.
-- A chaque incident: ajouter un anti-pattern dans le playbook.
-
-## Check-list de validation
-
-- Le changement indique son impact architecture.
-- Le choix de l'agent est justifie.
-- La preuve test est incluse.
-- Les risques residuels sont explicitement listes.

dotnet-tools.json

@@ -1,13 +1,5 @@
 {
   "version": 1,
   "isRoot": true,
-  "tools": {
+  "tools": {}
-    "picket": {
-      "version": "0.2.12",
-      "commands": [
-        "picket"
-      ],
-      "rollForward": false
-    }
-  }
 }

src/PostIt/Directory.Packages.props

@@ -16,8 +16,6 @@
         <PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersionBase)" />
         <PackageVersion Include="Avalonia.Headless.Xunit" Version="$(AvaloniaVersionBase)" />
         <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
-        <PackageVersion Include="Mapsui" Version="5.1.0" />
-        <PackageVersion Include="Mapsui.Avalonia12" Version="5.1.0" />
 
         <PackageVersion Include="Material.Avalonia" Version="3.19.0" />
         <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />

src/PostIt/PostIt.Android/Application.cs

@@ -1,5 +1,4 @@
 using Android.App;
-using Android;
 using Android.Runtime;
 using Avalonia;
 using Avalonia.Android;
@@ -10,9 +9,6 @@ using Avalonia.Controls;
 using Avalonia.Styling;
 using Yavsc.Api.Client;
 
-[assembly: UsesPermission(Manifest.Permission.AccessFineLocation)]
-[assembly: UsesPermission(Manifest.Permission.AccessCoarseLocation)]
-
 namespace PostIt.Android
 {
     [Application]

src/PostIt/PostIt.Android/MainActivity.cs

@@ -57,17 +57,6 @@ public class MainActivity : AvaloniaMainActivity
 
     }
 
-    public override void OnRequestPermissionsResult(int requestCode, string[]? permissions, Permission[]? grantResults)
-    {
-        if (PostIt.Android.Services.AndroidCurrentLocationProvider
-            .HandlePermissionResult(requestCode, grantResults))
-        {
-            return;
-        }
-
-        base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
     internal static class AndroidOidcCallbackSink
     {
         private static System.Threading.Tasks.TaskCompletionSource<string>? _pending;

src/PostIt/PostIt.Android/PlatformBootstrap.cs

@@ -14,12 +14,11 @@ internal static class PlatformBootstrap
 {
     internal static void InitPlatform()
     {
+
         Platform.CreateBrowser = () =>
         {
             var activity = MainActivity.Current;
             return activity is null ? null : new AndroidSystemBrowser(activity);
         };
-
-        Platform.TryGetCurrentLocationAsync = AndroidCurrentLocationProvider.TryGetCurrentLocationAsync;
     }
 }

src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs

@@ -1,130 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Android;
-using Android.App;
-using Android.Content.PM;
-using Android.Locations;
-using AndroidX.Core.App;
-using AndroidX.Core.Content;
-using PostIt.Services;
-
-namespace PostIt.Android.Services;
-
-internal static class AndroidCurrentLocationProvider
-{
-    public static async Task<CurrentLocationResult> TryGetCurrentLocationAsync(CancellationToken cancellationToken)
-    {
-        var activity = MainActivity.Current;
-        if (activity is null)
-        {
-            return CurrentLocationResult.Unavailable("L'activité Android n'est pas encore prête.");
-        }
-
-        var permissionGranted = await LocationPermissionBroker.EnsureGrantedAsync(activity, cancellationToken).ConfigureAwait(false);
-        if (!permissionGranted)
-        {
-            return CurrentLocationResult.PermissionDenied();
-        }
-
-        var locationManager = activity.GetSystemService(global::Android.Content.Context.LocationService) as LocationManager;
-        if (locationManager is null)
-        {
-            return CurrentLocationResult.Unavailable("Le service de localisation Android est indisponible.");
-        }
-
-        var location = locationManager.GetProviders(enabledOnly: true)?
-            .Select(provider => locationManager.GetLastKnownLocation(provider))
-            .Where(candidate => candidate is not null)
-            .OrderByDescending(candidate => candidate!.Time)
-            .ThenBy(candidate => candidate!.Accuracy)
-            .FirstOrDefault();
-
-        if (location is null)
-        {
-            return CurrentLocationResult.Unavailable("Aucune position n'est disponible. Activez la localisation du système puis réessayez.");
-        }
-
-        return CurrentLocationResult.Success(location.Latitude, location.Longitude);
-    }
-
-    public static bool HandlePermissionResult(int requestCode, Permission[]? grantResults)
-        => LocationPermissionBroker.HandleResult(requestCode, grantResults);
-
-    private static class LocationPermissionBroker
-    {
-        private const int RequestCode = 4042;
-        private static readonly string[] RequestedPermissions =
-        {
-            Manifest.Permission.AccessFineLocation,
-            Manifest.Permission.AccessCoarseLocation,
-        };
-
-        private static readonly object SyncRoot = new();
-        private static TaskCompletionSource<bool>? _pendingRequest;
-
-        public static Task<bool> EnsureGrantedAsync(Activity activity, CancellationToken cancellationToken)
-        {
-            if (HasLocationPermission(activity))
-            {
-                return Task.FromResult(true);
-            }
-
-            lock (SyncRoot)
-            {
-                if (_pendingRequest is null)
-                {
-                    _pendingRequest = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                    ActivityCompat.RequestPermissions(activity, RequestedPermissions, RequestCode);
-                }
-
-                if (!cancellationToken.CanBeCanceled)
-                {
-                    return _pendingRequest.Task;
-                }
-
-                return WaitAsync(_pendingRequest.Task, cancellationToken);
-            }
-        }
-
-        public static bool HandleResult(int requestCode, Permission[]? grantResults)
-        {
-            if (requestCode != RequestCode)
-            {
-                return false;
-            }
-
-            var granted = grantResults is { Length: > 0 } && grantResults.All(result => result == Permission.Granted);
-            TaskCompletionSource<bool>? pendingRequest;
-            lock (SyncRoot)
-            {
-                pendingRequest = _pendingRequest;
-                _pendingRequest = null;
-            }
-
-            pendingRequest?.TrySetResult(granted);
-            return true;
-        }
-
-        private static bool HasLocationPermission(Activity activity)
-        {
-            return ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessFineLocation) == Permission.Granted
-                || ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessCoarseLocation) == Permission.Granted;
-        }
-
-        private static async Task<bool> WaitAsync(Task<bool> task, CancellationToken cancellationToken)
-        {
-            using var registration = cancellationToken.Register(() =>
-            {
-                lock (SyncRoot)
-                {
-                    _pendingRequest?.TrySetCanceled(cancellationToken);
-                    _pendingRequest = null;
-                }
-            });
-
-            return await task.ConfigureAwait(false);
-        }
-    }
-}

src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs

@@ -7,20 +7,6 @@ namespace PostIt.Tests;
 
 public class ActivitiesPageViewModelTests
 {
-    [Fact]
-    public void ActivityApiClient_uses_avatar_authority_when_provided()
-    {
-        var api = new StubActivityApi();
-        var client = new ActivityApiClient(
-            api,
-            "https://api.pschneider.fr/api/v1/",
-            "https://yavsc.pschneider.fr/");
-
-        var url = client.BuildAvatarXsUrl("paul");
-
-        Assert.Equal("https://yavsc.pschneider.fr/avatars/paul.xs.png", url);
-    }
-
     [Fact]
     public async Task ActivityApiClient_uses_business_absolute_paths()
     {
@@ -39,22 +25,6 @@ public class ActivitiesPageViewModelTests
         Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[3]);
     }
 
-    [Fact]
-    public async Task ActivityApiClient_uses_updated_business_base_without_restart()
-    {
-        var api = new StubActivityApi();
-        var baseUrl = "https://business-a.example/api/v1/";
-        var client = new ActivityApiClient(api, () => baseUrl);
-
-        await client.GetCatalogAsync(ct: TestContext.Current.CancellationToken);
-
-        baseUrl = "https://business-b.example/api/v1/";
-        await client.GetUsersAsync("brush", TestContext.Current.CancellationToken);
-
-        Assert.Equal("https://business-a.example/api/v1/activity/catalog", api.Paths[0]);
-        Assert.Equal("https://business-b.example/api/v1/activity/brush/users", api.Paths[1]);
-    }
-
     [Fact]
     public async Task RefreshAsync_loads_first_activity_then_specialization_performers()
     {
@@ -70,7 +40,6 @@ public class ActivitiesPageViewModelTests
         Assert.Equal("brush", vm.CurrentActivity?.Code);
         Assert.Single(vm.Performers);
         Assert.Equal("Alice", vm.Performers[0].UserName);
-        Assert.Equal("https://business.example/avatars/Alice.xs.png", vm.Performers[0].AvatarXsUrl);
         Assert.True(vm.Performers[0].HasPerformerProfile);
         Assert.True(vm.Performers[0].IsPerformerActive);
         Assert.Equal("Actif", vm.Performers[0].PerformerStatusBadgeLabel);
@@ -81,7 +50,6 @@ public class ActivitiesPageViewModelTests
         Assert.Equal("brush-pro", vm.CurrentActivity?.Code);
         Assert.Single(vm.Performers);
         Assert.Equal("Bob", vm.Performers[0].UserName);
-        Assert.Equal("https://business.example/avatars/Bob.xs.png", vm.Performers[0].AvatarXsUrl);
         Assert.True(vm.Performers[0].HasPerformerProfile);
         Assert.False(vm.Performers[0].IsPerformerActive);
         Assert.Equal("Inactif", vm.Performers[0].PerformerStatusBadgeLabel);
@@ -104,9 +72,9 @@ public class ActivitiesPageViewModelTests
         {
             Paths.Add(path);
 
-            if (typeof(T) == typeof(List<ActivityInfo>))
+            if (typeof(T) == typeof(List<ActivityBrowseItemDto>))
             {
-                var activities = new List<ActivityInfo>
+                var activities = new List<ActivityBrowseItemDto>
                 {
                     new()
                     {
@@ -114,11 +82,11 @@ public class ActivitiesPageViewModelTests
                         Name = "Brush",
                         Description = "Coiffure à domicile",
                         PerformerCount = 1,
-                        Forms = new List<CommandFormSummary>
+                        Forms = new List<CommandFormSummaryDto>
                         {
                             new() { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" }
                         },
-                        Children = new List<ActivityInfo>
+                        Children = new List<ActivityBrowseItemDto>
                         {
                             new()
                             {
@@ -127,7 +95,7 @@ public class ActivitiesPageViewModelTests
                                 Description = "Spécialisation premium",
                                 ParentCode = "brush",
                                 PerformerCount = 1,
-                                Forms = new List<CommandFormSummary>
+                                Forms = new List<CommandFormSummaryDto>
                                 {
                                     new() { Id = 2, ActionName = "Rdv", Title = "Rendez-vous premium" }
                                 }
@@ -138,14 +106,14 @@ public class ActivitiesPageViewModelTests
                 return Task.FromResult((T)(object)activities);
             }
 
-            if (typeof(T) == typeof(List<PerformerActivity>))
+            if (typeof(T) == typeof(List<ActivityPerformerDto>))
             {
                 var performers = path.EndsWith("brush-pro/users", StringComparison.Ordinal)
-                    ? new List<PerformerActivity>
+                    ? new List<ActivityPerformerDto>
                     {
                         new() { PerformerId = "pro-2", HasPerformerProfile = true, Active = false, UserName = "Bob", ActivityCode = "brush-pro", ActivityName = "Brush Pro", ExtraActivityCount = 2 }
                     }
-                    : new List<PerformerActivity>
+                    : new List<ActivityPerformerDto>
                     {
                         new() { PerformerId = "pro-1", HasPerformerProfile = true, Active = true, UserName = "Alice", ActivityCode = "brush", ActivityName = "Brush", ExtraActivityCount = 0 }
                     };
@@ -162,12 +130,6 @@ public class ActivitiesPageViewModelTests
             return Task.CompletedTask;
         }
 
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
         public ValueTask DisposeAsync() => ValueTask.CompletedTask;
     }
 }

src/PostIt/PostIt.Tests/BearerScopeTests.cs

@@ -67,7 +67,7 @@ public class BearerScopeTests
                 Scopes = userScopes,
                 RedirectUri = "postit://callback",
             },
-            ApiUrl = "https://example.invalid/api/v1/",
+            BusinessApiUrl = "https://example.invalid/api/v1/",
         };
 
         var tokensPath = Path.Combine(
@@ -266,7 +266,7 @@ public class BearerScopeTests
             // private HttpClient is independent, so we resolve the
             // absolute URI ourselves from Settings.BusinessApiUrl —
             // the same URL BlogApiClient would have set as BaseAddress.
-            var absolute = new Uri(new Uri(Settings.ApiUrl), path);
+            var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path);
             using var req = new HttpRequestMessage(method, absolute);
             req.Headers.Authorization =
                 new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _accessToken);

src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs

@@ -1,8 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using PostIt.Helpers;
-using PostIt.Services;
 using PostIt.ViewModels;
-using PostIt.ViewModels.Commands;
 using Yavsc;
 using Yavsc.Abstract.Workflow;
 using Yavsc.Api.Client;
@@ -17,19 +15,19 @@ public class BillingCommandPageViewModelTests
     {
         var api = new RecordingApi();
         var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
+        var vm = new BillingCommandPageViewModel(
-          new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+            new ActivityBrowseItemDto { Code = "dev", Name = "Développement" },
-          .CreateCommandPageViewModel(
-            new ActivityInfo { Code = "dev", Name = "Développement" },
             new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-            client) as RdvViewModel;
+            new CommandFormSummaryDto { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" },
-
+            client)
-            vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+        {
-        vm!.Reason = "Point de cadrage";
+            EventDateText = "2026-09-02 14:30",
-        vm!.Address = "1 rue du Test";
+            Reason = "Point de cadrage",
-        vm!.Latitude = 48.8566;
+            Address = "1 rue du Test",
-        vm!.Longitude = 2.3522;
+            LatitudeText = "48.8566",
-        vm!.Consent = true;
+            LongitudeText = "2.3522",
+            Consent = true,
+        };
 
         await vm.SubmitCommand.ExecuteAsync(null);
 
@@ -48,154 +46,16 @@ public class BillingCommandPageViewModelTests
     {
         var api = new RecordingApi();
         var client = new BillingApiClient(api, "https://business.example/api/v1/");
-
+        var vm = new BillingCommandPageViewModel(
-        var vm =
+            new ActivityBrowseItemDto { Code = "book", Name = "Book" },
-         new CommandFormSummary { Id = 13, ActionName = "Book", Title = "Réservation" }
-         .CreateCommandPageViewModel(
-            new ActivityInfo { Code = "book", Name = "Book" },
             new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
+            new CommandFormSummaryDto { Id = 13, ActionName = "Book", Title = "Réservation" },
             client);
 
-        Assert.Null(vm);
-    }
-
-    [Fact]
-    public async Task SubmitAsync_allows_missing_coordinates_and_omits_them_from_payload()
-    {
-        var api = new RecordingApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
-
-        new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
-        .CreateCommandPageViewModel(
-            new ActivityInfo { Code = "dev", Name = "Développement" },
-            new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-            client) as RdvViewModel;
-        vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
-        vm!.Reason = "Point de cadrage";
-        vm!.Address = "1 rue du Test";
-        vm!.Latitude = null;
-        vm!.Longitude = null;
-        vm!.Consent = true;
-
         await vm.SubmitCommand.ExecuteAsync(null);
 
-        using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+        Assert.Null(api.LastPath);
-        var location = json.RootElement.GetProperty("Location");
+        Assert.Contains("n'est pas encore pris en charge", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
-        Assert.Equal("1 rue du Test", location.GetProperty("Address").GetString());
-        Assert.False(location.TryGetProperty("Latitude", out _));
-        Assert.False(location.TryGetProperty("Longitude", out _));
-    }
-
-    [Fact]
-    public async Task UseCurrentLocationAsync_prefills_coordinates_from_platform_provider()
-    {
-        var original = Platform.TryGetCurrentLocationAsync;
-        try
-        {
-            Platform.TryGetCurrentLocationAsync = _ => Task.FromResult(CurrentLocationResult.Success(48.8566, 2.3522));
-
-            var api = new RecordingApi();
-            var client = new BillingApiClient(api, "https://business.example/api/v1/");
-            var vm =
-             new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
-             .CreateCommandPageViewModel(
-                new ActivityInfo { Code = "dev", Name = "Développement" },
-                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-                client) as RdvViewModel;
-
-            await vm!.UseCurrentLocationCommand.ExecuteAsync(null);
-
-            Assert.Equal(48.8566, vm!.Latitude);
-            Assert.Equal(2.3522, vm!.Longitude);
-        }
-        finally
-        {
-            Platform.TryGetCurrentLocationAsync = original;
-        }
-    }
-
-    [Fact]
-    public void ApplyLocationFromMap_sets_coordinates_and_updates_status()
-    {
-        var api = new RecordingApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
-            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
-            .CreateCommandPageViewModel(
-                new ActivityInfo { Code = "dev", Name = "Développement" },
-                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-                client) as RdvViewModel;
-
-        vm!.Address = string.Empty;
-        vm.ApplyLocationFromMap(48.85661234, 2.35224567);
-
-        Assert.Equal(48.856612, vm.Latitude);
-        Assert.Equal(2.352246, vm.Longitude);
-        Assert.Contains("Position sélectionnée", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
-    }
-
-    [Fact]
-    public void EventDateSelection_round_trips_with_EventDate_for_DatePicker_binding()
-    {
-        var api = new RecordingApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
-            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
-            .CreateCommandPageViewModel(
-                new ActivityInfo { Code = "dev", Name = "Développement" },
-                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-                client) as RdvViewModel;
-
-        var selected = new DateTimeOffset(2026, 9, 7, 14, 30, 0, TimeSpan.FromHours(2));
-        vm!.EventDateSelection = selected;
-
-        Assert.Equal(selected.LocalDateTime, vm.EventDate);
-        Assert.Equal(vm.EventDate, vm.EventDateSelection!.Value.LocalDateTime);
-    }
-
-    [Fact]
-    public void ApplyResolvedAddress_populates_empty_address_directly()
-    {
-        var api = new RecordingApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
-            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
-            .CreateCommandPageViewModel(
-                new ActivityInfo { Code = "dev", Name = "Développement" },
-                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-                client) as RdvViewModel;
-
-        vm!.Address = string.Empty;
-        vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
-
-        Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.Address);
-        Assert.False(vm.HasSuggestedAddress);
-    }
-
-    [Fact]
-    public void ApplyResolvedAddress_preserves_manual_address_and_exposes_suggestion()
-    {
-        var api = new RecordingApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
-            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
-            .CreateCommandPageViewModel(
-                new ActivityInfo { Code = "dev", Name = "Développement" },
-                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-                client) as RdvViewModel;
-
-        vm!.Address = "Saisie manuelle";
-        vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
-
-        Assert.Equal("Saisie manuelle", vm.Address);
-        Assert.True(vm.HasSuggestedAddress);
-        Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.SuggestedAddress);
-
-        vm.ApplySuggestedAddressCommand.Execute(null);
-
-        Assert.Equal("10 rue de Rivoli, 75001 Paris", vm.Address);
-        Assert.False(vm.HasSuggestedAddress);
     }
 
     [Fact]
@@ -210,18 +70,19 @@ public class BillingCommandPageViewModelTests
             }
         };
         var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
+        var vm = new BillingCommandPageViewModel(
-        new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
+            new ActivityBrowseItemDto { Code = "brush", Name = "Brush" },
-        .CreateCommandPageViewModel(
-            new ActivityInfo { Code = "brush", Name = "Brush" },
             new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
-            client) as BrushViewModel;
+            new CommandFormSummaryDto { Id = 13, ActionName = "Brush", Title = "Coupe" },
-        vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+            client)
-        vm!.Address = "1 rue du Test";
+        {
-        vm!.Latitude = 48.8566;
+            EventDateText = "2026-09-02 14:30",
-        vm!.Longitude = 2.3522;
+            Address = "1 rue du Test",
-        vm!.Consent = true;
+            LatitudeText = "48.8566",
-        vm!.AdditionalInfo = "Prévoir shampoing";
+            LongitudeText = "2.3522",
+            Consent = true,
+            AdditionalInfo = "Prévoir shampoing",
+        };
 
         await vm.InitializeAsync();
         vm.SelectedPrestation = vm.AvailablePrestations[1];
@@ -245,22 +106,23 @@ public class BillingCommandPageViewModelTests
             }
         };
         var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
+        var vm = new BillingCommandPageViewModel(
-        new CommandFormSummary { Id = 14, ActionName = "MBrush", Title = "Coupe groupée" }
+            new ActivityBrowseItemDto { Code = "mbrush", Name = "MBrush" },
-        .CreateCommandPageViewModel(
-            new ActivityInfo { Code = "mbrush", Name = "MBrush" },
             new ActivityUserDisplayItem { PerformerId = "perf-3", UserName = "Cara" },
-            client) as MBrushViewModel;
+            new CommandFormSummaryDto { Id = 14, ActionName = "MBrush", Title = "Coupe groupée" },
-        vm!.EventDate = DateTime.Parse("2026-09-03 10:00");
+            client)
-        vm!.Address = "2 rue du Test";
+        {
-        vm!.Latitude = 48.8567;
+            EventDateText = "2026-09-03 10:00",
-        vm!.Longitude = 2.3523;
+            Address = "2 rue du Test",
-        vm!.Consent = true;
+            LatitudeText = "48.8567",
+            LongitudeText = "2.3523",
+            Consent = true,
+        };
 
         await vm.InitializeAsync();
-        vm!.MultiPrestations[0].IsSelected = true;
+        vm.MultiPrestations[0].IsSelected = true;
-        vm!.MultiPrestations[1].IsSelected = true;
+        vm.MultiPrestations[1].IsSelected = true;
-        await vm!.SubmitCommand.ExecuteAsync(null);
+        await vm.SubmitCommand.ExecuteAsync(null);
 
         Assert.Equal("https://business.example/api/v1/billing/MBrush", api.LastPath);
         using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
@@ -282,13 +144,13 @@ public class BillingCommandPageViewModelTests
             }
         };
         var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm =
+        var vm = new BillingCommandPageViewModel(
-           new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
+            new ActivityBrowseItemDto { Code = "brush", Name = "Brush" },
-         .CreateCommandPageViewModel(
-            new ActivityInfo { Code = "brush", Name = "Brush" },
             new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
-            client) as BrushViewModel;
+            new CommandFormSummaryDto { Id = 13, ActionName = "Brush", Title = "Coupe" },
-        await vm!.InitializeAsync(new BillingQueryDetailsDto
+            client);
+
+        await vm.InitializeAsync(new BillingQueryDetailsDto
         {
             Id = 77,
             BillingCode = "Brush",
@@ -308,9 +170,9 @@ public class BillingCommandPageViewModelTests
             }
         });
 
-        vm!.SelectedPrestation = vm!.AvailablePrestations[1];
+        vm.SelectedPrestation = vm.AvailablePrestations[1];
-        vm!.AdditionalInfo = "Note mise à jour";
+        vm.AdditionalInfo = "Note mise à jour";
-        await vm!.SubmitCommand.ExecuteAsync(null);
+        await vm.SubmitCommand.ExecuteAsync(null);
 
         Assert.Equal(HttpMethod.Put, api.LastMethod);
         Assert.Equal("https://business.example/api/v1/billing/Brush/77", api.LastPath);
@@ -352,12 +214,6 @@ public class BillingCommandPageViewModelTests
             return Task.CompletedTask;
         }
 
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
         public ValueTask DisposeAsync() => ValueTask.CompletedTask;
     }
 }

src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs

@@ -14,9 +14,9 @@ public class BillingQueriesPageViewModelTests
         var api = new StubBillingApi();
         var client = new BillingApiClient(api, "https://business.example/api/v1/");
         var vm = new BillingQueriesPageViewModel(
-            new ActivityInfo { Code = "dev", Name = "Développement" },
+            new ActivityBrowseItemDto { Code = "dev", Name = "Développement" },
             new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-            new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
+            new CommandFormSummaryDto { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
             client);
 
         await vm.InitializeAsync();
@@ -33,9 +33,9 @@ public class BillingQueriesPageViewModelTests
         var api = new StubBillingApi();
         var client = new BillingApiClient(api, "https://business.example/api/v1/");
         var vm = new BillingQueriesPageViewModel(
-            new ActivityInfo { Code = "dev", Name = "Développement" },
+            new ActivityBrowseItemDto { Code = "dev", Name = "Développement" },
             new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-            new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
+            new CommandFormSummaryDto { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
             client,
             isReadOnly: true,
             ongoingOnly: true);
@@ -45,8 +45,10 @@ public class BillingQueriesPageViewModelTests
         Assert.Equal(2, vm.Queries.Count);
         Assert.All(vm.Queries, q => Assert.DoesNotContain("Rejected", q.StatusLabel, StringComparison.OrdinalIgnoreCase));
         Assert.Contains("lecture seule", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+        Assert.False(vm.CanOpenDetails);
 
-        Assert.True(vm.Queries.Count > 0);
+        vm.SelectedQuery = vm.Queries[0];
+        Assert.False(vm.OpenSelectedQueryCommand.CanExecute(null));
     }
 
     private sealed class StubBillingApi : IYavscApiClient
@@ -127,12 +129,6 @@ public class BillingQueriesPageViewModelTests
             return Task.CompletedTask;
         }
 
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
         public ValueTask DisposeAsync() => ValueTask.CompletedTask;
     }
 }

src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs

@@ -1,270 +0,0 @@
-using System.Net.Http;
-using PostIt.ViewModels;
-using Yavsc;
-using Yavsc.Api.Client;
-
-namespace PostIt.Tests;
-
-public class EstimateEditionPageViewModelTests
-{
-    private static BillingQuerySummaryDto SampleQuery() => new()
-    {
-        Id = 42,
-        BillingCode = "Brush",
-        ActivityCode = "hair",
-        PerformerId = "perf-1",
-        ClientId = "cli-1",
-        Status = QueryStatus.InProgress,
-        Description = "Coupe simple",
-        EventDate = new DateTime(2026, 9, 12, 10, 0, 0, DateTimeKind.Utc),
-    };
-
-    private static EstimateEditionPageViewModel CreateViewModel(StubEstimateApi api, BillingQuerySummaryDto? query = null)
-    {
-        var client = new EstimateApiClient(api, "https://business.example/api/v1/");
-        return new EstimateEditionPageViewModel(query ?? SampleQuery(), client);
-    }
-
-    [Fact]
-    public void Constructor_prefills_description_and_adds_a_first_line()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-
-        Assert.Equal("Coupe simple", vm.EstimateDescription);
-        Assert.Single(vm.Lines);
-        Assert.Same(vm.Lines[0], vm.SelectedLine);
-        Assert.Contains("#42", vm.ContextLabel);
-        Assert.Contains("cli-1", vm.ContextLabel);
-    }
-
-    [Fact]
-    public void AddLine_appends_and_selects_the_new_line()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-
-        vm.AddLineCommand.Execute(null);
-
-        Assert.Equal(2, vm.Lines.Count);
-        Assert.Same(vm.Lines[1], vm.SelectedLine);
-    }
-
-    [Fact]
-    public void RemoveLine_removes_the_selected_line()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-        var first = vm.Lines[0];
-
-        vm.RemoveLineCommand.Execute(null);
-
-        Assert.Empty(vm.Lines);
-        Assert.Null(vm.SelectedLine);
-        Assert.False(vm.RemoveLineCommand.CanExecute(null));
-        Assert.DoesNotContain(first, vm.Lines);
-    }
-
-    [Fact]
-    public void Total_sums_line_totals_and_tracks_edits()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-
-        vm.Lines[0].Count = 2;
-        vm.Lines[0].UnitaryCost = 15.5m;
-
-        Assert.Equal(31m, vm.Total);
-        Assert.Equal($"{31m:0.00} EUR", vm.TotalLabel);
-
-        vm.AddLineCommand.Execute(null);
-        vm.Lines[1].Count = 1;
-        vm.Lines[1].UnitaryCost = 9m;
-
-        Assert.Equal(40m, vm.Total);
-    }
-
-    [Fact]
-    public async Task Send_without_title_warns_and_does_not_post()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-        vm.Lines[0].Name = "Coupe";
-        vm.Lines[0].Description = "Coupe simple";
-        vm.Lines[0].UnitaryCost = 25m;
-
-        await vm.SendCommand.ExecuteAsync(null);
-
-        Assert.Null(api.LastBody);
-        Assert.Equal(StatusSeverity.Warning, vm.ActionStatus.Severity);
-        Assert.Contains("titre", vm.ActionStatus.Message);
-    }
-
-    [Fact]
-    public async Task Send_without_any_line_warns_and_does_not_post()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-        vm.EstimateTitle = "Devis coupe";
-        vm.Lines.Clear();
-
-        await vm.SendCommand.ExecuteAsync(null);
-
-        Assert.Null(api.LastBody);
-        Assert.Equal(StatusSeverity.Warning, vm.ActionStatus.Severity);
-        Assert.Contains("ligne", vm.ActionStatus.Message);
-    }
-
-    [Fact]
-    public async Task Send_with_a_blank_line_name_warns_and_does_not_post()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-        vm.EstimateTitle = "Devis coupe";
-        vm.Lines[0].Description = "Oubli du nom";
-
-        await vm.SendCommand.ExecuteAsync(null);
-
-        Assert.Null(api.LastBody);
-        Assert.Equal(StatusSeverity.Warning, vm.ActionStatus.Severity);
-        Assert.Contains("nom", vm.ActionStatus.Message);
-    }
-
-    [Fact]
-    public async Task Send_posts_the_estimate_payload_to_the_estimate_route()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-        vm.EstimateTitle = "  Devis coupe  ";
-        vm.Lines[0].Name = "Coupe";
-        vm.Lines[0].Description = "Coupe simple";
-        vm.Lines[0].Count = 2.4m;
-        vm.Lines[0].UnitaryCost = 25m;
-
-        await vm.SendCommand.ExecuteAsync(null);
-
-        Assert.Equal("https://business.example/api/v1/estimate", api.LastPath);
-        Assert.Equal(HttpMethod.Post, api.LastMethod);
-
-        var payload = Assert.IsType<EstimateDto>(api.LastBody);
-        Assert.Equal(42, payload.CommandId);
-        Assert.Equal("cli-1", payload.ClientId);
-        Assert.Equal("Brush", payload.CommandType);
-        Assert.Equal("Devis coupe", payload.Title);
-        Assert.Equal("Coupe simple", payload.Description);
-        Assert.Empty(payload.AttachedFiles);
-        Assert.Empty(payload.AttachedGraphics);
-
-        var line = Assert.Single(payload.Bill);
-        Assert.Equal("Coupe", line.Name);
-        Assert.Equal(2, line.Count);
-        Assert.Equal(25m, line.UnitaryCost);
-        Assert.Equal("EUR", line.Currency);
-    }
-
-    [Fact]
-    public async Task Send_marks_the_page_as_sent_and_disables_resend()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-        vm.EstimateTitle = "Devis coupe";
-        vm.Lines[0].Name = "Coupe";
-        vm.Lines[0].Description = "Coupe simple";
-        vm.Lines[0].UnitaryCost = 25m;
-
-        await vm.SendCommand.ExecuteAsync(null);
-
-        Assert.True(vm.HasSent);
-        Assert.False(vm.SendCommand.CanExecute(null));
-        Assert.Equal("Devis envoyé", vm.SendLabel);
-        Assert.Equal(StatusSeverity.Info, vm.ActionStatus.Severity);
-        Assert.Contains("#7", vm.ActionStatus.Message);
-    }
-
-    [Fact]
-    public async Task Send_surfaces_server_errors_as_error_status()
-    {
-        var api = new StubEstimateApi { Failure = new HttpRequestException("boom", null, System.Net.HttpStatusCode.InternalServerError) };
-        var vm = CreateViewModel(api);
-        vm.EstimateTitle = "Devis coupe";
-        vm.Lines[0].Name = "Coupe";
-        vm.Lines[0].Description = "Coupe simple";
-
-        await vm.SendCommand.ExecuteAsync(null);
-
-        Assert.False(vm.HasSent);
-        Assert.Equal(StatusSeverity.Error, vm.ActionStatus.Severity);
-        Assert.True(vm.SendCommand.CanExecute(null));
-    }
-
-    [Fact]
-    public async Task Send_accepts_negative_amounts_for_discount_lines()
-    {
-        var api = new StubEstimateApi();
-        var vm = CreateViewModel(api);
-        vm.EstimateTitle = "Devis avec remise";
-        vm.Lines[0].Name = "Coupe";
-        vm.Lines[0].Description = "Coupe simple";
-        vm.Lines[0].UnitaryCost = 25m;
-
-        vm.AddLineCommand.Execute(null);
-        vm.Lines[1].Name = "Remise fidélité";
-        vm.Lines[1].Description = "Remise client régulier";
-        vm.Lines[1].UnitaryCost = -5m;
-
-        Assert.Equal(20m, vm.Total);
-
-        await vm.SendCommand.ExecuteAsync(null);
-
-        var payload = Assert.IsType<EstimateDto>(api.LastBody);
-        Assert.Equal(2, payload.Bill.Count);
-        Assert.Equal(-5m, payload.Bill[1].UnitaryCost);
-        Assert.True(vm.HasSent);
-    }
-
-    private sealed class StubEstimateApi : IYavscApiClient
-    {
-        public HttpClient Http { get; } = new();
-        public string? LastPath { get; private set; }
-        public HttpMethod? LastMethod { get; private set; }
-        public object? LastBody { get; private set; }
-        public Exception? Failure { get; init; }
-
-        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
-        {
-            LastMethod = method;
-            LastPath = path;
-            LastBody = body;
-
-            if (Failure is not null)
-            {
-                throw Failure;
-            }
-
-            if (typeof(T) == typeof(EstimateCreatedDto))
-            {
-                var payload = (EstimateDto)body!;
-                var created = new EstimateCreatedDto { Id = 7, Bill = payload.Bill };
-                return Task.FromResult((T)(object)created);
-            }
-
-            return Task.FromResult(default(T)!);
-        }
-
-        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
-        {
-            LastMethod = method;
-            LastPath = path;
-            LastBody = body;
-            return Task.CompletedTask;
-        }
-
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
-        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
-    }
-}

src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs

@@ -1,15 +0,0 @@
-using PostIt.ViewModels;
-
-namespace PostIt.Tests;
-
-public class HomePageProviderFlowTests
-{
-    [Fact]
-    public void HomePage_exposes_provider_requests_command()
-    {
-        var vm = new HomePageViewModel();
-
-        Assert.NotNull(vm.OpenProviderRequests);
-        Assert.True(vm.OpenProviderRequests.CanExecute(null));
-    }
-}

src/PostIt/PostIt.Tests/MainPageButtonsTests.cs

@@ -8,8 +8,6 @@ using Yavsc.Blogspot;
 using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
-using PostIt.Views.Blogs;
-using PostIt.Helpers;
 
 namespace PostIt.Tests;
 
@@ -74,13 +72,13 @@ public class MainPageButtonsTests
         { }
     }
 
-    private static BlogsViewModel MakeViewModel(BlogPostDto? selectedPost = null)
+    private static MainViewModel 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 BlogsViewModel resolves
+        // 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
@@ -95,7 +93,7 @@ public class MainPageButtonsTests
         services.AddTransient<SignaturePage>();
         services.AddTransient<CirclesPage>();
         services.AddTransient<PostAclDialog>();
-        var vm = new BlogsViewModel(blog, services: services.BuildServiceProvider());
+        var vm = new MainViewModel(blog, services: services.BuildServiceProvider());
         if (selectedPost is not null) vm.SelectedPost = selectedPost;
         return vm;
     }
@@ -103,7 +101,7 @@ public class MainPageButtonsTests
     /// <summary>
     /// Mount a real <see cref="MainView"/> (as
     /// <c>SessionStatusBannerTests</c> does), push a
-    /// <see cref="BlogsPage"/> with the given VM onto
+    /// <see cref="MainPage"/> with the given VM onto
     /// <c>NavRoot</c>. <c>PushAsync</c> is awaited (via
     /// <c>GetAwaiter().GetResult()</c>) so the page is on the
     /// nav stack before the test tries to interact with its
@@ -111,17 +109,13 @@ public class MainPageButtonsTests
     /// realised and <c>KeyPressQwerty</c> has a real
     /// <see cref="TopLevel"/> to dispatch against.
     /// </summary>
-    private static (MainView window, BlogsPage page) MountMainPage(BlogsViewModel vm)
+    private static (MainView window, MainPage page) MountMainPage(MainViewModel vm)
     {
         var window = new MainView();
-        var page = new BlogsPage { DataContext = vm };
+        var page = new MainPage { DataContext = vm };
         var app = (PostIt.App)Application.Current!;
-
         app.AttachMainWindow(window);
-
         window.NavRoot.PushAsync(page).GetAwaiter().GetResult();
-        var mainWindow = new Window { Content = window };
-        mainWindow.Show();
         return (window, page);
     }
 
@@ -151,7 +145,7 @@ public class MainPageButtonsTests
     }
 
     [AvaloniaFact]
-    public async Task Acl_button_click_pushes_a_page_onto_nav_stack()
+    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
@@ -184,7 +178,7 @@ public class MainPageButtonsTests
     }
 
     [AvaloniaFact]
-    public async Task Circles_button_click_pushes_a_page_onto_nav_stack()
+    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.
@@ -209,7 +203,7 @@ public class MainPageButtonsTests
     public void Signature_dev_button_click_pushes_a_page_onto_nav_stack()
     {
         // Arrange: the "[DEV] Signature" button is bound to the
-        // BlogsViewModel.OpenSignatureDevCommand [RelayCommand].
+        // 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

src/PostIt/PostIt.Tests/MainPageSaveTests.cs

@@ -5,11 +5,10 @@ using Yavsc.Blogspot;
 using Yavsc.Api.Client;
 using PostIt.ViewModels;
 using PostIt.Views;
-using PostIt.Views.Blogs;
 namespace PostIt.Tests;
 
 /// <summary>
-/// Headless UI tests for the "Save" flow in <see cref="BlogsPage"/>.
+/// Headless UI tests for the "Save" flow in <see cref="MainPage"/>.
 /// The pattern is the one <c>SessionStatusBannerTests</c>
 /// established: <c>[AvaloniaFact]</c>, a <see cref="Window"/>
 /// hosting the page (via a <see cref="Frame"/> because
@@ -41,9 +40,9 @@ public class MainPageSaveTests
         var recorder = new CallRecorder();
         var api = new RecordingYavscApiClient(recorder);
         var blog = new BlogApiClient(api, "http://localhost/");
-        var viewModel = new BlogsViewModel(blog);
+        var viewModel = new MainViewModel(blog);
 
-        var page = new BlogsPage { DataContext = viewModel };
+        var page = new MainPage { DataContext = viewModel };
         // MainPage is a ContentPage (a Page, not a Control), so it
         // must be hosted in a navigation surface. The production
         // MainWindow.axaml uses NavigationPage, and the API is the
@@ -64,7 +63,9 @@ public class MainPageSaveTests
         const string typed = "Mon premier billet";
         titleBox.Text = typed;
 
-        var saveButton = page.SaveButton;
+        var saveButton = window.GetVisualDescendants()
+            .OfType<Button>()
+            .Single(b => b.Content as string == "Save");
         saveButton.Command!.Execute(null);
 
         // The Save command is async (RelayCommand over Task) but

src/PostIt/PostIt.Tests/NominatimReverseGeocodingServiceTests.cs

@@ -1,72 +0,0 @@
-using System.Net;
-using System.Text;
-using PostIt.Services;
-
-namespace PostIt.Tests;
-
-public class NominatimReverseGeocodingServiceTests
-{
-    [Fact]
-    public async Task TryResolveAddressAsync_formats_compact_street_address_from_nominatim_payload()
-    {
-        var handler = new StubHandler("""
-            {
-              "display_name": "6, Place de l'Hôtel-de-Ville - Esplanade de la Libération, Paris, 75004, France",
-              "address": {
-                "house_number": "6",
-                "road": "Place de l'Hôtel-de-Ville - Esplanade de la Libération",
-                "postcode": "75004",
-                "city": "Paris"
-              }
-            }
-            """);
-
-        var service = new NominatimReverseGeocodingService(new HttpClient(handler)
-        {
-            BaseAddress = new Uri("https://nominatim.openstreetmap.org/")
-        });
-
-        var result = await service.TryResolveAddressAsync(48.8566, 2.3522);
-
-        Assert.Equal("6, Place de l'Hôtel-de-Ville - Esplanade de la Libération, 75004, Paris", result);
-        Assert.NotNull(handler.LastRequest);
-        Assert.Contains("reverse?format=jsonv2", handler.LastRequest!.RequestUri!.ToString(), StringComparison.Ordinal);
-    }
-
-    [Fact]
-    public async Task TryResolveAddressAsync_returns_null_on_unsuccessful_response()
-    {
-        var handler = new StubHandler("{}", HttpStatusCode.TooManyRequests);
-        var service = new NominatimReverseGeocodingService(new HttpClient(handler)
-        {
-            BaseAddress = new Uri("https://nominatim.openstreetmap.org/")
-        });
-
-        var result = await service.TryResolveAddressAsync(48.8566, 2.3522);
-
-        Assert.Null(result);
-    }
-
-    private sealed class StubHandler : HttpMessageHandler
-    {
-        private readonly string _payload;
-        private readonly HttpStatusCode _statusCode;
-
-        public HttpRequestMessage? LastRequest { get; private set; }
-
-        public StubHandler(string payload, HttpStatusCode statusCode = HttpStatusCode.OK)
-        {
-            _payload = payload;
-            _statusCode = statusCode;
-        }
-
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            LastRequest = request;
-            return Task.FromResult(new HttpResponseMessage(_statusCode)
-            {
-                Content = new StringContent(_payload, Encoding.UTF8, "application/json")
-            });
-        }
-    }
-}

src/PostIt/PostIt.Tests/PostAclDialogTests.cs

@@ -95,7 +95,7 @@ public class PostAclDialogTests
             HttpMethod method, string path, object? body = null,
             CancellationToken ct = default)
         {
-            var absolute = new Uri(new Uri(Settings.ApiUrl), path);
+            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();
@@ -123,8 +123,8 @@ public class PostAclDialogTests
         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.ApiUrl);
+        var aclClient = new BlogAclApiClient(api, settings.BusinessApiUrl);
-        var circleClient = new CircleApiClient(api, settings.ApiUrl);
+        var circleClient = new CircleApiClient(api, settings.BusinessApiUrl);
 
         var services = new ServiceCollection();
         services.AddSingleton(settings);
@@ -270,12 +270,6 @@ public class PostAclDialogTests
             return Task.CompletedTask;
         }
 
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
         public ValueTask DisposeAsync() => ValueTask.CompletedTask;
     }
 }

src/PostIt/PostIt.Tests/PostItViewModelTests.cs

@@ -11,23 +11,25 @@ public class PostItViewModelTests
     [Fact]
     public void SearchCommand_filters_posts_by_title_article_or_author()
     {
-        // BlogsViewModel no longer owns a BlogApiClient instance by
+        // MainPageViewModel no longer owns a BlogApiClient instance by
         // default; tests construct one with a fake YavscApiClient that
         // throws on any call (we never call the API in this test).
         var fakeApi = new ThrowingYavscApiClient();
         var blog = new BlogApiClient(fakeApi, "http://localhost/");
-        var viewModel = new BlogsViewModel(blog);
+        var viewModel = new MainViewModel(blog);
 
         viewModel.Posts.Add(new BlogPostDto { Id = 1, Title = "First post", Article = "Hello world", AuthorId = "alice" });
         viewModel.Posts.Add(new BlogPostDto { Id = 2, Title = "Second post", Article = "Nothing here", AuthorId = "bob" });
         viewModel.Posts.Add(new BlogPostDto { Id = 3, Title = "Third post", Article = "Search me", AuthorId = "carol" });
 
         viewModel.SearchText = "search";
+        viewModel.SearchCommand.Execute(null);
 
         Assert.Single(viewModel.FilteredPosts);
         Assert.Equal(3, viewModel.FilteredPosts[0].Id);
 
         viewModel.SearchText = "bob";
+        viewModel.SearchCommand.Execute(null);
 
         Assert.Single(viewModel.FilteredPosts);
         Assert.Equal(2, viewModel.FilteredPosts[0].Id);
@@ -58,7 +60,7 @@ public class PostItViewModelTests
     {
         var api = new RecordingPublishApi();
         var blog = new BlogApiClient(api, "http://localhost/");
-        var viewModel = new BlogsViewModel(blog);
+        var viewModel = new MainViewModel(blog);
 
         viewModel.SelectedPost = new BlogPostDto { Id = 42, IsPublished = false };
 
@@ -144,12 +146,6 @@ public class PostItViewModelTests
             return Task.CompletedTask;
         }
 
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
         public ValueTask DisposeAsync() => ValueTask.CompletedTask;
     }
 }

src/PostIt/PostIt.Tests/ProviderOngoingRequestsPageViewModelTests.cs

@@ -1,238 +0,0 @@
-using System.Net.Http;
-using PostIt.ViewModels;
-using Yavsc;
-using Yavsc.Api.Client;
-
-namespace PostIt.Tests;
-
-public class ProviderOngoingRequestsPageViewModelTests
-{
-    [Fact]
-    public async Task RefreshAsync_calls_provider_endpoint_and_filters_out_unknown_billing_codes()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client);
-
-        await vm.InitializeAsync();
-
-        Assert.Contains("https://business.example/api/v1/bill/provider/ongoing", api.Paths);
-        Assert.Equal(3, vm.Queries.Count);
-        Assert.Equal(12, vm.Queries[0].Id);
-        Assert.Equal(11, vm.Queries[1].Id);
-        Assert.Equal(10, vm.Queries[2].Id);
-    }
-
-    [Fact]
-    public async Task FilterText_filters_by_activity_code_and_status()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client);
-
-        await vm.InitializeAsync();
-
-        vm.FilterText = "mbrush";
-        Assert.Single(vm.Queries);
-        Assert.Equal("MBrush", vm.Queries[0].BillingCode);
-
-        vm.FilterText = "accepted";
-        Assert.Single(vm.Queries);
-        Assert.Equal(QueryStatus.Accepted, vm.Queries[0].Status);
-    }
-
-    [Fact]
-    public async Task OpenSelectedEditorCommand_can_execute_only_when_selection_exists()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client);
-
-        await vm.InitializeAsync();
-
-        Assert.False(vm.OpenSelectedEditorCommand.CanExecute(null));
-
-        vm.SelectedQuery = vm.Queries[0];
-
-        Assert.True(vm.OpenSelectedEditorCommand.CanExecute(null));
-    }
-
-    [Fact]
-    public async Task SelectedSortOption_date_keeps_most_recent_first()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client);
-
-        await vm.InitializeAsync();
-        vm.SelectedSortOption = ProviderOngoingRequestsPageViewModel.SortByDate;
-
-        Assert.Equal(new long[] { 12, 11, 10 }, vm.Queries.Select(q => q.Id).ToArray());
-    }
-
-    [Fact]
-    public async Task SelectedSortOption_date_ascending_keeps_oldest_first()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client);
-
-        await vm.InitializeAsync();
-        vm.SelectedSortOption = ProviderOngoingRequestsPageViewModel.SortByDateAsc;
-
-        Assert.Equal(new long[] { 10, 11, 12 }, vm.Queries.Select(q => q.Id).ToArray());
-    }
-
-    [Fact]
-    public async Task SelectedSortOption_status_prioritizes_inprogress_then_accepted_then_inserted()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client);
-
-        await vm.InitializeAsync();
-        vm.SelectedSortOption = ProviderOngoingRequestsPageViewModel.SortByStatus;
-
-        Assert.Equal(new long[] { 11, 12, 10 }, vm.Queries.Select(q => q.Id).ToArray());
-    }
-
-    [Fact]
-    public void Constructor_reads_saved_sort_option_from_settings()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var settings = new Settings
-        {
-            ProviderOngoingRequestsSortOption = ProviderOngoingRequestsPageViewModel.SortByStatus,
-        };
-
-        var vm = new ProviderOngoingRequestsPageViewModel(client, settings);
-
-        Assert.Equal(ProviderOngoingRequestsPageViewModel.SortByStatus, vm.SelectedSortOption);
-    }
-
-    [Fact]
-    public void Constructor_falls_back_to_default_when_saved_sort_is_invalid()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var settings = new Settings
-        {
-            ProviderOngoingRequestsSortOption = "invalide",
-        };
-
-        var vm = new ProviderOngoingRequestsPageViewModel(client, settings);
-
-        Assert.Equal(ProviderOngoingRequestsPageViewModel.SortByDate, vm.SelectedSortOption);
-    }
-
-    [Fact]
-    public async Task CreateEstimateForSelectedCommand_requires_a_selection()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var estimateClient = new EstimateApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client, estimateClient: estimateClient);
-
-        await vm.InitializeAsync();
-
-        Assert.False(vm.CreateEstimateForSelectedCommand.CanExecute(null));
-
-        vm.SelectedQuery = vm.Queries[0];
-
-        Assert.True(vm.CreateEstimateForSelectedCommand.CanExecute(null));
-    }
-
-    [Fact]
-    public async Task CreateEstimateForSelectedCommand_is_disabled_without_estimate_client()
-    {
-        var api = new StubProviderApi();
-        var client = new BillingApiClient(api, "https://business.example/api/v1/");
-        var vm = new ProviderOngoingRequestsPageViewModel(client);
-
-        await vm.InitializeAsync();
-        vm.SelectedQuery = vm.Queries[0];
-
-        Assert.False(vm.CreateEstimateForSelectedCommand.CanExecute(null));
-    }
-
-    private sealed class StubProviderApi : IYavscApiClient
-    {
-        public HttpClient Http { get; } = new();
-        public List<string> Paths { get; } = new();
-
-        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
-        {
-            Paths.Add(path);
-
-            if (typeof(T) == typeof(List<BillingQuerySummaryDto>))
-            {
-                var data = new List<BillingQuerySummaryDto>
-                {
-                    new()
-                    {
-                        Id = 10,
-                        BillingCode = "Rdv",
-                        ActivityCode = "dev",
-                        PerformerId = "perf-1",
-                        ClientId = "cli-1",
-                        Status = QueryStatus.Inserted,
-                        Description = "Rendez-vous",
-                        EventDate = new DateTime(2026, 9, 10, 10, 0, 0, DateTimeKind.Utc),
-                    },
-                    new()
-                    {
-                        Id = 11,
-                        BillingCode = "MBrush",
-                        ActivityCode = "hair",
-                        PerformerId = "perf-1",
-                        ClientId = "cli-2",
-                        Status = QueryStatus.InProgress,
-                        Description = "Coupe multiple",
-                        EventDate = new DateTime(2026, 9, 11, 10, 0, 0, DateTimeKind.Utc),
-                    },
-                    new()
-                    {
-                        Id = 12,
-                        BillingCode = "Brush",
-                        ActivityCode = "hair",
-                        PerformerId = "perf-1",
-                        ClientId = "cli-3",
-                        Status = QueryStatus.Accepted,
-                        Description = "Coupe simple",
-                        EventDate = new DateTime(2026, 9, 12, 10, 0, 0, DateTimeKind.Utc),
-                    },
-                    new()
-                    {
-                        Id = 13,
-                        BillingCode = "",
-                        ActivityCode = "unknown",
-                        PerformerId = "perf-1",
-                        ClientId = "cli-4",
-                        Status = QueryStatus.Accepted,
-                        Description = "Doit être filtrée",
-                        EventDate = new DateTime(2026, 9, 13, 10, 0, 0, DateTimeKind.Utc),
-                    }
-                };
-
-                return Task.FromResult((T)(object)data);
-            }
-
-            return Task.FromResult(default(T)!);
-        }
-
-        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
-        {
-            Paths.Add(path);
-            return Task.CompletedTask;
-        }
-
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
-        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
-    }
-}

src/PostIt/PostIt.Tests/RdvPageHeadlessTests.cs

@@ -1,85 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Headless.XUnit;
-using PostIt.ViewModels;
-using PostIt.ViewModels.Commands;
-using PostIt.Views.Commands;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-
-namespace PostIt.Tests;
-
-public class RdvPageHeadlessTests
-{
-    [AvaloniaFact]
-    public void Suggested_address_panel_is_hidden_by_default()
-    {
-        var page = CreatePage(out _);
-
-        var panel = page.FindControl<Grid>("SuggestedAddressPanel");
-        var progress = page.FindControl<ProgressBar>("SuggestedAddressProgress");
-
-        Assert.NotNull(panel);
-        Assert.NotNull(progress);
-        Assert.False(panel!.IsVisible);
-        Assert.False(progress!.IsVisible);
-    }
-
-    [AvaloniaFact]
-    public async Task Suggested_address_panel_and_spinner_follow_viewmodel_state()
-    {
-        var page = CreatePage(out var vm);
-        var panel = page.FindControl<Grid>("SuggestedAddressPanel")!;
-        var progress = page.FindControl<ProgressBar>("SuggestedAddressProgress")!;
-        var applyButton = page.FindControl<Button>("ApplySuggestedAddressButton")!;
-
-        vm.Address = "Saisie manuelle";
-        vm.NotifyReverseGeocodingStarted();
-        await Task.Delay(50);
-
-        Assert.True(panel.IsVisible);
-        Assert.True(progress.IsVisible);
-        Assert.False(applyButton.IsVisible);
-
-        vm.ApplyResolvedAddress("10 rue de Rivoli, 75001 Paris");
-        await Task.Delay(50);
-
-        Assert.True(panel.IsVisible);
-        Assert.False(progress.IsVisible);
-        Assert.True(applyButton.IsVisible);
-    }
-
-    private static RdvPage CreatePage(out RdvViewModel vm)
-    {
-        vm = new RdvViewModel(
-            new ActivityInfo { Code = "dev", Name = "Développement" },
-            new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
-            new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" },
-            new BillingApiClient(new RecordingApi(), "https://business.example/api/v1/"));
-
-        var page = new RdvPage { DataContext = vm };
-        var nav = new NavigationPage();
-        _ = nav.PushAsync(page);
-        var window = new Window { Content = nav };
-        window.Show();
-        return page;
-    }
-
-    private sealed class RecordingApi : IYavscApiClient
-    {
-        public HttpClient Http { get; } = new();
-
-        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
-            => Task.FromResult(default(T)!);
-
-        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
-            => Task.CompletedTask;
-
-        public Task<T> CallAsync<T>(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync<T>(method, path, (object?)null, ct);
-
-        public Task CallAsync(HttpMethod method, string path, Func<HttpContent> contentFactory, CancellationToken ct = default)
-            => CallAsync(method, path, (object?)null, ct);
-
-        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
-    }
-}

src/PostIt/PostIt.Tests/RdvPageTests.cs

@@ -1,30 +0,0 @@
-using PostIt.Views.Commands;
-
-namespace PostIt.Tests;
-
-public class RdvPageTests
-{
-    [Fact]
-    public void AreCoordinatesClose_returns_true_for_nearby_points_within_cache_tolerance()
-    {
-        var result = RdvPage.AreCoordinatesClose(
-            48.8566,
-            2.3522,
-            48.85665,
-            2.35225);
-
-        Assert.True(result);
-    }
-
-    [Fact]
-    public void AreCoordinatesClose_returns_false_for_points_outside_cache_tolerance()
-    {
-        var result = RdvPage.AreCoordinatesClose(
-            48.8566,
-            2.3522,
-            48.85685,
-            2.3522);
-
-        Assert.False(result);
-    }
-}

src/PostIt/PostIt.Tests/SettingsLoadTests.cs

@@ -89,7 +89,7 @@ public class SettingsLoadTests
                         settings.Authentication.RedirectUri =
                             global::AuthenticationSettings.DesktopRedirectUri;
 
-                        settings.ApiUrl = flip
+                        settings.BusinessApiUrl = flip
                             ? "https://a.example.test/api/v1/"
                             : "https://b.example.test/api/v1/";
 
@@ -173,51 +173,4 @@ public class SettingsLoadTests
         Assert.NotNull(roundTrip);
         Assert.Equal("bonjour", roundTrip.SearchText);
     }
-
-        /// <summary>
-        /// First-start regression guard: older settings payloads can
-        /// still contain <c>ActionStatus</c> from a previous write. This
-        /// runtime-only UI state must not be persisted anymore and must
-        /// not break deserialization when present.
-        /// </summary>
-        [Fact]
-        public void ActionStatus_is_not_persisted_and_legacy_payload_with_it_still_deserializes()
-        {
-                var settings = new PostIt.ViewModels.Settings
-                {
-                        Authentication = new AuthenticationSettings
-                        {
-                                Authority = "https://example.test/",
-                                ClientId = "postit-tests",
-                                Scopes = new[] { "openid" }
-                        }
-                };
-
-                var serialized = JsonSerializer.Serialize(settings);
-                Assert.DoesNotContain("\"ActionStatus\"", serialized, StringComparison.Ordinal);
-
-                const string legacyPayload = """
-                        {
-                            "Authentication": {
-                                "Authority": "https://example.test/",
-                                "ClientId": "postit-tests",
-                                "Scopes": ["openid"],
-                                "RedirectUri": "postit://callback"
-                            },
-                            "DarkMode": false,
-                            "BlogsApiUrl": "https://blogs.example.test/api/v1/",
-                            "ApiUrl": "https://api.example.test/api/v1/",
-                            "SearchText": "hello",
-                            "ActionStatus": {
-                                "Message": "runtime only",
-                                "Severity": "Error"
-                            }
-                        }
-                        """;
-
-                var roundTrip = JsonSerializer.Deserialize<PostIt.ViewModels.Settings>(legacyPayload);
-
-                Assert.NotNull(roundTrip);
-                Assert.Equal("hello", roundTrip.SearchText);
-        }
 }

src/PostIt/PostIt.Tests/YavscApiClientTests.cs

@@ -58,7 +58,7 @@ public class YavscApiClientTests
             // calls CallAsync("posts", ...) directly (bypassing
             // BlogApiClient, which is the only thing that would set
             // it in production). Mirror prod here.
-            reloaded.Http.BaseAddress = new Uri(settings.ApiUrl);
+            reloaded.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
 
             var posts = await reloaded.CallAsync<List<StubApiServer.Post>>(
                 HttpMethod.Get, "posts", TestContext.Current.CancellationToken);
@@ -118,7 +118,7 @@ public class YavscApiClientTests
                 RedirectUri = "postit://callback",
                 Scopes = new[] { "openid" },
             },
-            ApiUrl = "https://127.0.0.1:5003/api/v1",
+            BusinessApiUrl = "https://127.0.0.1:5003/api/v1",
         };
         var client = new YavscApiClient(settings, new TokenStore(Path.Combine(
             Path.GetTempPath(), $"postit-tests-noop-{Guid.NewGuid():N}.json")));
@@ -162,7 +162,7 @@ public class YavscApiClientTests
             RedirectUri = authority.LoopbackRedirectUri,
             Scopes = new[] { "openid", "profile", "blog" }
         },
-        ApiUrl = apiBaseUrl
+        BusinessApiUrl = apiBaseUrl
     };
 
     private static async Task<YavscApiClient> LoginAndPersistAsync(
@@ -175,7 +175,7 @@ public class YavscApiClientTests
         // directly (bypassing BlogApiClient) rely on the same
         // BaseAddress the production chain sets in BlogApiClient's
         // ctor. Mirror that here so "posts" resolves to the stub.
-        client.Http.BaseAddress = new Uri(settings.ApiUrl);
+        client.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
 
         // Force the API client to use the test browser by routing the
         // LoginInteractiveAsync call through a small wrapper.

src/PostIt/PostIt/App.axaml.cs

@@ -46,48 +46,35 @@ public partial class App : Application
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            InitializeClassicDesktopLifetime(settings, desktop);
+            var window = ServiceProvider.GetRequiredService<MainWindow>();
+            desktop.MainWindow = window;
+            View = window.MainView;
+            this.ConfigureRootView(window.MainView);
+
+            ApplyDarkMode(settings);
         }
         else if (ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
         {
-            InitializeActivityLifetime(settings, singleViewFactoryApplicationLifetime);
+            singleViewFactoryApplicationLifetime.MainViewFactory =
+                () =>
+                {
+                    View = ServiceProvider.GetRequiredService<MainView>();
+                    this.ConfigureRootView(View);
+                    ApplyDarkMode(settings);
+                    return View;
+                };
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         {
-            InitializeSingleViewLifetime(settings, singleViewPlatform);
+            singleViewPlatform.MainView = View = ServiceProvider.GetRequiredService<MainView>();
+            ConfigureRootView(View);
+            ApplyDarkMode(settings);
         }
 
         base.OnFrameworkInitializationCompleted();
     }
 
-    public void InitializeSingleViewLifetime(Settings settings, ISingleViewApplicationLifetime singleViewPlatform)
+private void ConfigureRootView(MainView rootView)
-    {
-        singleViewPlatform.MainView = View = ServiceProvider!.GetRequiredService<MainView>();
-        ConfigureRootView(View);
-        ApplyDarkMode(settings);
-    }
-
-    public void InitializeActivityLifetime(Settings settings, IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
-    {
-        singleViewFactoryApplicationLifetime.MainViewFactory =
-                        () =>
-                        {
-                            this.ConfigureRootView(ServiceProvider!.GetRequiredService<MainView>());
-                            ApplyDarkMode(settings);
-                            return View!;
-                        };
-    }
-
-    public void InitializeClassicDesktopLifetime(Settings settings, IClassicDesktopStyleApplicationLifetime desktop)
-    {
-        var window = ServiceProvider!.GetRequiredService<MainWindow>();
-        desktop.MainWindow = window;
-        this.ConfigureRootView(window.MainView);
-
-        ApplyDarkMode(settings);
-    }
-
-    public void ConfigureRootView(MainView rootView)
 {
     // Déclencher le Boot une seule fois lors du chargement du contrôle à l'écran.
     rootView.AttachedToVisualTree += async (_, _) => await BootOnceAsync();
@@ -100,7 +87,6 @@ public partial class App : Application
     };
 
     rootView.SessionBanner.DataContext = sessionStatus;
-    this.View = rootView;
 }
 
     private async Task BootOnceAsync()
@@ -149,6 +135,9 @@ public partial class App : Application
         var homePage = provider.GetRequiredService<HomePageViewModel>();
         var app = (App)Current!;
         await app.PushPageAsync(homePage);
+        if (!refreshed) return;
+
+        await PushMainPageAsync().ConfigureAwait(true);
     }
 
     /// <summary>
@@ -159,10 +148,10 @@ public partial class App : Application
     /// (interactive login from the banner). Pulled out as a helper so
     /// the two callers can't drift apart.
     /// </summary>
-    public static async Task PushBlogsPageAsync()
+    public static async Task PushMainPageAsync()
     {
         var app = (App)Current!;
-        var mainVm = app.ServiceProvider!.GetRequiredService<BlogsViewModel>();
+        var mainVm = app.ServiceProvider!.GetRequiredService<MainViewModel>();
         await mainVm.InitializeAsync();
         await app.PushPageAsync(mainVm);
     }

src/PostIt/PostIt/Controls/StatusBar.axaml

@@ -1,22 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
-             x:Class="PostIt.Controls.StatusBar"
-             x:DataType="vm:StatusNotice">
-    <Border Background="{Binding Background}"
-            BorderBrush="{Binding BorderBrush}"
-            BorderThickness="1"
-            CornerRadius="6"
-            Padding="8">
-        <StackPanel Orientation="Horizontal" Spacing="8">
-            <TextBlock Text="{Binding Glyph}"
-                       FontWeight="Bold"
-                       Foreground="{Binding Foreground}"
-                       VerticalAlignment="Top"/>
-            <TextBlock Text="{Binding Message}"
-                       Foreground="{Binding Foreground}"
-                       TextWrapping="Wrap"
-                       VerticalAlignment="Center"/>
-        </StackPanel>
-    </Border>
-</UserControl>

src/PostIt/PostIt/Controls/StatusBar.axaml.cs

@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace PostIt.Controls;
-
-public partial class StatusBar : UserControl
-{
-    public StatusBar()
-    {
-        InitializeComponent();
-    }
-}

src/PostIt/PostIt/Helpers/FormHelpers.cs

@@ -1,50 +0,0 @@
-using System;
-using PostIt.ViewModels;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-
-namespace PostIt.Helpers;
-
-public static class FormHelpers
-{
-    public static BillingCommandPageViewModel?
-    CreateCommandPageViewModel(
-        this CommandFormSummary form,
-        ActivityInfo activity,
-        ActivityUserDisplayItem performer,
-        BillingApiClient billingClient)
-    {
-
-        string namespacePrefix = typeof(PostIt.ViewModels.Commands.RdvViewModel).Namespace + ".";
-
-        string formVMName =   form.ActionName + "ViewModel";
-
-        string formOnActivityVMName =  activity.Code + formVMName + "ViewModel";
-
-        var vmType = Type.GetType(namespacePrefix +formOnActivityVMName);
-        if (vmType == null)
-        {
-            vmType = Type.GetType(namespacePrefix + formVMName);
-        }
-        if (vmType == null)
-        {
-            Console.Error.WriteLine(
-                $"! Cannot find type '{formOnActivityVMName}' or '{formVMName}'");
-            return null;
-        }
-        if (!typeof(BillingCommandPageViewModel).IsAssignableFrom(vmType))
-        {
-            Console.Error.WriteLine($"! The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
-            return null;
-        }
-
-        var vm = Activator.CreateInstance(vmType, activity, performer, form, billingClient);
-
-        if (vm == null)
-        {
-            throw new InvalidOperationException($"Cannot create instance of '{formOnActivityVMName}' or '{formVMName}'");
-        }
-
-        return vm as BillingCommandPageViewModel ?? throw new InvalidOperationException($"The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
-    }
-}

src/PostIt/PostIt/Helpers/ImageHelper.cs

@@ -1,34 +0,0 @@
-using System;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-
-namespace PostIt.Helpers;
-
-public static class ImageHelper
-{
-    private static readonly HttpClient HttpClient = new();
-
-    public static Bitmap LoadFromResource(Uri resourceUri)
-    {
-        return new Bitmap(AssetLoader.Open(resourceUri));
-    }
-
-    public static async Task<Bitmap?> LoadFromWeb(Uri url)
-    {
-        try
-        {
-            var response = await HttpClient.GetAsync(url).ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-            var data = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
-            return new Bitmap(new MemoryStream(data));
-        }
-        catch (HttpRequestException ex)
-        {
-            Console.WriteLine($"An error occurred while downloading image '{url}': {ex.Message}");
-            return null;
-        }
-    }
-}

src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs

@@ -3,8 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
 using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
-using PostIt.Views.Blogs;
-using PostIt.Views.Commands;
 using Yavsc.Api.Client;
 
 namespace PostIt.Helpers;
@@ -25,18 +23,13 @@ public static class ServiceCollectionHelpers
         var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
         var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
         var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
-        var activityClient = new ActivityApiClient(
+        var activityClient = new ActivityApiClient(api, settings.BusinessApiUrl);
-            api,
+        var billingClient = new BillingApiClient(api, settings.BusinessApiUrl);
-            () => settings.ApiUrl,
-            () => settings.Authentication?.Authority);
-        var billingClient = new BillingApiClient(api, () => settings.ApiUrl);
-        var estimateClient = new EstimateApiClient(api, () => settings.ApiUrl);
         var userDirectory = new UserDirectory(userSearchClient);
-        var reverseGeocoding = new NominatimReverseGeocodingService();
 
         // Vues
         services.AddSingleton<MainView>();
-        services.AddSingleton<BlogsPage>();
+        services.AddSingleton<MainPage>();
         services.AddSingleton<MainWindow>();
 
         // SettingsPage is a singleton: there must be one and only one
@@ -56,13 +49,8 @@ public static class ServiceCollectionHelpers
         services.AddSingleton<CirclesPage>();
         services.AddSingleton<ActivitiesPage>();
         services.AddTransient<CommandFormsPage>();
-        services.AddTransient<RdvPage>();
+        services.AddTransient<BillingCommandPage>();
-        services.AddTransient<BrushPage>();
         services.AddTransient<BillingQueriesPage>();
-        services.AddTransient<BillingQueryDetailsPage>();
-        services.AddTransient<ProviderOngoingRequestsPage>();
-        services.AddTransient<EstimateEditionPage>();
-
         // ViewModels
         services.AddSingleton(settings);
         services.AddSingleton<YavscApiClient>(api);
@@ -72,8 +60,6 @@ public static class ServiceCollectionHelpers
         services.AddSingleton(userSearchClient);
         services.AddSingleton(activityClient);
         services.AddSingleton(billingClient);
-        services.AddSingleton(estimateClient);
-        services.AddSingleton<IReverseGeocodingService>(reverseGeocoding);
         services.AddSingleton<IUserDirectory>(userDirectory);
         services.AddSingleton<HomePageViewModel>();
         services.AddSingleton<SignaturePageViewModel>();
@@ -95,7 +81,7 @@ public static class ServiceCollectionHelpers
         sessionStatus.Refresh();
         services.AddSingleton(sessionStatus);
         services.AddSingleton<SessionStatusBanner>();
-        services.AddSingleton<BlogsViewModel>();
+        services.AddSingleton<MainViewModel>();
         return services.BuildServiceProvider();
     }
 }

src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs

@@ -8,7 +8,7 @@ namespace PostIt.Helpers;
 
 public static class ViewModelBaseHelpers
 {
-    public static async Task<Page> PushPageAsync(this App app, ViewModelBase vm)
+    public static async Task PushPageAsync(this App app, ViewModelBase vm)
     {
         var window = app.View;
         if (window is null)
@@ -43,11 +43,9 @@ public static class ViewModelBaseHelpers
         var stack = window.NavRoot.NavigationStack;
         if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
         {
-            return page;
+            return;
         }
 
         await window.NavRoot.PushAsync(page);
-
-        return page;
     }
 }

src/PostIt/PostIt/PostIt.csproj

@@ -29,8 +29,6 @@
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Mapsui" />
-    <PackageReference Include="Mapsui.Avalonia12" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="IdentityModel.OidcClient" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />

src/PostIt/PostIt/Services/CurrentLocationResult.cs

@@ -1,28 +0,0 @@
-namespace PostIt.Services;
-
-public sealed class CurrentLocationResult
-{
-    private CurrentLocationResult(bool isSuccess, bool isPermissionDenied, double? latitude, double? longitude, string message)
-    {
-        IsSuccess = isSuccess;
-        IsPermissionDenied = isPermissionDenied;
-        Latitude = latitude;
-        Longitude = longitude;
-        Message = message;
-    }
-
-    public bool IsSuccess { get; }
-    public bool IsPermissionDenied { get; }
-    public double? Latitude { get; }
-    public double? Longitude { get; }
-    public string Message { get; }
-
-    public static CurrentLocationResult Success(double latitude, double longitude, string? message = null)
-        => new(true, false, latitude, longitude, message ?? "Position récupérée.");
-
-    public static CurrentLocationResult PermissionDenied(string? message = null)
-        => new(false, true, null, null, message ?? "La géolocalisation n'est pas autorisée.");
-
-    public static CurrentLocationResult Unavailable(string? message = null)
-        => new(false, false, null, null, message ?? "La géolocalisation n'est pas disponible sur cette plateforme.");
-}

src/PostIt/PostIt/Services/IReverseGeocodingService.cs

@@ -1,9 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace PostIt.Services;
-
-public interface IReverseGeocodingService
-{
-    Task<string?> TryResolveAddressAsync(double latitude, double longitude, CancellationToken cancellationToken = default);
-}

src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs

@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace PostIt.Services;
-
-public sealed class NominatimReverseGeocodingService : IReverseGeocodingService
-{
-    private static readonly Uri BaseUri = new("https://nominatim.openstreetmap.org/");
-    private readonly HttpClient _httpClient;
-
-    public NominatimReverseGeocodingService(HttpClient? httpClient = null)
-    {
-        _httpClient = httpClient ?? CreateDefaultClient();
-    }
-
-    public async Task<string?> TryResolveAddressAsync(double latitude, double longitude, CancellationToken cancellationToken = default)
-    {
-        var requestUri = BuildReverseUri(latitude, longitude);
-
-        try
-        {
-            using var response = await _httpClient.GetAsync(requestUri, cancellationToken).ConfigureAwait(false);
-            if (!response.IsSuccessStatusCode)
-                return null;
-
-            await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-            using var json = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
-            return FormatAddress(json.RootElement);
-        }
-        catch (OperationCanceledException)
-        {
-            throw;
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
-    private static HttpClient CreateDefaultClient()
-    {
-        var client = new HttpClient
-        {
-            BaseAddress = BaseUri,
-            Timeout = TimeSpan.FromSeconds(10),
-        };
-        client.DefaultRequestHeaders.UserAgent.Clear();
-        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("PostIt", "1.1"));
-        client.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("fr-FR"));
-        client.DefaultRequestHeaders.AcceptLanguage.Add(new StringWithQualityHeaderValue("fr", 0.9));
-        return client;
-    }
-
-    private static Uri BuildReverseUri(double latitude, double longitude)
-    {
-        var lat = latitude.ToString("0.######", CultureInfo.InvariantCulture);
-        var lon = longitude.ToString("0.######", CultureInfo.InvariantCulture);
-        var path = $"reverse?format=jsonv2&addressdetails=1&accept-language=fr&zoom=18&lat={lat}&lon={lon}";
-        return new Uri(path, UriKind.Relative);
-    }
-
-    private static string? FormatAddress(JsonElement root)
-    {
-        if (root.TryGetProperty("address", out var address))
-        {
-            var street = JoinNonEmpty(
-                TryGetString(address, "house_number"),
-                TryGetString(address, "road"));
-
-            var locality = JoinNonEmpty(
-                TryGetString(address, "postcode"),
-                TryGetString(address, "city")
-                    ?? TryGetString(address, "town")
-                    ?? TryGetString(address, "village")
-                    ?? TryGetString(address, "municipality"));
-
-            var formatted = JoinNonEmpty(street, locality);
-            if (!string.IsNullOrWhiteSpace(formatted))
-                return formatted;
-        }
-
-        if (root.TryGetProperty("display_name", out var displayName))
-        {
-            var value = displayName.GetString();
-            if (!string.IsNullOrWhiteSpace(value))
-                return value;
-        }
-
-        return null;
-    }
-
-    private static string? TryGetString(JsonElement element, string propertyName)
-    {
-        return element.TryGetProperty(propertyName, out var property)
-            ? property.GetString()
-            : null;
-    }
-
-    private static string? JoinNonEmpty(params string?[] values)
-    {
-        List<string>? parts = null;
-        foreach (var value in values)
-        {
-            if (string.IsNullOrWhiteSpace(value))
-                continue;
-
-            parts ??= new List<string>();
-            parts.Add(value.Trim());
-        }
-
-        return parts is null || parts.Count == 0 ? null : string.Join(", ", parts);
-    }
-}

src/PostIt/PostIt/Services/Platform.cs

@@ -1,7 +1,4 @@
-using System;
 using IdentityModel.OidcClient.Browser;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace PostIt.Services;
 
@@ -40,12 +37,4 @@ public static class Platform
     /// </summary>
     public static System.Func<IBrowser?>? CreateBrowser { get; set; } =
         () => new CustomSchemeBrowser(CustomScheme);
-
-    /// <summary>
-    /// Optional platform hook used by the shared billing form to request a
-    /// current device position. Platforms that do not expose a native
-    /// location provider can leave the default delegate in place.
-    /// </summary>
-    public static Func<CancellationToken, Task<CurrentLocationResult>> TryGetCurrentLocationAsync { get; set; } =
-        _ => Task.FromResult(CurrentLocationResult.Unavailable());
 }

src/PostIt/PostIt/Services/YavscApiClient.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -191,28 +190,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
         object? body = null,
         CancellationToken ct = default)
     {
-        using var response = await SendAsync(method, path, body is null ? null : () => JsonContent.Create(body), ct).ConfigureAwait(false);
+        using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
-        await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
-
-        var stream = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false);
-        var dto = await JsonSerializer.DeserializeAsync<T>(stream,
-            new JsonSerializerOptions { PropertyNameCaseInsensitive = true }, ct).ConfigureAwait(false);
-        return dto!;
-    }
-
-    /// <summary>
-    /// Call a multipart endpoint, transparently refreshing the token if needed.
-    /// </summary>
-    public virtual async Task<T> CallAsync<T>(
-        HttpMethod method,
-        string path,
-        Func<HttpContent> contentFactory,
-        CancellationToken ct = default)
-    {
-        if (contentFactory is null)
-            throw new ArgumentNullException(nameof(contentFactory));
-
-        using var response = await SendAsync(method, path, contentFactory, ct).ConfigureAwait(false);
         await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
 
         var stream = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false);
@@ -238,23 +216,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
         object? body = null,
         CancellationToken ct = default)
     {
-        using var response = await SendAsync(method, path, body is null ? null : () => JsonContent.Create(body), ct).ConfigureAwait(false);
+        using var response = await SendAsync(method, path, body, ct).ConfigureAwait(false);
-        await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
-    }
-
-    /// <summary>
-    /// Call a multipart endpoint that returns no useful body (DELETE, etc.).
-    /// </summary>
-    public async Task CallAsync(
-        HttpMethod method,
-        string path,
-        Func<HttpContent> contentFactory,
-        CancellationToken ct = default)
-    {
-        if (contentFactory is null)
-            throw new ArgumentNullException(nameof(contentFactory));
-
-        using var response = await SendAsync(method, path, contentFactory, ct).ConfigureAwait(false);
         await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
     }
 
@@ -269,7 +231,7 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
         => CallAsync(method, path, body: null, ct);
 
     private async Task<HttpResponseMessage> SendAsync(
-        HttpMethod method, string path, Func<HttpContent>? contentFactory, CancellationToken ct)
+        HttpMethod method, string path, object? body, CancellationToken ct)
     {
         if (_tokens is null)
             throw new InvalidOperationException("Not logged in. Call LoginInteractiveAsync first.");
@@ -277,8 +239,8 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
         await EnsureFreshTokenAsync(ct).ConfigureAwait(false);
 
         using var req = new HttpRequestMessage(method, path);
-        if (contentFactory is not null)
+        if (body is not null)
-            req.Content = contentFactory();
+            req.Content = JsonContent.Create(body);
         var response = await Http.SendAsync(req, ct).ConfigureAwait(false);
 
         if (response.StatusCode == HttpStatusCode.Unauthorized)
@@ -289,8 +251,8 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
             await ForceRefreshAsync(ct).ConfigureAwait(false);
 
             using var retry = new HttpRequestMessage(method, path);
-            if (contentFactory is not null)
+            if (body is not null)
-                retry.Content = contentFactory();
+                retry.Content = JsonContent.Create(body);
             response = await Http.SendAsync(retry, ct).ConfigureAwait(false);
         }
 
@@ -389,77 +351,6 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
         _store.Save(_tokens);
     }
 
-    /// <summary>
-    /// Upload a user avatar to the Yavsc API. The server expects a
-    /// single multipart file named <c>file</c> and validates the image
-    /// content type before persisting it.
-    /// </summary>
-    public async Task<string> SetAvatarAsync(
-        Stream imageStream,
-        string fileName,
-        string? contentType = null,
-        CancellationToken ct = default)
-    {
-        if (imageStream is null)
-            throw new ArgumentNullException(nameof(imageStream));
-        if (string.IsNullOrWhiteSpace(fileName))
-            throw new ArgumentException("A file name is required.", nameof(fileName));
-
-        var endpoint = new Uri(new Uri(Settings.ApiUrl.TrimEnd('/') + "/", UriKind.Absolute), "account/set-avatar");
-
-        await EnsureFreshTokenAsync(ct).ConfigureAwait(false);
-
-        var attemptUpload = async () =>
-        {
-            if (imageStream.CanSeek)
-                imageStream.Position = 0;
-
-            using var content = new MultipartFormDataContent();
-            using var fileContent = new StreamContent(imageStream);
-            fileContent.Headers.ContentType = new MediaTypeHeaderValue(
-                string.IsNullOrWhiteSpace(contentType) ? "application/octet-stream" : contentType);
-            content.Add(fileContent, "file", fileName);
-
-            using var request = new HttpRequestMessage(HttpMethod.Post, endpoint)
-            {
-                Content = content,
-            };
-
-            return await Http.SendAsync(request, ct).ConfigureAwait(false);
-        };
-
-        var response = await attemptUpload().ConfigureAwait(false);
-        if (response.StatusCode == HttpStatusCode.Unauthorized)
-        {
-            response.Dispose();
-            await ForceRefreshAsync(ct).ConfigureAwait(false);
-            response = await attemptUpload().ConfigureAwait(false);
-        }
-
-        await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
-
-        var payload = await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
-        if (string.IsNullOrWhiteSpace(payload))
-            return "Avatar mis à jour.";
-
-        try
-        {
-            using var json = JsonDocument.Parse(payload);
-            if (json.RootElement.TryGetProperty("message", out var msgEl))
-            {
-                var message = msgEl.GetString();
-                if (!string.IsNullOrWhiteSpace(message))
-                    return message;
-            }
-        }
-        catch (JsonException)
-        {
-            // Keep a user-friendly fallback when the API payload is not JSON.
-        }
-
-        return "Avatar mis à jour.";
-    }
-
     public async Task LogoutAsync()
     {
         _store.Clear();

src/PostIt/PostIt/ViewLocator.cs

@@ -4,10 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Microsoft.Extensions.DependencyInjection;
 using PostIt.ViewModels;
-using PostIt.ViewModels.Commands;
 using PostIt.Views;
-using PostIt.Views.Blogs;
-using PostIt.Views.Commands;
 
 namespace PostIt;
 
@@ -39,21 +36,17 @@ public class ViewLocator : IDataTemplate
         var services = app!.ServiceProvider!;
         return data switch
         {
-            BlogsViewModel => services.GetRequiredService<BlogsPage>(),
+            MainViewModel => services.GetRequiredService<MainPage>(),
             Settings => services.GetRequiredService<SettingsPage>(),
             HomePageViewModel => services.GetRequiredService<HomePage>(),
             ActivitiesPageViewModel => services.GetRequiredService<ActivitiesPage>(),
             CommandFormsPageViewModel => services.GetRequiredService<CommandFormsPage>(),
-            BrushViewModel => services.GetRequiredService<BrushPage>(),
+            BillingCommandPageViewModel => services.GetRequiredService<BillingCommandPage>(),
-            RdvViewModel => services.GetRequiredService<RdvPage>(),
+            BillingQueriesPageViewModel => services.GetRequiredService<BillingQueriesPage>(),
             SignaturePageViewModel => services.GetRequiredService<SignaturePage>(),
             AddCircleMemberDialogViewModel => services.GetRequiredService<AddCircleMemberDialog>(),
             CirclesPageViewModel => services.GetRequiredService<CirclesPage>(),
             PostAclDialogViewModel => services.GetRequiredService<PostAclDialog>(),
-            BillingQueriesPageViewModel => services.GetRequiredService<BillingQueriesPage>(),
-            BillingQueryDetailsPageViewModel => services.GetRequiredService<BillingQueryDetailsPage>(),
-            ProviderOngoingRequestsPageViewModel => services.GetRequiredService<ProviderOngoingRequestsPage>(),
-            EstimateEditionPageViewModel => services.GetRequiredService<EstimateEditionPage>(),
             null => new TextBlock { Text = "No view for <null>" },
             _ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
         };

src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs

@@ -13,23 +13,23 @@ using Yavsc.Api.Client;
 
 namespace PostIt.ViewModels;
 
-public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewModel
+public partial class ActivitiesPageViewModel : ViewModelBase
 {
     private readonly ActivityApiClient _client;
     private readonly BillingApiClient _billingClient;
     private bool _syncingSelection;
 
     [ObservableProperty]
-    public partial ObservableCollection<ActivityInfo> Activities { get; set; } = new();
+    public partial ObservableCollection<ActivityBrowseItemDto> Activities { get; set; } = new();
 
     [ObservableProperty]
-    public partial ActivityInfo? SelectedActivity { get; set; }
+    public partial ActivityBrowseItemDto? SelectedActivity { get; set; }
 
     [ObservableProperty]
-    public partial ObservableCollection<ActivityInfo> Specializations { get; set; } = new();
+    public partial ObservableCollection<ActivityBrowseItemDto> Specializations { get; set; } = new();
 
     [ObservableProperty]
-    public partial ActivityInfo? SelectedSpecialization { get; set; }
+    public partial ActivityBrowseItemDto? SelectedSpecialization { get; set; }
 
     [ObservableProperty]
     public partial ObservableCollection<ActivityUserDisplayItem> Performers { get; set; } = new();
@@ -43,10 +43,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = "Choisissez une activité.";
 
-    [ObservableProperty]
+    public ActivityBrowseItemDto? CurrentActivity => SelectedSpecialization ?? SelectedActivity;
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Choisissez une activité.");
-
-    public ActivityInfo? CurrentActivity => SelectedSpecialization ?? SelectedActivity;
     public string SelectedActivityLabel => SelectedActivity?.Name ?? "(aucune activité)";
     public string CurrentActivityLabel => CurrentActivity?.Name ?? "(aucune)";
     public int CurrentFormCount => CurrentActivity?.Forms?.Count ?? 0;
@@ -69,19 +66,19 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
     }
 
-    partial void OnSelectedActivityChanged(ActivityInfo? value)
+    partial void OnSelectedActivityChanged(ActivityBrowseItemDto? value)
     {
         if (_syncingSelection) return;
         _ = ShowActivitySafeAsync(value);
     }
 
-    partial void OnSelectedSpecializationChanged(ActivityInfo? value)
+    partial void OnSelectedSpecializationChanged(ActivityBrowseItemDto? value)
     {
         if (_syncingSelection) return;
         _ = ShowSpecializationSafeAsync(value);
     }
 
-    private async Task ShowActivitySafeAsync(ActivityInfo? value)
+    private async Task ShowActivitySafeAsync(ActivityBrowseItemDto? value)
     {
         try
         {
@@ -89,15 +86,15 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
     }
 
-    private async Task ShowSpecializationSafeAsync(ActivityInfo? value)
+    private async Task ShowSpecializationSafeAsync(ActivityBrowseItemDto? value)
     {
         try
         {
@@ -105,11 +102,11 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
     }
 
@@ -120,28 +117,28 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         try
         {
             var list = await _client.GetCatalogAsync();
-            Activities = new ObservableCollection<ActivityInfo>(list ?? new());
+            Activities = new ObservableCollection<ActivityBrowseItemDto>(list ?? new());
 
             var first = Activities.FirstOrDefault();
             await ShowActivityAsync(first);
             if (first is null)
             {
-                this.SetInfoStatus("Aucune activité disponible.");
+                StatusMessage = "Aucune activité disponible.";
             }
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            Activities = new ObservableCollection<ActivityInfo>();
+            Activities = new ObservableCollection<ActivityBrowseItemDto>();
-            Specializations = new ObservableCollection<ActivityInfo>();
+            Specializations = new ObservableCollection<ActivityBrowseItemDto>();
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
-            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
         }
         catch (Exception ex)
         {
-            Activities = new ObservableCollection<ActivityInfo>();
+            Activities = new ObservableCollection<ActivityBrowseItemDto>();
-            Specializations = new ObservableCollection<ActivityInfo>();
+            Specializations = new ObservableCollection<ActivityBrowseItemDto>();
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -149,7 +146,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         }
     }
 
-    public async Task ShowActivityAsync(ActivityInfo? activity)
+    public async Task ShowActivityAsync(ActivityBrowseItemDto? activity)
     {
         _syncingSelection = true;
         try
@@ -166,7 +163,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         OnPropertyChanged(nameof(SelectedActivityLabel));
         OnPropertyChanged(nameof(CurrentActivityLabel));
         OnPropertyChanged(nameof(CurrentFormCount));
-        Specializations = new ObservableCollection<ActivityInfo>(activity?.Children ?? new());
+        Specializations = new ObservableCollection<ActivityBrowseItemDto>(activity?.Children ?? new());
 
         if (activity is null)
         {
@@ -178,7 +175,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         await LoadPerformersAsync(activity);
     }
 
-    public async Task ShowSpecializationAsync(ActivityInfo? specialization)
+    public async Task ShowSpecializationAsync(ActivityBrowseItemDto? specialization)
     {
         _syncingSelection = true;
         try
@@ -206,46 +203,28 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
         await LoadPerformersAsync(specialization);
     }
 
-    private async Task LoadPerformersAsync(ActivityInfo activity)
+    private async Task LoadPerformersAsync(ActivityBrowseItemDto activity)
     {
         IsBusy = true;
         try
         {
             var list = await _client.GetUsersAsync(activity.Code);
-            var items = (list ?? new())
+            Performers = new ObservableCollection<ActivityUserDisplayItem>((list ?? new())
-                .Select(dto => ActivityUserDisplayItem.FromDto(dto, _client.BuildAvatarXsUrl(dto.UserName)))
+                .Select(ActivityUserDisplayItem.FromDto));
-                .ToList();
-
-            await Task.WhenAll(items.Select(async item =>
-            {
-                if (string.IsNullOrWhiteSpace(item.AvatarXsUrl))
-                {
-                    return;
-                }
-
-                if (!Uri.TryCreate(item.AvatarXsUrl, UriKind.Absolute, out var avatarUri))
-                {
-                    return;
-                }
-
-                item.AvatarImage = await ImageHelper.LoadFromWeb(avatarUri);
-            }));
-
-            Performers = new ObservableCollection<ActivityUserDisplayItem>(items);
             SelectedPerformer = null;
-            this.SetInfoStatus($"{activity.Name} · {Performers.Count} utilisateur(s)");
+            StatusMessage = $"{activity.Name} · {Performers.Count} utilisateur(s)";
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
             SelectedPerformer = null;
-            this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.");
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
         }
         catch (Exception ex)
         {
             Performers = new ObservableCollection<ActivityUserDisplayItem>();
             SelectedPerformer = null;
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -262,7 +241,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewM
     {
         if (SelectedPerformer is null || CurrentActivity is null)
         {
-            this.SetWarningStatus("Sélectionnez un utilisateur et une activité avec formulaire.");
+            StatusMessage = "Sélectionnez un utilisateur et une activité avec formulaire.";
             return;
         }
 

src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs

@@ -1,208 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using PostIt.Helpers;
-using Yavsc;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-
-namespace PostIt.ViewModels;
-
-public partial class BillingQueryDetailsPageViewModel : ViewModelBase, IActionStatusViewModel
-{
-    private readonly BillingApiClient _billingClient;
-    private readonly BillingQueryDetailsDto _details;
-
-    public ActivityInfo Activity { get; }
-    public ActivityUserDisplayItem Performer { get; }
-    public CommandFormSummary Form { get; }
-    public bool IsReadOnly { get; }
-
-    public long Id => _details.Id;
-    public string Title => $"Detail commande #{_details.Id}";
-    public string ContextLabel => $"{Performer.UserName} · {Activity.Name} · {Form.Title}";
-    public string StatusLabel => _details.Status.ToString();
-    public string StatusGlyph => GetStatusGlyph(_details.Status);
-    public string StatusBadgeBackground => GetStatusBadgeBackground(_details.Status);
-    public string StatusBadgeBorder => GetStatusBadgeBorder(_details.Status);
-    public string StatusBadgeForeground => GetStatusBadgeForeground(_details.Status);
-    public string TitleForeground => StatusBadgeForeground;
-    public string BillingCode => _details.BillingCode;
-    public string Description => EmptyAsPlaceholder(_details.Description, "(sans description)");
-    public string Reason => EmptyAsPlaceholder(_details.Reason, "(aucun motif)");
-    public string AdditionalInfo => EmptyAsPlaceholder(_details.AdditionalInfo, "(aucune info complementaire)");
-    public string ClientId => EmptyAsPlaceholder(_details.ClientId, "(non renseigne)");
-    public string EventDateLabel => _details.EventDate?.ToLocalTime().ToString("f") ?? "Date non precisee";
-    public string ConsentLabel => _details.Consent ? "Oui" : "Non";
-    public string ProvisionalLabel => _details.Provisional.HasValue ? _details.Provisional.Value.ToString("0.00") : "(non renseigne)";
-    public string LocationLabel => BuildLocationLabel(_details.Location);
-    public string PrestationsLabel => BuildPrestationsLabel(_details);
-    public bool CanEdit => !IsReadOnly;
-
-    [ObservableProperty]
-    public partial bool IsBusy { get; set; }
-
-    [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Pret.";
-
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
-
-    public override bool CanNavigateNext
-    {
-        get => false;
-        protected set { _ = value; }
-    }
-
-    public override bool CanNavigatePrevious
-    {
-        get => true;
-        protected set { _ = value; }
-    }
-
-    public BillingQueryDetailsPageViewModel(
-        ActivityInfo activity,
-        ActivityUserDisplayItem performer,
-        CommandFormSummary form,
-        BillingApiClient billingClient,
-        BillingQueryDetailsDto details,
-        bool isReadOnly)
-    {
-        Activity = activity ?? throw new ArgumentNullException(nameof(activity));
-        Performer = performer ?? throw new ArgumentNullException(nameof(performer));
-        Form = form ?? throw new ArgumentNullException(nameof(form));
-        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
-        _details = details ?? throw new ArgumentNullException(nameof(details));
-        IsReadOnly = isReadOnly;
-
-        this.SetInfoStatus("Details de commande charges.");
-    }
-
-    [RelayCommand]
-    private async Task OpenEditorAsync()
-    {
-        if (IsReadOnly)
-        {
-            this.SetWarningStatus("Mode lecture seule: edition desactivee.");
-            return;
-        }
-
-        var app = (App?)Application.Current;
-        if (app is null)
-        {
-            throw new InvalidOperationException("Application PostIt indisponible.");
-        }
-
-        IsBusy = true;
-        try
-        {
-            var vm = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient);
-            if (vm is null)
-            {
-                this.SetWarningStatus("Ce formulaire n'est pas encore pris en charge en edition.");
-                return;
-            }
-
-            await vm.InitializeAsync(_details).ConfigureAwait(true);
-            await app.PushPageAsync(vm).ConfigureAwait(true);
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors de l'ouverture en edition: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    [RelayCommand]
-    private async Task BackAsync()
-    {
-        var app = (App?)Application.Current;
-        if (app is null)
-        {
-            throw new InvalidOperationException("Application PostIt indisponible.");
-        }
-
-        await app.GoBackAsync().ConfigureAwait(true);
-    }
-
-    private static string EmptyAsPlaceholder(string? value, string placeholder)
-        => string.IsNullOrWhiteSpace(value) ? placeholder : value;
-
-    private static string BuildLocationLabel(BillingLocationDto? location)
-    {
-        if (location is null)
-        {
-            return "(non renseignee)";
-        }
-
-        var text = EmptyAsPlaceholder(location.Address, "adresse vide");
-        if (location.Latitude.HasValue && location.Longitude.HasValue)
-        {
-            text += $" ({location.Latitude.Value:0.####}, {location.Longitude.Value:0.####})";
-        }
-
-        return text;
-    }
-
-    private static string BuildPrestationsLabel(BillingQueryDetailsDto details)
-    {
-        if (details.PrestationIds.Count > 0)
-        {
-            return string.Join(", ", details.PrestationIds.Select(static id => id.ToString()));
-        }
-
-        return details.PrestationId.HasValue
-            ? details.PrestationId.Value.ToString()
-            : "(aucune)";
-    }
-
-    private static string GetStatusBadgeBackground(QueryStatus status)
-        => status switch
-        {
-            QueryStatus.Accepted => "#E6F7EC",
-            QueryStatus.InProgress => "#FFF4D6",
-            QueryStatus.Rejected => "#FDECEA",
-            QueryStatus.Failed => "#ECEFF1",
-            QueryStatus.Success => "#E8F8EF",
-            _ => "#EAF3FF",
-        };
-
-    private static string GetStatusBadgeBorder(QueryStatus status)
-        => status switch
-        {
-            QueryStatus.Accepted => "#2E7D32",
-            QueryStatus.InProgress => "#B26A00",
-            QueryStatus.Rejected => "#C62828",
-            QueryStatus.Failed => "#607D8B",
-            QueryStatus.Success => "#1E8E3E",
-            _ => "#2A5EA8",
-        };
-
-    private static string GetStatusBadgeForeground(QueryStatus status)
-        => status switch
-        {
-            QueryStatus.Accepted => "#1B5E20",
-            QueryStatus.InProgress => "#7A4A00",
-            QueryStatus.Rejected => "#8E0000",
-            QueryStatus.Failed => "#37474F",
-            QueryStatus.Success => "#145A2A",
-            _ => "#1A4178",
-        };
-
-    private static string GetStatusGlyph(QueryStatus status)
-        => status switch
-        {
-            QueryStatus.Accepted => "OK",
-            QueryStatus.InProgress => "~",
-            QueryStatus.Rejected => "!",
-            QueryStatus.Failed => "X",
-            QueryStatus.Success => "V",
-            _ => "i",
-        };
-}

src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs

@@ -1,293 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Avalonia;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using PostIt.Helpers;
-using Yavsc.Api.Client;
-
-namespace PostIt.ViewModels;
-
-/// <summary>
-/// Edition d'un devis (<c>Estimate</c>) créé en réponse à une demande
-/// client (<see cref="BillingQuerySummaryDto"/>) consultée depuis la
-/// page « Mes demandes en cours ». L'envoi poste le devis sur
-/// <c>api/v1/estimate</c>; côté serveur, la commande liée
-/// (<see cref="BillingQuerySummaryDto.Id"/>) est alors marquée comme
-/// validée par le prestataire.
-/// </summary>
-public partial class EstimateEditionPageViewModel : ViewModelBase, IActionStatusViewModel
-{
-    private readonly EstimateApiClient _estimateClient;
-    private readonly BillingQuerySummaryDto _query;
-
-    public long QueryId => _query.Id;
-    public string ClientId => _query.ClientId;
-    public string BillingCode => _query.BillingCode;
-
-    public string Title => $"Devis — demande #{_query.Id}";
-
-    public string ContextLabel
-        => $"Demande #{_query.Id} · {BillingCode} · client {ClientId}";
-
-    public string QueryDescription => string.IsNullOrWhiteSpace(_query.Description)
-        ? "(sans description)"
-        : _query.Description;
-
-    [ObservableProperty]
-    public partial string EstimateTitle { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial string EstimateDescription { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial ObservableCollection<EstimateLineItemViewModel> Lines { get; set; } = new();
-
-    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(RemoveLineCommand))]
-    public partial EstimateLineItemViewModel? SelectedLine { get; set; }
-
-    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(SendCommand))]
-    public partial bool IsBusy { get; set; }
-
-    /// <summary>
-    /// True une fois le devis accepté par le serveur: l'envoi est
-    /// désactivé pour éviter les doublons, il ne reste que « Retour ».
-    /// </summary>
-    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(SendCommand))]
-    public partial bool HasSent { get; set; }
-
-    [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Prêt.";
-
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Prêt.");
-
-    public decimal Total => Lines.Sum(line => line.LineTotal);
-
-    public string TotalLabel => $"{Total:0.00} {Lines.FirstOrDefault()?.Currency ?? "EUR"}";
-
-    public string SendLabel => HasSent ? "Devis envoyé" : "Envoyer le devis";
-
-    public override bool CanNavigateNext
-    {
-        get => false;
-        protected set { _ = value; }
-    }
-
-    public override bool CanNavigatePrevious
-    {
-        get => true;
-        protected set { _ = value; }
-    }
-
-    public EstimateEditionPageViewModel(BillingQuerySummaryDto query, EstimateApiClient estimateClient)
-    {
-        _query = query ?? throw new ArgumentNullException(nameof(query));
-        _estimateClient = estimateClient ?? throw new ArgumentNullException(nameof(estimateClient));
-
-        EstimateDescription = query.Description ?? string.Empty;
-        Lines.CollectionChanged += OnLinesCollectionChanged;
-
-        AddLine();
-        this.SetInfoStatus("Complétez le devis puis envoyez-le. La demande associée sera validée.");
-    }
-
-    [RelayCommand]
-    private void AddLine()
-    {
-        var line = new EstimateLineItemViewModel();
-        Lines.Add(line);
-        SelectedLine = line;
-    }
-
-    private bool CanRemoveLine() => SelectedLine is not null && !IsBusy && !HasSent;
-
-    [RelayCommand(CanExecute = nameof(CanRemoveLine))]
-    private void RemoveLine()
-    {
-        if (SelectedLine is null)
-        {
-            return;
-        }
-
-        var index = Lines.IndexOf(SelectedLine);
-        Lines.Remove(SelectedLine);
-        SelectedLine = Lines.Count == 0
-            ? null
-            : Lines[Math.Min(index, Lines.Count - 1)];
-    }
-
-    private bool CanSend() => !IsBusy && !HasSent;
-
-    [RelayCommand(CanExecute = nameof(CanSend))]
-    private async Task SendAsync()
-    {
-        if (!TryValidate(out var validationMessage))
-        {
-            this.SetWarningStatus(validationMessage);
-            return;
-        }
-
-        IsBusy = true;
-        try
-        {
-            var payload = BuildPayload();
-            var created = await _estimateClient.CreateAsync(payload).ConfigureAwait(true);
-
-            HasSent = true;
-            OnPropertyChanged(nameof(SendLabel));
-            this.SetInfoStatus(
-                $"Devis #{created.Id} envoyé ({created.Bill.Count} ligne(s)). La demande #{QueryId} est validée.");
-        }
-        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
-        {
-            this.SetWarningStatus("Accès refusé à l'API devis (scope 'api'). Déconnectez puis reconnectez-vous.");
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors de l'envoi du devis: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    [RelayCommand]
-    private async Task BackAsync()
-    {
-        var app = (App?)Application.Current;
-        if (app is null)
-        {
-            throw new InvalidOperationException("Application PostIt indisponible.");
-        }
-
-        await app.GoBackAsync().ConfigureAwait(true);
-    }
-
-    internal EstimateDto BuildPayload()
-    {
-        return new EstimateDto
-        {
-            CommandId = QueryId,
-            ClientId = ClientId,
-            CommandType = BillingCode,
-            Title = EstimateTitle.Trim(),
-            Description = EstimateDescription.Trim(),
-            Bill = Lines.Select(line => new EstimateLineDto
-            {
-                Id = line.Id,
-                Name = line.Name.Trim(),
-                Description = line.Description.Trim(),
-                Count = Math.Max(1, (int)Math.Round(line.Count)),
-                UnitaryCost = line.UnitaryCost,
-                Currency = string.IsNullOrWhiteSpace(line.Currency) ? "EUR" : line.Currency.Trim(),
-            }).ToList(),
-        };
-    }
-
-    private bool TryValidate(out string message)
-    {
-        if (string.IsNullOrWhiteSpace(EstimateTitle))
-        {
-            message = "Le titre du devis est requis.";
-            return false;
-        }
-
-        if (string.IsNullOrWhiteSpace(ClientId))
-        {
-            message = "La demande sélectionnée n'identifie pas de client.";
-            return false;
-        }
-
-        if (string.IsNullOrWhiteSpace(BillingCode))
-        {
-            message = "La demande sélectionnée n'a pas de code de facturation.";
-            return false;
-        }
-
-        if (Lines.Count == 0)
-        {
-            message = "Ajoutez au moins une ligne au devis.";
-            return false;
-        }
-
-        foreach (var line in Lines)
-        {
-            if (string.IsNullOrWhiteSpace(line.Name))
-            {
-                message = "Chaque ligne doit avoir un nom.";
-                return false;
-            }
-
-            if (line.Name.Trim().Length > 256)
-            {
-                message = $"Le nom de la ligne « {line.Name.Trim()[..20]}… » dépasse 256 caractères.";
-                return false;
-            }
-
-            if (string.IsNullOrWhiteSpace(line.Description))
-            {
-                message = $"La ligne « {line.Name.Trim()} » doit avoir une description.";
-                return false;
-            }
-
-            if (line.Description.Trim().Length > 512)
-            {
-                message = $"La description de la ligne « {line.Name.Trim()} » dépasse 512 caractères.";
-                return false;
-            }
-
-            if (line.Count < 1)
-            {
-                message = $"La quantité de la ligne « {line.Name.Trim()} » doit être d'au moins 1.";
-                return false;
-            }
-        }
-
-        message = string.Empty;
-        return true;
-    }
-
-    private void OnLinesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        if (e.OldItems is not null)
-        {
-            foreach (var item in e.OldItems.OfType<EstimateLineItemViewModel>())
-            {
-                item.PropertyChanged -= OnLinePropertyChanged;
-            }
-        }
-
-        if (e.NewItems is not null)
-        {
-            foreach (var item in e.NewItems.OfType<EstimateLineItemViewModel>())
-            {
-                item.PropertyChanged += OnLinePropertyChanged;
-            }
-        }
-
-        RaiseTotalsChanged();
-    }
-
-    private void OnLinePropertyChanged(object? sender, PropertyChangedEventArgs e)
-    {
-        if (e.PropertyName is nameof(EstimateLineItemViewModel.LineTotal)
-            or nameof(EstimateLineItemViewModel.Currency))
-        {
-            RaiseTotalsChanged();
-        }
-    }
-
-    private void RaiseTotalsChanged()
-    {
-        OnPropertyChanged(nameof(Total));
-        OnPropertyChanged(nameof(TotalLabel));
-    }
-}

src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs

@@ -1,35 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace PostIt.ViewModels;
-
-/// <summary>
-/// Editable estimate line. <see cref="Count"/> is exposed as a
-/// <see cref="decimal"/> so it binds directly to
-/// <c>NumericUpDown.Value</c> (<c>decimal?</c>); it is rounded back
-/// to an integer when the DTO is built.
-/// </summary>
-public partial class EstimateLineItemViewModel : ObservableObject
-{
-    public long Id { get; set; }
-
-    [ObservableProperty]
-    public partial string Name { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial string Description { get; set; } = string.Empty;
-
-    [ObservableProperty, NotifyPropertyChangedFor(nameof(LineTotal))]
-    [NotifyPropertyChangedFor(nameof(LineTotalLabel))]
-    public partial decimal Count { get; set; } = 1m;
-
-    [ObservableProperty, NotifyPropertyChangedFor(nameof(LineTotal))]
-    [NotifyPropertyChangedFor(nameof(LineTotalLabel))]
-    public partial decimal UnitaryCost { get; set; }
-
-    [ObservableProperty]
-    public partial string Currency { get; set; } = "EUR";
-
-    public decimal LineTotal => Count * UnitaryCost;
-
-    public string LineTotalLabel => $"{LineTotal:0.00}";
-}

src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs

@@ -1,390 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Avalonia;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using PostIt.Helpers;
-using Yavsc;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-
-namespace PostIt.ViewModels;
-
-public partial class ProviderOngoingRequestsPageViewModel : ViewModelBase, IActionStatusViewModel
-{
-    public const string SortByDate = "Date (plus récent d'abord)";
-    public const string SortByDateAsc = "Date (plus ancien d'abord)";
-    public const string SortByStatus = "Statut (en cours d'abord)";
-
-    private readonly BillingApiClient _billingClient;
-    private readonly EstimateApiClient? _estimateClient;
-    private readonly Settings? _settings;
-    private List<BillingQuerySummaryDto> _allQueries = new();
-
-    [ObservableProperty]
-    public partial ObservableCollection<BillingQuerySummaryDto> Queries { get; set; } = new();
-
-    [ObservableProperty]
-    public partial string FilterText { get; set; } = string.Empty;
-
-    public IReadOnlyList<string> SortOptions { get; } = new[]
-    {
-        SortByDate,
-        SortByDateAsc,
-        SortByStatus,
-    };
-
-    [ObservableProperty]
-    public partial string SelectedSortOption { get; set; } = SortByDate;
-
-    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedQueryCommand))]
-    [NotifyCanExecuteChangedFor(nameof(OpenSelectedEditorCommand))]
-    [NotifyCanExecuteChangedFor(nameof(CreateEstimateForSelectedCommand))]
-    public partial BillingQuerySummaryDto? SelectedQuery { get; set; }
-
-    [ObservableProperty]
-    public partial bool IsBusy { get; set; }
-
-    [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Chargement des demandes fournisseur...";
-
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Chargement des demandes fournisseur...");
-
-    public string Title => "Mes demandes en cours";
-
-    public override bool CanNavigateNext
-    {
-        get => false;
-        protected set { _ = value; }
-    }
-
-    public override bool CanNavigatePrevious
-    {
-        get => true;
-        protected set { _ = value; }
-    }
-
-    public ProviderOngoingRequestsPageViewModel(
-        BillingApiClient billingClient,
-        Settings? settings = null,
-        EstimateApiClient? estimateClient = null)
-    {
-        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
-        _estimateClient = estimateClient;
-        _settings = settings;
-
-        if (_settings is not null)
-        {
-            var preferredSort = NormalizeSortOption(_settings.ProviderOngoingRequestsSortOption);
-            if (!string.Equals(preferredSort, SelectedSortOption, StringComparison.Ordinal))
-            {
-                SelectedSortOption = preferredSort;
-            }
-        }
-    }
-
-    public Task InitializeAsync() => RefreshAsync();
-
-    [RelayCommand]
-    public async Task RefreshAsync()
-    {
-        IsBusy = true;
-        try
-        {
-            var items = await _billingClient.GetProviderOngoingQueriesAsync().ConfigureAwait(true) ?? new();
-            _allQueries = items
-                .Where(x => !string.IsNullOrWhiteSpace(x.BillingCode))
-                .OrderByDescending(x => x.EventDate ?? DateTime.MinValue)
-                .ThenByDescending(x => x.Id)
-                .ToList();
-
-            ApplyFilter();
-            this.SetInfoStatus(_allQueries.Count == 0
-                ? "Aucune demande en cours pour votre profil fournisseur."
-                : $"{_allQueries.Count} demande(s) en cours chargée(s).");
-        }
-        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
-        {
-            _allQueries = new List<BillingQuerySummaryDto>();
-            Queries = new ObservableCollection<BillingQuerySummaryDto>();
-            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
-        }
-        catch (Exception ex)
-        {
-            _allQueries = new List<BillingQuerySummaryDto>();
-            Queries = new ObservableCollection<BillingQuerySummaryDto>();
-            this.SetErrorStatus($"Erreur: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    private bool CanOpenSelectedQuery() => SelectedQuery is not null;
-
-    private bool CanOpenSelectedEditor() => SelectedQuery is not null;
-
-    [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))]
-    public async Task OpenSelectedQueryAsync()
-    {
-        if (SelectedQuery is null)
-        {
-            this.SetWarningStatus("Sélectionnez une demande.");
-            return;
-        }
-
-        var app = (App?)Application.Current;
-        if (app is null)
-        {
-            throw new InvalidOperationException("Application PostIt indisponible.");
-        }
-
-        IsBusy = true;
-        try
-        {
-            var details = await _billingClient
-                .GetQueryAsync(SelectedQuery.BillingCode, SelectedQuery.Id)
-                .ConfigureAwait(true);
-            var (activity, performer, form) = BuildNavigationContext(SelectedQuery);
-
-            var vm = new BillingQueryDetailsPageViewModel(
-                activity,
-                performer,
-                form,
-                _billingClient,
-                details,
-                isReadOnly: false);
-
-            await app.PushPageAsync(vm).ConfigureAwait(true);
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors de l'ouverture: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    [RelayCommand(CanExecute = nameof(CanOpenSelectedEditor))]
-    public async Task OpenSelectedEditorAsync()
-    {
-        if (SelectedQuery is null)
-        {
-            this.SetWarningStatus("Sélectionnez une demande.");
-            return;
-        }
-
-        var app = (App?)Application.Current;
-        if (app is null)
-        {
-            throw new InvalidOperationException("Application PostIt indisponible.");
-        }
-
-        IsBusy = true;
-        try
-        {
-            var details = await _billingClient
-                .GetQueryAsync(SelectedQuery.BillingCode, SelectedQuery.Id)
-                .ConfigureAwait(true);
-
-            var (activity, performer, form) = BuildNavigationContext(SelectedQuery);
-            var vm = form.CreateCommandPageViewModel(activity, performer, _billingClient);
-            if (vm is null)
-            {
-                this.SetWarningStatus($"Le formulaire '{form.ActionName}' n'est pas pris en charge en édition.");
-                return;
-            }
-
-            await vm.InitializeAsync(details).ConfigureAwait(true);
-            await app.PushPageAsync(vm).ConfigureAwait(true);
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors de l'ouverture en édition: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    private bool CanCreateEstimateForSelected() => SelectedQuery is not null && _estimateClient is not null;
-
-    [RelayCommand(CanExecute = nameof(CanCreateEstimateForSelected))]
-    public async Task CreateEstimateForSelectedAsync()
-    {
-        if (SelectedQuery is null)
-        {
-            this.SetWarningStatus("Sélectionnez une demande.");
-            return;
-        }
-
-        if (_estimateClient is null)
-        {
-            this.SetWarningStatus("Le client devis n'est pas disponible.");
-            return;
-        }
-
-        var app = (App?)Application.Current;
-        if (app is null)
-        {
-            throw new InvalidOperationException("Application PostIt indisponible.");
-        }
-
-        var vm = new EstimateEditionPageViewModel(SelectedQuery, _estimateClient);
-        await app.PushPageAsync(vm).ConfigureAwait(true);
-    }
-
-    partial void OnFilterTextChanged(string value)
-    {
-        ApplyFilter();
-    }
-
-    partial void OnSelectedSortOptionChanged(string value)
-    {
-        var normalized = NormalizeSortOption(value);
-        if (!string.Equals(normalized, value, StringComparison.Ordinal))
-        {
-            SelectedSortOption = normalized;
-            return;
-        }
-
-        PersistSortPreference(value);
-        ApplyFilter();
-    }
-
-    private void ApplyFilter()
-    {
-        var query = FilterText?.Trim();
-        var filtered = string.IsNullOrWhiteSpace(query)
-            ? _allQueries
-            : _allQueries.Where(x =>
-                    ContainsInsensitive(x.Description, query)
-                    || ContainsInsensitive(x.ActivityCode, query)
-                    || ContainsInsensitive(x.BillingCode, query)
-                    || ContainsInsensitive(x.ClientId, query)
-                    || ContainsInsensitive(x.Status.ToString(), query))
-                .ToList();
-
-        var sorted = ApplySort(filtered);
-        Queries = new ObservableCollection<BillingQuerySummaryDto>(sorted);
-    }
-
-    private List<BillingQuerySummaryDto> ApplySort(IEnumerable<BillingQuerySummaryDto> source)
-    {
-        if (string.Equals(SelectedSortOption, SortByStatus, StringComparison.Ordinal))
-        {
-            return source
-                .OrderBy(x => GetStatusRank(x.Status))
-                .ThenByDescending(x => x.EventDate ?? DateTime.MinValue)
-                .ThenByDescending(x => x.Id)
-                .ToList();
-        }
-
-            if (string.Equals(SelectedSortOption, SortByDateAsc, StringComparison.Ordinal))
-            {
-                return source
-                .OrderBy(x => x.EventDate ?? DateTime.MinValue)
-                .ThenBy(x => x.Id)
-                .ToList();
-            }
-
-        return source
-            .OrderByDescending(x => x.EventDate ?? DateTime.MinValue)
-            .ThenByDescending(x => x.Id)
-            .ToList();
-    }
-
-    private void PersistSortPreference(string selectedSort)
-    {
-        if (_settings is null)
-        {
-            return;
-        }
-
-        if (string.Equals(_settings.ProviderOngoingRequestsSortOption, selectedSort, StringComparison.Ordinal))
-        {
-            return;
-        }
-
-        _settings.ProviderOngoingRequestsSortOption = selectedSort;
-
-        try
-        {
-            _settings.Save();
-        }
-        catch
-        {
-            this.SetWarningStatus("Le tri a été appliqué, mais sa sauvegarde a échoué.");
-        }
-    }
-
-    private static string NormalizeSortOption(string? sortOption)
-    {
-        if (string.Equals(sortOption, SortByDate, StringComparison.Ordinal)
-            || string.Equals(sortOption, SortByDateAsc, StringComparison.Ordinal)
-            || string.Equals(sortOption, SortByStatus, StringComparison.Ordinal))
-        {
-            return sortOption!;
-        }
-
-        return SortByDate;
-    }
-
-    private static int GetStatusRank(QueryStatus status)
-        => status switch
-        {
-            QueryStatus.InProgress => 0,
-            QueryStatus.Accepted => 1,
-            QueryStatus.Inserted => 2,
-            QueryStatus.Success => 3,
-            QueryStatus.Rejected => 4,
-            QueryStatus.Failed => 5,
-            _ => 99,
-        };
-
-    private static bool ContainsInsensitive(string? source, string query)
-        => !string.IsNullOrWhiteSpace(source)
-           && source.Contains(query, StringComparison.OrdinalIgnoreCase);
-
-    private static (ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form)
-        BuildNavigationContext(BillingQuerySummaryDto query)
-    {
-        var activity = new ActivityInfo
-        {
-            Code = query.ActivityCode,
-            Name = string.IsNullOrWhiteSpace(query.ActivityCode)
-                ? "Activité"
-                : query.ActivityCode,
-        };
-
-        var performer = new ActivityUserDisplayItem
-        {
-            PerformerId = query.PerformerId,
-            UserName = "Mon profil fournisseur",
-            AvatarFallbackLabel = "M",
-            IsPerformerActive = true,
-            PerformerStatusBadgeLabel = "Actif",
-            PerformerStatusBadgeBackground = "#E6F7EC",
-            PerformerStatusBadgeBorder = "#2E7D32",
-            PerformerStatusBadgeForeground = "#1B5E20",
-        };
-
-        var form = new CommandFormSummary
-        {
-            ActionName = query.BillingCode,
-            Title = query.BillingCode,
-        };
-
-        return (activity, performer, form);
-    }
-}

src/PostIt/PostIt/ViewModels/ActivityUserDisplayItem.cs

@@ -1,13 +1,10 @@
-using Avalonia.Media.Imaging;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Yavsc.Abstract.Workflow;
 
 namespace PostIt.ViewModels;
 
-public sealed partial class ActivityUserDisplayItem : ObservableObject
+public sealed class ActivityUserDisplayItem
 {
     public string PerformerId { get; init; } = string.Empty;
-    public string AvatarXsUrl { get; init; } = string.Empty;
     public bool HasPerformerProfile { get; init; }
     public string PerformerBadgeLabel { get; init; } = "Profil pro";
     public bool IsPerformerActive { get; init; }
@@ -16,25 +13,17 @@ public sealed partial class ActivityUserDisplayItem : ObservableObject
     public string PerformerStatusBadgeBorder { get; init; } = "#C62828";
     public string PerformerStatusBadgeForeground { get; init; } = "#8E0000";
     public string UserName { get; init; } = string.Empty;
-    public string AvatarFallbackLabel { get; init; } = "?";
     public string WebSite { get; init; } = string.Empty;
     public int ExtraActivityCount { get; init; }
     public string ExtraActivityLabel { get; init; } = "Pas d'autre activité";
 
-    [ObservableProperty]
+    public static ActivityUserDisplayItem FromDto(ActivityPerformerDto dto)
-    public partial Bitmap? AvatarImage { get; set; }
-
-    public static ActivityUserDisplayItem FromDto(PerformerActivity dto, string avatarXsUrl)
     {
         return new ActivityUserDisplayItem
         {
             PerformerId = dto.PerformerId,
-            AvatarXsUrl = avatarXsUrl,
             HasPerformerProfile = dto.HasPerformerProfile,
             UserName = dto.UserName,
-            AvatarFallbackLabel = string.IsNullOrWhiteSpace(dto.UserName)
-                ? "?"
-                : dto.UserName.Trim()[0].ToString().ToUpperInvariant(),
             WebSite = dto.WebSite,
             IsPerformerActive = dto.Active,
             PerformerStatusBadgeLabel = dto.Active ? "Actif" : "Inactif",

src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs

@@ -29,7 +29,7 @@ namespace PostIt.ViewModels;
 /// <c>CirclesPage</c> then calls
 /// <see cref="CircleApiClient.AddMemberAsync"/>.</para>
 /// </summary>
-public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStatusViewModel
+public partial class AddCircleMemberDialogViewModel : ViewModelBase
 {
     private readonly IUserDirectory _directory;
 
@@ -46,10 +46,7 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStat
     public partial bool IsBusy { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Pret.";
+    public partial string StatusMessage { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     /// <summary>
     /// Raised when the user confirms a selection. The hosting
@@ -82,7 +79,7 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStat
         if (string.IsNullOrWhiteSpace(SearchQuery))
         {
             Results.Clear();
-            this.SetWarningStatus("Tapez un nom ou un email");
+            StatusMessage = "Tapez un nom ou un email";
             return;
         }
 
@@ -91,11 +88,11 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStat
         {
             var hits = await _directory.SearchAsync(SearchQuery, CancellationToken.None).ConfigureAwait(true);
             Results = new ObservableCollection<UserSummary>(hits ?? Array.Empty<UserSummary>());
-            this.SetInfoStatus($"{Results.Count} résultat(s)");
+            StatusMessage = $"{Results.Count} résultat(s)";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -113,20 +110,18 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStat
     {
         if (Selected is null)
         {
-            this.SetWarningStatus("Sélectionnez un utilisateur");
+            StatusMessage = "Sélectionnez un utilisateur";
             return;
         }
         Confirmed?.Invoke(this, Selected);
-        var app = App.Current as App
+        var app = App.Current as App;
-            ?? throw new InvalidOperationException("Application PostIt indisponible.");
         await app.GoBackAsync();
     }
 
     [RelayCommand]
     public async Task CloseAsync()
     {
-        var app = App.Current as App
+        var app = App.Current as App;
-            ?? throw new InvalidOperationException("Application PostIt indisponible.");
         await app.GoBackAsync();
     }
 }

src/PostIt/PostIt/ViewModels/BillingCommandPageViewModel.cs

@@ -0,0 +1,399 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Net;
+using System.Net.Http;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Haircut;
+using Yavsc.Models.Relationship;
+
+namespace PostIt.ViewModels;
+
+public partial class BillingCommandPageViewModel : ViewModelBase
+{
+    private readonly BillingApiClient _billingClient;
+
+    public ActivityBrowseItemDto Activity { get; }
+    public ActivityUserDisplayItem Performer { get; }
+    public CommandFormSummaryDto Form { get; }
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    [ObservableProperty]
+    public partial string StatusMessage { get; set; }
+
+    [ObservableProperty]
+    public partial string EventDateText { get; set; }
+
+    [ObservableProperty]
+    public partial string Reason { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string Address { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string LatitudeText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string LongitudeText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial bool Consent { get; set; } = true;
+
+    [ObservableProperty]
+    public partial ObservableCollection<HairPrestationDto> AvailablePrestations { get; set; } = new();
+
+    [ObservableProperty]
+    public partial HairPrestationDto? SelectedPrestation { get; set; }
+
+    [ObservableProperty]
+    public partial ObservableCollection<SelectableHairPrestationItem> MultiPrestations { get; set; } = new();
+
+    [ObservableProperty]
+    public partial string AdditionalInfo { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial long? ExistingQueryId { get; set; }
+
+    [ObservableProperty]
+    public partial QueryStatus CommandStatus { get; set; } = QueryStatus.Inserted;
+
+    public string Title => Form.Title;
+    public string PerformerLabel => Performer.UserName;
+    public string ActivityLabel => Activity.Name;
+    public bool IsSupported => IsRdv || IsBrush || IsMultiBrush;
+    public bool IsRdv => string.Equals(Form.ActionName, BillingCodes.Rdv, StringComparison.Ordinal);
+    public bool IsBrush => string.Equals(Form.ActionName, BillingCodes.Brush, StringComparison.Ordinal);
+    public bool IsMultiBrush => string.Equals(Form.ActionName, BillingCodes.MBrush, StringComparison.Ordinal);
+    public bool ShowsReason => IsRdv;
+    public bool ShowsAdditionalInfo => IsBrush;
+    public bool ShowsSinglePrestation => IsBrush;
+    public bool ShowsMultiplePrestations => IsMultiBrush;
+    public string BillingRoute => $"/billing/{Form.ActionName}";
+    public bool IsEditingExisting => ExistingQueryId.HasValue;
+    public string SubmitLabel => IsEditingExisting ? "Mettre à jour la commande" : "Poster la commande";
+    public string SupportMessage => IsSupported
+        ? IsRdv
+            ? "Complétez les informations du rendez-vous puis postez la commande."
+            : IsBrush
+                ? "Choisissez une prestation coiffure puis postez la commande."
+                : "Choisissez une ou plusieurs prestations coiffure puis postez la commande."
+        : $"Le formulaire {Form.ActionName} n'est pas encore pris en charge dans PostIt.";
+
+    public override bool CanNavigateNext
+    {
+        get => false;
+        protected set { _ = value; }
+    }
+
+    public override bool CanNavigatePrevious
+    {
+        get => true;
+        protected set { _ = value; }
+    }
+
+    public BillingCommandPageViewModel(
+        ActivityBrowseItemDto activity,
+        ActivityUserDisplayItem performer,
+        CommandFormSummaryDto form,
+        BillingApiClient billingClient)
+    {
+        Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+        Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+        Form = form ?? throw new ArgumentNullException(nameof(form));
+        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+
+        EventDateText = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture);
+        StatusMessage = SupportMessage;
+    }
+
+    partial void OnExistingQueryIdChanged(long? value)
+    {
+        OnPropertyChanged(nameof(IsEditingExisting));
+        OnPropertyChanged(nameof(SubmitLabel));
+    }
+
+    public async Task InitializeAsync(BillingQueryDetailsDto? existingQuery = null)
+    {
+        if (!IsBrush && !IsMultiBrush)
+        {
+            if (existingQuery is not null)
+            {
+                ApplyExistingQuery(existingQuery);
+            }
+
+            return;
+        }
+
+        IsBusy = true;
+        try
+        {
+            var prestations = await _billingClient.GetHairPrestationsAsync(Form.ActionName).ConfigureAwait(true);
+            AvailablePrestations = new ObservableCollection<HairPrestationDto>(prestations ?? new List<HairPrestationDto>());
+            SelectedPrestation = AvailablePrestations.FirstOrDefault();
+            MultiPrestations = new ObservableCollection<SelectableHairPrestationItem>(AvailablePrestations.Select(SelectableHairPrestationItem.FromDto));
+
+            StatusMessage = AvailablePrestations.Count == 0
+                ? "Aucune prestation coiffure disponible."
+                : SupportMessage;
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur lors du chargement des prestations: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+
+        if (existingQuery is not null)
+        {
+            ApplyExistingQuery(existingQuery);
+        }
+    }
+
+    [RelayCommand]
+    private async Task SubmitAsync()
+    {
+        if (!IsSupported)
+        {
+            StatusMessage = SupportMessage;
+            return;
+        }
+
+        if (!Consent)
+        {
+            StatusMessage = "Le consentement est requis pour poster la commande.";
+            return;
+        }
+
+        if (!TryParseEventDate(out var eventDate))
+        {
+            StatusMessage = "La date doit être saisie au format yyyy-MM-dd HH:mm.";
+            return;
+        }
+
+        if (IsRdv && string.IsNullOrWhiteSpace(Reason))
+        {
+            StatusMessage = "Le motif du rendez-vous est requis.";
+            return;
+        }
+
+        if (string.IsNullOrWhiteSpace(Address))
+        {
+            StatusMessage = "L'adresse du rendez-vous est requise.";
+            return;
+        }
+
+        if (!TryParseCoordinate(LatitudeText, out var latitude))
+        {
+            StatusMessage = "Latitude invalide.";
+            return;
+        }
+
+        if (!TryParseCoordinate(LongitudeText, out var longitude))
+        {
+            StatusMessage = "Longitude invalide.";
+            return;
+        }
+
+        IsBusy = true;
+        try
+        {
+            var location = new Location
+            {
+                Address = Address.Trim(),
+                Latitude = latitude,
+                Longitude = longitude,
+            };
+
+            var payload = new BillingQueryDetailsDto
+            {
+                Id = ExistingQueryId ?? 0,
+                BillingCode = Form.ActionName,
+                ActivityCode = Activity.Code,
+                PerformerId = Performer.PerformerId,
+                Consent = Consent,
+                EventDate = eventDate,
+                Status = CommandStatus,
+                Reason = Reason.Trim(),
+                AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
+                Location = new BillingLocationDto
+                {
+                    Address = location.Address,
+                    Latitude = location.Latitude,
+                    Longitude = location.Longitude,
+                }
+            };
+
+            if (IsRdv)
+            {
+                if (IsEditingExisting)
+                {
+                    await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+                }
+                else
+                {
+                    await _billingClient.CreateAsync(Form.ActionName, new
+                    {
+                        ActivityCode = Activity.Code,
+                        PerformerId = Performer.PerformerId,
+                        Consent,
+                        EventDate = eventDate,
+                        Location = location,
+                        Reason = payload.Reason,
+                        Status = payload.Status,
+                    }).ConfigureAwait(true);
+                }
+            }
+            else if (IsBrush)
+            {
+                if (SelectedPrestation is null)
+                {
+                    StatusMessage = "Sélectionnez une prestation coiffure.";
+                    return;
+                }
+
+                payload.PrestationId = SelectedPrestation.Id;
+
+                if (IsEditingExisting)
+                {
+                    await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+                }
+                else
+                {
+                    await _billingClient.CreateAsync(Form.ActionName, new
+                    {
+                        ActivityCode = Activity.Code,
+                        PerformerId = Performer.PerformerId,
+                        Consent,
+                        EventDate = (DateTime?)eventDate,
+                        Location = location,
+                        PrestationId = SelectedPrestation.Id,
+                        AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? null : AdditionalInfo.Trim(),
+                        Status = payload.Status,
+                    }).ConfigureAwait(true);
+                }
+            }
+            else if (IsMultiBrush)
+            {
+                var selectedPrestations = MultiPrestations.Where(x => x.IsSelected).ToList();
+                if (selectedPrestations.Count == 0)
+                {
+                    StatusMessage = "Sélectionnez au moins une prestation coiffure.";
+                    return;
+                }
+
+                payload.PrestationIds = selectedPrestations.Select(x => x.Id).ToList();
+
+                if (IsEditingExisting)
+                {
+                    await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+                }
+                else
+                {
+                    await _billingClient.CreateAsync(Form.ActionName, new
+                    {
+                        ActivityCode = Activity.Code,
+                        PerformerId = Performer.PerformerId,
+                        Consent,
+                        EventDate = eventDate,
+                        Location = location,
+                        Prestations = selectedPrestations.Select(x => new { PrestationId = x.Id }).ToList(),
+                        Status = payload.Status,
+                    }).ConfigureAwait(true);
+                }
+            }
+
+            StatusMessage = IsEditingExisting
+                ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
+                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur lors de l'envoi: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
+    {
+        ExistingQueryId = existingQuery.Id;
+        CommandStatus = existingQuery.Status;
+        Consent = existingQuery.Consent;
+        Reason = existingQuery.Reason ?? string.Empty;
+        AdditionalInfo = existingQuery.AdditionalInfo ?? string.Empty;
+
+        if (existingQuery.EventDate is not null)
+        {
+            EventDateText = existingQuery.EventDate.Value
+                .ToLocalTime()
+                .ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture);
+        }
+
+        if (existingQuery.Location is not null)
+        {
+            Address = existingQuery.Location.Address ?? string.Empty;
+            LatitudeText = existingQuery.Location.Latitude.ToString(CultureInfo.InvariantCulture);
+            LongitudeText = existingQuery.Location.Longitude.ToString(CultureInfo.InvariantCulture);
+        }
+
+        if (IsBrush && existingQuery.PrestationId is not null)
+        {
+            SelectedPrestation = AvailablePrestations.FirstOrDefault(x => x.Id == existingQuery.PrestationId.Value);
+        }
+
+        if (IsMultiBrush)
+        {
+            var selectedIds = existingQuery.PrestationIds is null
+                ? new HashSet<long>()
+                : new HashSet<long>(existingQuery.PrestationIds);
+            foreach (var item in MultiPrestations)
+            {
+                item.IsSelected = selectedIds.Contains(item.Id);
+            }
+        }
+
+        StatusMessage = $"Commande #{existingQuery.Id} chargée.";
+    }
+
+    private bool TryParseEventDate(out DateTime eventDate)
+    {
+        return DateTime.TryParse(
+            EventDateText,
+            CultureInfo.CurrentCulture,
+            DateTimeStyles.AssumeLocal,
+            out eventDate)
+            || DateTime.TryParse(
+                EventDateText,
+                CultureInfo.InvariantCulture,
+                DateTimeStyles.AssumeLocal,
+                out eventDate);
+    }
+
+    private static bool TryParseCoordinate(string text, out double value)
+    {
+        return double.TryParse(text, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.CurrentCulture, out value)
+            || double.TryParse(text, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out value);
+    }
+}

src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs

@@ -14,13 +14,13 @@ using Yavsc.Abstract.Workflow;
 
 namespace PostIt.ViewModels;
 
-public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusViewModel
+public partial class BillingQueriesPageViewModel : ViewModelBase
 {
     private readonly BillingApiClient _billingClient;
 
-    public ActivityInfo Activity { get; }
+    public ActivityBrowseItemDto Activity { get; }
     public ActivityUserDisplayItem Performer { get; }
-    public CommandFormSummary Form { get; }
+    public CommandFormSummaryDto Form { get; }
     public bool IsReadOnly { get; }
     public bool OngoingOnly { get; }
 
@@ -36,9 +36,6 @@ public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusV
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = "Chargement des commandes...";
 
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Chargement des commandes...");
-
     public string Title => IsReadOnly
         ? $"Demandes en cours ({Form.Title})"
         : $"Commandes {Form.Title}";
@@ -58,9 +55,9 @@ public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusV
     }
 
     public BillingQueriesPageViewModel(
-        ActivityInfo activity,
+        ActivityBrowseItemDto activity,
         ActivityUserDisplayItem performer,
-        CommandFormSummary form,
+        CommandFormSummaryDto form,
         BillingApiClient billingClient,
         bool isReadOnly = false,
         bool ongoingOnly = false)
@@ -75,7 +72,7 @@ public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusV
 
     public Task InitializeAsync() => RefreshAsync();
 
-    private bool CanOpenSelectedQuery() => CanOpenDetails && SelectedQuery is not null;
+    private bool CanOpenSelectedQuery() => !IsReadOnly && SelectedQuery is not null;
 
     [RelayCommand]
     public async Task RefreshAsync()
@@ -93,17 +90,17 @@ public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusV
                 .ToList();
 
             Queries = new ObservableCollection<BillingQueryDisplayItem>(filtered);
-            this.SetInfoStatus(BuildLoadedStatusMessage(filtered.Count));
+            StatusMessage = BuildLoadedStatusMessage(filtered.Count);
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
             Queries = new ObservableCollection<BillingQueryDisplayItem>();
-            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
         }
         catch (Exception ex)
         {
             Queries = new ObservableCollection<BillingQueryDisplayItem>();
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -114,9 +111,15 @@ public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusV
     [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))]
     public async Task OpenSelectedQueryAsync()
     {
+        if (IsReadOnly)
+        {
+            StatusMessage = "Mode lecture seule: l'ouverture en modification est désactivée.";
+            return;
+        }
+
         if (SelectedQuery is null)
         {
-            this.SetWarningStatus("Sélectionnez une commande.");
+            StatusMessage = "Sélectionnez une commande.";
             return;
         }
 
@@ -130,22 +133,17 @@ public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusV
         try
         {
             var details = await _billingClient.GetQueryAsync(Form.ActionName, SelectedQuery.Id).ConfigureAwait(true);
-            var vm = new BillingQueryDetailsPageViewModel(
+            var vm = new BillingCommandPageViewModel(Activity, Performer, Form, _billingClient);
-                Activity,
+            await vm.InitializeAsync(details).ConfigureAwait(true);
-                Performer,
-                Form,
-                _billingClient,
-                details,
-                IsReadOnly);
             await app.PushPageAsync(vm).ConfigureAwait(true);
         }
         catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
         {
-            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur lors de l'ouverture: {ex.Message}");
+            StatusMessage = $"Erreur lors de l'ouverture: {ex.Message}";
         }
         finally
         {

src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs

@@ -34,7 +34,7 @@ namespace PostIt.ViewModels;
 /// <see cref="OnAddMemberConfirmedAsync"/>. The "remove"
 /// command is per-row and runs inline.</para>
 /// </summary>
-public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewModel
+public partial class CirclesPageViewModel : ViewModelBase
 {
     private readonly CircleApiClient _client;
 
@@ -63,10 +63,8 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
     public partial bool IsBusy { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Pret.";
+    public partial string StatusMessage { get; set; } = string.Empty;
 
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     public CirclesPageViewModel(CircleApiClient client)
     {
@@ -102,11 +100,11 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         {
             var list = await _client.GetMyCirclesAsync();
             Circles = new ObservableCollection<CircleDto>(list ?? new());
-            this.SetInfoStatus($"{Circles.Count} cercle(s)");
+            StatusMessage = $"{Circles.Count} cercle(s)";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -117,10 +115,8 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
     [RelayCommand]
     internal async Task OpenAddMemberAsync()
     {
-        var app = Application.Current as App
+        var app = Application.Current as App;
-            ?? throw new InvalidOperationException("Application PostIt indisponible.");
+        var services = app?.ServiceProvider;
-        var services = app.ServiceProvider
-            ?? throw new InvalidOperationException("ServiceProvider PostIt indisponible.");
         var directory = services.GetRequiredService<IUserDirectory>();
         AddCircleMemberDialogViewModel model =
         new AddCircleMemberDialogViewModel(directory);
@@ -151,11 +147,11 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         {
             var list = await _client.GetMembersAsync(circleId);
             Members = new ObservableCollection<CircleMemberDto>(list ?? new());
-            this.SetInfoStatus($"{Members.Count} membre(s)");
+            StatusMessage = $"{Members.Count} membre(s)";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
             Members = new ObservableCollection<CircleMemberDto>();
         }
         finally
@@ -170,7 +166,7 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         SelectedCircle = null;
         DraftName = string.Empty;
         DraftPublic = false;
-        this.SetInfoStatus("Nouveau cercle");
+        StatusMessage = "Nouveau cercle";
     }
 
     [RelayCommand]
@@ -180,7 +176,7 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         SelectedCircle = circle;
         DraftName = circle.Name;
         DraftPublic = circle.Public;
-        this.SetInfoStatus($"Édition de « {circle.Name} »");
+        StatusMessage = $"Édition de « {circle.Name} »";
     }
 
     [RelayCommand]
@@ -188,7 +184,7 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
     {
         if (string.IsNullOrWhiteSpace(DraftName))
         {
-            this.SetWarningStatus("Le nom est obligatoire");
+            StatusMessage = "Le nom est obligatoire";
             return;
         }
 
@@ -202,22 +198,22 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
                     Name = DraftName.Trim(),
                     Public = DraftPublic,
                 });
-                this.SetStatus(
+                StatusMessage = created is null
-                    created is null ? "Création échouée" : $"Cercle « {created.Name} » créé",
+                    ? "Création échouée"
-                    created is null ? StatusSeverity.Warning : StatusSeverity.Info);
+                    : $"Cercle « {created.Name} » créé";
             }
             else
             {
                 SelectedCircle.Name = DraftName.Trim();
                 SelectedCircle.Public = DraftPublic;
                 await _client.UpdateCircleAsync(SelectedCircle.Id, SelectedCircle);
-                this.SetInfoStatus($"Cercle « {SelectedCircle.Name} » mis à jour");
+                StatusMessage = $"Cercle « {SelectedCircle.Name} » mis à jour";
             }
             await RefreshAsync();
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -233,7 +229,7 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         try
         {
             await _client.DeleteCircleAsync(circle.Id);
-            this.SetInfoStatus($"Cercle « {circle.Name} » supprimé");
+            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
@@ -244,7 +240,7 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -265,7 +261,7 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         try
         {
             await _client.AddMemberAsync(SelectedCircle.Id, picked.Id);
-            this.SetInfoStatus($"« {picked.DisplayName} » ajouté au cercle");
+            StatusMessage = $"« {picked.DisplayName} » ajouté au cercle";
             await LoadMembersAsync(SelectedCircle.Id);
         }
         catch (Exception ex)
@@ -280,7 +276,7 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
             var msg = ex.Message.Contains("409") || ex.Message.Contains("Conflict")
                 ? "Déjà membre du cercle"
                 : $"Erreur: {ex.Message}";
-            this.SetStatus(msg, msg == "Déjà membre du cercle" ? StatusSeverity.Warning : StatusSeverity.Error);
+            StatusMessage = msg;
         }
         finally
         {
@@ -301,11 +297,11 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode
         {
             await _client.RemoveMemberAsync(SelectedCircle.Id, member.Id);
             Members.Remove(member);
-            this.SetInfoStatus($"« {member.UserName} » retiré du cercle");
+            StatusMessage = $"« {member.UserName} » retiré du cercle";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {

src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs

@@ -11,24 +11,21 @@ using Yavsc.Api.Client;
 
 namespace PostIt.ViewModels;
 
-public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusViewModel
+public partial class CommandFormsPageViewModel : ViewModelBase
 {
     private readonly BillingApiClient _billingClient;
 
-    public ActivityInfo Activity { get; }
+    public ActivityBrowseItemDto Activity { get; }
     public ActivityUserDisplayItem Performer { get; }
 
     [ObservableProperty]
-    public partial ObservableCollection<CommandFormSummary> Forms { get; set; }
+    public partial ObservableCollection<CommandFormSummaryDto> Forms { get; set; }
 
     [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedFormCommand)), NotifyCanExecuteChangedFor(nameof(OpenQueriesCommand)), NotifyCanExecuteChangedFor(nameof(OpenOngoingQueriesCommand))]
-    public partial CommandFormSummary? SelectedForm { get; set; }
+    public partial CommandFormSummaryDto? SelectedForm { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Pret.";
+    public partial string StatusMessage { get; set; }
-
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     public string Title => $"Formulaires pour {Performer.UserName}";
     public string ContextLabel => $"{Activity.Name} · {Forms.Count} formulaire(s)";
@@ -46,7 +43,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusVie
     }
 
     public CommandFormsPageViewModel(
-        ActivityInfo activity,
+        ActivityBrowseItemDto activity,
         ActivityUserDisplayItem performer,
         BillingApiClient billingClient)
     {
@@ -54,15 +51,13 @@ public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusVie
         Performer = performer ?? throw new ArgumentNullException(nameof(performer));
         _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
 
-        Forms = new ObservableCollection<CommandFormSummary>((activity.Forms ?? new())
+        Forms = new ObservableCollection<CommandFormSummaryDto>((activity.Forms ?? new())
             .OrderBy(f => f.Title)
             .ThenBy(f => f.ActionName));
         SelectedForm = Forms.FirstOrDefault();
-        this.SetStatus(
+        StatusMessage = Forms.Count == 0
-            Forms.Count == 0
             ? "Aucun formulaire n'est disponible pour cette activité."
-                : "Choisissez le formulaire à utiliser.",
+            : "Choisissez le formulaire à utiliser.";
-            Forms.Count == 0 ? StatusSeverity.Warning : StatusSeverity.Info);
     }
 
     private bool CanOpenSelectedForm() => SelectedForm is not null;
@@ -76,7 +71,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusVie
     {
         if (SelectedForm is null)
         {
-            this.SetWarningStatus("Sélectionnez un formulaire.");
+            StatusMessage = "Sélectionnez un formulaire.";
             return;
         }
 
@@ -86,9 +81,8 @@ public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusVie
             throw new InvalidOperationException("Application PostIt indisponible.");
         }
 
-        var vm =  SelectedForm.CreateCommandPageViewModel(
+        var vm = new BillingCommandPageViewModel(Activity, Performer, SelectedForm, _billingClient);
-            Activity, Performer, _billingClient);
+        await vm.InitializeAsync();
-        await vm!.InitializeAsync();
         await app.PushPageAsync(vm);
     }
 
@@ -97,7 +91,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusVie
     {
         if (SelectedForm is null)
         {
-            this.SetWarningStatus("Sélectionnez un formulaire.");
+            StatusMessage = "Sélectionnez un formulaire.";
             return;
         }
 
@@ -117,7 +111,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusVie
     {
         if (SelectedForm is null)
         {
-            this.SetWarningStatus("Sélectionnez un formulaire.");
+            StatusMessage = "Sélectionnez un formulaire.";
             return;
         }
 

src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using Yavsc;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-using Yavsc.Models.Billing;
-
-namespace PostIt.ViewModels;
-
-public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase, IActionStatusViewModel
-{
-    protected readonly BillingApiClient _billingClient;
-
-    public ActivityInfo Activity { get; }
-    public ActivityUserDisplayItem Performer { get; }
-    public CommandFormSummary Form { get; }
-
-    [ObservableProperty]
-    public partial bool IsBusy { get; set; }
-
-    [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Pret.";
-
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
-
-    [ObservableProperty]
-    public partial string Reason { get; set; } = string.Empty;
-
-
-
-    [ObservableProperty]
-    public partial bool Consent { get; set; } = true;
-
-
-    [ObservableProperty]
-    public partial string AdditionalInfo { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial long? ExistingQueryId { get; set; }
-
-    [ObservableProperty]
-    public partial QueryStatus CommandStatus { get; set; } = QueryStatus.Inserted;
-
-    public bool CanUseCurrentLocation => IsSupported && !IsBusy;
-
-    public string Title => Form.Title;
-    public string PerformerLabel => Performer.UserName;
-    public string ActivityLabel => Activity.Name;
-    public virtual bool IsSupported => true;
-    public string BillingRoute => $"/billing/{Form.ActionName}";
-    public bool IsEditingExisting => ExistingQueryId.HasValue;
-    public string SubmitLabel => IsEditingExisting ? "Mettre à jour la commande" : "Poster la commande";
-    public virtual string SupportMessage => $"Le formulaire {Form.ActionName} n'est pas encore pris en charge dans PostIt.";
-
-    public override bool CanNavigateNext
-    {
-        get => false;
-        protected set { _ = value; }
-    }
-
-    public override bool CanNavigatePrevious
-    {
-        get => true;
-        protected set { _ = value; }
-    }
-
-    public BillingCommandPageViewModel(
-        ActivityInfo activity,
-        ActivityUserDisplayItem performer,
-        CommandFormSummary form,
-        BillingApiClient billingClient)
-    {
-        Activity = activity ?? throw new ArgumentNullException(nameof(activity));
-        Performer = performer ?? throw new ArgumentNullException(nameof(performer));
-        Form = form ?? throw new ArgumentNullException(nameof(form));
-        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
-
-        this.SetInfoStatus(SupportMessage);
-    }
-
-    partial void OnExistingQueryIdChanged(long? value)
-    {
-        OnPropertyChanged(nameof(IsEditingExisting));
-        OnPropertyChanged(nameof(SubmitLabel));
-    }
-
-    partial void OnIsBusyChanged(bool value)
-    {
-        OnPropertyChanged(nameof(CanUseCurrentLocation));
-    }
-
-    public async Task InitializeAsync(BillingQueryDetailsDto? existingQuery = null)
-    {
-        await LoadAsync();
-        if (existingQuery is not null)
-        {
-            ApplyExistingQuery(existingQuery);
-            return;
-        }
-    }
-
-    protected abstract void ApplyExistingQuery(BillingQueryDetailsDto existingQuery);
-
-
-
-    [RelayCommand]
-    protected abstract Task SubmitAsync();
-}

src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs

@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-using Yavsc.Models.Billing;
-using Yavsc.Models.Haircut;
-namespace PostIt.ViewModels.Commands;
-
-public partial class BrushViewModel : RdvViewModel
-{
-    public override string SupportMessage => "Choisissez une prestation coiffure puis postez la commande.";
-
-    [ObservableProperty]
-    public partial ObservableCollection<HairPrestationDto> AvailablePrestations { get; set; } = new();
-
-    [ObservableProperty]
-    public partial HairPrestationDto? SelectedPrestation { get; set; }
-
-    public BrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
-        : base(activity, performer, form, billingClient)
-    {
-    }
-
-    public override async Task LoadAsync()
-    {
-        var prestations = await _billingClient.GetHairPrestationsAsync(Form.ActionName);
-
-        AvailablePrestations = new ObservableCollection<HairPrestationDto>
-            (prestations ?? new List<HairPrestationDto>());
-
-        if (SelectedPrestation is null)
-        {
-            SelectedPrestation = AvailablePrestations.FirstOrDefault();
-        }
-
-    }
-
-    protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
-    {
-        base.ApplyExistingQuery(existingQuery);
-
-        if (existingQuery.PrestationId is not null)
-        {
-            SelectedPrestation = AvailablePrestations.FirstOrDefault(x => x.Id == existingQuery.PrestationId.Value);
-        }
-
-        IsBusy = true;
-        try
-        {
-            if (SelectedPrestation is null)
-            {
-                SelectedPrestation = AvailablePrestations.FirstOrDefault();
-            }
-
-            this.SetStatus(
-                AvailablePrestations.Count == 0
-                    ? "Aucune prestation coiffure disponible."
-                    : SupportMessage,
-                AvailablePrestations.Count == 0 ? StatusSeverity.Warning : StatusSeverity.Info);
-        }
-        catch (HttpRequestException ex)
-        when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
-        {
-            this.SetWarningStatus("Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous.");
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors du chargement des prestations: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    protected override async Task SubmitAsync()
-    {
-        if (!Consent)
-        {
-            this.SetWarningStatus("Le consentement est requis pour poster la commande.");
-            return;
-        }
-
-        if (string.IsNullOrWhiteSpace(Address))
-        {
-            this.SetWarningStatus("L'adresse du rendez-vous est requise.");
-            return;
-        }
-
-        if (SelectedPrestation is null)
-        {
-            this.SetWarningStatus("Sélectionnez une prestation coiffure.");
-            return;
-        }
-
-        IsBusy = true;
-        try
-        {
-            var address = Address.Trim();
-            var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
-
-            var payload = new BillingQueryDetailsDto
-            {
-                Id = ExistingQueryId ?? 0,
-                BillingCode = Form.ActionName,
-                ActivityCode = Activity.Code,
-                PerformerId = Performer.PerformerId,
-                Consent = Consent,
-                EventDate = EventDate,
-                Status = CommandStatus,
-                Reason = Reason.Trim(),
-                AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
-                Location = new BillingLocationDto
-                {
-                    Address = address,
-                    Latitude = Latitude,
-                    Longitude = Longitude,
-                }
-            };
-
-            payload.PrestationId = SelectedPrestation.Id;
-
-            if (IsEditingExisting)
-            {
-                await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
-            }
-            else
-            {
-                await _billingClient.CreateAsync(Form.ActionName, new
-                {
-                    ActivityCode = Activity.Code,
-                    PerformerId = Performer.PerformerId,
-                    Consent,
-                    EventDate = (DateTime?)EventDate,
-                    Location = locationPayload,
-                    PrestationId = SelectedPrestation.Id,
-                    AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? null : AdditionalInfo.Trim(),
-                    Status = payload.Status,
-                }).ConfigureAwait(true);
-            }
-
-            this.SetInfoStatus(IsEditingExisting
-                ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
-                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
-        }
-        catch (HttpRequestException ex)
-        when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
-        {
-            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-
-    }
-}

src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs

@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-using Yavsc.Models.Billing;
-
-namespace PostIt.ViewModels.Commands;
-
-public partial class MBrushViewModel : BrushViewModel
-{
-    public override string SupportMessage => "Choisissez une ou plusieurs prestations coiffure puis postez la commande.";
-
-    [ObservableProperty]
-    public partial ObservableCollection<SelectableHairPrestationItem> MultiPrestations { get; set; } = new();
-
-    public MBrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
-        : base(activity, performer, form, billingClient)
-    {
-    }
-
-    public override async Task LoadAsync()
-    {
-        await base.LoadAsync().ConfigureAwait(true);
-        MultiPrestations = new ObservableCollection<SelectableHairPrestationItem>(
-            AvailablePrestations.Select(SelectableHairPrestationItem.FromDto));
-    }
-
-    protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
-    {
-        base.ApplyExistingQuery(existingQuery);
-
-        var selectedIds = existingQuery.PrestationIds is null
-            ? new HashSet<long>()
-            : new HashSet<long>(existingQuery.PrestationIds);
-
-        foreach (var item in MultiPrestations)
-        {
-            item.IsSelected = selectedIds.Contains(item.Id);
-        }
-    }
-
-    protected override async Task SubmitAsync()
-    {
-        if (!Consent)
-        {
-            this.SetWarningStatus("Le consentement est requis pour poster la commande.");
-            return;
-        }
-
-        if (string.IsNullOrWhiteSpace(Address))
-        {
-            this.SetWarningStatus("L'adresse du rendez-vous est requise.");
-            return;
-        }
-
-        var selectedPrestations = MultiPrestations.Where(x => x.IsSelected).ToList();
-        if (selectedPrestations.Count == 0)
-        {
-            this.SetWarningStatus("Sélectionnez au moins une prestation coiffure.");
-            return;
-        }
-
-        IsBusy = true;
-        try
-        {
-            var address = Address.Trim();
-            var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
-
-            var payload = new BillingQueryDetailsDto
-            {
-                Id = ExistingQueryId ?? 0,
-                BillingCode = Form.ActionName,
-                ActivityCode = Activity.Code,
-                PerformerId = Performer.PerformerId,
-                Consent = Consent,
-                EventDate = EventDate,
-                Status = CommandStatus,
-                Reason = Reason.Trim(),
-                Location = new BillingLocationDto
-                {
-                    Address = address,
-                    Latitude = Latitude,
-                    Longitude = Longitude,
-                },
-                PrestationIds = selectedPrestations.Select(x => x.Id).ToList(),
-            };
-
-            if (IsEditingExisting)
-            {
-                await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
-            }
-            else
-            {
-                await _billingClient.CreateAsync(Form.ActionName, new
-                {
-                    ActivityCode = Activity.Code,
-                    PerformerId = Performer.PerformerId,
-                    Consent,
-                    EventDate = EventDate,
-                    Location = locationPayload,
-                    Prestations = selectedPrestations.Select(x => new { PrestationId = x.Id }).ToList(),
-                    Status = payload.Status,
-                }).ConfigureAwait(true);
-            }
-
-            this.SetInfoStatus(IsEditingExisting
-                ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
-                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
-        }
-        catch (HttpRequestException ex)
-            when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
-        {
-            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-}

src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs

@@ -1,353 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using PostIt.Services;
-using Yavsc.Abstract.Workflow;
-using Yavsc.Api.Client;
-
-namespace PostIt.ViewModels.Commands;
-
-public partial class RdvViewModel : BillingCommandPageViewModel
-{
-    private long? _existingLocationId;
-    private bool _hydratingExistingQuery;
-
-    public override string SupportMessage => "Complétez les informations du rendez-vous puis postez la commande.";
-
-    [ObservableProperty]
-    public partial string Address { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial string SuggestedAddress { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial bool IsResolvingAddress { get; set; }
-
-    [ObservableProperty]
-    public partial double? Latitude { get; set; }
-
-    [ObservableProperty]
-    public partial double? Longitude { get; set; }
-
-
-    [ObservableProperty]
-    public partial DateTime EventDate { get; set; }
-
-    public DateTimeOffset? EventDateSelection
-    {
-        get => new(EventDate);
-        set
-        {
-            if (!value.HasValue)
-                return;
-
-            EventDate = value.Value.LocalDateTime;
-        }
-    }
-
-    public RdvViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
-        : base(activity, performer, form, billingClient)
-    {
-        EventDate = DateTime.Now.AddDays(1);
-    }
-
-    public bool HasSuggestedAddress => !string.IsNullOrWhiteSpace(SuggestedAddress);
-    public bool HasSuggestedAddressPanel => HasSuggestedAddress || IsResolvingAddress;
-
-    protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
-    {
-        _hydratingExistingQuery = true;
-        ExistingQueryId = existingQuery.Id;
-        CommandStatus = existingQuery.Status;
-        Consent = existingQuery.Consent;
-        Reason = existingQuery.Reason ?? string.Empty;
-        AdditionalInfo = existingQuery.AdditionalInfo ?? string.Empty;
-
-        if (existingQuery.EventDate is not null)
-        {
-            EventDate = existingQuery.EventDate.Value
-                .ToLocalTime();
-        }
-
-        if (existingQuery.Location is not null)
-        {
-            _existingLocationId = existingQuery.Location.Id;
-            Address = existingQuery.Location.Address ?? string.Empty;
-            SuggestedAddress = string.Empty;
-            Latitude = existingQuery.Location.Latitude;
-            Longitude = existingQuery.Location.Longitude;
-        }
-        else
-        {
-            _existingLocationId = null;
-        }
-
-        _hydratingExistingQuery = false;
-
-        this.SetInfoStatus($"Commande #{existingQuery.Id} chargée.");
-    }
-
-    [RelayCommand(CanExecute = nameof(CanUseCurrentLocation))]
-    private async Task UseCurrentLocationAsync()
-    {
-        if (!CanUseCurrentLocation)
-        {
-            return;
-        }
-
-        IsBusy = true;
-        try
-        {
-            var result = await Platform.TryGetCurrentLocationAsync(default).ConfigureAwait(true);
-            if (!result.IsSuccess || !result.Latitude.HasValue || !result.Longitude.HasValue)
-            {
-                this.SetWarningStatus(result.Message);
-                return;
-            }
-
-            Latitude = result.Latitude.Value;
-            Longitude = result.Longitude.Value;
-            this.SetInfoStatus(string.IsNullOrWhiteSpace(Address)
-                ? "Position récupérée. Complétez l'adresse puis envoyez la commande."
-                : result.Message);
-        }
-        catch (OperationCanceledException)
-        {
-            this.SetWarningStatus("La récupération de la position a été annulée.");
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Impossible de récupérer la position: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    protected static BillingLocationDto BuildLocationPayload(string address, double? latitude, double? longitude, long? locationId = null)
-    {
-        if (latitude.HasValue && longitude.HasValue)
-        {
-            return new BillingLocationDto
-            {
-                Id = locationId,
-                Address = address,
-                Latitude = latitude.Value,
-                Longitude = longitude.Value,
-            };
-        }
-
-        return new BillingLocationDto
-        {
-            Id = locationId,
-            Address = address,
-        };
-    }
-
-    public void ApplyLocationFromMap(double latitude, double longitude)
-    {
-        Latitude = Math.Round(latitude, 6);
-        Longitude = Math.Round(longitude, 6);
-
-        if (string.IsNullOrWhiteSpace(Address))
-        {
-            this.SetInfoStatus("Position sélectionnée sur la carte. Complétez l'adresse puis envoyez la commande.");
-            return;
-        }
-
-        this.SetInfoStatus("Position sélectionnée sur la carte.");
-    }
-
-    public void NotifyReverseGeocodingStarted()
-    {
-        IsResolvingAddress = true;
-        this.SetInfoStatus(string.IsNullOrWhiteSpace(Address)
-            ? "Recherche de l'adresse depuis la carte..."
-            : "Recherche d'une adresse suggérée..."
-        );
-    }
-
-    public void NotifyReverseGeocodingUnavailable()
-    {
-        IsResolvingAddress = false;
-        if (HasSuggestedAddress || !string.IsNullOrWhiteSpace(Address))
-            return;
-
-        this.SetInfoStatus("Position sélectionnée sur la carte. Complétez l'adresse puis envoyez la commande.");
-    }
-
-    public void ApplyResolvedAddress(string address)
-    {
-        if (string.IsNullOrWhiteSpace(address))
-            return;
-
-        var trimmedAddress = address.Trim();
-        if (string.IsNullOrWhiteSpace(Address))
-        {
-            Address = trimmedAddress;
-            SuggestedAddress = string.Empty;
-            IsResolvingAddress = false;
-            this.SetInfoStatus("Adresse mise à jour depuis la carte.");
-            return;
-        }
-
-        if (string.Equals(Address.Trim(), trimmedAddress, StringComparison.Ordinal))
-        {
-            SuggestedAddress = string.Empty;
-            IsResolvingAddress = false;
-            return;
-        }
-
-        SuggestedAddress = trimmedAddress;
-        IsResolvingAddress = false;
-        this.SetInfoStatus("Adresse suggérée depuis la carte. Appliquez-la si besoin.");
-    }
-
-    [RelayCommand(CanExecute = nameof(HasSuggestedAddress))]
-    private void ApplySuggestedAddress()
-    {
-        if (string.IsNullOrWhiteSpace(SuggestedAddress))
-            return;
-
-        Address = SuggestedAddress.Trim();
-        SuggestedAddress = string.Empty;
-        IsResolvingAddress = false;
-        this.SetInfoStatus("Adresse suggérée appliquée.");
-    }
-
-    partial void OnSuggestedAddressChanged(string value)
-    {
-        OnPropertyChanged(nameof(HasSuggestedAddress));
-        OnPropertyChanged(nameof(HasSuggestedAddressPanel));
-        ApplySuggestedAddressCommand.NotifyCanExecuteChanged();
-    }
-
-    partial void OnIsResolvingAddressChanged(bool value)
-    {
-        OnPropertyChanged(nameof(HasSuggestedAddressPanel));
-    }
-
-    partial void OnEventDateChanged(DateTime value)
-    {
-        OnPropertyChanged(nameof(EventDateSelection));
-    }
-
-    partial void OnAddressChanged(string value)
-    {
-        if (_hydratingExistingQuery)
-            return;
-
-        _existingLocationId = null;
-    }
-
-    partial void OnLatitudeChanged(double? value)
-    {
-        if (_hydratingExistingQuery)
-            return;
-
-        _existingLocationId = null;
-    }
-
-    partial void OnLongitudeChanged(double? value)
-    {
-        if (_hydratingExistingQuery)
-            return;
-
-        _existingLocationId = null;
-    }
-
-
-    protected override async Task SubmitAsync()
-    {
-        if (!IsSupported)
-        {
-            this.SetWarningStatus(SupportMessage);
-            return;
-        }
-
-        if (!Consent)
-        {
-            this.SetWarningStatus("Le consentement est requis pour poster la commande.");
-            return;
-        }
-
-        if (string.IsNullOrWhiteSpace(Address))
-        {
-            this.SetWarningStatus("L'adresse du rendez-vous est requise.");
-            return;
-        }
-
-
-        if (string.IsNullOrWhiteSpace(Reason))
-        {
-            this.SetWarningStatus("Le motif du rendez-vous est requis.");
-            return;
-        }
-
-
-
-        IsBusy = true;
-        try
-        {
-            var address = Address.Trim();
-            var locationPayload = BuildLocationPayload(address, Latitude, Longitude, IsEditingExisting ? _existingLocationId : null);
-
-            var payload = new BillingQueryDetailsDto
-            {
-                Id = ExistingQueryId ?? 0,
-                BillingCode = Form.ActionName,
-                ActivityCode = Activity.Code,
-                PerformerId = Performer.PerformerId,
-                Consent = Consent,
-                EventDate = EventDate,
-                Status = CommandStatus,
-                Reason = Reason.Trim(),
-                AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
-                Location = locationPayload
-            };
-
-            if (IsEditingExisting)
-            {
-                await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
-            }
-            else
-            {
-                await _billingClient.CreateAsync(Form.ActionName, new
-                {
-                    ActivityCode = Activity.Code,
-                    PerformerId = Performer.PerformerId,
-                    Consent,
-                    EventDate = EventDate,
-                    Location = locationPayload,
-                    Reason = payload.Reason,
-                    Status = payload.Status,
-                }).ConfigureAwait(true);
-            }
-
-            this.SetInfoStatus(IsEditingExisting
-                ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
-                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.");
-        }
-        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
-        {
-            this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.");
-        }
-        catch (Exception ex)
-        {
-            this.SetErrorStatus($"Erreur lors de l'envoi: {ex.Message}");
-        }
-        finally
-        {
-            IsBusy = false;
-        }
-    }
-
-    public override Task LoadAsync()
-    {
-        return Task.CompletedTask;
-    }
-}

src/PostIt/PostIt/ViewModels/HomePageViewModel.cs

@@ -5,7 +5,6 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
 using PostIt.Helpers;
 using PostIt.Services;
-using Yavsc.Api.Client;
 namespace PostIt.ViewModels;
 
 public class HomePageViewModel : ViewModelBase
@@ -31,12 +30,10 @@ public class HomePageViewModel : ViewModelBase
         SessionStatus = sessionStatus;
 
         OpenActivities = new AsyncRelayCommand(OpenActivitiesAsync);
-        OpenProviderRequests = new AsyncRelayCommand(OpenProviderRequestsAsync);
+
-        OpenBlogs = new AsyncRelayCommand(App.PushBlogsPageAsync);
     }
-    public IAsyncRelayCommand OpenBlogs { get; }
+    public IAsyncRelayCommand OpenBlogs { get; } = new AsyncRelayCommand(App.PushMainPageAsync);
     public IAsyncRelayCommand OpenActivities { get; }
-    public IAsyncRelayCommand OpenProviderRequests { get; }
 
     private async Task OpenActivitiesAsync()
     {
@@ -51,27 +48,6 @@ public class HomePageViewModel : ViewModelBase
         await app.PushPageAsync(vm);
     }
 
-    private async Task OpenProviderRequestsAsync()
-    {
-        var app = (App?)Application.Current;
-        if (app is null)
-        {
-            throw new InvalidOperationException("Application PostIt indisponible.");
-        }
-
-        var billingClient = app.ServiceProvider?.GetRequiredService<BillingApiClient>();
-        if (billingClient is null)
-        {
-            throw new InvalidOperationException("Client billing indisponible.");
-        }
-
-        var estimateClient = app.ServiceProvider?.GetRequiredService<EstimateApiClient>();
-
-        var vm = new ProviderOngoingRequestsPageViewModel(billingClient, Settings, estimateClient);
-        await vm.InitializeAsync();
-        await app.PushPageAsync(vm);
-    }
-
     /// <summary>
     /// Avalonia designer constructor. Builds a self-contained VM
     /// with a freshly-constructed Settings so the XAML preview can

src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs

@@ -1,32 +0,0 @@
-namespace PostIt.ViewModels;
-
-public interface IActionStatusViewModel
-{
-    string StatusMessage { get; set; }
-    StatusNotice ActionStatus { get; set; }
-}
-
-public static class ActionStatusViewModelExtensions
-{
-    public static void SetInfoStatus(this IActionStatusViewModel viewModel, string message)
-        => viewModel.SetStatus(message, StatusSeverity.Info);
-
-    public static void SetWarningStatus(this IActionStatusViewModel viewModel, string message)
-        => viewModel.SetStatus(message, StatusSeverity.Warning);
-
-    public static void SetErrorStatus(this IActionStatusViewModel viewModel, string message)
-        => viewModel.SetStatus(message, StatusSeverity.Error);
-
-    public static void SetStatus(this IActionStatusViewModel viewModel, string message, StatusSeverity severity)
-    {
-        var normalizedMessage = string.IsNullOrWhiteSpace(message) ? "Pret." : message.Trim();
-
-        viewModel.StatusMessage = normalizedMessage;
-        viewModel.ActionStatus = severity switch
-        {
-            StatusSeverity.Error => StatusNotice.Error(normalizedMessage),
-            StatusSeverity.Warning => StatusNotice.Warning(normalizedMessage),
-            _ => StatusNotice.Info(normalizedMessage),
-        };
-    }
-}

src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs

@@ -1,35 +0,0 @@
-namespace PostIt.ViewModels;
-
-public enum StatusSeverity
-{
-    Info,
-    Warning,
-    Error
-}
-
-public sealed class StatusNotice
-{
-    public string Message { get; }
-    public StatusSeverity Severity { get; }
-    public string Glyph { get; }
-    public string Background { get; }
-    public string BorderBrush { get; }
-    public string Foreground { get; }
-
-    private StatusNotice(string message, StatusSeverity severity)
-    {
-        Message = string.IsNullOrWhiteSpace(message) ? "Pret." : message;
-        Severity = severity;
-
-        (Glyph, Background, BorderBrush, Foreground) = severity switch
-        {
-            StatusSeverity.Error => ("!", "#7F1D1D", "#C62828", "#e1f0f6"),
-            StatusSeverity.Warning => ("~", "#7C4A03", "#E6A700", "#eaeaea"),
-            _ => ("i", "#E8F0FE", "#5B8DEF", "#1E3A8A"),
-        };
-    }
-
-    public static StatusNotice Info(string message) => new(message, StatusSeverity.Info);
-    public static StatusNotice Warning(string message) => new(message, StatusSeverity.Warning);
-    public static StatusNotice Error(string message) => new(message, StatusSeverity.Error);
-}

src/PostIt/PostIt/ViewModels/MainViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia;
@@ -9,12 +8,11 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Blogspot;
 using Yavsc.Api.Client;
-using Yavsc.Abstract.Files;
 using PostIt.Helpers;
 
 namespace PostIt.ViewModels;
 
-public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
+public partial class MainViewModel : ViewModelBase
 {
     /// <summary>Window/tab title. Cosmetic — bound by
     /// <c>MainPage.axaml</c> if at all. Not the post title.</summary>
@@ -56,9 +54,6 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     [ObservableProperty]
     public partial string StatusMessage { get; set; }
 
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
-
     [ObservableProperty]
     public partial string SearchText { get; set; }
 
@@ -68,9 +63,6 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     [ObservableProperty]
     public partial ObservableCollection<BlogPostDto> FilteredPosts { get; set; }
 
-    [ObservableProperty]
-    public partial ObservableCollection<BlogUploadFile> DraftAttachments { get; set; }
-
     [ObservableProperty]
     public partial BlogPostDto? SelectedPost { get; set; }
 
@@ -92,10 +84,16 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
                 Posts.Add(post);
             }
             ApplyFilter();
-            this.SetInfoStatus($"{Posts.Count} billet(s) chargé(s).");
+            StatusMessage = $"Loaded {Posts.Count} posts.";
         });
     }
 
+    [RelayCommand]
+    internal async Task SearchAsync() {
+        await RefreshAsync();
+        ApplyFilter();
+    }
+
     [RelayCommand]
     internal async Task SaveAsync()
     {
@@ -106,14 +104,12 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
         // than to send a request the server will reject.
         if (string.IsNullOrWhiteSpace(DraftTitle))
         {
-            this.SetWarningStatus("Le titre est obligatoire.");
+            StatusMessage = "Title is required.";
             return;
         }
 
         await ExecuteAsync(async () =>
         {
-            var attachments = DraftAttachments.ToArray();
-
             // Build a fresh BlogPostDto from the editor buffer on
             // every Save — we no longer mutate SelectedPost in
             // place. The previous behaviour copied the buffer
@@ -134,28 +130,11 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
                     DateModified = DateTime.UtcNow,
                     IsPublished = DraftIsPublished
                 };
-                var created = await BlogClient!.CreatePostAsync(draft, attachments);
+                var created = await BlogClient!.CreatePostAsync(draft);
                 if (created is not null)
                 {
                     SelectedPost = created;
-
+                    StatusMessage = $"Created post {created.Id}.";
-                    if (TryAppendAttachmentLinks(created, attachments))
-                    {
-                        var linkUpdate = new BlogPostDto
-                        {
-                            Id = created.Id,
-                            AuthorId = created.AuthorId,
-                            Photo = created.Photo,
-                            Title = DraftTitle,
-                            Article = DraftArticle ?? string.Empty,
-                            DateCreated = created.DateCreated,
-                            DateModified = DateTime.UtcNow,
-                        };
-                        await BlogClient.UpdatePostAsync(created.Id, linkUpdate);
-                    }
-
-                    this.SetInfoStatus($"Billet {created.Id} créé.");
-                    DraftAttachments.Clear();
                 }
             }
             else
@@ -170,26 +149,8 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
                     DateCreated = SelectedPost.DateCreated,
                     DateModified = DateTime.UtcNow,
                 };
-
+                await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
-                await BlogClient!.UpdatePostAsync(SelectedPost.Id, update, attachments);
+                StatusMessage = $"Saved post {SelectedPost.Id}.";
-
-                if (TryAppendAttachmentLinks(SelectedPost, attachments))
-                {
-                    var linkUpdate = new BlogPostDto
-                    {
-                        Id = SelectedPost.Id,
-                        AuthorId = SelectedPost.AuthorId,
-                        Photo = SelectedPost.Photo,
-                        Title = DraftTitle,
-                        Article = DraftArticle ?? string.Empty,
-                        DateCreated = SelectedPost.DateCreated,
-                        DateModified = DateTime.UtcNow,
-                    };
-                    await BlogClient.UpdatePostAsync(SelectedPost.Id, linkUpdate);
-                }
-
-                this.SetInfoStatus($"Billet {SelectedPost.Id} enregistré.");
-                DraftAttachments.Clear();
             }
 
             await RefreshPostsAsync();
@@ -201,14 +162,14 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     {
         if (SelectedPost is null || SelectedPost.Id == 0)
         {
-            this.SetWarningStatus("Sélectionnez un billet existant avant suppression.");
+            StatusMessage = "Select an existing post before deleting.";
             return;
         }
 
         await ExecuteAsync(async () =>
         {
             await BlogClient!.DeletePostAsync(SelectedPost.Id);
-            this.SetInfoStatus($"Billet {SelectedPost.Id} supprimé.");
+            StatusMessage = $"Deleted post {SelectedPost.Id}.";
             SelectedPost = null;
             await RefreshPostsAsync();
         });
@@ -233,7 +194,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     {
         if (SelectedPost is null || SelectedPost.Id == 0)
         {
-            this.SetWarningStatus("Sélectionnez un billet existant pour changer sa publication.");
+            StatusMessage = "Sélectionnez un billet existant pour changer sa publication.";
             return;
         }
 
@@ -250,9 +211,9 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
             // locally flipped state until the round-trip
             // re-hydrates it.
             SelectedPost.IsPublished = publish;
-            this.SetInfoStatus(publish
+            StatusMessage = publish
                 ? $"Billet {SelectedPost.Id} publié."
-                : $"Billet {SelectedPost.Id} remis en brouillon.");
+                : $"Billet {SelectedPost.Id} remis en brouillon.";
         });
     }
 
@@ -286,7 +247,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     {
         if (SelectedPost is null)
         {
-            this.SetWarningStatus("Sélectionnez un billet existant avant de gérer l'ACL.");
+            StatusMessage = "Select an existing post before managing ACL.";
             return;
         }
 
@@ -372,7 +333,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     }
 
 
-    public BlogsViewModel()
+    public MainViewModel()
     {
         SettingsModel = new Settings();
         Init(SettingsModel);
@@ -383,10 +344,9 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     {
         Posts = new ObservableCollection<BlogPostDto>();
         FilteredPosts = new ObservableCollection<BlogPostDto>();
-        DraftAttachments = new ObservableCollection<BlogUploadFile>();
         SelectedPost = null;
         IsBusy = false;
-        this.SetInfoStatus("Prêt.");
+        StatusMessage = "Ready";
         Settings = settings ?? new Settings();
         SearchText = Settings.SearchText;
         WindowTitle = "PostIt";
@@ -433,7 +393,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
     /// <see cref="BlogApiClient"/>. Production code uses the
     /// (Settings, BlogApiClient) overload below.
     /// </summary>
-    public BlogsViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
+    public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
     {
         SettingsModel = new Settings();
         BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ;
@@ -464,7 +424,6 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
         // Mirror publication state too. Defaults to false on
         // null selection so a fresh draft starts unpublished.
         DraftIsPublished = value?.IsPublished ?? false;
-        DraftAttachments.Clear();
         UpdateCommandStates();
     }
 
@@ -517,12 +476,12 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
         try
         {
             IsBusy = true;
-            this.SetInfoStatus("Traitement en cours...");
+            StatusMessage = "Working...";
             await action();
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Error: {ex.Message}";
         }
         finally
         {
@@ -546,55 +505,4 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel
             IsLoaded = true;
         }
     }
-
-    private bool TryAppendAttachmentLinks(BlogPostDto post, IReadOnlyCollection<BlogUploadFile> attachments)
-    {
-        if (attachments.Count == 0)
-            return false;
-
-        var ownerSegment = post.Author?.UserName;
-        if (string.IsNullOrWhiteSpace(ownerSegment))
-            ownerSegment = post.AuthorId;
-
-        if (string.IsNullOrWhiteSpace(ownerSegment))
-            return false;
-
-        var article = DraftArticle ?? string.Empty;
-        var links = new List<string>();
-
-        foreach (var attachment in attachments)
-        {
-            var relativePath = $"{EscapePathSegment(ownerSegment)}/blogs/{post.Id}/{EscapePathSegment(attachment.FileName)}";
-            var fileUrl = ResolveUserFileUrl(relativePath);
-            var markdownLine = $"- [{attachment.FileName}]({fileUrl})";
-
-            if (!article.Contains(markdownLine, StringComparison.Ordinal))
-                links.Add(markdownLine);
-        }
-
-        if (links.Count == 0)
-            return false;
-
-        var prefix = article.Length == 0
-            ? ""
-            : (article.EndsWith("\n", StringComparison.Ordinal) ? "\n" : "\n\n");
-
-        DraftArticle = article + prefix + string.Join("\n", links);
-        return true;
-    }
-
-    private string ResolveUserFileUrl(string relativePath)
-    {
-        var authority = Settings?.Authentication?.Authority;
-        if (!string.IsNullOrWhiteSpace(authority)
-            && Uri.TryCreate(authority, UriKind.Absolute, out var baseUri))
-        {
-            return FileServerUrlHelpers.GetUserFilesUri(baseUri, relativePath).ToString();
-        }
-
-        return $"{Yavsc.Constants.UserFilesPath}/{relativePath}";
-    }
-
-    private static string EscapePathSegment(string segment)
-        => Uri.EscapeDataString(segment);
 }

src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs

@@ -37,7 +37,7 @@ public sealed class PostAclEntry
 /// any 403 / 404 will surface as an exception caught by the
 /// command and routed to <see cref="StatusMessage"/>.</para>
 /// </summary>
-public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewModel
+public partial class PostAclDialogViewModel : ViewModelBase
 {
     private readonly BlogAclApiClient _aclClient;
     private readonly CircleApiClient _circleClient;
@@ -61,10 +61,7 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo
     public partial bool IsBusy { get; set; }
 
     [ObservableProperty]
-    public partial string StatusMessage { get; set; } = "Pret.";
+    public partial string StatusMessage { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
 
     /// <summary>
     /// Idempotency gate for <see cref="LoadAsync"/>: the dialog
@@ -118,12 +115,12 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo
             AclEntries = new ObservableCollection<PostAclEntry>(AclEntries.Select(a => ToAclEntry(a.CircleId)));
 
 
-            this.SetInfoStatus($"{AclEntries.Count} autorisation(s)");
+            StatusMessage = $"{AclEntries.Count} autorisation(s)";
             _loaded = true;
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -136,7 +133,7 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo
     {
         if (SelectedCircleToAdd is null)
         {
-            this.SetWarningStatus("Sélectionnez un cercle à ajouter");
+            StatusMessage = "Sélectionnez un cercle à ajouter";
             return;
         }
 
@@ -145,7 +142,7 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo
         {
             if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id))
             {
-                this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé");
+                StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
                 return;
             }
 
@@ -157,11 +154,11 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo
             if (created is not null)
             {
                 AclEntries.Add(ToAclEntry(created.CircleId));
-                this.SetInfoStatus($"Cercle « {SelectedCircleToAdd.Name} » autorisé");
+                StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé";
             }
             else
             {
-                this.SetWarningStatus("Autorisation refusée par le serveur");
+                StatusMessage = "Autorisation refusée par le serveur";
             }
         }
         catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Conflict)
@@ -169,11 +166,11 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo
             // Conflict means the link already exists in backend. Resync
             // from the dedicated ACL API so the UI reflects server truth.
             await ReloadAclEntriesFromServerAsync();
-            this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé");
+            StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {
@@ -192,11 +189,11 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo
             var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId);
             if (existing is not null)
                 AclEntries.Remove(existing);
-            this.SetInfoStatus("Autorisation révoquée");
+            StatusMessage = "Autorisation révoquée";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         finally
         {

src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs

@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-
-namespace PostIt.ViewModels;
-
-public abstract class RemoteViewModelBase : ViewModelBase
-{
-     public abstract Task LoadAsync();
-
-
-}

src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs

@@ -22,7 +22,7 @@ public partial class AuthenticationSettings : ObservableObject
 
     public const string DefaultClientId  = "postit";
 
-    public static readonly string[] DefaultScopes  = { "blogs", "api" };
+    public static readonly string[] DefaultScopes  = { "blogs" };
 
     [ObservableProperty]
     public partial string Authority { get; set; }

src/PostIt/PostIt/ViewModels/Settings/Settings.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 [assembly: InternalsVisibleTo("PostIt.Tests")]
 
@@ -15,8 +14,7 @@ namespace PostIt.ViewModels;
 
 public partial class Settings : ViewModelBase
 {
-    [JsonIgnore]
+    const string SettingsFileName = "postit-settings.json";
-    public string? SettingsFileFullName { get; private set; }
 
     [ObservableProperty]
     public partial AuthenticationSettings Authentication { get; set; } = new();
@@ -28,82 +26,11 @@ public partial class Settings : ViewModelBase
     public partial string BlogsApiUrl { get; set; } = "https://blogs.pschneider.fr/api/v1/";
 
     [ObservableProperty]
-    public partial string ApiUrl { get; set; } = "https://api.pschneider.fr/api/v1/";
+    public partial string BusinessApiUrl { get; set; } = "https://api.pschneider.fr/api/v1/";
 
     [ObservableProperty]
     public partial string SearchText { get; set; } = string.Empty;
 
-    [ObservableProperty]
-    public partial string ProviderOngoingRequestsSortOption { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    [JsonIgnore]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret.");
-
-
-    public bool Loaded { get; private set; } = false;
-
-
-    /// <summary>
-    /// True when the in-memory state has drifted from the last
-    /// <see cref="Load"/> or <see cref="Save"/> snapshot. The
-    /// Settings page binds the Sauver button's <c>IsEnabled</c> to
-    /// this flag, so it only enables when the user has actually
-    /// touched something since the last load / save. Cleared by
-    /// <see cref="Load"/> (and by <see cref="ApplyJson"/>), set by
-    /// every successful setter on the four top-level mutable
-    /// properties and on the sub-properties of
-    /// <see cref="Authentication"/>.
-    /// </summary>
-    [ObservableProperty]
-    public partial bool IsDirty { get; private set; } = false;
-
-
-    /// <summary>
-    /// Guards every mutation of the observable state. <c>[ObservableProperty]</c>
-    /// generates setters that call <c>SetProperty(...)</c> which fires
-    /// <c>PropertyChanged</c>. Avalonia bindings consume that event on
-    /// the UI thread, and a stray background-thread update is exactly
-    /// what crashed <c>DataValidationErrors.SetErrors</c> on
-    /// <c>postit://callback</c> re-launches. The lock makes mutations
-    /// atomic; <see cref="OnPropertyChanged(PropertyChangedEventArgs)"/>
-    /// then marshals the notification onto the UI thread so bindings
-    /// observe the change on the right thread.
-    /// </summary>
-    private readonly object _mutationGate = new();
-
-    /// <summary>
-    /// Scopes the PostIt client always requires from the OIDC provider,
-    /// regardless of what the user has in their settings file.
-    ///
-    /// <para>PostIt calls into the Blog API (and any other Yavsc API
-    /// gated by an <c>[Authorize("…Scope")]</c> policy) and is silent
-    /// about the contract: a missing scope here surfaces as a 401
-    /// on the very first API call after login, with no obvious link
-    /// to the settings. The "feature" scopes the user must opt into
-    /// (e.g. <c>blogs</c>) are still their choice — we only force the
-    /// structural ones that OIDC itself needs.</para>
-    /// </summary>
-    private static readonly string[] BuiltInScopes = new[]
-    {
-        "openid",        // OIDC: required for the id_token
-        "profile",       // OIDC: standard profile claims
-        "offline_access", // OIDC: required to receive a refresh_token
-        "blogs",
-        "api"
-    };
-    private readonly string DEFAULT_SETTINGS_FILENAME = "postit-settings.json";
-
-    public void SetActionStatus(string message, StatusSeverity severity = StatusSeverity.Info)
-    {
-        ActionStatus = severity switch
-        {
-            StatusSeverity.Error => StatusNotice.Error(message),
-            StatusSeverity.Warning => StatusNotice.Warning(message),
-            _ => StatusNotice.Info(message),
-        };
-    }
-
     /// <summary>
     /// Catch top-level mutations: the four ObservableProperty
     /// setters above all funnel through here, and we flip
@@ -118,9 +45,8 @@ public partial class Settings : ViewModelBase
 
     partial void OnDarkModeChanged(bool value) => MarkDirty();
     partial void OnBlogsApiUrlChanged(string value) => MarkDirty();
-    partial void OnApiUrlChanged(string value) => MarkDirty();
+    partial void OnBusinessApiUrlChanged(string value) => MarkDirty();
     partial void OnSearchTextChanged(string value) => MarkDirty();
-    partial void OnProviderOngoingRequestsSortOptionChanged(string value) => MarkDirty();
 
     /// <summary>
     /// Authentication can be reassigned wholesale by
@@ -141,6 +67,35 @@ public partial class Settings : ViewModelBase
         MarkDirty();
     }
 
+    public bool Loaded { get; private set; } = false;
+
+    /// <summary>
+    /// True when the in-memory state has drifted from the last
+    /// <see cref="Load"/> or <see cref="Save"/> snapshot. The
+    /// Settings page binds the Sauver button's <c>IsEnabled</c> to
+    /// this flag, so it only enables when the user has actually
+    /// touched something since the last load / save. Cleared by
+    /// <see cref="Load"/> (and by <see cref="ApplyJson"/>), set by
+    /// every successful setter on the four top-level mutable
+    /// properties and on the sub-properties of
+    /// <see cref="Authentication"/>.
+    /// </summary>
+    [ObservableProperty]
+    public partial bool IsDirty { get; private set; } = false;
+
+    /// <summary>
+    /// Guards every mutation of the observable state. <c>[ObservableProperty]</c>
+    /// generates setters that call <c>SetProperty(...)</c> which fires
+    /// <c>PropertyChanged</c>. Avalonia bindings consume that event on
+    /// the UI thread, and a stray background-thread update is exactly
+    /// what crashed <c>DataValidationErrors.SetErrors</c> on
+    /// <c>postit://callback</c> re-launches. The lock makes mutations
+    /// atomic; <see cref="OnPropertyChanged(PropertyChangedEventArgs)"/>
+    /// then marshals the notification onto the UI thread so bindings
+    /// observe the change on the right thread.
+    /// </summary>
+    private readonly object _mutationGate = new();
+
     /// <summary>
     /// Build OidcClient options configured for Authorization Code + PKCE
     /// (no client secret). The browser implementation should be supplied
@@ -155,8 +110,6 @@ public partial class Settings : ViewModelBase
         // build options from a torn read.
         lock (_mutationGate)
         {
-            EnsureAuthenticationDefaultsLocked();
-
             var options = new OidcClientOptions
             {
                 Authority = Authentication.Authority,
@@ -185,25 +138,27 @@ public partial class Settings : ViewModelBase
         }
     }
 
-    private void EnsureAuthenticationDefaultsLocked()
+    /// <summary>
+    /// Scopes the PostIt client always requires from the OIDC provider,
+    /// regardless of what the user has in their settings file.
+    ///
+    /// <para>PostIt calls into the Blog API (and any other Yavsc API
+    /// gated by an <c>[Authorize("…Scope")]</c> policy) and is silent
+    /// about the contract: a missing scope here surfaces as a 401
+    /// on the very first API call after login, with no obvious link
+    /// to the settings. The "feature" scopes the user must opt into
+    /// (e.g. <c>blogs</c>) are still their choice — we only force the
+    /// structural ones that OIDC itself needs.</para>
+    /// </summary>
+    private static readonly string[] BuiltInScopes = new[]
     {
-        Authentication ??= new AuthenticationSettings();
+        "openid",        // OIDC: required for the id_token
-
+        "profile",       // OIDC: standard profile claims
-        if (string.IsNullOrWhiteSpace(Authentication.Authority))
+        "offline_access", // OIDC: required to receive a refresh_token
-            Authentication.Authority = AuthenticationSettings.DefaultAuthority;
+        "blogs",
-
+        "api"
-        if (string.IsNullOrWhiteSpace(Authentication.ClientId))
-            Authentication.ClientId = AuthenticationSettings.DefaultClientId;
-
-        if (string.IsNullOrWhiteSpace(Authentication.RedirectUri))
-            Authentication.RedirectUri = AuthenticationSettings.DesktopRedirectUri;
-
-        if (Authentication.Scopes is null || Authentication.Scopes.Length == 0)
-            Authentication.Scopes = AuthenticationSettings.DefaultScopes;
-
-        Authentication.RefreshScopeListText();
-    }
 
+    };
 
     /// <summary>
     /// Merge user-configured scopes with the built-in ones. User scopes
@@ -256,42 +211,16 @@ public partial class Settings : ViewModelBase
                 return;
             }
         }
-        if (Environment.GetEnvironmentVariable("POSTIT_SETTINGS_JSON") is string envJson
+
-            && !string.IsNullOrWhiteSpace(envJson))
-        {
-            Console.WriteLine("🔎 Loading settings from POSTIT_SETTINGS_JSON environment variable.");
-            FileInfo configByEnvFileInfo = new FileInfo(envJson);
-            if (!configByEnvFileInfo.Exists)
-            {
-                throw new Exception($"🩎 Settings file not found at {configByEnvFileInfo.FullName}");
-            }
-            string json = File.ReadAllText(configByEnvFileInfo.FullName);
-            ApplyJson(json, "POSTIT_SETTINGS_JSON");
-            SettingsFileFullName = configByEnvFileInfo.FullName;
-            Loaded = true;
-            return;
-        }
         string configDir = Path.Combine(
     Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
     "PostIt"
-        );
+);
+        Directory.CreateDirectory(configDir);
 
-        if (SettingsFileFullName is not null)
+        string configPath = Path.Combine(configDir, SettingsFileName);
-        {
-            // Already set by a previous Load() or by the environment
-            // variable path above. Use it as-is.
-        }
-        else if (Environment.GetEnvironmentVariable("POSTIT_SETTINGS_JSON") is string envPath
-            && !string.IsNullOrWhiteSpace(envPath))
-        {
-            SettingsFileFullName = envPath;
-        }
-        else
-        {
-            SettingsFileFullName = Path.Combine(configDir, "postit-settings.json");
-        }
 
-        FileInfo configFileInfo = new FileInfo(SettingsFileFullName);
+        FileInfo configFileInfo = new FileInfo(configPath);
 
         if (!configFileInfo.Exists)
         {
@@ -320,7 +249,6 @@ public partial class Settings : ViewModelBase
             using var reader = new StreamReader(stream);
             var json = reader.ReadToEnd();
             ApplyJson(json, $"user file {configFileInfo.FullName}");
-            SettingsFileFullName = configFileInfo.FullName;
             Loaded = true;
         }
         catch (Exception ex)
@@ -372,17 +300,16 @@ public partial class Settings : ViewModelBase
             // → our overridden dispatcher-safe marshaller below.
             else lock (_mutationGate)
             {
-                var legacyApiUrl = TryReadApiUrl(json);
+                var legacyApiUrl = TryReadLegacyApiUrl(json);
                 this.Authentication = settings.Authentication;
                 this.DarkMode = settings.DarkMode;
                 this.BlogsApiUrl = !string.IsNullOrWhiteSpace(settings.BlogsApiUrl)
                     ? settings.BlogsApiUrl
                     : legacyApiUrl ?? this.BlogsApiUrl;
-                this.ApiUrl = !string.IsNullOrWhiteSpace(settings.ApiUrl)
+                this.BusinessApiUrl = !string.IsNullOrWhiteSpace(settings.BusinessApiUrl)
-                    ? settings.ApiUrl
+                    ? settings.BusinessApiUrl
-                    : this.ApiUrl;
+                    : this.BusinessApiUrl;
                 this.SearchText = settings.SearchText ?? string.Empty;
-                this.ProviderOngoingRequestsSortOption = settings.ProviderOngoingRequestsSortOption ?? string.Empty;
                 if (!(settings.Authentication is null))
                 {
                     this.Authentication = new AuthenticationSettings();
@@ -394,13 +321,11 @@ public partial class Settings : ViewModelBase
                      AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
                     if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
                     {
-                        this.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
+                        settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
                     }
                     else
                         this.Authentication.Scopes = settings.Authentication.Scopes;
                 }
-
-                EnsureAuthenticationDefaultsLocked();
             }
             // A disk load (or an embedded-resource fallback) is the
             // baseline, not a user edit. Clear the dirty flag last
@@ -428,7 +353,7 @@ public partial class Settings : ViewModelBase
         }
     }
 
-    private static string? TryReadApiUrl(string json)
+    private static string? TryReadLegacyApiUrl(string json)
     {
         try
         {
@@ -459,9 +384,8 @@ public partial class Settings : ViewModelBase
         };
         this.DarkMode = false;
         this.BlogsApiUrl = "https://blogs.pschneider.fr/api/v1/";
-        this.ApiUrl = "https://api.pschneider.fr/api/v1/";
+        this.BusinessApiUrl = "https://api.pschneider.fr/api/v1/";
         this.SearchText = string.Empty;
-        this.ProviderOngoingRequestsSortOption = string.Empty;
     }
 
     /// <summary>
@@ -481,20 +405,12 @@ public partial class Settings : ViewModelBase
     /// </summary>
     [RelayCommand(CanExecute = nameof(CanSave))]
     public void Save()
-    {
-        SetActionStatus("Enregistrement des parametres...", StatusSeverity.Info);
-
-        if (SettingsFileFullName is null)
     {
         var configDir = Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
             "PostIt");
         Directory.CreateDirectory(configDir);
-            SettingsFileFullName = Path.Combine(configDir, DEFAULT_SETTINGS_FILENAME);
+        var configPath = Path.Combine(configDir, SettingsFileName);
-        }
-
-        var configPath = SettingsFileFullName!;
-        Directory.CreateDirectory(Path.GetDirectoryName(configPath)!);
 
         lock (_mutationGate)
         {
@@ -509,13 +425,10 @@ public partial class Settings : ViewModelBase
                     File.SetUnixFileMode(configPath,
                         UnixFileMode.UserRead | UnixFileMode.UserWrite);
                 IsDirty = false;
-                SetActionStatus("Parametres sauvegardes.", StatusSeverity.Info);
-
                 Console.WriteLine($"💾 Settings saved to {configPath}");
             }
             catch (Exception ex)
             {
-                SetActionStatus($"Echec sauvegarde parametres: {ex.Message}", StatusSeverity.Error);
                 Console.Error.WriteLine($"🩎 Error saving settings to {configPath}: {ex.Message}");
                 throw;
             }

src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs

@@ -30,7 +30,7 @@ namespace PostIt.ViewModels;
 /// until the Yavsc.Org endpoint exists; the contract there will
 /// be <c>POST /api/signature/{devisId}</c> with this same payload.
 /// </summary>
-public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewModel
+public partial class SignaturePageViewModel : ViewModelBase
 {
     /// <summary>
     /// Default capture surface, in DIPs. 3:1 ratio matches a
@@ -42,9 +42,6 @@ public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewMo
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = "Prêt.";
 
-    [ObservableProperty]
-    public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Prêt.");
-
     [ObservableProperty]
     public partial int StrokeCount { get; set; }
 
@@ -110,7 +107,7 @@ public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewMo
 
     private void OnStrokeCompleted(object? sender, SignaturePadData data)
     {
-        this.SetInfoStatus($"Trait terminé. {data.StrokeCount} trait(s).");
+        StatusMessage = $"Trait terminé. {data.StrokeCount} trait(s).";
         RefreshCounts();
     }
 
@@ -128,7 +125,7 @@ public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewMo
     public void Clear()
     {
         _control?.Clear();
-        this.SetInfoStatus("Effacé.");
+        StatusMessage = "Effacé.";
         RefreshCounts();
     }
 
@@ -137,14 +134,14 @@ public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewMo
     {
         if (_control is null)
         {
-            this.SetWarningStatus("Contrôle non attaché.");
+            StatusMessage = "Contrôle non attaché.";
             return;
         }
 
         var data = _control.Snapshot();
         if (data.IsEmpty)
         {
-            this.SetWarningStatus("Rien à capturer.");
+            StatusMessage = "Rien à capturer.";
             return;
         }
 
@@ -152,11 +149,11 @@ public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewMo
         {
             var path = WriteCapture(data);
             LastCapturedPath = path;
-            this.SetInfoStatus($"Capture enregistrée: {path}");
+            StatusMessage = $"Capture enregistrée: {path}";
         }
         catch (Exception ex)
         {
-            this.SetErrorStatus($"Erreur: {ex.Message}");
+            StatusMessage = $"Erreur: {ex.Message}";
         }
         await Task.CompletedTask;
     }

src/PostIt/PostIt/ViewModels/ViewModelBase.cs

@@ -1,8 +1,8 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace PostIt.ViewModels;
 
-public abstract class ViewModelBase : ObservableObject
+public abstract partial class ViewModelBase : ObservableObject
 {
      /// <summary>
     /// Gets if the user can navigate to the next page

src/PostIt/PostIt/Views/ActivitiesPage.axaml

@@ -1,7 +1,6 @@
 <ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:PostIt.ViewModels"
-             xmlns:postitControls="using:PostIt.Controls"
              xmlns:wf="using:Yavsc.Abstract.Workflow"
              x:Class="PostIt.Views.ActivitiesPage"
              x:DataType="vm:ActivitiesPageViewModel"
@@ -22,8 +21,8 @@
         </Grid.Styles>
 
         <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="8">
-            <Button Content="🗘 Rafraîchir" Command="{Binding RefreshCommand}" />
+            <Button Content="Rafraîchir" Command="{Binding RefreshCommand}" />
-            <TextBlock Text="📑 Catalogue des activités" FontWeight="Bold" VerticalAlignment="Center" />
+            <TextBlock Text="Catalogue des activités" FontWeight="Bold" VerticalAlignment="Center" />
         </StackPanel>
 
         <Grid Grid.Row="1" Margin="0,12,0,12" ColumnDefinitions="*,16,*,16,*">
@@ -33,7 +32,7 @@
                          ItemsSource="{Binding Activities}"
                          SelectedItem="{Binding SelectedActivity, Mode=TwoWay}">
                     <ListBox.ItemTemplate>
-                        <DataTemplate x:DataType="wf:ActivityInfo">
+                        <DataTemplate x:DataType="wf:ActivityBrowseItemDto">
                             <StackPanel Spacing="2" Margin="0,0,0,8">
                                 <TextBlock Text="{Binding Name}" FontWeight="Bold" />
                                 <TextBlock Text="{Binding Description}" TextWrapping="Wrap" FontSize="11" Opacity="0.7" />
@@ -54,7 +53,7 @@
                          ItemsSource="{Binding Specializations}"
                          SelectedItem="{Binding SelectedSpecialization, Mode=TwoWay}">
                     <ListBox.ItemTemplate>
-                        <DataTemplate x:DataType="wf:ActivityInfo">
+                        <DataTemplate x:DataType="wf:ActivityBrowseItemDto">
                             <StackPanel Spacing="2" Margin="0,0,0,8">
                                 <TextBlock Text="{Binding Name}" FontWeight="Bold" />
                                 <TextBlock Text="{Binding Description}" TextWrapping="Wrap" FontSize="11" Opacity="0.7" />
@@ -77,24 +76,7 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate x:DataType="vm:ActivityUserDisplayItem">
                             <StackPanel Spacing="2" Margin="0,0,0,8">
-                                <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
+                                <StackPanel Orientation="Horizontal" Spacing="4">
-                                    <Border Width="24"
-                                            Height="24"
-                                            CornerRadius="12"
-                                            ClipToBounds="True"
-                                            Background="#E9ECEF">
-                                        <Grid>
-                                            <TextBlock Text="{Binding AvatarFallbackLabel}"
-                                                       HorizontalAlignment="Center"
-                                                       VerticalAlignment="Center"
-                                                       FontWeight="SemiBold"
-                                                       Foreground="#495057" />
-                                            <Image Source="{Binding AvatarImage}"
-                                                   Width="24"
-                                                   Height="24"
-                                                   Stretch="UniformToFill" />
-                                        </Grid>
-                                    </Border>
                                     <TextBlock Text="{Binding UserName}" FontWeight="Bold" />
                                     <Border IsVisible="{Binding HasPerformerProfile}"
                                             Classes="user-badge"
@@ -132,8 +114,16 @@
         </Grid>
 
         <Grid Grid.Row="2" ColumnDefinitions="*,Auto">
-            <postitControls:StatusBar Grid.Column="0"
+            <TextBox Grid.Column="0"
-                                      DataContext="{Binding ActionStatus}" />
+                     Text="{Binding StatusMessage}"
+                     IsReadOnly="True"
+                     AcceptsReturn="True"
+                     TextWrapping="Wrap"
+                     BorderThickness="0"
+                     BorderBrush="Transparent"
+                     Padding="0"
+                     Background="Transparent"
+                     VerticalAlignment="Center" />
             <ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
         </Grid>
     </Grid>

src/PostIt/PostIt/Views/Activity/BillingQueriesPage.axaml

@@ -1,90 +0,0 @@
-<ContentPage xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
-             xmlns:postitControls="using:PostIt.Controls"
-             x:Class="PostIt.Views.BillingQueriesPage"
-             x:DataType="vm:BillingQueriesPageViewModel"
-             Header="Commandes billing">
-    <Grid RowDefinitions="Auto,Auto,Auto,*,Auto" Margin="12">
-        <StackPanel Grid.Row="0" Spacing="3">
-            <TextBlock Text="{Binding Title}" FontSize="20" FontWeight="Bold" />
-            <TextBlock Text="{Binding ContextLabel}" Opacity="0.75" />
-        </StackPanel>
-
-        <Grid Grid.Row="1" Margin="0,10,0,0" ColumnDefinitions="Auto,8,Auto,8,*">
-            <Border Grid.Column="0" Background="#EAF3FF" BorderBrush="#2A5EA8" BorderThickness="1" CornerRadius="6" Padding="8,3">
-                <TextBlock Text="{Binding IsReadOnly, StringFormat='Lecture seule : {0}'}" FontSize="11" />
-            </Border>
-            <Border Grid.Column="2" Background="#F2F7F2" BorderBrush="#2F6D2F" BorderThickness="1" CornerRadius="6" Padding="8,3">
-                <TextBlock Text="{Binding OngoingOnly, StringFormat='En cours uniquement : {0}'}" FontSize="11" />
-            </Border>
-            <TextBlock Grid.Column="4"
-                       HorizontalAlignment="Right"
-                       VerticalAlignment="Center"
-                       Text="{Binding Queries.Count, StringFormat='Résultats : {0}'}"
-                       Opacity="0.7" />
-        </Grid>
-
-        <Grid Grid.Row="2" ColumnDefinitions="Auto,8,Auto,*" Margin="0,12,0,12">
-            <Button Grid.Column="0" Content="Rafraîchir" Command="{Binding RefreshCommand}" />
-            <Button Content="Voir le detail"
-                    Grid.Column="2"
-                    Command="{Binding OpenSelectedQueryCommand}"
-                    IsVisible="{Binding CanOpenDetails}" />
-        </Grid>
-
-        <ListBox Grid.Row="3"
-                 ItemsSource="{Binding Queries}"
-                 SelectedItem="{Binding SelectedQuery, Mode=TwoWay}">
-            <ListBox.ItemTemplate>
-                <DataTemplate x:DataType="vm:BillingQueryDisplayItem">
-                    <Border BorderThickness="1"
-                            BorderBrush="#22000000"
-                            CornerRadius="8"
-                            Padding="10"
-                            Margin="0,0,0,8">
-                        <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,Auto">
-                            <TextBlock Grid.Row="0"
-                                       Grid.Column="0"
-                                       Text="{Binding Description}"
-                                       FontWeight="Bold"
-                                       TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="0"
-                                       Grid.Column="1"
-                                       Text="{Binding StatusLabel}"
-                                       FontSize="11"
-                                       Opacity="0.75"
-                                       HorizontalAlignment="Right" />
-
-                            <TextBlock Grid.Row="1"
-                                       Grid.ColumnSpan="2"
-                                       Margin="0,4,0,0"
-                                       Text="{Binding Summary}"
-                                       TextWrapping="Wrap"
-                                       FontSize="12"
-                                       Opacity="0.85" />
-
-                            <Grid Grid.Row="2" Grid.ColumnSpan="2" ColumnDefinitions="*,Auto" Margin="0,8,0,0">
-                                <TextBlock Grid.Column="0"
-                                           Text="{Binding EventDateLabel, StringFormat='Date : {0}'}"
-                                           FontSize="11"
-                                           Opacity="0.7" />
-                                <TextBlock Grid.Column="1"
-                                           Text="{Binding BillingCode, StringFormat='Code : {0}'}"
-                                           FontSize="11"
-                                           Opacity="0.65"
-                                           HorizontalAlignment="Right" />
-                            </Grid>
-                        </Grid>
-                    </Border>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-
-        <Grid Grid.Row="4" ColumnDefinitions="*,Auto" Margin="0,12,0,0">
-            <postitControls:StatusBar Grid.Column="0"
-                                      DataContext="{Binding ActionStatus}" />
-            <ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
-        </Grid>
-    </Grid>
-</ContentPage>

src/PostIt/PostIt/Views/Activity/BillingQueryDetailsPage.axaml

@@ -1,131 +0,0 @@
-<ContentPage xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
-             xmlns:postitControls="using:PostIt.Controls"
-             x:Class="PostIt.Views.BillingQueryDetailsPage"
-             x:DataType="vm:BillingQueryDetailsPageViewModel"
-             Header="Detail commande">
-    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
-        <StackPanel Grid.Row="0" Spacing="4">
-            <TextBlock Text="{Binding Title}"
-                       FontSize="20"
-                       FontWeight="Bold"
-                       Foreground="{Binding TitleForeground}" />
-            <TextBlock Text="{Binding ContextLabel}" Opacity="0.75" />
-        </StackPanel>
-
-        <Grid Grid.Row="1" Margin="0,10,0,0" ColumnDefinitions="Auto,8,Auto,*">
-            <Button Grid.Column="0"
-                    Content="Retour"
-                    Command="{Binding BackCommand}" />
-            <Button Grid.Column="2"
-                    Content="Ouvrir en edition"
-                    Command="{Binding OpenEditorCommand}"
-                    IsVisible="{Binding CanEdit}" />
-        </Grid>
-
-        <ScrollViewer Grid.Row="2" Margin="0,12,0,12">
-            <StackPanel Spacing="10">
-                <Border BorderThickness="1"
-                        BorderBrush="#22000000"
-                        CornerRadius="8"
-                        Padding="10">
-                    <Grid ColumnDefinitions="Auto,12,*" RowDefinitions="Auto,Auto" RowSpacing="8">
-                        <TextBlock Grid.Row="0" Grid.Column="0" Text="Statut" FontWeight="SemiBold" />
-                        <Border Grid.Row="0"
-                                Grid.Column="2"
-                                Background="{Binding StatusBadgeBackground}"
-                                BorderBrush="{Binding StatusBadgeBorder}"
-                                BorderThickness="1"
-                                CornerRadius="6"
-                                Padding="8,3"
-                                HorizontalAlignment="Left">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <TextBlock Text="{Binding StatusGlyph}"
-                                           Foreground="{Binding StatusBadgeForeground}"
-                                           FontWeight="Bold" />
-                                <TextBlock Text="{Binding StatusLabel}"
-                                           Foreground="{Binding StatusBadgeForeground}"
-                                           FontWeight="SemiBold" />
-                            </StackPanel>
-                        </Border>
-
-                        <TextBlock Grid.Row="1" Grid.Column="0" Text="Date" FontWeight="SemiBold" />
-                        <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding EventDateLabel}" />
-                    </Grid>
-                </Border>
-
-                <Border BorderThickness="1"
-                        BorderBrush="#22000000"
-                        CornerRadius="8"
-                        Padding="10">
-                    <Grid ColumnDefinitions="Auto,12,*" RowDefinitions="Auto,Auto,Auto,Auto" RowSpacing="8">
-                        <TextBlock Grid.Row="0" Grid.Column="0" Text="Description" FontWeight="SemiBold" />
-                        <TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding Description}" TextWrapping="Wrap" />
-
-                        <TextBlock Grid.Row="1" Grid.Column="0" Text="Motif" FontWeight="SemiBold" />
-                        <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding Reason}" TextWrapping="Wrap" />
-
-                        <TextBlock Grid.Row="2" Grid.Column="0" Text="Infos" FontWeight="SemiBold" />
-                        <TextBlock Grid.Row="2" Grid.Column="2" Text="{Binding AdditionalInfo}" TextWrapping="Wrap" />
-
-                        <TextBlock Grid.Row="3" Grid.Column="0" Text="Consentement" FontWeight="SemiBold" />
-                        <TextBlock Grid.Row="3" Grid.Column="2" Text="{Binding ConsentLabel}" />
-                    </Grid>
-                </Border>
-
-                <Expander Header="Metadonnees techniques"
-                          IsExpanded="False">
-                    <Border BorderThickness="1"
-                            BorderBrush="#22000000"
-                            CornerRadius="8"
-                            Padding="10"
-                            Margin="0,6,0,0">
-                        <Grid ColumnDefinitions="Auto,12,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto" RowSpacing="8">
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Code" FontWeight="SemiBold" />
-                            <TextBlock Grid.Row="0"
-                                       Grid.Column="2"
-                                       Text="{Binding BillingCode}"
-                                       FontFamily="Consolas, Courier New, monospace" />
-
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Client" FontWeight="SemiBold" />
-                            <TextBlock Grid.Row="1"
-                                       Grid.Column="2"
-                                       Text="{Binding ClientId}"
-                                       FontFamily="Consolas, Courier New, monospace" />
-
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Provision" FontWeight="SemiBold" />
-                            <TextBlock Grid.Row="2"
-                                       Grid.Column="2"
-                                       Text="{Binding ProvisionalLabel}"
-                                       FontFamily="Consolas, Courier New, monospace" />
-
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Lieu" FontWeight="SemiBold" />
-                            <TextBlock Grid.Row="3"
-                                       Grid.Column="2"
-                                       Text="{Binding LocationLabel}"
-                                       TextWrapping="Wrap"
-                                       FontFamily="Consolas, Courier New, monospace" />
-
-                            <TextBlock Grid.Row="4" Grid.Column="0" Text="Prestations" FontWeight="SemiBold" />
-                            <TextBlock Grid.Row="4"
-                                       Grid.Column="2"
-                                       Text="{Binding PrestationsLabel}"
-                                       TextWrapping="Wrap"
-                                       FontFamily="Consolas, Courier New, monospace" />
-                        </Grid>
-                    </Border>
-                </Expander>
-            </StackPanel>
-        </ScrollViewer>
-
-        <Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="0,8,0,0">
-            <postitControls:StatusBar Grid.Column="0"
-                                      DataContext="{Binding ActionStatus}" />
-            <ProgressBar Grid.Column="1"
-                         Width="120"
-                         IsIndeterminate="True"
-                         IsVisible="{Binding IsBusy}" />
-        </Grid>
-    </Grid>
-</ContentPage>

src/PostIt/PostIt/Views/Activity/BillingQueryDetailsPage.axaml.cs

@@ -1,17 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace PostIt.Views;
-
-public partial class BillingQueryDetailsPage : ContentPage
-{
-    public BillingQueryDetailsPage()
-    {
-        InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-}

src/PostIt/PostIt/Views/Activity/EstimateEditionPage.axaml

@@ -1,151 +0,0 @@
-<ContentPage xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
-             xmlns:postitControls="using:PostIt.Controls"
-             x:Class="PostIt.Views.EstimateEditionPage"
-             x:DataType="vm:EstimateEditionPageViewModel"
-             Header="Edition de devis">
-    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
-        <StackPanel Grid.Row="0" Spacing="3">
-            <TextBlock Text="{Binding Title}"
-                       FontSize="20"
-                       FontWeight="Bold" />
-            <TextBlock Text="{Binding ContextLabel}" Opacity="0.75" />
-        </StackPanel>
-
-        <Grid Grid.Row="1" ColumnDefinitions="Auto,8,*" Margin="0,10,0,8">
-            <Button Grid.Column="0"
-                    Content="Retour"
-                    Command="{Binding BackCommand}" />
-        </Grid>
-
-        <ScrollViewer Grid.Row="2">
-            <StackPanel Spacing="10">
-                <Border BorderThickness="1"
-                        BorderBrush="#22000000"
-                        CornerRadius="8"
-                        Padding="10">
-                    <Grid ColumnDefinitions="Auto,12,*" RowDefinitions="Auto,Auto,Auto" RowSpacing="8">
-                        <TextBlock Grid.Row="0"
-                                   Grid.Column="0"
-                                   Text="Demande"
-                                   FontWeight="SemiBold"
-                                   VerticalAlignment="Center" />
-                        <TextBlock Grid.Row="0"
-                                   Grid.Column="2"
-                                   Text="{Binding QueryDescription}"
-                                   TextWrapping="Wrap"
-                                   Opacity="0.75" />
-
-                        <TextBlock Grid.Row="1"
-                                   Grid.Column="0"
-                                   Text="Titre"
-                                   FontWeight="SemiBold"
-                                   VerticalAlignment="Center" />
-                        <TextBox Grid.Row="1"
-                                 Grid.Column="2"
-                                 Text="{Binding EstimateTitle}"
-                                 PlaceholderText="Titre du devis" />
-
-                        <TextBlock Grid.Row="2"
-                                   Grid.Column="0"
-                                   Text="Description"
-                                   FontWeight="SemiBold"
-                                   VerticalAlignment="Top" />
-                        <TextBox Grid.Row="2"
-                                 Grid.Column="2"
-                                 Text="{Binding EstimateDescription}"
-                                 PlaceholderText="Description détaillée du devis"
-                                 AcceptsReturn="True"
-                                 TextWrapping="Wrap"
-                                 MinHeight="70" />
-                    </Grid>
-                </Border>
-
-                <Border BorderThickness="1"
-                        BorderBrush="#22000000"
-                        CornerRadius="8"
-                        Padding="10">
-                    <StackPanel Spacing="8">
-                        <Grid ColumnDefinitions="*,Auto,8,Auto">
-                            <TextBlock Grid.Column="0"
-                                       Text="Lignes du devis"
-                                       FontWeight="SemiBold"
-                                       VerticalAlignment="Center" />
-                            <Button Grid.Column="1"
-                                    Content="Ajouter une ligne"
-                                    Command="{Binding AddLineCommand}" />
-                            <Button Grid.Column="3"
-                                    Content="Retirer la ligne"
-                                    Command="{Binding RemoveLineCommand}" />
-                        </Grid>
-
-                        <ListBox ItemsSource="{Binding Lines}"
-                                 SelectedItem="{Binding SelectedLine, Mode=TwoWay}">
-                            <ListBox.ItemTemplate>
-                                <DataTemplate x:DataType="vm:EstimateLineItemViewModel">
-                                    <Border BorderThickness="1"
-                                            BorderBrush="#22000000"
-                                            CornerRadius="6"
-                                            Padding="8"
-                                            Margin="0,0,0,8">
-                                        <Grid ColumnDefinitions="*,8,110,8,130,8,90"
-                                              RowDefinitions="Auto,Auto"
-                                              RowSpacing="6">
-                                            <TextBox Grid.Row="0"
-                                                     Grid.Column="0"
-                                                     Text="{Binding Name}"
-                                                     PlaceholderText="Nom de la ligne" />
-                                            <NumericUpDown Grid.Row="0"
-                                                           Grid.Column="2"
-                                                           Value="{Binding Count}"
-                                                           Minimum="1"
-                                                           Increment="1"
-                                                           FormatString="0" />
-                                            <NumericUpDown Grid.Row="0"
-                                                           Grid.Column="4"
-                                                           Value="{Binding UnitaryCost}"
-                                                           Increment="0.5"
-                                                           FormatString="0.00" />
-                                            <TextBlock Grid.Row="0"
-                                                       Grid.Column="6"
-                                                       Text="{Binding LineTotalLabel}"
-                                                       VerticalAlignment="Center"
-                                                       HorizontalAlignment="Right"
-                                                       FontWeight="SemiBold" />
-                                            <TextBox Grid.Row="1"
-                                                     Grid.Column="0"
-                                                     Grid.ColumnSpan="7"
-                                                     Text="{Binding Description}"
-                                                     PlaceholderText="Description de la ligne" />
-                                        </Grid>
-                                    </Border>
-                                </DataTemplate>
-                            </ListBox.ItemTemplate>
-                        </ListBox>
-
-                        <Grid ColumnDefinitions="*,Auto">
-                            <TextBlock Grid.Column="1"
-                                       Text="{Binding TotalLabel, StringFormat='Total : {0}'}"
-                                       FontSize="16"
-                                       FontWeight="Bold"
-                                       HorizontalAlignment="Right" />
-                        </Grid>
-                    </StackPanel>
-                </Border>
-            </StackPanel>
-        </ScrollViewer>
-
-        <Grid Grid.Row="3" ColumnDefinitions="Auto,8,*,Auto" Margin="0,12,0,0">
-            <Button Grid.Column="0"
-                    Content="{Binding SendLabel}"
-                    Command="{Binding SendCommand}" />
-            <postitControls:StatusBar Grid.Column="2"
-                                      DataContext="{Binding ActionStatus}" />
-            <ProgressBar Grid.Column="3"
-                         Width="120"
-                         IsIndeterminate="True"
-                         IsVisible="{Binding IsBusy}" />
-        </Grid>
-    </Grid>
-</ContentPage>

src/PostIt/PostIt/Views/Activity/ProviderOngoingRequestsPage.axaml

@@ -1,102 +0,0 @@
-<ContentPage xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:PostIt.ViewModels"
-             xmlns:dto="using:Yavsc.Api.Client"
-             xmlns:postitControls="using:PostIt.Controls"
-             x:Class="PostIt.Views.ProviderOngoingRequestsPage"
-             x:DataType="vm:ProviderOngoingRequestsPageViewModel"
-             Header="Mes demandes en cours">
-    <Grid RowDefinitions="Auto,Auto,Auto,*,Auto" Margin="12">
-        <StackPanel Grid.Row="0" Spacing="3">
-            <TextBlock Text="{Binding Title}" FontSize="20" FontWeight="Bold" />
-            <TextBlock Text="Point de vue fournisseur" Opacity="0.75" />
-        </StackPanel>
-
-        <Grid Grid.Row="1" ColumnDefinitions="Auto,8,Auto,8,*,8,Auto" Margin="0,10,0,8">
-            <Button Grid.Column="0" Content="Rafraîchir" Command="{Binding RefreshCommand}" />
-            <ComboBox Grid.Column="2"
-                      Width="220"
-                      ItemsSource="{Binding SortOptions}"
-                      SelectedItem="{Binding SelectedSortOption, Mode=TwoWay}" />
-            <TextBox Grid.Column="4"
-                     PlaceholderText="Filtrer: activité, code, client, statut..."
-                     Text="{Binding FilterText, Mode=TwoWay}" />
-            <TextBlock Grid.Column="6"
-                       HorizontalAlignment="Right"
-                       VerticalAlignment="Center"
-                       Text="{Binding Queries.Count, StringFormat='Résultats : {0}'}"
-                       Opacity="0.7" />
-        </Grid>
-
-        <TextBlock Grid.Row="2"
-                   Text="Astuce: sélectionnez une ligne puis ouvrez le détail ou l'édition directe."
-                   Opacity="0.65"
-                   FontSize="11"
-                   Margin="0,0,0,8" />
-
-        <Grid Grid.Row="3" RowDefinitions="*,Auto">
-            <ListBox Grid.Row="0"
-                     ItemsSource="{Binding Queries}"
-                     SelectedItem="{Binding SelectedQuery, Mode=TwoWay}">
-                <ListBox.ItemTemplate>
-                    <DataTemplate x:DataType="dto:BillingQuerySummaryDto">
-                        <Border BorderThickness="1"
-                                BorderBrush="#22000000"
-                                CornerRadius="8"
-                                Padding="10"
-                                Margin="0,0,0,8">
-                            <Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,Auto">
-                                <TextBlock Grid.Row="0"
-                                           Grid.Column="0"
-                                           Text="{Binding Description}"
-                                           FontWeight="Bold"
-                                           TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="0"
-                                           Grid.Column="1"
-                                           Text="{Binding Status}"
-                                           FontSize="11"
-                                           Opacity="0.75"
-                                           HorizontalAlignment="Right" />
-
-                                <TextBlock Grid.Row="1"
-                                           Grid.Column="0"
-                                           Margin="0,6,0,0"
-                                           Text="{Binding ActivityCode, StringFormat='Activité : {0}'}"
-                                           FontSize="11"
-                                           Opacity="0.75" />
-                                <TextBlock Grid.Row="1"
-                                           Grid.Column="1"
-                                           Margin="0,6,0,0"
-                                           Text="{Binding BillingCode, StringFormat='Code : {0}'}"
-                                           FontSize="11"
-                                           Opacity="0.65"
-                                           HorizontalAlignment="Right" />
-                            </Grid>
-                        </Border>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-
-                <StackPanel Grid.Row="1"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Right"
-                    Margin="0,8,0,0"
-                    Spacing="8">
-                <Button Content="Ouvrir le détail"
-                    Command="{Binding OpenSelectedQueryCommand}" />
-                <Button Content="Ouvrir en édition"
-                    Command="{Binding OpenSelectedEditorCommand}"
-                    />
-                <Button Content="Créer un devis"
-                    Command="{Binding CreateEstimateForSelectedCommand}"
-                    />
-                </StackPanel>
-        </Grid>
-
-            <Grid Grid.Row="4" ColumnDefinitions="*,Auto" Margin="0,12,0,0">
-            <postitControls:StatusBar Grid.Column="0"
-                                      DataContext="{Binding ActionStatus}" />
-            <ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
-        </Grid>
-    </Grid>
-</ContentPage>

src/PostIt/PostIt/Views/Activity/ProviderOngoingRequestsPage.axaml.cs

@@ -1,17 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace PostIt.Views;
-
-public partial class ProviderOngoingRequestsPage : ContentPage
-{
-    public ProviderOngoingRequestsPage()
-    {
-        InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-}

src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml

@@ -3,7 +3,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="PostIt.Views.AddCircleMemberDialog"
         xmlns:vm="using:PostIt.ViewModels"
-    xmlns:postitControls="using:PostIt.Controls"
         xmlns:services="using:PostIt.Services"
         x:DataType="vm:AddCircleMemberDialogViewModel"
       >
@@ -48,8 +47,8 @@
 
         <!-- Action buttons -->
         <Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" Margin="0,8,0,0">
-            <postitControls:StatusBar Grid.Column="0"
+            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                                      DataContext="{Binding ActionStatus}" />
+                       VerticalAlignment="Center"/>
             <Button Grid.Column="1" Content="Ajouter"
                     x:Name="AddButton"
                     Command="{Binding AddAsync}"

src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs

@@ -1,8 +1,10 @@
 
 using Avalonia.Markup.Xaml;
+using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using PostIt.Services;
 using PostIt.ViewModels;
+using System.Threading.Tasks;
 
 namespace PostIt.Views;
 
@@ -39,4 +41,10 @@ public partial class AddCircleMemberDialog : Avalonia.Controls.ContentPage
     /// </summary>
     public AddCircleMemberDialogViewModel? ViewModel
         => DataContext as AddCircleMemberDialogViewModel;
+
+    private async Task OnCloseClicked(object? sender, RoutedEventArgs e)
+    {
+        App app = App.Current! as App;
+        await app!.GoBackAsync();
+    }
 }

src/PostIt/PostIt/Views/BillingCommandPage.axaml

@@ -0,0 +1,131 @@
+<ContentPage xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="using:PostIt.ViewModels"
+             x:Class="PostIt.Views.BillingCommandPage"
+             x:DataType="vm:BillingCommandPageViewModel"
+             Header="Commande billing">
+    <ScrollViewer>
+        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*" Margin="12">
+            <TextBlock Grid.Row="0" Grid.ColumnSpan="2"
+                       Text="{Binding Title}"
+                       FontSize="18"
+                       FontWeight="Bold" />
+
+            <TextBlock Grid.Row="1" Grid.ColumnSpan="2"
+                       Margin="0,4,0,12"
+                       Text="{Binding SupportMessage}"
+                       TextWrapping="Wrap"
+                       Opacity="0.8" />
+
+            <TextBlock Grid.Row="2" Text="Utilisateur" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding PerformerLabel}" IsReadOnly="True" Margin="0,0,0,8" />
+
+            <TextBlock Grid.Row="3" Text="Activité" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ActivityLabel}" IsReadOnly="True" Margin="0,0,0,8" />
+
+            <TextBlock Grid.Row="4" Text="Date" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding EventDateText, Mode=TwoWay}" Margin="0,0,0,8" />
+
+            <TextBlock Grid.Row="5"
+                       Text="Motif"
+                       VerticalAlignment="Center"
+                       Margin="0,0,12,8"
+                       IsVisible="{Binding ShowsReason}" />
+            <TextBox Grid.Row="5"
+                     Grid.Column="1"
+                     Text="{Binding Reason, Mode=TwoWay}"
+                     Margin="0,0,0,8"
+                     IsVisible="{Binding ShowsReason}" />
+
+            <TextBlock Grid.Row="6" Text="Adresse" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding Address, Mode=TwoWay}" Margin="0,0,0,8" />
+
+            <TextBlock Grid.Row="7" Text="Latitude" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="7" Grid.Column="1" Text="{Binding LatitudeText, Mode=TwoWay}" Margin="0,0,0,8" />
+
+            <TextBlock Grid.Row="8" Text="Longitude" VerticalAlignment="Center" Margin="0,0,12,8" />
+            <TextBox Grid.Row="8" Grid.Column="1" Text="{Binding LongitudeText, Mode=TwoWay}" Margin="0,0,0,8" />
+
+            <TextBlock Grid.Row="9"
+                       Text="Prestation"
+                       VerticalAlignment="Center"
+                       Margin="0,0,12,8"
+                       IsVisible="{Binding ShowsSinglePrestation}" />
+            <ComboBox Grid.Row="9"
+                      Grid.Column="1"
+                      ItemsSource="{Binding AvailablePrestations}"
+                      SelectedItem="{Binding SelectedPrestation, Mode=TwoWay}"
+                      Margin="0,0,0,8"
+                      IsVisible="{Binding ShowsSinglePrestation}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Spacing="2">
+                            <TextBlock Text="{Binding Title}" FontWeight="Bold" />
+                            <TextBlock Text="{Binding Details}" FontSize="11" Opacity="0.7" TextWrapping="Wrap" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+
+            <TextBlock Grid.Row="10"
+                       Text="Prestations"
+                       VerticalAlignment="Top"
+                       Margin="0,0,12,8"
+                       IsVisible="{Binding ShowsMultiplePrestations}" />
+            <ListBox Grid.Row="10"
+                     Grid.Column="1"
+                     ItemsSource="{Binding MultiPrestations}"
+                     IsVisible="{Binding ShowsMultiplePrestations}"
+                     MaxHeight="180"
+                     Margin="0,0,0,8">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" Margin="0,0,0,8">
+                            <StackPanel Spacing="2">
+                                <TextBlock Text="{Binding Title}" FontWeight="Bold" />
+                                <TextBlock Text="{Binding Details}" FontSize="11" Opacity="0.7" TextWrapping="Wrap" />
+                            </StackPanel>
+                        </CheckBox>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+            <TextBlock Grid.Row="11"
+                       Text="Informations"
+                       VerticalAlignment="Center"
+                       Margin="0,0,12,8"
+                       IsVisible="{Binding ShowsAdditionalInfo}" />
+            <TextBox Grid.Row="11"
+                     Grid.Column="1"
+                     Text="{Binding AdditionalInfo, Mode=TwoWay}"
+                     Margin="0,0,0,8"
+                     IsVisible="{Binding ShowsAdditionalInfo}" />
+
+            <CheckBox Grid.Row="12" Grid.ColumnSpan="2"
+                      Content="Je consens à la création de cette commande"
+                      IsChecked="{Binding Consent, Mode=TwoWay}"
+                      Margin="0,4,0,12" />
+
+            <Grid Grid.Row="13" Grid.ColumnSpan="2" ColumnDefinitions="Auto,12,*,Auto">
+                <Button Grid.Column="0"
+                    Content="{Binding SubmitLabel}"
+                        Command="{Binding SubmitCommand}"
+                        IsEnabled="{Binding IsSupported}" />
+                <TextBox Grid.Column="2"
+                         Text="{Binding StatusMessage}"
+                         IsReadOnly="True"
+                         AcceptsReturn="True"
+                         TextWrapping="Wrap"
+                         BorderThickness="0"
+                         BorderBrush="Transparent"
+                         Padding="0"
+                         Background="Transparent"
+                         VerticalAlignment="Center" />
+                <ProgressBar Grid.Column="3"
+                             Width="120"
+                             IsIndeterminate="True"
+                             IsVisible="{Binding IsBusy}" />
+            </Grid>
+        </Grid>
+    </ScrollViewer>
+</ContentPage>

src/PostIt/PostIt/Views/BillingCommandPage.axaml.cs

@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
 
 namespace PostIt.Views;
 
-public partial class EstimateEditionPage : ContentPage
+public partial class BillingCommandPage : ContentPage
 {
-    public EstimateEditionPage()
+    public BillingCommandPage()
     {
         InitializeComponent();
     }

src/PostIt/PostIt/Views/BillingQueriesPage.axaml

@@ -0,0 +1,52 @@
+<ContentPage xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="using:PostIt.ViewModels"
+             x:Class="PostIt.Views.BillingQueriesPage"
+             x:DataType="vm:BillingQueriesPageViewModel"
+             Header="Commandes billing">
+    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
+        <StackPanel Grid.Row="0" Spacing="2">
+            <TextBlock Text="{Binding Title}" FontSize="18" FontWeight="Bold" />
+            <TextBlock Text="{Binding ContextLabel}" Opacity="0.75" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8" Margin="0,12,0,12">
+            <Button Content="Rafraîchir" Command="{Binding RefreshCommand}" />
+            <Button Content="Ouvrir la commande"
+                    Command="{Binding OpenSelectedQueryCommand}"
+                    IsVisible="{Binding CanOpenDetails}" />
+        </StackPanel>
+
+        <ListBox Grid.Row="2" ItemsSource="{Binding Queries}" SelectedItem="{Binding SelectedQuery, Mode=TwoWay}">
+            <ListBox.ItemTemplate>
+                <DataTemplate x:DataType="vm:BillingQueryDisplayItem">
+                    <Border BorderThickness="0,0,0,1" BorderBrush="#22000000" Padding="0,0,0,10" Margin="0,0,0,10">
+                        <StackPanel Spacing="3">
+                            <TextBlock Text="{Binding Description}" FontWeight="Bold" />
+                            <TextBlock Text="{Binding Summary}" TextWrapping="Wrap" FontSize="12" Opacity="0.8" />
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <TextBlock Text="{Binding EventDateLabel}" FontSize="11" Opacity="0.7" />
+                                <TextBlock Text="{Binding StatusLabel}" FontSize="11" Opacity="0.7" />
+                                <TextBlock Text="{Binding BillingCode}" FontSize="11" Opacity="0.6" />
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+        <Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="0,12,0,0">
+            <TextBox Grid.Column="0"
+                     Text="{Binding StatusMessage}"
+                     IsReadOnly="True"
+                     AcceptsReturn="True"
+                     TextWrapping="Wrap"
+                     BorderThickness="0"
+                     BorderBrush="Transparent"
+                     Padding="0"
+                     Background="Transparent"
+                     VerticalAlignment="Center" />
+            <ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
+        </Grid>
+    </Grid>
+</ContentPage>

src/PostIt/PostIt/Views/Blogs/BlogsPage.axaml

@@ -1,151 +0,0 @@
-<ContentPage xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="using:PostIt.ViewModels"
-             xmlns:postitControls="using:PostIt.Controls"
-             xmlns:models="using:Yavsc.Blogspot"
-             xmlns:views="using:PostIt.Views.Blogs"
-             xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
-             mc:Ignorable="d"
-             x:Class="PostIt.Views.Blogs.BlogsPage"
-             x:DataType="vm:BlogsViewModel"
-             HorizontalAlignment="Stretch"
-             VerticalAlignment="Stretch">
-  <Design.DataContext>
-    <vm:BlogsViewModel />
-  </Design.DataContext>
-  <ScrollViewer
-  VerticalScrollBarVisibility="Visible"
-  HorizontalScrollBarVisibility="Disabled"
-  Padding="5"
-  Margin="5"
-      >
-  <StackPanel HorizontalAlignment="Stretch">
-    <StackPanel Orientation="Horizontal" Spacing="10" Margin="5">
-      <TextBlock Text="Blog Posts" FontSize="20" FontWeight="SemiBold" />
-      <TextBox HorizontalAlignment="Right"
-               Text="{Binding SearchText, Mode=TwoWay}" PlaceholderText="Filter by title or author..." />
-    </StackPanel>
-    <CommandBar IsDynamicOverflowEnabled="True"
-           HorizontalAlignment="Right"     >
-      <CommandBar.PrimaryCommands>
-        <CommandBarButton Label="Refresh" Command="{Binding RefreshAsync}">
-          <CommandBarButton.Icon>
-            <PathIcon Data="{StaticResource RefreshIcon}" />
-          </CommandBarButton.Icon>
-        </CommandBarButton>
-        <CommandBarButton x:Name="SaveButton" Label="Save" Command="{Binding SaveAsync}">
-          <CommandBarButton.Icon>
-            <PathIcon Data="{StaticResource SaveIcon}" />
-          </CommandBarButton.Icon>
-        </CommandBarButton>
-        <CommandBarButton Label="Delete" Command="{Binding DeleteAsync}">
-          <CommandBarButton.Icon>
-            <PathIcon Data="{StaticResource DeleteIcon}" />
-          </CommandBarButton.Icon>
-        </CommandBarButton>
-        <CommandBarButton Label="Ajouter fichiers" Click="AddAttachment_Click"
-                          x:Name="AddAttachmentButton">
-          <CommandBarButton.Icon>
-            <PathIcon Data="{StaticResource AddIcon}" />
-          </CommandBarButton.Icon>
-        </CommandBarButton>
-        <CommandBarButton x:Name="ManageAclButton"
-                          Label="ACL"
-                          Command="{Binding ManageAclAsync}">
-          <CommandBarButton.Icon>
-            <PathIcon Data="{StaticResource AclIcon}" />
-          </CommandBarButton.Icon>
-        </CommandBarButton>
-        <CommandBarButton x:Name="OpenCirclesButton"
-                          Label="Mes cercles" Command="{Binding OpenCirclesAsync}">
-          <CommandBarButton.Icon>
-            <PathIcon Data="{StaticResource CircleIcon}" />
-          </CommandBarButton.Icon>
-        </CommandBarButton>
-        <CommandBarToggleButton Label="Publié"
-                                IsChecked="{Binding DraftIsPublished, Mode=TwoWay}">
-          <CommandBarToggleButton.Icon>
-            <PathIcon Data="{StaticResource PublishedIcon}" />
-          </CommandBarToggleButton.Icon>
-        </CommandBarToggleButton>
-        <CommandBarButton x:Name="OpenSignatureDevButton"
-                          Label="[DEV] Signature" Command="{Binding OpenSignatureDevAsync}">
-          <CommandBarButton.Icon>
-            <PathIcon Data="{StaticResource SignIcon}" />
-          </CommandBarButton.Icon>
-        </CommandBarButton>
-      </CommandBar.PrimaryCommands>
-    </CommandBar>
-
-      <Grid Margin="12" RowSpacing="12">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="*" />
-          <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <WrapPanel Grid.Row="0" ItemSpacing="10">
-
-        </WrapPanel>
-        <Border Grid.Row="1" BorderBrush="Gray" BorderThickness="1" Padding="8">
-          <ListBox ItemsSource="{Binding FilteredPosts}"
-                   SelectedItem="{Binding SelectedPost, Mode=TwoWay}">
-            <ListBox.ItemTemplate>
-              <DataTemplate x:DataType="models:BlogPostDto">
-                <StackPanel Spacing="4">
-                  <TextBlock Text="{Binding Title}" FontWeight="SemiBold" />
-                  <TextBlock Text="{Binding DateModified, StringFormat='Updated: {0:yyyy-MM-dd HH:mm}'}" FontSize="10" Foreground="Gray" />
-                  <TextBlock Text="{Binding AuthorId}" FontSize="10" Foreground="DarkSlateGray" />
-                </StackPanel>
-              </DataTemplate>
-            </ListBox.ItemTemplate>
-          </ListBox>
-        </Border>
-
-        <Border Grid.Row="2" BorderBrush="Gray" BorderThickness="1" Padding="8">
-          <Grid RowSpacing="10"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch">
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Grid.Row="0" Text="Post detail" FontWeight="SemiBold" />
-            <TextBox x:Name="DraftTitleTextBox"
-                     Grid.Row="1" Text="{Binding DraftTitle, Mode=TwoWay}" PlaceholderText="Title" />
-            <TextBox Grid.Row="2" PlaceholderText="Write something here !"
-                     Text="{Binding DraftArticle, Mode=TwoWay}"
-                     MinHeight="320"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Stretch" />
-
-            <Border Grid.Row="3" BorderBrush="LightGray" BorderThickness="1" Padding="8">
-              <StackPanel Spacing="4">
-                <TextBlock Text="Pièces jointes" FontWeight="SemiBold" />
-                <ItemsControl ItemsSource="{Binding DraftAttachments}">
-                  <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding FileName}" />
-                    </DataTemplate>
-                  </ItemsControl.ItemTemplate>
-                </ItemsControl>
-              </StackPanel>
-            </Border>
-
-            <postitControls:StatusBar Grid.Row="4"
-                                      DataContext="{Binding ActionStatus}" />
-
-          </Grid>
-        </Border>
-      </Grid>
-  </StackPanel>
-    </ScrollViewer>
-</ContentPage>

src/PostIt/PostIt/Views/Blogs/BlogsPage.axaml.cs

@@ -1,71 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Platform.Storage;
-using Avalonia.Controls.Primitives;
-
-namespace PostIt.Views.Blogs;
-
-public partial class BlogsPage : ContentPage
-{
-    public BlogsPage()
-    {
-        InitializeComponent();
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-        if (DataContext is ViewModels.BlogsViewModel vm)
-        {
-            if (!vm.IsLoaded)
-            {
-                vm.RefreshAsync().Wait();
-            }
-        }
-    }
-
-    private async void AddAttachment_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
-    {
-        var topLevel = TopLevel.GetTopLevel(this);
-        if (topLevel is null || DataContext is not ViewModels.BlogsViewModel vm)
-            return;
-
-        var files = await topLevel.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-        {
-            Title = "Choisir des fichiers à joindre au billet",
-            AllowMultiple = true,
-        });
-
-        if (files.Count == 0)
-            return;
-
-        var uploads = new System.Collections.Generic.List<Yavsc.Api.Client.BlogUploadFile>(files.Count);
-        foreach (var file in files)
-        {
-            await using var stream = await file.OpenReadAsync();
-            using var memory = new MemoryStream();
-            await stream.CopyToAsync(memory);
-            uploads.Add(new Yavsc.Api.Client.BlogUploadFile(file.Name, memory.ToArray(), GetMimeType(file.Name)));
-        }
-
-        vm.DraftAttachments.Clear();
-        foreach (var upload in uploads)
-            vm.DraftAttachments.Add(upload);
-    }
-
-    private static string GetMimeType(string fileName)
-    {
-        var ext = Path.GetExtension(fileName)?.ToLowerInvariant();
-        return ext switch
-        {
-            ".png" => "image/png",
-            ".jpg" or ".jpeg" => "image/jpeg",
-            ".webp" => "image/webp",
-            ".gif" => "image/gif",
-            ".pdf" => "application/pdf",
-            _ => "application/octet-stream"
-        };
-    }
-}

src/PostIt/PostIt/Views/CirclesPage.axaml

@@ -1,7 +1,6 @@
 <ContentPage
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:postitControls="using:PostIt.Controls"
         x:Class="PostIt.Views.CirclesPage"
         xmlns:vm="using:PostIt.ViewModels"
         xmlns:dtos="using:Yavsc.Api.Client.Dtos"
@@ -102,8 +101,8 @@
 
         <!-- Status bar -->
         <Grid Grid.Row="2" ColumnDefinitions="*,Auto" Margin="12,0,12,12">
-            <postitControls:StatusBar Grid.Column="0"
+            <TextBlock Grid.Column="0" Text="{Binding StatusMessage}"
-                                      DataContext="{Binding ActionStatus}" />
+                       VerticalAlignment="Center"/>
             <ProgressBar Grid.Column="1" IsIndeterminate="True"
                          IsVisible="{Binding IsBusy}"
                          Width="120"/>

src/PostIt/PostIt/Views/CommandFormsPage.axaml

@@ -1,7 +1,6 @@
 <ContentPage xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:PostIt.ViewModels"
-             xmlns:postitControls="using:PostIt.Controls"
              xmlns:wf="using:Yavsc.Abstract.Workflow"
              x:Class="PostIt.Views.CommandFormsPage"
              x:DataType="vm:CommandFormsPageViewModel"
@@ -21,7 +20,7 @@
                  ItemsSource="{Binding Forms}"
                  SelectedItem="{Binding SelectedForm, Mode=TwoWay}">
             <ListBox.ItemTemplate>
-                <DataTemplate x:DataType="wf:CommandFormSummary">
+                <DataTemplate x:DataType="wf:CommandFormSummaryDto">
                     <StackPanel Spacing="2" Margin="0,0,0,10">
                         <TextBlock Text="{Binding Title}" FontWeight="Bold" />
                         <TextBlock Text="{Binding ActionName, StringFormat='Route billing : /billing/{0}'}"
@@ -34,16 +33,24 @@
 
         <Grid Grid.Row="3" Margin="0,12,0,0" ColumnDefinitions="Auto,8,Auto,8,Auto,12,*">
             <Button Grid.Column="0"
-                    Content="Ouvrir le formulaire de demande"
+                    Content="Ouvrir le formulaire"
                     Command="{Binding OpenSelectedFormCommand}" />
             <Button Grid.Column="2"
-                Content="Voir les demandes non validées"
+                Content="Voir les commandes"
                 Command="{Binding OpenQueriesCommand}" />
             <Button Grid.Column="4"
-                    Content="Demandes en cours (validées, en lecture seule)"
+                    Content="Demandes en cours (lecture seule)"
                     Command="{Binding OpenOngoingQueriesCommand}" />
-            <postitControls:StatusBar Grid.Column="6"
+            <TextBox Grid.Column="6"
-                                      DataContext="{Binding ActionStatus}" />
+                     Text="{Binding StatusMessage}"
+                     IsReadOnly="True"
+                     AcceptsReturn="True"
+                     TextWrapping="Wrap"
+                     BorderThickness="0"
+                     BorderBrush="Transparent"
+                     Padding="0"
+                     Background="Transparent"
+                     VerticalAlignment="Center" />
         </Grid>
     </Grid>
 </ContentPage>