@dsivd/prestations-ng 18.3.11 → 18.3.13

package/CHANGELOG.md

@@ -6,6 +6,20 @@
 
 ---
 
+## [18.3.13]
+
+### Fixed
+
+- [recaptcha.service.ts](projects/prestations-ng/src/sdk-recaptcha/recaptcha.service.ts)
+    - fixed recaptcha called infinitely when backend says that it must be revalidated
+
+## [18.3.12]
+
+### Updated
+
+- [foehn-remaining-alerts-summary.component.html](projects/prestations-ng/src/foehn-remaining-alerts-summary/foehn-remaining-alerts-summary.component.html)
+    - show debug infos that would be sent to the support form when not in prod
+
 ## [18.3.11]
 
 ### Updated

package/README.md

@@ -21,6 +21,7 @@ The documentation is available online at [https://dsi-vd.github.io/prestations-n
 
 Migration guides are available to provide an upgrade path from one major version to another.
 
+- If you need to upgrade to version `19+`, please refer to [the V19 upgrade guide](UPGRADING_V19.md).
 - If you need to upgrade to version `18+`, please refer to [the V18 upgrade guide](UPGRADING_V18.md).
 - If you need to upgrade to version `17+`, please refer to [the V17 upgrade guide](UPGRADING_V17.md).
 - If you need to upgrade to version `16+`, please refer to [the V16 upgrade guide](UPGRADING_V16.md).

package/UPGRADING_V19.md

@@ -0,0 +1,117 @@
+# PRESTAKIT : Upgrading from v18 to v19
+
+To migrate your project from `prestakit` v18 to v19, you need to migrate prestations-ng and prestations-be, as usual.
+But to migrate to prestations-be v19, you need to migrate your project to Spring Boot 4 / Java 25.
+
+Let's start by migrating to Spring Boot 4 / prestations-be v19.
+
+## PRESTATIONS-BE (via parent - Spring boot 4 / java 25)
+
+From here on, we are in the root folder of your project, for example ~/git/cybsdk/skeleton.
+
+### Spring Boot 4
+
+You can switch to Java 25 `jdk25` + change in IntelliJ: right-click on your project > Open Module Settings > Project > set "SDK" to `jdk25` from devtools and "Language 
+  level" to `25` in "Modules"
+
+Use the latest application-parent v15+ in your `pom.xml`.
+
+You can use this OpenRewrite recipe to simplify the migration (run with java 25).
+
+```bash
+source ~/devtools/fordev.sh 25 20
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE -Drewrite.activeRecipes=org.openrewrite.java.spring.boot4.UpgradeSpringBoot_4_0 -Pnof,noft
+```
+
+#### Fixes
+
+Fix application.properties :
+
+```diff
+# Remove the following properties if it was added by the recipe
+spring.liquibase.password=${spring.datasource.password}
+spring.liquibase.username=${spring.datasource.username}
+Replace the spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS property by spring.jackson.datatype.datetime.write-dates-as-timestamps if it was not done by the recipe
+```
+
+If the following plugin with Lombok path was added by the recipe, remove this plugin:
+
+```xml
+<plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-compiler-plugin</artifactId>
+    <configuration>
+        <annotationProcessorPaths>
+            <path>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.40</version>
+            </path>
+        </annotationProcessorPaths>
+    </configuration>
+</plugin>
+```
+
+If the code uses `AutoConfigureMockMvc`, add:
+```xml
+<dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-webmvc-test</artifactId>
+    <scope>test</scope>
+</dependency>
+```
+And replace the old `AutoConfigureMockMvc` import which is not recognized anymore by the new one.
+
+If we use in pom.xml Spring/Hibernate dependencies (like hibernate-jpamodelgen), check the Spring Boot 4 migration 
+guide to see if it has been replaced by another library: https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.0-Migration-Guide
+
+### Jackson migration
+
+With Spring Boot 4, Jackson 3 is now used instead of Jackson 2, so we need to replace the previous Jackson 2 classes.
+Replace `com.fasterxml.jackson.databind.ObjectMapper` with `tools.jackson.databind.json.JsonMapper`.
+
+### Brave Tracer
+
+If you are using Brave Tracer (search `brace.Tracer` in the code, usually in backoffices), you need to replace it with 
+OpenTelemetry by adding the following dependency:
+```xml
+<dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-micrometer-tracing-brave</artifactId>
+</dependency>
+```
+And replace `brave.Tracer` imports by `io.micrometer.tracing.Tracer`;
+
+### Property migration
+
+Run your application with this dependency :
+
+```
+<dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-properties-migrator</artifactId>
+    <scope>runtime</scope>
+</dependency>
+```
+
+Look for logs that indicate property you should migrate (watch for WARN logs of class PropertiesMigrationListener), update them and remove the dependency
+
+### Debugging tips
+
+Spring boot 4 doesn't support calling a controller with a trailing slash, fix the url called (/api/ping != /api/ping**/**)
+
+
+### Clean Sonar code smells
+You can use the following OpenRewrite recipes to clean Sonar code smells. It is recommended to do it after the migration to avoid mixing the migration changes with code cleaning changes, and to make it easier to review.
+
+```bash
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-testing-frameworks:RELEASE -Drewrite.activeRecipes=org.openrewrite.java.testing.junit.JUnit6BestPractices, -Pnof,noft
+
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-static-analysis:RELEASE -Drewrite.activeRecipes=org.openrewrite.staticanalysis.CommonStaticAnalysis -Pnof,noft
+
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run --define rewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-testing-frameworks:RELEASE --define rewrite.activeRecipes=org.openrewrite.java.testing.mockito.MockitoBestPractices --define rewrite.exportDatatables=true -Pnof,noft
+
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.activeRecipes=org.openrewrite.java.RemoveUnusedImports -Pnof,noft
+```
+
+Take a look at Sonar to see other things that you can improve or ignore.

package/fesm2022/dsivd-prestations-ng.mjs

@@ -4367,6 +4367,7 @@ class RecaptchaService {
         this.applicationInfoService = applicationInfoService;
         this.sdkLogsService = sdkLogsService;
         this.errorsSubject = new BehaviorSubject([]);
+        this.gesdemFormErrors = [];
         this.errors = this.initErrorObservable(); // has to be first since it is used in initShouldDisplayObservable !
         this.shouldDisplay = this.initShouldDisplayObservable();
         this.publicKey = this.initPublicKeyObservable();
@@ -4409,6 +4410,9 @@ class RecaptchaService {
         this.errorsSubject.next([newError, ...existingErrors]);
     }
     clearErrors() {
+        // Remove recaptcha errors so it won't reset infinitely
+        this.validationHandlerService.updateErrors(this.gesdemFormErrors.filter(error => error.code !== CAPTCHA_ERROR_NAME &&
+            error.name !== CAPTCHA_ERROR_NAME));
         this.errorsSubject.next([]);
     }
     getErrors() {
@@ -4432,8 +4436,13 @@ class RecaptchaService {
         of([]), 
         // Read from the gesdem service all errors.
         this.validationHandlerService.validationErrorsSubject).pipe(
+        // Store all validation errors before filtering
+        tap(errors => {
+            this.gesdemFormErrors = errors;
+        }), 
         // Errors from GesDem, or nothing
-        map(errors => errors.filter(ex => CAPTCHA_ERROR_NAME === ex.code)));
+        map(errors => errors.filter(ex => CAPTCHA_ERROR_NAME === ex.code ||
+            CAPTCHA_ERROR_NAME === ex.name)));
         // Bind errors to the component, either from the backend of from this component
         return combineLatest([
             // Errors from gesdem matching the name of the captcha.
@@ -13935,17 +13944,19 @@ class FoehnRemainingAlertsSummaryComponent {
         this.applicationInfoService = applicationInfoService;
         this.dictionaryService = dictionaryService;
         this.remainingErrorNamesToIgnore = [];
+        this.showDebugData = of(false);
         this.hasRemainingErrors = of(false);
         this.remainingErrorsLabelSubject = new BehaviorSubject(null);
         this.DEFAULT_REMAINING_ERRORS_MSG_KEY = 'foehn-remaining-alert-summary.default-error-message';
-        const remainingErrors = this.gesdemService.updateFormDataSubject.pipe(map(() => {
+        this.remainingErrors = this.gesdemService.updateFormDataSubject.pipe(map(() => {
             this.reference = this.gesdemService.lastResponse.meta.reference;
             return this.gesdemService.lastResponse.errors.filter(e => !this.remainingErrorNamesToIgnore.includes(e.name));
         }), shareReplay(1));
-        const defaultRemainingErrorsMsg = remainingErrors.pipe(filter(errors => !!errors.length), switchMap(errors => this.applicationInfoService.getSafeSupportFormUrl(this.reference, errors)), map(link => this.dictionaryService.getKeySync(this.DEFAULT_REMAINING_ERRORS_MSG_KEY, {
+        const defaultRemainingErrorsMsg = this.remainingErrors.pipe(filter(errors => !!errors.length), switchMap(errors => this.applicationInfoService.getSafeSupportFormUrl(this.reference, errors)), map(link => this.dictionaryService.getKeySync(this.DEFAULT_REMAINING_ERRORS_MSG_KEY, {
             supportLink: link
         })));
-        this.hasRemainingErrors = remainingErrors.pipe(map(errors => !!errors.length));
+        this.hasRemainingErrors = this.remainingErrors.pipe(map(errors => !!errors.length));
+        this.showDebugData = this.applicationInfoService.data.pipe(map(appInfo => appInfo.environment?.toUpperCase() !== 'PR'));
         this.remainingErrorsMessage = combineLatest([
             defaultRemainingErrorsMsg,
             this.remainingErrorsLabelSubject.asObservable()
@@ -13960,11 +13971,11 @@ class FoehnRemainingAlertsSummaryComponent {
         this.remainingErrorsLabelSubject.next(msg);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: FoehnRemainingAlertsSummaryComponent, deps: [{ token: GesdemHandlerService }, { token: ApplicationInfoService }, { token: SdkDictionaryService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.17", type: FoehnRemainingAlertsSummaryComponent, isStandalone: false, selector: "foehn-remaining-alerts-summary", inputs: { remainingErrorNamesToIgnore: "remainingErrorNamesToIgnore", remainingErrorsLabel: "remainingErrorsLabel" }, ngImport: i0, template: "<div\n    class=\"alert alert-danger\"\n    *ngIf=\"hasRemainingErrors | async\"\n    [innerHTML]=\"remainingErrorsMessage | async\"\n></div>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.17", type: FoehnRemainingAlertsSummaryComponent, isStandalone: false, selector: "foehn-remaining-alerts-summary", inputs: { remainingErrorNamesToIgnore: "remainingErrorNamesToIgnore", remainingErrorsLabel: "remainingErrorsLabel" }, ngImport: i0, template: "<div class=\"alert alert-danger\" *ngIf=\"hasRemainingErrors | async\">\n    <span [innerHTML]=\"remainingErrorsMessage | async\"></span>\n\n    <ng-container *ngIf=\"!!(showDebugData | async)\">\n        <div\n            class=\"alert alert-warning\"\n            *ngIf=\"remainingErrors | async as errors\"\n            id=\"remaining-errors-for-debug\"\n        >\n            DEBUG (ne s'affiche pas en production) :\n            <ul class=\"mt-3\">\n                <li *ngFor=\"let error of errors\">\n                    {{ error.name }} ({{ error.code }}) : {{ error.message }}\n                </li>\n            </ul>\n        </div>\n    </ng-container>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: FoehnRemainingAlertsSummaryComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'foehn-remaining-alerts-summary', standalone: false, template: "<div\n    class=\"alert alert-danger\"\n    *ngIf=\"hasRemainingErrors | async\"\n    [innerHTML]=\"remainingErrorsMessage | async\"\n></div>\n" }]
+            args: [{ selector: 'foehn-remaining-alerts-summary', standalone: false, template: "<div class=\"alert alert-danger\" *ngIf=\"hasRemainingErrors | async\">\n    <span [innerHTML]=\"remainingErrorsMessage | async\"></span>\n\n    <ng-container *ngIf=\"!!(showDebugData | async)\">\n        <div\n            class=\"alert alert-warning\"\n            *ngIf=\"remainingErrors | async as errors\"\n            id=\"remaining-errors-for-debug\"\n        >\n            DEBUG (ne s'affiche pas en production) :\n            <ul class=\"mt-3\">\n                <li *ngFor=\"let error of errors\">\n                    {{ error.name }} ({{ error.code }}) : {{ error.message }}\n                </li>\n            </ul>\n        </div>\n    </ng-container>\n</div>\n" }]
         }], ctorParameters: () => [{ type: GesdemHandlerService }, { type: ApplicationInfoService }, { type: SdkDictionaryService }], propDecorators: { remainingErrorNamesToIgnore: [{
                 type: Input
             }], remainingErrorsLabel: [{