From 4d885808b85e34a8f45ec307c17b91cac1a01e2f Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Mon, 25 Nov 2024 13:54:38 +0100 Subject: [PATCH 1/5] chore: trigger new deployment From cb6f743b3cd7559786f1a6d77e02244850127538 Mon Sep 17 00:00:00 2001 From: devthejo Date: Mon, 25 Nov 2024 15:28:37 +0100 Subject: [PATCH 2/5] chore: new preprod pg backup dir --- .kontinuous/env/preprod/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml index 968d8919d..0aa7a1b52 100644 --- a/.kontinuous/env/preprod/values.yaml +++ b/.kontinuous/env/preprod/values.yaml @@ -35,7 +35,7 @@ pgweb: pg: backup: - name: "202407291149" # backup on a new folder + name: "1732544897" # backup on a new folder ~tpl~enabled: "true" jobs: @@ -93,16 +93,16 @@ jobs: valueFrom: secretKeyRef: name: "{{.Values.global.s3SecretName}}" - key: bucket_region + key: bucket_region - name: S3_BUCKET_ACCESS_KEY valueFrom: secretKeyRef: name: "{{.Values.global.s3SecretName}}" - key: bucket_access_key + key: bucket_access_key - name: S3_BUCKET_SECRET_KEY valueFrom: secretKeyRef: name: "{{.Values.global.s3SecretName}}" key: bucket_secret_key - name: S3_BUCKET_ROOT_DIR - value: preprod/files \ No newline at end of file + value: preprod/files From 4514f196463ed6da26052ba66f1013587ebb6b42 Mon Sep 17 00:00:00 2001 From: devthejo Date: Mon, 25 Nov 2024 16:22:04 +0100 Subject: [PATCH 3/5] fix: pgweb needs --- .kontinuous/env/preprod/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml index 0aa7a1b52..7ec188aa6 100644 --- a/.kontinuous/env/preprod/values.yaml +++ b/.kontinuous/env/preprod/values.yaml @@ -14,6 +14,7 @@ migrate-s3: pgweb: ~chart: pgweb + ~needs: [pg] pgweb: env: - name: PGWEB_DATABASE_URL From 711bd9e2d0036f164e253598c18b24dfa5d577ff Mon Sep 17 00:00:00 2001 From: Adrien Chauve Date: Thu, 28 Nov 2024 09:29:20 +0100 Subject: [PATCH 4/5] chore: fix docker compose restarts --- docker-compose.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index dee9bcee2..2fad2602f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,6 +5,7 @@ volumes: services: frontend-usagers: image: "node:20.15.1-bullseye-slim" + restart: unless-stopped working_dir: /app command: bash -c "/app/packages/frontend-usagers/start.sh" volumes: @@ -30,6 +31,7 @@ services: frontend-bo: image: "node:20.15.1-bullseye-slim" + restart: unless-stopped working_dir: /app command: bash -c "/app/packages/frontend-bo/start.sh" volumes: @@ -55,6 +57,7 @@ services: backend: image: "node:20.15.1-bullseye-slim" + restart: unless-stopped working_dir: /app command: bash -c "/app/packages/backend/start.sh" volumes: @@ -95,7 +98,7 @@ services: postgres: image: postgres:15.1 - restart: always + restart: unless-stopped environment: - PGTZ=Europe/Paris - NODE_ENV=development @@ -110,19 +113,21 @@ services: - ./pg/scripts:/scripts - ./pg/seeds:/seeds healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: [ "CMD-SHELL", "pg_isready -U postgres" ] interval: 10s timeout: 5s retries: 5 maildev: image: maildev/maildev:2.1.0 + restart: unless-stopped ports: - "1080:1080" - "1025:1025" pghero: image: ankane/pghero + restart: unless-stopped environment: - DATABASE_URL=postgres://${PG_VAO_SUPERUSER}:${PG_VAO_SUPERPASSWORD}@postgres:5432/vao ports: @@ -132,6 +137,7 @@ services: minio: image: minio/minio + restart: unless-stopped volumes: - minio-data:/data ports: From fa60ddfbacb620529d21a72d28a1fcf9837c5b7e Mon Sep 17 00:00:00 2001 From: l-scherer Date: Thu, 5 Dec 2024 14:20:26 +0100 Subject: [PATCH 5/5] fix(personnel): fusager suppr et modif personnel 767 766 --- .../src/components/DS/personnel.vue | 4 +- .../shared/src/components/Table/TableFull.vue | 37 +++++++++++++------ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/packages/frontend-usagers/src/components/DS/personnel.vue b/packages/frontend-usagers/src/components/DS/personnel.vue index f5b9bfd4b..f53761674 100644 --- a/packages/frontend-usagers/src/components/DS/personnel.vue +++ b/packages/frontend-usagers/src/components/DS/personnel.vue @@ -385,11 +385,11 @@ function addPersonne() { modalPersonne.opened = true; } -function editItem(item, index) { +function editItem(item) { log.i("editItem - In", item); if (props.modifiable) { personnel.value = item; - indexCourant.value = index; + indexCourant.value = item.id; modalPersonne.opened = true; } } diff --git a/packages/shared/src/components/Table/TableFull.vue b/packages/shared/src/components/Table/TableFull.vue index 9abdeee58..68ae89961 100644 --- a/packages/shared/src/components/Table/TableFull.vue +++ b/packages/shared/src/components/Table/TableFull.vue @@ -1,15 +1,17 @@ - +