New lock files

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.

.changes/2.0.0-RC2.md

@@ -0,0 +1,3 @@
+## 2.0.0-RC2 - 2024-07-18
+### Fixed
+* Fix definition of workflow

.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

.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

.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

.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

.changes/2.1.0.md

@@ -0,0 +1,3 @@
+## 2.1.0 - 2024-09-24
+### Release
+* Update bundles version to 3.1.0

.changes/2.10.0.md

@@ -0,0 +1,3 @@
+## 2.10.0 - 2025-05-13
+### Release
+* Update chill bundles to 3.11.0

.changes/2.2.0.md

@@ -0,0 +1,3 @@
+## 2.2.0 - 2024-10-01
+### Release
+* Bundles version updated to 3.1.1

.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

.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"

.changes/2.5.0.md

@@ -0,0 +1,3 @@
+## 2.5.0 - 2024-12-09
+### Release
+* Update bundles to v3.5.0

.changes/2.6.0.md

@@ -0,0 +1,3 @@
+## 2.6.0 - 2025-01-08
+### Release
+* Update to chill bundles v3.5.3

.changes/2.7.0.md

@@ -0,0 +1,3 @@
+## 2.7.0 - 2025-01-20
+### Release
+* Update chill bundles to version 3.6.0

.changes/2.8.0.md

@@ -0,0 +1,3 @@
+## 2.8.0 - 2025-03-04
+### Release
+* Update chill bundles to v3.9.2

.changes/2.9.0.md

@@ -0,0 +1,3 @@
+## 2.9.0 - 2025-03-18
+### Release
+* Update chill bundles to v3.10.3

.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: ""

.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: ""

.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: ""

.changes/unreleased/Release-20240718-103918.yaml

@@ -1,5 +0,0 @@
-kind: Release
-body: upgrade to chill-bundles/3.0.0-RC5
-time: 2024-07-18T10:39:18.226486987+02:00
-custom:
-  Issue: ""

.drone.yml

@@ -32,6 +32,7 @@ steps:
       pull: always
       commands:
           - composer install --no-scripts --no-interaction
+          - bin/console cache:clear
       depends_on:
           - build-base-image
 

.env

@@ -76,4 +76,9 @@ 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 ###
+
+###> symfony/ovh-cloud-notifier ###
+# OVHCLOUD_DSN=ovhcloud://APPLICATION_KEY:APPLICATION_SECRET@default?consumer_key=CONSUMER_KEY&service_name=SERVICE_NAME
+###< symfony/ovh-cloud-notifier ###

CHANGELOG.md

@@ -6,6 +6,46 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 2.10.0 - 2025-05-13
+### Release
+* Update chill bundles to 3.11.0
+
+## 2.9.0 - 2025-03-18
+### Release
+* Update chill bundles to v3.10.3
+
+## 2.8.0 - 2025-03-04
+### Release
+* Update chill bundles to v3.9.2
+
+## 2.7.0 - 2025-01-20
+### Release
+* Update chill bundles to version 3.6.0
+
+## 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
@@ -22,6 +62,32 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 ### Release
 * 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

Dockerfile

@@ -1,6 +1,6 @@
 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

assets/swagger-ui/index.js

@@ -0,0 +1,7 @@
+import SwaggerUI from 'swagger-ui';
+import 'swagger-ui/dist/swagger-ui.css';
+
+SwaggerUI({
+  url: '/_dev/specs.yaml',
+  dom_id: '#swag'
+})

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-RC5",
+    "chill-project/chill-bundles": "dev-fix_mado_to_validate@dev",
     "chill-project/chill-deploy": "^1.0",
     "graylog2/gelf-php": "^2.0",
     "symfony/console": "5.4.*",

config/bundles.php

@@ -34,4 +34,5 @@ return [
     Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
+    Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
 ];

config/packages/chill.yaml

@@ -12,8 +12,6 @@ chill_main:
         twilio_sid: '%env(resolve:TWILIO_SID)%'
         twilio_secret: '%env(resolve:TWILIO_SECRET)%'
         default_carrier_code: '%env(resolve:DEFAULT_CARRIER_CODE)%'
-    short_messages:
-        dsn: '%env(string:SHORT_MESSAGE_DSN)%'
     acl:
         form_show_scopes: true
         form_show_centers: true

config/packages/notifier.yaml

@@ -0,0 +1,13 @@
+framework:
+    notifier:
+        chatter_transports:
+        texter_transports:
+            ovhcloud: '%env(OVHCLOUD_DSN)%'
+        channel_policy:
+            # use chat/slack, chat/telegram, sms/twilio or sms/nexmo
+            urgent: ['email']
+            high: ['email']
+            medium: ['email']
+            low: ['email']
+        admin_recipients:
+            - { email: admin@example.com }

config/packages/ux_translator.yaml

@@ -0,0 +1,3 @@
+ux_translator:
+    # The directory where the JavaScript translations are dumped
+    dump_directory: '%kernel.project_dir%/vendor/chill-project/chill-bundles/var/translations'

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

package.json

@@ -4,11 +4,17 @@
   ],
   "private": true,
   "devDependencies": {
-    "bootstrap": "5.2.3"
+    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
+    "bootstrap": "5.2.3",
+    "intl-messageformat": "^10.5.11"
   },
   "scripts": {
     "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"
-  }
+    "specs-create-dir": "mkdir -p templates/api",
+    "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
+    "dev": "yarn run encore dev",
+    "prod": "yarn run encore production"
+  },
+  "version": "0.0.0"
 }

symfony.lock

@@ -69,6 +69,15 @@
             "config/routes/annotations.yaml"
         ]
     },
+    "doctrine/deprecations": {
+        "version": "1.1",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "87424683adc81d7dc305eefec1fced883084aab9"
+        }
+    },
     "doctrine/doctrine-bundle": {
         "version": "2.12",
         "recipe": {
@@ -304,6 +313,27 @@
             "config/packages/monolog.yaml"
         ]
     },
+    "symfony/notifier": {
+        "version": "5.4",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "5.0",
+            "ref": "178877daf79d2dbd62129dd03612cb1a2cb407cc"
+        },
+        "files": [
+            "config/packages/notifier.yaml"
+        ]
+    },
+    "symfony/ovh-cloud-notifier": {
+        "version": "5.4",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "5.1",
+            "ref": "fe2e382c22d60eae9ad54cb22862b1c15291fdf8"
+        }
+    },
     "symfony/routing": {
         "version": "5.4",
         "recipe": {
@@ -355,6 +385,21 @@
             "templates/base.html.twig"
         ]
     },
+    "symfony/ux-translator": {
+        "version": "2.23",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "2.9",
+            "ref": "bc396565cc4cab95692dd6df810553dc22e352e1"
+        },
+        "files": [
+            "assets/translator.js",
+            "config/packages/ux_translator.yaml",
+            "var/translations/configuration.js",
+            "var/translations/index.js"
+        ]
+    },
     "symfony/validator": {
         "version": "5.4",
         "recipe": {

tsconfig.json

@@ -1,20 +1,6 @@
 {
-  "extends": "@tsconfig/node14/tsconfig.json",
+  "extends": "./vendor/chill-project/chill-bundles/ts-config-base.json",
   "compilerOptions": {
-    "lib": [
-      "es2020",
-      "dom"
-    ],
-    "module": "es6",
-    "moduleResolution": "node",
-    "isolatedModules": true,
-    "allowJs": false,
-    "checkJs": false,
-    "importHelpers": true,
-    "allowSyntheticDefaultImports": true,
-    "types": [
-      "node"
-    ],
     "sourceMap": true
   },
   "includes": [
@@ -25,6 +11,9 @@
   ],
   "exclude": [
     "./vendor/chill-project/chill-bundles/tests/*",
-    "./vendor/chill-project/chill-bundles/docs/*"
+    "./vendor/chill-project/chill-bundles/docs/*",
+    "./vendor/chill-project/chill-bundles/assets/translator.ts",
+    "./vendor/chill-project/chill-bundles/var/*.*"
   ]
 }
+

webpack.config.js

@@ -96,15 +96,17 @@ module.exports = (async () => {
         .setPublicPath('/build')
         .enableSassLoader()
         .enableVueLoader(() => {}, {
-            version: 3
+            version: 3,
+            runtimeCompilerBuild: true,
         })
-        .enableTypeScriptLoader(function (tsConfig){
+        .enableTypeScriptLoader(/*function (tsConfig){
          tsConfig.appendTsSuffixTo = [/\.vue$/];
          tsConfig.appendTsxSuffixTo = [/\.vue$/];
          // temporary fix for https://github.com/vuejs/vue-loader/issues/1915 and https://github.com/vuejs/core/issues/2855
          tsConfig.compilerOptions = {strict: !Encore.isProduction()};
+         tsConfig.compilerOptions.paths = {"translator": [resolve(__dirname, "./assets/translator.ts")]};
          tsConfig.silent = false;
-        })
+      }*/)
         //.enableForkedTypeScriptTypesChecking()
         .autoProvidejQuery()
         .enableSourceMaps(!Encore.isProduction())
@@ -113,40 +115,26 @@ module.exports = (async () => {
         .enableVersioning()
         .enableSingleRuntimeChunk()
         .splitEntryChunks()
-       // added when upgrading to symfony 5.4
-       // enables and configure @babel/preset-env polyfills
-       //.configureBabelPresetEnv((config) => {
-       //   config.useBuiltIns = 'usage';
-       //   config.corejs = '3.23';
-       //})
     //.addLoader({ test: /\.pdf$/, loader: 'file-loader', options: { name: '[name]_[hash].[ext]', outputPath: 'pdf/' } })
-    ;
-
-    // populate config with chill entries
-    let chillEntries = [];
-    await populateConfig(Encore, chillEntries);
     // configure Babel
     // .configureBabel((config) => {
     //     config.plugins.push('@babel/a-babel-plugin');
     // })
 
+    // enables and configure @babel/preset-env polyfills
+    // .configureBabelPresetEnv((config) => {
+    //    config.useBuiltIns = 'usage';
+    //    config.corejs = '3.23';
+    // })
+    ;
 
-    // enables Sass/SCSS support
-    //.enableSassLoader()
-
-    // add swagger UI
-    if (!Encore.isProduction()) {
-        Encore
-            .addEntry('swagger', __dirname + '/assets/swagger-ui/index.js')
-            .addLoader({
-                test: /\.yaml$/,
-                type: 'json',
-                use: [
-                    { loader: 'json-loader' },
-                    { loader: 'yaml-loader' }
-                ],
+    Encore.addAliases({
+        translator: resolve(__dirname, './vendor/chill-project/chill-bundles/assets/translator')
     });
-    }
+
+    // populate config with chill entries
+    let chillEntries = [];
+    await populateConfig(Encore, chillEntries);
 
     //getting the encore config and appending chill entries
     config = Encore.getWebpackConfig();