From ef33704cdabc0502fb0cea6924cc1a0bccb4d5e2 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 13 Jul 2026 13:12:33 +0000 Subject: [PATCH 1/4] Add docker-compose-swarm.yml aligned with sibling NRA apps Brings react-admin-nestjs's production Swarm stack in line with event-management-nra, teacher-report-nra, student-report-nra, and dnd-management-nra: client/server services, Caddy labels via caddy-docker-proxy, health checks, and env vars sourced from deployment variables instead of hardcoded values. Also pins Caddy's upstream transport keepalive to 30s so it stays below Node's keepAliveTimeout once nra-server's fix lands. Co-Authored-By: Claude Sonnet 5 --- docker-compose-swarm.yml | 113 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 docker-compose-swarm.yml diff --git a/docker-compose-swarm.yml b/docker-compose-swarm.yml new file mode 100644 index 00000000..825c81e6 --- /dev/null +++ b/docker-compose-swarm.yml @@ -0,0 +1,113 @@ +version: "3.8" + +services: + client: + image: 'ghcr.io/buzz-code/react-admin-nestjs-client:latest' + container_name: client + depends_on: + - server + deploy: + labels: + caddy: $DOMAIN_NAME + caddy.reverse_proxy: '{{upstreams 80}}' + caddy.reverse_proxy.health_uri: '/' + caddy.reverse_proxy.health_interval: 5s + caddy.reverse_proxy.health_timeout: 5s + placement: + constraints: + - node.labels.codeserver != true + - node.labels.listenReport != true + update_config: + parallelism: 1 + delay: 10s + order: start-first + rollback_config: + parallelism: 1 + delay: 5s + restart_policy: + condition: on-failure + delay: 5s + max_attempts: 3 + window: 120s + healthcheck: + test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:80/"] + interval: 30s + timeout: 10s + start_period: 30s + retries: 3 + environment: + PORT: 80 + REACT_APP_API_URL: 'https://api.$DOMAIN_NAME' + # ports: + # - '30003:80' + networks: + - private-network + - caddy + - elknet + + server: + image: 'ghcr.io/buzz-code/react-admin-nestjs-server:latest' + container_name: server + deploy: + labels: + caddy: api.$DOMAIN_NAME + caddy.reverse_proxy: '{{upstreams 3000}}' + caddy.reverse_proxy.health_uri: '/health' + caddy.reverse_proxy.health_interval: 5s + caddy.reverse_proxy.health_timeout: 5s + caddy.reverse_proxy.transport: http + caddy.reverse_proxy.transport.keepalive: 30s + placement: + constraints: + - node.labels.codeserver != true + - node.labels.listenReport != true + update_config: + parallelism: 1 + delay: 10s + order: start-first + rollback_config: + parallelism: 1 + delay: 5s + restart_policy: + condition: on-failure + delay: 5s + max_attempts: 3 + window: 120s + healthcheck: + test: ["CMD", "node", "-e", "require('http').get('http://localhost:3000/health', (r) => process.exit(r.statusCode === 200 ? 0 : 1))"] + interval: 30s + timeout: 10s + start_period: 60s + retries: 3 + labels: + co.elastic.logs/enabled: 'true' + environment: + IP_ADDRESS: $IP_ADDRESS + DOMAIN_NAME: $DOMAIN_NAME + MYSQL_HOST: $MYSQL_HOST + MYSQL_USER: $MYSQL_USER + MYSQL_PASSWORD: $MYSQL_PASSWORD + MYSQL_DATABASE: $MYSQL_DATABASE + JWT_SECRET: $JWT_SECRET + ADMIN_USER: $ADMIN_USER + SMTP_USER: $SMTP_USER + SMTP_PASSWORD: $SMTP_PASSWORD + MAINTENANCE_MODE: $MAINTENANCE_MODE + MAINTENANCE_MESSAGE: $MAINTENANCE_MESSAGE + # ports: + # - '30004:3000' + networks: + - private-network + - backend-network + - caddy + - elknet + + +networks: + private-network: + caddy: + external: true + elknet: + external: true + backend-network: + external: true From 16310b24cb32f2d47cdec269500ba9e1333f577c Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 13 Jul 2026 16:01:09 +0000 Subject: [PATCH 2/4] Bump server/shared to nra-server@7e95d47 Picks up the Node keepAliveTimeout/headersTimeout fix (c0cd9fe) and its CONSUMER_CHANGES.md entry. The corresponding per-app action (Caddy transport.keepalive labels) is already covered by this branch's docker-compose-swarm.yml. The other outstanding CONSUMER_CHANGES.md row (393e9ad, S3Module) was already addressed here previously. Co-Authored-By: Claude Sonnet 5 --- server/shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/shared b/server/shared index 58487d1f..7e95d47a 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 58487d1fa22b99b2bb06683e0d31553670158768 +Subproject commit 7e95d47a4eb1b39bc20c58b7d66a959629127019 From c5f613f9c430064fff61dc85c18afbdd981c1814 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 13 Jul 2026 18:12:46 +0000 Subject: [PATCH 3/4] Bump client/shared and server/shared to latest main client/shared -> nra-client@d852588, server/shared -> nra-server@f556912 (includes the merged keepAliveTimeout fix). No app-side consumer action needed: all rows in both CONSUMER_CHANGES.md tables are already marked done for this app. Co-Authored-By: Claude Sonnet 5 --- client/shared | 2 +- server/shared | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/shared b/client/shared index f6cc42f3..d852588f 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit f6cc42f3fa63b5cfa80a3cb5fe5797b4a33370f6 +Subproject commit d852588fe84c0d264c89ba48fbb146e5b07ad63e diff --git a/server/shared b/server/shared index 7e95d47a..f556912c 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 7e95d47a4eb1b39bc20c58b7d66a959629127019 +Subproject commit f556912c7876be50cc49e8189fc5b22790f2a8cf From a6ecde27e3fe56461a529a6e6a63b48c85133bbd Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 13 Jul 2026 18:21:54 +0000 Subject: [PATCH 4/4] Only call updateProfile when phoneNumber actually changed Avoids an extra network request on every save, and avoids overwriting a saved phone number with an empty string if identity hadn't finished loading when the form's defaultValues were computed. Co-Authored-By: Claude Sonnet 5 --- client/src/settings/Settings.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/settings/Settings.jsx b/client/src/settings/Settings.jsx index 9cd19486..acc7c0b6 100644 --- a/client/src/settings/Settings.jsx +++ b/client/src/settings/Settings.jsx @@ -46,7 +46,9 @@ export default function Settings() { const handleSave = async ({ phoneNumber, ...values }) => { try { await dataProvider.updateSettings({ data: values }); - await dataProvider.updateProfile({ data: { phoneNumber } }); + if (phoneNumber !== (identity?.phoneNumber ?? '')) { + await dataProvider.updateProfile({ data: { phoneNumber } }); + } await authProvider.getIdentity(true); notify('ההגדרות נשמרו בהצלחה', { type: 'info' }); navigate('/');