Compare commits
149 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fa4577fb35 | |||
|
45d3f1f4f8 |
|||
|
2c6ab134f5 |
|||
|
343538a7ea |
|||
|
b820348558 |
|||
|
7a1a9ad2ee |
|||
|
81beb0a102 |
|||
|
8e2fd65b68 |
|||
|
0d784e919c |
|||
|
e788910826 |
|||
|
6b4e52e7ce |
|||
|
fc820362b9 |
|||
|
2a36c19610 |
|||
|
914e9486b5 |
|||
|
55d305f295 |
|||
|
b46548a08f |
|||
|
5b4bb983de |
|||
|
9dc0138230 |
|||
|
b642cbf067 |
|||
|
17735eada3 |
|||
|
f4271b4052 |
|||
|
62a6236865 |
|||
|
9d97994e76 |
|||
|
ec2c405e28 |
|||
|
7b92745153 |
|||
|
2a8a4fc4a4 |
|||
|
6e2fec1620 |
|||
|
e987f215bb |
|||
|
fae0777d70 |
|||
| 3ec47ba4e7 | |||
|
34ea58182d |
|||
|
0241dd98f0 |
|||
|
3a1ce55c0f |
|||
| dc1998c6bd | |||
| 4d4612243f | |||
| 01e7ad715d | |||
|
bd94a707b6 |
|||
|
7990ee9f13 |
|||
|
6cff3db32e |
|||
|
52eedefb4a |
|||
| 51dc24de34 | |||
|
40437982eb |
|||
|
6a6cc3a967 |
|||
|
0bfe61cbb8 |
|||
|
1b237fa540 |
|||
|
39cb481bdb |
|||
|
c27091051b |
|||
|
24046ac632 |
|||
|
e0b2bd804d |
|||
|
c5941e04ce |
|||
|
3b4cc241a7 |
|||
|
243c0f2780 |
|||
|
5b6d2e82db |
|||
|
5d1649df80 |
|||
|
4a68494162 |
|||
|
ab8ab00ae8 |
|||
|
ecca6c07b4 |
|||
|
e08c61ba4c |
|||
|
4988253fdf |
|||
|
8226f54074 |
|||
|
74cb8795d2 |
|||
|
589e2ba6c3 |
|||
|
d738002677 |
|||
|
06b33f18e4 |
|||
|
1cdb9619a0 |
|||
|
dc05266bdb |
|||
| 4747942f93 | |||
|
e689dbfe35 |
|||
|
1c2e1760b0 |
|||
|
e56bdd4329 |
|||
|
05db88f345 |
|||
|
e62adedc17 |
|||
|
0034a311f2 |
|||
| 6b161b0fb5 | |||
|
671afebc12 |
|||
|
ad2285b8c5 |
|||
|
09c8d79714 |
|||
|
912dd88a02 |
|||
|
400db94953 |
|||
|
5d81ab3094 |
|||
|
45299d14c1 |
|||
|
bfcb7cd2ef |
|||
|
366cd0eed9 |
|||
|
29d842a8f9 |
|||
|
98cab22e60 |
|||
|
d63f065e03 |
|||
|
99c500d177 |
|||
|
b0e70eb198 |
|||
|
39400baadb |
|||
|
d6b45024dc |
|||
|
e266c1de6e |
|||
|
f285a168bd |
|||
|
1e3239498c |
|||
|
696117ac5a |
|||
|
eb0cf11703 |
|||
|
1ba114ee33 |
|||
|
f7956b0459 |
|||
|
8003239159 |
|||
|
8f9c55bf2d |
|||
|
c4f6913fdb |
|||
|
7e3b0a72ad |
|||
|
7ccb23ba28 |
|||
|
955d925f33 |
|||
|
bbd869ab88 |
|||
|
c338fb33ed |
|||
|
016d16fda4 |
|||
|
8978225539 |
|||
|
e337e25aa4 |
|||
|
955725d739 |
|||
|
7d1e5763ff |
|||
|
41a1febb24 |
|||
|
4f9acb17ff |
|||
|
af1ca7b1bb |
|||
|
bc6861dd26 |
|||
|
801839465c |
|||
|
1a79ee93eb |
|||
|
851920c79e |
|||
|
a9c18d6708 |
|||
|
70ad5100be |
|||
|
dab56e508f |
|||
|
9d5667c459 |
|||
|
36d58b6870 |
|||
|
553bd415a9 |
|||
|
0bb293c6ee |
|||
|
a4ae0fde72 |
|||
|
863c549d51 |
|||
|
14b0cdb6a4 |
|||
|
43dd526e4f |
|||
|
b18f86ed23 |
|||
|
d56ad25e6b |
|||
|
50a07102cb |
|||
|
6d6c4f2a8a |
|||
|
c707b5f29e |
|||
|
75b298b0f8 |
|||
|
dd5904f0a7 |
|||
|
beeac58628 |
|||
|
a450be6f24 |
|||
|
a079c56c08 |
|||
|
ce070453b2 |
|||
|
7fabee1bd1 |
|||
|
f62a020c82 |
|||
|
88e1499e4b |
|||
|
246111dee1 |
|||
|
11aaf36789 |
|||
|
404bba56ab |
|||
|
01bc4782a0 |
|||
|
bcd72e17d8 |
|||
|
50de5f412f |
|||
| 5274d7bdf5 |
224 changed files with 13797 additions and 2090 deletions
|
|
@ -25,9 +25,9 @@ on:
|
|||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: docker
|
||||
|
||||
container:
|
||||
image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
|
||||
steps:
|
||||
- name: Clone yavsc
|
||||
run: |
|
||||
|
|
@ -39,10 +39,13 @@ jobs:
|
|||
git checkout FETCH_HEAD
|
||||
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: Restore dependencies
|
||||
run: cd /src/_src && dotnet restore
|
||||
- name: Build
|
||||
run: cd /src/_src && dotnet build --no-restore
|
||||
echo "✅ Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
|
||||
|
||||
- name: Test
|
||||
run: cd /src/_src && dotnet test --no-build --verbosity normal
|
||||
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 ($?)!"
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ jobs:
|
|||
# via l'API REST Forgejo (pas d'actions tierces Node).
|
||||
release:
|
||||
runs-on: docker
|
||||
container:
|
||||
image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
|
||||
steps:
|
||||
- name: Clone du repo au tag demandé
|
||||
env:
|
||||
|
|
@ -66,10 +68,8 @@ jobs:
|
|||
# WORKDIR de l'image (cf. dotnet-android-build-image/Dockerfile).
|
||||
cd /src
|
||||
|
||||
# Clone unshallow pour que GitVersion.MsBuild ait l'historique
|
||||
# et les tags (sinon MSB3073 sur la cible Android cf. PR #21).
|
||||
if [[ ! -d _src/.git ]]; then
|
||||
git clone https://forgejo.pschneider.fr/notazof/yavsc.git _src
|
||||
git clone --depth=1 https://forgejo.pschneider.fr/notazof/yavsc.git _src
|
||||
fi
|
||||
|
||||
cd _src
|
||||
|
|
@ -171,37 +171,22 @@ jobs:
|
|||
echo "EOF" >> "$GITHUB_ENV"
|
||||
echo "IS_PRERELEASE=$([ "$CHANNEL" = "stable" ] && echo false || echo true)" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Build des projets .NET (sans docker)
|
||||
# L'image runner (pazof/yavsc-build-env) a le SDK .NET 10 + le
|
||||
# workload Android, mais PAS le binaire `docker` ni de daemon
|
||||
# Docker. On exécute donc les commandes dotnet directement
|
||||
# au lieu de passer par `docker build`.
|
||||
# Equivalent des stages build-env du Dockerfile (lignes
|
||||
# restore + build Yavsc.Org + build Yavsc.Api + build
|
||||
# Yavsc.Blogs + build PostIt.Android -r android-arm64).
|
||||
- name: Restore
|
||||
run: |
|
||||
cd /src/_src
|
||||
dotnet restore
|
||||
dotnet build src/Yavsc.Org/Yavsc.Org.csproj -c Release --no-restore -clp:ErrorsOnly
|
||||
dotnet build src/Yavsc.Api/Yavsc.Api.csproj -c Release --no-restore -clp:ErrorsOnly
|
||||
dotnet build src/Yavsc.Blogs/Yavsc.Blogs.csproj -c Release --no-restore -clp:ErrorsOnly
|
||||
dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
|
||||
-c Release --no-restore -clp:ErrorsOnly -r android-arm64
|
||||
|
||||
- name: Copier l'APK signé vers un emplacement connu
|
||||
# Le build Android avec -r android-arm64 produit l'APK dans
|
||||
# bin/Release/net10.0-android/android-arm64/. On le copie à
|
||||
# la racine du checkout pour que l'étape d'upload le trouve.
|
||||
- name: Build de PostIt.Android ARM64
|
||||
run: |
|
||||
cd /src/_src
|
||||
APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.PostIt-Signed.apk
|
||||
if [[ ! -f "$APK" ]]; then
|
||||
echo "::error::APK not found at $APK"
|
||||
ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/ 2>/dev/null || true
|
||||
exit 1
|
||||
fi
|
||||
cp "$APK" /src/_src/PostIt.Android.apk
|
||||
ls -la /src/_src/PostIt.Android.apk
|
||||
dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
|
||||
-c Release -r android-arm64 --no-restore -clp:ErrorsOnly
|
||||
|
||||
- name: Build de PostIt.Android x64
|
||||
run: |
|
||||
cd /src/_src
|
||||
dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
|
||||
-c Release -r android-x64 --no-restore -clp:ErrorsOnly
|
||||
|
||||
- name: Publier la release Forgejo via l'API REST
|
||||
# Pas d'action tierce (pas de Node dans l'image runner).
|
||||
|
|
@ -310,21 +295,22 @@ jobs:
|
|||
# sinon curl l'interprète comme un second fichier d'input
|
||||
# (un fichier nommé '?name=PostIt.Android.apk') et l'API
|
||||
# Forgejo renvoie 400 "Missing 'name' parameter".
|
||||
echo "::group::Upload APK asset"
|
||||
HTTP=$(curl -sS -o /tmp/asset.json -w '%{http_code}' \
|
||||
-X POST \
|
||||
-H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
-H "Accept: application/json" \
|
||||
--data-binary "@/src/_src/PostIt.Android.apk" \
|
||||
"$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android.apk")
|
||||
echo "POST asset -> HTTP $HTTP"
|
||||
echo "::group::Upload PostIt APK assets"
|
||||
for MARCH in arm64 x64; do
|
||||
HTTP=$(curl -sS -o /tmp/asset.json -w '%{http_code}' \
|
||||
-X POST \
|
||||
-H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
-H "Accept: application/json" \
|
||||
--data-binary "@/src/_src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-$MARCH/fr.pschneider.postit-Signed.apk" \
|
||||
"$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android-$MARCH.apk")
|
||||
echo "POST asset -> HTTP $HTTP"
|
||||
if [[ "$HTTP" != "201" ]]; then
|
||||
echo "::error::Asset upload failed (HTTP $HTTP):"
|
||||
cat /tmp/asset.json
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
echo "::endgroup::"
|
||||
|
||||
if [[ "$HTTP" != "201" ]]; then
|
||||
echo "::error::Asset upload failed (HTTP $HTTP):"
|
||||
cat /tmp/asset.json
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG"
|
||||
echo "✅ Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG"
|
||||
|
|
|
|||
183
.github/workflows/docker-publish-android.yml
vendored
183
.github/workflows/docker-publish-android.yml
vendored
|
|
@ -1,183 +0,0 @@
|
|||
name: Build and Push Yavsc Apk
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
tags:
|
||||
- '*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
force_unstable:
|
||||
description: 'Publier une release avec suffixe (ex. 1.0.0-rc1) malgré le fail-fast par défaut.'
|
||||
required: false
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
# softprops/action-gh-release a besoin de contents: write
|
||||
# pour publier une release + uploader un asset.
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
apk-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout du code
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
fetch-depth: 0
|
||||
fetch-tags: true
|
||||
|
||||
# 1. Votre étape de build actuelle (on nomme l'image "postit-android")
|
||||
# --target build-env : on ne veut que le stage de build (qui
|
||||
# contient les artefacts .apk). Sans --target, Docker ciblerait
|
||||
# le DERNIER stage du Dockerfile (blogs-runtime, qui est une
|
||||
# image ASP.NET runtime sans aucun APK à extraire).
|
||||
- name: Build de l'image Docker
|
||||
run: docker build --build-arg ANDROID_TARGET_RID=android-arm64 --target build-env -t postit-android .
|
||||
# 2. EXTRACTION : Créer un conteneur éphémère pour copier l'APK vers l'hôte GitHub
|
||||
- name: Extraire l'APK du conteneur Docker
|
||||
run: |
|
||||
docker create --name extractor postit-android
|
||||
docker cp extractor:/src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.PostIt-Signed.apk ./PostIt.Android.apk
|
||||
docker rm extractor
|
||||
|
||||
- name: Téléverser l'APK en tant qu'Artéfact GitHub
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: application-apk-release
|
||||
path: ./PostIt.Android.apk
|
||||
retention-days: 7
|
||||
|
||||
# Job de validation : parse le tag, vérifie le format, applique la règle
|
||||
# de parité du patch (pair=stable / impair=preview / suffixe=instable),
|
||||
# et s'assure que CHANGELOG.md contient une section cohérente.
|
||||
# Sans ce job, le job publish-release peut être bypassé (un attaquant
|
||||
# qui contrôle un tag ne peut pas publier de release sans une section
|
||||
# changelog cohérente).
|
||||
validate-release:
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout du code
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
fetch-depth: 0
|
||||
fetch-tags: true
|
||||
|
||||
- name: Valider le tag et la section CHANGELOG
|
||||
env:
|
||||
FORCE_UNSTABLE: ${{ inputs.force_unstable || github.event.inputs.force_unstable || 'false' }}
|
||||
run: |
|
||||
TAG="${GITHUB_REF_NAME}"
|
||||
|
||||
# Parse semver : MAJOR.MINOR.PATCH[-SUFFIX]
|
||||
if [[ ! "$TAG" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)(-.*)?$ ]]; then
|
||||
echo "::error::Tag '$TAG' does not match MAJOR.MINOR.PATCH[-SUFFIX] format."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
MAJOR="${BASH_REMATCH[1]}"
|
||||
MINOR="${BASH_REMATCH[2]}"
|
||||
PATCH="${BASH_REMATCH[3]}"
|
||||
SUFFIX="${BASH_REMATCH[4]}"
|
||||
|
||||
# Classification du canal par parité du patch.
|
||||
# Patch pair + pas de suffixe -> stable.
|
||||
# Patch impair + pas de suffixe -> preview.
|
||||
# Suffixe présent -> instable.
|
||||
if [[ -n "$SUFFIX" ]]; then
|
||||
CHANNEL="unstable"
|
||||
elif (( PATCH % 2 == 0 )); then
|
||||
CHANNEL="stable"
|
||||
else
|
||||
CHANNEL="preview"
|
||||
fi
|
||||
|
||||
echo "Tag $TAG classifié comme channel=$CHANNEL"
|
||||
|
||||
# Fail-fast sur instable sauf opt-in explicite via workflow_dispatch.
|
||||
if [[ "$CHANNEL" == "unstable" && "$FORCE_UNSTABLE" != "true" ]]; then
|
||||
echo "::error::Tag '$TAG' is unstable (suffix '$SUFFIX'). Refusing to publish."
|
||||
echo "Set force_unstable=true via workflow_dispatch to override."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Lecture du CHANGELOG.md (doit exister à la racine du repo).
|
||||
if [[ ! -f CHANGELOG.md ]]; then
|
||||
echo "::error::CHANGELOG.md not found at repo root."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extraction de la section [TAG]. On cherche la première ligne
|
||||
# commençant par '## [' qui contient '[TAG]' (entre '## [' et
|
||||
# la prochaine ligne '## [' ou fin de fichier). awk en mode
|
||||
# paragraphe suffit et reste POSIX.
|
||||
BODY=$(awk -v tag="[$TAG]" '
|
||||
/^## \[/ {
|
||||
if (in_section) exit
|
||||
if (index($0, tag) > 0) in_section=1
|
||||
next
|
||||
}
|
||||
in_section { print }
|
||||
' CHANGELOG.md)
|
||||
|
||||
if [[ -z "$BODY" ]]; then
|
||||
echo "::error::No section matching '## [$TAG]' found in CHANGELOG.md."
|
||||
echo "Add a '## [$TAG] - $CHANNEL' section before tagging."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Vérification cohérence du canal déclaré dans le titre de section.
|
||||
# Format attendu : "## [TAG] - stable" / "- preview" / "- unstable".
|
||||
HEADER=$(grep -m1 "^## \[$TAG\]" CHANGELOG.md)
|
||||
if [[ "$HEADER" != *" - $CHANNEL"* ]]; then
|
||||
echo "::error::Section '## [$TAG]' must declare suffix '- $CHANNEL' to match tag parity."
|
||||
echo "Current section header: $HEADER"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Section CHANGELOG validée pour [$TAG] - $CHANNEL"
|
||||
|
||||
# Exposition aux étapes suivantes via $GITHUB_ENV.
|
||||
# heredoc <<EOF pour le body multi-lignes (pattern GitHub Actions).
|
||||
{
|
||||
echo "RELEASE_BODY<<EOF"
|
||||
echo "$BODY"
|
||||
echo "EOF"
|
||||
echo "RELEASE_CHANNEL=$CHANNEL"
|
||||
if [[ "$CHANNEL" == "stable" ]]; then
|
||||
echo "IS_PRERELEASE=false"
|
||||
else
|
||||
echo "IS_PRERELEASE=true"
|
||||
fi
|
||||
} >> "$GITHUB_ENV"
|
||||
|
||||
publish-release:
|
||||
# Déclenché uniquement par un push de tag. Le job apk-deploy produit
|
||||
# l'artefact ; validate-release garantit la cohérence du tag et du
|
||||
# changelog avant publication.
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
needs: [apk-deploy, validate-release]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Récupérer l'APK depuis l'artefact
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: application-apk-release
|
||||
path: ./
|
||||
|
||||
- name: Publier la release GitHub et uploader l'APK
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
# Le nom de fichier final dans la release. C'est ce qui
|
||||
# apparaîtra dans l'asset et donc dans le permalink :
|
||||
# https://github.com/<owner>/<repo>/releases/latest/download/PostIt.Android.apk
|
||||
files: ./PostIt.Android.apk
|
||||
# Le body est extrait de la section CHANGELOG.md correspondant
|
||||
# au tag, exposée par validate-release via $GITHUB_ENV.
|
||||
body: ${{ env.RELEASE_BODY }}
|
||||
# stable -> false (marque comme Latest).
|
||||
# preview / unstable -> true (visible mais pas Latest).
|
||||
prerelease: ${{ env.IS_PRERELEASE }}
|
||||
2
.github/workflows/docker-publish-backend.yml
vendored
2
.github/workflows/docker-publish-backend.yml
vendored
|
|
@ -26,7 +26,7 @@ jobs:
|
|||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
- name: Test
|
||||
run: dotnet test --no-build --verbosity normal
|
||||
run: dotnet test --no-build --verbosity normal --filter="Category!=Platform-Android"
|
||||
# 4. Build et Push de l'image de production finale
|
||||
- name: Build and push production image
|
||||
uses: docker/build-push-action@v7
|
||||
|
|
|
|||
92
.vscode/launch.json
vendored
92
.vscode/launch.json
vendored
|
|
@ -1,59 +1,57 @@
|
|||
{
|
||||
// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
|
||||
// Pointez pour afficher la description des attributs existants.
|
||||
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Debug - Android",
|
||||
// Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
|
||||
// Pointez pour afficher la description des attributs existants.
|
||||
// Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Android Debug",
|
||||
"type": "mono",
|
||||
"preLaunchTask": "run-debug-android",
|
||||
"request": "attach",
|
||||
"address": "localhost",
|
||||
"port": 10000
|
||||
"port": 55555
|
||||
},
|
||||
{
|
||||
"name": "Attach - Android",
|
||||
"name": "Android Attach - Debug",
|
||||
"type": "mono",
|
||||
"request": "attach",
|
||||
"address": "localhost",
|
||||
"port": 10000
|
||||
"port": 55555
|
||||
},
|
||||
{
|
||||
"name": "API",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/Api/Api.csproj"
|
||||
},
|
||||
{
|
||||
"name": "Yavsc.Org",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
|
||||
},
|
||||
{
|
||||
"name": "Yavsc.Blogs",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
|
||||
},
|
||||
{
|
||||
"name": "PostIt",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
|
||||
|
||||
},
|
||||
{
|
||||
"name": "Test PostIt.Android launch (Xamarin.UITest)",
|
||||
"type": "coreclr",
|
||||
"request": "launch",
|
||||
"program": "${workspaceFolder}/src/PostIt/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests.dll",
|
||||
"args": [
|
||||
],
|
||||
"cwd": "${workspaceFolder}/src/PostIt/PostIt.Tests",
|
||||
"console": "integratedTerminal",
|
||||
"stopAtEntry": false
|
||||
}
|
||||
]
|
||||
{
|
||||
"name": "API",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/Api/Api.csproj"
|
||||
},
|
||||
{
|
||||
"name": "Yavsc Org",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
|
||||
},
|
||||
{
|
||||
"name": "Yavsc Blogs",
|
||||
"type": "dotnet",
|
||||
"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",
|
||||
"request": "launch",
|
||||
"program": "${workspaceFolder}/src/PostIt/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}/src/PostIt/PostIt.Tests",
|
||||
"console": "integratedTerminal",
|
||||
"stopAtEntry": false
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
49
.vscode/settings.json
vendored
49
.vscode/settings.json
vendored
|
|
@ -2,27 +2,31 @@
|
|||
"dotnet-test-explorer.testProjectPath": "test/**/*Tests.csproj",
|
||||
|
||||
"cSpell.words": [
|
||||
"appsettings",
|
||||
"asciidoctor",
|
||||
"ASPNETCORE",
|
||||
"Configurabilité",
|
||||
"Cratie",
|
||||
"DESTDIR",
|
||||
"dotnet",
|
||||
"DOTNET",
|
||||
"ecdsa",
|
||||
"envsubst",
|
||||
"Hsts",
|
||||
"Newtonsoft",
|
||||
"Npgsql",
|
||||
"PKCE",
|
||||
"postit",
|
||||
"pschneider",
|
||||
"SLNDIR",
|
||||
"validable",
|
||||
"www-data",
|
||||
"yavsc",
|
||||
"Yavsc"
|
||||
"appsettings",
|
||||
"asciidoctor",
|
||||
"ASPNETCORE",
|
||||
"Avalonia",
|
||||
"blogspot",
|
||||
"Configurabilité",
|
||||
"Cratie",
|
||||
"DESTDIR",
|
||||
"dotnet",
|
||||
"DOTNET",
|
||||
"ecdsa",
|
||||
"envsubst",
|
||||
"Forgejo",
|
||||
"Hsts",
|
||||
"Newtonsoft",
|
||||
"Npgsql",
|
||||
"Oidc",
|
||||
"PKCE",
|
||||
"postit",
|
||||
"pschneider",
|
||||
"SLNDIR",
|
||||
"validable",
|
||||
"www-data",
|
||||
"yavsc",
|
||||
"Yavsc"
|
||||
],
|
||||
"cSpell.reportUnknownWords": true,
|
||||
"cSpell.language": "fr,en",
|
||||
|
|
@ -40,5 +44,6 @@
|
|||
"copilotcli/gpt-5.3-codex"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"dotnet.defaultSolution": "yavsc.sln"
|
||||
}
|
||||
|
|
|
|||
83
.vscode/tasks.json
vendored
83
.vscode/tasks.json
vendored
|
|
@ -1,5 +1,22 @@
|
|||
{
|
||||
"version": "2.0.0",
|
||||
"isRoot": true,
|
||||
"problemMatcher": [
|
||||
{
|
||||
"owner": "dotnet",
|
||||
"fileLocation": ["relative", "${workspaceFolder}"],
|
||||
"source": "dotnet",
|
||||
"pattern": {
|
||||
"regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+(error|warning) (.*)$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"severity": 4,
|
||||
"code": 5,
|
||||
"message": 6
|
||||
}
|
||||
}
|
||||
],
|
||||
"tasks": [
|
||||
{
|
||||
"label": "run-debug-android",
|
||||
|
|
@ -10,19 +27,17 @@
|
|||
"env": {
|
||||
"DOTNET_HOST_PATH": "/usr/share/dotnet",
|
||||
"ANDROID_HOME": "/opt/android-sdk",
|
||||
"JAVA_HOME": "/usr/lib/jvm/java-1.21.0-openjdk-amd64"
|
||||
"JAVA_HOME": "/usr/lib/jvm/java-1.25.0-openjdk-amd64"
|
||||
}
|
||||
},
|
||||
"args": [
|
||||
"build"
|
||||
"-t:run",
|
||||
"run",
|
||||
"-p:TargetFramework=net10.0-android",
|
||||
"-p:Configuration=Debug",
|
||||
"-p:AndroidAttachDebugger=true",
|
||||
"-p:AndroidSdbHostPort=10000",
|
||||
"-p:AndroidSdbTargetPort=10000"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
"-p:AndroidSdbHostPort=55555",
|
||||
"-p:AndroidSdbTargetPort=55555"
|
||||
]
|
||||
},
|
||||
{
|
||||
"label": "build",
|
||||
|
|
@ -32,7 +47,6 @@
|
|||
"group": "build",
|
||||
"isBuildCommand": true,
|
||||
"isTestCommand": false,
|
||||
"problemMatcher": ["$msCompile"],
|
||||
"isBackground": true
|
||||
},
|
||||
{
|
||||
|
|
@ -62,59 +76,6 @@
|
|||
"kind": "build"
|
||||
},
|
||||
"isBackground": true
|
||||
},
|
||||
{
|
||||
"label": "test blogs",
|
||||
"type": "process",
|
||||
"problemMatcher": ["$msCompile"],
|
||||
"command": "dotnet",
|
||||
"args": ["test"],
|
||||
"runOptions": {
|
||||
"instanceLimit": 1
|
||||
},
|
||||
"options": {
|
||||
"cwd": "src/Yavsc.Blogs",
|
||||
"env": {
|
||||
"DOTNET_CLI_UI_LANGUAGE": "en-US",
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"group": {
|
||||
"kind": "test"
|
||||
},
|
||||
"isBackground": true,
|
||||
"presentation": {
|
||||
"echo": true,
|
||||
"reveal": "always",
|
||||
"focus": false,
|
||||
"panel": "shared",
|
||||
"showReuseMessage": true,
|
||||
"clear": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "publish",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"publish",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
},
|
||||
{
|
||||
"label": "watch",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": ["watch", "--project",
|
||||
"src/Yavsc.Org/Yavsc.Org.csproj"
|
||||
],
|
||||
"problemMatcher": "$msCompile",
|
||||
"runOptions": {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
136
CHANGELOG.md
136
CHANGELOG.md
|
|
@ -1,20 +1,124 @@
|
|||
# Changelog
|
||||
|
||||
Toutes les modifications notables de PostIt et de la plateforme Yavsc
|
||||
sont documentées dans ce fichier.
|
||||
## [1.0.8-rc12] - unstable
|
||||
|
||||
Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/),
|
||||
et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
### Added
|
||||
|
||||
À noter : la **parité du numéro de patch** porte une signification de canal :
|
||||
* [PostIt] Nouveau helper d'image `ImageHelper` pour charger des bitmaps depuis les ressources et depuis le web.
|
||||
* [PostIt] Affichage de l'avatar XS dans la liste des performers d'activites, avec fallback visuel (initiale utilisateur).
|
||||
* [PostIt.Tests] Nouveaux tests autour des URLs avatar et de la source d'autorite.
|
||||
* [contrib] Ajout d'un `README.md` utilitaire pour les symboles/icones.
|
||||
|
||||
- **patch pair** (ex. `1.0.0`, `1.0.2`) → **stable**
|
||||
- **patch impair** (ex. `1.0.1`, `1.0.3`) → **preview**
|
||||
- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable**
|
||||
### Changed
|
||||
|
||||
Cette convention est partagée avec le dépôt
|
||||
[`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian)
|
||||
pour la production des paquets `.deb`.
|
||||
* [PostIt] Les avatars ne sont plus relies en string sur `Image.Source`: ils sont telecharges et lies en `Bitmap`.
|
||||
* [Yavsc.Api.Client] `ActivityApiClient` accepte une base d'avatar dediee et construit les URLs avatar depuis l'autorite d'identification.
|
||||
* [PostIt] Le header de `MainPage` n'utilise plus `ScrollViewer`; remplacement par une barre de commandes basee sur `WrapPanel`.
|
||||
* [PostIt] Alignement de la navigation blogs: renommage `PushMainPageAsync` -> `PushBlogsPageAsync` et ajustement de `HomePageViewModel`.
|
||||
|
||||
### Fixed
|
||||
|
||||
néant
|
||||
|
||||
## [1.0.8-rc11] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
nothing
|
||||
|
||||
### Changed
|
||||
|
||||
* [Yavsc.Api.Test] Mise a jour de `Microsoft.EntityFrameworkCore.Sqlite` vers `10.0.11` afin de supprimer l'alerte NU1903 liee a `SQLitePCLRaw.lib.e_sqlite3` 2.1.11.
|
||||
* [Yavsc.Org] Nettoyage de la configuration NuGet pour le restore: suppression du fichier local `Directory.Packages.props` au profit du fichier racine centralise.
|
||||
* [Yavsc.Org] Suppression de references de packages redondantes dans le projet, sans impact fonctionnel attendu.
|
||||
|
||||
### Fixed
|
||||
|
||||
* [Yavsc.Api.Test] Le restore n'emet plus le warning de vulnerabilite `NU1903` sur `SQLitePCLRaw.lib.e_sqlite3`.
|
||||
* [Yavsc.Org] Suppression d'une vulnerabilite de severite elevee sur AutoMapper apres publication et consommation de la nouvelle version candidate de `HigginsSoft.IdentityServer8`.
|
||||
|
||||
## [1.0.8-rc10] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
* [PostIt] Une page d'historique des commandes billing permet maintenant d'ouvrir une commande existante.
|
||||
* [PostIt] Une vue "Demandes en cours" en lecture seule est disponible pour le performer, filtrée sur les statuts actifs (Inserted, Accepted, InProgress).
|
||||
* [Yavsc.Org] Nouvelles entités `Country` et `PerformerCodeInputValidation` pour piloter la validation du code entreprise performer par pays.
|
||||
|
||||
### Changed
|
||||
|
||||
* [PostIt] La page détail billing se préremplit depuis une commande existante (Rdv, Brush, MBrush) et passe en mode mise à jour.
|
||||
* [Yavsc.Org] Le formulaire `Manage/SetActivity` inclut désormais le pays d'exercice (`fr`, `en`, `pt`) et applique la regex associée au champ `SIREN`.
|
||||
* [Yavsc.Org] La vérification externe du numéro d'entreprise est conservée uniquement pour le pays `fr`.
|
||||
|
||||
### Fixed
|
||||
|
||||
* [PostIt] Le flux historique n'est plus limité à une simple liste: l'action d'ouverture charge la commande cible puis navigue vers la page détail.
|
||||
* [Yavsc.Org] Le champ `SIREN` n'est plus validé avec une règle unique indépendante du pays d'exercice.
|
||||
|
||||
## [1.0.8-rc9] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
nothing
|
||||
|
||||
### Changed
|
||||
|
||||
masquage non-owner côté backend de l'ACL du billet
|
||||
|
||||
### Fixed
|
||||
|
||||
On a maintenant le comportement attendu bout en bout:
|
||||
|
||||
ACL chargée depuis le BlogPostDto
|
||||
noms de cercles affichés dans le dialogue ACL côté PostIt
|
||||
|
||||
## [1.0.8-rc8] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
nothing
|
||||
|
||||
### Changed
|
||||
|
||||
nothing
|
||||
|
||||
### Fixed
|
||||
|
||||
The PostIt publish toggle button
|
||||
|
||||
## [1.0.8-rc7] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
* [PostIt] The search pattern now persists
|
||||
|
||||
### Changed
|
||||
|
||||
* The blog spot path is now `/api/v1/blogspot` (yet in last release)
|
||||
|
||||
### Fixed
|
||||
|
||||
* [Yavsc.Org] (Ticket #45) La forme de l'email de l'utilisateur est maintenant validée avant l'envoi du formulaire d'enregistrement
|
||||
|
||||
## [1.0.8-rc6] - unstable
|
||||
|
||||
### Added
|
||||
|
||||
* a code cleanup,
|
||||
* a first Xamarin.UITest is successful, but disabled, because breaking the actual CI process,
|
||||
* Android app starts, the login process succeeds
|
||||
|
||||
### Changed
|
||||
|
||||
L'identifiant de l'application client Android a changé, il passe en minuscules :
|
||||
`fr.pschneider.postit`
|
||||
|
||||
### Fixed
|
||||
|
||||
a bug posting and retrieving ACL from the backend,
|
||||
the ACL now comes along with the article,
|
||||
[TODO][PostIt] keep ACL along with the article
|
||||
|
||||
## [1.0.8-rc1] - unstable
|
||||
|
||||
|
|
@ -169,10 +273,10 @@ pour la production des paquets `.deb`.
|
|||
migration, reverted in this release. The publish toggle covers
|
||||
the same user-visible switch without a schema change.
|
||||
|
||||
[Unreleased]: https://github.com/pazof/yavsc/compare/HEAD
|
||||
[1.0.8-rc1]: https://github.com/pazof/yavsc/compare/1.0.7...1.0.8-rc1
|
||||
[1.0.7]: https://github.com/pazof/yavsc/compare/1.0.6...1.0.7
|
||||
[1.0.6]: https://github.com/pazof/yavsc/compare/1.0.5...1.0.6
|
||||
[Unreleased]: https://forgejo.pschneider.fr/notazof/yavsc/compare/HEAD
|
||||
[1.0.8-rc1]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.7...1.0.8-rc1
|
||||
[1.0.7]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.6...1.0.7
|
||||
[1.0.6]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.5...1.0.6
|
||||
|
||||
## [1.0.6] - stable
|
||||
|
||||
|
|
@ -206,4 +310,4 @@ pour la production des paquets `.deb`.
|
|||
actual release id. Switched to `jq` for both body construction and
|
||||
field extraction.
|
||||
|
||||
[1.0.6]: https://github.com/pazof/yavsc/compare/1.0.5...1.0.6
|
||||
[1.0.6]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.5...1.0.6
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
## Premier build
|
||||
|
||||
```bash
|
||||
git clone https://github.com/pazof/yavsc.git
|
||||
git clone https://forgejo.pschneider.fr/notazof/yavsc.git
|
||||
cd yavsc
|
||||
dotnet restore
|
||||
dotnet build
|
||||
|
|
@ -49,6 +49,39 @@ Les tests sont répartis en :
|
|||
item « Tests d'intégration smoke par BC ».
|
||||
- `src/PostIt.Tests/` — tests unitaires du client desktop PostIt.
|
||||
|
||||
## Onboarding assiste par agents IA
|
||||
|
||||
Pour accelerer la prise en main du depot avec Copilot/Plan/Explore :
|
||||
|
||||
- Parcours pas-a-pas : [doc/onboarding-agents.md](./doc/onboarding-agents.md)
|
||||
- Playbook d'usage des agents : [doc/agent-playbook.md](./doc/agent-playbook.md)
|
||||
- Matrice intentions -> agent -> preuves : [doc/agent-intent-matrix.md](./doc/agent-intent-matrix.md)
|
||||
|
||||
Regle minimale en contribution assistee par agent :
|
||||
- expliciter l'impact architecture,
|
||||
- justifier le niveau de tests execute,
|
||||
- documenter les risques residuels.
|
||||
|
||||
## Le CHANGELOG.md
|
||||
|
||||
Le `CHANGELOG.md` est un document de changement de version
|
||||
|
||||
Toutes les modifications notables de PostIt et de la plateforme Yavsc
|
||||
sont documentées dans ce fichier.
|
||||
|
||||
Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/),
|
||||
et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
À noter : la **parité du numéro de patch** porte une signification de canal :
|
||||
|
||||
- **patch pair** (ex. `1.0.0`, `1.0.2`) → **preview**
|
||||
- **patch impair** (ex. `1.0.1`, `1.0.3`) → **stable**
|
||||
- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable**
|
||||
|
||||
Cette convention est partagée avec le dépôt
|
||||
[`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian)
|
||||
pour la production des paquets `.deb`.
|
||||
|
||||
## Navigation (PostIt)
|
||||
|
||||
La navigation est centralisée dans
|
||||
|
|
|
|||
|
|
@ -1,16 +1,6 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<RootNamespace>Yavsc</RootNamespace>
|
||||
<!--
|
||||
GitVersion.MsBuild is referenced as a build-time package from
|
||||
every csproj under src/. Setting UseProjectNamespaceForGitVersionInformation
|
||||
here (in Directory.Build.props) means each assembly exposes a
|
||||
GitVersionInformation type under its own namespace, e.g.
|
||||
PostIt.GitVersionInformation, Yavsc.GitVersionInformation, so
|
||||
the assembly metadata reflects the source tree it was built
|
||||
from without conflicting names.
|
||||
-->
|
||||
<UseProjectNamespaceForGitVersionInformation>true</UseProjectNamespaceForGitVersionInformation>
|
||||
<NoWarn>NU1701, NU1901, NU1902</NoWarn>
|
||||
<NoWarn>NU1701, NU1901, NU1902, NU1507</NoWarn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,31 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<IdentityServer8Version>8.1.0-pazofrc007</IdentityServer8Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
|
||||
<PackageVersion Include="GitVersion.MsBuild" Version="6.8.1" />
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8" Version="8.1.0-alpha.171" />
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="8.1.0-alpha.171" />
|
||||
<PackageVersion Include="IdentityModel.OidcClient" Version="6.0.0" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
|
||||
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
|
||||
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.9" />
|
||||
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8" Version="$(IdentityServer8Version)" />
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="$(IdentityServer8Version)" />
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="$(IdentityServer8Version)" />
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework.Storage" Version="$(IdentityServer8Version)" />
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8.Security" Version="$(IdentityServer8Version)" />
|
||||
<PackageVersion Include="HigginsSoft.IdentityServer8.Storage" Version="$(IdentityServer8Version)" />
|
||||
|
||||
<PackageVersion Include="AsciiDocSharp" Version="0.1.0" />
|
||||
<PackageVersion Include="AsciiDocSharp.Converters.Html" Version="0.1.0" />
|
||||
|
||||
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2" />
|
||||
|
||||
<PackageVersion Include="Google.Apis.Compute.v1" Version="1.74.0.4138" />
|
||||
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Antiforgery" Version="2.3.11" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.SignalR" Version="1.2.11" />
|
||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.3.11" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.9" />
|
||||
|
|
@ -18,14 +33,24 @@
|
|||
<PackageVersion Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
|
||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
|
||||
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
|
||||
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
|
||||
|
||||
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.2" />
|
||||
|
||||
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
|
||||
|
||||
<PackageVersion Include="IdentityModel.OidcClient" Version="6.0.0" />
|
||||
|
||||
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
|
||||
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
|
||||
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
|
||||
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
|
||||
<PackageVersion Include="xunit.v3" Version="3.2.2" />
|
||||
<PackageVersion Include="xunit.v3.common" Version="3.2.2" />
|
||||
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
|
||||
<PackageVersion Include="YamlDotNet" Version="18.1.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
173
Makefile
173
Makefile
|
|
@ -77,13 +77,6 @@ release:
|
|||
echo " V : version semver (ex. 1.0.7-rc1) — sert à nommer la branche."; \
|
||||
exit 1; \
|
||||
fi
|
||||
@CURRENT=$$(git branch --show-current); \
|
||||
if [ "$$CURRENT" != "main" ]; then \
|
||||
echo "Refus : la cible doit être lancée depuis main."; \
|
||||
echo " Branche courante : $$CURRENT"; \
|
||||
echo " Fais : git checkout main && git pull --ff-only origin main"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@if [ -n "$$(git status --porcelain)" ]; then \
|
||||
echo "Working tree sale, refus de créer une branche release."; \
|
||||
git status --short; \
|
||||
|
|
@ -121,168 +114,4 @@ release:
|
|||
git push -u origin "$$BRANCH"; \
|
||||
echo "==> Terminé. Branche $$BRANCH live sur origin."
|
||||
|
||||
# Cibles pour installer PostIt.Android en Debug sur l'AVD qemu.
|
||||
#
|
||||
# Usage typique :
|
||||
# make qemu # lance l'AVD, attend le boot, build l'APK, l'installe
|
||||
# make qemu-install # (re)build l'APK et l'installe (AVD doit tourner)
|
||||
# make qemu-build # build l'APK seul (sans install)
|
||||
# make qemu-run # démarre l'AVD en background
|
||||
# make qemu-stop # arrête l'émulateur
|
||||
# make qemu-wait-boot # attend que l'AVD ait fini de booter
|
||||
#
|
||||
# Variables surchargeables (make VAR=valeur) :
|
||||
# AVD_NAME default: postit_test_avd
|
||||
# (l'AVD doit être listé par `avdmanager list avd`)
|
||||
# ADB_SERIAL default: emulator-5554
|
||||
# (port standard du premier émulateur lancé)
|
||||
# ANDROID_HOME default: /opt/android-sdk
|
||||
# (le SDK Android local; doit contenir
|
||||
# emulator/emulator et platform-tools/adb)
|
||||
# POSTIT_RID default: android-x64
|
||||
# (doit matcher l'ABI de l'AVD; `avdmanager list avd`
|
||||
# affiche la ligne Tag/ABI)
|
||||
# EMU_HEADLESS default: 0
|
||||
# (1 = lancer l'émulateur sans fenêtre, pour scripter)
|
||||
# CONFIG surcharge la variable CONFIG globale (Debug par
|
||||
# défaut dans ce Makefile). Passer à Release pour
|
||||
# un APK optimisé et signé release.
|
||||
# LOGCAT_LINES default: 200
|
||||
# (nombre de lignes dumpées par `make qemu-logcat`)
|
||||
# LOGCAT_FOLLOW default: 0
|
||||
# (1 = stream live via `make qemu-logcat`,
|
||||
# sinon dump one-shot des N dernières lignes)
|
||||
# LOGCAT_BOOT_WAIT default: 30
|
||||
# (secondes d'attente entre le clear du buffer,
|
||||
# le `am start`, et le dump final dans
|
||||
# `make qemu-logcat-boot`)
|
||||
AVD_NAME ?= postit_test_avd
|
||||
ADB_SERIAL ?= emulator-5554
|
||||
ANDROID_HOME ?= /opt/android-sdk
|
||||
POSTIT_RID ?= android-x64
|
||||
EMU_HEADLESS ?= 0
|
||||
LOGCAT_LINES ?= 600
|
||||
LOGCAT_FOLLOW ?= 0
|
||||
LOGCAT_BOOT_WAIT ?= 20
|
||||
|
||||
ANDROID_PACKAGE_NAME = fr.pschneider.PostIt
|
||||
POSTIT_ANDROID_CSPROJ := src/PostIt/PostIt.Android/PostIt.Android.csproj
|
||||
POSTIT_APK_DIR := src/PostIt/PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
|
||||
POSTIT_APK := $(POSTIT_APK_DIR)/$(ANDROID_PACKAGE_NAME)-Signed.apk
|
||||
|
||||
qemu-run:
|
||||
@echo " Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
|
||||
@mkdir -p /tmp/yavsc-emu
|
||||
@EMU_ARGS=""; \
|
||||
if [ "$(EMU_HEADLESS)" = "1" ]; then EMU_ARGS="-no-window -no-audio"; fi; \
|
||||
$(ANDROID_HOME)/emulator/emulator -avd $(AVD_NAME) $$EMU_ARGS \
|
||||
>/tmp/yavsc-emu/$(AVD_NAME).log 2>&1 & \
|
||||
echo " emulator PID: $$!"
|
||||
|
||||
qemu-stop:
|
||||
adb -s $(ADB_SERIAL) emu kill
|
||||
|
||||
qemu-wait-boot:
|
||||
@echo " Waiting for $(ADB_SERIAL) to finish booting..."
|
||||
adb -s $(ADB_SERIAL) wait-for-device
|
||||
@for i in $$(seq 1 180); do \
|
||||
BOOTED=$$(adb -s $(ADB_SERIAL) shell getprop sys.boot_completed 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ "$$BOOTED" = "1" ]; then \
|
||||
echo " ✓ booted in $${i}s"; \
|
||||
exit 0; \
|
||||
fi; \
|
||||
sleep 1; \
|
||||
done; \
|
||||
echo " ERROR: device did not boot within 180s." >&2; \
|
||||
echo " Logs: /tmp/yavsc-emu/$(AVD_NAME).log" >&2; \
|
||||
exit 1
|
||||
|
||||
qemu-build:
|
||||
# EmbedAssembliesIntoApk=true: without this, the Debug APK ships
|
||||
# without the managed assemblies in it (they are pushed at runtime
|
||||
# via `adb push`, "Fast Deployment"). On the qemu emulator, the
|
||||
# runtime cannot find them in `files/.__override__/<rid>/` and
|
||||
# aborts at startup with "No assemblies found in '.__override__'"
|
||||
# (monodroid-glue.cc:757, SIGABRT). Forcing this property on
|
||||
# packages the .dlls into the APK as `assemblies/<rid>/` so the
|
||||
# runtime reads them directly.
|
||||
#
|
||||
# The Xamarin.Android SDK property is `EmbedAssembliesIntoApk`,
|
||||
# not `AndroidEnableFastDeployment` (which exists in older
|
||||
# templates but is a no-op in the .NET 10 SDK).
|
||||
dotnet build $(POSTIT_ANDROID_CSPROJ) \
|
||||
-c $(CONFIG) \
|
||||
-p:RuntimeIdentifier=$(POSTIT_RID) \
|
||||
-p:EmbedAssembliesIntoApk=true \
|
||||
--nologo
|
||||
@if [ ! -f "$(POSTIT_APK)" ]; then \
|
||||
echo " APK not found at $(POSTIT_APK)." >&2; \
|
||||
echo " Files in $(POSTIT_APK_DIR):" >&2; \
|
||||
ls -la "$(POSTIT_APK_DIR)" 2>/dev/null || echo " (directory does not exist)" >&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
qemu-install: qemu-build
|
||||
@echo " Installing $(POSTIT_APK) on $(ADB_SERIAL)..."
|
||||
adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)" -r
|
||||
|
||||
qemu-uninstall:
|
||||
adb -s $(ADB_SERIAL) uninstall $(ANDROID_PACKAGE_NAME)
|
||||
|
||||
# Dump recent logcat output for the running PostIt.Android process.
|
||||
# By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
|
||||
# `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
|
||||
# Filtering is by PID (pidof $(ANDROID_PACKAGE_NAME)), not by tag,
|
||||
# because Mono/Xamarin can emit logs under several tags
|
||||
# (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
|
||||
# would miss the ones not matching. PID-based filtering is exact.
|
||||
# If the app is not running, pidof returns empty and logcat exits
|
||||
# silently with no output; that is the expected behaviour for
|
||||
# "no logs yet".
|
||||
qemu-logcat:
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -z "$$PID" ]; then \
|
||||
echo " $(ANDROID_PACKAGE_NAME) is not running on $(ADB_SERIAL)."; \
|
||||
echo " Start the app first (am start -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity)"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
echo " Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
|
||||
if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
|
||||
adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
else \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
fi
|
||||
|
||||
# Clear logcat, launch PostIt.Android, then dump everything that was
|
||||
# emitted during the startup window. Targets the "démarrage KO" case
|
||||
# where the process starts but Avalonia never renders a frame — the
|
||||
# logcat trace from process start to first frame is what diagnoses it.
|
||||
#
|
||||
# Override LOGCAT_BOOT_WAIT to extend the post-launch wait
|
||||
# (default 15s; raise to 30+ if the device is slow to boot Avalonia).
|
||||
LOGCAT_BOOT_WAIT ?= 15
|
||||
qemu-logcat-boot:
|
||||
@echo " Clearing logcat buffer..."
|
||||
adb -s $(ADB_SERIAL) logcat -c
|
||||
@echo " Launching $(ANDROID_PACKAGE_NAME)..."
|
||||
adb -s $(ADB_SERIAL) shell am start \
|
||||
-n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity
|
||||
@echo " Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
|
||||
@sleep $(LOGCAT_BOOT_WAIT)
|
||||
|
||||
@echo " Dumping logcat (PostIt PID + system buffer):"
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -n "$$PID" ]; then \
|
||||
echo " ✅ (PID $$PID at dump time)"; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time --pid=$$PID; \
|
||||
else \
|
||||
echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
qemu: qemu-run qemu-wait-boot qemu-install
|
||||
@echo " ✓ PostIt.Android installed on $(ADB_SERIAL)"
|
||||
|
||||
.PHONY: test release qemu qemu-run qemu-stop qemu-wait-boot qemu-build qemu-install qemu-logcat qemu-logcat-boot
|
||||
.PHONY: test release
|
||||
|
|
|
|||
|
|
@ -16,11 +16,10 @@ https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=release.yml
|
|||
|
||||
# Statut actuel des actions GitHub
|
||||
|
||||
* [](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml)
|
||||
* [](https://github.com/pazof/yavsc/actions/workflows/codeql.yml)
|
||||
|
||||
* [](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml)
|
||||
|
||||
* [](https://github.com/pazof/yavsc/actions/workflows/codeql.yml)
|
||||
|
||||
# Documentation
|
||||
|
||||
|
|
@ -29,6 +28,10 @@ sous [`doc/`](./doc/). Voir l'[index de la documentation](./doc/README.md)
|
|||
pour le sommaire complet. La racine de l'architecture est
|
||||
[Architecture.md](./doc/Architecture.md).
|
||||
|
||||
Pour une prise en main guidee avec agents IA:
|
||||
- parcours onboarding: [doc/onboarding-agents.md](./doc/onboarding-agents.md)
|
||||
- playbook d'usage: [doc/agent-playbook.md](./doc/agent-playbook.md)
|
||||
|
||||
|
||||
# Construction et déploiement
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ Trois principes non négociables traversent tous les jalons :
|
|||
>
|
||||
> Chaque jalon a un **critère de sortie** vérifiable.
|
||||
|
||||
### Jalon 0 — Fondations techniques *(en cours)*
|
||||
### Jalon 0 — Fondations techniques
|
||||
|
||||
> Cible : pouvoir parler du domaine sans se battre avec le runtime.
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ Trois principes non négociables traversent tous les jalons :
|
|||
|
||||
---
|
||||
|
||||
### Jalon 1 — Prestation signée de bout en bout
|
||||
### Jalon 1 — Prestation signée de bout en bout *(en cours)*
|
||||
|
||||
> Cible : un projet client/fournisseur aboutit à un **devis signé par les deux parties**, traçable, avec notifications.
|
||||
|
||||
|
|
|
|||
24
contrib/.env-sample
Normal file
24
contrib/.env-sample
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
# parametres de déploiement au Makefile
|
||||
|
||||
POSTGRES_HOST=localhost
|
||||
POSTGRES_PORT=5432
|
||||
POSTGRES_DB=yavsc
|
||||
POSTGRES_USER=yavsc
|
||||
POSTGRES_PASSWORD=<your-password-here>
|
||||
|
||||
HTTP_HOST=localhost
|
||||
|
||||
Org_PORT=83
|
||||
Blogs_PORT=85
|
||||
Api_PORT=87
|
||||
|
||||
PostIt_CLIENT_ID=postit
|
||||
|
||||
ASPNETCORE_Smtp__Host="mercure.pschneider.fr"
|
||||
ASPNETCORE_Smtp__Port=465
|
||||
ASPNETCORE_Smtp__SenderName="Paul Schneider"
|
||||
ASPNETCORE_Smtp__SenderEmail="paul@pschneider.fr"
|
||||
ASPNETCORE_Smtp__UserName="paul"
|
||||
ASPNETCORE_Smtp__Password="<your-smtp-password-here>"
|
||||
|
||||
DESTDIR=/srv/www/yavsc
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
APP_PROJECT_NAMES=Org Blogs
|
||||
APP_PROJECT_NAMES=Org Blogs Api
|
||||
SLNDIR=..
|
||||
|
||||
include $(SLNDIR)/.env
|
||||
|
|
@ -9,9 +9,11 @@ generated/:
|
|||
|
||||
generated/yavscOrg.service:
|
||||
generated/yavscBlogs.service:
|
||||
generated/yavscApi.service:
|
||||
|
||||
generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
|
||||
@cat template.service | APP_NAME="$*" \
|
||||
DESTDIR="$(DESTDIR)" \
|
||||
HTTP_HOST="$(HTTP_HOST)" \
|
||||
HTTP_PORT="$*_$(HTTP_PORT)" \
|
||||
BASEAPPDIR="$(BASEAPPDIR)" \
|
||||
|
|
@ -33,11 +35,12 @@ generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
|
|||
@echo Created service file: $@
|
||||
|
||||
|
||||
copy-services: copy-service-Org copy-service-Blogs
|
||||
copy-services: copy-service-Org copy-service-Blogs copy-service-Api
|
||||
copy-service-Org: /etc/systemd/system/yavscOrg.service
|
||||
copy-service-Blogs: /etc/systemd/system/yavscBlogs.service
|
||||
copy-service-Api: /etc/systemd/system/yavscApi.service
|
||||
|
||||
copy-binaries: build_publish_Org build_publish_Blogs stop-services
|
||||
copy-binaries: build_publish_Org build_publish_Blogs build_publish_Api stop-services
|
||||
@for project in $(APP_PROJECT_NAMES); \
|
||||
do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \
|
||||
echo "$${project} -> $${LCAPI}" ; \
|
||||
|
|
@ -60,6 +63,8 @@ copy-binaries: build_publish_Org build_publish_Blogs stop-services
|
|||
build_publish_%: clean_publish_dir_%
|
||||
@ASPNETCORE_ENV=$(CONFIGURATION) dotnet publish $(SLNDIR)/src/Yavsc.$*/Yavsc.$*.csproj
|
||||
|
||||
build_publish: build_publish_Org build_publish_Blogs build_publish_Api
|
||||
|
||||
clean_publish_dir_%:
|
||||
@rm -rf $(SLNDIR)/src/Yavsc.$*/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish
|
||||
|
||||
|
|
@ -84,6 +89,7 @@ stop-services:
|
|||
|
||||
$(SLNDIR)/src/Yavsc.Org/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
||||
$(SLNDIR)/src/Yavsc.Blogs/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
||||
$(SLNDIR)/src/Yavsc.Api/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish: build_publish
|
||||
|
||||
showConfig:
|
||||
@echo CONFIGURATION: $(CONFIGURATION)
|
||||
|
|
@ -92,4 +98,3 @@ showConfig:
|
|||
clean:
|
||||
@rm -rf generated
|
||||
|
||||
.PHONY: build_publish mep showConfig copy-service-Org copy-service-Blogs reinstall clean
|
||||
|
|
|
|||
5
contrib/README.md
Normal file
5
contrib/README.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
# Read me
|
||||
|
||||
## Note aux icones
|
||||
|
||||
㝉®🅬⛒⛑🩎🩺🞫🞮🞕🞖🞆🔴🔵🔲🖂🔧🔩🔐🔌💾💼💬💭👿👾🏷🎯🏹🌍🎎💩
|
||||
37
contrib/tmp/yavscBlogs.service
Normal file
37
contrib/tmp/yavscBlogs.service
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
[Unit]
|
||||
Description=yavsc-Blogs
|
||||
After=syslog.target
|
||||
After=network.target
|
||||
Wants=postgresql.service
|
||||
After=postgresql.service
|
||||
|
||||
[Service]
|
||||
RestartSec=5s
|
||||
Type=simple
|
||||
User=yavsc
|
||||
Group=yavsc
|
||||
WorkingDirectory=/srv/www/yavsc
|
||||
ExecStart=/srv/www/yavsc/Yavsc.Blogs
|
||||
Restart=always
|
||||
Environment="HOME="
|
||||
Environment="ANTHROPIC_API_KEY=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"
|
||||
Environment="ANTHROPIC_MAX_TOKENS=255"
|
||||
Environment="ASPNETCORE_Environment="
|
||||
Environment="ASPNETCORE_Kestrel__Endpoints__Http=http://localhost:Blogs_"
|
||||
Environment="ASPNETCORE_ConnectionStrings__YavscConnection=Server=localhost;Port=5432;Database=yavsc;Username=yavsc;Password=4T/X+fOnE;"
|
||||
|
||||
Environment="ASPNETCORE_Smtp__Host=\"mercure.pschneider.f\""
|
||||
Environment="ASPNETCORE_Smtp__Port=465"
|
||||
Environment="ASPNETCORE_Smtp__SenderName=\"Paul Schneider\""
|
||||
Environment="ASPNETCORE_Smtp__SenderEmail=\"paul@pschneider.fr\""
|
||||
Environment="ASPNETCORE_Smtp__UserName=\"paul\""
|
||||
Environment="ASPNETCORE_Smtp__Password=\"j\0Dsn5=t\""
|
||||
|
||||
CapabilityBoundingSet=CAP_NET_BIND_SERVICE
|
||||
AmbientCapabilities=CAP_NET_BIND_SERVICE
|
||||
StandardOutput=syslog
|
||||
StandardError=syslog
|
||||
SyslogIdentifier=yavscBlogs
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -18,6 +18,9 @@ La racine de l'architecture est [Architecture.md](Architecture.md).
|
|||
| [architecture/postit.md](architecture/postit.md) | PostIt — topologie des projets, ViewLocator custo, navigation, DI, conventions de binding |
|
||||
| [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
|
||||
| [testing.md](testing.md) | Stratégie de test : conventions des dossiers, EF Core in-memory, auth stubs, scaffold partagé |
|
||||
| [onboarding-agents.md](onboarding-agents.md) | Parcours pas-à-pas pour prise en main agents IA + architecture + tests |
|
||||
| [agent-playbook.md](agent-playbook.md) | Playbook d'usage de Copilot, Plan, Explore avec scénarios et anti-patterns |
|
||||
| [agent-intent-matrix.md](agent-intent-matrix.md) | Matrice intentions développeur -> agent -> preuves attendues |
|
||||
|
||||
## Roadmap & design exploration
|
||||
|
||||
|
|
|
|||
20
doc/agent-intent-matrix.md
Normal file
20
doc/agent-intent-matrix.md
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
# Matrice intentions -> agent -> preuves
|
||||
|
||||
Cette matrice aide a choisir rapidement l'agent adapte et a exiger
|
||||
une sortie verifiable.
|
||||
|
||||
| Intention developpeur | Agent principal | Entrees minimales | Sortie minimale attendue | Verification |
|
||||
|---|---|---|---|---|
|
||||
| Comprendre un BC avant changement | Explore | BC cible, profondeur, contrainte de perimetre | Composants, points d'entree, tests relies, risques | Lire les fichiers cites + confirmer tests proposes |
|
||||
| Decomposer une tache transverse | Plan | Objectif, contraintes, definition of done | Etapes ordonnees, dependances, criteres de verif | Verifier que chaque etape a une preuve observable |
|
||||
| Implementer une modif locale | Copilot | Fichier cible, comportement attendu, conventions | Patch minimal, justification courte | Build/test du projet impacte |
|
||||
| Ajouter un test smoke | Copilot (+Explore) | Route/endpoint, projet de test cible | Test + commande cible | Execution test cible |
|
||||
| Corriger une regression | Plan + Copilot | Symptome, zone suspecte, test attendu | Fix + test NonRegression | Test rouge avant, vert apres |
|
||||
| Diagnostiquer flux PostIt/OIDC | Explore + Plan | Flux, symptome, plateforme | Carte du flux + hypotheses testables | Verification manuelle + tests existants |
|
||||
|
||||
## Regles d'arbitrage
|
||||
|
||||
- Si l'intention est "comprendre": commencer par Explore.
|
||||
- Si l'intention est "orchestrer": commencer par Plan.
|
||||
- Si l'intention est "produire": utiliser Copilot apres cadrage.
|
||||
- Si une sortie n'inclut pas de preuve, elle est incomplete.
|
||||
101
doc/agent-playbook.md
Normal file
101
doc/agent-playbook.md
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
# Playbook d'usage des agents IA (Yavsc)
|
||||
|
||||
Ce playbook normalise l'usage de Copilot, Plan et Explore dans le depot.
|
||||
Il privilegie des sorties verifiables: fichiers, commandes tests, risques.
|
||||
|
||||
## Quand utiliser quel agent
|
||||
|
||||
- Plan: quand la tache est ambigue, transverse ou risquee.
|
||||
- Explore: quand il faut cartographier rapidement des zones du code.
|
||||
- Copilot: quand les specifications sont claires et localisees.
|
||||
|
||||
## Prompt type (base)
|
||||
|
||||
Utiliser ce squelette avant toute tache non triviale:
|
||||
|
||||
```text
|
||||
Contexte: <projet/fichier/fonction>
|
||||
Objectif: <resultat observable>
|
||||
Contraintes: <style, archi, perimetre>
|
||||
Verification: <tests exacts a lancer>
|
||||
Sortie attendue: <fichiers modifies + risques>
|
||||
```
|
||||
|
||||
## 4 scenarios de reference
|
||||
|
||||
## 1) Explorer un bounded context
|
||||
|
||||
Intention:
|
||||
- Comprendre ou implementer un changement dans un BC sans regression laterale.
|
||||
|
||||
Prompt minimal:
|
||||
```text
|
||||
Explore le BC <nom> avec profondeur medium.
|
||||
Retour: composants touches, points d'entree, tests existants et risques.
|
||||
```
|
||||
|
||||
Preuves attendues:
|
||||
- Carte des fichiers a modifier.
|
||||
- Test(s) smoke/mandatory proposes.
|
||||
|
||||
## 2) Ajouter un smoke test
|
||||
|
||||
Intention:
|
||||
- Couvrir rapidement un endpoint ou une route publique.
|
||||
|
||||
Prompt minimal:
|
||||
```text
|
||||
Propose un smoke test pour <route/endpoint> dans le projet de test approprie.
|
||||
Respecte les conventions de doc/testing.md.
|
||||
```
|
||||
|
||||
Preuves attendues:
|
||||
- Fichier test cree/modifie.
|
||||
- Commande precise pour executer le test cible.
|
||||
|
||||
## 3) Corriger une regression backend API
|
||||
|
||||
Intention:
|
||||
- Corriger un bug sans casser un flux voisin.
|
||||
|
||||
Prompt minimal:
|
||||
```text
|
||||
Planifie puis implemente un fix de <symptome> dans <projet>.
|
||||
Ajoute/ajuste un test NonRegression rouge puis vert.
|
||||
```
|
||||
|
||||
Preuves attendues:
|
||||
- Explication cause racine.
|
||||
- Test non-regression associe.
|
||||
- Commande d'execution et resultat attendu.
|
||||
|
||||
## 4) Tracer un flux PostIt/OIDC
|
||||
|
||||
Intention:
|
||||
- Localiser une cassure d'authentification entre client et serveur.
|
||||
|
||||
Prompt minimal:
|
||||
```text
|
||||
Cartographie le flux OIDC PostIt: entrypoints, callback, stockage token,
|
||||
refresh. Donne points de rupture probables et tests/verification proposes.
|
||||
```
|
||||
|
||||
Preuves attendues:
|
||||
- Liste ordonnee des etapes du flux.
|
||||
- Fichiers critiques.
|
||||
- Hypotheses testables.
|
||||
|
||||
## Anti-patterns a eviter
|
||||
|
||||
- Prompt sans objectif verifiable.
|
||||
- Demande trop large sans perimetre de fichiers.
|
||||
- Validation basee uniquement sur "ca semble correct".
|
||||
- Pas de lien entre changement et niveau de test.
|
||||
|
||||
## Gate PR minimale (agent-assiste)
|
||||
|
||||
Avant validation:
|
||||
- Impact architecture explicite.
|
||||
- Rationale de choix agent explicite.
|
||||
- Test(s) executes et justifies.
|
||||
- Risques residuels documentes.
|
||||
73
doc/onboarding-agents.md
Normal file
73
doc/onboarding-agents.md
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
# Onboarding guide: agents IA + architecture + tests
|
||||
|
||||
Ce guide est optimise pour accelerer la prise en main des agents IA
|
||||
(Copilot, Plan, Explore) dans Yavsc, avec une verification rapide
|
||||
par les tests.
|
||||
|
||||
## Resultat attendu
|
||||
|
||||
A la fin du parcours, un contributeur doit pouvoir:
|
||||
- Identifier les projets impactes par une modification.
|
||||
- Choisir l'agent adapte a l'intention de travail.
|
||||
- Produire une proposition de changement verifiable par les tests.
|
||||
|
||||
## Parcours en 3 modules
|
||||
|
||||
## Module A - Comprendre le terrain (30-45 min)
|
||||
|
||||
Objectif: acquerir une lecture fiable de l'architecture.
|
||||
|
||||
1. Lire [README.md](../README.md) puis [Architecture.md](Architecture.md).
|
||||
2. Lire [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md).
|
||||
3. Selon le domaine:
|
||||
- Backend/API: [architecture/workflow-multi-parties.md](architecture/workflow-multi-parties.md)
|
||||
- PostIt: [architecture/postit.md](architecture/postit.md) puis [architecture/postit-oidc.md](architecture/postit-oidc.md)
|
||||
|
||||
Definition of done:
|
||||
- Expliquer en 5 phrases quelles couches sont touchees.
|
||||
- Citer le ou les points d'entree applicatifs a verifier.
|
||||
|
||||
## Module B - Boucle tests rapide (20-30 min)
|
||||
|
||||
Objectif: verifier rapidement sans lancer toute la suite.
|
||||
|
||||
1. Lire [testing.md](testing.md).
|
||||
2. Lancer les smoke tests d'abord, puis mandatory selon le projet.
|
||||
3. N'elargir au test complet que si le scope depasse le BC touche.
|
||||
|
||||
Definition of done:
|
||||
- Fournir la commande test executee.
|
||||
- Expliquer pourquoi ce niveau de test est suffisant.
|
||||
|
||||
## Module C - Usage agentique en production (30-40 min)
|
||||
|
||||
Objectif: utiliser les agents comme accelerateurs, pas comme boites noires.
|
||||
|
||||
1. Plan: decomposer la tache en etapes verifiables.
|
||||
2. Explore: collecter le contexte code/doc precise.
|
||||
3. Copilot: implementer localement et verifier.
|
||||
|
||||
Regles:
|
||||
- Toujours donner un contexte explicite (fichier, but, contrainte).
|
||||
- Demander des preuves observables (fichiers modifies, tests, risques).
|
||||
- Refuser toute sortie non verifiable.
|
||||
|
||||
Definition of done:
|
||||
- Une tache simple est livree avec:
|
||||
- Plan
|
||||
- Changement local
|
||||
- Preuve par test
|
||||
|
||||
## Routine continue (sans echeance fixe)
|
||||
|
||||
Rituels recommandes:
|
||||
- Hebdo: revue des prompts qui ont bien fonctionne.
|
||||
- Mensuel: mise a jour du present guide et du playbook.
|
||||
- A chaque incident: ajouter un anti-pattern dans le playbook.
|
||||
|
||||
## Check-list de validation
|
||||
|
||||
- Le changement indique son impact architecture.
|
||||
- Le choix de l'agent est justifie.
|
||||
- La preuve test est incluse.
|
||||
- Les risques residuels sont explicitement listes.
|
||||
|
|
@ -5,33 +5,29 @@
|
|||
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
|
||||
<PropertyGroup>
|
||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<AvaloniaVersionBase>12.1.1</AvaloniaVersionBase>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<!-- Avalonia packages -->
|
||||
<!-- Important: keep version in sync! -->
|
||||
<PackageVersion Include="Avalonia" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.Themes.Fluent" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.Fonts.Inter" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.Desktop" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.Browser" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.Android" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.Headless" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.Headless.Xunit" Version="12.1.1" />
|
||||
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
|
||||
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Headless.Xunit" Version="$(AvaloniaVersionBase)" />
|
||||
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
|
||||
|
||||
<PackageVersion Include="Material.Avalonia" Version="3.19.0" />
|
||||
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
|
||||
|
||||
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
||||
|
||||
<PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.10.0.1" />
|
||||
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.15" />
|
||||
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.11.0.1" />
|
||||
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.11.0.1" />
|
||||
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
|
||||
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.10.0.1" />
|
||||
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.10.0.1" />
|
||||
<PackageVersion Include="Xamarin.UITest" Version="4.4.2" />
|
||||
|
||||
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
|
||||
<PackageVersion Include="Microsoft.Maui.Essentials" Version="10.0.100" />
|
||||
|
||||
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
|
||||
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
178
src/PostIt/Makefile
Normal file
178
src/PostIt/Makefile
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
|
||||
# Cibles pour installer PostIt.Android en Debug sur l'AVD qemu.
|
||||
#
|
||||
# Usage typique :
|
||||
# make qemu # lance l'AVD, attend le boot, build l'APK, l'installe
|
||||
# make android-install # (re)build l'APK et l'installe (AVD doit tourner)
|
||||
# make android-build # build l'APK seul (sans install)
|
||||
# make qemu-run # démarre l'AVD en background
|
||||
# make qemu-stop # arrête l'émulateur
|
||||
# make qemu-wait-boot # attend que l'AVD ait fini de booter
|
||||
#
|
||||
# Variables surchargeables (make VAR=valeur) :
|
||||
# AVD_NAME default: postit_test_avd
|
||||
# (l'AVD doit être listé par `avdmanager list avd`)
|
||||
# ADB_SERIAL default: emulator-5554
|
||||
# (port standard du premier émulateur lancé)
|
||||
# ANDROID_HOME default: /opt/android-sdk
|
||||
# (le SDK Android local; doit contenir
|
||||
# emulator/emulator et platform-tools/adb)
|
||||
# POSTIT_RID default: android-x64
|
||||
# (doit matcher l'ABI de l'AVD; `avdmanager list avd`
|
||||
# affiche la ligne Tag/ABI)
|
||||
# EMU_HEADLESS default: 0
|
||||
# (1 = lancer l'émulateur sans fenêtre, pour scripter)
|
||||
# CONFIG surcharge la variable CONFIG globale (Debug par
|
||||
# défaut dans ce Makefile). Passer à Release pour
|
||||
# un APK optimisé et signé release.
|
||||
# LOGCAT_LINES default: 200
|
||||
# (nombre de lignes dumpées par `make qemu-logcat`)
|
||||
# LOGCAT_FOLLOW default: 0
|
||||
# (1 = stream live via `make logcat`,
|
||||
# sinon dump one-shot des N dernières lignes)
|
||||
# LOGCAT_BOOT_WAIT default: 30
|
||||
# (secondes d'attente entre le clear du buffer,
|
||||
# le `am start`, et le dump final dans
|
||||
# `make qemu-logcat-boot`)
|
||||
AVD_NAME ?= postit_test_avd
|
||||
ADB_SERIAL ?= emulator-5554
|
||||
ANDROID_HOME ?= /opt/android-sdk
|
||||
POSTIT_RID ?= android-x64
|
||||
EMU_HEADLESS ?= 0
|
||||
LOGCAT_LINES ?= 600
|
||||
LOGCAT_FOLLOW ?= 0
|
||||
LOGCAT_BOOT_WAIT ?= 30
|
||||
|
||||
ANDROID_PACKAGE_NAME = fr.pschneider.postit
|
||||
POSTIT_ANDROID_CSPROJ := PostIt.Android/PostIt.Android.csproj
|
||||
POSTIT_APK_DIR := PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
|
||||
POSTIT_APK := $(POSTIT_APK_DIR)/$(ANDROID_PACKAGE_NAME)-Signed.apk
|
||||
|
||||
clean: clean-PostIt clean-PostIt.Android clean-PostIt.Desktop
|
||||
|
||||
clean-%:
|
||||
rm -rf $*/obj $*/bin
|
||||
|
||||
qemu-run:
|
||||
@echo " Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
|
||||
@mkdir -p /tmp/yavsc-emu
|
||||
@EMU_ARGS=""; \
|
||||
if [ "$(EMU_HEADLESS)" = "1" ]; then EMU_ARGS="-no-window -no-audio"; fi; \
|
||||
$(ANDROID_HOME)/emulator/emulator -avd $(AVD_NAME) $$EMU_ARGS \
|
||||
>/tmp/yavsc-emu/$(AVD_NAME).log 2>&1 & \
|
||||
echo " ✅ Started emulator PID: $$!"
|
||||
|
||||
qemu-stop:
|
||||
adb -s $(ADB_SERIAL) emu kill
|
||||
echo " ✅ Stopped emulator"
|
||||
|
||||
qemu-wait-boot:
|
||||
@echo " Waiting for $(ADB_SERIAL) to finish booting..."
|
||||
adb -s $(ADB_SERIAL) wait-for-device
|
||||
@for i in $$(seq 1 180); do \
|
||||
BOOTED=$$(adb -s $(ADB_SERIAL) shell getprop sys.boot_completed 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ "$$BOOTED" = "1" ]; then \
|
||||
echo " ✓ booted in $${i}s"; \
|
||||
exit 0; \
|
||||
fi; \
|
||||
sleep 1; \
|
||||
done; \
|
||||
echo " 👿 ERROR: device did not boot within 180s." >&2; \
|
||||
echo " Logs: /tmp/yavsc-emu/$(AVD_NAME).log" >&2; \
|
||||
exit 1
|
||||
|
||||
android-build:
|
||||
# EmbedAssembliesIntoApk=true: without this, the Debug APK ships
|
||||
# without the managed assemblies in it (they are pushed at runtime
|
||||
# via `adb push`, "Fast Deployment"). On the qemu emulator, the
|
||||
# runtime cannot find them in `files/.__override__/<rid>/` and
|
||||
# aborts at startup with "No assemblies found in '.__override__'"
|
||||
# (monodroid-glue.cc:757, SIGABRT). Forcing this property on
|
||||
# packages the .dlls into the APK as `assemblies/<rid>/` so the
|
||||
# runtime reads them directly.
|
||||
#
|
||||
# The Xamarin.Android SDK property is `EmbedAssembliesIntoApk`,
|
||||
# not `AndroidEnableFastDeployment` (which exists in older
|
||||
# templates but is a no-op in the .NET 10 SDK).
|
||||
dotnet build $(POSTIT_ANDROID_CSPROJ) \
|
||||
-c $(CONFIG) \
|
||||
-p:RuntimeIdentifier=$(POSTIT_RID) \
|
||||
-p:EmbedAssembliesIntoApk=true \
|
||||
--nologo
|
||||
@if [ ! -f "$(POSTIT_APK)" ]; then \
|
||||
echo " APK not found at $(POSTIT_APK)." >&2; \
|
||||
echo " Files in $(POSTIT_APK_DIR):" >&2; \
|
||||
ls -la "$(POSTIT_APK_DIR)" 2>/dev/null || echo " (directory does not exist)" >&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
android-install: android-build
|
||||
@echo " Installing $(POSTIT_APK) on $(ADB_SERIAL)..."
|
||||
adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)" -r
|
||||
@echo " ✅ PostIt.Android installed on $(ADB_SERIAL)"
|
||||
|
||||
qemu-uninstall:
|
||||
adb -s $(ADB_SERIAL) uninstall $(ANDROID_PACKAGE_NAME)
|
||||
|
||||
# Dump recent logcat output for the running PostIt.Android process.
|
||||
# By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
|
||||
# `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
|
||||
# Filtering is by PID (pidof $(ANDROID_PACKAGE_NAME)), not by tag,
|
||||
# because Mono/Xamarin can emit logs under several tags
|
||||
# (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
|
||||
# would miss the ones not matching. PID-based filtering is exact.
|
||||
# If the app is not running, pidof returns empty and logcat exits
|
||||
# silently with no output; that is the expected behaviour for
|
||||
# "no logs yet".
|
||||
logcat:
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -z "$$PID" ]; then \
|
||||
echo " $(ANDROID_PACKAGE_NAME) is not running on $(ADB_SERIAL)."; \
|
||||
echo " Start the app first (am start -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity)"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
echo " Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
|
||||
if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
|
||||
adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
else \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
fi
|
||||
|
||||
# Clear logcat, launch PostIt.Android, then dump everything that was
|
||||
# emitted during the startup window. Targets the "démarrage KO" case
|
||||
# where the process starts but Avalonia never renders a frame — the
|
||||
# logcat trace from process start to first frame is what diagnoses it.
|
||||
#
|
||||
# Override LOGCAT_BOOT_WAIT to extend the post-launch wait
|
||||
# (default 15s; raise to 30+ if the device is slow to boot Avalonia).
|
||||
LOGCAT_BOOT_WAIT ?= 15
|
||||
|
||||
|
||||
android-start:
|
||||
@echo " Clearing logcat buffer..."
|
||||
adb -s $(ADB_SERIAL) logcat -c
|
||||
@echo " Launching $(ANDROID_PACKAGE_NAME)..."
|
||||
adb -s $(ADB_SERIAL) shell am start \
|
||||
-n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity
|
||||
@echo " ✅ $(ANDROID_PACKAGE_NAME) started on $(ADB_SERIAL)"
|
||||
|
||||
qemu-logcat-boot: android-start
|
||||
@echo " Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
|
||||
@sleep $(LOGCAT_BOOT_WAIT)
|
||||
|
||||
@echo " Dumping logcat (PostIt PID + system buffer):"
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -n "$$PID" ]; then \
|
||||
echo " ✅ (PID $$PID at dump time)"; \
|
||||
sleep 10; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID; \
|
||||
else \
|
||||
echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
qemu: qemu-run qemu-wait-boot android-install
|
||||
|
||||
.PHONY: clean qemu qemu-run qemu-stop qemu-wait-boot android-build android-install logcat qemu-logcat-boot
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using Android.App;
|
||||
using Android;
|
||||
using Android.Runtime;
|
||||
using Avalonia;
|
||||
using Avalonia.Android;
|
||||
|
|
@ -9,6 +10,9 @@ using Avalonia.Controls;
|
|||
using Avalonia.Styling;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
[assembly: UsesPermission(Manifest.Permission.AccessFineLocation)]
|
||||
[assembly: UsesPermission(Manifest.Permission.AccessCoarseLocation)]
|
||||
|
||||
namespace PostIt.Android
|
||||
{
|
||||
[Application]
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
using Android.App;
|
||||
|
||||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.Content.PM;
|
||||
using Avalonia;
|
||||
using AndroidX.Core.Provider;
|
||||
using AndroidX.Emoji2.Text;
|
||||
using Avalonia.Android;
|
||||
using PostIt.Droid.Services;
|
||||
|
||||
namespace PostIt.Android;
|
||||
|
||||
|
|
@ -15,18 +18,22 @@ namespace PostIt.Android;
|
|||
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
|
||||
public class MainActivity : AvaloniaMainActivity
|
||||
{
|
||||
/// <summary>
|
||||
/// Strongly-typed handle to the current MainActivity instance, set in
|
||||
/// <see cref="OnCreate"/> and consumed by platform services such as
|
||||
/// <see cref="Services.AndroidSystemBrowser"/> which need to launch
|
||||
/// Chrome Custom Tabs.
|
||||
/// <summary>
|
||||
/// The current MainActivity instance.
|
||||
/// </summary>
|
||||
public static MainActivity? Current { get; private set; }
|
||||
|
||||
protected override void OnCreate(global::Android.OS.Bundle? savedInstanceState)
|
||||
{
|
||||
FontRequest fontRequest = new FontRequest(
|
||||
"com.google.android.gms.fonts",
|
||||
"com.google.android.gms",
|
||||
"Noto Color Emoji Compat",
|
||||
Yavsc.Resource.Array.com_google_android_gms_fonts_certs); //com_google_android_gms_fonts_certs
|
||||
EmojiCompat.Config config = new FontRequestEmojiCompatConfig(this, fontRequest);
|
||||
EmojiCompat.Init(config);
|
||||
PlatformBootstrap.InitPlatform();
|
||||
base.OnCreate(savedInstanceState);
|
||||
PlatformBootstrap.EnsureInitialized();
|
||||
Current = this;
|
||||
}
|
||||
/// <summary>
|
||||
|
|
@ -41,7 +48,24 @@ public class MainActivity : AvaloniaMainActivity
|
|||
protected override void OnNewIntent(Intent? intent)
|
||||
{
|
||||
base.OnNewIntent(intent);
|
||||
if (intent is not null) AndroidOidcCallbackSink.Handle(intent);
|
||||
|
||||
var url = intent?.DataString;
|
||||
if (!string.IsNullOrEmpty(url) && url.StartsWith("postit://callback"))
|
||||
{
|
||||
OidcCallbackManager.SetResult(url);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public override void OnRequestPermissionsResult(int requestCode, string[]? permissions, Permission[]? grantResults)
|
||||
{
|
||||
if (PostIt.Android.Services.AndroidCurrentLocationProvider
|
||||
.HandlePermissionResult(requestCode, grantResults))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
}
|
||||
|
||||
internal static class AndroidOidcCallbackSink
|
||||
|
|
|
|||
|
|
@ -12,18 +12,14 @@ namespace PostIt.Android;
|
|||
/// </summary>
|
||||
internal static class PlatformBootstrap
|
||||
{
|
||||
private static int _initialized;
|
||||
|
||||
internal static void EnsureInitialized()
|
||||
internal static void InitPlatform()
|
||||
{
|
||||
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
||||
return;
|
||||
|
||||
Platform.DefaultRedirectUri = ViewModels.Settings.AndroidRedirectUri;
|
||||
Platform.CreateBrowser = () =>
|
||||
{
|
||||
var activity = MainActivity.Current;
|
||||
return activity is null ? null : new AndroidSystemBrowser(activity);
|
||||
};
|
||||
|
||||
Platform.TryGetCurrentLocationAsync = AndroidCurrentLocationProvider.TryGetCurrentLocationAsync;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,30 +4,27 @@
|
|||
<TargetFramework>net10.0-android</TargetFramework>
|
||||
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
<ApplicationId>fr.pschneider.PostIt</ApplicationId>
|
||||
<ApplicationId>fr.pschneider.postit</ApplicationId>
|
||||
<ApplicationVersion>1</ApplicationVersion>
|
||||
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
|
||||
<AndroidPackageFormat>apk</AndroidPackageFormat>
|
||||
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
|
||||
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
|
||||
<TrimMode>partial</TrimMode>
|
||||
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
|
||||
<Version>1.1.0-beta.1</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<AndroidResource Include="Icon.png">
|
||||
<Link>Resources\drawable\Icon.png</Link>
|
||||
</AndroidResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia.Android" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Browser" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" />
|
||||
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Common" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -2,31 +2,5 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<application android:label="PostIt" android:icon="@drawable/Icon">
|
||||
|
||||
<!--
|
||||
Deep-link receiver for the OIDC Authorization Code + PKCE flow.
|
||||
After the user authenticates in the system browser, the OP
|
||||
redirects to android://postit-signin?... and Android forwards
|
||||
the Intent to the MainActivity (configured SingleTask so the
|
||||
existing instance receives OnNewIntent rather than spawning a
|
||||
new one).
|
||||
|
||||
The host value (postit-signin) MUST match the
|
||||
AndroidRedirectUri constant in PostIt/Settings/Settings.cs and
|
||||
the corresponding RedirectUri registered for the 'postit'
|
||||
client in IdentityServer (Yavsc.Org ConfigurationDb).
|
||||
-->
|
||||
<activity-alias
|
||||
android:name="PostIt.Android.OidcCallbackActivity"
|
||||
android:targetActivity="PostIt.Android.PostItMainActivity"
|
||||
android:exported="true"
|
||||
android:launchMode="singleTask">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="android" android:host="postit-signin" />
|
||||
</intent-filter>
|
||||
</activity-alias>
|
||||
</application>
|
||||
</manifest>
|
||||
|
|
|
|||
13
src/PostIt/PostIt.Android/Resources/values/font_certs.xml
Normal file
13
src/PostIt/PostIt.Android/Resources/values/font_certs.xml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<array name="com_google_android_gms_fonts_certs">
|
||||
<item>@array/com_google_android_gms_fonts_certs_dev</item>
|
||||
<item>@array/com_google_android_gms_fonts_certs_prod</item>
|
||||
</array>
|
||||
<string-array name="com_google_android_gms_fonts_certs_dev">
|
||||
<item>MIIEqDCCA5CgAwIBAgIJAN5gc16AJfAsMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHR29vZ2xlMRAwDgYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMSEwHwYJKoZIhvcNAQkBFhJhbmRyb2lkQGFuZHJvaWQuY29tMCAXDTA4MDQxNTIyNDA0M1YYDzQyMDgxMzA0MjI0MDQzWjCBlDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDURvdW50YWluIFZpZXcxEDAOBgNVBAoTB0dvb2dsZTEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEhMB8GCSqGSIb3DQEJARYSYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBi1vF0K1vOEHG7AxneTjOHUka46MIidBqvFcO164A49iU2DkYPhUaM4H8JCdzh6N1GzM6h9o6E2V6z8+gEtdI6nqqs0EGA0G0H701bFjLp9+K/1DkMIFeD4P8J7X1/M8t4+X09X/7bQyV3w0v7q+Qh38sY8W/7K29B3f2O2sLw+uX9U8a8Tf4Xv8A==</item>
|
||||
</string-array>
|
||||
<string-array name="com_google_android_gms_fonts_certs_prod">
|
||||
<item>MIIEQzCCAyugAwIBAgIJAMLgh0ZgXpYOMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKvSkUIXm+t9M8rXj2V</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
|
|
@ -0,0 +1,130 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Android;
|
||||
using Android.App;
|
||||
using Android.Content.PM;
|
||||
using Android.Locations;
|
||||
using AndroidX.Core.App;
|
||||
using AndroidX.Core.Content;
|
||||
using PostIt.Services;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
internal static class AndroidCurrentLocationProvider
|
||||
{
|
||||
public static async Task<CurrentLocationResult> TryGetCurrentLocationAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
var activity = MainActivity.Current;
|
||||
if (activity is null)
|
||||
{
|
||||
return CurrentLocationResult.Unavailable("L'activité Android n'est pas encore prête.");
|
||||
}
|
||||
|
||||
var permissionGranted = await LocationPermissionBroker.EnsureGrantedAsync(activity, cancellationToken).ConfigureAwait(false);
|
||||
if (!permissionGranted)
|
||||
{
|
||||
return CurrentLocationResult.PermissionDenied();
|
||||
}
|
||||
|
||||
var locationManager = activity.GetSystemService(global::Android.Content.Context.LocationService) as LocationManager;
|
||||
if (locationManager is null)
|
||||
{
|
||||
return CurrentLocationResult.Unavailable("Le service de localisation Android est indisponible.");
|
||||
}
|
||||
|
||||
var location = locationManager.GetProviders(enabledOnly: true)?
|
||||
.Select(provider => locationManager.GetLastKnownLocation(provider))
|
||||
.Where(candidate => candidate is not null)
|
||||
.OrderByDescending(candidate => candidate!.Time)
|
||||
.ThenBy(candidate => candidate!.Accuracy)
|
||||
.FirstOrDefault();
|
||||
|
||||
if (location is null)
|
||||
{
|
||||
return CurrentLocationResult.Unavailable("Aucune position n'est disponible. Activez la localisation du système puis réessayez.");
|
||||
}
|
||||
|
||||
return CurrentLocationResult.Success(location.Latitude, location.Longitude);
|
||||
}
|
||||
|
||||
public static bool HandlePermissionResult(int requestCode, Permission[]? grantResults)
|
||||
=> LocationPermissionBroker.HandleResult(requestCode, grantResults);
|
||||
|
||||
private static class LocationPermissionBroker
|
||||
{
|
||||
private const int RequestCode = 4042;
|
||||
private static readonly string[] RequestedPermissions =
|
||||
{
|
||||
Manifest.Permission.AccessFineLocation,
|
||||
Manifest.Permission.AccessCoarseLocation,
|
||||
};
|
||||
|
||||
private static readonly object SyncRoot = new();
|
||||
private static TaskCompletionSource<bool>? _pendingRequest;
|
||||
|
||||
public static Task<bool> EnsureGrantedAsync(Activity activity, CancellationToken cancellationToken)
|
||||
{
|
||||
if (HasLocationPermission(activity))
|
||||
{
|
||||
return Task.FromResult(true);
|
||||
}
|
||||
|
||||
lock (SyncRoot)
|
||||
{
|
||||
if (_pendingRequest is null)
|
||||
{
|
||||
_pendingRequest = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
ActivityCompat.RequestPermissions(activity, RequestedPermissions, RequestCode);
|
||||
}
|
||||
|
||||
if (!cancellationToken.CanBeCanceled)
|
||||
{
|
||||
return _pendingRequest.Task;
|
||||
}
|
||||
|
||||
return WaitAsync(_pendingRequest.Task, cancellationToken);
|
||||
}
|
||||
}
|
||||
|
||||
public static bool HandleResult(int requestCode, Permission[]? grantResults)
|
||||
{
|
||||
if (requestCode != RequestCode)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var granted = grantResults is { Length: > 0 } && grantResults.All(result => result == Permission.Granted);
|
||||
TaskCompletionSource<bool>? pendingRequest;
|
||||
lock (SyncRoot)
|
||||
{
|
||||
pendingRequest = _pendingRequest;
|
||||
_pendingRequest = null;
|
||||
}
|
||||
|
||||
pendingRequest?.TrySetResult(granted);
|
||||
return true;
|
||||
}
|
||||
|
||||
private static bool HasLocationPermission(Activity activity)
|
||||
{
|
||||
return ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessFineLocation) == Permission.Granted
|
||||
|| ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessCoarseLocation) == Permission.Granted;
|
||||
}
|
||||
|
||||
private static async Task<bool> WaitAsync(Task<bool> task, CancellationToken cancellationToken)
|
||||
{
|
||||
using var registration = cancellationToken.Register(() =>
|
||||
{
|
||||
lock (SyncRoot)
|
||||
{
|
||||
_pendingRequest?.TrySetCanceled(cancellationToken);
|
||||
_pendingRequest = null;
|
||||
}
|
||||
});
|
||||
|
||||
return await task.ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@ using System.Threading.Tasks;
|
|||
using Android.App;
|
||||
using AndroidX.Browser.CustomTabs;
|
||||
using IdentityModel.OidcClient.Browser;
|
||||
using PostIt.Droid.Services;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
|
|
@ -35,9 +36,14 @@ public sealed class AndroidSystemBrowser : IBrowser
|
|||
};
|
||||
}
|
||||
|
||||
var uri = global::Android.Net.Uri.Parse(options.StartUrl)!;
|
||||
// 1. Enregistrez la tâche avant de lancer le Custom Tab
|
||||
var callbackTask = OidcCallbackManager.RegisterCallback(cancellationToken);
|
||||
|
||||
var callbackTask = MainActivity.AndroidOidcCallbackSink.AwaitNextCallbackAsync();
|
||||
// 2. LANCEZ VOTRE CUSTOM TAB ICI (via AndroidX.Browser.CustomTabs)
|
||||
// ... code pour ouvrir l'URL d'authentification ...
|
||||
|
||||
|
||||
var uri = global::Android.Net.Uri.Parse(options.StartUrl)!;
|
||||
|
||||
var tabsIntent = new CustomTabsIntent.Builder()
|
||||
.SetShowTitle(true)!
|
||||
|
|
|
|||
21
src/PostIt/PostIt.Android/Services/OidcCallbackManager.cs
Normal file
21
src/PostIt/PostIt.Android/Services/OidcCallbackManager.cs
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace PostIt.Droid.Services;
|
||||
|
||||
public static class OidcCallbackManager
|
||||
{
|
||||
private static TaskCompletionSource<string>? _tcs;
|
||||
|
||||
public static Task<string> RegisterCallback(CancellationToken cancellationToken)
|
||||
{
|
||||
_tcs = new TaskCompletionSource<string>();
|
||||
cancellationToken.Register(() => _tcs.TrySetCanceled());
|
||||
return _tcs.Task;
|
||||
}
|
||||
|
||||
public static void SetResult(string url)
|
||||
{
|
||||
_tcs?.TrySetResult(url);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.Content.PM;
|
||||
using Android.OS;
|
||||
using PostIt.Droid.Services;
|
||||
|
||||
namespace PostIt.Android;
|
||||
|
||||
[Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop, Exported = true)]
|
||||
[IntentFilter(new[] { Intent.ActionView },
|
||||
Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable },
|
||||
DataScheme = "postit", // Remplacez par votre schéma personnalisé (ex: yavsc ou postit)
|
||||
DataHost = "callback")] // Correspond à postit://callback
|
||||
public class WebAuthenticationCallbackActivity : Activity
|
||||
{
|
||||
protected override void OnCreate(Bundle? savedInstanceState)
|
||||
{
|
||||
base.OnCreate(savedInstanceState);
|
||||
|
||||
// Capturer l'URL de redirection OIDC
|
||||
var url = Intent?.DataString;
|
||||
|
||||
if (!string.IsNullOrEmpty(url))
|
||||
{
|
||||
// Transmettre l'URL au gestionnaire partagé pour compléter la Task
|
||||
OidcCallbackManager.SetResult(url);
|
||||
}
|
||||
|
||||
// Fermer cette activité transparente et ramener l'application au premier plan
|
||||
var intent = new Intent(this, typeof(MainActivity));
|
||||
intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
|
||||
StartActivity(intent);
|
||||
Finish();
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
<Nullable>enable</Nullable>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
|
||||
<Version>1.1.0-beta.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -15,4 +15,4 @@
|
|||
<ItemGroup>
|
||||
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
using PostIt.Services;
|
||||
|
||||
namespace PostIt.Desktop;
|
||||
|
||||
/// <summary>
|
||||
/// One-shot platform bootstrap. Called from <c>Program.Main</c> so that
|
||||
/// the shared OIDC login path sees a working <c>IBrowser</c> — the
|
||||
/// custom-scheme browser that hands the OIDC callback off to the
|
||||
/// running instance through the named pipe. Desktop builds do NOT use
|
||||
/// a loopback HTTP listener: the <c>postit://</c> scheme is registered
|
||||
/// with the OS at install time and the browser is whatever the user
|
||||
/// has configured to open it.
|
||||
/// </summary>
|
||||
internal static class PlatformBootstrap
|
||||
{
|
||||
private static int _initialized;
|
||||
|
||||
internal static void EnsureInitialized()
|
||||
{
|
||||
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
||||
return;
|
||||
|
||||
// Use the custom-scheme redirect on Desktop. Loopback is only
|
||||
// a fallback for platforms that cannot register postit://
|
||||
// (see Settings.DefaultLoopbackRedirectUri for that path).
|
||||
Platform.DefaultRedirectUri = AuthenticationSettings.DefaultDesktopRedirectUri;
|
||||
Platform.CustomScheme = "postit";
|
||||
}
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
<Nullable>enable</Nullable>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
|
||||
<Version>1.1.0-beta.1</Version>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
@ -24,4 +24,4 @@
|
|||
<ItemGroup>
|
||||
<ProjectReference Include="..\PostIt\PostIt.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -12,8 +12,6 @@ sealed class Program
|
|||
[STAThread]
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
PlatformBootstrap.EnsureInitialized();
|
||||
|
||||
// Short-circuit 2nd-instance launches (OS handing us the
|
||||
// postit://callback URL) BEFORE Avalonia spins up a window.
|
||||
// If we let Avalonia initialise, the new MainWindow flashes
|
||||
|
|
|
|||
151
src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs
Normal file
151
src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
using System.Net.Http;
|
||||
using PostIt.ViewModels;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public class ActivitiesPageViewModelTests
|
||||
{
|
||||
[Fact]
|
||||
public void ActivityApiClient_uses_avatar_authority_when_provided()
|
||||
{
|
||||
var api = new StubActivityApi();
|
||||
var client = new ActivityApiClient(
|
||||
api,
|
||||
"https://api.pschneider.fr/api/v1/",
|
||||
"https://yavsc.pschneider.fr/");
|
||||
|
||||
var url = client.BuildAvatarXsUrl("paul");
|
||||
|
||||
Assert.Equal("https://yavsc.pschneider.fr/avatars/paul.xs.png", url);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ActivityApiClient_uses_business_absolute_paths()
|
||||
{
|
||||
var api = new StubActivityApi();
|
||||
var client = new ActivityApiClient(api, "https://business.example/api/v1/");
|
||||
var billingClient = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
|
||||
await client.GetCatalogAsync("brush", TestContext.Current.CancellationToken);
|
||||
await client.GetUsersAsync("brush-pro", TestContext.Current.CancellationToken);
|
||||
await billingClient.CreateAsync("Rdv", new { Foo = "Bar" }, TestContext.Current.CancellationToken);
|
||||
await billingClient.GetQuerySummariesAsync("Rdv", TestContext.Current.CancellationToken);
|
||||
|
||||
Assert.Equal("https://business.example/api/v1/activity/catalog?parentCode=brush", api.Paths[0]);
|
||||
Assert.Equal("https://business.example/api/v1/activity/brush-pro/users", api.Paths[1]);
|
||||
Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[2]);
|
||||
Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[3]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RefreshAsync_loads_first_activity_then_specialization_performers()
|
||||
{
|
||||
var api = new StubActivityApi();
|
||||
var client = new ActivityApiClient(api, "https://business.example/api/v1/");
|
||||
var billingClient = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm = new ActivitiesPageViewModel(client, billingClient);
|
||||
|
||||
await vm.RefreshAsync();
|
||||
|
||||
Assert.Equal("brush", vm.SelectedActivity?.Code);
|
||||
Assert.Single(vm.Specializations);
|
||||
Assert.Equal("brush", vm.CurrentActivity?.Code);
|
||||
Assert.Single(vm.Performers);
|
||||
Assert.Equal("Alice", vm.Performers[0].UserName);
|
||||
Assert.Equal("https://business.example/avatars/Alice.xs.png", vm.Performers[0].AvatarXsUrl);
|
||||
Assert.True(vm.Performers[0].HasPerformerProfile);
|
||||
Assert.True(vm.Performers[0].IsPerformerActive);
|
||||
Assert.Equal("Actif", vm.Performers[0].PerformerStatusBadgeLabel);
|
||||
Assert.Equal("Pas d'autre activité", vm.Performers[0].ExtraActivityLabel);
|
||||
|
||||
await vm.ShowSpecializationAsync(vm.Specializations[0]);
|
||||
|
||||
Assert.Equal("brush-pro", vm.CurrentActivity?.Code);
|
||||
Assert.Single(vm.Performers);
|
||||
Assert.Equal("Bob", vm.Performers[0].UserName);
|
||||
Assert.Equal("https://business.example/avatars/Bob.xs.png", vm.Performers[0].AvatarXsUrl);
|
||||
Assert.True(vm.Performers[0].HasPerformerProfile);
|
||||
Assert.False(vm.Performers[0].IsPerformerActive);
|
||||
Assert.Equal("Inactif", vm.Performers[0].PerformerStatusBadgeLabel);
|
||||
Assert.Equal("Autres spécialisations: 2", vm.Performers[0].ExtraActivityLabel);
|
||||
Assert.Contains("brush pro", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
await vm.ShowSpecializationAsync(null);
|
||||
|
||||
Assert.Equal("brush", vm.CurrentActivity?.Code);
|
||||
Assert.Single(vm.Performers);
|
||||
Assert.Equal("Alice", vm.Performers[0].UserName);
|
||||
}
|
||||
|
||||
private sealed class StubActivityApi : IYavscApiClient
|
||||
{
|
||||
public HttpClient Http { get; } = new();
|
||||
public List<string> Paths { get; } = new();
|
||||
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
Paths.Add(path);
|
||||
|
||||
if (typeof(T) == typeof(List<ActivityInfo>))
|
||||
{
|
||||
var activities = new List<ActivityInfo>
|
||||
{
|
||||
new()
|
||||
{
|
||||
Code = "brush",
|
||||
Name = "Brush",
|
||||
Description = "Coiffure à domicile",
|
||||
PerformerCount = 1,
|
||||
Forms = new List<CommandFormSummary>
|
||||
{
|
||||
new() { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" }
|
||||
},
|
||||
Children = new List<ActivityInfo>
|
||||
{
|
||||
new()
|
||||
{
|
||||
Code = "brush-pro",
|
||||
Name = "Brush Pro",
|
||||
Description = "Spécialisation premium",
|
||||
ParentCode = "brush",
|
||||
PerformerCount = 1,
|
||||
Forms = new List<CommandFormSummary>
|
||||
{
|
||||
new() { Id = 2, ActionName = "Rdv", Title = "Rendez-vous premium" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
return Task.FromResult((T)(object)activities);
|
||||
}
|
||||
|
||||
if (typeof(T) == typeof(List<PerformerActivity>))
|
||||
{
|
||||
var performers = path.EndsWith("brush-pro/users", StringComparison.Ordinal)
|
||||
? new List<PerformerActivity>
|
||||
{
|
||||
new() { PerformerId = "pro-2", HasPerformerProfile = true, Active = false, UserName = "Bob", ActivityCode = "brush-pro", ActivityName = "Brush Pro", ExtraActivityCount = 2 }
|
||||
}
|
||||
: new List<PerformerActivity>
|
||||
{
|
||||
new() { PerformerId = "pro-1", HasPerformerProfile = true, Active = true, UserName = "Alice", ActivityCode = "brush", ActivityName = "Brush", ExtraActivityCount = 0 }
|
||||
};
|
||||
|
||||
return Task.FromResult((T)(object)performers);
|
||||
}
|
||||
|
||||
return Task.FromResult(default(T)!);
|
||||
}
|
||||
|
||||
public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
Paths.Add(path);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
|
@ -73,7 +73,7 @@ public class AddCircleMemberDialogTests
|
|||
return context;
|
||||
}
|
||||
/// <summary>
|
||||
/// Mount a real <see cref="MainWindow"/>, build a minimal
|
||||
/// Mount a real <see cref="MainView"/>, build a minimal
|
||||
/// DI graph, push <see cref="CirclesPage"/> then the
|
||||
/// <see cref="AddCircleMemberDialog"/> on top of it.
|
||||
/// Returns the stack size so the test can pin the delta.
|
||||
|
|
@ -98,12 +98,9 @@ public class AddCircleMemberDialogTests
|
|||
services.AddTransient<AddCircleMemberDialogViewModel>();
|
||||
var sp = services.BuildServiceProvider();
|
||||
|
||||
context.Window = new MainWindow();
|
||||
context.Window = new MainView();
|
||||
context.App = (PostIt.App)Application.Current!;
|
||||
context.App.DataTemplates.Clear();
|
||||
context.App.DataTemplates.Add(new ViewLocator(sp));
|
||||
context.App.AttachMainWindow(context.Window);
|
||||
context.Window.Show();
|
||||
|
||||
context.page = sp.GetRequiredService<CirclesPage>();
|
||||
context.Window.NavRoot.PushAsync(context.page).GetAwaiter().GetResult();
|
||||
|
|
|
|||
|
|
@ -12,9 +12,10 @@ namespace PostIt.Tests;
|
|||
/// Skip conditions: the package is not installed on the connected device,
|
||||
/// or no device is connected via adb.
|
||||
/// </summary>
|
||||
[Trait("Category", "Platform-Android")]
|
||||
public class AndroidAppLaunchTests
|
||||
{
|
||||
private const string PackageName = "fr.pschneider.PostIt";
|
||||
private const string PackageName = "fr.pschneider.postit";
|
||||
|
||||
private readonly ITestOutputHelper _output;
|
||||
|
||||
|
|
@ -23,7 +24,8 @@ public class AndroidAppLaunchTests
|
|||
_output = output;
|
||||
}
|
||||
|
||||
// FIXME [Fact]
|
||||
// TODO https://twosixtech.com/blog/integrating-docker-and-adb/
|
||||
[Fact]
|
||||
public void PostIt_starts_and_draws_a_first_frame_on_the_emulator()
|
||||
{
|
||||
if (!IsPackageInstalledOnAnyDevice())
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public class BearerScopeTests
|
|||
Scopes = userScopes,
|
||||
RedirectUri = "postit://callback",
|
||||
},
|
||||
BusinessApiUrl = "https://example.invalid/api/v1/",
|
||||
ApiUrl = "https://example.invalid/api/v1/",
|
||||
};
|
||||
|
||||
var tokensPath = Path.Combine(
|
||||
|
|
@ -266,7 +266,7 @@ public class BearerScopeTests
|
|||
// private HttpClient is independent, so we resolve the
|
||||
// absolute URI ourselves from Settings.BusinessApiUrl —
|
||||
// the same URL BlogApiClient would have set as BaseAddress.
|
||||
var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path);
|
||||
var absolute = new Uri(new Uri(Settings.ApiUrl), path);
|
||||
using var req = new HttpRequestMessage(method, absolute);
|
||||
req.Headers.Authorization =
|
||||
new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _accessToken);
|
||||
|
|
|
|||
274
src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs
Normal file
274
src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs
Normal file
|
|
@ -0,0 +1,274 @@
|
|||
using System.Text.Json;
|
||||
using PostIt.Helpers;
|
||||
using PostIt.Services;
|
||||
using PostIt.ViewModels;
|
||||
using PostIt.ViewModels.Commands;
|
||||
using Yavsc;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
using Yavsc.Models.Haircut;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public class BillingCommandPageViewModelTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task SubmitAsync_posts_rdv_payload_to_selected_billing_route()
|
||||
{
|
||||
var api = new RecordingApi();
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm =
|
||||
new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
|
||||
.CreateCommandPageViewModel(
|
||||
new ActivityInfo { Code = "dev", Name = "Développement" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
|
||||
client) as RdvViewModel;
|
||||
|
||||
vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
|
||||
vm!.Reason = "Point de cadrage";
|
||||
vm!.Address = "1 rue du Test";
|
||||
vm!.Latitude = 48.8566;
|
||||
vm!.Longitude = 2.3522;
|
||||
vm!.Consent = true;
|
||||
|
||||
await vm.SubmitCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.Equal("https://business.example/api/v1/billing/Rdv", api.LastPath);
|
||||
Assert.NotNull(api.LastBody);
|
||||
|
||||
using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
|
||||
Assert.Equal("dev", json.RootElement.GetProperty("ActivityCode").GetString());
|
||||
Assert.Equal("perf-1", json.RootElement.GetProperty("PerformerId").GetString());
|
||||
Assert.Equal("Point de cadrage", json.RootElement.GetProperty("Reason").GetString());
|
||||
Assert.Equal((int)QueryStatus.Inserted, json.RootElement.GetProperty("Status").GetInt32());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SubmitAsync_refuses_unsupported_billing_code()
|
||||
{
|
||||
var api = new RecordingApi();
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
|
||||
var vm =
|
||||
new CommandFormSummary { Id = 13, ActionName = "Book", Title = "Réservation" }
|
||||
.CreateCommandPageViewModel(
|
||||
new ActivityInfo { Code = "book", Name = "Book" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
|
||||
client);
|
||||
|
||||
Assert.Null(vm);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SubmitAsync_allows_missing_coordinates_and_omits_them_from_payload()
|
||||
{
|
||||
var api = new RecordingApi();
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm =
|
||||
|
||||
new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
|
||||
.CreateCommandPageViewModel(
|
||||
new ActivityInfo { Code = "dev", Name = "Développement" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
|
||||
client) as RdvViewModel;
|
||||
vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
|
||||
vm!.Reason = "Point de cadrage";
|
||||
vm!.Address = "1 rue du Test";
|
||||
vm!.Latitude = null;
|
||||
vm!.Longitude = null;
|
||||
vm!.Consent = true;
|
||||
|
||||
await vm.SubmitCommand.ExecuteAsync(null);
|
||||
|
||||
using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
|
||||
var location = json.RootElement.GetProperty("Location");
|
||||
Assert.Equal("1 rue du Test", location.GetProperty("Address").GetString());
|
||||
Assert.False(location.TryGetProperty("Latitude", out _));
|
||||
Assert.False(location.TryGetProperty("Longitude", out _));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UseCurrentLocationAsync_prefills_coordinates_from_platform_provider()
|
||||
{
|
||||
var original = Platform.TryGetCurrentLocationAsync;
|
||||
try
|
||||
{
|
||||
Platform.TryGetCurrentLocationAsync = _ => Task.FromResult(CurrentLocationResult.Success(48.8566, 2.3522));
|
||||
|
||||
var api = new RecordingApi();
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm =
|
||||
new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
|
||||
.CreateCommandPageViewModel(
|
||||
new ActivityInfo { Code = "dev", Name = "Développement" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
|
||||
client) as RdvViewModel;
|
||||
|
||||
await vm!.UseCurrentLocationCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.Equal(48.8566, vm!.Latitude);
|
||||
Assert.Equal(2.3522, vm!.Longitude);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Platform.TryGetCurrentLocationAsync = original;
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task InitializeAsync_loads_prestations_for_brush_and_submit_posts_selected_prestation()
|
||||
{
|
||||
var api = new RecordingApi
|
||||
{
|
||||
HairPrestations = new List<HairPrestationDto>
|
||||
{
|
||||
new() { Id = 10, Title = "Femme · Cheveux mi-longs", Details = "Coupe · Brushing" },
|
||||
new() { Id = 11, Title = "Homme · Cheveux courts", Details = "Coupe · Coiffage" },
|
||||
}
|
||||
};
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm =
|
||||
new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
|
||||
.CreateCommandPageViewModel(
|
||||
new ActivityInfo { Code = "brush", Name = "Brush" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
|
||||
client) as BrushViewModel;
|
||||
vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
|
||||
vm!.Address = "1 rue du Test";
|
||||
vm!.Latitude = 48.8566;
|
||||
vm!.Longitude = 2.3522;
|
||||
vm!.Consent = true;
|
||||
vm!.AdditionalInfo = "Prévoir shampoing";
|
||||
|
||||
await vm.InitializeAsync();
|
||||
vm.SelectedPrestation = vm.AvailablePrestations[1];
|
||||
await vm.SubmitCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.Equal("https://business.example/api/v1/billing/Brush", api.LastPath);
|
||||
using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
|
||||
Assert.Equal(11, json.RootElement.GetProperty("PrestationId").GetInt32());
|
||||
Assert.Equal("Prévoir shampoing", json.RootElement.GetProperty("AdditionalInfo").GetString());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task InitializeAsync_loads_prestations_for_mbrush_and_submit_posts_selected_prestations()
|
||||
{
|
||||
var api = new RecordingApi
|
||||
{
|
||||
HairPrestations = new List<HairPrestationDto>
|
||||
{
|
||||
new() { Id = 21, Title = "Femme · Cheveux longs", Details = "Coupe · Couleur" },
|
||||
new() { Id = 22, Title = "Enfant · Cheveux courts", Details = "Coupe · Sans technique" },
|
||||
}
|
||||
};
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm =
|
||||
new CommandFormSummary { Id = 14, ActionName = "MBrush", Title = "Coupe groupée" }
|
||||
.CreateCommandPageViewModel(
|
||||
new ActivityInfo { Code = "mbrush", Name = "MBrush" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-3", UserName = "Cara" },
|
||||
client) as MBrushViewModel;
|
||||
vm!.EventDate = DateTime.Parse("2026-09-03 10:00");
|
||||
vm!.Address = "2 rue du Test";
|
||||
vm!.Latitude = 48.8567;
|
||||
vm!.Longitude = 2.3523;
|
||||
vm!.Consent = true;
|
||||
|
||||
await vm.InitializeAsync();
|
||||
vm!.MultiPrestations[0].IsSelected = true;
|
||||
vm!.MultiPrestations[1].IsSelected = true;
|
||||
await vm!.SubmitCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.Equal("https://business.example/api/v1/billing/MBrush", api.LastPath);
|
||||
using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
|
||||
var prestations = json.RootElement.GetProperty("Prestations");
|
||||
Assert.Equal(2, prestations.GetArrayLength());
|
||||
Assert.Equal(21, prestations[0].GetProperty("PrestationId").GetInt32());
|
||||
Assert.Equal(22, prestations[1].GetProperty("PrestationId").GetInt32());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task InitializeAsync_with_existing_brush_query_prefills_and_submit_updates_query()
|
||||
{
|
||||
var api = new RecordingApi
|
||||
{
|
||||
HairPrestations = new List<HairPrestationDto>
|
||||
{
|
||||
new() { Id = 30, Title = "Femme · Cheveux longs", Details = "Coupe · Brushing" },
|
||||
new() { Id = 31, Title = "Homme · Cheveux courts", Details = "Coupe" },
|
||||
}
|
||||
};
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm =
|
||||
new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
|
||||
.CreateCommandPageViewModel(
|
||||
new ActivityInfo { Code = "brush", Name = "Brush" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
|
||||
client) as BrushViewModel;
|
||||
await vm!.InitializeAsync(new BillingQueryDetailsDto
|
||||
{
|
||||
Id = 77,
|
||||
BillingCode = "Brush",
|
||||
ActivityCode = "brush",
|
||||
PerformerId = "perf-2",
|
||||
ClientId = "cli-1",
|
||||
EventDate = new DateTime(2026, 9, 2, 14, 30, 0, DateTimeKind.Utc),
|
||||
Consent = true,
|
||||
Status = QueryStatus.Accepted,
|
||||
PrestationId = 30,
|
||||
AdditionalInfo = "Ancienne note",
|
||||
Location = new BillingLocationDto
|
||||
{
|
||||
Address = "1 rue du Test",
|
||||
Latitude = 48.8566,
|
||||
Longitude = 2.3522,
|
||||
}
|
||||
});
|
||||
|
||||
vm!.SelectedPrestation = vm!.AvailablePrestations[1];
|
||||
vm!.AdditionalInfo = "Note mise à jour";
|
||||
await vm!.SubmitCommand.ExecuteAsync(null);
|
||||
|
||||
Assert.Equal(HttpMethod.Put, api.LastMethod);
|
||||
Assert.Equal("https://business.example/api/v1/billing/Brush/77", api.LastPath);
|
||||
Assert.True(vm.IsEditingExisting);
|
||||
Assert.Equal("Mettre à jour la commande", vm.SubmitLabel);
|
||||
|
||||
using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
|
||||
Assert.Equal(77, json.RootElement.GetProperty("Id").GetInt32());
|
||||
Assert.Equal(31, json.RootElement.GetProperty("PrestationId").GetInt32());
|
||||
Assert.Equal("Note mise à jour", json.RootElement.GetProperty("AdditionalInfo").GetString());
|
||||
Assert.Equal((int)QueryStatus.Accepted, json.RootElement.GetProperty("Status").GetInt32());
|
||||
}
|
||||
|
||||
private sealed class RecordingApi : IYavscApiClient
|
||||
{
|
||||
public HttpClient Http { get; } = new();
|
||||
public HttpMethod? LastMethod { get; private set; }
|
||||
public string? LastPath { get; private set; }
|
||||
public object? LastBody { get; private set; }
|
||||
public List<HairPrestationDto>? HairPrestations { get; init; }
|
||||
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
LastMethod = method;
|
||||
LastPath = path;
|
||||
LastBody = body;
|
||||
if (typeof(T) == typeof(List<HairPrestationDto>))
|
||||
{
|
||||
return Task.FromResult((T)(object)(HairPrestations ?? new List<HairPrestationDto>()));
|
||||
}
|
||||
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 ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
134
src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs
Normal file
134
src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs
Normal file
|
|
@ -0,0 +1,134 @@
|
|||
using System.Net.Http;
|
||||
using PostIt.ViewModels;
|
||||
using Yavsc;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public class BillingQueriesPageViewModelTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task RefreshAsync_filters_queries_by_selected_activity_and_performer()
|
||||
{
|
||||
var api = new StubBillingApi();
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm = new BillingQueriesPageViewModel(
|
||||
new ActivityInfo { Code = "dev", Name = "Développement" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
|
||||
new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
|
||||
client);
|
||||
|
||||
await vm.InitializeAsync();
|
||||
|
||||
Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths.Single());
|
||||
Assert.Equal(3, vm.Queries.Count);
|
||||
Assert.Contains(vm.Queries, q => q.Description == "Rendez-vous #1");
|
||||
Assert.Contains("3 commande", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RefreshAsync_in_readonly_ongoing_mode_keeps_only_ongoing_statuses_and_disables_open()
|
||||
{
|
||||
var api = new StubBillingApi();
|
||||
var client = new BillingApiClient(api, "https://business.example/api/v1/");
|
||||
var vm = new BillingQueriesPageViewModel(
|
||||
new ActivityInfo { Code = "dev", Name = "Développement" },
|
||||
new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
|
||||
new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
|
||||
client,
|
||||
isReadOnly: true,
|
||||
ongoingOnly: true);
|
||||
|
||||
await vm.InitializeAsync();
|
||||
|
||||
Assert.Equal(2, vm.Queries.Count);
|
||||
Assert.All(vm.Queries, q => Assert.DoesNotContain("Rejected", q.StatusLabel, StringComparison.OrdinalIgnoreCase));
|
||||
Assert.Contains("lecture seule", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
|
||||
Assert.False(vm.CanOpenDetails);
|
||||
|
||||
vm.SelectedQuery = vm.Queries[0];
|
||||
Assert.False(vm.OpenSelectedQueryCommand.CanExecute(null));
|
||||
}
|
||||
|
||||
private sealed class StubBillingApi : IYavscApiClient
|
||||
{
|
||||
public HttpClient Http { get; } = new();
|
||||
public List<string> Paths { get; } = new();
|
||||
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
Paths.Add(path);
|
||||
|
||||
if (typeof(T) == typeof(List<BillingQuerySummaryDto>))
|
||||
{
|
||||
var data = new List<BillingQuerySummaryDto>
|
||||
{
|
||||
new()
|
||||
{
|
||||
Id = 11,
|
||||
ActivityCode = "dev",
|
||||
PerformerId = "perf-1",
|
||||
ClientId = "cli-1",
|
||||
Status = QueryStatus.Inserted,
|
||||
Description = "Rendez-vous #1",
|
||||
Reason = "Point de cadrage",
|
||||
EventDate = new DateTime(2026, 9, 1, 10, 0, 0, DateTimeKind.Utc),
|
||||
},
|
||||
new()
|
||||
{
|
||||
Id = 12,
|
||||
ActivityCode = "other",
|
||||
PerformerId = "perf-1",
|
||||
ClientId = "cli-1",
|
||||
Status = QueryStatus.Accepted,
|
||||
Description = "Autre activité",
|
||||
EventDate = new DateTime(2026, 9, 2, 10, 0, 0, DateTimeKind.Utc),
|
||||
},
|
||||
new()
|
||||
{
|
||||
Id = 13,
|
||||
ActivityCode = "dev",
|
||||
PerformerId = "perf-2",
|
||||
ClientId = "cli-1",
|
||||
Status = QueryStatus.Accepted,
|
||||
Description = "Autre performer",
|
||||
EventDate = new DateTime(2026, 9, 3, 10, 0, 0, DateTimeKind.Utc),
|
||||
},
|
||||
new()
|
||||
{
|
||||
Id = 14,
|
||||
ActivityCode = "dev",
|
||||
PerformerId = "perf-1",
|
||||
ClientId = "cli-1",
|
||||
Status = QueryStatus.InProgress,
|
||||
Description = "En cours",
|
||||
EventDate = new DateTime(2026, 9, 4, 10, 0, 0, DateTimeKind.Utc),
|
||||
},
|
||||
new()
|
||||
{
|
||||
Id = 15,
|
||||
ActivityCode = "dev",
|
||||
PerformerId = "perf-1",
|
||||
ClientId = "cli-1",
|
||||
Status = QueryStatus.Rejected,
|
||||
Description = "Rejetée",
|
||||
EventDate = new DateTime(2026, 9, 5, 10, 0, 0, DateTimeKind.Utc),
|
||||
}
|
||||
};
|
||||
|
||||
return Task.FromResult((T)(object)data);
|
||||
}
|
||||
|
||||
return Task.FromResult(default(T)!);
|
||||
}
|
||||
|
||||
public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
Paths.Add(path);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
|
@ -166,4 +166,51 @@ public class BlogPostAuthorDtoTests
|
|||
Assert.True(root.TryGetProperty("userName", out _));
|
||||
Assert.True(root.TryGetProperty("avatar", out _));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BlogPostDto_deserialises_acl_from_detail_payload()
|
||||
{
|
||||
// Detail payload shape emitted by BlogApiController.GetBlog:
|
||||
// ACL entries are included under "acl"/"ACL".
|
||||
var json = """
|
||||
{
|
||||
"id": 99,
|
||||
"title": "ACL test",
|
||||
"authorId": "u-alice",
|
||||
"acl": [
|
||||
{ "circleId": 12, "blogPostId": 99 },
|
||||
{ "circleId": 34, "blogPostId": 99 }
|
||||
]
|
||||
}
|
||||
""";
|
||||
|
||||
var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
|
||||
|
||||
Assert.NotNull(post);
|
||||
var acl = post!.GetACL();
|
||||
Assert.Equal(2, acl.Length);
|
||||
Assert.Contains(acl, a => a.CircleId == 12);
|
||||
Assert.Contains(acl, a => a.CircleId == 34);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BlogPostDto_does_not_emit_acl_when_serialized_for_write()
|
||||
{
|
||||
var post = new BlogPostDto
|
||||
{
|
||||
Id = 77,
|
||||
Title = "Write payload"
|
||||
};
|
||||
post.AuthorizeCircle(11);
|
||||
|
||||
// The client should not send ACL through POST/PUT blog payloads.
|
||||
// ACL mutations have their own dedicated /blogacl endpoint.
|
||||
var json = JsonSerializer.Serialize(post,
|
||||
new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
|
||||
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
Assert.False(root.TryGetProperty("acl", out _));
|
||||
Assert.False(root.TryGetProperty("wireAcl", out _));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ public class MainPageButtonsTests
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Mount a real <see cref="MainWindow"/> (as
|
||||
/// Mount a real <see cref="MainView"/> (as
|
||||
/// <c>SessionStatusBannerTests</c> does), push a
|
||||
/// <see cref="MainPage"/> with the given VM onto
|
||||
/// <c>NavRoot</c>. <c>PushAsync</c> is awaited (via
|
||||
|
|
@ -109,18 +109,12 @@ public class MainPageButtonsTests
|
|||
/// realised and <c>KeyPressQwerty</c> has a real
|
||||
/// <see cref="TopLevel"/> to dispatch against.
|
||||
/// </summary>
|
||||
private static (MainWindow window, MainPage page) MountMainPage(MainViewModel vm)
|
||||
private static (MainView window, MainPage page) MountMainPage(MainViewModel vm)
|
||||
{
|
||||
var window = new MainWindow();
|
||||
var window = new MainView();
|
||||
var page = new MainPage { DataContext = vm };
|
||||
var app = (PostIt.App)Application.Current!;
|
||||
if (vm.Services is not null)
|
||||
{
|
||||
app.DataTemplates.Clear();
|
||||
app.DataTemplates.Add(new ViewLocator(vm.Services));
|
||||
}
|
||||
app.AttachMainWindow(window);
|
||||
window.Show();
|
||||
window.NavRoot.PushAsync(page).GetAwaiter().GetResult();
|
||||
return (window, page);
|
||||
}
|
||||
|
|
@ -130,7 +124,7 @@ public class MainPageButtonsTests
|
|||
/// supported headless pattern (cf. CalculatorTests in the
|
||||
/// Avalonia.Samples repo). Returns the nav-stack count
|
||||
/// before the click so the caller can assert on the delta.
|
||||
/// KeyPressQwerty is dispatched on the <see cref="MainWindow"/>
|
||||
/// KeyPressQwerty is dispatched on the <see cref="MainView"/>
|
||||
/// itself — it is the <see cref="TopLevel"/> that owns the
|
||||
/// headless implementation, and routing the key through any
|
||||
/// descendant TopLevel (e.g. one obtained via
|
||||
|
|
@ -139,7 +133,7 @@ public class MainPageButtonsTests
|
|||
/// because the descendant does not carry the
|
||||
/// <c>PlatformHandle</c> the harness expects.
|
||||
/// </summary>
|
||||
private static int ClickAndCapture(MainWindow window, Button button)
|
||||
private static int ClickAndCapture(MainView window, Button button)
|
||||
{
|
||||
var stackBefore = window.NavRoot.NavigationStack.Count;
|
||||
button.Command?.Execute(button.CommandParameter);
|
||||
|
|
|
|||
|
|
@ -79,9 +79,9 @@ public class MainPageSaveTests
|
|||
// whose Title is exactly what the user typed. The bug
|
||||
// fails this assertion with Title == string.Empty.
|
||||
Assert.NotEmpty(recorder.Calls);
|
||||
var (method, path, body) = recorder.FirstCall;
|
||||
var (method, path, body) = recorder.Calls[1];
|
||||
Assert.Equal(HttpMethod.Post, method);
|
||||
Assert.Equal("blog", path);
|
||||
Assert.Equal("blogspot", path);
|
||||
var sent = Assert.IsType<BlogPostDto>(body);
|
||||
Assert.Equal(typed, sent.Title);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ using PostIt.Services;
|
|||
using PostIt.ViewModels;
|
||||
using PostIt.Views;
|
||||
using Yavsc.Api.Client;
|
||||
using Yavsc.Api.Client.Dtos;
|
||||
using Yavsc.Blogspot;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
|
@ -94,7 +95,7 @@ public class PostAclDialogTests
|
|||
HttpMethod method, string path, object? body = null,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path);
|
||||
var absolute = new Uri(new Uri(Settings.ApiUrl), path);
|
||||
using var req = new HttpRequestMessage(method, absolute);
|
||||
using var resp = _http.SendAsync(req, ct).GetAwaiter().GetResult();
|
||||
resp.EnsureSuccessStatusCode();
|
||||
|
|
@ -117,13 +118,13 @@ public class PostAclDialogTests
|
|||
/// rebinding the global DI mid-test would trample the
|
||||
/// Settings singleton the rest of the harness depends on.
|
||||
/// </summary>
|
||||
private static (MainWindow window, BlogAclApiClient aclClient, CircleApiClient circleClient, CountingHttpHandler handler) Mount()
|
||||
private static (MainView window, BlogAclApiClient aclClient, CircleApiClient circleClient, CountingHttpHandler handler) Mount()
|
||||
{
|
||||
var handler = new CountingHttpHandler();
|
||||
var settings = new Settings();
|
||||
var api = new TestableYavscApiClient(settings, new TokenStore(System.IO.Path.GetTempFileName()), handler);
|
||||
var aclClient = new BlogAclApiClient(api, settings.BusinessApiUrl);
|
||||
var circleClient = new CircleApiClient(api, settings.BusinessApiUrl);
|
||||
var aclClient = new BlogAclApiClient(api, settings.ApiUrl);
|
||||
var circleClient = new CircleApiClient(api, settings.ApiUrl);
|
||||
|
||||
var services = new ServiceCollection();
|
||||
services.AddSingleton(settings);
|
||||
|
|
@ -138,12 +139,9 @@ public class PostAclDialogTests
|
|||
// CountingHttpHandler.
|
||||
GC.KeepAlive(sp);
|
||||
|
||||
var window = new MainWindow();
|
||||
var window = new MainView();
|
||||
var app = (App)Application.Current!;
|
||||
app.DataTemplates.Clear();
|
||||
app.DataTemplates.Add(new ViewLocator(sp));
|
||||
app.AttachMainWindow(window);
|
||||
window.Show();
|
||||
|
||||
return (window, aclClient, circleClient, handler);
|
||||
}
|
||||
|
|
@ -193,9 +191,8 @@ public class PostAclDialogTests
|
|||
await Task.Delay(20);
|
||||
}
|
||||
|
||||
// Assert: exactly two GETs went out (one to /blogacl,
|
||||
// one to /circle), both from the LoadAsync call.
|
||||
Assert.Equal(2, handler.RequestCount);
|
||||
// Assert: one GET went out (for /circle) from LoadAsync.
|
||||
Assert.Equal(1, handler.RequestCount);
|
||||
|
||||
// And the VM's idempotency gate has flipped.
|
||||
Assert.True(vm.Loaded);
|
||||
|
|
@ -221,7 +218,58 @@ public class PostAclDialogTests
|
|||
await vm.LoadAsync();
|
||||
|
||||
// Assert: the second call short-circuited on _loaded.
|
||||
Assert.Equal(2, handler.RequestCount);
|
||||
Assert.Equal(1, handler.RequestCount);
|
||||
Assert.True(vm.Loaded);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task LoadAsync_keeps_acl_from_blogpostdto_and_only_loads_circles()
|
||||
{
|
||||
var post = new BlogPostDto { Id = 42, Title = "ACL hydration" };
|
||||
post.AuthorizeCircle(12);
|
||||
post.AuthorizeCircle(34);
|
||||
|
||||
var api = new StubAclApiClient();
|
||||
var aclClient = new BlogAclApiClient(api, "http://localhost/");
|
||||
var circleClient = new CircleApiClient(api, "http://localhost/");
|
||||
var vm = new PostAclDialogViewModel(post, aclClient, circleClient);
|
||||
|
||||
await vm.LoadAsync();
|
||||
|
||||
Assert.Equal(1, api.CallCount);
|
||||
Assert.Equal(2, vm.AclEntries.Count);
|
||||
Assert.Contains(vm.AclEntries, a => a.CircleId == 12);
|
||||
Assert.Contains(vm.AclEntries, a => a.CircleId == 34);
|
||||
}
|
||||
|
||||
private sealed class StubAclApiClient : IYavscApiClient
|
||||
{
|
||||
public HttpClient Http { get; } = new();
|
||||
public int CallCount { get; private set; }
|
||||
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
CallCount++;
|
||||
|
||||
if (typeof(T) == typeof(List<CircleDto>))
|
||||
{
|
||||
var circles = new List<CircleDto>
|
||||
{
|
||||
new() { Id = 12, Name = "A", OwnerId = "owner", Public = false },
|
||||
new() { Id = 34, Name = "B", OwnerId = "owner", Public = false },
|
||||
};
|
||||
return Task.FromResult((T)(object)circles);
|
||||
}
|
||||
|
||||
return Task.FromResult(default(T)!);
|
||||
}
|
||||
|
||||
public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
CallCount++;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+1.Branch.release-1.0.8-rc1.Sha.1167169aa89e1bf25290e9a152d27b357a500ab3</InformationalVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
|
||||
<Version>1.1.0-beta.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -16,9 +16,7 @@
|
|||
<PackageReference Include="Xamarin.UITest" />
|
||||
<PackageReference Include="xunit.v3" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" />
|
||||
|
||||
<PackageReference Include="coverlet.collector" />
|
||||
|
||||
<PackageReference Include="Avalonia.Headless" />
|
||||
<PackageReference Include="Avalonia.Headless.XUnit" />
|
||||
</ItemGroup>
|
||||
|
|
@ -28,6 +26,5 @@
|
|||
<ItemGroup>
|
||||
<Using Include="Xunit" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
<ItemGroup></ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -55,6 +55,21 @@ public class PostItViewModelTests
|
|||
Assert.Equal("Hello", posts[0].Title);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task TogglePublishCommand_uses_the_current_checked_state_without_inverting_it()
|
||||
{
|
||||
var api = new RecordingPublishApi();
|
||||
var blog = new BlogApiClient(api, "http://localhost/");
|
||||
var viewModel = new MainViewModel(blog);
|
||||
|
||||
viewModel.SelectedPost = new BlogPostDto { Id = 42, IsPublished = false };
|
||||
|
||||
await viewModel.SetPublishStateAsync(true);
|
||||
|
||||
Assert.True(api.LastPublishValue);
|
||||
Assert.True(viewModel.DraftIsPublished);
|
||||
}
|
||||
|
||||
/// <summary>Test fake that always throws if the API is invoked.</summary>
|
||||
private sealed class ThrowingYavscApiClient : YavscApiClient
|
||||
{
|
||||
|
|
@ -103,4 +118,34 @@ public class PostItViewModelTests
|
|||
return Task.FromResult(default(T)!);
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class RecordingPublishApi : IYavscApiClient
|
||||
{
|
||||
public bool LastPublishValue { get; private set; }
|
||||
public HttpClient Http { get; } = new();
|
||||
|
||||
public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
if (method == HttpMethod.Put && path.Contains("/publish", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var publish = body?.GetType().GetProperty("publish")?.GetValue(body) is bool value && value;
|
||||
LastPublishValue = publish;
|
||||
}
|
||||
|
||||
return Task.FromResult(default(T)!);
|
||||
}
|
||||
|
||||
public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
|
||||
{
|
||||
if (method == HttpMethod.Put && path.Contains("/publish", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var publish = body?.GetType().GetProperty("publish")?.GetValue(body) is bool value && value;
|
||||
LastPublishValue = publish;
|
||||
}
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace PostIt.Tests;
|
|||
|
||||
/// <summary>
|
||||
/// UI tests for <see cref="SessionStatusBanner"/>. Mounted inside
|
||||
/// a real <see cref="MainWindow"/> via the headless Avalonia
|
||||
/// a real <see cref="MainView"/> via the headless Avalonia
|
||||
/// platform declared in <c>TestApp.cs</c>.
|
||||
///
|
||||
/// <para>The pattern is the one that <c>UnitTest1.MainPage_Should_Load</c>
|
||||
|
|
@ -34,11 +34,10 @@ public class SessionStatusBannerTests
|
|||
[AvaloniaFact]
|
||||
public void Banner_renders_three_buttons_in_the_visual_tree()
|
||||
{
|
||||
var window = new MainWindow();
|
||||
window.SessionBanner.DataContext = new SessionStatusViewModel();
|
||||
MainWindow window = new MainWindow();
|
||||
window.Show();
|
||||
|
||||
var buttons = window.SessionBanner.GetVisualDescendants()
|
||||
var buttons = window.GetVisualDescendants()
|
||||
.OfType<Button>()
|
||||
.ToList();
|
||||
|
||||
|
|
@ -46,7 +45,7 @@ public class SessionStatusBannerTests
|
|||
// déconnecter, Se connecter, Paramètres. If any one is
|
||||
// missing, the user has no way to trigger the
|
||||
// corresponding navigation event.
|
||||
Assert.Equal(3, buttons.Count);
|
||||
Assert.Equal(4, buttons.Count);
|
||||
Assert.Contains(buttons, b => b.Content as string == "Se déconnecter");
|
||||
Assert.Contains(buttons, b => b.Content as string == "Se connecter");
|
||||
Assert.Contains(buttons, b => b.Content as string == "Paramètres");
|
||||
|
|
@ -55,13 +54,10 @@ public class SessionStatusBannerTests
|
|||
[AvaloniaFact]
|
||||
public void Banner_login_button_is_visible_when_logged_out()
|
||||
{
|
||||
var window = new MainWindow();
|
||||
var vm = new SessionStatusViewModel();
|
||||
Assert.True(vm.IsLoggedOut); // VM default
|
||||
window.SessionBanner.DataContext = vm;
|
||||
MainWindow window = new MainWindow();
|
||||
window.Show();
|
||||
|
||||
var login = window.SessionBanner.GetVisualDescendants()
|
||||
var login = window.GetVisualDescendants()
|
||||
.OfType<Button>()
|
||||
.Single(b => b.Content as string == "Se connecter");
|
||||
|
||||
|
|
@ -73,13 +69,13 @@ public class SessionStatusBannerTests
|
|||
[AvaloniaFact]
|
||||
public void Banner_logout_button_is_hidden_when_logged_out()
|
||||
{
|
||||
var window = new MainWindow();
|
||||
var vm = new SessionStatusViewModel();
|
||||
Assert.False(vm.IsLoggedIn); // VM default
|
||||
window.SessionBanner.DataContext = vm;
|
||||
window.Show();
|
||||
SessionStatusBanner banner = CreateBanner();
|
||||
|
||||
var logout = window.SessionBanner.GetVisualDescendants()
|
||||
Assert.False((banner.DataContext as SessionStatusViewModel)!
|
||||
.IsLoggedIn); // VM default
|
||||
|
||||
|
||||
var logout = banner.GetVisualDescendants()
|
||||
.OfType<Button>()
|
||||
.Single(b => b.Content as string == "Se déconnecter");
|
||||
|
||||
|
|
@ -89,11 +85,9 @@ public class SessionStatusBannerTests
|
|||
[AvaloniaFact]
|
||||
public void Banner_settings_button_is_visible_regardless_of_session()
|
||||
{
|
||||
var window = new MainWindow();
|
||||
window.SessionBanner.DataContext = new SessionStatusViewModel();
|
||||
window.Show();
|
||||
SessionStatusBanner banner = CreateBanner();
|
||||
|
||||
var settings = window.SessionBanner.GetVisualDescendants()
|
||||
var settings = banner.GetVisualDescendants()
|
||||
.OfType<Button>()
|
||||
.Single(b => b.Content as string == "Paramètres");
|
||||
|
||||
|
|
@ -103,14 +97,21 @@ public class SessionStatusBannerTests
|
|||
Assert.True(settings.IsVisible);
|
||||
}
|
||||
|
||||
private static SessionStatusBanner CreateBanner()
|
||||
{
|
||||
MainWindow window = new MainWindow();
|
||||
window.Show();
|
||||
var banner = window.MainView.SessionBanner;
|
||||
var status = new SessionStatusViewModel();
|
||||
banner.DataContext = status;
|
||||
return banner;
|
||||
}
|
||||
|
||||
[AvaloniaFact]
|
||||
public void Banner_session_label_reflects_DataContext()
|
||||
{
|
||||
var window = new MainWindow();
|
||||
window.SessionBanner.DataContext = new SessionStatusViewModel();
|
||||
window.Show();
|
||||
|
||||
var label = window.SessionBanner.GetVisualDescendants()
|
||||
SessionStatusBanner banner = CreateBanner();
|
||||
var label = banner.GetVisualDescendants()
|
||||
.OfType<TextBlock>()
|
||||
.First(t => t.Text == "Déconnecté" || t.Text == "Connecté");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
using System.Text.Json;
|
||||
|
||||
namespace PostIt.Tests;
|
||||
|
||||
public class SettingsLoadTests
|
||||
|
|
@ -85,9 +87,9 @@ public class SettingsLoadTests
|
|||
bool flip = ((workerId + i) & 1) == 0;
|
||||
settings.DarkMode = flip;
|
||||
settings.Authentication.RedirectUri =
|
||||
global::AuthenticationSettings.DefaultDesktopRedirectUri;
|
||||
global::AuthenticationSettings.DesktopRedirectUri;
|
||||
|
||||
settings.BusinessApiUrl = flip
|
||||
settings.ApiUrl = flip
|
||||
? "https://a.example.test/api/v1/"
|
||||
: "https://b.example.test/api/v1/";
|
||||
|
||||
|
|
@ -149,4 +151,26 @@ public class SettingsLoadTests
|
|||
|
||||
Assert.True(settings.Loaded);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SearchText_is_serialized_in_settings_and_round_trips()
|
||||
{
|
||||
var settings = new PostIt.ViewModels.Settings
|
||||
{
|
||||
Authentication = new AuthenticationSettings
|
||||
{
|
||||
Authority = "https://example.test/",
|
||||
ClientId = "postit-tests",
|
||||
Scopes = new[] { "openid" }
|
||||
}
|
||||
};
|
||||
|
||||
settings.SearchText = "bonjour";
|
||||
|
||||
var json = JsonSerializer.Serialize(settings);
|
||||
var roundTrip = JsonSerializer.Deserialize<PostIt.ViewModels.Settings>(json);
|
||||
|
||||
Assert.NotNull(roundTrip);
|
||||
Assert.Equal("bonjour", roundTrip.SearchText);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,6 +94,26 @@ public class SignaturePadControlTests
|
|||
Assert.NotEqual(first.Strokes, third.Strokes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void PendingStroke_is_exposed_only_while_capturing()
|
||||
{
|
||||
var pad = new SignaturePadControl();
|
||||
|
||||
Assert.Empty(pad.PendingStroke);
|
||||
|
||||
pad.BeginCaptureForTest();
|
||||
pad.AppendPointForTest(1_000, 2_000);
|
||||
pad.AppendPointForTest(3_000, 4_000);
|
||||
|
||||
Assert.Equal(new[] { 1_000, 2_000, 3_000, 4_000 }, pad.PendingStroke);
|
||||
Assert.Equal(new[] { 1_000, 2_000, 3_000, 4_000 }, pad.Strokes);
|
||||
|
||||
pad.SealStrokeForTest();
|
||||
|
||||
Assert.Empty(pad.PendingStroke);
|
||||
Assert.Equal(new[] { 2, 1_000, 2_000, 3_000, 4_000 }, pad.Strokes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Clear_empties_buffer_and_raises_redraw()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace PostIt.Tests;
|
|||
|
||||
internal class TestAppContext
|
||||
{
|
||||
public MainWindow? Window {get; set; }
|
||||
public MainView? Window {get; set; }
|
||||
public CirclesPage? page {get; set; }
|
||||
public AddCircleMemberDialog? dialog { get; set; }
|
||||
public App? App { get; internal set; }
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@ public class MainPageTests
|
|||
[AvaloniaFact]
|
||||
public void MainPage_Should_Load()
|
||||
{
|
||||
var window = new MainWindow();
|
||||
window.Show();
|
||||
var window = new MainView();
|
||||
Assert.NotNull(window);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public class YavscApiClientTests
|
|||
// calls CallAsync("posts", ...) directly (bypassing
|
||||
// BlogApiClient, which is the only thing that would set
|
||||
// it in production). Mirror prod here.
|
||||
reloaded.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
|
||||
reloaded.Http.BaseAddress = new Uri(settings.ApiUrl);
|
||||
|
||||
var posts = await reloaded.CallAsync<List<StubApiServer.Post>>(
|
||||
HttpMethod.Get, "posts", TestContext.Current.CancellationToken);
|
||||
|
|
@ -118,7 +118,7 @@ public class YavscApiClientTests
|
|||
RedirectUri = "postit://callback",
|
||||
Scopes = new[] { "openid" },
|
||||
},
|
||||
BusinessApiUrl = "https://127.0.0.1:5003/api/v1",
|
||||
ApiUrl = "https://127.0.0.1:5003/api/v1",
|
||||
};
|
||||
var client = new YavscApiClient(settings, new TokenStore(Path.Combine(
|
||||
Path.GetTempPath(), $"postit-tests-noop-{Guid.NewGuid():N}.json")));
|
||||
|
|
@ -162,7 +162,7 @@ public class YavscApiClientTests
|
|||
RedirectUri = authority.LoopbackRedirectUri,
|
||||
Scopes = new[] { "openid", "profile", "blog" }
|
||||
},
|
||||
BusinessApiUrl = apiBaseUrl
|
||||
ApiUrl = apiBaseUrl
|
||||
};
|
||||
|
||||
private static async Task<YavscApiClient> LoginAndPersistAsync(
|
||||
|
|
@ -175,7 +175,7 @@ public class YavscApiClientTests
|
|||
// directly (bypassing BlogApiClient) rely on the same
|
||||
// BaseAddress the production chain sets in BlogApiClient's
|
||||
// ctor. Mirror that here so "posts" resolves to the stub.
|
||||
client.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
|
||||
client.Http.BaseAddress = new Uri(settings.ApiUrl);
|
||||
|
||||
// Force the API client to use the test browser by routing the
|
||||
// LoginInteractiveAsync call through a small wrapper.
|
||||
|
|
|
|||
|
|
@ -11,6 +11,5 @@
|
|||
|
||||
<Application.Styles>
|
||||
<FluentTheme />
|
||||
<StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
|
||||
</Application.Styles>
|
||||
</Application>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
|
|
@ -16,6 +16,8 @@ namespace PostIt;
|
|||
|
||||
public partial class App : Application
|
||||
{
|
||||
private int _bootStarted;
|
||||
|
||||
/// <summary>
|
||||
/// DI container the platform entry points hand to ViewModels so
|
||||
/// they can resolve the canonical <see cref="Settings"/> singleton
|
||||
|
|
@ -28,14 +30,11 @@ public partial class App : Application
|
|||
/// </summary>
|
||||
public IServiceProvider? ServiceProvider { get; private set; }
|
||||
|
||||
public MainWindow? Window { get; private set; }
|
||||
public MainView? View { get; private set; }
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
AvaloniaXamlLoader.Load(this);
|
||||
#if DEBUG
|
||||
this.AttachDeveloperTools();
|
||||
#endif
|
||||
}
|
||||
|
||||
public override void OnFrameworkInitializationCompleted()
|
||||
|
|
@ -47,7 +46,11 @@ public partial class App : Application
|
|||
|
||||
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
||||
{
|
||||
desktop.MainWindow = CreateMainWindow();
|
||||
var window = ServiceProvider.GetRequiredService<MainWindow>();
|
||||
desktop.MainWindow = window;
|
||||
View = window.MainView;
|
||||
this.ConfigureRootView(window.MainView);
|
||||
|
||||
ApplyDarkMode(settings);
|
||||
}
|
||||
else if (ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
|
||||
|
|
@ -55,53 +58,57 @@ public partial class App : Application
|
|||
singleViewFactoryApplicationLifetime.MainViewFactory =
|
||||
() =>
|
||||
{
|
||||
Window = CreateMainWindow();
|
||||
View = ServiceProvider.GetRequiredService<MainView>();
|
||||
this.ConfigureRootView(View);
|
||||
ApplyDarkMode(settings);
|
||||
return Window;
|
||||
return View;
|
||||
};
|
||||
}
|
||||
else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
|
||||
{
|
||||
singleViewPlatform.MainView = CreateMainWindow();
|
||||
singleViewPlatform.MainView = View = ServiceProvider.GetRequiredService<MainView>();
|
||||
ConfigureRootView(View);
|
||||
ApplyDarkMode(settings);
|
||||
}
|
||||
|
||||
base.OnFrameworkInitializationCompleted();
|
||||
}
|
||||
|
||||
private void ConfigureRootView(MainView rootView)
|
||||
{
|
||||
// Déclencher le Boot une seule fois lors du chargement du contrôle à l'écran.
|
||||
rootView.AttachedToVisualTree += async (_, _) => await BootOnceAsync();
|
||||
|
||||
|
||||
private MainWindow CreateMainWindow()
|
||||
var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
|
||||
sessionStatus.LogoutCompleted += () =>
|
||||
{
|
||||
Window = new MainWindow();
|
||||
// Remplacer Window.NavRoot par rootView.NavRoot
|
||||
rootView.NavRoot.PopToRootAsync();
|
||||
};
|
||||
|
||||
rootView.SessionBanner.DataContext = sessionStatus;
|
||||
}
|
||||
|
||||
private async Task BootOnceAsync()
|
||||
{
|
||||
if (Interlocked.Exchange(ref _bootStarted, 1) == 1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
|
||||
Window.Opened += async (_, _) => await BootAsync(this.ServiceProvider!, api);
|
||||
var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
|
||||
sessionStatus.LogoutCompleted += () =>
|
||||
{
|
||||
Window.NavRoot.PopToRootAsync();
|
||||
};
|
||||
|
||||
sessionStatus.LoginSucceeded += () =>
|
||||
{
|
||||
PushMainPageAsync().Wait();
|
||||
};
|
||||
|
||||
var homeVm = ServiceProvider!.GetRequiredService<HomePageViewModel>();
|
||||
|
||||
this.PushPageAsync(homeVm).Wait();
|
||||
Window.SessionBanner.DataContext = sessionStatus;
|
||||
return Window;
|
||||
await BootAsync(this.ServiceProvider!, api);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test-only hook: bind a concrete <see cref="MainWindow"/> so
|
||||
/// Test-only hook: bind a concrete <see cref="MainView"/> so
|
||||
/// command-driven navigation paths (<see cref="PushPage"/>) can
|
||||
/// push onto a real <see cref="NavigationPage"/> in headless
|
||||
/// fixtures that do not run the full desktop lifetime bootstrap.
|
||||
/// </summary>
|
||||
internal void AttachMainWindow(MainWindow mainWindow)
|
||||
internal void AttachMainWindow(MainView mainView)
|
||||
{
|
||||
Window = mainWindow ?? throw new ArgumentNullException(nameof(mainWindow));
|
||||
View = mainView ?? throw new ArgumentNullException(nameof(mainView));
|
||||
}
|
||||
|
||||
private static void ApplyDarkMode(Settings settings)
|
||||
|
|
@ -125,9 +132,9 @@ public partial class App : Application
|
|||
var refreshed = await api.TrySilentLoginAsync().ConfigureAwait(true);
|
||||
var sessionStatus = provider.GetRequiredService<SessionStatusViewModel>();
|
||||
sessionStatus.Refresh();
|
||||
if (!refreshed) return;
|
||||
|
||||
await PushMainPageAsync().ConfigureAwait(true);
|
||||
var homePage = provider.GetRequiredService<HomePageViewModel>();
|
||||
var app = (App)Current!;
|
||||
await app.PushPageAsync(homePage);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -138,10 +145,11 @@ public partial class App : Application
|
|||
/// (interactive login from the banner). Pulled out as a helper so
|
||||
/// the two callers can't drift apart.
|
||||
/// </summary>
|
||||
public static async Task PushMainPageAsync()
|
||||
public static async Task PushBlogsPageAsync()
|
||||
{
|
||||
var app = (App)Current!;
|
||||
var mainVm = app.ServiceProvider!.GetRequiredService<MainViewModel>();
|
||||
await mainVm.InitializeAsync();
|
||||
await app.PushPageAsync(mainVm);
|
||||
}
|
||||
|
||||
|
|
@ -179,6 +187,6 @@ public partial class App : Application
|
|||
|
||||
internal async Task GoBackAsync()
|
||||
{
|
||||
await Window!.NavRoot.PopAsync();
|
||||
await View!.NavRoot.PopAsync();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,21 +68,38 @@ public class SignaturePadControl : TemplatedControl
|
|||
public event EventHandler? RedrawRequested;
|
||||
|
||||
private readonly List<int> _strokes = new(capacity: 256);
|
||||
private InputElement? _wiredCaptureArea;
|
||||
private int _pendingPoints; // number of (x, y) pairs awaiting a length prefix
|
||||
private bool _capturing;
|
||||
|
||||
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
|
||||
{
|
||||
base.OnApplyTemplate(e);
|
||||
RewireCaptureArea();
|
||||
}
|
||||
|
||||
if (CaptureArea is { } previous)
|
||||
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
|
||||
{
|
||||
base.OnPropertyChanged(change);
|
||||
|
||||
if (change.Property == CaptureAreaProperty)
|
||||
{
|
||||
RewireCaptureArea();
|
||||
}
|
||||
}
|
||||
|
||||
private void RewireCaptureArea()
|
||||
{
|
||||
if (_wiredCaptureArea is { } previous)
|
||||
{
|
||||
previous.PointerPressed -= OnCapturePressed;
|
||||
previous.PointerMoved -= OnCaptureMoved;
|
||||
previous.PointerReleased -= OnCaptureReleased;
|
||||
}
|
||||
|
||||
if (CaptureArea is { } area)
|
||||
_wiredCaptureArea = CaptureArea;
|
||||
|
||||
if (_wiredCaptureArea is { } area)
|
||||
{
|
||||
area.PointerPressed += OnCapturePressed;
|
||||
area.PointerMoved += OnCaptureMoved;
|
||||
|
|
@ -97,12 +114,14 @@ public class SignaturePadControl : TemplatedControl
|
|||
_capturing = true;
|
||||
_pendingPoints = 0;
|
||||
AppendPoint(e.GetPosition(CaptureArea));
|
||||
RedrawRequested?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
|
||||
private void OnCaptureMoved(object? sender, PointerEventArgs e)
|
||||
{
|
||||
if (!_capturing) return;
|
||||
AppendPoint(e.GetPosition(CaptureArea));
|
||||
RedrawRequested?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
|
||||
private void OnCaptureReleased(object? sender, PointerReleasedEventArgs e)
|
||||
|
|
@ -169,6 +188,16 @@ public class SignaturePadControl : TemplatedControl
|
|||
/// </summary>
|
||||
public SignaturePadData Snapshot() => new(_strokes.ToArray());
|
||||
|
||||
/// <summary>
|
||||
/// Copy of the current in-progress stroke, without the length
|
||||
/// prefix used for sealed strokes. The view can render this as a
|
||||
/// live preview while the user is still drawing.
|
||||
/// </summary>
|
||||
internal IReadOnlyList<int> PendingStroke
|
||||
=> _capturing && _pendingPoints > 0
|
||||
? _strokes.GetRange(_strokes.Count - 2 * _pendingPoints, 2 * _pendingPoints)
|
||||
: Array.Empty<int>();
|
||||
|
||||
// --- Test-only surface (visible to PostIt.Tests) -------------------
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -183,6 +212,17 @@ public class SignaturePadControl : TemplatedControl
|
|||
_pendingPoints++;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test hook: mark the control as actively capturing so tests
|
||||
/// can exercise the live-preview path without synthetic pointer
|
||||
/// events.
|
||||
/// </summary>
|
||||
internal void BeginCaptureForTest()
|
||||
{
|
||||
_capturing = true;
|
||||
_pendingPoints = 0;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test hook: seal the currently-pending stroke with a length
|
||||
/// prefix. Mirrors what <see cref="OnCaptureReleased"/> does at
|
||||
|
|
|
|||
50
src/PostIt/PostIt/Helpers/FormHelpers.cs
Normal file
50
src/PostIt/PostIt/Helpers/FormHelpers.cs
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
using System;
|
||||
using PostIt.ViewModels;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.Helpers;
|
||||
|
||||
public static class FormHelpers
|
||||
{
|
||||
public static BillingCommandPageViewModel?
|
||||
CreateCommandPageViewModel(
|
||||
this CommandFormSummary form,
|
||||
ActivityInfo activity,
|
||||
ActivityUserDisplayItem performer,
|
||||
BillingApiClient billingClient)
|
||||
{
|
||||
|
||||
string namespacePrefix = typeof(PostIt.ViewModels.Commands.RdvViewModel).Namespace + ".";
|
||||
|
||||
string formVMName = form.ActionName + "ViewModel";
|
||||
|
||||
string formOnActivityVMName = activity.Code + formVMName + "ViewModel";
|
||||
|
||||
var vmType = Type.GetType(namespacePrefix +formOnActivityVMName);
|
||||
if (vmType == null)
|
||||
{
|
||||
vmType = Type.GetType(namespacePrefix + formVMName);
|
||||
}
|
||||
if (vmType == null)
|
||||
{
|
||||
Console.Error.WriteLine(
|
||||
$"! Cannot find type '{formOnActivityVMName}' or '{formVMName}'");
|
||||
return null;
|
||||
}
|
||||
if (!typeof(BillingCommandPageViewModel).IsAssignableFrom(vmType))
|
||||
{
|
||||
Console.Error.WriteLine($"! The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
|
||||
return null;
|
||||
}
|
||||
|
||||
var vm = Activator.CreateInstance(vmType, activity, performer, form, billingClient);
|
||||
|
||||
if (vm == null)
|
||||
{
|
||||
throw new InvalidOperationException($"Cannot create instance of '{formOnActivityVMName}' or '{formVMName}'");
|
||||
}
|
||||
|
||||
return vm as BillingCommandPageViewModel ?? throw new InvalidOperationException($"The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
|
||||
}
|
||||
}
|
||||
34
src/PostIt/PostIt/Helpers/ImageHelper.cs
Normal file
34
src/PostIt/PostIt/Helpers/ImageHelper.cs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Media.Imaging;
|
||||
using Avalonia.Platform;
|
||||
|
||||
namespace PostIt.Helpers;
|
||||
|
||||
public static class ImageHelper
|
||||
{
|
||||
private static readonly HttpClient HttpClient = new();
|
||||
|
||||
public static Bitmap LoadFromResource(Uri resourceUri)
|
||||
{
|
||||
return new Bitmap(AssetLoader.Open(resourceUri));
|
||||
}
|
||||
|
||||
public static async Task<Bitmap?> LoadFromWeb(Uri url)
|
||||
{
|
||||
try
|
||||
{
|
||||
var response = await HttpClient.GetAsync(url).ConfigureAwait(false);
|
||||
response.EnsureSuccessStatusCode();
|
||||
var data = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
|
||||
return new Bitmap(new MemoryStream(data));
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
{
|
||||
Console.WriteLine($"An error occurred while downloading image '{url}': {ex.Message}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
|
|||
using PostIt.Services;
|
||||
using PostIt.ViewModels;
|
||||
using PostIt.Views;
|
||||
using PostIt.Views.Commands;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.Helpers;
|
||||
|
|
@ -23,11 +24,18 @@ public static class ServiceCollectionHelpers
|
|||
var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
|
||||
var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
|
||||
var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
|
||||
var contactService = new ContactService();
|
||||
var activityClient = new ActivityApiClient(
|
||||
api,
|
||||
settings.ApiUrl,
|
||||
settings.Authentication?.Authority);
|
||||
var billingClient = new BillingApiClient(api, settings.ApiUrl);
|
||||
var userDirectory = new UserDirectory(userSearchClient);
|
||||
|
||||
// Vues
|
||||
services.AddTransient<MainPage>();
|
||||
services.AddSingleton<MainView>();
|
||||
services.AddSingleton<MainPage>();
|
||||
services.AddSingleton<MainWindow>();
|
||||
|
||||
// SettingsPage is a singleton: there must be one and only one
|
||||
// instance of the settings UI for the lifetime of the app.
|
||||
// This guarantees that (a) the bindings always reflect the
|
||||
|
|
@ -40,9 +48,30 @@ public static class ServiceCollectionHelpers
|
|||
// the navigation stack, each bound to a fresh
|
||||
// SettingsViewModel and missing any in-flight edits.
|
||||
services.AddSingleton<SettingsPage>();
|
||||
services.AddTransient<HomePage>();
|
||||
services.AddTransient<SignaturePage>();
|
||||
services.AddTransient<CirclesPage>();
|
||||
services.AddSingleton<HomePage>();
|
||||
services.AddSingleton<SignaturePage>();
|
||||
services.AddSingleton<CirclesPage>();
|
||||
services.AddSingleton<ActivitiesPage>();
|
||||
services.AddTransient<CommandFormsPage>();
|
||||
services.AddTransient<RdvPage>();
|
||||
services.AddTransient<BrushPage>();
|
||||
services.AddTransient<BillingQueriesPage>();
|
||||
// ViewModels
|
||||
services.AddSingleton(settings);
|
||||
services.AddSingleton<YavscApiClient>(api);
|
||||
services.AddSingleton(client);
|
||||
services.AddSingleton(circleClient);
|
||||
services.AddSingleton(blogAclClient);
|
||||
services.AddSingleton(userSearchClient);
|
||||
services.AddSingleton(activityClient);
|
||||
services.AddSingleton(billingClient);
|
||||
services.AddSingleton<IUserDirectory>(userDirectory);
|
||||
services.AddSingleton<HomePageViewModel>();
|
||||
services.AddSingleton<SignaturePageViewModel>();
|
||||
services.AddSingleton<CirclesPageViewModel>();
|
||||
services.AddSingleton<ActivitiesPageViewModel>();
|
||||
services.AddTransient<SelectableHairPrestationItem>();
|
||||
|
||||
// Dialogs (modal-light pages): the ViewLocator resolves
|
||||
// them when a caller pushes a PostAclDialogViewModel or
|
||||
// AddCircleMemberDialogViewModel via App.PushPageAsync.
|
||||
|
|
@ -51,27 +80,13 @@ public static class ServiceCollectionHelpers
|
|||
// here — the parametrised ctors stay for direct test wiring.
|
||||
services.AddTransient<PostAclDialog>();
|
||||
services.AddTransient<AddCircleMemberDialog>();
|
||||
// ViewModels
|
||||
services.AddSingleton(settings);
|
||||
services.AddSingleton<YavscApiClient>(api);
|
||||
services.AddSingleton(client);
|
||||
services.AddSingleton(circleClient);
|
||||
services.AddSingleton(blogAclClient);
|
||||
services.AddSingleton(userSearchClient);
|
||||
services.AddSingleton<IContactService>(contactService);
|
||||
services.AddSingleton<IUserDirectory>(userDirectory);
|
||||
services.AddTransient<MainViewModel>();
|
||||
services.AddTransient<HomePageViewModel>();
|
||||
services.AddTransient<SignaturePageViewModel>();
|
||||
services.AddTransient<CirclesPageViewModel>();
|
||||
|
||||
// Persistent session banner: one instance for the lifetime of
|
||||
// the app so the same VM survives page navigation.
|
||||
var sessionStatus = new SessionStatusViewModel { Api = api };
|
||||
sessionStatus.Refresh();
|
||||
services.AddSingleton(sessionStatus);
|
||||
services.AddTransient<SessionStatusBanner>();
|
||||
|
||||
services.AddSingleton<SessionStatusBanner>();
|
||||
services.AddSingleton<MainViewModel>();
|
||||
return services.BuildServiceProvider();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ public static class ViewModelBaseHelpers
|
|||
{
|
||||
public static async Task PushPageAsync(this App app, ViewModelBase vm)
|
||||
{
|
||||
if (app.Window is null)
|
||||
var window = app.View;
|
||||
if (window is null)
|
||||
{
|
||||
throw new InvalidOperationException("MainWindow is not initialized yet.");
|
||||
}
|
||||
|
|
@ -39,12 +40,12 @@ public static class ViewModelBaseHelpers
|
|||
page.DataContext = vm;
|
||||
|
||||
// Avoid stacking the same singleton page twice (e.g. SettingsPage).
|
||||
var stack = app.Window.NavRoot.NavigationStack;
|
||||
var stack = window.NavRoot.NavigationStack;
|
||||
if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
await app.Window.NavRoot.PushAsync(page);
|
||||
await window.NavRoot.PushAsync(page);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||
<FileVersion>1.1.0.0</FileVersion>
|
||||
<InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
|
||||
<Version>1.1.0-beta.1</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<AvaloniaResource Include="Assets\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="postit-settings.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
|
|
@ -28,13 +30,11 @@
|
|||
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="CommunityToolkit.Mvvm" />
|
||||
<PackageReference Include="Avalonia.AvaloniaEdit" />
|
||||
<PackageReference Include="IdentityModel.OidcClient" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
|
||||
<ProjectReference Include="../../Yavsc.Api.Client/Yavsc.Api.Client.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#if !ANDROID && !IOS
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace PostIt.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Desktop stub for <see cref="IContactService"/>.
|
||||
///
|
||||
/// <para>The desktop has no equivalent of the mobile address
|
||||
/// book (no <c>Contacts.Default</c>, no CardDAV out of the
|
||||
/// box). Rather than synthesise a list from a different
|
||||
/// source, this provider returns an empty list and lets the
|
||||
/// UI render an honest "no local contacts on this platform"
|
||||
/// message.</para>
|
||||
///
|
||||
/// <para>If desktop users want to invite people who aren't
|
||||
/// Yavsc members, that flow goes through a separate path
|
||||
/// (manual email entry + invitation endpoint) — not through
|
||||
/// <see cref="IContactService"/>. Finding existing Yavsc
|
||||
/// members is <see cref="IUserDirectory"/>'s job, not this
|
||||
/// one's.</para>
|
||||
///
|
||||
/// <para>Future CardDAV / Google Contacts / Exchange
|
||||
/// providers can plug in here as additional
|
||||
/// <see cref="IContactService"/> implementations selected
|
||||
/// from DI by configuration.</para>
|
||||
/// </summary>
|
||||
public sealed class ContactService : IContactService
|
||||
{
|
||||
public Task<IReadOnlyList<ContactDto>> GetDeviceContactsAsync(CancellationToken ct = default)
|
||||
=> Task.FromResult<IReadOnlyList<ContactDto>>(Array.Empty<ContactDto>());
|
||||
}
|
||||
#endif
|
||||
28
src/PostIt/PostIt/Services/CurrentLocationResult.cs
Normal file
28
src/PostIt/PostIt/Services/CurrentLocationResult.cs
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
namespace PostIt.Services;
|
||||
|
||||
public sealed class CurrentLocationResult
|
||||
{
|
||||
private CurrentLocationResult(bool isSuccess, bool isPermissionDenied, double? latitude, double? longitude, string message)
|
||||
{
|
||||
IsSuccess = isSuccess;
|
||||
IsPermissionDenied = isPermissionDenied;
|
||||
Latitude = latitude;
|
||||
Longitude = longitude;
|
||||
Message = message;
|
||||
}
|
||||
|
||||
public bool IsSuccess { get; }
|
||||
public bool IsPermissionDenied { get; }
|
||||
public double? Latitude { get; }
|
||||
public double? Longitude { get; }
|
||||
public string Message { get; }
|
||||
|
||||
public static CurrentLocationResult Success(double latitude, double longitude, string? message = null)
|
||||
=> new(true, false, latitude, longitude, message ?? "Position récupérée.");
|
||||
|
||||
public static CurrentLocationResult PermissionDenied(string? message = null)
|
||||
=> new(false, true, null, null, message ?? "La géolocalisation n'est pas autorisée.");
|
||||
|
||||
public static CurrentLocationResult Unavailable(string? message = null)
|
||||
=> new(false, false, null, null, message ?? "La géolocalisation n'est pas disponible sur cette plateforme.");
|
||||
}
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
using IdentityModel.OidcClient.Browser;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace PostIt.Services;
|
||||
|
||||
|
|
@ -21,14 +24,14 @@ public static class Platform
|
|||
/// override this property at startup (e.g. PostIt.Android sets
|
||||
/// it to <c>android://postit-signin</c>).
|
||||
/// </summary>
|
||||
public static string DefaultRedirectUri { get; set; } = "postit://callback";
|
||||
public const string RedirectUri = "postit://callback";
|
||||
|
||||
/// <summary>
|
||||
/// Scheme prefix the <see cref="CustomSchemeBrowser"/> matches
|
||||
/// against <c>BrowserOptions.EndUrl</c>. Overridable for apps
|
||||
/// that want to register their own scheme.
|
||||
/// </summary>
|
||||
public static string CustomScheme { get; set; } = "postit";
|
||||
public const string CustomScheme = "postit";
|
||||
|
||||
/// <summary>
|
||||
/// Constructs a fresh <see cref="IBrowser"/> for the running platform.
|
||||
|
|
@ -37,4 +40,12 @@ public static class Platform
|
|||
/// </summary>
|
||||
public static System.Func<IBrowser?>? CreateBrowser { get; set; } =
|
||||
() => new CustomSchemeBrowser(CustomScheme);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Optional platform hook used by the shared billing form to request a
|
||||
/// current device position. Platforms that do not expose a native
|
||||
/// location provider can leave the default delegate in place.
|
||||
/// </summary>
|
||||
public static Func<CancellationToken, Task<CurrentLocationResult>> TryGetCurrentLocationAsync { get; set; } =
|
||||
_ => Task.FromResult(CurrentLocationResult.Unavailable());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Threading;
|
||||
|
||||
namespace PostIt.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Tiny marshalling helper around <see cref="Dispatcher.UIThread"/> so
|
||||
/// the rest of the codebase does not have to import Avalonia.Threading
|
||||
/// directly. We want exactly one place that decides "is the current
|
||||
/// thread the Avalonia UI thread, and if not, post there" so that
|
||||
/// <see cref="ObservableObject"/>-derived types (Settings, the various
|
||||
/// ViewModels) can fire <c>PropertyChanged</c> safely from background
|
||||
/// work — which is exactly the cross-thread case that previously blew
|
||||
/// up inside <c>DataValidationErrors.SetErrors</c> on Avalonia 11.
|
||||
///
|
||||
/// The helper is intentionally tiny: a sync post when we are off the
|
||||
/// UI thread, a no-op when we are already on it, and an async fire-
|
||||
/// and-forget variant for places where awaiting would deadlock the
|
||||
/// caller (e.g. <c>Settings.Load</c> continuation paths).
|
||||
/// </summary>
|
||||
public static class UiDispatcher
|
||||
{
|
||||
/// <summary>
|
||||
/// True when the calling thread is the Avalonia UI thread. Property
|
||||
/// setters that touch bindings should check this before mutating
|
||||
/// state; the safe path is <see cref="InvokeIfNeeded"/>.
|
||||
/// </summary>
|
||||
public static bool IsOnUiThread => Dispatcher.UIThread.CheckAccess();
|
||||
|
||||
/// <summary>
|
||||
/// Run <paramref name="action"/> on the UI thread. If the caller is
|
||||
/// already on the UI thread, run synchronously to preserve stack
|
||||
/// traces and ordering; otherwise post to the dispatcher and wait.
|
||||
/// Never throws on shutdown — a missing dispatcher is treated as
|
||||
/// "best-effort skipped", matching Avalonia's own behaviour when
|
||||
/// the application lifetime has been torn down.
|
||||
/// </summary>
|
||||
public static void InvokeIfNeeded(Action action)
|
||||
{
|
||||
if (action is null) return;
|
||||
if (IsOnUiThread) { action(); return; }
|
||||
try { Dispatcher.UIThread.Post(action, DispatcherPriority.Normal); }
|
||||
catch (InvalidOperationException) { /* dispatcher gone, nothing to do */ }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fire-and-forget variant: schedules <paramref name="action"/> on
|
||||
/// the UI thread but does not block the caller. Use this from
|
||||
/// background workers (OIDC discovery, HTTP callbacks, file I/O)
|
||||
/// where awaiting the dispatcher would deadlock the calling sync
|
||||
/// context.
|
||||
/// </summary>
|
||||
public static void Post(Action action)
|
||||
{
|
||||
if (action is null) return;
|
||||
try { Dispatcher.UIThread.Post(action, DispatcherPriority.Normal); }
|
||||
catch (InvalidOperationException) { /* dispatcher gone */ }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Awaitable variant. Useful inside <c>async</c> ViewModel methods
|
||||
/// that must touch bindings only after the dispatcher has processed
|
||||
/// a queued update (e.g. "load file then refresh observable state").
|
||||
/// </summary>
|
||||
public static Task InvokeAsync(Action action)
|
||||
{
|
||||
if (action is null) return Task.CompletedTask;
|
||||
if (IsOnUiThread) { action(); return Task.CompletedTask; }
|
||||
return Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Normal).GetTask();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Net.Http.Headers;
|
||||
|
|
@ -351,6 +352,77 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
|
|||
_store.Save(_tokens);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Upload a user avatar to the Yavsc API. The server expects a
|
||||
/// single multipart file named <c>file</c> and validates the image
|
||||
/// content type before persisting it.
|
||||
/// </summary>
|
||||
public async Task<string> SetAvatarAsync(
|
||||
Stream imageStream,
|
||||
string fileName,
|
||||
string? contentType = null,
|
||||
CancellationToken ct = default)
|
||||
{
|
||||
if (imageStream is null)
|
||||
throw new ArgumentNullException(nameof(imageStream));
|
||||
if (string.IsNullOrWhiteSpace(fileName))
|
||||
throw new ArgumentException("A file name is required.", nameof(fileName));
|
||||
|
||||
var endpoint = new Uri(new Uri(Settings.ApiUrl.TrimEnd('/') + "/", UriKind.Absolute), "account/set-avatar");
|
||||
|
||||
await EnsureFreshTokenAsync(ct).ConfigureAwait(false);
|
||||
|
||||
var attemptUpload = async () =>
|
||||
{
|
||||
if (imageStream.CanSeek)
|
||||
imageStream.Position = 0;
|
||||
|
||||
using var content = new MultipartFormDataContent();
|
||||
using var fileContent = new StreamContent(imageStream);
|
||||
fileContent.Headers.ContentType = new MediaTypeHeaderValue(
|
||||
string.IsNullOrWhiteSpace(contentType) ? "application/octet-stream" : contentType);
|
||||
content.Add(fileContent, "file", fileName);
|
||||
|
||||
using var request = new HttpRequestMessage(HttpMethod.Post, endpoint)
|
||||
{
|
||||
Content = content,
|
||||
};
|
||||
|
||||
return await Http.SendAsync(request, ct).ConfigureAwait(false);
|
||||
};
|
||||
|
||||
var response = await attemptUpload().ConfigureAwait(false);
|
||||
if (response.StatusCode == HttpStatusCode.Unauthorized)
|
||||
{
|
||||
response.Dispose();
|
||||
await ForceRefreshAsync(ct).ConfigureAwait(false);
|
||||
response = await attemptUpload().ConfigureAwait(false);
|
||||
}
|
||||
|
||||
await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
|
||||
|
||||
var payload = await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
|
||||
if (string.IsNullOrWhiteSpace(payload))
|
||||
return "Avatar mis à jour.";
|
||||
|
||||
try
|
||||
{
|
||||
using var json = JsonDocument.Parse(payload);
|
||||
if (json.RootElement.TryGetProperty("message", out var msgEl))
|
||||
{
|
||||
var message = msgEl.GetString();
|
||||
if (!string.IsNullOrWhiteSpace(message))
|
||||
return message;
|
||||
}
|
||||
}
|
||||
catch (JsonException)
|
||||
{
|
||||
// Keep a user-friendly fallback when the API payload is not JSON.
|
||||
}
|
||||
|
||||
return "Avatar mis à jour.";
|
||||
}
|
||||
|
||||
public async Task LogoutAsync()
|
||||
{
|
||||
_store.Clear();
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@ using Avalonia.Controls;
|
|||
using Avalonia.Controls.Templates;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using PostIt.ViewModels;
|
||||
using PostIt.ViewModels.Commands;
|
||||
using PostIt.Views;
|
||||
using PostIt.Views.Commands;
|
||||
|
||||
namespace PostIt;
|
||||
|
||||
|
|
@ -16,12 +18,6 @@ namespace PostIt;
|
|||
Url = "https://docs.avaloniaui.net/docs/concepts/view-locator")]
|
||||
public class ViewLocator : IDataTemplate
|
||||
{
|
||||
private readonly IServiceProvider _services;
|
||||
|
||||
public ViewLocator(IServiceProvider services)
|
||||
{
|
||||
_services = services;
|
||||
}
|
||||
|
||||
public Control Build(object? data)
|
||||
{
|
||||
|
|
@ -38,15 +34,21 @@ public class ViewLocator : IDataTemplate
|
|||
|
||||
private Control BuildCore(object? data)
|
||||
{
|
||||
var app = App.Current as App;
|
||||
var services = app!.ServiceProvider!;
|
||||
return data switch
|
||||
{
|
||||
MainViewModel => _services.GetRequiredService<MainPage>(),
|
||||
Settings => _services.GetRequiredService<SettingsPage>(),
|
||||
HomePageViewModel => _services.GetRequiredService<HomePage>(),
|
||||
SignaturePageViewModel => _services.GetRequiredService<SignaturePage>(),
|
||||
AddCircleMemberDialogViewModel => _services.GetRequiredService<AddCircleMemberDialog>(),
|
||||
CirclesPageViewModel => _services.GetRequiredService<CirclesPage>(),
|
||||
PostAclDialogViewModel => _services.GetRequiredService<PostAclDialog>(),
|
||||
MainViewModel => services.GetRequiredService<MainPage>(),
|
||||
Settings => services.GetRequiredService<SettingsPage>(),
|
||||
HomePageViewModel => services.GetRequiredService<HomePage>(),
|
||||
ActivitiesPageViewModel => services.GetRequiredService<ActivitiesPage>(),
|
||||
CommandFormsPageViewModel => services.GetRequiredService<CommandFormsPage>(),
|
||||
BrushViewModel => services.GetRequiredService<BrushPage>(),
|
||||
RdvViewModel => services.GetRequiredService<RdvPage>(),
|
||||
SignaturePageViewModel => services.GetRequiredService<SignaturePage>(),
|
||||
AddCircleMemberDialogViewModel => services.GetRequiredService<AddCircleMemberDialog>(),
|
||||
CirclesPageViewModel => services.GetRequiredService<CirclesPage>(),
|
||||
PostAclDialogViewModel => services.GetRequiredService<PostAclDialog>(),
|
||||
null => new TextBlock { Text = "No view for <null>" },
|
||||
_ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
|
||||
};
|
||||
|
|
|
|||
275
src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs
Normal file
275
src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs
Normal file
|
|
@ -0,0 +1,275 @@
|
|||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using PostIt.Helpers;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public partial class ActivitiesPageViewModel : ViewModelBase
|
||||
{
|
||||
private readonly ActivityApiClient _client;
|
||||
private readonly BillingApiClient _billingClient;
|
||||
private bool _syncingSelection;
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<ActivityInfo> Activities { get; set; } = new();
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ActivityInfo? SelectedActivity { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<ActivityInfo> Specializations { get; set; } = new();
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ActivityInfo? SelectedSpecialization { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<ActivityUserDisplayItem> Performers { get; set; } = new();
|
||||
|
||||
[ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenCommandFormsCommand))]
|
||||
public partial ActivityUserDisplayItem? SelectedPerformer { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial bool IsBusy { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string StatusMessage { get; set; } = "Choisissez une activité.";
|
||||
|
||||
public ActivityInfo? CurrentActivity => SelectedSpecialization ?? SelectedActivity;
|
||||
public string SelectedActivityLabel => SelectedActivity?.Name ?? "(aucune activité)";
|
||||
public string CurrentActivityLabel => CurrentActivity?.Name ?? "(aucune)";
|
||||
public int CurrentFormCount => CurrentActivity?.Forms?.Count ?? 0;
|
||||
|
||||
public override bool CanNavigateNext
|
||||
{
|
||||
get => false;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public override bool CanNavigatePrevious
|
||||
{
|
||||
get => true;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public ActivitiesPageViewModel(ActivityApiClient client, BillingApiClient billingClient)
|
||||
{
|
||||
_client = client ?? throw new ArgumentNullException(nameof(client));
|
||||
_billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
|
||||
}
|
||||
|
||||
partial void OnSelectedActivityChanged(ActivityInfo? value)
|
||||
{
|
||||
if (_syncingSelection) return;
|
||||
_ = ShowActivitySafeAsync(value);
|
||||
}
|
||||
|
||||
partial void OnSelectedSpecializationChanged(ActivityInfo? value)
|
||||
{
|
||||
if (_syncingSelection) return;
|
||||
_ = ShowSpecializationSafeAsync(value);
|
||||
}
|
||||
|
||||
private async Task ShowActivitySafeAsync(ActivityInfo? value)
|
||||
{
|
||||
try
|
||||
{
|
||||
await ShowActivityAsync(value);
|
||||
}
|
||||
catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur: {ex.Message}";
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ShowSpecializationSafeAsync(ActivityInfo? value)
|
||||
{
|
||||
try
|
||||
{
|
||||
await ShowSpecializationAsync(value);
|
||||
}
|
||||
catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur: {ex.Message}";
|
||||
}
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
public async Task RefreshAsync()
|
||||
{
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var list = await _client.GetCatalogAsync();
|
||||
Activities = new ObservableCollection<ActivityInfo>(list ?? new());
|
||||
|
||||
var first = Activities.FirstOrDefault();
|
||||
await ShowActivityAsync(first);
|
||||
if (first is null)
|
||||
{
|
||||
StatusMessage = "Aucune activité disponible.";
|
||||
}
|
||||
}
|
||||
catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
Activities = new ObservableCollection<ActivityInfo>();
|
||||
Specializations = new ObservableCollection<ActivityInfo>();
|
||||
Performers = new ObservableCollection<ActivityUserDisplayItem>();
|
||||
StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Activities = new ObservableCollection<ActivityInfo>();
|
||||
Specializations = new ObservableCollection<ActivityInfo>();
|
||||
Performers = new ObservableCollection<ActivityUserDisplayItem>();
|
||||
StatusMessage = $"Erreur: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task ShowActivityAsync(ActivityInfo? activity)
|
||||
{
|
||||
_syncingSelection = true;
|
||||
try
|
||||
{
|
||||
SelectedActivity = activity;
|
||||
SelectedSpecialization = null;
|
||||
}
|
||||
finally
|
||||
{
|
||||
_syncingSelection = false;
|
||||
}
|
||||
|
||||
OnPropertyChanged(nameof(CurrentActivity));
|
||||
OnPropertyChanged(nameof(SelectedActivityLabel));
|
||||
OnPropertyChanged(nameof(CurrentActivityLabel));
|
||||
OnPropertyChanged(nameof(CurrentFormCount));
|
||||
Specializations = new ObservableCollection<ActivityInfo>(activity?.Children ?? new());
|
||||
|
||||
if (activity is null)
|
||||
{
|
||||
Performers = new ObservableCollection<ActivityUserDisplayItem>();
|
||||
SelectedPerformer = null;
|
||||
return;
|
||||
}
|
||||
|
||||
await LoadPerformersAsync(activity);
|
||||
}
|
||||
|
||||
public async Task ShowSpecializationAsync(ActivityInfo? specialization)
|
||||
{
|
||||
_syncingSelection = true;
|
||||
try
|
||||
{
|
||||
SelectedSpecialization = specialization;
|
||||
}
|
||||
finally
|
||||
{
|
||||
_syncingSelection = false;
|
||||
}
|
||||
|
||||
OnPropertyChanged(nameof(CurrentActivity));
|
||||
OnPropertyChanged(nameof(CurrentActivityLabel));
|
||||
OnPropertyChanged(nameof(CurrentFormCount));
|
||||
|
||||
if (specialization is null)
|
||||
{
|
||||
if (SelectedActivity is not null)
|
||||
{
|
||||
await LoadPerformersAsync(SelectedActivity);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
await LoadPerformersAsync(specialization);
|
||||
}
|
||||
|
||||
private async Task LoadPerformersAsync(ActivityInfo activity)
|
||||
{
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var list = await _client.GetUsersAsync(activity.Code);
|
||||
var items = (list ?? new())
|
||||
.Select(dto => ActivityUserDisplayItem.FromDto(dto, _client.BuildAvatarXsUrl(dto.UserName)))
|
||||
.ToList();
|
||||
|
||||
await Task.WhenAll(items.Select(async item =>
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(item.AvatarXsUrl))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Uri.TryCreate(item.AvatarXsUrl, UriKind.Absolute, out var avatarUri))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
item.AvatarImage = await ImageHelper.LoadFromWeb(avatarUri);
|
||||
}));
|
||||
|
||||
Performers = new ObservableCollection<ActivityUserDisplayItem>(items);
|
||||
SelectedPerformer = null;
|
||||
StatusMessage = $"{activity.Name} · {Performers.Count} utilisateur(s)";
|
||||
}
|
||||
catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
Performers = new ObservableCollection<ActivityUserDisplayItem>();
|
||||
SelectedPerformer = null;
|
||||
StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Performers = new ObservableCollection<ActivityUserDisplayItem>();
|
||||
SelectedPerformer = null;
|
||||
StatusMessage = $"Erreur: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
OpenCommandFormsCommand.NotifyCanExecuteChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private bool CanOpenCommandForms()
|
||||
=> SelectedPerformer is not null && CurrentActivity?.Forms?.Count > 0;
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanOpenCommandForms))]
|
||||
private async Task OpenCommandFormsAsync()
|
||||
{
|
||||
if (SelectedPerformer is null || CurrentActivity is null)
|
||||
{
|
||||
StatusMessage = "Sélectionnez un utilisateur et une activité avec formulaire.";
|
||||
return;
|
||||
}
|
||||
|
||||
var app = (App?)Application.Current;
|
||||
if (app is null)
|
||||
{
|
||||
throw new InvalidOperationException("Application PostIt indisponible.");
|
||||
}
|
||||
|
||||
var vm = new CommandFormsPageViewModel(CurrentActivity, SelectedPerformer, _billingClient);
|
||||
await app.PushPageAsync(vm);
|
||||
}
|
||||
}
|
||||
50
src/PostIt/PostIt/ViewModels/ActivityUserDisplayItem.cs
Normal file
50
src/PostIt/PostIt/ViewModels/ActivityUserDisplayItem.cs
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
using Avalonia.Media.Imaging;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public sealed partial class ActivityUserDisplayItem : ObservableObject
|
||||
{
|
||||
public string PerformerId { get; init; } = string.Empty;
|
||||
public string AvatarXsUrl { get; init; } = string.Empty;
|
||||
public bool HasPerformerProfile { get; init; }
|
||||
public string PerformerBadgeLabel { get; init; } = "Profil pro";
|
||||
public bool IsPerformerActive { get; init; }
|
||||
public string PerformerStatusBadgeLabel { get; init; } = "Inactif";
|
||||
public string PerformerStatusBadgeBackground { get; init; } = "#FDECEA";
|
||||
public string PerformerStatusBadgeBorder { get; init; } = "#C62828";
|
||||
public string PerformerStatusBadgeForeground { get; init; } = "#8E0000";
|
||||
public string UserName { get; init; } = string.Empty;
|
||||
public string AvatarFallbackLabel { get; init; } = "?";
|
||||
public string WebSite { get; init; } = string.Empty;
|
||||
public int ExtraActivityCount { get; init; }
|
||||
public string ExtraActivityLabel { get; init; } = "Pas d'autre activité";
|
||||
|
||||
[ObservableProperty]
|
||||
public partial Bitmap? AvatarImage { get; set; }
|
||||
|
||||
public static ActivityUserDisplayItem FromDto(PerformerActivity dto, string avatarXsUrl)
|
||||
{
|
||||
return new ActivityUserDisplayItem
|
||||
{
|
||||
PerformerId = dto.PerformerId,
|
||||
AvatarXsUrl = avatarXsUrl,
|
||||
HasPerformerProfile = dto.HasPerformerProfile,
|
||||
UserName = dto.UserName,
|
||||
AvatarFallbackLabel = string.IsNullOrWhiteSpace(dto.UserName)
|
||||
? "?"
|
||||
: dto.UserName.Trim()[0].ToString().ToUpperInvariant(),
|
||||
WebSite = dto.WebSite,
|
||||
IsPerformerActive = dto.Active,
|
||||
PerformerStatusBadgeLabel = dto.Active ? "Actif" : "Inactif",
|
||||
PerformerStatusBadgeBackground = dto.Active ? "#E6F7EC" : "#FDECEA",
|
||||
PerformerStatusBadgeBorder = dto.Active ? "#2E7D32" : "#C62828",
|
||||
PerformerStatusBadgeForeground = dto.Active ? "#1B5E20" : "#8E0000",
|
||||
ExtraActivityCount = dto.ExtraActivityCount,
|
||||
ExtraActivityLabel = dto.ExtraActivityCount == 0
|
||||
? "Pas d'autre activité"
|
||||
: $"Autres spécialisations: {dto.ExtraActivityCount}"
|
||||
};
|
||||
}
|
||||
}
|
||||
173
src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs
Normal file
173
src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs
Normal file
|
|
@ -0,0 +1,173 @@
|
|||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using PostIt.Helpers;
|
||||
using Yavsc;
|
||||
using Yavsc.Api.Client;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public partial class BillingQueriesPageViewModel : ViewModelBase
|
||||
{
|
||||
private readonly BillingApiClient _billingClient;
|
||||
|
||||
public ActivityInfo Activity { get; }
|
||||
public ActivityUserDisplayItem Performer { get; }
|
||||
public CommandFormSummary Form { get; }
|
||||
public bool IsReadOnly { get; }
|
||||
public bool OngoingOnly { get; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<BillingQueryDisplayItem> Queries { get; set; } = new();
|
||||
|
||||
[ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedQueryCommand))]
|
||||
public partial BillingQueryDisplayItem? SelectedQuery { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial bool IsBusy { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string StatusMessage { get; set; } = "Chargement des commandes...";
|
||||
|
||||
public string Title => IsReadOnly
|
||||
? $"Demandes en cours ({Form.Title})"
|
||||
: $"Commandes {Form.Title}";
|
||||
public string ContextLabel => $"{Performer.UserName} · {Activity.Name}";
|
||||
public bool CanOpenDetails => !IsReadOnly;
|
||||
|
||||
public override bool CanNavigateNext
|
||||
{
|
||||
get => false;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public override bool CanNavigatePrevious
|
||||
{
|
||||
get => true;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public BillingQueriesPageViewModel(
|
||||
ActivityInfo activity,
|
||||
ActivityUserDisplayItem performer,
|
||||
CommandFormSummary form,
|
||||
BillingApiClient billingClient,
|
||||
bool isReadOnly = false,
|
||||
bool ongoingOnly = false)
|
||||
{
|
||||
Activity = activity ?? throw new ArgumentNullException(nameof(activity));
|
||||
Performer = performer ?? throw new ArgumentNullException(nameof(performer));
|
||||
Form = form ?? throw new ArgumentNullException(nameof(form));
|
||||
_billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
|
||||
IsReadOnly = isReadOnly;
|
||||
OngoingOnly = ongoingOnly;
|
||||
}
|
||||
|
||||
public Task InitializeAsync() => RefreshAsync();
|
||||
|
||||
private bool CanOpenSelectedQuery() => !IsReadOnly && SelectedQuery is not null;
|
||||
|
||||
[RelayCommand]
|
||||
public async Task RefreshAsync()
|
||||
{
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var list = await _billingClient.GetQuerySummariesAsync(Form.ActionName).ConfigureAwait(true);
|
||||
var filtered = (list ?? new())
|
||||
.Where(q => q.ActivityCode == Activity.Code && q.PerformerId == Performer.PerformerId)
|
||||
.Where(q => !OngoingOnly || IsOngoingStatus(q.Status))
|
||||
.OrderByDescending(q => q.EventDate ?? DateTime.MinValue)
|
||||
.ThenByDescending(q => q.Id)
|
||||
.Select(BillingQueryDisplayItem.FromDto)
|
||||
.ToList();
|
||||
|
||||
Queries = new ObservableCollection<BillingQueryDisplayItem>(filtered);
|
||||
StatusMessage = BuildLoadedStatusMessage(filtered.Count);
|
||||
}
|
||||
catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
Queries = new ObservableCollection<BillingQueryDisplayItem>();
|
||||
StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Queries = new ObservableCollection<BillingQueryDisplayItem>();
|
||||
StatusMessage = $"Erreur: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
[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.";
|
||||
return;
|
||||
}
|
||||
|
||||
var app = (App?)Application.Current;
|
||||
if (app is null)
|
||||
{
|
||||
throw new InvalidOperationException("Application PostIt indisponible.");
|
||||
}
|
||||
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var details = await _billingClient.GetQueryAsync(Form.ActionName, SelectedQuery.Id).ConfigureAwait(true);
|
||||
var vm = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient);
|
||||
await vm!.InitializeAsync(details).ConfigureAwait(true);
|
||||
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.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur lors de l'ouverture: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
private string BuildLoadedStatusMessage(int count)
|
||||
{
|
||||
if (count == 0)
|
||||
{
|
||||
return OngoingOnly
|
||||
? "Aucune demande en cours pour ce formulaire."
|
||||
: "Aucune commande trouvée pour ce formulaire.";
|
||||
}
|
||||
|
||||
if (OngoingOnly)
|
||||
{
|
||||
return $"{count} demande(s) en cours chargée(s) (lecture seule).";
|
||||
}
|
||||
|
||||
return $"{count} commande(s) chargée(s).";
|
||||
}
|
||||
|
||||
private static bool IsOngoingStatus(QueryStatus status)
|
||||
=> status is QueryStatus.Inserted or QueryStatus.Accepted or QueryStatus.InProgress;
|
||||
}
|
||||
35
src/PostIt/PostIt/ViewModels/BillingQueryDisplayItem.cs
Normal file
35
src/PostIt/PostIt/ViewModels/BillingQueryDisplayItem.cs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
using System;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public sealed class BillingQueryDisplayItem
|
||||
{
|
||||
public long Id { get; init; }
|
||||
public string Description { get; init; } = string.Empty;
|
||||
public string Summary { get; init; } = string.Empty;
|
||||
public string StatusLabel { get; init; } = string.Empty;
|
||||
public string EventDateLabel { get; init; } = string.Empty;
|
||||
public string BillingCode { get; init; } = string.Empty;
|
||||
|
||||
public static BillingQueryDisplayItem FromDto(BillingQuerySummaryDto dto)
|
||||
{
|
||||
var summary = !string.IsNullOrWhiteSpace(dto.Reason)
|
||||
? dto.Reason
|
||||
: !string.IsNullOrWhiteSpace(dto.AdditionalInfo)
|
||||
? dto.AdditionalInfo
|
||||
: dto.Description;
|
||||
|
||||
return new BillingQueryDisplayItem
|
||||
{
|
||||
Id = dto.Id,
|
||||
Description = string.IsNullOrWhiteSpace(dto.Description)
|
||||
? $"Commande #{dto.Id}"
|
||||
: dto.Description,
|
||||
Summary = summary,
|
||||
StatusLabel = dto.Status.ToString(),
|
||||
EventDateLabel = dto.EventDate?.ToLocalTime().ToString("g") ?? "Date non précisée",
|
||||
BillingCode = dto.BillingCode,
|
||||
};
|
||||
}
|
||||
}
|
||||
135
src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs
Normal file
135
src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using PostIt.Helpers;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public partial class CommandFormsPageViewModel : ViewModelBase
|
||||
{
|
||||
private readonly BillingApiClient _billingClient;
|
||||
|
||||
public ActivityInfo Activity { get; }
|
||||
public ActivityUserDisplayItem Performer { get; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<CommandFormSummary> Forms { get; set; }
|
||||
|
||||
[ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedFormCommand)), NotifyCanExecuteChangedFor(nameof(OpenQueriesCommand)), NotifyCanExecuteChangedFor(nameof(OpenOngoingQueriesCommand))]
|
||||
public partial CommandFormSummary? SelectedForm { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string StatusMessage { get; set; }
|
||||
|
||||
public string Title => $"Formulaires pour {Performer.UserName}";
|
||||
public string ContextLabel => $"{Activity.Name} · {Forms.Count} formulaire(s)";
|
||||
|
||||
public override bool CanNavigateNext
|
||||
{
|
||||
get => false;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public override bool CanNavigatePrevious
|
||||
{
|
||||
get => true;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public CommandFormsPageViewModel(
|
||||
ActivityInfo activity,
|
||||
ActivityUserDisplayItem performer,
|
||||
BillingApiClient billingClient)
|
||||
{
|
||||
Activity = activity ?? throw new ArgumentNullException(nameof(activity));
|
||||
Performer = performer ?? throw new ArgumentNullException(nameof(performer));
|
||||
_billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
|
||||
|
||||
Forms = new ObservableCollection<CommandFormSummary>((activity.Forms ?? new())
|
||||
.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.";
|
||||
}
|
||||
|
||||
private bool CanOpenSelectedForm() => SelectedForm is not null;
|
||||
|
||||
private bool CanOpenQueries() => SelectedForm is not null;
|
||||
|
||||
private bool CanOpenOngoingQueries() => SelectedForm is not null;
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanOpenSelectedForm))]
|
||||
private async Task OpenSelectedFormAsync()
|
||||
{
|
||||
if (SelectedForm is null)
|
||||
{
|
||||
StatusMessage = "Sélectionnez un formulaire.";
|
||||
return;
|
||||
}
|
||||
|
||||
var app = (App?)Application.Current;
|
||||
if (app is null)
|
||||
{
|
||||
throw new InvalidOperationException("Application PostIt indisponible.");
|
||||
}
|
||||
|
||||
var vm = SelectedForm.CreateCommandPageViewModel(
|
||||
Activity, Performer, _billingClient);
|
||||
await vm!.InitializeAsync();
|
||||
await app.PushPageAsync(vm);
|
||||
}
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanOpenQueries))]
|
||||
private async Task OpenQueriesAsync()
|
||||
{
|
||||
if (SelectedForm is null)
|
||||
{
|
||||
StatusMessage = "Sélectionnez un formulaire.";
|
||||
return;
|
||||
}
|
||||
|
||||
var app = (App?)Application.Current;
|
||||
if (app is null)
|
||||
{
|
||||
throw new InvalidOperationException("Application PostIt indisponible.");
|
||||
}
|
||||
|
||||
var vm = new BillingQueriesPageViewModel(Activity, Performer, SelectedForm, _billingClient);
|
||||
await vm.InitializeAsync();
|
||||
await app.PushPageAsync(vm);
|
||||
}
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanOpenOngoingQueries))]
|
||||
private async Task OpenOngoingQueriesAsync()
|
||||
{
|
||||
if (SelectedForm is null)
|
||||
{
|
||||
StatusMessage = "Sélectionnez un formulaire.";
|
||||
return;
|
||||
}
|
||||
|
||||
var app = (App?)Application.Current;
|
||||
if (app is null)
|
||||
{
|
||||
throw new InvalidOperationException("Application PostIt indisponible.");
|
||||
}
|
||||
|
||||
var vm = new BillingQueriesPageViewModel(
|
||||
Activity,
|
||||
Performer,
|
||||
SelectedForm,
|
||||
_billingClient,
|
||||
isReadOnly: true,
|
||||
ongoingOnly: true);
|
||||
await vm.InitializeAsync();
|
||||
await app.PushPageAsync(vm);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,108 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using Yavsc;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
using Yavsc.Models.Billing;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase
|
||||
{
|
||||
protected readonly BillingApiClient _billingClient;
|
||||
|
||||
public ActivityInfo Activity { get; }
|
||||
public ActivityUserDisplayItem Performer { get; }
|
||||
public CommandFormSummary Form { get; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial bool IsBusy { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string StatusMessage { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string Reason { get; set; } = string.Empty;
|
||||
|
||||
|
||||
|
||||
[ObservableProperty]
|
||||
public partial bool Consent { get; set; } = true;
|
||||
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string AdditionalInfo { get; set; } = string.Empty;
|
||||
|
||||
[ObservableProperty]
|
||||
public partial long? ExistingQueryId { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial QueryStatus CommandStatus { get; set; } = QueryStatus.Inserted;
|
||||
|
||||
public bool CanUseCurrentLocation => IsSupported && !IsBusy;
|
||||
|
||||
public string Title => Form.Title;
|
||||
public string PerformerLabel => Performer.UserName;
|
||||
public string ActivityLabel => Activity.Name;
|
||||
public virtual bool IsSupported => true;
|
||||
public string BillingRoute => $"/billing/{Form.ActionName}";
|
||||
public bool IsEditingExisting => ExistingQueryId.HasValue;
|
||||
public string SubmitLabel => IsEditingExisting ? "Mettre à jour la commande" : "Poster la commande";
|
||||
public virtual string SupportMessage => $"Le formulaire {Form.ActionName} n'est pas encore pris en charge dans PostIt.";
|
||||
|
||||
public override bool CanNavigateNext
|
||||
{
|
||||
get => false;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public override bool CanNavigatePrevious
|
||||
{
|
||||
get => true;
|
||||
protected set { _ = value; }
|
||||
}
|
||||
|
||||
public BillingCommandPageViewModel(
|
||||
ActivityInfo activity,
|
||||
ActivityUserDisplayItem performer,
|
||||
CommandFormSummary form,
|
||||
BillingApiClient billingClient)
|
||||
{
|
||||
Activity = activity ?? throw new ArgumentNullException(nameof(activity));
|
||||
Performer = performer ?? throw new ArgumentNullException(nameof(performer));
|
||||
Form = form ?? throw new ArgumentNullException(nameof(form));
|
||||
_billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
|
||||
|
||||
StatusMessage = SupportMessage;
|
||||
}
|
||||
|
||||
partial void OnExistingQueryIdChanged(long? value)
|
||||
{
|
||||
OnPropertyChanged(nameof(IsEditingExisting));
|
||||
OnPropertyChanged(nameof(SubmitLabel));
|
||||
}
|
||||
|
||||
partial void OnIsBusyChanged(bool value)
|
||||
{
|
||||
OnPropertyChanged(nameof(CanUseCurrentLocation));
|
||||
}
|
||||
|
||||
public async Task InitializeAsync(BillingQueryDetailsDto? existingQuery = null)
|
||||
{
|
||||
await LoadAsync();
|
||||
if (existingQuery is not null)
|
||||
{
|
||||
ApplyExistingQuery(existingQuery);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract void ApplyExistingQuery(BillingQueryDetailsDto existingQuery);
|
||||
|
||||
|
||||
|
||||
[RelayCommand]
|
||||
protected abstract Task SubmitAsync();
|
||||
}
|
||||
165
src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs
Normal file
165
src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs
Normal file
|
|
@ -0,0 +1,165 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
using Yavsc.Models.Billing;
|
||||
using Yavsc.Models.Haircut;
|
||||
namespace PostIt.ViewModels.Commands;
|
||||
|
||||
public partial class BrushViewModel : RdvViewModel
|
||||
{
|
||||
public override string SupportMessage => "Choisissez une prestation coiffure puis postez la commande.";
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<HairPrestationDto> AvailablePrestations { get; set; } = new();
|
||||
|
||||
[ObservableProperty]
|
||||
public partial HairPrestationDto? SelectedPrestation { get; set; }
|
||||
|
||||
public BrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
|
||||
: base(activity, performer, form, billingClient)
|
||||
{
|
||||
}
|
||||
|
||||
public override async Task LoadAsync()
|
||||
{
|
||||
var prestations = await _billingClient.GetHairPrestationsAsync(Form.ActionName);
|
||||
|
||||
AvailablePrestations = new ObservableCollection<HairPrestationDto>
|
||||
(prestations ?? new List<HairPrestationDto>());
|
||||
|
||||
if (SelectedPrestation is null)
|
||||
{
|
||||
SelectedPrestation = AvailablePrestations.FirstOrDefault();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
|
||||
{
|
||||
base.ApplyExistingQuery(existingQuery);
|
||||
|
||||
if (existingQuery.PrestationId is not null)
|
||||
{
|
||||
SelectedPrestation = AvailablePrestations.FirstOrDefault(x => x.Id == existingQuery.PrestationId.Value);
|
||||
}
|
||||
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
if (SelectedPrestation is null)
|
||||
{
|
||||
SelectedPrestation = AvailablePrestations.FirstOrDefault();
|
||||
}
|
||||
|
||||
StatusMessage = AvailablePrestations.Count == 0
|
||||
? "Aucune prestation coiffure disponible."
|
||||
: SupportMessage;
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
StatusMessage = "Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur lors du chargement des prestations: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
protected override async Task SubmitAsync()
|
||||
{
|
||||
if (!Consent)
|
||||
{
|
||||
StatusMessage = "Le consentement est requis pour poster la commande.";
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(Address))
|
||||
{
|
||||
StatusMessage = "L'adresse du rendez-vous est requise.";
|
||||
return;
|
||||
}
|
||||
|
||||
if (SelectedPrestation is null)
|
||||
{
|
||||
StatusMessage = "Sélectionnez une prestation coiffure.";
|
||||
return;
|
||||
}
|
||||
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var address = Address.Trim();
|
||||
var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
|
||||
|
||||
var payload = new BillingQueryDetailsDto
|
||||
{
|
||||
Id = ExistingQueryId ?? 0,
|
||||
BillingCode = Form.ActionName,
|
||||
ActivityCode = Activity.Code,
|
||||
PerformerId = Performer.PerformerId,
|
||||
Consent = Consent,
|
||||
EventDate = EventDate,
|
||||
Status = CommandStatus,
|
||||
Reason = Reason.Trim(),
|
||||
AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
|
||||
Location = new BillingLocationDto
|
||||
{
|
||||
Address = address,
|
||||
Latitude = Latitude,
|
||||
Longitude = Longitude,
|
||||
}
|
||||
};
|
||||
|
||||
payload.PrestationId = SelectedPrestation.Id;
|
||||
|
||||
if (IsEditingExisting)
|
||||
{
|
||||
await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
await _billingClient.CreateAsync(Form.ActionName, new
|
||||
{
|
||||
ActivityCode = Activity.Code,
|
||||
PerformerId = Performer.PerformerId,
|
||||
Consent,
|
||||
EventDate = (DateTime?)EventDate,
|
||||
Location = locationPayload,
|
||||
PrestationId = SelectedPrestation.Id,
|
||||
AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? null : AdditionalInfo.Trim(),
|
||||
Status = payload.Status,
|
||||
}).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
StatusMessage = IsEditingExisting
|
||||
? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
|
||||
: $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
130
src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs
Normal file
130
src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
using Yavsc.Models.Billing;
|
||||
|
||||
namespace PostIt.ViewModels.Commands;
|
||||
|
||||
public partial class MBrushViewModel : BrushViewModel
|
||||
{
|
||||
public override string SupportMessage => "Choisissez une ou plusieurs prestations coiffure puis postez la commande.";
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<SelectableHairPrestationItem> MultiPrestations { get; set; } = new();
|
||||
|
||||
public MBrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
|
||||
: base(activity, performer, form, billingClient)
|
||||
{
|
||||
}
|
||||
|
||||
public override async Task LoadAsync()
|
||||
{
|
||||
await base.LoadAsync().ConfigureAwait(true);
|
||||
MultiPrestations = new ObservableCollection<SelectableHairPrestationItem>(
|
||||
AvailablePrestations.Select(SelectableHairPrestationItem.FromDto));
|
||||
}
|
||||
|
||||
protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
|
||||
{
|
||||
base.ApplyExistingQuery(existingQuery);
|
||||
|
||||
var selectedIds = existingQuery.PrestationIds is null
|
||||
? new HashSet<long>()
|
||||
: new HashSet<long>(existingQuery.PrestationIds);
|
||||
|
||||
foreach (var item in MultiPrestations)
|
||||
{
|
||||
item.IsSelected = selectedIds.Contains(item.Id);
|
||||
}
|
||||
}
|
||||
|
||||
protected override async Task SubmitAsync()
|
||||
{
|
||||
if (!Consent)
|
||||
{
|
||||
StatusMessage = "Le consentement est requis pour poster la commande.";
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(Address))
|
||||
{
|
||||
StatusMessage = "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.";
|
||||
return;
|
||||
}
|
||||
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var address = Address.Trim();
|
||||
var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
|
||||
|
||||
var payload = new BillingQueryDetailsDto
|
||||
{
|
||||
Id = ExistingQueryId ?? 0,
|
||||
BillingCode = Form.ActionName,
|
||||
ActivityCode = Activity.Code,
|
||||
PerformerId = Performer.PerformerId,
|
||||
Consent = Consent,
|
||||
EventDate = EventDate,
|
||||
Status = CommandStatus,
|
||||
Reason = Reason.Trim(),
|
||||
Location = new BillingLocationDto
|
||||
{
|
||||
Address = address,
|
||||
Latitude = Latitude,
|
||||
Longitude = Longitude,
|
||||
},
|
||||
PrestationIds = selectedPrestations.Select(x => x.Id).ToList(),
|
||||
};
|
||||
|
||||
if (IsEditingExisting)
|
||||
{
|
||||
await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
await _billingClient.CreateAsync(Form.ActionName, new
|
||||
{
|
||||
ActivityCode = Activity.Code,
|
||||
PerformerId = Performer.PerformerId,
|
||||
Consent,
|
||||
EventDate = EventDate,
|
||||
Location = locationPayload,
|
||||
Prestations = selectedPrestations.Select(x => new { PrestationId = x.Id }).ToList(),
|
||||
Status = payload.Status,
|
||||
}).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
StatusMessage = IsEditingExisting
|
||||
? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
|
||||
: $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
|
||||
}
|
||||
catch (HttpRequestException ex)
|
||||
when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
211
src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs
Normal file
211
src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs
Normal file
|
|
@ -0,0 +1,211 @@
|
|||
using System;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using PostIt.Services;
|
||||
using Yavsc.Abstract.Workflow;
|
||||
using Yavsc.Api.Client;
|
||||
|
||||
namespace PostIt.ViewModels.Commands;
|
||||
|
||||
public partial class RdvViewModel : BillingCommandPageViewModel
|
||||
{
|
||||
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 double? Latitude { get; set; }
|
||||
|
||||
[ObservableProperty]
|
||||
public partial double? Longitude { get; set; }
|
||||
|
||||
|
||||
[ObservableProperty]
|
||||
public partial DateTime EventDate { get; set; }
|
||||
|
||||
public RdvViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
|
||||
: base(activity, performer, form, billingClient)
|
||||
{
|
||||
EventDate = DateTime.Now.AddDays(1);
|
||||
}
|
||||
|
||||
protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
|
||||
{
|
||||
ExistingQueryId = existingQuery.Id;
|
||||
CommandStatus = existingQuery.Status;
|
||||
Consent = existingQuery.Consent;
|
||||
Reason = existingQuery.Reason ?? string.Empty;
|
||||
AdditionalInfo = existingQuery.AdditionalInfo ?? string.Empty;
|
||||
|
||||
if (existingQuery.EventDate is not null)
|
||||
{
|
||||
EventDate = existingQuery.EventDate.Value
|
||||
.ToLocalTime();
|
||||
}
|
||||
|
||||
if (existingQuery.Location is not null)
|
||||
{
|
||||
Address = existingQuery.Location.Address ?? string.Empty;
|
||||
Latitude = existingQuery.Location.Latitude;
|
||||
Longitude = existingQuery.Location.Longitude;
|
||||
}
|
||||
|
||||
StatusMessage = $"Commande #{existingQuery.Id} chargée.";
|
||||
}
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanUseCurrentLocation))]
|
||||
private async Task UseCurrentLocationAsync()
|
||||
{
|
||||
if (!CanUseCurrentLocation)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var result = await Platform.TryGetCurrentLocationAsync(default).ConfigureAwait(true);
|
||||
if (!result.IsSuccess || !result.Latitude.HasValue || !result.Longitude.HasValue)
|
||||
{
|
||||
StatusMessage = result.Message;
|
||||
return;
|
||||
}
|
||||
|
||||
Latitude = result.Latitude.Value;
|
||||
Longitude = result.Longitude.Value;
|
||||
StatusMessage = string.IsNullOrWhiteSpace(Address)
|
||||
? "Position récupérée. Complétez l'adresse puis envoyez la commande."
|
||||
: result.Message;
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
StatusMessage = "La récupération de la position a été annulée.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Impossible de récupérer la position: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
protected static object BuildLocationPayload(string address, double? latitude, double? longitude)
|
||||
{
|
||||
if (latitude.HasValue && longitude.HasValue)
|
||||
{
|
||||
return new
|
||||
{
|
||||
Address = address,
|
||||
Latitude = latitude.Value,
|
||||
Longitude = longitude.Value,
|
||||
};
|
||||
}
|
||||
|
||||
return new
|
||||
{
|
||||
Address = address,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
protected override async Task SubmitAsync()
|
||||
{
|
||||
if (!IsSupported)
|
||||
{
|
||||
StatusMessage = SupportMessage;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Consent)
|
||||
{
|
||||
StatusMessage = "Le consentement est requis pour poster la commande.";
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(Address))
|
||||
{
|
||||
StatusMessage = "L'adresse du rendez-vous est requise.";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (string.IsNullOrWhiteSpace(Reason))
|
||||
{
|
||||
StatusMessage = "Le motif du rendez-vous est requis.";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var address = Address.Trim();
|
||||
var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
|
||||
|
||||
var payload = new BillingQueryDetailsDto
|
||||
{
|
||||
Id = ExistingQueryId ?? 0,
|
||||
BillingCode = Form.ActionName,
|
||||
ActivityCode = Activity.Code,
|
||||
PerformerId = Performer.PerformerId,
|
||||
Consent = Consent,
|
||||
EventDate = EventDate,
|
||||
Status = CommandStatus,
|
||||
Reason = Reason.Trim(),
|
||||
AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
|
||||
Location = new BillingLocationDto
|
||||
{
|
||||
Address = address,
|
||||
Latitude = Latitude,
|
||||
Longitude = Longitude,
|
||||
}
|
||||
};
|
||||
|
||||
if (IsEditingExisting)
|
||||
{
|
||||
await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
await _billingClient.CreateAsync(Form.ActionName, new
|
||||
{
|
||||
ActivityCode = Activity.Code,
|
||||
PerformerId = Performer.PerformerId,
|
||||
Consent,
|
||||
EventDate = EventDate,
|
||||
Location = locationPayload,
|
||||
Reason = payload.Reason,
|
||||
Status = payload.Status,
|
||||
}).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
StatusMessage = IsEditingExisting
|
||||
? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
|
||||
: $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
|
||||
}
|
||||
catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
|
||||
{
|
||||
StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur lors de l'envoi: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
public override Task LoadAsync()
|
||||
{
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,9 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using PostIt.Helpers;
|
||||
using PostIt.Services;
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
|
|
@ -24,8 +29,25 @@ public class HomePageViewModel : ViewModelBase
|
|||
Settings = settings;
|
||||
SessionStatus = sessionStatus;
|
||||
|
||||
OpenActivities = new AsyncRelayCommand(OpenActivitiesAsync);
|
||||
|
||||
}
|
||||
public RelayCommand OpenBlogs { get; set; } = new RelayCommand(() => App.PushMainPageAsync());
|
||||
public IAsyncRelayCommand OpenBlogs { get; } = new AsyncRelayCommand(App.PushBlogsPageAsync);
|
||||
public IAsyncRelayCommand OpenActivities { get; }
|
||||
|
||||
private async Task OpenActivitiesAsync()
|
||||
{
|
||||
var app = (App?)Application.Current;
|
||||
var vm = app?.ServiceProvider?.GetRequiredService<ActivitiesPageViewModel>();
|
||||
if (app is null || vm is null)
|
||||
{
|
||||
throw new InvalidOperationException("Activities page is not available.");
|
||||
}
|
||||
|
||||
await vm.RefreshAsync();
|
||||
await app.PushPageAsync(vm);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Avalonia designer constructor. Builds a self-contained VM
|
||||
/// with a freshly-constructed Settings so the XAML preview can
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public partial class MainViewModel : ViewModelBase
|
|||
/// mutable field. Toggling is its own action.</summary>
|
||||
[ObservableProperty]
|
||||
public partial bool DraftIsPublished { get; set; }
|
||||
|
||||
public bool IsLoaded { get; private set; }
|
||||
public Settings SettingsModel { get; }
|
||||
|
||||
[ObservableProperty]
|
||||
|
|
@ -72,6 +72,218 @@ public partial class MainViewModel : ViewModelBase
|
|||
[ObservableProperty]
|
||||
public partial Settings Settings { get; private set; }
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task RefreshAsync()
|
||||
{
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
var posts = await BlogClient!.GetPostsAsync();
|
||||
Posts.Clear();
|
||||
foreach (var post in posts.OrderByDescending(p => p.DateModified))
|
||||
{
|
||||
Posts.Add(post);
|
||||
}
|
||||
ApplyFilter();
|
||||
StatusMessage = $"Loaded {Posts.Count} posts.";
|
||||
});
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task SearchAsync() {
|
||||
await RefreshAsync();
|
||||
ApplyFilter();
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task SaveAsync()
|
||||
{
|
||||
// The button is already disabled when the title is empty
|
||||
// (see CanSave), but the test path (and any programmatic
|
||||
// ICommand.Execute) bypasses CanExecute, so we still
|
||||
// guard here. Better to no-op with a status message
|
||||
// than to send a request the server will reject.
|
||||
if (string.IsNullOrWhiteSpace(DraftTitle))
|
||||
{
|
||||
StatusMessage = "Title is required.";
|
||||
return;
|
||||
}
|
||||
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
// Build a fresh BlogPostDto from the editor buffer on
|
||||
// every Save — we no longer mutate SelectedPost in
|
||||
// place. The previous behaviour copied the buffer
|
||||
// (which was a no-op when SelectedPost was null)
|
||||
// back onto the model and relied on a
|
||||
// [Required] violation to surface the missing
|
||||
// input; the new shape keeps the editor buffer as
|
||||
// the single source of truth for outgoing payloads
|
||||
// and the selected post as a read-only hint for
|
||||
// the update path.
|
||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
||||
{
|
||||
var draft = new BlogPostDto
|
||||
{
|
||||
Title = DraftTitle,
|
||||
Article = DraftArticle ?? string.Empty,
|
||||
DateCreated = DateTime.UtcNow,
|
||||
DateModified = DateTime.UtcNow,
|
||||
IsPublished = DraftIsPublished
|
||||
};
|
||||
var created = await BlogClient!.CreatePostAsync(draft);
|
||||
if (created is not null)
|
||||
{
|
||||
SelectedPost = created;
|
||||
StatusMessage = $"Created post {created.Id}.";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var update = new BlogPostDto
|
||||
{
|
||||
Id = SelectedPost.Id,
|
||||
AuthorId = SelectedPost.AuthorId,
|
||||
Photo = SelectedPost.Photo,
|
||||
Title = DraftTitle,
|
||||
Article = DraftArticle ?? string.Empty,
|
||||
DateCreated = SelectedPost.DateCreated,
|
||||
DateModified = DateTime.UtcNow,
|
||||
};
|
||||
await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
|
||||
StatusMessage = $"Saved post {SelectedPost.Id}.";
|
||||
}
|
||||
|
||||
await RefreshPostsAsync();
|
||||
});
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task DeleteAsync()
|
||||
{
|
||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
||||
{
|
||||
StatusMessage = "Select an existing post before deleting.";
|
||||
return;
|
||||
}
|
||||
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
await BlogClient!.DeletePostAsync(SelectedPost.Id);
|
||||
StatusMessage = $"Deleted post {SelectedPost.Id}.";
|
||||
SelectedPost = null;
|
||||
await RefreshPostsAsync();
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Toggle the publication state of the currently selected
|
||||
/// post. Pushes the new state to
|
||||
/// <c>PUT /api/BlogApi/{id}/publish</c> and reflects it
|
||||
/// locally in <see cref="DraftIsPublished"/> + the
|
||||
/// selected post so the UI updates without a full
|
||||
/// refresh.
|
||||
///
|
||||
/// <para>The toggle is its own action — separate from Save
|
||||
/// — because <c>Publish</c> is not part of the
|
||||
/// <c>BlogPostDto</c> payload. Bundling it into Save
|
||||
/// would require a wire-shape change and a second server
|
||||
/// overload; the dedicated endpoint keeps the wire
|
||||
/// contract clean.</para>
|
||||
/// </summary>
|
||||
public async Task SetPublishStateAsync(bool publish)
|
||||
{
|
||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
||||
{
|
||||
StatusMessage = "Sélectionnez un billet existant pour changer sa publication.";
|
||||
return;
|
||||
}
|
||||
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
// The checkbox updates DraftIsPublished before the command is
|
||||
// executed. Using the current bound value avoids the
|
||||
// double-toggle bug in which the UI has already flipped the
|
||||
// state and the command flips it again.
|
||||
await BlogClient!.SetPublishAsync(SelectedPost.Id, publish);
|
||||
DraftIsPublished = publish;
|
||||
// Mirror into the selected post so a subsequent
|
||||
// RefreshPostsAsync() doesn't blow away the
|
||||
// locally flipped state until the round-trip
|
||||
// re-hydrates it.
|
||||
SelectedPost.IsPublished = publish;
|
||||
StatusMessage = publish
|
||||
? $"Billet {SelectedPost.Id} publié."
|
||||
: $"Billet {SelectedPost.Id} remis en brouillon.";
|
||||
});
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task TogglePublishAsync()
|
||||
{
|
||||
await SetPublishStateAsync(DraftIsPublished);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// DEV ONLY: open the signature capture page. The production
|
||||
/// entry point is a SignalR push from Yavsc.Org ("devis
|
||||
/// received, sign here"); this command is the dev-time
|
||||
/// shortcut to reach the page without that infrastructure.
|
||||
/// Aligned on the same VM-first navigation pattern as
|
||||
/// <see cref="OpenSettings"/>: the VM resolves the target VM
|
||||
/// through <see cref="Services"/>, the <c>ViewLocator</c> picks
|
||||
/// the matching <c>Control</c> at bind time. No
|
||||
/// <c>Click</code> handler, no <c>App.ServiceProvider</c>
|
||||
/// access from the view layer.
|
||||
/// </summary>
|
||||
[RelayCommand]
|
||||
internal async Task OpenSignatureDevAsync()
|
||||
{
|
||||
await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanManageAcl))]
|
||||
public async Task ManageAclAsync()
|
||||
{
|
||||
if (SelectedPost is null)
|
||||
{
|
||||
StatusMessage = "Select an existing post before managing ACL.";
|
||||
return;
|
||||
}
|
||||
|
||||
var postForAcl = SelectedPost;
|
||||
try
|
||||
{
|
||||
var detailed = await BlogClient!.GetPostAsync(SelectedPost.Id).ConfigureAwait(true);
|
||||
if (detailed is not null)
|
||||
{
|
||||
postForAcl = detailed;
|
||||
SelectedPost = detailed;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Keep the dialog usable even if the detail refresh fails.
|
||||
}
|
||||
|
||||
await ((App)App.Current!).PushPageAsync(GetACLViewModel(postForAcl)).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
public async Task OpenCirclesAsync()
|
||||
{
|
||||
var circlesVm = ResolveServices().GetRequiredService<CirclesPageViewModel>();
|
||||
await ((App)App.Current!).PushPageAsync(circlesVm).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
private ViewModelBase GetACLViewModel(BlogPostDto selectedPost)
|
||||
{
|
||||
var sp = ResolveServices();
|
||||
var aclClient = sp.GetRequiredService<BlogAclApiClient>();
|
||||
var circleClient = sp.GetRequiredService<CircleApiClient>();
|
||||
return new PostAclDialogViewModel(selectedPost, aclClient, circleClient);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// API surface that hits the Yavsc.Blogs deployment at
|
||||
/// <see cref="Settings.ApiUrl"/>. Owned and constructed by
|
||||
|
|
@ -130,17 +342,18 @@ public partial class MainViewModel : ViewModelBase
|
|||
|
||||
private void Init(Settings? settings)
|
||||
{
|
||||
SearchText = string.Empty;
|
||||
Posts = new ObservableCollection<BlogPostDto>();
|
||||
FilteredPosts = new ObservableCollection<BlogPostDto>();
|
||||
SelectedPost = null;
|
||||
IsBusy = false;
|
||||
StatusMessage = "Ready";
|
||||
Settings = settings ?? new Settings();
|
||||
SearchText = Settings.SearchText;
|
||||
WindowTitle = "PostIt";
|
||||
DraftTitle = string.Empty;
|
||||
DraftArticle = string.Empty;
|
||||
DraftIsPublished = false;
|
||||
IsLoaded = false;
|
||||
// Production path: DI injects the canonical Settings singleton
|
||||
// and we use it as-is. Test path: tests call this constructor
|
||||
// without a Settings argument; we fall back to a fresh
|
||||
|
|
@ -152,6 +365,15 @@ public partial class MainViewModel : ViewModelBase
|
|||
// (thread-safe dispatcher marshalling) so the duplicate
|
||||
// instance is now merely wasteful, not dangerous.
|
||||
|
||||
Settings.PropertyChanged += (s, e) =>
|
||||
{
|
||||
if (e.PropertyName == nameof(Settings.SearchText))
|
||||
{
|
||||
SearchText = Settings.SearchText;
|
||||
ApplyFilter();
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
/// <summary>Save is enabled as soon as the user has typed
|
||||
|
|
@ -179,7 +401,14 @@ public partial class MainViewModel : ViewModelBase
|
|||
Init(settings);
|
||||
}
|
||||
|
||||
partial void OnSearchTextChanged(string value) => ApplyFilter();
|
||||
partial void OnSearchTextChanged(string value)
|
||||
{
|
||||
if (Settings is not null && Settings.SearchText != value)
|
||||
{
|
||||
Settings.SearchText = value;
|
||||
}
|
||||
ApplyFilter();
|
||||
}
|
||||
|
||||
partial void OnSelectedPostChanged(BlogPostDto? value)
|
||||
{
|
||||
|
|
@ -206,170 +435,6 @@ public partial class MainViewModel : ViewModelBase
|
|||
partial void OnDraftTitleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
|
||||
partial void OnDraftArticleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task LoadPosts()
|
||||
{
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
var posts = await BlogClient!.GetPostsAsync();
|
||||
Posts.Clear();
|
||||
foreach (var post in posts.OrderByDescending(p => p.DateModified))
|
||||
{
|
||||
Posts.Add(post);
|
||||
}
|
||||
ApplyFilter();
|
||||
StatusMessage = $"Loaded {Posts.Count} posts.";
|
||||
});
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
internal void Search() => ApplyFilter();
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task Save()
|
||||
{
|
||||
// The button is already disabled when the title is empty
|
||||
// (see CanSave), but the test path (and any programmatic
|
||||
// ICommand.Execute) bypasses CanExecute, so we still
|
||||
// guard here. Better to no-op with a status message
|
||||
// than to send a request the server will reject.
|
||||
if (string.IsNullOrWhiteSpace(DraftTitle))
|
||||
{
|
||||
StatusMessage = "Title is required.";
|
||||
return;
|
||||
}
|
||||
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
// Build a fresh BlogPostDto from the editor buffer on
|
||||
// every Save — we no longer mutate SelectedPost in
|
||||
// place. The previous behaviour copied the buffer
|
||||
// (which was a no-op when SelectedPost was null)
|
||||
// back onto the model and relied on a
|
||||
// [Required] violation to surface the missing
|
||||
// input; the new shape keeps the editor buffer as
|
||||
// the single source of truth for outgoing payloads
|
||||
// and the selected post as a read-only hint for
|
||||
// the update path.
|
||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
||||
{
|
||||
var draft = new BlogPostDto
|
||||
{
|
||||
Title = DraftTitle,
|
||||
Article = DraftArticle ?? string.Empty,
|
||||
DateCreated = DateTime.UtcNow,
|
||||
DateModified = DateTime.UtcNow,
|
||||
};
|
||||
var created = await BlogClient!.CreatePostAsync(draft);
|
||||
if (created is not null)
|
||||
{
|
||||
SelectedPost = created;
|
||||
StatusMessage = $"Created post {created.Id}.";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var update = new BlogPostDto
|
||||
{
|
||||
Id = SelectedPost.Id,
|
||||
AuthorId = SelectedPost.AuthorId,
|
||||
Photo = SelectedPost.Photo,
|
||||
Title = DraftTitle,
|
||||
Article = DraftArticle ?? string.Empty,
|
||||
DateCreated = SelectedPost.DateCreated,
|
||||
DateModified = DateTime.UtcNow,
|
||||
};
|
||||
await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
|
||||
StatusMessage = $"Saved post {SelectedPost.Id}.";
|
||||
}
|
||||
|
||||
await RefreshPostsAsync();
|
||||
});
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
internal async Task Delete()
|
||||
{
|
||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
||||
{
|
||||
StatusMessage = "Select an existing post before deleting.";
|
||||
return;
|
||||
}
|
||||
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
await BlogClient!.DeletePostAsync(SelectedPost.Id);
|
||||
StatusMessage = $"Deleted post {SelectedPost.Id}.";
|
||||
SelectedPost = null;
|
||||
await RefreshPostsAsync();
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Toggle the publication state of the currently selected
|
||||
/// post. Pushes the new state to
|
||||
/// <c>PUT /api/BlogApi/{id}/publish</c> and reflects it
|
||||
/// locally in <see cref="DraftIsPublished"/> + the
|
||||
/// selected post so the UI updates without a full
|
||||
/// refresh.
|
||||
///
|
||||
/// <para>The toggle is its own action — separate from Save
|
||||
/// — because <c>Publish</c> is not part of the
|
||||
/// <c>BlogPostDto</c> payload. Bundling it into Save
|
||||
/// would require a wire-shape change and a second server
|
||||
/// overload; the dedicated endpoint keeps the wire
|
||||
/// contract clean.</para>
|
||||
/// </summary>
|
||||
[RelayCommand]
|
||||
internal async Task TogglePublish()
|
||||
{
|
||||
if (SelectedPost is null || SelectedPost.Id == 0)
|
||||
{
|
||||
StatusMessage = "Sélectionnez un billet existant pour changer sa publication.";
|
||||
return;
|
||||
}
|
||||
|
||||
await ExecuteAsync(async () =>
|
||||
{
|
||||
var desired = !DraftIsPublished;
|
||||
await BlogClient!.SetPublishAsync(SelectedPost.Id, desired);
|
||||
DraftIsPublished = desired;
|
||||
// Mirror into the selected post so a subsequent
|
||||
// RefreshPostsAsync() doesn't blow away the
|
||||
// locally flipped state until the round-trip
|
||||
// re-hydrates it.
|
||||
SelectedPost.IsPublished = desired;
|
||||
StatusMessage = desired
|
||||
? $"Billet {SelectedPost.Id} publié."
|
||||
: $"Billet {SelectedPost.Id} remis en brouillon.";
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// DEV ONLY: open the signature capture page. The production
|
||||
/// entry point is a SignalR push from Yavsc.Org ("devis
|
||||
/// received, sign here"); this command is the dev-time
|
||||
/// shortcut to reach the page without that infrastructure.
|
||||
/// Aligned on the same VM-first navigation pattern as
|
||||
/// <see cref="OpenSettings"/>: the VM resolves the target VM
|
||||
/// through <see cref="Services"/>, the <c>ViewLocator</c> picks
|
||||
/// the matching <c>Control</c> at bind time. No
|
||||
/// <c>Click</code> handler, no <c>App.ServiceProvider</c>
|
||||
/// access from the view layer.
|
||||
/// </summary>
|
||||
[RelayCommand]
|
||||
internal async Task OpenSignatureDev()
|
||||
{
|
||||
await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
private ViewModelBase GetACLViewModel(BlogPostDto selectedPost)
|
||||
{
|
||||
var sp = ResolveServices();
|
||||
var aclClient = sp.GetRequiredService<BlogAclApiClient>();
|
||||
var circleClient = sp.GetRequiredService<CircleApiClient>();
|
||||
return new PostAclDialogViewModel(selectedPost, aclClient, circleClient);
|
||||
}
|
||||
|
||||
private async Task RefreshPostsAsync()
|
||||
{
|
||||
|
|
@ -426,28 +491,18 @@ public partial class MainViewModel : ViewModelBase
|
|||
|
||||
private void UpdateCommandStates()
|
||||
{
|
||||
LoadPostsCommand.NotifyCanExecuteChanged();
|
||||
RefreshCommand.NotifyCanExecuteChanged();
|
||||
SaveCommand.NotifyCanExecuteChanged();
|
||||
DeleteCommand.NotifyCanExecuteChanged();
|
||||
}
|
||||
|
||||
|
||||
|
||||
[RelayCommand(CanExecute = nameof(CanManageAcl))]
|
||||
public async Task ManageAcl()
|
||||
internal async Task InitializeAsync()
|
||||
{
|
||||
if (SelectedPost is null)
|
||||
if (!IsLoaded)
|
||||
{
|
||||
StatusMessage = "Select an existing post before managing ACL.";
|
||||
return;
|
||||
await RefreshAsync();
|
||||
IsLoaded = true;
|
||||
}
|
||||
await ((App)App.Current!).PushPageAsync(GetACLViewModel(SelectedPost)).ConfigureAwait(true);
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
public async Task OpenCircles()
|
||||
{
|
||||
var circlesVm = ResolveServices().GetRequiredService<CirclesPageViewModel>();
|
||||
await ((App)App.Current!).PushPageAsync(circlesVm).ConfigureAwait(true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Threading.Tasks;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
|
|
@ -8,9 +10,17 @@ using Yavsc.Blogspot;
|
|||
using Yavsc.Api.Client;
|
||||
using Yavsc.Api.Client.Dtos;
|
||||
using Yavsc.Abstract.BlogSpot;
|
||||
using Yavsc.Abstract.Identity.Security;
|
||||
using System.Net.Http;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public sealed class PostAclEntry
|
||||
{
|
||||
public long CircleId { get; init; }
|
||||
public string CircleName { get; init; } = string.Empty;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// View model for the "Gérer l'ACL" modal of a single blog post.
|
||||
///
|
||||
|
|
@ -41,7 +51,7 @@ public partial class PostAclDialogViewModel : ViewModelBase
|
|||
MyCircles { get; set; } = new();
|
||||
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<PostAccessControlRulePayload>
|
||||
public partial ObservableCollection<PostAclEntry>
|
||||
AclEntries { get; set; } = new();
|
||||
|
||||
[ObservableProperty]
|
||||
|
|
@ -77,6 +87,9 @@ public partial class PostAclDialogViewModel : ViewModelBase
|
|||
Post = post ?? throw new ArgumentNullException(nameof(post));
|
||||
_aclClient = aclClient ?? throw new ArgumentNullException(nameof(aclClient));
|
||||
_circleClient = circleClient ?? throw new ArgumentNullException(nameof(circleClient));
|
||||
|
||||
AclEntries = new ObservableCollection<PostAclEntry>(post.GetACL().Select(a => ToAclEntry(a.CircleId)));
|
||||
SelectedCircleToAdd = null;
|
||||
}
|
||||
|
||||
public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
|
||||
|
|
@ -90,16 +103,17 @@ public partial class PostAclDialogViewModel : ViewModelBase
|
|||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
// Load circles and ACL entries in parallel — both are
|
||||
// independent reads on the same host. The caller's uid
|
||||
// is implicit in both endpoints.
|
||||
// Load circles for the picker. ACL entries come from the
|
||||
// BlogPostDto detail payload (source of truth for initial state).
|
||||
var circlesTask = _circleClient.GetMyCirclesAsync();
|
||||
var aclTask = _aclClient.GetMyAclAsync();
|
||||
await Task.WhenAll(circlesTask, aclTask);
|
||||
await Task.WhenAll(circlesTask);
|
||||
|
||||
var circles = circlesTask.Result ?? new List<CircleDto>();
|
||||
MyCircles = new ObservableCollection<CircleDto>(circles);
|
||||
|
||||
// Resolve labels now that circles are available.
|
||||
AclEntries = new ObservableCollection<PostAclEntry>(AclEntries.Select(a => ToAclEntry(a.CircleId)));
|
||||
|
||||
|
||||
StatusMessage = $"{AclEntries.Count} autorisation(s)";
|
||||
_loaded = true;
|
||||
|
|
@ -126,14 +140,20 @@ public partial class PostAclDialogViewModel : ViewModelBase
|
|||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
var created = await _aclClient.GrantAsync(new Yavsc.Abstract.BlogSpot.PostAccessControlRulePayload
|
||||
if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id))
|
||||
{
|
||||
StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
|
||||
return;
|
||||
}
|
||||
|
||||
var created = await _aclClient.GrantAsync(new PostAccessControlRulePayload
|
||||
{
|
||||
CircleId = SelectedCircleToAdd.Id,
|
||||
BlogPostId = Post.Id
|
||||
});
|
||||
if (created is not null)
|
||||
{
|
||||
AclEntries.Add(created);
|
||||
AclEntries.Add(ToAclEntry(created.CircleId));
|
||||
StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé";
|
||||
}
|
||||
else
|
||||
|
|
@ -141,6 +161,13 @@ public partial class PostAclDialogViewModel : ViewModelBase
|
|||
StatusMessage = "Autorisation refusée par le serveur";
|
||||
}
|
||||
}
|
||||
catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Conflict)
|
||||
{
|
||||
// Conflict means the link already exists in backend. Resync
|
||||
// from the dedicated ACL API so the UI reflects server truth.
|
||||
await ReloadAclEntriesFromServerAsync();
|
||||
StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
StatusMessage = $"Erreur: {ex.Message}";
|
||||
|
|
@ -152,14 +179,16 @@ public partial class PostAclDialogViewModel : ViewModelBase
|
|||
}
|
||||
|
||||
[RelayCommand]
|
||||
public async Task RevokeAsync(PostAccessControlRulePayload? acl)
|
||||
public async Task RevokeAsync(PostAclEntry? acl)
|
||||
{
|
||||
if (acl is null) return;
|
||||
IsBusy = true;
|
||||
try
|
||||
{
|
||||
await _aclClient.RevokeAsync(acl.CircleId);
|
||||
AclEntries.Remove(acl);
|
||||
var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId);
|
||||
if (existing is not null)
|
||||
AclEntries.Remove(existing);
|
||||
StatusMessage = "Autorisation révoquée";
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
@ -171,4 +200,26 @@ public partial class PostAclDialogViewModel : ViewModelBase
|
|||
IsBusy = false;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ReloadAclEntriesFromServerAsync()
|
||||
{
|
||||
var allAcl = await _aclClient.GetMyAclAsync();
|
||||
var currentPostAcl = (allAcl ?? new List<PostAccessControlRulePayload>())
|
||||
.Where(a => a.BlogPostId == Post.Id)
|
||||
.Select(a => ToAclEntry(a.CircleId))
|
||||
.GroupBy(a => a.CircleId)
|
||||
.Select(g => g.First())
|
||||
.ToList();
|
||||
AclEntries = new ObservableCollection<PostAclEntry>(currentPostAcl);
|
||||
}
|
||||
|
||||
private PostAclEntry ToAclEntry(long circleId)
|
||||
{
|
||||
var circleName = MyCircles.FirstOrDefault(c => c.Id == circleId)?.Name;
|
||||
return new PostAclEntry
|
||||
{
|
||||
CircleId = circleId,
|
||||
CircleName = string.IsNullOrWhiteSpace(circleName) ? $"Cercle #{circleId}" : circleName
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
10
src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs
Normal file
10
src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
using System.Threading.Tasks;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public abstract class RemoteViewModelBase : ViewModelBase
|
||||
{
|
||||
public abstract Task LoadAsync();
|
||||
|
||||
|
||||
}
|
||||
22
src/PostIt/PostIt/ViewModels/SelectableHairPrestationItem.cs
Normal file
22
src/PostIt/PostIt/ViewModels/SelectableHairPrestationItem.cs
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Yavsc.Models.Haircut;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public partial class SelectableHairPrestationItem : ObservableObject
|
||||
{
|
||||
public long Id { get; init; }
|
||||
public string Title { get; init; } = string.Empty;
|
||||
public string Details { get; init; } = string.Empty;
|
||||
|
||||
[ObservableProperty]
|
||||
public partial bool IsSelected { get; set; }
|
||||
|
||||
public static SelectableHairPrestationItem FromDto(HairPrestationDto dto)
|
||||
=> new()
|
||||
{
|
||||
Id = dto.Id,
|
||||
Title = dto.Title,
|
||||
Details = dto.Details,
|
||||
};
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@ public partial class AuthenticationSettings : ObservableObject
|
|||
/// hand-off in <see cref="PostIt.Services.SingleInstance"/>
|
||||
/// (RFC 8252 §7.1). Production Desktop builds use this.
|
||||
/// </summary>
|
||||
public const string DefaultDesktopRedirectUri = "postit://callback";
|
||||
public const string DesktopRedirectUri = "postit://callback";
|
||||
|
||||
/// <summary>
|
||||
/// Redirect URI used by the Android app. The corresponding IntentFilter
|
||||
|
|
@ -18,11 +18,11 @@ public partial class AuthenticationSettings : ObservableObject
|
|||
/// </summary>
|
||||
public const string AndroidRedirectUri = "android://postit-signin";
|
||||
|
||||
public static string DefaultAuthority { get; internal set; } = "https://yavsc.pschneider.fr";
|
||||
public const string DefaultAuthority = "https://yavsc.pschneider.fr";
|
||||
|
||||
public static string DefaultClientId { get; internal set; } = "postit";
|
||||
public const string DefaultClientId = "postit";
|
||||
|
||||
public static string[] DefaultScopes { get; set; } = { "blogs"} ;
|
||||
public static readonly string[] DefaultScopes = { "blogs" };
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string Authority { get; set; }
|
||||
|
|
@ -34,15 +34,19 @@ public partial class AuthenticationSettings : ObservableObject
|
|||
[ObservableProperty]
|
||||
public partial string[] Scopes { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// OAuth redirect URI. Defaults to <see cref="DefaultDesktopRedirectUri"/>
|
||||
/// OAuth redirect URI. Defaults to <see cref="DesktopRedirectUri"/>
|
||||
/// (custom URI scheme) which is the right answer for desktop
|
||||
/// production builds. Mobile platforms must set this to
|
||||
/// <see cref="AndroidRedirectUri"/> before calling <c>LoginAsync</c>.
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
public partial string RedirectUri { get; set; } = DefaultDesktopRedirectUri;
|
||||
public partial string RedirectUri { get; set; }
|
||||
#if ANDROID
|
||||
= AndroidRedirectUri;
|
||||
#else
|
||||
= DesktopRedirectUri;
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// Space-separated view of <see cref="Scopes"/>. Exists for the
|
||||
|
|
@ -2,13 +2,11 @@ using System.Runtime.CompilerServices;
|
|||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using IdentityModel.OidcClient;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
|
||||
[assembly: InternalsVisibleTo("PostIt.Tests")]
|
||||
|
||||
|
|
@ -18,37 +16,6 @@ public partial class Settings : ViewModelBase
|
|||
{
|
||||
const string SettingsFileName = "postit-settings.json";
|
||||
|
||||
/// <summary>
|
||||
/// Redirect URI used by the Android app. The corresponding IntentFilter
|
||||
/// in <c>PostIt.Android/Properties/AndroidManifest.xml</c> must match.
|
||||
/// </summary>
|
||||
public const string AndroidRedirectUri = "android://postit-signin";
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Process-wide canonical <see cref="Settings"/> instance, wired up
|
||||
/// at application boot by <see cref="App.OnFrameworkInitializationCompleted"/>
|
||||
/// through <see cref="BindToServiceProvider"/>. The hybrid pattern:
|
||||
/// <list type="bullet">
|
||||
/// <item><description>The static <c>Current</c> reference gives
|
||||
/// ViewModels a non-DI way to reach the same instance (and lets
|
||||
/// the framework bindings push notifications through one stable
|
||||
/// <see cref="ObservableObject"/>).</description></item>
|
||||
/// <item><description>Tests that want to exercise a clean
|
||||
/// instance still call <c>new Settings()</c>; <c>Current</c>
|
||||
/// stays null in those contexts because <see cref="BindToServiceProvider"/>
|
||||
/// is never invoked.</description></item>
|
||||
/// <item><description>Reads (<see cref="GetCurrent"/>) are
|
||||
/// thread-safe and never allocate; mutations always go through
|
||||
/// the DI-resolved singleton so two threads cannot each register
|
||||
/// a different "current" Settings.</description></item>
|
||||
/// </list>
|
||||
/// </summary>
|
||||
private static Settings? s_current;
|
||||
|
||||
|
||||
|
||||
[ObservableProperty]
|
||||
public partial AuthenticationSettings Authentication { get; set; } = new();
|
||||
|
||||
|
|
@ -59,14 +26,17 @@ public partial class Settings : ViewModelBase
|
|||
public partial string BlogsApiUrl { get; set; } = "https://blogs.pschneider.fr/api/v1/";
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string BusinessApiUrl { get; set; } = "https://business.pschneider.fr/api/v1/";
|
||||
public partial string ApiUrl { get; set; } = "https://api.pschneider.fr/api/v1/";
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string SearchText { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Catch top-level mutations: the four ObservableProperty
|
||||
/// setters above all funnel through here, and we flip
|
||||
/// <see cref="IsDirty"/> in lock-step. Sub-property mutations
|
||||
/// (e.g. <c>Authentication.Authority</c>) are caught by the
|
||||
/// subscription wired up in
|
||||
/// subscription wired up in
|
||||
/// below. <see cref="ApplyJson"/> disables the flag during bulk
|
||||
/// hydration so the disk load itself does not count as a user
|
||||
/// edit.
|
||||
|
|
@ -75,7 +45,8 @@ public partial class Settings : ViewModelBase
|
|||
|
||||
partial void OnDarkModeChanged(bool value) => MarkDirty();
|
||||
partial void OnBlogsApiUrlChanged(string value) => MarkDirty();
|
||||
partial void OnBusinessApiUrlChanged(string value) => MarkDirty();
|
||||
partial void OnApiUrlChanged(string value) => MarkDirty();
|
||||
partial void OnSearchTextChanged(string value) => MarkDirty();
|
||||
|
||||
/// <summary>
|
||||
/// Authentication can be reassigned wholesale by
|
||||
|
|
@ -183,7 +154,10 @@ public partial class Settings : ViewModelBase
|
|||
{
|
||||
"openid", // OIDC: required for the id_token
|
||||
"profile", // OIDC: standard profile claims
|
||||
"offline_access" // OIDC: required to receive a refresh_token
|
||||
"offline_access", // OIDC: required to receive a refresh_token
|
||||
"blogs",
|
||||
"api"
|
||||
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -326,8 +300,16 @@ public partial class Settings : ViewModelBase
|
|||
// → our overridden dispatcher-safe marshaller below.
|
||||
else lock (_mutationGate)
|
||||
{
|
||||
var legacyApiUrl = TryReadLegacyApiUrl(json);
|
||||
this.Authentication = settings.Authentication;
|
||||
this.DarkMode = settings.DarkMode;
|
||||
this.BlogsApiUrl = !string.IsNullOrWhiteSpace(settings.BlogsApiUrl)
|
||||
? settings.BlogsApiUrl
|
||||
: legacyApiUrl ?? this.BlogsApiUrl;
|
||||
this.ApiUrl = !string.IsNullOrWhiteSpace(settings.ApiUrl)
|
||||
? settings.ApiUrl
|
||||
: this.ApiUrl;
|
||||
this.SearchText = settings.SearchText ?? string.Empty;
|
||||
if (!(settings.Authentication is null))
|
||||
{
|
||||
this.Authentication = new AuthenticationSettings();
|
||||
|
|
@ -336,13 +318,13 @@ public partial class Settings : ViewModelBase
|
|||
this.Authentication.ClientId = string.IsNullOrWhiteSpace(settings.Authentication.ClientId) ?
|
||||
AuthenticationSettings.DefaultClientId : settings.Authentication.ClientId;
|
||||
this.Authentication.RedirectUri = string.IsNullOrWhiteSpace(settings.Authentication.RedirectUri) ?
|
||||
AuthenticationSettings.DefaultDesktopRedirectUri : settings.Authentication.RedirectUri;
|
||||
AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
|
||||
if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
|
||||
{
|
||||
settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
|
||||
}
|
||||
else
|
||||
this.Authentication.Scopes = settings.Authentication.Scopes;
|
||||
this.Authentication.Scopes = settings.Authentication.Scopes;
|
||||
}
|
||||
}
|
||||
// A disk load (or an embedded-resource fallback) is the
|
||||
|
|
@ -371,16 +353,39 @@ public partial class Settings : ViewModelBase
|
|||
}
|
||||
}
|
||||
|
||||
private static string? TryReadLegacyApiUrl(string json)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
if (doc.RootElement.TryGetProperty("ApiUrl", out var apiUrl)
|
||||
&& apiUrl.ValueKind == JsonValueKind.String)
|
||||
{
|
||||
return apiUrl.GetString();
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Ignore legacy payload parse errors: normal deserialization
|
||||
// already reports actionable diagnostics to the caller.
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private void UseDefaultSettings()
|
||||
{
|
||||
this.Authentication = new AuthenticationSettings
|
||||
{
|
||||
Authority = AuthenticationSettings.DefaultAuthority,
|
||||
ClientId = AuthenticationSettings.DefaultClientId,
|
||||
RedirectUri = AuthenticationSettings.DefaultDesktopRedirectUri,
|
||||
RedirectUri = AuthenticationSettings.DesktopRedirectUri,
|
||||
Scopes = AuthenticationSettings.DefaultScopes
|
||||
};
|
||||
this.DarkMode = false;
|
||||
this.BlogsApiUrl = "https://blogs.pschneider.fr/api/v1/";
|
||||
this.ApiUrl = "https://api.pschneider.fr/api/v1/";
|
||||
this.SearchText = string.Empty;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
|
||||
namespace PostIt.ViewModels;
|
||||
|
||||
public abstract partial class ViewModelBase : ObservableObject
|
||||
public abstract class ViewModelBase : ObservableObject
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets if the user can navigate to the next page
|
||||
|
|
|
|||
147
src/PostIt/PostIt/Views/ActivitiesPage.axaml
Normal file
147
src/PostIt/PostIt/Views/ActivitiesPage.axaml
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
<ContentPage xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:vm="using:PostIt.ViewModels"
|
||||
xmlns:wf="using:Yavsc.Abstract.Workflow"
|
||||
x:Class="PostIt.Views.ActivitiesPage"
|
||||
x:DataType="vm:ActivitiesPageViewModel"
|
||||
Header="Activités">
|
||||
<Grid RowDefinitions="Auto,*,Auto" Margin="12">
|
||||
<Grid.Styles>
|
||||
<Style Selector="Border.user-badge">
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="CornerRadius" Value="6" />
|
||||
<Setter Property="Padding" Value="5,0" />
|
||||
<Setter Property="MinHeight" Value="16" />
|
||||
</Style>
|
||||
<Style Selector="TextBlock.user-badge-text">
|
||||
<Setter Property="FontSize" Value="9" />
|
||||
<Setter Property="FontWeight" Value="SemiBold" />
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
</Style>
|
||||
</Grid.Styles>
|
||||
|
||||
<StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="8">
|
||||
<Button Content="🗘 Rafraîchir" Command="{Binding RefreshCommand}" />
|
||||
<TextBlock Text="📑 Catalogue des activités" FontWeight="Bold" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
|
||||
<Grid Grid.Row="1" Margin="0,12,0,12" ColumnDefinitions="*,16,*,16,*">
|
||||
<Grid Grid.Column="0" RowDefinitions="Auto,*">
|
||||
<TextBlock Grid.Row="0" Text="Activités" FontWeight="Bold" Margin="0,0,0,8" />
|
||||
<ListBox Grid.Row="1"
|
||||
ItemsSource="{Binding Activities}"
|
||||
SelectedItem="{Binding SelectedActivity, Mode=TwoWay}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="wf:ActivityInfo">
|
||||
<StackPanel Spacing="2" Margin="0,0,0,8">
|
||||
<TextBlock Text="{Binding Name}" FontWeight="Bold" />
|
||||
<TextBlock Text="{Binding Description}" TextWrapping="Wrap" FontSize="11" Opacity="0.7" />
|
||||
<TextBlock Text="{Binding PerformerCount, StringFormat='Utilisateurs: {0}'}"
|
||||
FontSize="11" Opacity="0.6" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Column="2" RowDefinitions="Auto,Auto,*">
|
||||
<TextBlock Grid.Row="0" Text="Spécialisations" FontWeight="Bold" Margin="0,0,0,8" />
|
||||
<TextBlock Grid.Row="1"
|
||||
Text="{Binding SelectedActivityLabel, StringFormat='Pour : {0}'}"
|
||||
FontSize="11" Opacity="0.7" Margin="0,0,0,8" />
|
||||
<ListBox Grid.Row="2"
|
||||
ItemsSource="{Binding Specializations}"
|
||||
SelectedItem="{Binding SelectedSpecialization, Mode=TwoWay}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="wf:ActivityInfo">
|
||||
<StackPanel Spacing="2" Margin="0,0,0,8">
|
||||
<TextBlock Text="{Binding Name}" FontWeight="Bold" />
|
||||
<TextBlock Text="{Binding Description}" TextWrapping="Wrap" FontSize="11" Opacity="0.7" />
|
||||
<TextBlock Text="{Binding PerformerCount, StringFormat='Utilisateurs: {0}'}"
|
||||
FontSize="11" Opacity="0.6" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Column="4" RowDefinitions="Auto,Auto,*,Auto">
|
||||
<TextBlock Grid.Row="0" Text="Utilisateurs" FontWeight="Bold" Margin="0,0,0,8" />
|
||||
<TextBlock Grid.Row="1"
|
||||
Text="{Binding CurrentActivityLabel, StringFormat='Activité affichée : {0}'}"
|
||||
FontSize="11" Opacity="0.7" Margin="0,0,0,8" />
|
||||
<ListBox Grid.Row="2"
|
||||
ItemsSource="{Binding Performers}"
|
||||
SelectedItem="{Binding SelectedPerformer, Mode=TwoWay}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:ActivityUserDisplayItem">
|
||||
<StackPanel Spacing="2" Margin="0,0,0,8">
|
||||
<StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
|
||||
<Border Width="24"
|
||||
Height="24"
|
||||
CornerRadius="12"
|
||||
ClipToBounds="True"
|
||||
Background="#E9ECEF">
|
||||
<Grid>
|
||||
<TextBlock Text="{Binding AvatarFallbackLabel}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#495057" />
|
||||
<Image Source="{Binding AvatarImage}"
|
||||
Width="24"
|
||||
Height="24"
|
||||
Stretch="UniformToFill" />
|
||||
</Grid>
|
||||
</Border>
|
||||
<TextBlock Text="{Binding UserName}" FontWeight="Bold" />
|
||||
<Border IsVisible="{Binding HasPerformerProfile}"
|
||||
Classes="user-badge"
|
||||
Background="#D9F5E5"
|
||||
BorderBrush="#2E7D32"
|
||||
>
|
||||
<TextBlock Text="{Binding PerformerBadgeLabel}"
|
||||
Classes="user-badge-text"
|
||||
Foreground="#1B5E20"
|
||||
/>
|
||||
</Border>
|
||||
<Border IsVisible="{Binding HasPerformerProfile}"
|
||||
Classes="user-badge"
|
||||
Background="{Binding PerformerStatusBadgeBackground}"
|
||||
BorderBrush="{Binding PerformerStatusBadgeBorder}"
|
||||
>
|
||||
<TextBlock Text="{Binding PerformerStatusBadgeLabel}"
|
||||
Classes="user-badge-text"
|
||||
Foreground="{Binding PerformerStatusBadgeForeground}"
|
||||
/>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
<TextBlock Text="{Binding WebSite}" FontSize="11" Opacity="0.7" />
|
||||
<TextBlock Text="{Binding ExtraActivityLabel}"
|
||||
FontSize="11" Opacity="0.6" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
<Button Grid.Row="3"
|
||||
Margin="0,8,0,0"
|
||||
Content="Voir les formulaires"
|
||||
Command="{Binding OpenCommandFormsCommand}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
<Grid Grid.Row="2" ColumnDefinitions="*,Auto">
|
||||
<TextBox Grid.Column="0"
|
||||
Text="{Binding StatusMessage}"
|
||||
IsReadOnly="True"
|
||||
AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
BorderThickness="0"
|
||||
BorderBrush="Transparent"
|
||||
Padding="0"
|
||||
Background="Transparent"
|
||||
VerticalAlignment="Center" />
|
||||
<ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ContentPage>
|
||||
17
src/PostIt/PostIt/Views/ActivitiesPage.axaml.cs
Normal file
17
src/PostIt/PostIt/Views/ActivitiesPage.axaml.cs
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace PostIt.Views;
|
||||
|
||||
public partial class ActivitiesPage : ContentPage
|
||||
{
|
||||
public ActivitiesPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
AvaloniaXamlLoader.Load(this);
|
||||
}
|
||||
}
|
||||
52
src/PostIt/PostIt/Views/BillingQueriesPage.axaml
Normal file
52
src/PostIt/PostIt/Views/BillingQueriesPage.axaml
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
<ContentPage xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:vm="using:PostIt.ViewModels"
|
||||
x:Class="PostIt.Views.BillingQueriesPage"
|
||||
x:DataType="vm:BillingQueriesPageViewModel"
|
||||
Header="Commandes billing">
|
||||
<Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
|
||||
<StackPanel Grid.Row="0" Spacing="2">
|
||||
<TextBlock Text="{Binding Title}" FontSize="18" FontWeight="Bold" />
|
||||
<TextBlock Text="{Binding ContextLabel}" Opacity="0.75" />
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8" Margin="0,12,0,12">
|
||||
<Button Content="Rafraîchir" Command="{Binding RefreshCommand}" />
|
||||
<Button Content="Ouvrir la commande"
|
||||
Command="{Binding OpenSelectedQueryCommand}"
|
||||
IsVisible="{Binding CanOpenDetails}" />
|
||||
</StackPanel>
|
||||
|
||||
<ListBox Grid.Row="2" ItemsSource="{Binding Queries}" SelectedItem="{Binding SelectedQuery, Mode=TwoWay}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:BillingQueryDisplayItem">
|
||||
<Border BorderThickness="0,0,0,1" BorderBrush="#22000000" Padding="0,0,0,10" Margin="0,0,0,10">
|
||||
<StackPanel Spacing="3">
|
||||
<TextBlock Text="{Binding Description}" FontWeight="Bold" />
|
||||
<TextBlock Text="{Binding Summary}" TextWrapping="Wrap" FontSize="12" Opacity="0.8" />
|
||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||
<TextBlock Text="{Binding EventDateLabel}" FontSize="11" Opacity="0.7" />
|
||||
<TextBlock Text="{Binding StatusLabel}" FontSize="11" Opacity="0.7" />
|
||||
<TextBlock Text="{Binding BillingCode}" FontSize="11" Opacity="0.6" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
|
||||
<Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="0,12,0,0">
|
||||
<TextBox Grid.Column="0"
|
||||
Text="{Binding StatusMessage}"
|
||||
IsReadOnly="True"
|
||||
AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
BorderThickness="0"
|
||||
BorderBrush="Transparent"
|
||||
Padding="0"
|
||||
Background="Transparent"
|
||||
VerticalAlignment="Center" />
|
||||
<ProgressBar Grid.Column="1" Width="120" IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ContentPage>
|
||||
17
src/PostIt/PostIt/Views/BillingQueriesPage.axaml.cs
Normal file
17
src/PostIt/PostIt/Views/BillingQueriesPage.axaml.cs
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace PostIt.Views;
|
||||
|
||||
public partial class BillingQueriesPage : ContentPage
|
||||
{
|
||||
public BillingQueriesPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
AvaloniaXamlLoader.Load(this);
|
||||
}
|
||||
}
|
||||
56
src/PostIt/PostIt/Views/CommandFormsPage.axaml
Normal file
56
src/PostIt/PostIt/Views/CommandFormsPage.axaml
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
<ContentPage xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:vm="using:PostIt.ViewModels"
|
||||
xmlns:wf="using:Yavsc.Abstract.Workflow"
|
||||
x:Class="PostIt.Views.CommandFormsPage"
|
||||
x:DataType="vm:CommandFormsPageViewModel"
|
||||
Header="Formulaires">
|
||||
<Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
|
||||
<TextBlock Grid.Row="0"
|
||||
Text="{Binding Title}"
|
||||
FontSize="18"
|
||||
FontWeight="Bold" />
|
||||
|
||||
<TextBlock Grid.Row="1"
|
||||
Margin="0,4,0,12"
|
||||
Text="{Binding ContextLabel}"
|
||||
Opacity="0.75" />
|
||||
|
||||
<ListBox Grid.Row="2"
|
||||
ItemsSource="{Binding Forms}"
|
||||
SelectedItem="{Binding SelectedForm, Mode=TwoWay}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate x:DataType="wf:CommandFormSummary">
|
||||
<StackPanel Spacing="2" Margin="0,0,0,10">
|
||||
<TextBlock Text="{Binding Title}" FontWeight="Bold" />
|
||||
<TextBlock Text="{Binding ActionName, StringFormat='Route billing : /billing/{0}'}"
|
||||
FontSize="11"
|
||||
Opacity="0.7" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
|
||||
<Grid Grid.Row="3" Margin="0,12,0,0" ColumnDefinitions="Auto,8,Auto,8,Auto,12,*">
|
||||
<Button Grid.Column="0"
|
||||
Content="Ouvrir le formulaire"
|
||||
Command="{Binding OpenSelectedFormCommand}" />
|
||||
<Button Grid.Column="2"
|
||||
Content="Voir les commandes"
|
||||
Command="{Binding OpenQueriesCommand}" />
|
||||
<Button Grid.Column="4"
|
||||
Content="Demandes en cours (lecture seule)"
|
||||
Command="{Binding OpenOngoingQueriesCommand}" />
|
||||
<TextBox Grid.Column="6"
|
||||
Text="{Binding StatusMessage}"
|
||||
IsReadOnly="True"
|
||||
AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
BorderThickness="0"
|
||||
BorderBrush="Transparent"
|
||||
Padding="0"
|
||||
Background="Transparent"
|
||||
VerticalAlignment="Center" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ContentPage>
|
||||
17
src/PostIt/PostIt/Views/CommandFormsPage.axaml.cs
Normal file
17
src/PostIt/PostIt/Views/CommandFormsPage.axaml.cs
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace PostIt.Views;
|
||||
|
||||
public partial class CommandFormsPage : ContentPage
|
||||
{
|
||||
public CommandFormsPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
AvaloniaXamlLoader.Load(this);
|
||||
}
|
||||
}
|
||||
113
src/PostIt/PostIt/Views/Commands/BrushPage.axaml
Normal file
113
src/PostIt/PostIt/Views/Commands/BrushPage.axaml
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
<ContentPage xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:cvm="using:PostIt.ViewModels.Commands"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="PostIt.Views.Commands.BrushPage"
|
||||
|
||||
x:DataType="cvm:BrushViewModel"
|
||||
Header="Commande billing">
|
||||
<ScrollViewer>
|
||||
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*" Margin="12">
|
||||
<TextBlock Grid.Row="0" Grid.ColumnSpan="2"
|
||||
Text="{Binding Title}"
|
||||
FontSize="18"
|
||||
FontWeight="Bold" />
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.ColumnSpan="2"
|
||||
Margin="0,4,0,12"
|
||||
Text="{Binding SupportMessage}"
|
||||
TextWrapping="Wrap"
|
||||
Opacity="0.8" />
|
||||
|
||||
<TextBlock Grid.Row="2" Text="Utilisateur" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding PerformerLabel}" IsReadOnly="True" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="3" Text="Activité" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ActivityLabel}" IsReadOnly="True" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="4" Text="Date" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<DatePicker Grid.Row="4" Grid.Column="1" DayFormat="ddd dd" SelectedDate="{Binding EventDate, Mode=TwoWay}" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="5"
|
||||
Text="Motif"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
Text="{Binding Reason, Mode=TwoWay}"
|
||||
Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="6" Text="Adresse" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="6" Grid.Column="1" Text="{Binding Address, Mode=TwoWay}" Margin="0,0,0,8" />
|
||||
|
||||
<Button Grid.Row="7"
|
||||
Grid.ColumnSpan="2"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="0,0,0,8"
|
||||
Content="Utiliser ma position"
|
||||
Command="{Binding UseCurrentLocationCommand}" />
|
||||
|
||||
<TextBlock Grid.Row="8" Text="Latitude" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="8" Grid.Column="1" Text="{Binding Latitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="9" Text="Longitude" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="9" Grid.Column="1" Text="{Binding Longitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="10"
|
||||
Text="Prestation"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,12,8" />
|
||||
<ComboBox Grid.Row="10"
|
||||
Grid.Column="1"
|
||||
ItemsSource="{Binding AvailablePrestations}"
|
||||
SelectedItem="{Binding SelectedPrestation, Mode=TwoWay}"
|
||||
Margin="0,0,0,8">
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel Spacing="2">
|
||||
<TextBlock Text="{Binding Title}" FontWeight="Bold" />
|
||||
<TextBlock Text="{Binding Details}" FontSize="11" Opacity="0.7" TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ComboBox.ItemTemplate>
|
||||
</ComboBox>
|
||||
|
||||
<TextBlock Grid.Row="12"
|
||||
Text="Informations"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="12"
|
||||
Grid.Column="1"
|
||||
Text="{Binding AdditionalInfo, Mode=TwoWay}"
|
||||
Margin="0,0,0,8" />
|
||||
|
||||
<CheckBox Grid.Row="13" Grid.ColumnSpan="2"
|
||||
Content="Je consens à la création de cette commande"
|
||||
IsChecked="{Binding Consent, Mode=TwoWay}"
|
||||
Margin="0,4,0,12" />
|
||||
|
||||
<Grid Grid.Row="14" Grid.ColumnSpan="2" ColumnDefinitions="Auto,12,*,Auto">
|
||||
<Button Grid.Column="0"
|
||||
Content="{Binding SubmitLabel}"
|
||||
Command="{Binding SubmitCommand}"
|
||||
IsEnabled="{Binding IsSupported}" />
|
||||
<TextBox Grid.Column="2"
|
||||
Text="{Binding StatusMessage}"
|
||||
IsReadOnly="True"
|
||||
AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
BorderThickness="0"
|
||||
BorderBrush="Transparent"
|
||||
Padding="0"
|
||||
Background="Transparent"
|
||||
VerticalAlignment="Center" />
|
||||
<ProgressBar Grid.Column="3"
|
||||
Width="120"
|
||||
IsIndeterminate="True"
|
||||
IsVisible="{Binding IsBusy}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</ContentPage>
|
||||
13
src/PostIt/PostIt/Views/Commands/BrushPage.axaml.cs
Normal file
13
src/PostIt/PostIt/Views/Commands/BrushPage.axaml.cs
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace PostIt.Views.Commands;
|
||||
|
||||
public partial class BrushPage : ContentPage
|
||||
{
|
||||
public BrushPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
91
src/PostIt/PostIt/Views/Commands/RdvPage.axaml
Normal file
91
src/PostIt/PostIt/Views/Commands/RdvPage.axaml
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
<ContentPage xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:cvm="using:PostIt.ViewModels.Commands"
|
||||
x:Class="PostIt.Views.Commands.RdvPage"
|
||||
x:DataType="cvm:RdvViewModel"
|
||||
Header="Commande billing">
|
||||
<ScrollViewer>
|
||||
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*" Margin="12">
|
||||
<TextBlock Grid.Row="0" Grid.ColumnSpan="2"
|
||||
Text="{Binding Title}"
|
||||
FontSize="18"
|
||||
FontWeight="Bold" />
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.ColumnSpan="2"
|
||||
Margin="0,4,0,12"
|
||||
Text="{Binding SupportMessage}"
|
||||
TextWrapping="Wrap"
|
||||
Opacity="0.8" />
|
||||
|
||||
<TextBlock Grid.Row="2" Text="Utilisateur" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding PerformerLabel}" IsReadOnly="True" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="3" Text="Activité" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ActivityLabel}" IsReadOnly="True" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="4" Text="Date" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<DatePicker Grid.Row="4" Grid.Column="1" DayFormat="ddd dd" SelectedDate="{Binding EventDate, Mode=TwoWay}" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="5"
|
||||
Text="Motif"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
Text="{Binding Reason, Mode=TwoWay}"
|
||||
Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="6" Text="Adresse" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="6" Grid.Column="1" Text="{Binding Address, Mode=TwoWay}" Margin="0,0,0,8" />
|
||||
|
||||
<Button Grid.Row="7"
|
||||
Grid.ColumnSpan="2"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="0,0,0,8"
|
||||
Content="Utiliser ma position"
|
||||
Command="{Binding UseCurrentLocationCommand}" />
|
||||
|
||||
<TextBlock Grid.Row="8" Text="Latitude" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="8" Grid.Column="1" Text="{Binding Latitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
|
||||
|
||||
<TextBlock Grid.Row="9" Text="Longitude" VerticalAlignment="Center" Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="9" Grid.Column="1" Text="{Binding Longitude, Mode=TwoWay}" PlaceholderText="Optionnel" Margin="0,0,0,8" />
|
||||
|
||||
|
||||
<TextBlock Grid.Row="12"
|
||||
Text="Informations"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,12,8" />
|
||||
<TextBox Grid.Row="12"
|
||||
Grid.Column="1"
|
||||
Text="{Binding AdditionalInfo, Mode=TwoWay}"
|
||||
Margin="0,0,0,8" />
|
||||
|
||||
<CheckBox Grid.Row="13" Grid.ColumnSpan="2"
|
||||
Content="Je consens à la création de cette commande"
|
||||
IsChecked="{Binding Consent, Mode=TwoWay}"
|
||||
Margin="0,4,0,12" />
|
||||
|
||||
<Grid Grid.Row="14" Grid.ColumnSpan="2" ColumnDefinitions="Auto,12,*,Auto">
|
||||
<Button Grid.Column="0"
|
||||
Content="{Binding SubmitLabel}"
|
||||
Command="{Binding SubmitCommand}"
|
||||
IsEnabled="{Binding IsSupported}" />
|
||||
<TextBox Grid.Column="2"
|
||||
Text="{Binding StatusMessage}"
|
||||
IsReadOnly="True"
|
||||
AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
BorderThickness="0"
|
||||
BorderBrush="Transparent"
|
||||
Padding="0"
|
||||
Background="Transparent"
|
||||
VerticalAlignment="Center" />
|
||||
<ProgressBar Grid.Column="3"
|
||||
Width="120"
|
||||
IsIndeterminate="True"
|
||||
IsVisible="{Binding IsBusy}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</ContentPage>
|
||||
17
src/PostIt/PostIt/Views/Commands/RdvPage.axaml.cs
Normal file
17
src/PostIt/PostIt/Views/Commands/RdvPage.axaml.cs
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace PostIt.Views.Commands;
|
||||
|
||||
public partial class RdvPage : ContentPage
|
||||
{
|
||||
public RdvPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
AvaloniaXamlLoader.Load(this);
|
||||
}
|
||||
}
|
||||
|
|
@ -18,5 +18,9 @@
|
|||
Command="{Binding OpenBlogs}"
|
||||
HorizontalAlignment="Center"
|
||||
IsEnabled="{Binding SessionStatus.IsLoggedIn}"/>
|
||||
<Button Content="Parcourir les activités"
|
||||
Command="{Binding OpenActivities}"
|
||||
HorizontalAlignment="Center"
|
||||
IsEnabled="{Binding SessionStatus.IsLoggedIn}"/>
|
||||
</StackPanel>
|
||||
</ContentPage>
|
||||
|
|
|
|||
|
|
@ -24,20 +24,20 @@
|
|||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<StackPanel Grid.Row="0" Spacing="12"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Top">
|
||||
|
||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||
<Button Command="{Binding LoadPosts}" Content="Load posts" />
|
||||
<Button Command="{Binding Search}" Content="Filter" />
|
||||
<Button Command="{Binding Save}" Content="Save" />
|
||||
<Button Command="{Binding Delete}" Content="Delete" />
|
||||
<Border Grid.Row="0"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Top"
|
||||
Padding="0">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<Button Command="{Binding RefreshAsync}" Content="🗘 Refresh" />
|
||||
<Button Command="{Binding SearchAsync}" Content="🔍 Filter" />
|
||||
<Button Command="{Binding SaveAsync}" Content="Save" />
|
||||
<Button Command="{Binding DeleteAsync}" Content="Delete" />
|
||||
<Button x:Name="ManageAclButton"
|
||||
Command="{Binding ManageAcl}"
|
||||
Command="{Binding ManageAclAsync}"
|
||||
Content="ACL" />
|
||||
<Button x:Name="OpenCirclesButton"
|
||||
Command="{Binding OpenCircles}"
|
||||
Command="{Binding OpenCirclesAsync}"
|
||||
Content="Mes cercles" />
|
||||
<!-- Publication toggle: a CheckBox wired to
|
||||
DraftIsPublished. Clicking it fires
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
and the buffer in sync. -->
|
||||
<CheckBox Content="Publié"
|
||||
IsChecked="{Binding DraftIsPublished, Mode=TwoWay}"
|
||||
Command="{Binding TogglePublishCommand}"
|
||||
Command="{Binding TogglePublishAsync}"
|
||||
VerticalAlignment="Center"/>
|
||||
<!--
|
||||
DEV ONLY: temporary shortcut to open the signature
|
||||
|
|
@ -59,11 +59,11 @@
|
|||
MainPage.axaml.cs once the SignalR handler lands.
|
||||
-->
|
||||
<Button x:Name="OpenSignatureDevButton"
|
||||
Command="{Binding OpenSignatureDev}"
|
||||
Command="{Binding OpenSignatureDevAsync}"
|
||||
Content="[DEV] Signature"
|
||||
ToolTip.Tip="DEV ONLY — to remove when SignalR handler lands" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
|
||||
<Border Grid.Row="1" BorderBrush="Gray" BorderThickness="1" Padding="8">
|
||||
<ListBox ItemsSource="{Binding FilteredPosts}" SelectedItem="{Binding SelectedPost, Mode=TwoWay}"
|
||||
|
|
@ -97,16 +97,15 @@
|
|||
|
||||
<TextBlock Grid.Row="0" Text="Post detail" FontWeight="SemiBold" />
|
||||
<TextBox Grid.Row="1" Text="{Binding DraftTitle, Mode=TwoWay}" PlaceholderText="Title" />
|
||||
<AvaloniaEdit:TextEditor Grid.Row="2"
|
||||
views:TextEditorBinding.Text="{Binding DraftArticle, Mode=TwoWay}"
|
||||
ShowLineNumbers="True"
|
||||
FontFamily="Cascadia Code, Consolas, Menlo, Monospace"
|
||||
MinHeight="320"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
HorizontalScrollBarVisibility="Auto" />
|
||||
<TextBox Grid.Row="2" PlaceholderText="Write something here !"
|
||||
Text="{Binding DraftArticle, Mode=TwoWay}"
|
||||
MinHeight="320"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch">
|
||||
</TextBox>
|
||||
|
||||
<TextBlock Grid.Row="3" Text="{Binding StatusMessage}" Foreground="Gray" />
|
||||
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
using System;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Primitives;
|
||||
|
||||
namespace PostIt.Views;
|
||||
|
||||
|
|
@ -8,4 +10,16 @@ public partial class MainPage : ContentPage
|
|||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
|
||||
{
|
||||
base.OnApplyTemplate(e);
|
||||
if (DataContext is ViewModels.MainViewModel vm)
|
||||
{
|
||||
if (!vm.IsLoaded)
|
||||
{
|
||||
vm.RefreshAsync().Wait();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue