diff --git a/.forgejo/workflows/buildAndTest.yml b/.forgejo/workflows/buildAndTest.yml index ea58d2fef..b9e6f17b2 100644 --- a/.forgejo/workflows/buildAndTest.yml +++ b/.forgejo/workflows/buildAndTest.yml @@ -31,6 +31,7 @@ jobs: steps: - name: Clone yavsc run: | + set -e cd /src git clone https://forgejo.pschneider.fr/notazof/yavsc.git _src cd _src @@ -40,12 +41,23 @@ 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" \ - --logger "xunit;LogFileName=test-results.xml" \ - && echo "✅ Success !" || echo "❌ Fail ($?)!" + --filter="Category!=Platform-Android" diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index a72f92bd6..911fc831d 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -175,6 +175,12 @@ 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: | @@ -200,6 +206,7 @@ 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/.gitignore b/.gitignore index b7813f604..056cf69d2 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ appsettings-*.*.json generated/ *.tmp +tmp/ DataDir/ *.tests.trx diff --git a/.gitleaksignore b/.gitleaksignore new file mode 100644 index 000000000..056cf69d2 --- /dev/null +++ b/.gitleaksignore @@ -0,0 +1,45 @@ +# 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 dc8d3c68d..d5088f01d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,6 +4,22 @@ // 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", @@ -20,10 +36,10 @@ "port": 55555 }, { - "name": "API", + "name": "Yavsc API", "type": "dotnet", "request": "launch", - "projectPath": "${workspaceFolder}/src/Api/Api.csproj" + "projectPath": "${workspaceFolder}/src/Yavsc.Api/Yavsc.Api.csproj" }, { "name": "Yavsc Org", @@ -37,12 +53,7 @@ "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 a30c9c065..71384cd8c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -47,7 +47,10 @@ "group": "build", "isBuildCommand": true, "isTestCommand": false, - "isBackground": true + "isBackground": true, + "options": { + "cwd": "${workspaceFolder}" + } }, { "label": "test blogs backend", @@ -63,6 +66,28 @@ "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", @@ -76,6 +101,21 @@ "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 1c7c92595..111c1491a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,58 @@ # Changelog +## [1.0.8-rc14] - unstable + +### Added + +* [PostIt] Ajout d'un `BillingQueryDetailsPageViewModel` et de sa page associee pour afficher le detail d'une commande billing depuis l'historique. +* [PostIt] Ajout d'un mode detail avec section metier (statut, date, description, motif, infos) et section technique repliable (code, client, provision, lieu, prestations). +* [PostIt] Ajout d'un badge de statut enrichi (couleur + pictogramme) sur le detail d'une commande pour visualiser l'etat en un coup d'oeil. +* [PostIt] Ajout d'un bloc d'actions rapide en tete du detail (`Retour`, `Ouvrir en edition`) pour eviter le scroll jusqu'au bas de page. +* [PostIt] Ajout d'un style monospace sur les metadonnees techniques (code billing, client, provision, lieu, prestations) pour faciliter la lecture des identifiants et valeurs brutes. + +### Changed + +* [PostIt] Le bouton d'ouverture depuis la liste billing ouvre maintenant une page de detail dediee avant l'eventuelle edition. +* [PostIt] Amelioration UX des pages billing: badges de statut colores, actions remontees en haut de page, et typographie monospace sur les metadonnees techniques. + +### Fixed + +* [Yavsc.Api] Correction d'un 500 sur le refresh du catalogue d'activites lorsque `Activity.Description` est `NULL` en base (nullabilite explicite + projection null-safe + gardes sur codes vides). +* [Yavsc.Api] Correction des erreurs 400/500 sur les routes billing (`Rdv`, `Brush`, `MBrush`) en imposant `ClientId` depuis l'utilisateur authentifie et en ignorant les champs server-owned lors de la validation modele. +* [Yavsc.Api] Correction du `PUT /api/v1/billing/Rdv/{id}`: mise a jour controlee de l'entite existante (et non remplacement brut du graphe JSON), ce qui supprime les `BadRequest` parasites. +* [Yavsc.Api] Correction PostgreSQL `timestamptz` sur RDV: normalisation UTC de `EventDate` sur `POST/PUT /api/v1/billing/Rdv` pour eviter l'erreur `Cannot write DateTime with Kind=Local`. +* [Yavsc.Api] Correction du flux FrontOffice accept/reject de query: sauvegarde avec contexte utilisateur et fallback d'injection pour `IBillingService` afin d'eviter les erreurs serveur en environnement de test. +* [Yavsc.Blogs] Correction des `BadRequest` sur `POST/PUT /api/v1/blogspot` avec payload JSON (PostIt): les proprietes de navigation/serveur (`Author`, `Tags`, `Comments`, audit) ne bloquent plus la validation. +* [Yavsc.Org] Correction du flux MVC de creation de commentaire: `SaveChangesAsync(userId)` est utilise pour renseigner les champs d'audit requis (`UserCreated`/`UserModified`). +* [Yavsc.Api.Test] Stabilisation des fixtures de seed billing: remplissage des metadonnees d'audit (`UserCreated`, `UserModified`, dates) pour eviter les echecs SQLite `NOT NULL`. + +## [1.0.8-rc13] - unstable + +### Added + +* [PostIt] Integration d'un selecteur de lieu RDV base sur Mapsui (carte interactive dans le formulaire `Rdv`). +* [PostIt] Ajout d'un marqueur de position et d'une action de recentrage sur la carte RDV. +* [PostIt] Ajout d'un service de reverse geocoding pour suggerer une adresse a partir des coordonnees carte. +* [PostIt] Cache et debounce des resolutions d'adresse RDV pour limiter les appels reseau et lisser l'UX. +* [PostIt.Tests] Nouvelles non-regressions sur le panneau d'adresse suggeree RDV et le comportement de la carte. +* [Yavsc.Abstract] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable. +* [Yavsc.Server] Activation de `#nullable enable annotations` sur les fichiers legacy avec annotations nullable. + +### Changed + +* [PostIt] Generalisation de la barre de statut d'action (severite explicite) sur pages principales, dialogues et formulaires billing. +* [PostIt] Harmonisation des messages de statut utilisateur en francais. +* [PostIt] Renforcement des gardes de navigation dans les flux de gestion des membres de cercle. +* [PostIt] Le flux RDV conserve l'adresse saisie manuellement et propose l'adresse resolue comme suggestion explicite. +* [PostIt] Le flux de geolocalisation RDV tolere les positions proches dans le cache de suggestion d'adresse. + +### Fixed + +* [PostIt.Desktop] Correction d'un crash au demarrage OIDC (`No authority specified`) via durcissement des valeurs par defaut de configuration d'authentification. +* [PostIt] Correction de la persistance des settings: l'etat runtime de statut n'est plus serialize dans le JSON utilisateur. +* [PostIt.Tests] Ajout d'un verrou de non-regression sur le premier chargement des settings. +* [PostIt] Correction du binding de la date RDV: `DatePicker.SelectedDate` est aligne sur un proxy `DateTimeOffset?` (`EventDateSelection`). + ## [1.0.8-rc12] - unstable ### Added diff --git a/Makefile b/Makefile index 08f0461d2..d99fe5e5e 100644 --- a/Makefile +++ b/Makefile @@ -48,70 +48,4 @@ docker-build: docker-run: docker run -d -p 5000:5000 --name yavsc yavsc -# 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 - @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 +.PHONY: test install docker-image docker-build docker-run diff --git a/contrib/Makefile b/contrib/Makefile index 79145668f..4e4ef4df6 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -95,6 +95,15 @@ 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 diff --git a/contrib/README.md b/contrib/README.md deleted file mode 100644 index 011561560..000000000 --- a/contrib/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Read me - -## Note aux icones - -㝉®🅬⛒⛑🩎🩺🞫🞮🞕🞖🞆🔴🔵🔲🖂🔧🔩🔐🔌💾💼💬💭👿👾🏷🎯🏹🌍🎎💩 diff --git a/dotnet-tools.json b/dotnet-tools.json index b0e38abda..1762a89de 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -1,5 +1,13 @@ { "version": 1, "isRoot": true, - "tools": {} + "tools": { + "picket": { + "version": "0.2.12", + "commands": [ + "picket" + ], + "rollForward": false + } + } } \ No newline at end of file diff --git a/src/PostIt/Directory.Packages.props b/src/PostIt/Directory.Packages.props index 4dd4b2889..2f27340e9 100644 --- a/src/PostIt/Directory.Packages.props +++ b/src/PostIt/Directory.Packages.props @@ -16,6 +16,8 @@ + + diff --git a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs index 04cc0f314..6cac39603 100644 --- a/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs @@ -162,6 +162,12 @@ public class ActivitiesPageViewModelTests 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/BillingCommandPageViewModelTests.cs b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs index c7b5b926b..34804b4cd 100644 --- a/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs @@ -115,6 +115,89 @@ public class BillingCommandPageViewModelTests } } + [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() { @@ -269,6 +352,12 @@ public class BillingCommandPageViewModelTests 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 index a7f2b0844..e53139351 100644 --- a/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs +++ b/src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs @@ -45,10 +45,8 @@ public class BillingQueriesPageViewModelTests Assert.Equal(2, vm.Queries.Count); Assert.All(vm.Queries, q => Assert.DoesNotContain("Rejected", q.StatusLabel, StringComparison.OrdinalIgnoreCase)); Assert.Contains("lecture seule", vm.StatusMessage, StringComparison.OrdinalIgnoreCase); - Assert.False(vm.CanOpenDetails); - vm.SelectedQuery = vm.Queries[0]; - Assert.False(vm.OpenSelectedQueryCommand.CanExecute(null)); + Assert.True(vm.Queries.Count > 0); } private sealed class StubBillingApi : IYavscApiClient @@ -129,6 +127,12 @@ public class BillingQueriesPageViewModelTests 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/EstimateEditionPageViewModelTests.cs b/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs new file mode 100644 index 000000000..db70e25fa --- /dev/null +++ b/src/PostIt/PostIt.Tests/EstimateEditionPageViewModelTests.cs @@ -0,0 +1,270 @@ +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 new file mode 100644 index 000000000..16f01c5e9 --- /dev/null +++ b/src/PostIt/PostIt.Tests/HomePageProviderFlowTests.cs @@ -0,0 +1,15 @@ +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 d1d00532d..f72c8d4d5 100644 --- a/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs +++ b/src/PostIt/PostIt.Tests/MainPageButtonsTests.cs @@ -8,6 +8,8 @@ using Yavsc.Blogspot; using PostIt.Services; using PostIt.ViewModels; using PostIt.Views; +using PostIt.Views.Blogs; +using PostIt.Helpers; namespace PostIt.Tests; @@ -72,13 +74,13 @@ public class MainPageButtonsTests { } } - private static MainViewModel MakeViewModel(BlogPostDto? selectedPost = null) + private static BlogsViewModel MakeViewModel(BlogPostDto? selectedPost = null) { var api = new ThrowingApi(); var blog = new BlogApiClient(api, "http://localhost/"); var circle = new CircleApiClient(api, "http://localhost/"); var acl = new BlogAclApiClient(api, "http://localhost/"); - // Minimal DI graph: only what MainPageViewModel resolves + // Minimal DI graph: only what BlogsViewModel resolves // when the user clicks a navigation button. Today that's // SignaturePageViewModel / CirclesPageViewModel / ACL // dependencies. The graph intentionally stays local to this @@ -93,7 +95,7 @@ public class MainPageButtonsTests services.AddTransient(); services.AddTransient(); services.AddTransient(); - var vm = new MainViewModel(blog, services: services.BuildServiceProvider()); + var vm = new BlogsViewModel(blog, services: services.BuildServiceProvider()); if (selectedPost is not null) vm.SelectedPost = selectedPost; return vm; } @@ -101,7 +103,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 @@ -109,13 +111,17 @@ public class MainPageButtonsTests /// realised and KeyPressQwerty has a real /// to dispatch against. /// - private static (MainView window, MainPage page) MountMainPage(MainViewModel vm) + private static (MainView window, BlogsPage page) MountMainPage(BlogsViewModel vm) { var window = new MainView(); - var page = new MainPage { DataContext = vm }; + var page = new BlogsPage { 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); } @@ -145,7 +151,7 @@ public class MainPageButtonsTests } [AvaloniaFact] - public void Acl_button_click_pushes_a_page_onto_nav_stack() + public async Task 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 @@ -178,7 +184,7 @@ public class MainPageButtonsTests } [AvaloniaFact] - public void Circles_button_click_pushes_a_page_onto_nav_stack() + public async Task 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. @@ -203,7 +209,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 - // MainPageViewModel.OpenSignatureDevCommand [RelayCommand]. + // BlogsViewModel.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 0fd5627c8..519cd141d 100644 --- a/src/PostIt/PostIt.Tests/MainPageSaveTests.cs +++ b/src/PostIt/PostIt.Tests/MainPageSaveTests.cs @@ -5,10 +5,11 @@ 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 @@ -40,9 +41,9 @@ public class MainPageSaveTests var recorder = new CallRecorder(); var api = new RecordingYavscApiClient(recorder); var blog = new BlogApiClient(api, "http://localhost/"); - var viewModel = new MainViewModel(blog); + var viewModel = new BlogsViewModel(blog); - var page = new MainPage { DataContext = viewModel }; + var page = new BlogsPage { 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 @@ -63,9 +64,7 @@ public class MainPageSaveTests const string typed = "Mon premier billet"; titleBox.Text = typed; - var saveButton = window.GetVisualDescendants() - .OfType -public partial class AddCircleMemberDialogViewModel : ViewModelBase +public partial class AddCircleMemberDialogViewModel : ViewModelBase, IActionStatusViewModel { private readonly IUserDirectory _directory; @@ -46,7 +46,10 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase public partial bool IsBusy { get; set; } [ObservableProperty] - public partial string StatusMessage { get; set; } = string.Empty; + public partial string StatusMessage { get; set; } = "Pret."; + + [ObservableProperty] + public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret."); /// /// Raised when the user confirms a selection. The hosting @@ -79,7 +82,7 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase if (string.IsNullOrWhiteSpace(SearchQuery)) { Results.Clear(); - StatusMessage = "Tapez un nom ou un email"; + this.SetWarningStatus("Tapez un nom ou un email"); return; } @@ -88,11 +91,11 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase { var hits = await _directory.SearchAsync(SearchQuery, CancellationToken.None).ConfigureAwait(true); Results = new ObservableCollection(hits ?? Array.Empty()); - StatusMessage = $"{Results.Count} résultat(s)"; + this.SetInfoStatus($"{Results.Count} résultat(s)"); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -110,18 +113,20 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase { if (Selected is null) { - StatusMessage = "Sélectionnez un utilisateur"; + this.SetWarningStatus("Sélectionnez un utilisateur"); return; } Confirmed?.Invoke(this, Selected); - var app = App.Current as App; + var app = App.Current as App + ?? throw new InvalidOperationException("Application PostIt indisponible."); await app.GoBackAsync(); } [RelayCommand] public async Task CloseAsync() { - var app = App.Current as App; + var app = App.Current as App + ?? throw new InvalidOperationException("Application PostIt indisponible."); await app.GoBackAsync(); } } diff --git a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs similarity index 84% rename from src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs rename to src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs index 9cee3ea8c..cd068b4f4 100644 --- a/src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/ACL/CirclesPageViewModel.cs @@ -34,7 +34,7 @@ namespace PostIt.ViewModels; /// . The "remove" /// command is per-row and runs inline. /// -public partial class CirclesPageViewModel : ViewModelBase +public partial class CirclesPageViewModel : ViewModelBase, IActionStatusViewModel { private readonly CircleApiClient _client; @@ -63,8 +63,10 @@ public partial class CirclesPageViewModel : ViewModelBase public partial bool IsBusy { get; set; } [ObservableProperty] - public partial string StatusMessage { get; set; } = string.Empty; + public partial string StatusMessage { get; set; } = "Pret."; + [ObservableProperty] + public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret."); public CirclesPageViewModel(CircleApiClient client) { @@ -100,11 +102,11 @@ public partial class CirclesPageViewModel : ViewModelBase { var list = await _client.GetMyCirclesAsync(); Circles = new ObservableCollection(list ?? new()); - StatusMessage = $"{Circles.Count} cercle(s)"; + this.SetInfoStatus($"{Circles.Count} cercle(s)"); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -115,8 +117,10 @@ public partial class CirclesPageViewModel : ViewModelBase [RelayCommand] internal async Task OpenAddMemberAsync() { - var app = Application.Current as App; - var services = app?.ServiceProvider; + var app = Application.Current as App + ?? throw new InvalidOperationException("Application PostIt indisponible."); + var services = app.ServiceProvider + ?? throw new InvalidOperationException("ServiceProvider PostIt indisponible."); var directory = services.GetRequiredService(); AddCircleMemberDialogViewModel model = new AddCircleMemberDialogViewModel(directory); @@ -147,11 +151,11 @@ public partial class CirclesPageViewModel : ViewModelBase { var list = await _client.GetMembersAsync(circleId); Members = new ObservableCollection(list ?? new()); - StatusMessage = $"{Members.Count} membre(s)"; + this.SetInfoStatus($"{Members.Count} membre(s)"); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); Members = new ObservableCollection(); } finally @@ -166,7 +170,7 @@ public partial class CirclesPageViewModel : ViewModelBase SelectedCircle = null; DraftName = string.Empty; DraftPublic = false; - StatusMessage = "Nouveau cercle"; + this.SetInfoStatus("Nouveau cercle"); } [RelayCommand] @@ -176,7 +180,7 @@ public partial class CirclesPageViewModel : ViewModelBase SelectedCircle = circle; DraftName = circle.Name; DraftPublic = circle.Public; - StatusMessage = $"Édition de « {circle.Name} »"; + this.SetInfoStatus($"Édition de « {circle.Name} »"); } [RelayCommand] @@ -184,7 +188,7 @@ public partial class CirclesPageViewModel : ViewModelBase { if (string.IsNullOrWhiteSpace(DraftName)) { - StatusMessage = "Le nom est obligatoire"; + this.SetWarningStatus("Le nom est obligatoire"); return; } @@ -198,22 +202,22 @@ public partial class CirclesPageViewModel : ViewModelBase Name = DraftName.Trim(), Public = DraftPublic, }); - StatusMessage = created is null - ? "Création échouée" - : $"Cercle « {created.Name} » créé"; + this.SetStatus( + created is null ? "Création échouée" : $"Cercle « {created.Name} » créé", + created is null ? StatusSeverity.Warning : StatusSeverity.Info); } else { SelectedCircle.Name = DraftName.Trim(); SelectedCircle.Public = DraftPublic; await _client.UpdateCircleAsync(SelectedCircle.Id, SelectedCircle); - StatusMessage = $"Cercle « {SelectedCircle.Name} » mis à jour"; + this.SetInfoStatus($"Cercle « {SelectedCircle.Name} » mis à jour"); } await RefreshAsync(); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -229,7 +233,7 @@ public partial class CirclesPageViewModel : ViewModelBase try { await _client.DeleteCircleAsync(circle.Id); - StatusMessage = $"Cercle « {circle.Name} » supprimé"; + this.SetInfoStatus($"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 @@ -240,7 +244,7 @@ public partial class CirclesPageViewModel : ViewModelBase } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -261,7 +265,7 @@ public partial class CirclesPageViewModel : ViewModelBase try { await _client.AddMemberAsync(SelectedCircle.Id, picked.Id); - StatusMessage = $"« {picked.DisplayName} » ajouté au cercle"; + this.SetInfoStatus($"« {picked.DisplayName} » ajouté au cercle"); await LoadMembersAsync(SelectedCircle.Id); } catch (Exception ex) @@ -276,7 +280,7 @@ public partial class CirclesPageViewModel : ViewModelBase var msg = ex.Message.Contains("409") || ex.Message.Contains("Conflict") ? "Déjà membre du cercle" : $"Erreur: {ex.Message}"; - StatusMessage = msg; + this.SetStatus(msg, msg == "Déjà membre du cercle" ? StatusSeverity.Warning : StatusSeverity.Error); } finally { @@ -297,11 +301,11 @@ public partial class CirclesPageViewModel : ViewModelBase { await _client.RemoveMemberAsync(SelectedCircle.Id, member.Id); Members.Remove(member); - StatusMessage = $"« {member.UserName} » retiré du cercle"; + this.SetInfoStatus($"« {member.UserName} » retiré du cercle"); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { diff --git a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs b/src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs similarity index 87% rename from src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs rename to src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs index 605446068..be1b220fa 100644 --- a/src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/ACL/PostAclDialogViewModel.cs @@ -37,7 +37,7 @@ public sealed class PostAclEntry /// any 403 / 404 will surface as an exception caught by the /// command and routed to . /// -public partial class PostAclDialogViewModel : ViewModelBase +public partial class PostAclDialogViewModel : ViewModelBase, IActionStatusViewModel { private readonly BlogAclApiClient _aclClient; private readonly CircleApiClient _circleClient; @@ -61,7 +61,10 @@ public partial class PostAclDialogViewModel : ViewModelBase public partial bool IsBusy { get; set; } [ObservableProperty] - public partial string StatusMessage { get; set; } = string.Empty; + public partial string StatusMessage { get; set; } = "Pret."; + + [ObservableProperty] + public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret."); /// /// Idempotency gate for : the dialog @@ -115,12 +118,12 @@ public partial class PostAclDialogViewModel : ViewModelBase AclEntries = new ObservableCollection(AclEntries.Select(a => ToAclEntry(a.CircleId))); - StatusMessage = $"{AclEntries.Count} autorisation(s)"; + this.SetInfoStatus($"{AclEntries.Count} autorisation(s)"); _loaded = true; } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -133,7 +136,7 @@ public partial class PostAclDialogViewModel : ViewModelBase { if (SelectedCircleToAdd is null) { - StatusMessage = "Sélectionnez un cercle à ajouter"; + this.SetWarningStatus("Sélectionnez un cercle à ajouter"); return; } @@ -142,7 +145,7 @@ public partial class PostAclDialogViewModel : ViewModelBase { if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id)) { - StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé"; + this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé"); return; } @@ -154,11 +157,11 @@ public partial class PostAclDialogViewModel : ViewModelBase if (created is not null) { AclEntries.Add(ToAclEntry(created.CircleId)); - StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé"; + this.SetInfoStatus($"Cercle « {SelectedCircleToAdd.Name} » autorisé"); } else { - StatusMessage = "Autorisation refusée par le serveur"; + this.SetWarningStatus("Autorisation refusée par le serveur"); } } catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Conflict) @@ -166,11 +169,11 @@ public partial class PostAclDialogViewModel : ViewModelBase // Conflict means the link already exists in backend. Resync // from the dedicated ACL API so the UI reflects server truth. await ReloadAclEntriesFromServerAsync(); - StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé"; + this.SetWarningStatus($"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé"); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -189,11 +192,11 @@ public partial class PostAclDialogViewModel : ViewModelBase var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId); if (existing is not null) AclEntries.Remove(existing); - StatusMessage = "Autorisation révoquée"; + this.SetInfoStatus("Autorisation révoquée"); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { diff --git a/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs similarity index 86% rename from src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs rename to src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs index 2dc8938f3..bd13faf9b 100644 --- a/src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Activity/ActivitiesPageViewModel.cs @@ -13,7 +13,7 @@ using Yavsc.Api.Client; namespace PostIt.ViewModels; -public partial class ActivitiesPageViewModel : ViewModelBase +public partial class ActivitiesPageViewModel : ViewModelBase, IActionStatusViewModel { private readonly ActivityApiClient _client; private readonly BillingApiClient _billingClient; @@ -43,6 +43,9 @@ public partial class ActivitiesPageViewModel : ViewModelBase [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)"; @@ -86,11 +89,11 @@ public partial class ActivitiesPageViewModel : ViewModelBase } catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) { - StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } } @@ -102,11 +105,11 @@ public partial class ActivitiesPageViewModel : ViewModelBase } catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) { - StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } } @@ -123,7 +126,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase await ShowActivityAsync(first); if (first is null) { - StatusMessage = "Aucune activité disponible."; + this.SetInfoStatus("Aucune activité disponible."); } } catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) @@ -131,14 +134,14 @@ public partial class ActivitiesPageViewModel : ViewModelBase Activities = new ObservableCollection(); Specializations = new ObservableCollection(); Performers = new ObservableCollection(); - StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."; + 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(); - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -230,19 +233,19 @@ public partial class ActivitiesPageViewModel : ViewModelBase Performers = new ObservableCollection(items); SelectedPerformer = null; - StatusMessage = $"{activity.Name} · {Performers.Count} utilisateur(s)"; + 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; - StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { Performers = new ObservableCollection(); SelectedPerformer = null; - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -259,7 +262,7 @@ public partial class ActivitiesPageViewModel : ViewModelBase { if (SelectedPerformer is null || CurrentActivity is null) { - StatusMessage = "Sélectionnez un utilisateur et une activité avec formulaire."; + this.SetWarningStatus("Sélectionnez un utilisateur et une activité avec formulaire."); return; } diff --git a/src/PostIt/PostIt/ViewModels/ActivityUserDisplayItem.cs b/src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs similarity index 100% rename from src/PostIt/PostIt/ViewModels/ActivityUserDisplayItem.cs rename to src/PostIt/PostIt/ViewModels/Activity/ActivityUserDisplayItem.cs diff --git a/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs similarity index 83% rename from src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs rename to src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs index d5aba0215..aab923d80 100644 --- a/src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Activity/BillingQueriesPageViewModel.cs @@ -14,7 +14,7 @@ using Yavsc.Abstract.Workflow; namespace PostIt.ViewModels; -public partial class BillingQueriesPageViewModel : ViewModelBase +public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusViewModel { private readonly BillingApiClient _billingClient; @@ -36,6 +36,9 @@ public partial class BillingQueriesPageViewModel : ViewModelBase [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}"; @@ -72,7 +75,7 @@ public partial class BillingQueriesPageViewModel : ViewModelBase public Task InitializeAsync() => RefreshAsync(); - private bool CanOpenSelectedQuery() => !IsReadOnly && SelectedQuery is not null; + private bool CanOpenSelectedQuery() => CanOpenDetails && SelectedQuery is not null; [RelayCommand] public async Task RefreshAsync() @@ -90,17 +93,17 @@ public partial class BillingQueriesPageViewModel : ViewModelBase .ToList(); Queries = new ObservableCollection(filtered); - StatusMessage = BuildLoadedStatusMessage(filtered.Count); + this.SetInfoStatus(BuildLoadedStatusMessage(filtered.Count)); } catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) { Queries = new ObservableCollection(); - StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { Queries = new ObservableCollection(); - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -111,15 +114,9 @@ public partial class BillingQueriesPageViewModel : ViewModelBase [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))] public async Task OpenSelectedQueryAsync() { - if (IsReadOnly) - { - StatusMessage = "Mode lecture seule: l'ouverture en modification est désactivée."; - return; - } - if (SelectedQuery is null) { - StatusMessage = "Sélectionnez une commande."; + this.SetWarningStatus("Sélectionnez une commande."); return; } @@ -133,17 +130,22 @@ public partial class BillingQueriesPageViewModel : ViewModelBase try { var details = await _billingClient.GetQueryAsync(Form.ActionName, SelectedQuery.Id).ConfigureAwait(true); - var vm = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient); - await vm!.InitializeAsync(details).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) { - StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { - StatusMessage = $"Erreur lors de l'ouverture: {ex.Message}"; + this.SetErrorStatus($"Erreur lors de l'ouverture: {ex.Message}"); } finally { diff --git a/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs new file mode 100644 index 000000000..cd13daaf1 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDetailsPageViewModel.cs @@ -0,0 +1,208 @@ +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/BillingQueryDisplayItem.cs b/src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs similarity index 100% rename from src/PostIt/PostIt/ViewModels/BillingQueryDisplayItem.cs rename to src/PostIt/PostIt/ViewModels/Activity/BillingQueryDisplayItem.cs diff --git a/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs similarity index 83% rename from src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs rename to src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs index 71f5d67a0..533fbc380 100644 --- a/src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Activity/CommandFormsPageViewModel.cs @@ -11,7 +11,7 @@ using Yavsc.Api.Client; namespace PostIt.ViewModels; -public partial class CommandFormsPageViewModel : ViewModelBase +public partial class CommandFormsPageViewModel : ViewModelBase, IActionStatusViewModel { private readonly BillingApiClient _billingClient; @@ -25,7 +25,10 @@ public partial class CommandFormsPageViewModel : ViewModelBase public partial CommandFormSummary? SelectedForm { get; set; } [ObservableProperty] - public partial string StatusMessage { get; set; } + 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)"; @@ -55,9 +58,11 @@ public partial class CommandFormsPageViewModel : ViewModelBase .OrderBy(f => f.Title) .ThenBy(f => f.ActionName)); SelectedForm = Forms.FirstOrDefault(); - StatusMessage = Forms.Count == 0 - ? "Aucun formulaire n'est disponible pour cette activité." - : "Choisissez le formulaire à utiliser."; + 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; @@ -71,7 +76,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase { if (SelectedForm is null) { - StatusMessage = "Sélectionnez un formulaire."; + this.SetWarningStatus("Sélectionnez un formulaire."); return; } @@ -92,7 +97,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase { if (SelectedForm is null) { - StatusMessage = "Sélectionnez un formulaire."; + this.SetWarningStatus("Sélectionnez un formulaire."); return; } @@ -112,7 +117,7 @@ public partial class CommandFormsPageViewModel : ViewModelBase { if (SelectedForm is null) { - StatusMessage = "Sélectionnez un formulaire."; + this.SetWarningStatus("Sélectionnez un formulaire."); return; } diff --git a/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs new file mode 100644 index 000000000..8f007dc08 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Activity/EstimateEditionPageViewModel.cs @@ -0,0 +1,293 @@ +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 new file mode 100644 index 000000000..864906cdd --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Activity/EstimateLineItemViewModel.cs @@ -0,0 +1,35 @@ +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 new file mode 100644 index 000000000..71e979e66 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Activity/ProviderOngoingRequestsPageViewModel.cs @@ -0,0 +1,390 @@ +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/SelectableHairPrestationItem.cs b/src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs similarity index 100% rename from src/PostIt/PostIt/ViewModels/SelectableHairPrestationItem.cs rename to src/PostIt/PostIt/ViewModels/Activity/SelectableHairPrestationItem.cs diff --git a/src/PostIt/PostIt/ViewModels/MainViewModel.cs b/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs similarity index 78% rename from src/PostIt/PostIt/ViewModels/MainViewModel.cs rename to src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs index f56b666dd..78be2e789 100644 --- a/src/PostIt/PostIt/ViewModels/MainViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Blogs/BlogsViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.ObjectModel; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Avalonia; @@ -8,11 +9,12 @@ 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 MainViewModel : ViewModelBase +public partial class BlogsViewModel : ViewModelBase, IActionStatusViewModel { /// Window/tab title. Cosmetic — bound by /// MainPage.axaml if at all. Not the post title. @@ -54,6 +56,9 @@ public partial class MainViewModel : ViewModelBase [ObservableProperty] public partial string StatusMessage { get; set; } + [ObservableProperty] + public partial StatusNotice ActionStatus { get; set; } = StatusNotice.Info("Pret."); + [ObservableProperty] public partial string SearchText { get; set; } @@ -63,6 +68,9 @@ public partial class MainViewModel : ViewModelBase [ObservableProperty] public partial ObservableCollection FilteredPosts { get; set; } + [ObservableProperty] + public partial ObservableCollection DraftAttachments { get; set; } + [ObservableProperty] public partial BlogPostDto? SelectedPost { get; set; } @@ -84,16 +92,10 @@ public partial class MainViewModel : ViewModelBase Posts.Add(post); } ApplyFilter(); - StatusMessage = $"Loaded {Posts.Count} posts."; + this.SetInfoStatus($"{Posts.Count} billet(s) chargé(s)."); }); } - [RelayCommand] - internal async Task SearchAsync() { - await RefreshAsync(); - ApplyFilter(); - } - [RelayCommand] internal async Task SaveAsync() { @@ -104,12 +106,14 @@ public partial class MainViewModel : ViewModelBase // than to send a request the server will reject. if (string.IsNullOrWhiteSpace(DraftTitle)) { - StatusMessage = "Title is required."; + 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 @@ -130,11 +134,28 @@ public partial class MainViewModel : ViewModelBase DateModified = DateTime.UtcNow, IsPublished = DraftIsPublished }; - var created = await BlogClient!.CreatePostAsync(draft); + var created = await BlogClient!.CreatePostAsync(draft, attachments); if (created is not null) { SelectedPost = created; - StatusMessage = $"Created post {created.Id}."; + + if (TryAppendAttachmentLinks(created, attachments)) + { + var linkUpdate = new BlogPostDto + { + Id = created.Id, + AuthorId = created.AuthorId, + Photo = created.Photo, + Title = DraftTitle, + Article = DraftArticle ?? string.Empty, + DateCreated = created.DateCreated, + DateModified = DateTime.UtcNow, + }; + await BlogClient.UpdatePostAsync(created.Id, linkUpdate); + } + + this.SetInfoStatus($"Billet {created.Id} créé."); + DraftAttachments.Clear(); } } else @@ -149,8 +170,26 @@ public partial class MainViewModel : ViewModelBase DateCreated = SelectedPost.DateCreated, DateModified = DateTime.UtcNow, }; - await BlogClient!.UpdatePostAsync(SelectedPost.Id, update); - StatusMessage = $"Saved post {SelectedPost.Id}."; + + 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(); @@ -162,14 +201,14 @@ public partial class MainViewModel : ViewModelBase { if (SelectedPost is null || SelectedPost.Id == 0) { - StatusMessage = "Select an existing post before deleting."; + this.SetWarningStatus("Sélectionnez un billet existant avant suppression."); return; } await ExecuteAsync(async () => { await BlogClient!.DeletePostAsync(SelectedPost.Id); - StatusMessage = $"Deleted post {SelectedPost.Id}."; + this.SetInfoStatus($"Billet {SelectedPost.Id} supprimé."); SelectedPost = null; await RefreshPostsAsync(); }); @@ -194,7 +233,7 @@ public partial class MainViewModel : ViewModelBase { if (SelectedPost is null || SelectedPost.Id == 0) { - StatusMessage = "Sélectionnez un billet existant pour changer sa publication."; + this.SetWarningStatus("Sélectionnez un billet existant pour changer sa publication."); return; } @@ -211,9 +250,9 @@ public partial class MainViewModel : ViewModelBase // locally flipped state until the round-trip // re-hydrates it. SelectedPost.IsPublished = publish; - StatusMessage = publish + this.SetInfoStatus(publish ? $"Billet {SelectedPost.Id} publié." - : $"Billet {SelectedPost.Id} remis en brouillon."; + : $"Billet {SelectedPost.Id} remis en brouillon."); }); } @@ -247,7 +286,7 @@ public partial class MainViewModel : ViewModelBase { if (SelectedPost is null) { - StatusMessage = "Select an existing post before managing ACL."; + this.SetWarningStatus("Sélectionnez un billet existant avant de gérer l'ACL."); return; } @@ -333,7 +372,7 @@ public partial class MainViewModel : ViewModelBase } - public MainViewModel() + public BlogsViewModel() { SettingsModel = new Settings(); Init(SettingsModel); @@ -344,9 +383,10 @@ public partial class MainViewModel : ViewModelBase { Posts = new ObservableCollection(); FilteredPosts = new ObservableCollection(); + DraftAttachments = new ObservableCollection(); SelectedPost = null; IsBusy = false; - StatusMessage = "Ready"; + this.SetInfoStatus("Prêt."); Settings = settings ?? new Settings(); SearchText = Settings.SearchText; WindowTitle = "PostIt"; @@ -393,7 +433,7 @@ public partial class MainViewModel : ViewModelBase /// . Production code uses the /// (Settings, BlogApiClient) overload below. /// - public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null) + public BlogsViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null) { SettingsModel = new Settings(); BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ; @@ -424,6 +464,7 @@ public partial class MainViewModel : ViewModelBase // Mirror publication state too. Defaults to false on // null selection so a fresh draft starts unpublished. DraftIsPublished = value?.IsPublished ?? false; + DraftAttachments.Clear(); UpdateCommandStates(); } @@ -476,12 +517,12 @@ public partial class MainViewModel : ViewModelBase try { IsBusy = true; - StatusMessage = "Working..."; + this.SetInfoStatus("Traitement en cours..."); await action(); } catch (Exception ex) { - StatusMessage = $"Error: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } finally { @@ -505,4 +546,55 @@ public partial class MainViewModel : ViewModelBase IsLoaded = true; } } + + private bool TryAppendAttachmentLinks(BlogPostDto post, IReadOnlyCollection attachments) + { + if (attachments.Count == 0) + return false; + + var ownerSegment = post.Author?.UserName; + if (string.IsNullOrWhiteSpace(ownerSegment)) + ownerSegment = post.AuthorId; + + if (string.IsNullOrWhiteSpace(ownerSegment)) + return false; + + var article = DraftArticle ?? string.Empty; + var links = new List(); + + foreach (var attachment in attachments) + { + var relativePath = $"{EscapePathSegment(ownerSegment)}/blogs/{post.Id}/{EscapePathSegment(attachment.FileName)}"; + var fileUrl = ResolveUserFileUrl(relativePath); + var markdownLine = $"- [{attachment.FileName}]({fileUrl})"; + + if (!article.Contains(markdownLine, StringComparison.Ordinal)) + links.Add(markdownLine); + } + + if (links.Count == 0) + return false; + + var prefix = article.Length == 0 + ? "" + : (article.EndsWith("\n", StringComparison.Ordinal) ? "\n" : "\n\n"); + + DraftArticle = article + prefix + string.Join("\n", links); + return true; + } + + private string ResolveUserFileUrl(string relativePath) + { + var authority = Settings?.Authentication?.Authority; + if (!string.IsNullOrWhiteSpace(authority) + && Uri.TryCreate(authority, UriKind.Absolute, out var baseUri)) + { + return FileServerUrlHelpers.GetUserFilesUri(baseUri, relativePath).ToString(); + } + + return $"{Yavsc.Constants.UserFilesPath}/{relativePath}"; + } + + private static string EscapePathSegment(string segment) + => Uri.EscapeDataString(segment); } diff --git a/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs index 0ab76291d..5ad2b08f4 100644 --- a/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs @@ -9,7 +9,7 @@ using Yavsc.Models.Billing; namespace PostIt.ViewModels; -public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase +public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase, IActionStatusViewModel { protected readonly BillingApiClient _billingClient; @@ -21,7 +21,10 @@ public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase public partial bool IsBusy { get; set; } [ObservableProperty] - public partial string StatusMessage { get; set; } + 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; @@ -75,7 +78,7 @@ public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase Form = form ?? throw new ArgumentNullException(nameof(form)); _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient)); - StatusMessage = SupportMessage; + this.SetInfoStatus(SupportMessage); } partial void OnExistingQueryIdChanged(long? value) diff --git a/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs index d49fde803..72d9ce8ea 100644 --- a/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs @@ -58,18 +58,20 @@ public partial class BrushViewModel : RdvViewModel SelectedPrestation = AvailablePrestations.FirstOrDefault(); } - StatusMessage = AvailablePrestations.Count == 0 - ? "Aucune prestation coiffure disponible." - : SupportMessage; + 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) { - StatusMessage = "Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { - StatusMessage = $"Erreur lors du chargement des prestations: {ex.Message}"; + this.SetErrorStatus($"Erreur lors du chargement des prestations: {ex.Message}"); } finally { @@ -81,19 +83,19 @@ public partial class BrushViewModel : RdvViewModel { if (!Consent) { - StatusMessage = "Le consentement est requis pour poster la commande."; + this.SetWarningStatus("Le consentement est requis pour poster la commande."); return; } if (string.IsNullOrWhiteSpace(Address)) { - StatusMessage = "L'adresse du rendez-vous est requise."; + this.SetWarningStatus("L'adresse du rendez-vous est requise."); return; } if (SelectedPrestation is null) { - StatusMessage = "Sélectionnez une prestation coiffure."; + this.SetWarningStatus("Sélectionnez une prestation coiffure."); return; } @@ -143,18 +145,18 @@ public partial class BrushViewModel : RdvViewModel }).ConfigureAwait(true); } - StatusMessage = IsEditingExisting + this.SetInfoStatus(IsEditingExisting ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}." - : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}."; + : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}."); } catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) { - StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { - StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}"; + this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}"); } finally { diff --git a/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs index 793a77516..05481c2c3 100644 --- a/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs @@ -49,20 +49,20 @@ public partial class MBrushViewModel : BrushViewModel { if (!Consent) { - StatusMessage = "Le consentement est requis pour poster la commande."; + this.SetWarningStatus("Le consentement est requis pour poster la commande."); return; } if (string.IsNullOrWhiteSpace(Address)) { - StatusMessage = "L'adresse du rendez-vous est requise."; + this.SetWarningStatus("L'adresse du rendez-vous est requise."); return; } var selectedPrestations = MultiPrestations.Where(x => x.IsSelected).ToList(); if (selectedPrestations.Count == 0) { - StatusMessage = "Sélectionnez au moins une prestation coiffure."; + this.SetWarningStatus("Sélectionnez au moins une prestation coiffure."); return; } @@ -109,18 +109,18 @@ public partial class MBrushViewModel : BrushViewModel }).ConfigureAwait(true); } - StatusMessage = IsEditingExisting + this.SetInfoStatus(IsEditingExisting ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}." - : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}."; + : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}."); } catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) { - StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { - StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}"; + this.SetErrorStatus($"Erreur lors de l'envoi de la commande: {ex.Message}"); } finally { diff --git a/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs index c2ff3294e..4f9d457a5 100644 --- a/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs @@ -12,11 +12,20 @@ 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; } @@ -27,14 +36,30 @@ public partial class RdvViewModel : BillingCommandPageViewModel [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; @@ -49,12 +74,20 @@ public partial class RdvViewModel : BillingCommandPageViewModel 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; + } - StatusMessage = $"Commande #{existingQuery.Id} chargée."; + _hydratingExistingQuery = false; + + this.SetInfoStatus($"Commande #{existingQuery.Id} chargée."); } [RelayCommand(CanExecute = nameof(CanUseCurrentLocation))] @@ -71,23 +104,23 @@ public partial class RdvViewModel : BillingCommandPageViewModel var result = await Platform.TryGetCurrentLocationAsync(default).ConfigureAwait(true); if (!result.IsSuccess || !result.Latitude.HasValue || !result.Longitude.HasValue) { - StatusMessage = result.Message; + this.SetWarningStatus(result.Message); return; } Latitude = result.Latitude.Value; Longitude = result.Longitude.Value; - StatusMessage = string.IsNullOrWhiteSpace(Address) + this.SetInfoStatus(string.IsNullOrWhiteSpace(Address) ? "Position récupérée. Complétez l'adresse puis envoyez la commande." - : result.Message; + : result.Message); } catch (OperationCanceledException) { - StatusMessage = "La récupération de la position a été annulée."; + this.SetWarningStatus("La récupération de la position a été annulée."); } catch (Exception ex) { - StatusMessage = $"Impossible de récupérer la position: {ex.Message}"; + this.SetErrorStatus($"Impossible de récupérer la position: {ex.Message}"); } finally { @@ -95,49 +128,163 @@ public partial class RdvViewModel : BillingCommandPageViewModel } } - protected static object BuildLocationPayload(string address, double? latitude, double? longitude) + protected static BillingLocationDto BuildLocationPayload(string address, double? latitude, double? longitude, long? locationId = null) { if (latitude.HasValue && longitude.HasValue) { - return new + return new BillingLocationDto { + Id = locationId, Address = address, Latitude = latitude.Value, Longitude = longitude.Value, }; } - return new + 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) { - StatusMessage = SupportMessage; + this.SetWarningStatus(SupportMessage); return; } if (!Consent) { - StatusMessage = "Le consentement est requis pour poster la commande."; + this.SetWarningStatus("Le consentement est requis pour poster la commande."); return; } if (string.IsNullOrWhiteSpace(Address)) { - StatusMessage = "L'adresse du rendez-vous est requise."; + this.SetWarningStatus("L'adresse du rendez-vous est requise."); return; } if (string.IsNullOrWhiteSpace(Reason)) { - StatusMessage = "Le motif du rendez-vous est requis."; + this.SetWarningStatus("Le motif du rendez-vous est requis."); return; } @@ -147,7 +294,7 @@ public partial class RdvViewModel : BillingCommandPageViewModel try { var address = Address.Trim(); - var locationPayload = BuildLocationPayload(address, Latitude, Longitude); + var locationPayload = BuildLocationPayload(address, Latitude, Longitude, IsEditingExisting ? _existingLocationId : null); var payload = new BillingQueryDetailsDto { @@ -160,12 +307,7 @@ public partial class RdvViewModel : BillingCommandPageViewModel Status = CommandStatus, Reason = Reason.Trim(), AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(), - Location = new BillingLocationDto - { - Address = address, - Latitude = Latitude, - Longitude = Longitude, - } + Location = locationPayload }; if (IsEditingExisting) @@ -186,17 +328,17 @@ public partial class RdvViewModel : BillingCommandPageViewModel }).ConfigureAwait(true); } - StatusMessage = IsEditingExisting + this.SetInfoStatus(IsEditingExisting ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}." - : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}."; + : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}."); } catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden) { - StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."; + this.SetWarningStatus("Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous."); } catch (Exception ex) { - StatusMessage = $"Erreur lors de l'envoi: {ex.Message}"; + this.SetErrorStatus($"Erreur lors de l'envoi: {ex.Message}"); } finally { diff --git a/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs b/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs new file mode 100644 index 000000000..614d477c8 --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs @@ -0,0 +1,32 @@ +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/HomePageViewModel.cs b/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs similarity index 68% rename from src/PostIt/PostIt/ViewModels/HomePageViewModel.cs rename to src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs index 830be4dde..fd2ff1091 100644 --- a/src/PostIt/PostIt/ViewModels/HomePageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Layout/HomePageViewModel.cs @@ -5,6 +5,7 @@ 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 @@ -30,10 +31,12 @@ public class HomePageViewModel : ViewModelBase SessionStatus = sessionStatus; OpenActivities = new AsyncRelayCommand(OpenActivitiesAsync); - + OpenProviderRequests = new AsyncRelayCommand(OpenProviderRequestsAsync); + OpenBlogs = new AsyncRelayCommand(App.PushBlogsPageAsync); } - public IAsyncRelayCommand OpenBlogs { get; } = new AsyncRelayCommand(App.PushBlogsPageAsync); + public IAsyncRelayCommand OpenBlogs { get; } public IAsyncRelayCommand OpenActivities { get; } + public IAsyncRelayCommand OpenProviderRequests { get; } private async Task OpenActivitiesAsync() { @@ -48,6 +51,27 @@ public class HomePageViewModel : ViewModelBase await app.PushPageAsync(vm); } + private async Task OpenProviderRequestsAsync() + { + var app = (App?)Application.Current; + if (app is null) + { + throw new InvalidOperationException("Application PostIt indisponible."); + } + + var billingClient = app.ServiceProvider?.GetRequiredService(); + 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 diff --git a/src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs b/src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs similarity index 100% rename from src/PostIt/PostIt/ViewModels/SessionStatusViewModel.cs rename to src/PostIt/PostIt/ViewModels/Layout/SessionStatusViewModel.cs diff --git a/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs b/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs new file mode 100644 index 000000000..c87af390c --- /dev/null +++ b/src/PostIt/PostIt/ViewModels/Layout/StatusNotice.cs @@ -0,0 +1,35 @@ +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/Settings/AuthenticationSettings.cs b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs index 8034820d9..3c23187e4 100644 --- a/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs +++ b/src/PostIt/PostIt/ViewModels/Settings/AuthenticationSettings.cs @@ -22,7 +22,7 @@ public partial class AuthenticationSettings : ObservableObject public const string DefaultClientId = "postit"; - public static readonly string[] DefaultScopes = { "blogs" }; + public static readonly string[] DefaultScopes = { "blogs", "api" }; [ObservableProperty] public partial string Authority { get; set; } diff --git a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs index e63f0b321..35d5a59fe 100644 --- a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs +++ b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Net.Http; using System.Text.Json; +using System.Text.Json.Serialization; [assembly: InternalsVisibleTo("PostIt.Tests")] @@ -14,7 +15,8 @@ namespace PostIt.ViewModels; public partial class Settings : ViewModelBase { - const string SettingsFileName = "postit-settings.json"; + [JsonIgnore] + public string? SettingsFileFullName { get; private set; } [ObservableProperty] public partial AuthenticationSettings Authentication { get; set; } = new(); @@ -31,6 +33,77 @@ public partial class Settings : ViewModelBase [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), + }; + } + /// /// Catch top-level mutations: the four ObservableProperty /// setters above all funnel through here, and we flip @@ -47,6 +120,7 @@ public partial class Settings : ViewModelBase partial void OnBlogsApiUrlChanged(string value) => MarkDirty(); partial void OnApiUrlChanged(string value) => MarkDirty(); partial void OnSearchTextChanged(string value) => MarkDirty(); + partial void OnProviderOngoingRequestsSortOptionChanged(string value) => MarkDirty(); /// /// Authentication can be reassigned wholesale by @@ -67,35 +141,6 @@ 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 @@ -110,6 +155,8 @@ public partial class Settings : ViewModelBase // build options from a torn read. lock (_mutationGate) { + EnsureAuthenticationDefaultsLocked(); + var options = new OidcClientOptions { Authority = Authentication.Authority, @@ -138,27 +185,25 @@ public partial class Settings : ViewModelBase } } - /// - /// 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[] + private void EnsureAuthenticationDefaultsLocked() { - "openid", // OIDC: required for the id_token - "profile", // OIDC: standard profile claims - "offline_access", // OIDC: required to receive a refresh_token - "blogs", - "api" + 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(); + } - }; /// /// Merge user-configured scopes with the built-in ones. User scopes @@ -211,16 +256,42 @@ public partial class Settings : ViewModelBase return; } } - + if (Environment.GetEnvironmentVariable("POSTIT_SETTINGS_JSON") is string envJson + && !string.IsNullOrWhiteSpace(envJson)) + { + Console.WriteLine("🔎 Loading settings from POSTIT_SETTINGS_JSON environment variable."); + FileInfo configByEnvFileInfo = new FileInfo(envJson); + if (!configByEnvFileInfo.Exists) + { + throw new Exception($"🩎 Settings file not found at {configByEnvFileInfo.FullName}"); + } + string json = File.ReadAllText(configByEnvFileInfo.FullName); + ApplyJson(json, "POSTIT_SETTINGS_JSON"); + SettingsFileFullName = configByEnvFileInfo.FullName; + Loaded = true; + return; + } string configDir = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), - "PostIt" -); - Directory.CreateDirectory(configDir); + Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + "PostIt" + ); - string configPath = Path.Combine(configDir, SettingsFileName); + 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"); + } - FileInfo configFileInfo = new FileInfo(configPath); + FileInfo configFileInfo = new FileInfo(SettingsFileFullName); if (!configFileInfo.Exists) { @@ -249,6 +320,7 @@ 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) @@ -300,7 +372,7 @@ public partial class Settings : ViewModelBase // → our overridden dispatcher-safe marshaller below. else lock (_mutationGate) { - var legacyApiUrl = TryReadLegacyApiUrl(json); + var legacyApiUrl = TryReadApiUrl(json); this.Authentication = settings.Authentication; this.DarkMode = settings.DarkMode; this.BlogsApiUrl = !string.IsNullOrWhiteSpace(settings.BlogsApiUrl) @@ -310,6 +382,7 @@ public partial class Settings : ViewModelBase ? 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(); @@ -321,11 +394,13 @@ public partial class Settings : ViewModelBase AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri; if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0) { - settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes; + this.Authentication.Scopes = AuthenticationSettings.DefaultScopes; } else this.Authentication.Scopes = settings.Authentication.Scopes; } + + EnsureAuthenticationDefaultsLocked(); } // A disk load (or an embedded-resource fallback) is the // baseline, not a user edit. Clear the dirty flag last @@ -353,7 +428,7 @@ public partial class Settings : ViewModelBase } } - private static string? TryReadLegacyApiUrl(string json) + private static string? TryReadApiUrl(string json) { try { @@ -386,6 +461,7 @@ public partial class Settings : ViewModelBase this.BlogsApiUrl = "https://blogs.pschneider.fr/api/v1/"; this.ApiUrl = "https://api.pschneider.fr/api/v1/"; this.SearchText = string.Empty; + this.ProviderOngoingRequestsSortOption = string.Empty; } /// @@ -406,11 +482,19 @@ public partial class Settings : ViewModelBase [RelayCommand(CanExecute = nameof(CanSave))] public void Save() { - var configDir = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), - "PostIt"); - Directory.CreateDirectory(configDir); - var configPath = Path.Combine(configDir, SettingsFileName); + 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)!); lock (_mutationGate) { @@ -425,10 +509,13 @@ 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/SignaturePageViewModel.cs b/src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs similarity index 90% rename from src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs rename to src/PostIt/PostIt/ViewModels/Signature/SignaturePageViewModel.cs index b4b37974b..23ba70cf9 100644 --- a/src/PostIt/PostIt/ViewModels/SignaturePageViewModel.cs +++ b/src/PostIt/PostIt/ViewModels/Signature/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 +public partial class SignaturePageViewModel : ViewModelBase, IActionStatusViewModel { /// /// Default capture surface, in DIPs. 3:1 ratio matches a @@ -42,6 +42,9 @@ public partial class SignaturePageViewModel : ViewModelBase [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; } @@ -107,7 +110,7 @@ public partial class SignaturePageViewModel : ViewModelBase private void OnStrokeCompleted(object? sender, SignaturePadData data) { - StatusMessage = $"Trait terminé. {data.StrokeCount} trait(s)."; + this.SetInfoStatus($"Trait terminé. {data.StrokeCount} trait(s)."); RefreshCounts(); } @@ -125,7 +128,7 @@ public partial class SignaturePageViewModel : ViewModelBase public void Clear() { _control?.Clear(); - StatusMessage = "Effacé."; + this.SetInfoStatus("Effacé."); RefreshCounts(); } @@ -134,14 +137,14 @@ public partial class SignaturePageViewModel : ViewModelBase { if (_control is null) { - StatusMessage = "Contrôle non attaché."; + this.SetWarningStatus("Contrôle non attaché."); return; } var data = _control.Snapshot(); if (data.IsEmpty) { - StatusMessage = "Rien à capturer."; + this.SetWarningStatus("Rien à capturer."); return; } @@ -149,11 +152,11 @@ public partial class SignaturePageViewModel : ViewModelBase { var path = WriteCapture(data); LastCapturedPath = path; - StatusMessage = $"Capture enregistrée: {path}"; + this.SetInfoStatus($"Capture enregistrée: {path}"); } catch (Exception ex) { - StatusMessage = $"Erreur: {ex.Message}"; + this.SetErrorStatus($"Erreur: {ex.Message}"); } await Task.CompletedTask; } diff --git a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml b/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml similarity index 93% rename from src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml rename to src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml index 8b2329886..a17f8574e 100644 --- a/src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml +++ b/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="PostIt.Views.AddCircleMemberDialog" xmlns:vm="using:PostIt.ViewModels" + xmlns:postitControls="using:PostIt.Controls" xmlns:services="using:PostIt.Services" x:DataType="vm:AddCircleMemberDialogViewModel" > @@ -47,8 +48,8 @@ - +