Temporary deploy Dune with dev branch

Update dockerfile to use postgresql version 15
Update Chill to v2.6.0
2025-01-20 12:35:45 +01:00 · 2025-01-08 10:59:41 +01:00 · 2025-01-08 10:35:32 +01:00 · 2024-12-09 12:30:57 +01:00 · 2024-12-09 12:30:08 +01:00 · 2024-11-01 20:12:48 +01:00
28 changed files with 3038 additions and 3792 deletions
--- a/.changes/2.0.0-RC1.md
+++ b/.changes/2.0.0-RC1.md
@@ -0,0 +1,3 @@
+## 2.0.0-RC1 - 2024-07-18
+### Release
+* upgrade to chill-bundles/3.0.0-RC5
--- a/.changes/2.0.0-RC2.md
+++ b/.changes/2.0.0-RC2.md
@@ -0,0 +1,3 @@
+## 2.0.0-RC2 - 2024-07-18
+### Fixed
+* Fix definition of workflow
--- a/.changes/2.0.0-RC3.md
+++ b/.changes/2.0.0-RC3.md
@@ -0,0 +1,9 @@
+## 2.1.0 - 2024-07-23
+### Release
+* Upgrade chill to v3.0.0-RC3
+* upgrade chill-bundle to v3.0.0-RC4
+* Add graylog to image
+* upgrade to chill-bundles/3.0.0-RC5
+* Upgrade chill-bundles to v3.0.0-RC6
+### Fixed
+* Fix definition of workflow
--- a/.changes/2.0.0-RC4.md
+++ b/.changes/2.0.0-RC4.md
@@ -0,0 +1,3 @@
+## 2.2.0 - 2024-07-25
+### Release
+* Update chill-bundles to v3.0.0-RC7
--- a/.changes/2.0.0-RC5.md
+++ b/.changes/2.0.0-RC5.md
@@ -0,0 +1,3 @@
+## 2.1.0 - 2024-07-30
+### Release
+* Update chill-bundles to v3.0.0-RC8
--- a/.changes/2.0.0-RC6.md
+++ b/.changes/2.0.0-RC6.md
@@ -0,0 +1,3 @@
+## 2.1.0 - 2024-08-08
+### Release
+* Update chill-bundles to v3.0.0-RC9
--- a/.changes/2.0.0-alpha1.md
+++ b/.changes/2.0.0-alpha1.md
@@ -1,3 +1,3 @@
 ## 2.0.0-alpha1 - 2024-07-03
 ### Release
-* Upgrade chill to v2.0.0-RC3
+* Upgrade chill to v3.0.0-RC3
--- a/.changes/2.0.0-alpha2.md
+++ b/.changes/2.0.0-alpha2.md
@@ -1,4 +1,3 @@
 ## 2.0.0-alpha2 - 2024-07-03
 ### Release
-* Upgrade chill to v3.0.0-RC3
 * upgrade chill-bundle to v3.0.0-RC4
--- a/.changes/2.0.0-alpha3.md
+++ b/.changes/2.0.0-alpha3.md
@@ -1,5 +1,3 @@
 ## 2.0.0-alpha3 - 2024-07-03
 ### Release
-* Upgrade chill to v3.0.0-RC3
-* upgrade chill-bundle to v3.0.0-RC4
 * Add graylog to image
--- a/.changes/2.0.0-alpha4.md
+++ b/.changes/2.0.0-alpha4.md
@@ -0,0 +1,3 @@
+## 2.0.0-alpha4 - 2024-07-03
+### Release
+* fixes
--- a/.changes/2.1.0.md
+++ b/.changes/2.1.0.md
@@ -0,0 +1,3 @@
+## 2.1.0 - 2024-09-24
+### Release
+* Update bundles version to 3.1.0
--- a/.changes/2.2.0.md
+++ b/.changes/2.2.0.md
@@ -0,0 +1,3 @@
+## 2.2.0 - 2024-10-01
+### Release
+* Bundles version updated to 3.1.1
--- a/.changes/2.3.0.md
+++ b/.changes/2.3.0.md
@@ -0,0 +1,3 @@
+## 2.3.0 - 2024-10-30
+### Feature
+* Update bundles to v3.2.0 adding gender entity feature
--- a/.changes/2.4.0.md
+++ b/.changes/2.4.0.md
@@ -0,0 +1,3 @@
+## 2.4.0 - 2024-11-01
+### Feature
+* Update chill bundles to v3.2.2: new feature gender entity"
--- a/.changes/2.5.0.md
+++ b/.changes/2.5.0.md
@@ -0,0 +1,3 @@
+## 2.5.0 - 2024-12-09
+### Release
+* Update bundles to v3.5.0
--- a/.changes/2.6.0.md
+++ b/.changes/2.6.0.md
@@ -0,0 +1,3 @@
+## 2.6.0 - 2025-01-08
+### Release
+* Update to chill bundles v3.5.3
--- a/.changes/unreleased/Release-20240703-124635.yaml
+++ b/.changes/unreleased/Release-20240703-124635.yaml
@@ -1,5 +0,0 @@
-kind: Release
-body: Upgrade chill to v3.0.0-RC3
-time: 2024-07-03T12:46:35.963251524+02:00
-custom:
-  Issue: ""
--- a/.changes/unreleased/Release-20240703-133816.yaml
+++ b/.changes/unreleased/Release-20240703-133816.yaml
@@ -1,5 +0,0 @@
-kind: Release
-body: upgrade chill-bundle to v3.0.0-RC4
-time: 2024-07-03T13:38:16.338710196+02:00
-custom:
-  Issue: ""
--- a/.changes/unreleased/Release-20240703-135412.yaml
+++ b/.changes/unreleased/Release-20240703-135412.yaml
@@ -1,5 +0,0 @@
-kind: Release
-body: Add graylog to image
-time: 2024-07-03T13:54:12.983732476+02:00
-custom:
-  Issue: ""
--- a/.env
+++ b/.env
@@ -76,4 +76,5 @@ ADD_ADDRESS_MAP_CENTER_Z=14
 # Variables for relatorio host, which generates documents
 RELATORIO_HOST=
 RELATORIO_PORT=
+WOPI_SERVER=http://${COLLABORA_HOST}:${COLLABORA_PORT}
 ###< chill-project/chill-bundles ###
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,17 +6,72 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


+## 2.6.0 - 2025-01-08
+### Release
+* Update to chill bundles v3.5.3
+
+## 2.5.0 - 2024-12-09
+### Release
+* Update bundles to v3.5.0
+
+## 2.4.0 - 2024-11-01
+### Feature
+* Update chill bundles to v3.2.2: new feature gender entity"
+
+## 2.3.0 - 2024-10-30
+### Feature
+* Update bundles to v3.2.0 adding gender entity feature
+
+## 2.2.0 - 2024-10-01
+### Release
+* Bundles version updated to 3.1.1
+
+## 2.1.0 - 2024-09-24
+### Release
+* Update bundles version to 3.1.0
+
+## 2.0.0-alpha4 - 2024-07-03
+### Release
+* fixes
+
 ## 2.0.0-alpha3 - 2024-07-03
 ### Release
-* Upgrade chill to v3.0.0-RC3
-* upgrade chill-bundle to v3.0.0-RC4
 * Add graylog to image

 ## 2.0.0-alpha2 - 2024-07-03
 ### Release
-* Upgrade chill to v3.0.0-RC3
 * upgrade chill-bundle to v3.0.0-RC4

 ## 2.0.0-alpha1 - 2024-07-03
 ### Release
-* Upgrade chill to v2.0.0-RC3
+* Upgrade chill to v3.0.0-RC3
+
+## 2.1.0 - 2024-08-08
+### Release
+* Update chill-bundles to v3.0.0-RC9
+
+## 2.1.0 - 2024-07-30
+### Release
+* Update chill-bundles to v3.0.0-RC8
+
+## 2.2.0 - 2024-07-25
+### Release
+* Update chill-bundles to v3.0.0-RC7
+
+## 2.1.0 - 2024-07-23
+### Release
+* Upgrade chill to v3.0.0-RC3
+* upgrade chill-bundle to v3.0.0-RC4
+* Add graylog to image
+* upgrade to chill-bundles/3.0.0-RC5
+* Upgrade chill-bundles to v3.0.0-RC6
+### Fixed
+* Fix definition of workflow
+
+## 2.0.0-RC2 - 2024-07-18
+### Fixed
+* Fix definition of workflow
+
+## 2.0.0-RC1 - 2024-07-18
+### Release
+* upgrade to chill-bundles/3.0.0-RC5
--- a/8
+++ b/8
@@ -1,12 +1,13 @@
-FROM php:8.2-fpm-alpine AS chill_base_php82
+FROM php:8.3-fpm-alpine AS chill_base_php82

-ENV POSTGRES_VERSION 14
+ENV POSTGRES_VERSION=15

 # default UID for the PHP user
 ARG UID=1000
 ARG GID=1000

 # install php extensions and deps
+# apk add --no-cache --update --virtual rabbitmq-c-dev rabbitmq-c-utils gcc g++ make autoconf  && pecl install amqp
 RUN apk update && apk add --no-cache \
    wget gnupg \
    libpq-dev \
@@ -16,6 +17,7 @@ RUN apk update && apk add --no-cache \
    linux-headers \
    gcc g++ make autoconf \
    bash git \
+    rabbitmq-c rabbitmq-c-dev \
    && docker-php-ext-install pdo_pgsql intl mbstring zip bcmath exif sockets \
    && git clone https://github.com/nikic/php-ast.git \
    && cd php-ast \
@@ -26,6 +28,8 @@ RUN apk update && apk add --no-cache \
    && cd .. && rm -rf php-ast \
    && pecl install redis \
    && docker-php-ext-enable redis \
+    && pecl install amqp \
+    && docker-php-ext-enable amqp \
    && apk add libpng-dev libjpeg-turbo-dev freetype-dev \
    && docker-php-ext-configure gd --with-freetype --with-jpeg \
    && docker-php-ext-install -j$(nproc) gd \
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
    "ext-iconv": "*",
    "champs-libres/wopi-bundle": "dev-master@dev",
    "champs-libres/wopi-lib": "dev-master@dev",
-    "chill-project/chill-bundles": "v3.0.0-RC4",
+    "chill-project/chill-bundles": "dev-user_edit_form@dev",
    "chill-project/chill-deploy": "^1.0",
    "graylog2/gelf-php": "^2.0",
    "symfony/console": "5.4.*",
--- a/composer.lock
+++ b/composer.lock
--- a/config/packages/wopi.yaml
+++ b/config/packages/wopi.yaml
@@ -0,0 +1,3 @@
+wopi:
+  server: "%env(resolve:WOPI_SERVER)%"
+  enable_lock: false
--- a/config/packages/workflow.yaml
+++ b/config/packages/workflow.yaml
@@ -8,8 +8,10 @@ framework:
                    - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
                    - Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
                label:
-                    fr: 'Suivi'
+                    fr: 'Suivi CD85'
            support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
+            marking_store:
+                service: Chill\MainBundle\Workflow\EntityWorkflowMarkingStore
            initial_marking: 'initial'
            places:
                initial:
@@ -40,14 +42,6 @@ framework:
                            forward: {fr: Visa accordé}
                            backward: {fr: Visa refusé}
                            neutral: {fr: Autre}
-                attenteSignature:
-                    metadata:
-                        label:
-                            fr: En attente de signature
-                        validationFilterInputLabels:
-                            forward: {fr: Signature accordée}
-                            backward: {fr: Signature refusée}
-                            neutral: {fr: Autre}
                attenteTraitement:
                    metadata:
                        label:
@@ -72,6 +66,16 @@ framework:
                            forward: {fr: Validation de la mise en forme}
                            backward: {fr: Refus de validation de la mise en forme}
                            neutral: {fr: Autre}
+                attenteReceptionExternal:
+                    metadata:
+                        isSentExternal: true
+                        onExternalView: clotureApresLectureEnvoiExterne
+                        label:
+                            fr: En attente d'ouverture par un destinataire externe
+                        validationFilterInputLabels:
+                            forward: {fr: Document reçu par un destinataire externe}
+                            backward: {fr: Document non reçu par un destinataire externe}
+                            neutral: {fr: Autre}
                annule:
                    metadata:
                        isFinal: true
@@ -117,22 +121,12 @@ framework:
                        - attenteModification
                        - attenteMiseEnForme
                        - attenteValidationMiseEnForme
+                        - attenteTraitement
                    to: attenteVisa
                    metadata:
                        label:
                            fr: Demande de visa
                        isForward: true
-                demandeSignature:
-                    from:
-                        - initial
-                        - attenteModification
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                        - attenteVisa
-                    to: attenteSignature
-                    metadata:
-                        label: {fr: Demande de signature}
-                        isForward: true
                demandeTraitement:
                    from:
                        - initial
@@ -140,7 +134,6 @@ framework:
                        - attenteMiseEnForme
                        - attenteValidationMiseEnForme
                        - attenteVisa
-                        - attenteSignature
                    to: attenteTraitement
                    metadata:
                        label: {fr: Demande de traitement}
@@ -152,12 +145,32 @@ framework:
                        - attenteMiseEnForme
                        - attenteValidationMiseEnForme
                        - attenteVisa
-                        - attenteSignature
                        - attenteTraitement
                    to: attenteEnvoi
                    metadata:
                        label: {fr: Demande d'envoi}
                        isForward: true
+                demandeEnvoiExterne:
+                    from:
+                        - initial
+                        - attenteModification
+                        - attenteMiseEnForme
+                        - attenteValidationMiseEnForme
+                        - attenteVisa
+                        - attenteTraitement
+                    to: attenteReceptionExternal
+                    metadata:
+                        label: {fr: Envoi sécurisé par courrier électronique}
+                        isForward: true
+                clotureApresLectureEnvoiExterne:
+                    from:
+                        - attenteReceptionExternal
+                    to:
+                        - final
+                    metadata:
+                        transitionGuard: system
+                        isForward:  true
+                        label: {fr: Consultation de l'envoi sécurisé}
                annulation:
                    from:
                        - initial
@@ -165,13 +178,13 @@ framework:
                        - attenteMiseEnForme
                        - attenteValidationMiseEnForme
                        - attenteVisa
-                        - attenteSignature
                        - attenteTraitement
                        - attenteEnvoi
                    to: annule
                    metadata:
                        label: {fr: Annulation}
                        isForward: false
+                        transitionGuard: 'system+only-dest' # can be 'system+only-dest' or 'only-dest' (only-dest is default)
                # transitions qui répètent l'étape
                demandeMiseEnFormeSupplementaire:
                    from:
@@ -187,12 +200,6 @@ framework:
                    metadata:
                        label: {fr: Demande de visa supplémentaire}
                        isForward: true
-                demandeSignatureSupplementaire:
-                    from:
-                        - attenteSignature
-                    to: attenteSignature
-                    metadata:
-                        label: {fr: Demande de signature supplémentaire}
                demandeTraitementSupplementaire:
                    from:
                        - attenteTraitement
@@ -203,7 +210,6 @@ framework:
                refusEtModificationDocument:
                    from:
                        - attenteVisa
-                        - attenteSignature
                        - attenteTraitement
                        - attenteEnvoi
                    to: attenteModification
@@ -214,7 +220,6 @@ framework:
                refusEtDemandeMiseEnForme:
                    from:
                        - attenteVisa
-                        - attenteSignature
                        - attenteTraitement
                        - attenteEnvoi
                    to: attenteMiseEnForme
@@ -223,21 +228,11 @@ framework:
                        isForward: false
                refusEtDemandeVisa:
                    from:
-                        - attenteSignature
-                        - attenteTraitement
                        - attenteEnvoi
                    to: attenteVisa
                    metadata:
                        label: {fr: Refus et demande de visa}
                        isForward: false
-                refusEtDemandeSignature:
-                    from:
-                        - attenteTraitement
-                        - attenteEnvoi
-                    to: attenteSignature
-                    metadata:
-                        label: {fr: Refus et demande de signature}
-                        isForward: false
                refusEtDemandeTraitement:
                    from:
                        - attenteEnvoi
@@ -268,24 +263,17 @@ framework:
                    metadata:
                        label: {fr: Accorde le visa et cloture positive}
                        isForward: true
-                attenteSignatureToFinal:
-                    from:
-                        - attenteSignature
-                    to: final
-                    metadata:
-                        label: {fr: Accorde la signature et cloture positive}
-                        isForward: true
                attenteTraitementToFinal:
                    from:
                        - attenteTraitement
                    to: final
                    metadata:
-                        label: {fr: Traitement terminé et cloture postive}
+                        label: {fr: Traitement terminé et cloture positive}
                        isForward: true
                attenteEnvoiToFinal:
                    from:
                        - attenteEnvoi
                    to: final
                    metadata:
-                        label: {fr: Envoyé et cloture postive}
+                        label: {fr: Envoyé et cloture positive}
                        isForward: true
--- a/package.json
+++ b/package.json
@@ -10,5 +10,8 @@
    "specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
    "specs-validate": "swagger-cli validate templates/api/specs.yaml",
    "specs": "yarn run specs-build && yarn run specs-validate"
+  },
+  "dependencies": {
+    "bootstrap-icons": "^1.11.3"
  }
 }
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Julie Lenaerts	da7f10419a	Temporary deploy Dune with dev branch All checks were successful continuous-integration/drone/tag Build is passing Details	2025-01-20 12:35:45 +01:00
Julie Lenaerts	e65dd3ee87	Update dockerfile to use postgresql version 15 All checks were successful continuous-integration/drone/tag Build is passing Details	2025-01-08 10:59:41 +01:00
Julie Lenaerts	8797e6af7c	Update Chill to v2.6.0 Some checks failed continuous-integration/drone/tag Build is failing Details	2025-01-08 10:35:32 +01:00
Julie Lenaerts	cc3731d482	Update chill base version to 2.5.0 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-12-09 12:30:57 +01:00
Julie Lenaerts	bb264eeed2	update composer files and workflow config	2024-12-09 12:30:08 +01:00
Julie Lenaerts	47faf59ede	Update chill root to v2.4.0 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-11-01 20:12:48 +01:00
Julie Lenaerts	441517891c	Update chill base version to v2.3.0 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-10-30 10:38:10 +01:00
Julie Lenaerts	093c6fc710	Add bootstrap icons to package.json	2024-10-22 07:42:02 +02:00
Julie Lenaerts	87fcbd5771	Update Chill to v2.2.0 with bundles v3.1.1 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-10-01 10:43:53 +02:00
Julie Lenaerts	8fc61bfc2d	Update composer and yarn files	2024-10-01 10:42:31 +02:00
Julie Lenaerts	42ccb32635	Update chill base app to version 2.1.0 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-09-24 11:59:10 +02:00
Julie Lenaerts	b0062cddfc	Update bundles to version 3.1.0	2024-09-24 11:57:37 +02:00
Julie Lenaerts	207f8b9118	Update bundles version to v3.0.0-RC9 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-08-08 11:29:04 +02:00
Julie Lenaerts	73c1e7a17a	Update chill-bundles to version 3.0.0-RC8 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-07-30 15:10:30 +02:00
Julie Lenaerts	e399ee3a34	Fix naming of changie files All checks were successful continuous-integration/drone/tag Build is passing Details	2024-07-25 17:06:13 +02:00
Julie Lenaerts	190ff0b0a6	Add changie file: upgrade chill-bundles to v3.0.0-RC7	2024-07-25 17:02:19 +02:00
Julie Lenaerts	cfb2dcfd31	Update chill-bundles to v3.0.0-RC7	2024-07-25 17:00:23 +02:00
Julie Lenaerts	d121f3343f	Upgrade to chill-bundles/v3.0.0-RC6 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-07-23 17:22:20 +02:00
Julien Fastré	adba3b88ae	Add WOPI_SERVER variable to .env file A new environmental variable, WOPI_SERVER, has been added to the .env file. This addition is related to the configuration of the Collabora Online integration.	2024-07-18 23:14:03 +02:00
Julien Fastré	182f2fa111	release 2.0.0-RC2 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-07-18 16:12:54 +02:00
Julien Fastré	8a61ff2b7a	Update workflow definition and configuration The configuration for the workflow in the config/packages/workflow.yaml file has also been updated, notably by adding a marking store.	2024-07-18 16:11:04 +02:00
Julien Fastré	b6bc9e4a3a	fix changelogs and description of changes	2024-07-18 13:00:40 +02:00
Julien Fastré	79e7a63941	release 2.0.0-RC1 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-07-18 10:41:18 +02:00
Julien Fastré	bdce8411b3	upgrade deps	2024-07-18 10:39:30 +02:00
Julien Fastré	40770834a3	switch to php8.3 and add amqp as pecl dependency	2024-07-18 10:38:44 +02:00
Julien Fastré	0cee0637c9	release 2.0.0-alpha4 All checks were successful continuous-integration/drone/tag Build is passing Details	2024-07-03 14:21:18 +02:00
Julien Fastré	74ee56c960	add missing wopi configuration file	2024-07-03 14:19:55 +02:00