diff --git a/.forgejo/workflows/buildAndTest.yml b/.forgejo/workflows/buildAndTest.yml index b9e6f17b2..86694c899 100644 --- a/.forgejo/workflows/buildAndTest.yml +++ b/.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,8 @@ 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" + cd /src/_src && dotnet test --verbosity normal && echo "✅ Success !" diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 911fc831d..a72f92bd6 100644 --- a/.forgejo/workflows/release.yml +++ b/.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 diff --git a/.github/workflows/docker-publish-backend.yml b/.github/workflows/docker-publish-backend.yml index d8466bdb8..6c2431aed 100644 --- a/.github/workflows/docker-publish-backend.yml +++ b/.github/workflows/docker-publish-backend.yml @@ -26,7 +26,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Test - run: dotnet test --no-build --verbosity normal --filter="Category!=Platform-Android" + run: dotnet test --no-build --verbosity normal # 4. Build et Push de l'image de production finale - name: Build and push production image uses: docker/build-push-action@v7 diff --git a/.gitignore b/.gitignore index 056cf69d2..b7813f604 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ appsettings-*.*.json generated/ *.tmp -tmp/ DataDir/ *.tests.trx diff --git a/.gitleaksignore b/.gitleaksignore deleted file mode 100644 index 056cf69d2..000000000 --- a/.gitleaksignore +++ /dev/null @@ -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 - diff --git a/.vscode/launch.json b/.vscode/launch.json index d5088f01d..dc8d3c68d 100644 --- a/.vscode/launch.json +++ b/.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", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 71384cd8c..3faedae05 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,13 +7,12 @@ "fileLocation": ["relative", "${workspaceFolder}"], "source": "dotnet", "pattern": { - "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+(error|warning) (.*)$", + "regexp": "^\\s+(.*)\\((\\d+):(\\d+)\\):\\s+(error|warning)\\s+(.*)$", "file": 1, "line": 2, "column": 3, "severity": 4, - "code": 5, - "message": 6 + "message": 5 } } ], @@ -47,10 +46,7 @@ "group": "build", "isBuildCommand": true, "isTestCommand": false, - "isBackground": true, - "options": { - "cwd": "${workspaceFolder}" - } + "isBackground": true }, { "label": "test blogs backend", @@ -66,28 +62,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 +75,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" - } } ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index 111c1491a..7210a2275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,160 +1,21 @@ # Changelog -## [1.0.8-rc14] - unstable +Toutes les modifications notables de PostIt et de la plateforme Yavsc +sont documentées dans ce fichier. -### Added +Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/), +et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -* [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. +À noter : la **parité du numéro de patch** porte une signification de canal : -### Changed +- **patch pair** (ex. `1.0.0`, `1.0.2`) → **stable** +- **patch impair** (ex. `1.0.1`, `1.0.3`) → **preview** +- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable** -* [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. +Cette convention est partagée avec le dépôt +[`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian) +pour la production des paquets `.deb`. -### 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 - -nothing - -### Changed - -* [Yavsc.Api.Test] Mise a jour de `Microsoft.EntityFrameworkCore.Sqlite` vers `10.0.11` afin de supprimer l'alerte NU1903 liee a `SQLitePCLRaw.lib.e_sqlite3` 2.1.11. -* [Yavsc.Org] Nettoyage de la configuration NuGet pour le restore: suppression du fichier local `Directory.Packages.props` au profit du fichier racine centralise. -* [Yavsc.Org] Suppression de references de packages redondantes dans le projet, sans impact fonctionnel attendu. - -### Fixed - -* [Yavsc.Api.Test] Le restore n'emet plus le warning de vulnerabilite `NU1903` sur `SQLitePCLRaw.lib.e_sqlite3`. -* [Yavsc.Org] Suppression d'une vulnerabilite de severite elevee sur AutoMapper apres publication et consommation de la nouvelle version candidate de `HigginsSoft.IdentityServer8`. - -## [1.0.8-rc10] - unstable - -### Added - -* [PostIt] Une page d'historique des commandes billing permet maintenant d'ouvrir une commande existante. -* [PostIt] Une vue "Demandes en cours" en lecture seule est disponible pour le performer, filtrée sur les statuts actifs (Inserted, Accepted, InProgress). -* [Yavsc.Org] Nouvelles entités `Country` et `PerformerCodeInputValidation` pour piloter la validation du code entreprise performer par pays. - -### Changed - -* [PostIt] La page détail billing se préremplit depuis une commande existante (Rdv, Brush, MBrush) et passe en mode mise à jour. -* [Yavsc.Org] Le formulaire `Manage/SetActivity` inclut désormais le pays d'exercice (`fr`, `en`, `pt`) et applique la regex associée au champ `SIREN`. -* [Yavsc.Org] La vérification externe du numéro d'entreprise est conservée uniquement pour le pays `fr`. - -### Fixed - -* [PostIt] Le flux historique n'est plus limité à une simple liste: l'action d'ouverture charge la commande cible puis navigue vers la page détail. -* [Yavsc.Org] Le champ `SIREN` n'est plus validé avec une règle unique indépendante du pays d'exercice. - -## [1.0.8-rc9] - unstable - -### Added - -nothing - -### Changed - -masquage non-owner côté backend de l'ACL du billet - -### Fixed - -On a maintenant le comportement attendu bout en bout: - -ACL chargée depuis le BlogPostDto -noms de cercles affichés dans le dialogue ACL côté PostIt - -## [1.0.8-rc8] - unstable - -### Added - -nothing - -### Changed - -nothing - -### Fixed - -The PostIt publish toggle button - -## [1.0.8-rc7] - unstable - -### Added - -* [PostIt] The search pattern now persists - -### Changed - -* The blog spot path is now `/api/v1/blogspot` (yet in last release) - -### Fixed - -* [Yavsc.Org] (Ticket #45) La forme de l'email de l'utilisateur est maintenant validée avant l'envoi du formulaire d'enregistrement ## [1.0.8-rc6] - unstable diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8aa0567d3..b9969ea50 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,39 +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 - -Toutes les modifications notables de PostIt et de la plateforme Yavsc -sont documentées dans ce fichier. - -Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/), -et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -À noter : la **parité du numéro de patch** porte une signification de canal : - -- **patch pair** (ex. `1.0.0`, `1.0.2`) → **preview** -- **patch impair** (ex. `1.0.1`, `1.0.3`) → **stable** -- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable** - -Cette convention est partagée avec le dépôt -[`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian) -pour la production des paquets `.deb`. - ## Navigation (PostIt) La navigation est centralisée dans diff --git a/Directory.Packages.props b/Directory.Packages.props index f1be93f91..7505c8512 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,31 +1,15 @@ true - 8.1.0-pazofrc007 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -33,24 +17,14 @@ - + - - - - - - - - - - - + \ No newline at end of file diff --git a/Makefile b/Makefile index d99fe5e5e..fa9d4ecf1 100644 --- a/Makefile +++ b/Makefile @@ -48,4 +48,77 @@ 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/ depuis main, met à jour les +# `` 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="; \ + echo " V : version semver (ex. 1.0.7-rc1) — sert à nommer la branche."; \ + exit 1; \ + fi + @CURRENT=$$(git branch --show-current); \ + if [ "$$CURRENT" != "main" ]; then \ + echo "Refus : la cible doit être lancée depuis main."; \ + echo " Branche courante : $$CURRENT"; \ + echo " Fais : git checkout main && git pull --ff-only origin main"; \ + 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 diff --git a/README.md b/README.md index 549348f4a..33dc4c770 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,9 @@ https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=release.yml # Statut actuel des actions GitHub -* [![CodeQL Advanced](https://github.com/pazof/yavsc/actions/workflows/codeql.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/codeql.yml) - -* [![Build and Push Yavsc Production Image](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml) - +-* [![CodeQL Advanced](https://github.com/pazof/yavsc/actions/workflows/codeql.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/codeql.yml) +* [![Build and Push Yavsc Production Image](https://forgejo.[![Build and Push Yavsc Production Image](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml) # Documentation L'architecture, la roadmap et les détails métier sont documentés @@ -28,10 +26,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 diff --git a/ROADMAP.md b/ROADMAP.md index 364b98bda..4c00e629c 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -68,7 +68,7 @@ Trois principes non négociables traversent tous les jalons : > > Chaque jalon a un **critère de sortie** vérifiable. -### Jalon 0 — Fondations techniques +### Jalon 0 — Fondations techniques *(en cours)* > Cible : pouvoir parler du domaine sans se battre avec le runtime. @@ -81,7 +81,7 @@ Trois principes non négociables traversent tous les jalons : --- -### Jalon 1 — Prestation signée de bout en bout *(en cours)* +### Jalon 1 — Prestation signée de bout en bout > Cible : un projet client/fournisseur aboutit à un **devis signé par les deux parties**, traçable, avec notifications. diff --git a/contrib/.env-sample b/contrib/.env-sample deleted file mode 100644 index fb01ede43..000000000 --- a/contrib/.env-sample +++ /dev/null @@ -1,24 +0,0 @@ -# parametres de déploiement au Makefile - -POSTGRES_HOST=localhost -POSTGRES_PORT=5432 -POSTGRES_DB=yavsc -POSTGRES_USER=yavsc -POSTGRES_PASSWORD= - -HTTP_HOST=localhost - -Org_PORT=83 -Blogs_PORT=85 -Api_PORT=87 - -PostIt_CLIENT_ID=postit - -ASPNETCORE_Smtp__Host="mercure.pschneider.fr" -ASPNETCORE_Smtp__Port=465 -ASPNETCORE_Smtp__SenderName="Paul Schneider" -ASPNETCORE_Smtp__SenderEmail="paul@pschneider.fr" -ASPNETCORE_Smtp__UserName="paul" -ASPNETCORE_Smtp__Password="" - -DESTDIR=/srv/www/yavsc diff --git a/contrib/Makefile b/contrib/Makefile index 4e4ef4df6..151045db0 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,4 +1,4 @@ -APP_PROJECT_NAMES=Org Blogs Api +APP_PROJECT_NAMES=Org Blogs SLNDIR=.. include $(SLNDIR)/.env @@ -9,11 +9,9 @@ generated/: generated/yavscOrg.service: generated/yavscBlogs.service: -generated/yavscApi.service: generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env @cat template.service | APP_NAME="$*" \ - DESTDIR="$(DESTDIR)" \ HTTP_HOST="$(HTTP_HOST)" \ HTTP_PORT="$*_$(HTTP_PORT)" \ BASEAPPDIR="$(BASEAPPDIR)" \ @@ -35,12 +33,11 @@ generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env @echo Created service file: $@ -copy-services: copy-service-Org copy-service-Blogs copy-service-Api +copy-services: copy-service-Org copy-service-Blogs copy-service-Org: /etc/systemd/system/yavscOrg.service copy-service-Blogs: /etc/systemd/system/yavscBlogs.service -copy-service-Api: /etc/systemd/system/yavscApi.service -copy-binaries: build_publish_Org build_publish_Blogs build_publish_Api stop-services +copy-binaries: build_publish_Org build_publish_Blogs stop-services @for project in $(APP_PROJECT_NAMES); \ do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \ echo "$${project} -> $${LCAPI}" ; \ @@ -63,8 +60,6 @@ copy-binaries: build_publish_Org build_publish_Blogs build_publish_Api stop-serv build_publish_%: clean_publish_dir_% @ASPNETCORE_ENV=$(CONFIGURATION) dotnet publish $(SLNDIR)/src/Yavsc.$*/Yavsc.$*.csproj -build_publish: build_publish_Org build_publish_Blogs build_publish_Api - clean_publish_dir_%: @rm -rf $(SLNDIR)/src/Yavsc.$*/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish @@ -89,21 +84,12 @@ stop-services: $(SLNDIR)/src/Yavsc.Org/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish $(SLNDIR)/src/Yavsc.Blogs/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish -$(SLNDIR)/src/Yavsc.Api/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish showConfig: @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 +.PHONY: build_publish mep showConfig copy-service-Org copy-service-Blogs reinstall clean diff --git a/doc/README.md b/doc/README.md index fb9bea943..912a2e562 100644 --- a/doc/README.md +++ b/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 diff --git a/doc/agent-intent-matrix.md b/doc/agent-intent-matrix.md deleted file mode 100644 index 975cd7b79..000000000 --- a/doc/agent-intent-matrix.md +++ /dev/null @@ -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. diff --git a/doc/agent-playbook.md b/doc/agent-playbook.md deleted file mode 100644 index ecc14f1d2..000000000 --- a/doc/agent-playbook.md +++ /dev/null @@ -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: -Objectif: -Contraintes: -Verification: -Sortie attendue: -``` - -## 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 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 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 dans . -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. diff --git a/doc/onboarding-agents.md b/doc/onboarding-agents.md deleted file mode 100644 index 14a727a17..000000000 --- a/doc/onboarding-agents.md +++ /dev/null @@ -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. diff --git a/dotnet-tools.json b/dotnet-tools.json index 1762a89de..b0e38abda 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -1,13 +1,5 @@ { "version": 1, "isRoot": true, - "tools": { - "picket": { - "version": "0.2.12", - "commands": [ - "picket" - ], - "rollForward": false - } - } + "tools": {} } \ No newline at end of file diff --git a/src/PostIt/Directory.Packages.props b/src/PostIt/Directory.Packages.props index 2f27340e9..0d5fa50cc 100644 --- a/src/PostIt/Directory.Packages.props +++ b/src/PostIt/Directory.Packages.props @@ -8,6 +8,8 @@ 12.1.1 + + @@ -16,17 +18,19 @@ - - + + + + diff --git a/src/PostIt/PostIt.Android/Application.cs b/src/PostIt/PostIt.Android/Application.cs index 040b01ca3..f5a7908dd 100644 --- a/src/PostIt/PostIt.Android/Application.cs +++ b/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] diff --git a/src/PostIt/PostIt.Android/MainActivity.cs b/src/PostIt/PostIt.Android/MainActivity.cs index 549100804..ad8455ef0 100644 --- a/src/PostIt/PostIt.Android/MainActivity.cs +++ b/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? _pending; diff --git a/src/PostIt/PostIt.Android/PlatformBootstrap.cs b/src/PostIt/PostIt.Android/PlatformBootstrap.cs index 5b90267f0..f208f9ce9 100644 --- a/src/PostIt/PostIt.Android/PlatformBootstrap.cs +++ b/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; } } diff --git a/src/PostIt/PostIt.Android/PostIt.Android.csproj b/src/PostIt/PostIt.Android/PostIt.Android.csproj index 3d8be385c..7f44645d0 100644 --- a/src/PostIt/PostIt.Android/PostIt.Android.csproj +++ b/src/PostIt/PostIt.Android/PostIt.Android.csproj @@ -11,7 +11,7 @@ false 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070 + 1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0 1.1.0-beta.1 diff --git a/src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs b/src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs deleted file mode 100644 index f710cacc7..000000000 --- a/src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs +++ /dev/null @@ -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 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? _pendingRequest; - - public static Task EnsureGrantedAsync(Activity activity, CancellationToken cancellationToken) - { - if (HasLocationPermission(activity)) - { - return Task.FromResult(true); - } - - lock (SyncRoot) - { - if (_pendingRequest is null) - { - _pendingRequest = new TaskCompletionSource(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? 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 WaitAsync(Task task, CancellationToken cancellationToken) - { - using var registration = cancellationToken.Register(() => - { - lock (SyncRoot) - { - _pendingRequest?.TrySetCanceled(cancellationToken); - _pendingRequest = null; - } - }); - - return await task.ConfigureAwait(false); - } - } -} diff --git a/src/PostIt/PostIt.Browser/PostIt.Browser.csproj b/src/PostIt/PostIt.Browser/PostIt.Browser.csproj index 4534a2940..67600a727 100644 --- a/src/PostIt/PostIt.Browser/PostIt.Browser.csproj +++ b/src/PostIt/PostIt.Browser/PostIt.Browser.csproj @@ -6,7 +6,7 @@ enable 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070 + 1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0 1.1.0-beta.1 diff --git a/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj b/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj index 948e726c5..30ba65c41 100644 --- a/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj +++ b/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj @@ -7,7 +7,7 @@ enable 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070 + 1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0 1.1.0-beta.1 diff --git a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs deleted file mode 100644 index 6cac39603..000000000 --- a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs +++ /dev/null @@ -1,173 +0,0 @@ -using System.Net.Http; -using PostIt.ViewModels; -using Yavsc.Abstract.Workflow; -using Yavsc.Api.Client; - -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() - { - var api = new StubActivityApi(); - var client = new ActivityApiClient(api, "https://business.example/api/v1/"); - var billingClient = new BillingApiClient(api, "https://business.example/api/v1/"); - - await client.GetCatalogAsync("brush", TestContext.Current.CancellationToken); - await client.GetUsersAsync("brush-pro", TestContext.Current.CancellationToken); - await billingClient.CreateAsync("Rdv", new { Foo = "Bar" }, TestContext.Current.CancellationToken); - await billingClient.GetQuerySummariesAsync("Rdv", TestContext.Current.CancellationToken); - - Assert.Equal("https://business.example/api/v1/activity/catalog?parentCode=brush", api.Paths[0]); - Assert.Equal("https://business.example/api/v1/activity/brush-pro/users", api.Paths[1]); - Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[2]); - 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() - { - var api = new StubActivityApi(); - var client = new ActivityApiClient(api, "https://business.example/api/v1/"); - var billingClient = new BillingApiClient(api, "https://business.example/api/v1/"); - var vm = new ActivitiesPageViewModel(client, billingClient); - - await vm.RefreshAsync(); - - Assert.Equal("brush", vm.SelectedActivity?.Code); - Assert.Single(vm.Specializations); - 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); - Assert.Equal("Pas d'autre activité", vm.Performers[0].ExtraActivityLabel); - - await vm.ShowSpecializationAsync(vm.Specializations[0]); - - 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); - Assert.Equal("Autres spécialisations: 2", vm.Performers[0].ExtraActivityLabel); - Assert.Contains("brush pro", vm.StatusMessage, StringComparison.OrdinalIgnoreCase); - - await vm.ShowSpecializationAsync(null); - - Assert.Equal("brush", vm.CurrentActivity?.Code); - Assert.Single(vm.Performers); - Assert.Equal("Alice", vm.Performers[0].UserName); - } - - private sealed class StubActivityApi : IYavscApiClient - { - public HttpClient Http { get; } = new(); - public List Paths { get; } = new(); - - public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default) - { - Paths.Add(path); - - if (typeof(T) == typeof(List)) - { - var activities = new List - { - new() - { - Code = "brush", - Name = "Brush", - Description = "Coiffure à domicile", - PerformerCount = 1, - Forms = new List - { - new() { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" } - }, - Children = new List - { - new() - { - Code = "brush-pro", - Name = "Brush Pro", - Description = "Spécialisation premium", - ParentCode = "brush", - PerformerCount = 1, - Forms = new List - { - new() { Id = 2, ActionName = "Rdv", Title = "Rendez-vous premium" } - } - } - } - } - }; - return Task.FromResult((T)(object)activities); - } - - if (typeof(T) == typeof(List)) - { - var performers = path.EndsWith("brush-pro/users", StringComparison.Ordinal) - ? new List - { - new() { PerformerId = "pro-2", HasPerformerProfile = true, Active = false, UserName = "Bob", ActivityCode = "brush-pro", ActivityName = "Brush Pro", ExtraActivityCount = 2 } - } - : new List - { - new() { PerformerId = "pro-1", HasPerformerProfile = true, Active = true, UserName = "Alice", ActivityCode = "brush", ActivityName = "Brush", ExtraActivityCount = 0 } - }; - - return Task.FromResult((T)(object)performers); - } - - 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 CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public ValueTask DisposeAsync() => ValueTask.CompletedTask; - } -} diff --git a/src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs b/src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs index 25630c836..d4980d268 100644 --- a/src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs +++ b/src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs @@ -12,7 +12,6 @@ namespace PostIt.Tests; /// Skip conditions: the package is not installed on the connected device, /// or no device is connected via adb. /// -[Trait("Category", "Platform-Android")] public class AndroidAppLaunchTests { private const string PackageName = "fr.pschneider.postit"; @@ -24,8 +23,8 @@ public class AndroidAppLaunchTests _output = output; } - // TODO https://twosixtech.com/blog/integrating-docker-and-adb/ - [Fact] + // https://twosixtech.com/blog/integrating-docker-and-adb/ + // FIXME ala hosted shared resource adb server - [Fact] public void PostIt_starts_and_draws_a_first_frame_on_the_emulator() { if (!IsPackageInstalledOnAnyDevice()) diff --git a/src/PostIt/PostIt.Tests/BearerScopeTests.cs b/src/PostIt/PostIt.Tests/BearerScopeTests.cs index 984483fc7..c6bf7d56e 100644 --- a/src/PostIt/PostIt.Tests/BearerScopeTests.cs +++ b/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); diff --git a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs deleted file mode 100644 index 34804b4cd..000000000 --- a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs +++ /dev/null @@ -1,363 +0,0 @@ -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; -using Yavsc.Models.Haircut; - -namespace PostIt.Tests; - -public class BillingCommandPageViewModelTests -{ - [Fact] - public async Task SubmitAsync_posts_rdv_payload_to_selected_billing_route() - { - 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 = 48.8566; - vm!.Longitude = 2.3522; - vm!.Consent = true; - - await vm.SubmitCommand.ExecuteAsync(null); - - Assert.Equal("https://business.example/api/v1/billing/Rdv", api.LastPath); - Assert.NotNull(api.LastBody); - - using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody)); - Assert.Equal("dev", json.RootElement.GetProperty("ActivityCode").GetString()); - Assert.Equal("perf-1", json.RootElement.GetProperty("PerformerId").GetString()); - Assert.Equal("Point de cadrage", json.RootElement.GetProperty("Reason").GetString()); - Assert.Equal((int)QueryStatus.Inserted, json.RootElement.GetProperty("Status").GetInt32()); - } - - [Fact] - public async Task SubmitAsync_refuses_unsupported_billing_code() - { - var api = new RecordingApi(); - var client = new BillingApiClient(api, "https://business.example/api/v1/"); - - var vm = - new CommandFormSummary { Id = 13, ActionName = "Book", Title = "Réservation" } - .CreateCommandPageViewModel( - new ActivityInfo { Code = "book", Name = "Book" }, - new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" }, - 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)); - var location = json.RootElement.GetProperty("Location"); - 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] - public async Task InitializeAsync_loads_prestations_for_brush_and_submit_posts_selected_prestation() - { - var api = new RecordingApi - { - HairPrestations = new List - { - new() { Id = 10, Title = "Femme · Cheveux mi-longs", Details = "Coupe · Brushing" }, - new() { Id = 11, Title = "Homme · Cheveux courts", Details = "Coupe · Coiffage" }, - } - }; - var client = new BillingApiClient(api, "https://business.example/api/v1/"); - var vm = - new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" } - .CreateCommandPageViewModel( - new ActivityInfo { Code = "brush", Name = "Brush" }, - new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" }, - client) as BrushViewModel; - vm!.EventDate = DateTime.Parse("2026-09-02 14:30"); - vm!.Address = "1 rue du Test"; - vm!.Latitude = 48.8566; - vm!.Longitude = 2.3522; - vm!.Consent = true; - vm!.AdditionalInfo = "Prévoir shampoing"; - - await vm.InitializeAsync(); - vm.SelectedPrestation = vm.AvailablePrestations[1]; - await vm.SubmitCommand.ExecuteAsync(null); - - Assert.Equal("https://business.example/api/v1/billing/Brush", api.LastPath); - using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody)); - Assert.Equal(11, json.RootElement.GetProperty("PrestationId").GetInt32()); - Assert.Equal("Prévoir shampoing", json.RootElement.GetProperty("AdditionalInfo").GetString()); - } - - [Fact] - public async Task InitializeAsync_loads_prestations_for_mbrush_and_submit_posts_selected_prestations() - { - var api = new RecordingApi - { - HairPrestations = new List - { - new() { Id = 21, Title = "Femme · Cheveux longs", Details = "Coupe · Couleur" }, - new() { Id = 22, Title = "Enfant · Cheveux courts", Details = "Coupe · Sans technique" }, - } - }; - var client = new BillingApiClient(api, "https://business.example/api/v1/"); - var vm = - new CommandFormSummary { Id = 14, ActionName = "MBrush", Title = "Coupe groupée" } - .CreateCommandPageViewModel( - new ActivityInfo { Code = "mbrush", Name = "MBrush" }, - new ActivityUserDisplayItem { PerformerId = "perf-3", UserName = "Cara" }, - client) as MBrushViewModel; - vm!.EventDate = DateTime.Parse("2026-09-03 10:00"); - vm!.Address = "2 rue du Test"; - vm!.Latitude = 48.8567; - vm!.Longitude = 2.3523; - vm!.Consent = true; - - await vm.InitializeAsync(); - vm!.MultiPrestations[0].IsSelected = true; - vm!.MultiPrestations[1].IsSelected = true; - 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)); - var prestations = json.RootElement.GetProperty("Prestations"); - Assert.Equal(2, prestations.GetArrayLength()); - Assert.Equal(21, prestations[0].GetProperty("PrestationId").GetInt32()); - Assert.Equal(22, prestations[1].GetProperty("PrestationId").GetInt32()); - } - - [Fact] - public async Task InitializeAsync_with_existing_brush_query_prefills_and_submit_updates_query() - { - var api = new RecordingApi - { - HairPrestations = new List - { - new() { Id = 30, Title = "Femme · Cheveux longs", Details = "Coupe · Brushing" }, - new() { Id = 31, Title = "Homme · Cheveux courts", Details = "Coupe" }, - } - }; - var client = new BillingApiClient(api, "https://business.example/api/v1/"); - var vm = - new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" } - .CreateCommandPageViewModel( - new ActivityInfo { Code = "brush", Name = "Brush" }, - new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" }, - client) as BrushViewModel; - await vm!.InitializeAsync(new BillingQueryDetailsDto - { - Id = 77, - BillingCode = "Brush", - ActivityCode = "brush", - PerformerId = "perf-2", - ClientId = "cli-1", - EventDate = new DateTime(2026, 9, 2, 14, 30, 0, DateTimeKind.Utc), - Consent = true, - Status = QueryStatus.Accepted, - PrestationId = 30, - AdditionalInfo = "Ancienne note", - Location = new BillingLocationDto - { - Address = "1 rue du Test", - Latitude = 48.8566, - Longitude = 2.3522, - } - }); - - vm!.SelectedPrestation = vm!.AvailablePrestations[1]; - vm!.AdditionalInfo = "Note mise à jour"; - await vm!.SubmitCommand.ExecuteAsync(null); - - Assert.Equal(HttpMethod.Put, api.LastMethod); - Assert.Equal("https://business.example/api/v1/billing/Brush/77", api.LastPath); - Assert.True(vm.IsEditingExisting); - Assert.Equal("Mettre à jour la commande", vm.SubmitLabel); - - using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody)); - Assert.Equal(77, json.RootElement.GetProperty("Id").GetInt32()); - Assert.Equal(31, json.RootElement.GetProperty("PrestationId").GetInt32()); - Assert.Equal("Note mise à jour", json.RootElement.GetProperty("AdditionalInfo").GetString()); - Assert.Equal((int)QueryStatus.Accepted, json.RootElement.GetProperty("Status").GetInt32()); - } - - private sealed class RecordingApi : IYavscApiClient - { - public HttpClient Http { get; } = new(); - public HttpMethod? LastMethod { get; private set; } - public string? LastPath { get; private set; } - public object? LastBody { get; private set; } - public List? HairPrestations { get; init; } - - public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default) - { - LastMethod = method; - LastPath = path; - LastBody = body; - if (typeof(T) == typeof(List)) - { - return Task.FromResult((T)(object)(HairPrestations ?? new List())); - } - 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 CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public ValueTask DisposeAsync() => ValueTask.CompletedTask; - } -} diff --git a/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs deleted file mode 100644 index e53139351..000000000 --- a/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System.Net.Http; -using PostIt.ViewModels; -using Yavsc; -using Yavsc.Abstract.Workflow; -using Yavsc.Api.Client; - -namespace PostIt.Tests; - -public class BillingQueriesPageViewModelTests -{ - [Fact] - public async Task RefreshAsync_filters_queries_by_selected_activity_and_performer() - { - 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 ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" }, - new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" }, - client); - - await vm.InitializeAsync(); - - Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths.Single()); - Assert.Equal(3, vm.Queries.Count); - Assert.Contains(vm.Queries, q => q.Description == "Rendez-vous #1"); - Assert.Contains("3 commande", vm.StatusMessage, StringComparison.OrdinalIgnoreCase); - } - - [Fact] - public async Task RefreshAsync_in_readonly_ongoing_mode_keeps_only_ongoing_statuses_and_disables_open() - { - 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 ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" }, - new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" }, - client, - isReadOnly: true, - ongoingOnly: true); - - await vm.InitializeAsync(); - - 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.True(vm.Queries.Count > 0); - } - - private sealed class StubBillingApi : IYavscApiClient - { - public HttpClient Http { get; } = new(); - public List Paths { get; } = new(); - - public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default) - { - Paths.Add(path); - - if (typeof(T) == typeof(List)) - { - var data = new List - { - new() - { - Id = 11, - ActivityCode = "dev", - PerformerId = "perf-1", - ClientId = "cli-1", - Status = QueryStatus.Inserted, - Description = "Rendez-vous #1", - Reason = "Point de cadrage", - EventDate = new DateTime(2026, 9, 1, 10, 0, 0, DateTimeKind.Utc), - }, - new() - { - Id = 12, - ActivityCode = "other", - PerformerId = "perf-1", - ClientId = "cli-1", - Status = QueryStatus.Accepted, - Description = "Autre activité", - EventDate = new DateTime(2026, 9, 2, 10, 0, 0, DateTimeKind.Utc), - }, - new() - { - Id = 13, - ActivityCode = "dev", - PerformerId = "perf-2", - ClientId = "cli-1", - Status = QueryStatus.Accepted, - Description = "Autre performer", - EventDate = new DateTime(2026, 9, 3, 10, 0, 0, DateTimeKind.Utc), - }, - new() - { - Id = 14, - ActivityCode = "dev", - PerformerId = "perf-1", - ClientId = "cli-1", - Status = QueryStatus.InProgress, - Description = "En cours", - EventDate = new DateTime(2026, 9, 4, 10, 0, 0, DateTimeKind.Utc), - }, - new() - { - Id = 15, - ActivityCode = "dev", - PerformerId = "perf-1", - ClientId = "cli-1", - Status = QueryStatus.Rejected, - Description = "Rejetée", - EventDate = new DateTime(2026, 9, 5, 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 CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public ValueTask DisposeAsync() => ValueTask.CompletedTask; - } -} diff --git a/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs b/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs index daabdf59b..895f220ec 100644 --- a/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs +++ b/src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs @@ -166,51 +166,4 @@ public class BlogPostAuthorDtoTests Assert.True(root.TryGetProperty("userName", out _)); Assert.True(root.TryGetProperty("avatar", out _)); } - - [Fact] - public void BlogPostDto_deserialises_acl_from_detail_payload() - { - // Detail payload shape emitted by BlogApiController.GetBlog: - // ACL entries are included under "acl"/"ACL". - var json = """ - { - "id": 99, - "title": "ACL test", - "authorId": "u-alice", - "acl": [ - { "circleId": 12, "blogPostId": 99 }, - { "circleId": 34, "blogPostId": 99 } - ] - } - """; - - var post = JsonSerializer.Deserialize(json, CaseInsensitiveJson); - - Assert.NotNull(post); - var acl = post!.GetACL(); - Assert.Equal(2, acl.Length); - Assert.Contains(acl, a => a.CircleId == 12); - Assert.Contains(acl, a => a.CircleId == 34); - } - - [Fact] - public void BlogPostDto_does_not_emit_acl_when_serialized_for_write() - { - var post = new BlogPostDto - { - Id = 77, - Title = "Write payload" - }; - post.AuthorizeCircle(11); - - // The client should not send ACL through POST/PUT blog payloads. - // ACL mutations have their own dedicated /blogacl endpoint. - var json = JsonSerializer.Serialize(post, - new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }); - - using var doc = JsonDocument.Parse(json); - var root = doc.RootElement; - Assert.False(root.TryGetProperty("acl", out _)); - Assert.False(root.TryGetProperty("wireAcl", out _)); - } } diff --git a/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs b/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs deleted file mode 100644 index db70e25fa..000000000 --- a/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs +++ /dev/null @@ -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(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(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 CallAsync(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 CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public Task CallAsync(HttpMethod method, string path, Func contentFactory, CancellationToken ct = default) - => CallAsync(method, path, (object?)null, ct); - - public ValueTask DisposeAsync() => ValueTask.CompletedTask; - } -} diff --git a/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs b/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs deleted file mode 100644 index 16f01c5e9..000000000 --- a/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs +++ /dev/null @@ -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)); - } -} diff --git a/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs b/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs index f72c8d4d5..d1d00532d 100644 --- a/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs +++ b/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(); services.AddTransient(); services.AddTransient(); - 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 /// /// Mount a real (as /// SessionStatusBannerTests does), push a - /// with the given VM onto + /// with the given VM onto /// NavRoot. PushAsync is awaited (via /// GetAwaiter().GetResult()) so the page is on the /// nav stack before the test tries to interact with its @@ -111,17 +109,13 @@ public class MainPageButtonsTests /// realised and KeyPressQwerty has a real /// to dispatch against. /// - 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 diff --git a/src/PostIt/PostIt.Tests/MainPageSaveTests.cs b/src/PostIt/PostIt.Tests/MainPageSaveTests.cs index 519cd141d..5baae6581 100644 --- a/src/PostIt/PostIt.Tests/MainPageSaveTests.cs +++ b/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; /// -/// Headless UI tests for the "Save" flow in . +/// Headless UI tests for the "Save" flow in . /// The pattern is the one SessionStatusBannerTests /// established: [AvaloniaFact], a /// hosting the page (via a 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 public SignaturePadData Snapshot() => new(_strokes.ToArray()); - /// - /// Copy of the current in-progress stroke, without the length - /// prefix used for sealed strokes. The view can render this as a - /// live preview while the user is still drawing. - /// - internal IReadOnlyList PendingStroke - => _capturing && _pendingPoints > 0 - ? _strokes.GetRange(_strokes.Count - 2 * _pendingPoints, 2 * _pendingPoints) - : Array.Empty(); - // --- Test-only surface (visible to PostIt.Tests) ------------------- /// @@ -212,17 +183,6 @@ public class SignaturePadControl : TemplatedControl _pendingPoints++; } - /// - /// Test hook: mark the control as actively capturing so tests - /// can exercise the live-preview path without synthetic pointer - /// events. - /// - internal void BeginCaptureForTest() - { - _capturing = true; - _pendingPoints = 0; - } - /// /// Test hook: seal the currently-pending stroke with a length /// prefix. Mirrors what does at diff --git a/src/PostIt/PostIt/Controls/StatusBar.axaml b/src/PostIt/PostIt/Controls/StatusBar.axaml deleted file mode 100644 index eaa6f5a09..000000000 --- a/src/PostIt/PostIt/Controls/StatusBar.axaml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/src/PostIt/PostIt/Controls/StatusBar.axaml.cs b/src/PostIt/PostIt/Controls/StatusBar.axaml.cs deleted file mode 100644 index 975f9b2f9..000000000 --- a/src/PostIt/PostIt/Controls/StatusBar.axaml.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Avalonia.Controls; - -namespace PostIt.Controls; - -public partial class StatusBar : UserControl -{ - public StatusBar() - { - InitializeComponent(); - } -} diff --git a/src/PostIt/PostIt/Helpers/FormHelpers.cs b/src/PostIt/PostIt/Helpers/FormHelpers.cs deleted file mode 100644 index 18cc8fd0e..000000000 --- a/src/PostIt/PostIt/Helpers/FormHelpers.cs +++ /dev/null @@ -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"); - } -} diff --git a/src/PostIt/PostIt/Helpers/ImageHelper.cs b/src/PostIt/PostIt/Helpers/ImageHelper.cs deleted file mode 100644 index 30e7e34e5..000000000 --- a/src/PostIt/PostIt/Helpers/ImageHelper.cs +++ /dev/null @@ -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 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; - } - } -} \ No newline at end of file diff --git a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs index 6bd54ca20..c4e774cc7 100644 --- a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs +++ b/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,11 @@ 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( - api, - () => 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(); - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); // SettingsPage is a singleton: there must be one and only one @@ -51,36 +42,9 @@ public static class ServiceCollectionHelpers // the navigation stack, each bound to a fresh // SettingsViewModel and missing any in-flight edits. services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - // ViewModels - services.AddSingleton(settings); - services.AddSingleton(api); - services.AddSingleton(client); - services.AddSingleton(circleClient); - services.AddSingleton(blogAclClient); - services.AddSingleton(userSearchClient); - services.AddSingleton(activityClient); - services.AddSingleton(billingClient); - services.AddSingleton(estimateClient); - services.AddSingleton(reverseGeocoding); - services.AddSingleton(userDirectory); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddTransient(); - + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); // Dialogs (modal-light pages): the ViewLocator resolves // them when a caller pushes a PostAclDialogViewModel or // AddCircleMemberDialogViewModel via App.PushPageAsync. @@ -89,13 +53,26 @@ public static class ServiceCollectionHelpers // here — the parametrised ctors stay for direct test wiring. services.AddTransient(); services.AddTransient(); + // ViewModels + services.AddSingleton(settings); + services.AddSingleton(api); + services.AddSingleton(client); + services.AddSingleton(circleClient); + services.AddSingleton(blogAclClient); + services.AddSingleton(userSearchClient); + services.AddSingleton(userDirectory); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + // Persistent session banner: one instance for the lifetime of // the app so the same VM survives page navigation. var sessionStatus = new SessionStatusViewModel { Api = api }; sessionStatus.Refresh(); services.AddSingleton(sessionStatus); - services.AddSingleton(); - services.AddSingleton(); + services.AddTransient(); + return services.BuildServiceProvider(); } } diff --git a/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs b/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs index f30e021d9..e4250cbb9 100644 --- a/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs +++ b/src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs @@ -8,7 +8,7 @@ namespace PostIt.Helpers; public static class ViewModelBaseHelpers { - public static async Task 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; } } diff --git a/src/PostIt/PostIt/PostIt.csproj b/src/PostIt/PostIt/PostIt.csproj index 09632bdf8..1ae36a446 100644 --- a/src/PostIt/PostIt/PostIt.csproj +++ b/src/PostIt/PostIt/PostIt.csproj @@ -5,7 +5,7 @@ latest 1.1.0.0 1.1.0.0 - 1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070 + 1.1.0-beta.1+148.Branch.release-1.0.8-rc4.Sha.6b161b0fb509fec0ce467aa94f1a450b202af2f0 1.1.0-beta.1 @@ -29,8 +29,6 @@ None All - - diff --git a/src/PostIt/PostIt/Services/CurrentLocationResult.cs b/src/PostIt/PostIt/Services/CurrentLocationResult.cs deleted file mode 100644 index ea19da436..000000000 --- a/src/PostIt/PostIt/Services/CurrentLocationResult.cs +++ /dev/null @@ -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."); -} diff --git a/src/PostIt/PostIt/Services/IReverseGeocodingService.cs b/src/PostIt/PostIt/Services/IReverseGeocodingService.cs deleted file mode 100644 index 0e62fe9dc..000000000 --- a/src/PostIt/PostIt/Services/IReverseGeocodingService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading; -using System.Threading.Tasks; - -namespace PostIt.Services; - -public interface IReverseGeocodingService -{ - Task TryResolveAddressAsync(double latitude, double longitude, CancellationToken cancellationToken = default); -} \ No newline at end of file diff --git a/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs b/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs deleted file mode 100644 index f9ddb2f6a..000000000 --- a/src/PostIt/PostIt/Services/NominatimReverseGeocodingService.cs +++ /dev/null @@ -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 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? parts = null; - foreach (var value in values) - { - if (string.IsNullOrWhiteSpace(value)) - continue; - - parts ??= new List(); - parts.Add(value.Trim()); - } - - return parts is null || parts.Count == 0 ? null : string.Join(", ", parts); - } -} \ No newline at end of file diff --git a/src/PostIt/PostIt/Services/Platform.cs b/src/PostIt/PostIt/Services/Platform.cs index 2e5ac76a3..8e5f7e254 100644 --- a/src/PostIt/PostIt/Services/Platform.cs +++ b/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 /// public static System.Func? CreateBrowser { get; set; } = () => new CustomSchemeBrowser(CustomScheme); - - /// - /// 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. - /// - public static Func> TryGetCurrentLocationAsync { get; set; } = - _ => Task.FromResult(CurrentLocationResult.Unavailable()); } diff --git a/src/PostIt/PostIt/Services/YavscApiClient.cs b/src/PostIt/PostIt/Services/YavscApiClient.cs index 7e3187d8b..726b3f4f4 100644 --- a/src/PostIt/PostIt/Services/YavscApiClient.cs +++ b/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); - await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false); - - var stream = await response.Content.ReadAsStreamAsync(ct).ConfigureAwait(false); - var dto = await JsonSerializer.DeserializeAsync(stream, - new JsonSerializerOptions { PropertyNameCaseInsensitive = true }, ct).ConfigureAwait(false); - return dto!; - } - - /// - /// Call a multipart endpoint, transparently refreshing the token if needed. - /// - public virtual async Task CallAsync( - HttpMethod method, - string path, - Func contentFactory, - CancellationToken ct = default) - { - if (contentFactory is null) - throw new ArgumentNullException(nameof(contentFactory)); - - using var response = await SendAsync(method, path, contentFactory, 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); @@ -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); - await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false); - } - - /// - /// Call a multipart endpoint that returns no useful body (DELETE, etc.). - /// - public async Task CallAsync( - HttpMethod method, - string path, - Func contentFactory, - CancellationToken ct = default) - { - if (contentFactory is null) - throw new ArgumentNullException(nameof(contentFactory)); - - using var response = await SendAsync(method, path, contentFactory, ct).ConfigureAwait(false); + using var response = await SendAsync(method, path, body, 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 SendAsync( - HttpMethod method, string path, Func? 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) - req.Content = contentFactory(); + if (body is not null) + 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) - retry.Content = contentFactory(); + if (body is not null) + 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); } - /// - /// Upload a user avatar to the Yavsc API. The server expects a - /// single multipart file named file and validates the image - /// content type before persisting it. - /// - public async Task 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(); diff --git a/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs b/src/PostIt/PostIt/Settings/AuthenticationSettings.cs similarity index 95% rename from src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs rename to src/PostIt/PostIt/Settings/AuthenticationSettings.cs index 3c23187e4..9ebeaebd4 100644 --- a/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs +++ b/src/PostIt/PostIt/Settings/AuthenticationSettings.cs @@ -18,11 +18,11 @@ public partial class AuthenticationSettings : ObservableObject /// public const string AndroidRedirectUri = "android://postit-signin"; - public const string DefaultAuthority = "https://yavsc.pschneider.fr"; + public static string DefaultAuthority { get; internal set; } = "https://yavsc.pschneider.fr"; - public const string DefaultClientId = "postit"; + public static string DefaultClientId { get; internal set; } = "postit"; - public static readonly string[] DefaultScopes = { "blogs", "api" }; + public static string[] DefaultScopes { get; set; } = { "blogs"} ; [ObservableProperty] public partial string Authority { get; set; } diff --git a/src/PostIt/PostIt/ViewLocator.cs b/src/PostIt/PostIt/ViewLocator.cs index 6f8c5d902..3543a9c9f 100644 --- a/src/PostIt/PostIt/ViewLocator.cs +++ b/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; @@ -20,7 +17,7 @@ namespace PostIt; public class ViewLocator : IDataTemplate { - public Control Build(object? data) + public Control Build(object? data) { try { @@ -39,25 +36,17 @@ public class ViewLocator : IDataTemplate var services = app!.ServiceProvider!; return data switch { - BlogsViewModel => services.GetRequiredService(), + MainViewModel => services.GetRequiredService(), Settings => services.GetRequiredService(), HomePageViewModel => services.GetRequiredService(), - ActivitiesPageViewModel => services.GetRequiredService(), - CommandFormsPageViewModel => services.GetRequiredService(), - BrushViewModel => services.GetRequiredService(), - RdvViewModel => services.GetRequiredService(), SignaturePageViewModel => services.GetRequiredService(), AddCircleMemberDialogViewModel => services.GetRequiredService(), CirclesPageViewModel => services.GetRequiredService(), PostAclDialogViewModel => services.GetRequiredService(), - BillingQueriesPageViewModel => services.GetRequiredService(), - BillingQueryDetailsPageViewModel => services.GetRequiredService(), - ProviderOngoingRequestsPageViewModel => services.GetRequiredService(), - EstimateEditionPageViewModel => services.GetRequiredService(), null => new TextBlock { Text = "No view for " }, _ => new TextBlock { Text = $"No view for {data.GetType().Name}" } }; } - public bool Match(object? data) => data is ViewModelBase; + public bool Match(object? data) => data is ViewModelBase; } diff --git a/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs deleted file mode 100644 index bd13faf9b..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs +++ /dev/null @@ -1,278 +0,0 @@ -using System; -using System.Collections.ObjectModel; -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.Abstract.Workflow; -using Yavsc.Api.Client; - -namespace PostIt.ViewModels; - -public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewModel -{ - private readonly ActivityApiClient _client; - private readonly BillingApiClient _billingClient; - private bool _syncingSelection; - - [ObservableProperty] - public partial ObservableCollection Activities { get; set; } = new(); - - [ObservableProperty] - public partial ActivityInfo? SelectedActivity { get; set; } - - [ObservableProperty] - public partial ObservableCollection Specializations { get; set; } = new(); - - [ObservableProperty] - public partial ActivityInfo? SelectedSpecialization { get; set; } - - [ObservableProperty] - public partial ObservableCollection Performers { get; set; } = new(); - - [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenCommandFormsCommand))] - public partial ActivityUserDisplayItem? SelectedPerformer { get; set; } - - [ObservableProperty] - public partial bool IsBusy { get; set; } - - [ObservableProperty] - public partial string StatusMessage { get; set; } = "Choisissez une activité."; - - [ObservableProperty] - 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; - - public override bool CanNavigateNext - { - get => false; - protected set { _ = value; } - } - - public override bool CanNavigatePrevious - { - get => true; - protected set { _ = value; } - } - - public ActivitiesPageViewModel(ActivityApiClient client, BillingApiClient billingClient) - { - _client = client ?? throw new ArgumentNullException(nameof(client)); - _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient)); - } - - partial void OnSelectedActivityChanged(ActivityInfo? value) - { - if (_syncingSelection) return; - _ = ShowActivitySafeAsync(value); - } - - partial void OnSelectedSpecializationChanged(ActivityInfo? value) - { - if (_syncingSelection) return; - _ = ShowSpecializationSafeAsync(value); - } - - private async Task ShowActivitySafeAsync(ActivityInfo? value) - { - try - { - await ShowActivityAsync(value); - } - 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."); - } - catch (Exception ex) - { - this.SetErrorStatus($"Erreur: {ex.Message}"); - } - } - - private async Task ShowSpecializationSafeAsync(ActivityInfo? value) - { - try - { - await ShowSpecializationAsync(value); - } - 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."); - } - catch (Exception ex) - { - this.SetErrorStatus($"Erreur: {ex.Message}"); - } - } - - [RelayCommand] - public async Task RefreshAsync() - { - IsBusy = true; - try - { - var list = await _client.GetCatalogAsync(); - Activities = new ObservableCollection(list ?? new()); - - var first = Activities.FirstOrDefault(); - await ShowActivityAsync(first); - if (first is null) - { - this.SetInfoStatus("Aucune activité disponible."); - } - } - catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) - { - Activities = new ObservableCollection(); - Specializations = new ObservableCollection(); - Performers = new ObservableCollection(); - this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."); - } - catch (Exception ex) - { - Activities = new ObservableCollection(); - Specializations = new ObservableCollection(); - Performers = new ObservableCollection(); - this.SetErrorStatus($"Erreur: {ex.Message}"); - } - finally - { - IsBusy = false; - } - } - - public async Task ShowActivityAsync(ActivityInfo? activity) - { - _syncingSelection = true; - try - { - SelectedActivity = activity; - SelectedSpecialization = null; - } - finally - { - _syncingSelection = false; - } - - OnPropertyChanged(nameof(CurrentActivity)); - OnPropertyChanged(nameof(SelectedActivityLabel)); - OnPropertyChanged(nameof(CurrentActivityLabel)); - OnPropertyChanged(nameof(CurrentFormCount)); - Specializations = new ObservableCollection(activity?.Children ?? new()); - - if (activity is null) - { - Performers = new ObservableCollection(); - SelectedPerformer = null; - return; - } - - await LoadPerformersAsync(activity); - } - - public async Task ShowSpecializationAsync(ActivityInfo? specialization) - { - _syncingSelection = true; - try - { - SelectedSpecialization = specialization; - } - finally - { - _syncingSelection = false; - } - - OnPropertyChanged(nameof(CurrentActivity)); - OnPropertyChanged(nameof(CurrentActivityLabel)); - OnPropertyChanged(nameof(CurrentFormCount)); - - if (specialization is null) - { - if (SelectedActivity is not null) - { - await LoadPerformersAsync(SelectedActivity); - } - return; - } - - await LoadPerformersAsync(specialization); - } - - private async Task LoadPerformersAsync(ActivityInfo activity) - { - IsBusy = true; - try - { - var list = await _client.GetUsersAsync(activity.Code); - var items = (list ?? new()) - .Select(dto => ActivityUserDisplayItem.FromDto(dto, _client.BuildAvatarXsUrl(dto.UserName))) - .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(items); - SelectedPerformer = null; - this.SetInfoStatus($"{activity.Name} · {Performers.Count} utilisateur(s)"); - } - catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) - { - Performers = new ObservableCollection(); - SelectedPerformer = null; - this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."); - } - catch (Exception ex) - { - Performers = new ObservableCollection(); - SelectedPerformer = null; - this.SetErrorStatus($"Erreur: {ex.Message}"); - } - finally - { - IsBusy = false; - OpenCommandFormsCommand.NotifyCanExecuteChanged(); - } - } - - private bool CanOpenCommandForms() - => SelectedPerformer is not null && CurrentActivity?.Forms?.Count > 0; - - [RelayCommand(CanExecute = nameof(CanOpenCommandForms))] - private async Task OpenCommandFormsAsync() - { - if (SelectedPerformer is null || CurrentActivity is null) - { - this.SetWarningStatus("Sélectionnez un utilisateur et une activité avec formulaire."); - return; - } - - var app = (App?)Application.Current; - if (app is null) - { - throw new InvalidOperationException("Application PostIt indisponible."); - } - - var vm = new CommandFormsPageViewModel(CurrentActivity, SelectedPerformer, _billingClient); - await app.PushPageAsync(vm); - } -} diff --git a/src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs b/src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs deleted file mode 100644 index d89a66e96..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Avalonia.Media.Imaging; -using CommunityToolkit.Mvvm.ComponentModel; -using Yavsc.Abstract.Workflow; - -namespace PostIt.ViewModels; - -public sealed partial class ActivityUserDisplayItem : ObservableObject -{ - 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; } - public string PerformerStatusBadgeLabel { get; init; } = "Inactif"; - public string PerformerStatusBadgeBackground { get; init; } = "#FDECEA"; - 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 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", - PerformerStatusBadgeBackground = dto.Active ? "#E6F7EC" : "#FDECEA", - PerformerStatusBadgeBorder = dto.Active ? "#2E7D32" : "#C62828", - PerformerStatusBadgeForeground = dto.Active ? "#1B5E20" : "#8E0000", - ExtraActivityCount = dto.ExtraActivityCount, - ExtraActivityLabel = dto.ExtraActivityCount == 0 - ? "Pas d'autre activité" - : $"Autres spécialisations: {dto.ExtraActivityCount}" - }; - } -} diff --git a/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs deleted file mode 100644 index aab923d80..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System; -using System.Collections.ObjectModel; -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.Api.Client; -using Yavsc.Abstract.Workflow; - -namespace PostIt.ViewModels; - -public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusViewModel -{ - private readonly BillingApiClient _billingClient; - - public ActivityInfo Activity { get; } - public ActivityUserDisplayItem Performer { get; } - public CommandFormSummary Form { get; } - public bool IsReadOnly { get; } - public bool OngoingOnly { get; } - - [ObservableProperty] - public partial ObservableCollection Queries { get; set; } = new(); - - [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedQueryCommand))] - public partial BillingQueryDisplayItem? SelectedQuery { get; set; } - - [ObservableProperty] - public partial bool IsBusy { get; set; } - - [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}"; - public string ContextLabel => $"{Performer.UserName} · {Activity.Name}"; - public bool CanOpenDetails => !IsReadOnly; - - public override bool CanNavigateNext - { - get => false; - protected set { _ = value; } - } - - public override bool CanNavigatePrevious - { - get => true; - protected set { _ = value; } - } - - public BillingQueriesPageViewModel( - ActivityInfo activity, - ActivityUserDisplayItem performer, - CommandFormSummary form, - BillingApiClient billingClient, - bool isReadOnly = false, - bool ongoingOnly = false) - { - 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)); - IsReadOnly = isReadOnly; - OngoingOnly = ongoingOnly; - } - - public Task InitializeAsync() => RefreshAsync(); - - private bool CanOpenSelectedQuery() => CanOpenDetails && SelectedQuery is not null; - - [RelayCommand] - public async Task RefreshAsync() - { - IsBusy = true; - try - { - var list = await _billingClient.GetQuerySummariesAsync(Form.ActionName).ConfigureAwait(true); - var filtered = (list ?? new()) - .Where(q => q.ActivityCode == Activity.Code && q.PerformerId == Performer.PerformerId) - .Where(q => !OngoingOnly || IsOngoingStatus(q.Status)) - .OrderByDescending(q => q.EventDate ?? DateTime.MinValue) - .ThenByDescending(q => q.Id) - .Select(BillingQueryDisplayItem.FromDto) - .ToList(); - - Queries = new ObservableCollection(filtered); - this.SetInfoStatus(BuildLoadedStatusMessage(filtered.Count)); - } - catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) - { - Queries = new ObservableCollection(); - this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."); - } - catch (Exception ex) - { - Queries = new ObservableCollection(); - this.SetErrorStatus($"Erreur: {ex.Message}"); - } - finally - { - IsBusy = false; - } - } - - [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))] - public async Task OpenSelectedQueryAsync() - { - if (SelectedQuery is null) - { - this.SetWarningStatus("Sélectionnez une commande."); - return; - } - - var app = (App?)Application.Current; - if (app is null) - { - throw new InvalidOperationException("Application PostIt indisponible."); - } - - IsBusy = true; - try - { - var details = await _billingClient.GetQueryAsync(Form.ActionName, SelectedQuery.Id).ConfigureAwait(true); - var vm = new BillingQueryDetailsPageViewModel( - Activity, - 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."); - } - catch (Exception ex) - { - this.SetErrorStatus($"Erreur lors de l'ouverture: {ex.Message}"); - } - finally - { - IsBusy = false; - } - } - - private string BuildLoadedStatusMessage(int count) - { - if (count == 0) - { - return OngoingOnly - ? "Aucune demande en cours pour ce formulaire." - : "Aucune commande trouvée pour ce formulaire."; - } - - if (OngoingOnly) - { - return $"{count} demande(s) en cours chargée(s) (lecture seule)."; - } - - return $"{count} commande(s) chargée(s)."; - } - - private static bool IsOngoingStatus(QueryStatus status) - => status is QueryStatus.Inserted or QueryStatus.Accepted or QueryStatus.InProgress; -} diff --git a/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs deleted file mode 100644 index cd13daaf1..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs +++ /dev/null @@ -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", - }; -} \ No newline at end of file diff --git a/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs deleted file mode 100644 index bc4373377..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using Yavsc.Api.Client; - -namespace PostIt.ViewModels; - -public sealed class BillingQueryDisplayItem -{ - public long Id { get; init; } - public string Description { get; init; } = string.Empty; - public string Summary { get; init; } = string.Empty; - public string StatusLabel { get; init; } = string.Empty; - public string EventDateLabel { get; init; } = string.Empty; - public string BillingCode { get; init; } = string.Empty; - - public static BillingQueryDisplayItem FromDto(BillingQuerySummaryDto dto) - { - var summary = !string.IsNullOrWhiteSpace(dto.Reason) - ? dto.Reason - : !string.IsNullOrWhiteSpace(dto.AdditionalInfo) - ? dto.AdditionalInfo - : dto.Description; - - return new BillingQueryDisplayItem - { - Id = dto.Id, - Description = string.IsNullOrWhiteSpace(dto.Description) - ? $"Commande #{dto.Id}" - : dto.Description, - Summary = summary, - StatusLabel = dto.Status.ToString(), - EventDateLabel = dto.EventDate?.ToLocalTime().ToString("g") ?? "Date non précisée", - BillingCode = dto.BillingCode, - }; - } -} \ No newline at end of file diff --git a/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs deleted file mode 100644 index 533fbc380..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Threading.Tasks; -using Avalonia; -using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.Input; -using PostIt.Helpers; -using Yavsc.Abstract.Workflow; -using Yavsc.Api.Client; - -namespace PostIt.ViewModels; - -public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusViewModel -{ - private readonly BillingApiClient _billingClient; - - public ActivityInfo Activity { get; } - public ActivityUserDisplayItem Performer { get; } - - [ObservableProperty] - public partial ObservableCollection Forms { get; set; } - - [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedFormCommand)), NotifyCanExecuteChangedFor(nameof(OpenQueriesCommand)), NotifyCanExecuteChangedFor(nameof(OpenOngoingQueriesCommand))] - public partial CommandFormSummary? SelectedForm { get; set; } - - [ObservableProperty] - public partial string StatusMessage { get; set; } = "Pret."; - - [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)"; - - public override bool CanNavigateNext - { - get => false; - protected set { _ = value; } - } - - public override bool CanNavigatePrevious - { - get => true; - protected set { _ = value; } - } - - public CommandFormsPageViewModel( - ActivityInfo activity, - ActivityUserDisplayItem performer, - BillingApiClient billingClient) - { - Activity = activity ?? throw new ArgumentNullException(nameof(activity)); - Performer = performer ?? throw new ArgumentNullException(nameof(performer)); - _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient)); - - Forms = new ObservableCollection((activity.Forms ?? new()) - .OrderBy(f => f.Title) - .ThenBy(f => f.ActionName)); - SelectedForm = Forms.FirstOrDefault(); - this.SetStatus( - Forms.Count == 0 - ? "Aucun formulaire n'est disponible pour cette activité." - : "Choisissez le formulaire à utiliser.", - Forms.Count == 0 ? StatusSeverity.Warning : StatusSeverity.Info); - } - - private bool CanOpenSelectedForm() => SelectedForm is not null; - - private bool CanOpenQueries() => SelectedForm is not null; - - private bool CanOpenOngoingQueries() => SelectedForm is not null; - - [RelayCommand(CanExecute = nameof(CanOpenSelectedForm))] - private async Task OpenSelectedFormAsync() - { - if (SelectedForm is null) - { - this.SetWarningStatus("Sélectionnez un formulaire."); - return; - } - - var app = (App?)Application.Current; - if (app is null) - { - throw new InvalidOperationException("Application PostIt indisponible."); - } - - var vm = SelectedForm.CreateCommandPageViewModel( - Activity, Performer, _billingClient); - await vm!.InitializeAsync(); - await app.PushPageAsync(vm); - } - - [RelayCommand(CanExecute = nameof(CanOpenQueries))] - private async Task OpenQueriesAsync() - { - if (SelectedForm is null) - { - this.SetWarningStatus("Sélectionnez un formulaire."); - return; - } - - var app = (App?)Application.Current; - if (app is null) - { - throw new InvalidOperationException("Application PostIt indisponible."); - } - - var vm = new BillingQueriesPageViewModel(Activity, Performer, SelectedForm, _billingClient); - await vm.InitializeAsync(); - await app.PushPageAsync(vm); - } - - [RelayCommand(CanExecute = nameof(CanOpenOngoingQueries))] - private async Task OpenOngoingQueriesAsync() - { - if (SelectedForm is null) - { - this.SetWarningStatus("Sélectionnez un formulaire."); - return; - } - - var app = (App?)Application.Current; - if (app is null) - { - throw new InvalidOperationException("Application PostIt indisponible."); - } - - var vm = new BillingQueriesPageViewModel( - Activity, - Performer, - SelectedForm, - _billingClient, - isReadOnly: true, - ongoingOnly: true); - await vm.InitializeAsync(); - await app.PushPageAsync(vm); - } -} diff --git a/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs deleted file mode 100644 index 8f007dc08..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs +++ /dev/null @@ -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; - -/// -/// Edition d'un devis (Estimate) créé en réponse à une demande -/// client () consultée depuis la -/// page « Mes demandes en cours ». L'envoi poste le devis sur -/// api/v1/estimate; côté serveur, la commande liée -/// () est alors marquée comme -/// validée par le prestataire. -/// -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 Lines { get; set; } = new(); - - [ObservableProperty, NotifyCanExecuteChangedFor(nameof(RemoveLineCommand))] - public partial EstimateLineItemViewModel? SelectedLine { get; set; } - - [ObservableProperty, NotifyCanExecuteChangedFor(nameof(SendCommand))] - public partial bool IsBusy { get; set; } - - /// - /// True une fois le devis accepté par le serveur: l'envoi est - /// désactivé pour éviter les doublons, il ne reste que « Retour ». - /// - [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()) - { - item.PropertyChanged -= OnLinePropertyChanged; - } - } - - if (e.NewItems is not null) - { - foreach (var item in e.NewItems.OfType()) - { - 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)); - } -} diff --git a/src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs deleted file mode 100644 index 864906cdd..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs +++ /dev/null @@ -1,35 +0,0 @@ -using CommunityToolkit.Mvvm.ComponentModel; - -namespace PostIt.ViewModels; - -/// -/// Editable estimate line. is exposed as a -/// so it binds directly to -/// NumericUpDown.Value (decimal?); it is rounded back -/// to an integer when the DTO is built. -/// -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}"; -} diff --git a/src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs deleted file mode 100644 index 71e979e66..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs +++ /dev/null @@ -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 _allQueries = new(); - - [ObservableProperty] - public partial ObservableCollection Queries { get; set; } = new(); - - [ObservableProperty] - public partial string FilterText { get; set; } = string.Empty; - - public IReadOnlyList 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(); - Queries = new ObservableCollection(); - this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."); - } - catch (Exception ex) - { - _allQueries = new List(); - Queries = new ObservableCollection(); - 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(sorted); - } - - private List ApplySort(IEnumerable 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); - } -} diff --git a/src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs b/src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs deleted file mode 100644 index ee07bb97a..000000000 --- a/src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs +++ /dev/null @@ -1,22 +0,0 @@ -using CommunityToolkit.Mvvm.ComponentModel; -using Yavsc.Models.Haircut; - -namespace PostIt.ViewModels; - -public partial class SelectableHairPrestationItem : ObservableObject -{ - public long Id { get; init; } - public string Title { get; init; } = string.Empty; - public string Details { get; init; } = string.Empty; - - [ObservableProperty] - public partial bool IsSelected { get; set; } - - public static SelectableHairPrestationItem FromDto(HairPrestationDto dto) - => new() - { - Id = dto.Id, - Title = dto.Title, - Details = dto.Details, - }; -} \ No newline at end of file diff --git a/src/PostIt/PostIt/ViewModels/ACL/AddCircleMemberDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs similarity index 84% rename from src/PostIt/PostIt/ViewModels/ACL/AddCircleMemberDialogViewModel.cs rename to src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs index 635073d1a..88d01335a 100644 --- a/src/PostIt/PostIt/ViewModels/ACL/AddCircleMemberDialogViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs @@ -29,7 +29,7 @@ namespace PostIt.ViewModels; /// CirclesPage then calls /// . /// -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."; - - [ObservableProperty] - public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret."); + public partial string StatusMessage { get; set; } = string.Empty; /// /// 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(hits ?? Array.Empty()); - 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 - ?? throw new InvalidOperationException("Application PostIt indisponible."); + var app = App.Current as App; await app.GoBackAsync(); } [RelayCommand] public async Task CloseAsync() { - var app = App.Current as App - ?? throw new InvalidOperationException("Application PostIt indisponible."); + var app = App.Current as App; await app.GoBackAsync(); } } diff --git a/src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs similarity index 84% rename from src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs rename to src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs index cd068b4f4..9cee3ea8c 100644 --- a/src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs @@ -34,7 +34,7 @@ namespace PostIt.ViewModels; /// . The "remove" /// command is per-row and runs inline. /// -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(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 - ?? throw new InvalidOperationException("Application PostIt indisponible."); - var services = app.ServiceProvider - ?? throw new InvalidOperationException("ServiceProvider PostIt indisponible."); + var app = Application.Current as App; + var services = app?.ServiceProvider; var directory = services.GetRequiredService(); AddCircleMemberDialogViewModel model = new AddCircleMemberDialogViewModel(directory); @@ -151,11 +147,11 @@ public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewMode { var list = await _client.GetMembersAsync(circleId); Members = new ObservableCollection(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(); } 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( - created is null ? "Création échouée" : $"Cercle « {created.Name} » créé", - created is null ? StatusSeverity.Warning : StatusSeverity.Info); + StatusMessage = created is null + ? "Création échouée" + : $"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 { diff --git a/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs deleted file mode 100644 index 5ad2b08f4..000000000 --- a/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs +++ /dev/null @@ -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(); -} diff --git a/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs deleted file mode 100644 index 72d9ce8ea..000000000 --- a/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs +++ /dev/null @@ -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 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 - (prestations ?? new List()); - - 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; - } - - } -} diff --git a/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs deleted file mode 100644 index 05481c2c3..000000000 --- a/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs +++ /dev/null @@ -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 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( - AvailablePrestations.Select(SelectableHairPrestationItem.FromDto)); - } - - protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery) - { - base.ApplyExistingQuery(existingQuery); - - var selectedIds = existingQuery.PrestationIds is null - ? new HashSet() - : new HashSet(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; - } - } -} diff --git a/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs deleted file mode 100644 index 4f9d457a5..000000000 --- a/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs +++ /dev/null @@ -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; - } -} diff --git a/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs b/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs new file mode 100644 index 000000000..5d727729c --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs @@ -0,0 +1,42 @@ +using CommunityToolkit.Mvvm.Input; +using PostIt.Services; +namespace PostIt.ViewModels; + +public class HomePageViewModel : ViewModelBase +{ + public YavscApiClient Api { get; } + public Settings Settings { get; } + public SessionStatusViewModel SessionStatus { get; } + + private string _welcomeText = "Welcome to PostIt!"; + public string WelcomeText + { + get => _welcomeText; + set => SetProperty(ref _welcomeText, value); + } + + public override bool CanNavigateNext { get => true; protected set => throw new System.NotImplementedException(); } + public override bool CanNavigatePrevious { get => false; protected set => throw new System.NotImplementedException(); } + + public HomePageViewModel(YavscApiClient api, Settings settings, SessionStatusViewModel sessionStatus) + { + Api = api; + Settings = settings; + SessionStatus = sessionStatus; + + } + public RelayCommand OpenBlogs { get; set; } = new RelayCommand(() => App.PushMainPageAsync()); + /// + /// Avalonia designer constructor. Builds a self-contained VM + /// with a freshly-constructed Settings so the XAML preview can + /// render without a running App. Production paths always reach + /// the parameterised constructor (DI or direct injection), and + /// the postit://callback crash is fixed at the Settings layer + /// (thread-safe dispatcher marshalling on PropertyChanged) — a + /// designer-only duplicate instance is therefore harmless. + /// + public HomePageViewModel() : this(null!, new Settings(), new SessionStatusViewModel()) + { + + } +} diff --git a/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs b/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs deleted file mode 100644 index 614d477c8..000000000 --- a/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs +++ /dev/null @@ -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), - }; - } -} \ No newline at end of file diff --git a/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs b/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs deleted file mode 100644 index fd2ff1091..000000000 --- a/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System; -using System.Threading.Tasks; -using Avalonia; -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 -{ - public YavscApiClient Api { get; } - public Settings Settings { get; } - public SessionStatusViewModel SessionStatus { get; } - - private string _welcomeText = "Welcome to PostIt!"; - public string WelcomeText - { - get => _welcomeText; - set => SetProperty(ref _welcomeText, value); - } - - public override bool CanNavigateNext { get => true; protected set => throw new System.NotImplementedException(); } - public override bool CanNavigatePrevious { get => false; protected set => throw new System.NotImplementedException(); } - - public HomePageViewModel(YavscApiClient api, Settings settings, SessionStatusViewModel sessionStatus) - { - Api = api; - Settings = settings; - SessionStatus = sessionStatus; - - OpenActivities = new AsyncRelayCommand(OpenActivitiesAsync); - OpenProviderRequests = new AsyncRelayCommand(OpenProviderRequestsAsync); - OpenBlogs = new AsyncRelayCommand(App.PushBlogsPageAsync); - } - public IAsyncRelayCommand OpenBlogs { get; } - public IAsyncRelayCommand OpenActivities { get; } - public IAsyncRelayCommand OpenProviderRequests { get; } - - private async Task OpenActivitiesAsync() - { - var app = (App?)Application.Current; - var vm = app?.ServiceProvider?.GetRequiredService(); - if (app is null || vm is null) - { - throw new InvalidOperationException("Activities page is not available."); - } - - await vm.RefreshAsync(); - 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(); - if (billingClient is null) - { - throw new InvalidOperationException("Client billing indisponible."); - } - - var estimateClient = app.ServiceProvider?.GetRequiredService(); - - var vm = new ProviderOngoingRequestsPageViewModel(billingClient, Settings, estimateClient); - await vm.InitializeAsync(); - await app.PushPageAsync(vm); - } - - /// - /// Avalonia designer constructor. Builds a self-contained VM - /// with a freshly-constructed Settings so the XAML preview can - /// render without a running App. Production paths always reach - /// the parameterised constructor (DI or direct injection), and - /// the postit://callback crash is fixed at the Settings layer - /// (thread-safe dispatcher marshalling on PropertyChanged) — a - /// designer-only duplicate instance is therefore harmless. - /// - public HomePageViewModel() : this(null!, new Settings(), new SessionStatusViewModel()) - { - - } -} diff --git a/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs b/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs deleted file mode 100644 index c87af390c..000000000 --- a/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs +++ /dev/null @@ -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); -} diff --git a/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs b/src/PostIt/PostIt/ViewModels/MainViewModel.cs similarity index 69% rename from src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs rename to src/PostIt/PostIt/ViewModels/MainViewModel.cs index 78be2e789..1aa3eee09 100644 --- a/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs +++ b/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 { /// Window/tab title. Cosmetic — bound by /// MainPage.axaml if at all. Not the post title. @@ -50,15 +48,12 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel /// mutable field. Toggling is its own action. [ObservableProperty] public partial bool DraftIsPublished { get; set; } - public bool IsLoaded { get; private set; } + public Settings SettingsModel { get; } [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 FilteredPosts { get; set; } - [ObservableProperty] - public partial ObservableCollection DraftAttachments { get; set; } - [ObservableProperty] public partial BlogPostDto? SelectedPost { get; set; } @@ -80,249 +72,6 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel [ObservableProperty] public partial Settings Settings { get; private set; } - [RelayCommand] - internal async Task RefreshAsync() - { - await ExecuteAsync(async () => - { - var posts = await BlogClient!.GetPostsAsync(); - Posts.Clear(); - foreach (var post in posts.OrderByDescending(p => p.DateModified)) - { - Posts.Add(post); - } - ApplyFilter(); - this.SetInfoStatus($"{Posts.Count} billet(s) chargé(s)."); - }); - } - - [RelayCommand] - internal async Task SaveAsync() - { - // The button is already disabled when the title is empty - // (see CanSave), but the test path (and any programmatic - // ICommand.Execute) bypasses CanExecute, so we still - // guard here. Better to no-op with a status message - // than to send a request the server will reject. - if (string.IsNullOrWhiteSpace(DraftTitle)) - { - this.SetWarningStatus("Le titre est obligatoire."); - 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 - // (which was a no-op when SelectedPost was null) - // back onto the model and relied on a - // [Required] violation to surface the missing - // input; the new shape keeps the editor buffer as - // the single source of truth for outgoing payloads - // and the selected post as a read-only hint for - // the update path. - if (SelectedPost is null || SelectedPost.Id == 0) - { - var draft = new BlogPostDto - { - Title = DraftTitle, - Article = DraftArticle ?? string.Empty, - DateCreated = DateTime.UtcNow, - DateModified = DateTime.UtcNow, - IsPublished = DraftIsPublished - }; - var created = await BlogClient!.CreatePostAsync(draft, attachments); - if (created is not null) - { - SelectedPost = created; - - 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 - { - var update = 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, update, attachments); - - 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(); - }); - } - - [RelayCommand] - internal async Task DeleteAsync() - { - if (SelectedPost is null || SelectedPost.Id == 0) - { - this.SetWarningStatus("Sélectionnez un billet existant avant suppression."); - return; - } - - await ExecuteAsync(async () => - { - await BlogClient!.DeletePostAsync(SelectedPost.Id); - this.SetInfoStatus($"Billet {SelectedPost.Id} supprimé."); - SelectedPost = null; - await RefreshPostsAsync(); - }); - } - - /// - /// Toggle the publication state of the currently selected - /// post. Pushes the new state to - /// PUT /api/BlogApi/{id}/publish and reflects it - /// locally in + the - /// selected post so the UI updates without a full - /// refresh. - /// - /// The toggle is its own action — separate from Save - /// — because Publish is not part of the - /// BlogPostDto payload. Bundling it into Save - /// would require a wire-shape change and a second server - /// overload; the dedicated endpoint keeps the wire - /// contract clean. - /// - public async Task SetPublishStateAsync(bool publish) - { - if (SelectedPost is null || SelectedPost.Id == 0) - { - this.SetWarningStatus("Sélectionnez un billet existant pour changer sa publication."); - return; - } - - await ExecuteAsync(async () => - { - // The checkbox updates DraftIsPublished before the command is - // executed. Using the current bound value avoids the - // double-toggle bug in which the UI has already flipped the - // state and the command flips it again. - await BlogClient!.SetPublishAsync(SelectedPost.Id, publish); - DraftIsPublished = publish; - // Mirror into the selected post so a subsequent - // RefreshPostsAsync() doesn't blow away the - // locally flipped state until the round-trip - // re-hydrates it. - SelectedPost.IsPublished = publish; - this.SetInfoStatus(publish - ? $"Billet {SelectedPost.Id} publié." - : $"Billet {SelectedPost.Id} remis en brouillon."); - }); - } - - [RelayCommand] - internal async Task TogglePublishAsync() - { - await SetPublishStateAsync(DraftIsPublished); - } - - /// - /// DEV ONLY: open the signature capture page. The production - /// entry point is a SignalR push from Yavsc.Org ("devis - /// received, sign here"); this command is the dev-time - /// shortcut to reach the page without that infrastructure. - /// Aligned on the same VM-first navigation pattern as - /// : the VM resolves the target VM - /// through , the ViewLocator picks - /// the matching Control at bind time. No - /// Click handler, no App.ServiceProvider - /// access from the view layer. - /// - [RelayCommand] - internal async Task OpenSignatureDevAsync() - { - await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true); - } - - - [RelayCommand(CanExecute = nameof(CanManageAcl))] - public async Task ManageAclAsync() - { - if (SelectedPost is null) - { - this.SetWarningStatus("Sélectionnez un billet existant avant de gérer l'ACL."); - return; - } - - var postForAcl = SelectedPost; - try - { - var detailed = await BlogClient!.GetPostAsync(SelectedPost.Id).ConfigureAwait(true); - if (detailed is not null) - { - postForAcl = detailed; - SelectedPost = detailed; - } - } - catch - { - // Keep the dialog usable even if the detail refresh fails. - } - - await ((App)App.Current!).PushPageAsync(GetACLViewModel(postForAcl)).ConfigureAwait(true); - } - - [RelayCommand] - public async Task OpenCirclesAsync() - { - var circlesVm = ResolveServices().GetRequiredService(); - await ((App)App.Current!).PushPageAsync(circlesVm).ConfigureAwait(true); - } - - private ViewModelBase GetACLViewModel(BlogPostDto selectedPost) - { - var sp = ResolveServices(); - var aclClient = sp.GetRequiredService(); - var circleClient = sp.GetRequiredService(); - return new PostAclDialogViewModel(selectedPost, aclClient, circleClient); - } - /// /// API surface that hits the Yavsc.Blogs deployment at /// . Owned and constructed by @@ -372,7 +121,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel } - public BlogsViewModel() + public MainViewModel() { SettingsModel = new Settings(); Init(SettingsModel); @@ -381,19 +130,17 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel private void Init(Settings? settings) { + SearchText = string.Empty; Posts = new ObservableCollection(); FilteredPosts = new ObservableCollection(); - DraftAttachments = new ObservableCollection(); SelectedPost = null; IsBusy = false; - this.SetInfoStatus("Prêt."); + StatusMessage = "Ready"; Settings = settings ?? new Settings(); - SearchText = Settings.SearchText; WindowTitle = "PostIt"; DraftTitle = string.Empty; DraftArticle = string.Empty; DraftIsPublished = false; - IsLoaded = false; // Production path: DI injects the canonical Settings singleton // and we use it as-is. Test path: tests call this constructor // without a Settings argument; we fall back to a fresh @@ -405,15 +152,6 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel // (thread-safe dispatcher marshalling) so the duplicate // instance is now merely wasteful, not dangerous. - Settings.PropertyChanged += (s, e) => - { - if (e.PropertyName == nameof(Settings.SearchText)) - { - SearchText = Settings.SearchText; - ApplyFilter(); - } - }; - } /// Save is enabled as soon as the user has typed @@ -433,7 +171,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel /// . Production code uses the /// (Settings, BlogApiClient) overload below. /// - 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)); ; @@ -441,14 +179,7 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel Init(settings); } - partial void OnSearchTextChanged(string value) - { - if (Settings is not null && Settings.SearchText != value) - { - Settings.SearchText = value; - } - ApplyFilter(); - } + partial void OnSearchTextChanged(string value) => ApplyFilter(); partial void OnSelectedPostChanged(BlogPostDto? value) { @@ -464,7 +195,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(); } @@ -476,6 +206,170 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel partial void OnDraftTitleChanged(string value) => SaveCommand.NotifyCanExecuteChanged(); partial void OnDraftArticleChanged(string value) => SaveCommand.NotifyCanExecuteChanged(); + [RelayCommand] + internal async Task LoadPosts() + { + await ExecuteAsync(async () => + { + var posts = await BlogClient!.GetPostsAsync(); + Posts.Clear(); + foreach (var post in posts.OrderByDescending(p => p.DateModified)) + { + Posts.Add(post); + } + ApplyFilter(); + StatusMessage = $"Loaded {Posts.Count} posts."; + }); + } + + [RelayCommand] + internal void Search() => ApplyFilter(); + + [RelayCommand] + internal async Task Save() + { + // The button is already disabled when the title is empty + // (see CanSave), but the test path (and any programmatic + // ICommand.Execute) bypasses CanExecute, so we still + // guard here. Better to no-op with a status message + // than to send a request the server will reject. + if (string.IsNullOrWhiteSpace(DraftTitle)) + { + StatusMessage = "Title is required."; + return; + } + + await ExecuteAsync(async () => + { + // Build a fresh BlogPostDto from the editor buffer on + // every Save — we no longer mutate SelectedPost in + // place. The previous behaviour copied the buffer + // (which was a no-op when SelectedPost was null) + // back onto the model and relied on a + // [Required] violation to surface the missing + // input; the new shape keeps the editor buffer as + // the single source of truth for outgoing payloads + // and the selected post as a read-only hint for + // the update path. + if (SelectedPost is null || SelectedPost.Id == 0) + { + var draft = new BlogPostDto + { + Title = DraftTitle, + Article = DraftArticle ?? string.Empty, + DateCreated = DateTime.UtcNow, + DateModified = DateTime.UtcNow, + }; + var created = await BlogClient!.CreatePostAsync(draft); + if (created is not null) + { + SelectedPost = created; + StatusMessage = $"Created post {created.Id}."; + } + } + else + { + var update = 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, update); + StatusMessage = $"Saved post {SelectedPost.Id}."; + } + + await RefreshPostsAsync(); + }); + } + + [RelayCommand] + internal async Task Delete() + { + if (SelectedPost is null || SelectedPost.Id == 0) + { + StatusMessage = "Select an existing post before deleting."; + return; + } + + await ExecuteAsync(async () => + { + await BlogClient!.DeletePostAsync(SelectedPost.Id); + StatusMessage = $"Deleted post {SelectedPost.Id}."; + SelectedPost = null; + await RefreshPostsAsync(); + }); + } + + /// + /// Toggle the publication state of the currently selected + /// post. Pushes the new state to + /// PUT /api/BlogApi/{id}/publish and reflects it + /// locally in + the + /// selected post so the UI updates without a full + /// refresh. + /// + /// The toggle is its own action — separate from Save + /// — because Publish is not part of the + /// BlogPostDto payload. Bundling it into Save + /// would require a wire-shape change and a second server + /// overload; the dedicated endpoint keeps the wire + /// contract clean. + /// + [RelayCommand] + internal async Task TogglePublish() + { + if (SelectedPost is null || SelectedPost.Id == 0) + { + StatusMessage = "Sélectionnez un billet existant pour changer sa publication."; + return; + } + + await ExecuteAsync(async () => + { + var desired = !DraftIsPublished; + await BlogClient!.SetPublishAsync(SelectedPost.Id, desired); + DraftIsPublished = desired; + // Mirror into the selected post so a subsequent + // RefreshPostsAsync() doesn't blow away the + // locally flipped state until the round-trip + // re-hydrates it. + SelectedPost.IsPublished = desired; + StatusMessage = desired + ? $"Billet {SelectedPost.Id} publié." + : $"Billet {SelectedPost.Id} remis en brouillon."; + }); + } + + /// + /// DEV ONLY: open the signature capture page. The production + /// entry point is a SignalR push from Yavsc.Org ("devis + /// received, sign here"); this command is the dev-time + /// shortcut to reach the page without that infrastructure. + /// Aligned on the same VM-first navigation pattern as + /// : the VM resolves the target VM + /// through , the ViewLocator picks + /// the matching Control at bind time. No + /// Click handler, no App.ServiceProvider + /// access from the view layer. + /// + [RelayCommand] + internal async Task OpenSignatureDev() + { + await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true); + } + + private ViewModelBase GetACLViewModel(BlogPostDto selectedPost) + { + var sp = ResolveServices(); + var aclClient = sp.GetRequiredService(); + var circleClient = sp.GetRequiredService(); + return new PostAclDialogViewModel(selectedPost, aclClient, circleClient); + } private async Task RefreshPostsAsync() { @@ -517,12 +411,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 { @@ -532,69 +426,28 @@ public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel private void UpdateCommandStates() { - RefreshCommand.NotifyCanExecuteChanged(); + LoadPostsCommand.NotifyCanExecuteChanged(); SaveCommand.NotifyCanExecuteChanged(); DeleteCommand.NotifyCanExecuteChanged(); } - internal async Task InitializeAsync() + + [RelayCommand(CanExecute = nameof(CanManageAcl))] + public async Task ManageAcl() { - if (!IsLoaded) + if (SelectedPost is null) { - await RefreshAsync(); - IsLoaded = true; + StatusMessage = "Select an existing post before managing ACL."; + return; } + await ((App)App.Current!).PushPageAsync(GetACLViewModel(SelectedPost)).ConfigureAwait(true); } - private bool TryAppendAttachmentLinks(BlogPostDto post, IReadOnlyCollection attachments) + [RelayCommand] + public async Task OpenCircles() { - 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(); - - 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; + var circlesVm = ResolveServices().GetRequiredService(); + await ((App)App.Current!).PushPageAsync(circlesVm).ConfigureAwait(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); } diff --git a/src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs similarity index 56% rename from src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs rename to src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs index be1b220fa..ae9e71d5e 100644 --- a/src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Net; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; @@ -10,17 +8,9 @@ using Yavsc.Blogspot; using Yavsc.Api.Client; using Yavsc.Api.Client.Dtos; using Yavsc.Abstract.BlogSpot; -using Yavsc.Abstract.Identity.Security; -using System.Net.Http; namespace PostIt.ViewModels; -public sealed class PostAclEntry -{ - public long CircleId { get; init; } - public string CircleName { get; init; } = string.Empty; -} - /// /// View model for the "Gérer l'ACL" modal of a single blog post. /// @@ -37,7 +27,7 @@ public sealed class PostAclEntry /// any 403 / 404 will surface as an exception caught by the /// command and routed to . /// -public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewModel +public partial class PostAclDialogViewModel : ViewModelBase { private readonly BlogAclApiClient _aclClient; private readonly CircleApiClient _circleClient; @@ -51,7 +41,7 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo MyCircles { get; set; } = new(); [ObservableProperty] - public partial ObservableCollection + public partial ObservableCollection AclEntries { get; set; } = new(); [ObservableProperty] @@ -61,10 +51,7 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo 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 partial string StatusMessage { get; set; } = string.Empty; /// /// Idempotency gate for : the dialog @@ -90,9 +77,6 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo Post = post ?? throw new ArgumentNullException(nameof(post)); _aclClient = aclClient ?? throw new ArgumentNullException(nameof(aclClient)); _circleClient = circleClient ?? throw new ArgumentNullException(nameof(circleClient)); - - AclEntries = new ObservableCollection(post.GetACL().Select(a => ToAclEntry(a.CircleId))); - SelectedCircleToAdd = null; } public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); } @@ -106,24 +90,23 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo IsBusy = true; try { - // Load circles for the picker. ACL entries come from the - // BlogPostDto detail payload (source of truth for initial state). + // Load circles and ACL entries in parallel — both are + // independent reads on the same host. The caller's uid + // is implicit in both endpoints. var circlesTask = _circleClient.GetMyCirclesAsync(); - await Task.WhenAll(circlesTask); + var aclTask = _aclClient.GetMyAclAsync(); + await Task.WhenAll(circlesTask, aclTask); var circles = circlesTask.Result ?? new List(); MyCircles = new ObservableCollection(circles); - // Resolve labels now that circles are available. - AclEntries = new ObservableCollection(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,44 +119,31 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo { if (SelectedCircleToAdd is null) { - this.SetWarningStatus("Sélectionnez un cercle à ajouter"); + StatusMessage = "Sélectionnez un cercle à ajouter"; return; } IsBusy = true; try { - if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id)) - { - this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé"); - return; - } - - var created = await _aclClient.GrantAsync(new PostAccessControlRulePayload + var created = await _aclClient.GrantAsync(new Yavsc.Abstract.BlogSpot.PostAccessControlRulePayload { CircleId = SelectedCircleToAdd.Id, BlogPostId = Post.Id }); if (created is not null) { - AclEntries.Add(ToAclEntry(created.CircleId)); - this.SetInfoStatus($"Cercle « {SelectedCircleToAdd.Name} » autorisé"); + AclEntries.Add(created); + 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) - { - // 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é"); - } catch (Exception ex) { - this.SetErrorStatus($"Erreur: {ex.Message}"); + StatusMessage = $"Erreur: {ex.Message}"; } finally { @@ -182,47 +152,23 @@ public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewMo } [RelayCommand] - public async Task RevokeAsync(PostAclEntry? acl) + public async Task RevokeAsync(PostAccessControlRulePayload? acl) { if (acl is null) return; IsBusy = true; try { await _aclClient.RevokeAsync(acl.CircleId); - var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId); - if (existing is not null) - AclEntries.Remove(existing); - this.SetInfoStatus("Autorisation révoquée"); + AclEntries.Remove(acl); + StatusMessage = "Autorisation révoquée"; } catch (Exception ex) { - this.SetErrorStatus($"Erreur: {ex.Message}"); + StatusMessage = $"Erreur: {ex.Message}"; } finally { IsBusy = false; } } - - private async Task ReloadAclEntriesFromServerAsync() - { - var allAcl = await _aclClient.GetMyAclAsync(); - var currentPostAcl = (allAcl ?? new List()) - .Where(a => a.BlogPostId == Post.Id) - .Select(a => ToAclEntry(a.CircleId)) - .GroupBy(a => a.CircleId) - .Select(g => g.First()) - .ToList(); - AclEntries = new ObservableCollection(currentPostAcl); - } - - private PostAclEntry ToAclEntry(long circleId) - { - var circleName = MyCircles.FirstOrDefault(c => c.Id == circleId)?.Name; - return new PostAclEntry - { - CircleId = circleId, - CircleName = string.IsNullOrWhiteSpace(circleName) ? $"Cercle #{circleId}" : circleName - }; - } } diff --git a/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs b/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs deleted file mode 100644 index 0229cca49..000000000 --- a/src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; - -namespace PostIt.ViewModels; - -public abstract class RemoteViewModelBase : ViewModelBase -{ - public abstract Task LoadAsync(); - - -} diff --git a/src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs b/src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs similarity index 100% rename from src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs rename to src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs diff --git a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings.cs similarity index 73% rename from src/PostIt/PostIt/ViewModels/Settings/Settings.cs rename to src/PostIt/PostIt/ViewModels/Settings.cs index 35d5a59fe..fd87d772e 100644 --- a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs +++ b/src/PostIt/PostIt/ViewModels/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] - public string? SettingsFileFullName { get; private set; } + const string SettingsFileName = "postit-settings.json"; [ObservableProperty] public partial AuthenticationSettings Authentication { get; set; } = new(); @@ -28,81 +26,7 @@ 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/"; - - [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; - - - /// - /// True when the in-memory state has drifted from the last - /// or snapshot. The - /// Settings page binds the Sauver button's IsEnabled to - /// this flag, so it only enables when the user has actually - /// touched something since the last load / save. Cleared by - /// (and by ), set by - /// every successful setter on the four top-level mutable - /// properties and on the sub-properties of - /// . - /// - [ObservableProperty] - public partial bool IsDirty { get; private set; } = false; - - - /// - /// Guards every mutation of the observable state. [ObservableProperty] - /// generates setters that call SetProperty(...) which fires - /// PropertyChanged. Avalonia bindings consume that event on - /// the UI thread, and a stray background-thread update is exactly - /// what crashed DataValidationErrors.SetErrors on - /// postit://callback re-launches. The lock makes mutations - /// atomic; - /// then marshals the notification onto the UI thread so bindings - /// observe the change on the right thread. - /// - private readonly object _mutationGate = new(); - - /// - /// Scopes the PostIt client always requires from the OIDC provider, - /// regardless of what the user has in their settings file. - /// - /// PostIt calls into the Blog API (and any other Yavsc API - /// gated by an [Authorize("…Scope")] 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. blogs) are still their choice — we only force the - /// structural ones that OIDC itself needs. - /// - 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), - }; - } + public partial string BusinessApiUrl { get; set; } = "https://business.pschneider.fr/api/v1/"; /// /// Catch top-level mutations: the four ObservableProperty @@ -118,9 +42,7 @@ 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 OnSearchTextChanged(string value) => MarkDirty(); - partial void OnProviderOngoingRequestsSortOptionChanged(string value) => MarkDirty(); + partial void OnBusinessApiUrlChanged(string value) => MarkDirty(); /// /// Authentication can be reassigned wholesale by @@ -141,6 +63,35 @@ public partial class Settings : ViewModelBase MarkDirty(); } + public bool Loaded { get; private set; } = false; + + /// + /// True when the in-memory state has drifted from the last + /// or snapshot. The + /// Settings page binds the Sauver button's IsEnabled to + /// this flag, so it only enables when the user has actually + /// touched something since the last load / save. Cleared by + /// (and by ), set by + /// every successful setter on the four top-level mutable + /// properties and on the sub-properties of + /// . + /// + [ObservableProperty] + public partial bool IsDirty { get; private set; } = false; + + /// + /// Guards every mutation of the observable state. [ObservableProperty] + /// generates setters that call SetProperty(...) which fires + /// PropertyChanged. Avalonia bindings consume that event on + /// the UI thread, and a stray background-thread update is exactly + /// what crashed DataValidationErrors.SetErrors on + /// postit://callback re-launches. The lock makes mutations + /// atomic; + /// then marshals the notification onto the UI thread so bindings + /// observe the change on the right thread. + /// + private readonly object _mutationGate = new(); + /// /// Build OidcClient options configured for Authorization Code + PKCE /// (no client secret). The browser implementation should be supplied @@ -155,8 +106,6 @@ public partial class Settings : ViewModelBase // build options from a torn read. lock (_mutationGate) { - EnsureAuthenticationDefaultsLocked(); - var options = new OidcClientOptions { Authority = Authentication.Authority, @@ -185,25 +134,24 @@ public partial class Settings : ViewModelBase } } - private void EnsureAuthenticationDefaultsLocked() + /// + /// Scopes the PostIt client always requires from the OIDC provider, + /// regardless of what the user has in their settings file. + /// + /// PostIt calls into the Blog API (and any other Yavsc API + /// gated by an [Authorize("…Scope")] 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. blogs) are still their choice — we only force the + /// structural ones that OIDC itself needs. + /// + private static readonly string[] BuiltInScopes = new[] { - Authentication ??= new AuthenticationSettings(); - - if (string.IsNullOrWhiteSpace(Authentication.Authority)) - Authentication.Authority = AuthenticationSettings.DefaultAuthority; - - 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(); - } - + "openid", // OIDC: required for the id_token + "profile", // OIDC: standard profile claims + "offline_access" // OIDC: required to receive a refresh_token + }; /// /// Merge user-configured scopes with the built-in ones. User scopes @@ -256,42 +204,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" - ); + Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + "PostIt" +); + Directory.CreateDirectory(configDir); - if (SettingsFileFullName is not null) - { - // 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"); - } + string configPath = Path.Combine(configDir, SettingsFileName); - FileInfo configFileInfo = new FileInfo(SettingsFileFullName); + FileInfo configFileInfo = new FileInfo(configPath); if (!configFileInfo.Exists) { @@ -320,7 +242,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 +293,8 @@ public partial class Settings : ViewModelBase // → our overridden dispatcher-safe marshaller below. else lock (_mutationGate) { - var legacyApiUrl = TryReadApiUrl(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) - ? settings.ApiUrl - : this.ApiUrl; - this.SearchText = settings.SearchText ?? string.Empty; - this.ProviderOngoingRequestsSortOption = settings.ProviderOngoingRequestsSortOption ?? string.Empty; if (!(settings.Authentication is null)) { this.Authentication = new AuthenticationSettings(); @@ -394,13 +306,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; + 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,26 +338,6 @@ public partial class Settings : ViewModelBase } } - private static string? TryReadApiUrl(string json) - { - try - { - using var doc = JsonDocument.Parse(json); - if (doc.RootElement.TryGetProperty("ApiUrl", out var apiUrl) - && apiUrl.ValueKind == JsonValueKind.String) - { - return apiUrl.GetString(); - } - } - catch - { - // Ignore legacy payload parse errors: normal deserialization - // already reports actionable diagnostics to the caller. - } - - return null; - } - private void UseDefaultSettings() { this.Authentication = new AuthenticationSettings @@ -458,10 +348,6 @@ public partial class Settings : ViewModelBase Scopes = AuthenticationSettings.DefaultScopes }; this.DarkMode = false; - this.BlogsApiUrl = "https://blogs.pschneider.fr/api/v1/"; - this.ApiUrl = "https://api.pschneider.fr/api/v1/"; - this.SearchText = string.Empty; - this.ProviderOngoingRequestsSortOption = string.Empty; } /// @@ -482,19 +368,11 @@ public partial class Settings : ViewModelBase [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 = SettingsFileFullName!; - Directory.CreateDirectory(Path.GetDirectoryName(configPath)!); + var configDir = Path.Combine( + Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + "PostIt"); + Directory.CreateDirectory(configDir); + var configPath = Path.Combine(configDir, SettingsFileName); lock (_mutationGate) { @@ -509,13 +387,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; } diff --git a/src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs b/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs similarity index 90% rename from src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs rename to src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs index 23ba70cf9..b4b37974b 100644 --- a/src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs @@ -30,7 +30,7 @@ namespace PostIt.ViewModels; /// until the Yavsc.Org endpoint exists; the contract there will /// be POST /api/signature/{devisId} with this same payload. /// -public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewModel +public partial class SignaturePageViewModel : ViewModelBase { /// /// 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; } diff --git a/src/PostIt/PostIt/ViewModels/ViewModelBase.cs b/src/PostIt/PostIt/ViewModels/ViewModelBase.cs index 307837645..4ca69eea0 100644 --- a/src/PostIt/PostIt/ViewModels/ViewModelBase.cs +++ b/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 { /// /// Gets if the user can navigate to the next page diff --git a/src/PostIt/PostIt/Views/Activity/ActivitiesPage.axaml b/src/PostIt/PostIt/Views/Activity/ActivitiesPage.axaml deleted file mode 100644 index a34d8edf2..000000000 --- a/src/PostIt/PostIt/Views/Activity/ActivitiesPage.axaml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - -