Feat migrating portail structure core v18

.talismanrc

@@ -22,6 +22,6 @@ fileignoreconfig:
 - filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
   checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
 - filename: yarn.lock
-  checksum: 4ce26d3d2734a1b84df51abc67dd6fd9391bd3fb1c4b5469e892d3b88f96285c
+  checksum: a5b99769312633f9996bf654dde6e79c7c4264e4c5e4b1fa4b15ba118ad0d1b5
 threshold: medium
 version: "1.0"

packages/frontend/angular.json

@@ -17,7 +17,7 @@
             "outputPath": "dist/domifa",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": ["zone.js", "@angular/localize/init"],
             "tsConfig": "./tsconfig.app.json",
             "assets": ["src/assets", "src/robots.txt"],
             "styles": [

packages/frontend/jest.config.js

@@ -1,7 +1,6 @@
 module.exports = {
   preset: "jest-preset-angular",
   setupFilesAfterEnv: ["<rootDir>/setup-jest.ts"],
-  globalSetup: "jest-preset-angular/global-setup",
   moduleNameMapper: {
     "^src/(.*)$": "<rootDir>/src/$1",
     "^app/(.*)$": "<rootDir>/src/app/$1",

packages/frontend/package.json

@@ -17,29 +17,30 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^17.3.12",
-    "@angular/cdk": "^17.3.10",
-    "@angular/common": "^17.3.12",
-    "@angular/compiler": "^17.3.12",
-    "@angular/core": "^17.3.12",
-    "@angular/forms": "^17.3.12",
-    "@angular/localize": "^17.3.12",
-    "@angular/platform-browser": "^17.3.12",
-    "@angular/platform-browser-dynamic": "^17.3.12",
-    "@angular/router": "^17.3.12",
+    "@angular/animations": "^18.2.13",
+    "@angular/cdk": "^18.2.13",
+    "@angular/common": "^18.2.13",
+    "@angular/compiler": "^18.2.13",
+    "@angular/core": "^18.2.13",
+    "@angular/forms": "^18.2.13",
+    "@angular/localize": "^18.2.13",
+    "@angular/platform-browser": "^18.2.13",
+    "@angular/platform-browser-dynamic": "^18.2.13",
+    "@angular/router": "^18.2.13",
     "@ckeditor/ckeditor5-angular": "^9.0.0",
     "@ckeditor/ckeditor5-build-classic": "^43.3.1",
     "@domifa/common": "workspace:^",
-    "@fortawesome/angular-fontawesome": "0.14.1",
+    "@fortawesome/angular-fontawesome": "0.15.0",
     "@fortawesome/fontawesome-svg-core": "^6.6.0",
     "@fortawesome/free-regular-svg-icons": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@khazii/ngx-intl-tel-input": "^17.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^15.1.2",
-    "@ngrx/effects": "^17.2.0",
-    "@ngrx/entity": "^17.2.0",
-    "@ngrx/store": "^17.2.0",
-    "@ngrx/store-devtools": "^17.2.0",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
+    "@ngrx/effects": "^18.1.1",
+    "@ngrx/entity": "^18.1.1",
+    "@ngrx/operators": "^18.0.0",
+    "@ngrx/store": "^18.1.1",
+    "@ngrx/store-devtools": "^18.1.1",
     "@popperjs/core": "^2.11.8",
     "@schematics/angular": "^15.2.11",
     "@sentry/angular": "^10.3.0",
@@ -63,19 +64,19 @@
     "zone.js": "~0.15.1"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "^0.1802.20",
-    "@angular-devkit/build-angular": "^17.3.17",
-    "@angular-devkit/core": "^17.3.17",
-    "@angular-devkit/schematics": "^17.3.17",
+    "@angular-devkit/architect": "^0.2001.5",
+    "@angular-devkit/build-angular": "^18.2.13",
+    "@angular-devkit/core": "^18.2.13",
+    "@angular-devkit/schematics": "^18.1.1",
     "@angular-eslint/builder": "17.5.3",
     "@angular-eslint/eslint-plugin": "17.5.3",
     "@angular-eslint/eslint-plugin-template": "17.5.3",
     "@angular-eslint/schematics": "17.5.3",
     "@angular-eslint/template-parser": "17.5.3",
-    "@angular/cli": "^17.3.17",
-    "@angular/compiler-cli": "^17.3.12",
-    "@angular/language-service": "^17.3.12",
-    "@schematics/update": "^0.1102.19",
+    "@angular/cli": "^18.2.13",
+    "@angular/compiler-cli": "^18.2.13",
+    "@angular/language-service": "^18.2.13",
+    "@schematics/update": "^0.1102.18",
     "@types/file-saver": "^2.0.7",
     "@types/google-libphonenumber": "^7.4.30",
     "@types/jest": "^29.5.14",

packages/frontend/src/app/app.component.html

@@ -304,7 +304,7 @@
           ><fa-icon
             [icon]="['fas', 'circle-notch']"
             aria-hidden="true"
-            [spin]="true"
+            animation="spin"
           >
           </fa-icon>
           Enregistrement en cours...</span

packages/frontend/src/app/app.component.spec.ts

@@ -1,25 +1,25 @@
 import { MATOMO_INJECTORS } from "./shared/constants/MATOMO_INJECTORS.const";
 import { ReactiveFormsModule } from "@angular/forms";
-import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from "@angular/core";
 import { TestBed, waitForAsync } from "@angular/core/testing";
-import { RouterTestingModule } from "@angular/router/testing";
 
 import { AppComponent } from "./app.component";
 import { StoreModule } from "@ngrx/store";
 import { _usagerReducer } from "./shared";
+import { RouterModule } from "@angular/router";
+import { provideHttpClient } from "@angular/common/http";
 
 describe("AppComponent", () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [AppComponent],
       imports: [
-        HttpClientTestingModule,
-        RouterTestingModule,
+        RouterModule.forRoot([]),
         ReactiveFormsModule,
         ...MATOMO_INJECTORS,
         StoreModule.forRoot({ app: _usagerReducer }),
       ],
+      providers: [provideHttpClient()],
       schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));

packages/frontend/src/app/app.module.ts

@@ -1,6 +1,10 @@
 import { LoadingService } from "./modules/shared/services/loading.service";
 import { CustomToastService } from "./modules/shared/services/custom-toast.service";
-import { HttpClientModule, HTTP_INTERCEPTORS } from "@angular/common/http";
+import {
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from "@angular/common/http";
 import {
   CUSTOM_ELEMENTS_SCHEMA,
   ErrorHandler,
@@ -58,12 +62,12 @@ registerLocaleData(localeFr, "fr");
 @NgModule({
   bootstrap: [AppComponent],
   declarations: [AppComponent],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
   imports: [
     AppRoutingModule,
     BrowserModule,
     BrowserAnimationsModule.withConfig({ disableAnimations }),
     FormsModule,
-    HttpClientModule,
     ReactiveFormsModule,
     FontAwesomeModule,
     GeneralModule,
@@ -90,7 +94,7 @@ registerLocaleData(localeFr, "fr");
         showDialog: !environment?.production,
       }),
     },
+    provideHttpClient(withInterceptorsFromDi()),
   ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
 })
 export class AppModule {}

packages/frontend/src/app/modules/admin-portail-usagers/admin-portail-usagers.module.ts

@@ -1,7 +1,10 @@
 import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
 import { AdminPortailUsagersRoutingModule } from "./admin-portail-usagers-routing.module";
-import { HttpClientModule } from "@angular/common/http";
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from "@angular/common/http";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import {
   NgbDateParserFormatter,
@@ -34,7 +37,6 @@ import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
     CommonModule,
     AdminPortailUsagersRoutingModule,
     FormsModule,
-    HttpClientModule,
     NgbModule,
     ReactiveFormsModule,
     SharedModule,
@@ -48,6 +50,7 @@ import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
     NgbDateCustomParserFormatter,
     { provide: NgbDatepickerI18n, useClass: CustomDatepickerI18n },
     { provide: NgbDateParserFormatter, useClass: NgbDateCustomParserFormatter },
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 export class AdminPortailUsagersModule {}

packages/frontend/src/app/modules/admin-portail-usagers/components/manage-structure-information-form/manage-structure-information-form.component.html

@@ -271,7 +271,7 @@
       <span *ngIf="loading">
         <fa-icon
           [icon]="['fas', 'circle-notch']"
-          [spin]="true"
+          animation="spin"
           aria-hidden="true"
         ></fa-icon>
         Veuillez patienter...

packages/frontend/src/app/modules/admin-portail-usagers/components/manage-structure-information/manage-structure-information.component.html

@@ -147,7 +147,7 @@ <h2>Informations déjà enregistrées</h2>
       <span *ngIf="loading">
         <fa-icon
           [icon]="['fas', 'circle-notch']"
-          [spin]="true"
+          animation="spin"
           aria-hidden="true"
         ></fa-icon>
         Veuillez patienter...

packages/frontend/src/app/modules/admin-portail-usagers/components/manage-structure-information/manage-structure-information.component.spec.ts

@@ -1,10 +1,9 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
-
 import { ManageStructureInformationComponent } from "./manage-structure-information.component";
 import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
-import { HttpClientTestingModule } from "@angular/common/http/testing";
-import { RouterTestingModule } from "@angular/router/testing";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
+import { RouterModule } from "@angular/router";
+import { provideHttpClient } from "@angular/common/http";
 
 describe("ManageStructureInformationComponent", () => {
   let component: ManageStructureInformationComponent;
@@ -14,7 +13,8 @@ describe("ManageStructureInformationComponent", () => {
     await TestBed.configureTestingModule({
       declarations: [ManageStructureInformationComponent],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [NgbModule, HttpClientTestingModule, RouterTestingModule],
+      imports: [NgbModule, RouterModule.forRoot([])],
+      providers: [provideHttpClient()],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ManageStructureInformationComponent);

packages/frontend/src/app/modules/admin-portail-usagers/components/portail-usagers-params/portail-usagers-params.component.html

@@ -143,7 +143,7 @@
             <span *ngIf="loading"
               ><fa-icon
                 [icon]="['fas', 'circle-notch']"
-                [spin]="true"
+                animation="spin"
                 aria-hidden="true"
               >
               </fa-icon>

packages/frontend/src/app/modules/admin-portail-usagers/components/portail-usagers-params/portail-usagers-params.component.spec.ts

@@ -1,17 +1,16 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
-
 import { PortailUsagersParamsComponent } from "./portail-usagers-params.component";
 import { APP_BASE_HREF } from "@angular/common";
-import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { ReactiveFormsModule, FormsModule } from "@angular/forms";
-import { RouterTestingModule } from "@angular/router/testing";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import {
   MockAuthService,
   USER_STRUCTURE_MOCK,
 } from "../../../../../_common/mocks";
 import { AuthService } from "../../../shared/services";
+import { RouterModule } from "@angular/router";
+import { provideHttpClient } from "@angular/common/http";
 
 describe("PortailUsagersParamsComponent", () => {
   let component: PortailUsagersParamsComponent;
@@ -23,10 +22,10 @@ describe("PortailUsagersParamsComponent", () => {
         NgbModule,
         ReactiveFormsModule,
         FormsModule,
-        HttpClientTestingModule,
-        RouterTestingModule,
+        RouterModule.forRoot([]),
       ],
       providers: [
+        provideHttpClient(),
         { provide: APP_BASE_HREF, useValue: "/" },
         { provide: AuthService, useClass: MockAuthService },
       ],

packages/frontend/src/app/modules/general/components/contact-support/contact-support.component.html

@@ -269,6 +269,7 @@ <h2 class="text-success">
                 d'import anonymisé, autres informations etc.)
               </label>
               <input
+                (change)="onFileChange($event)"
                 class="form-control"
                 type="file"
                 accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xlsx, .xls"
@@ -290,7 +291,6 @@ <h2 class="text-success">
                   'is-invalid':
                     (f.fileSource.dirty || submitted) && f.fileSource.errors
                 }"
-                (change)="onFileChange($event)"
               />
               <small id="file-description">
                 Formats autorisés .pdf, xlsx, .docx, .odt, .jpg, ou .png (6mo
@@ -321,7 +321,7 @@ <h2 class="text-success">
                 <fa-icon
                   [icon]="['fas', 'circle-notch']"
                   aria-hidden="true"
-                  [spin]="true"
+                  animation="spin"
                 >
                 </fa-icon>
                 Veuillez patienter...

packages/frontend/src/app/modules/general/components/contact-support/contact-support.component.spec.ts

@@ -1,15 +1,15 @@
 import { APP_BASE_HREF } from "@angular/common";
-import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { ReactiveFormsModule, FormsModule } from "@angular/forms";
-import { RouterTestingModule } from "@angular/router/testing";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 
 import { ContactSupportComponent } from "./contact-support.component";
 import { StoreModule } from "@ngrx/store";
 import { _usagerReducer } from "../../../../shared";
 import { NoopAnimationsModule } from "@angular/platform-browser/animations";
+import { RouterModule } from "@angular/router";
+import { provideHttpClient } from "@angular/common/http";
 
 describe("ContactSupportComponent", () => {
   let component: ContactSupportComponent;
@@ -22,11 +22,13 @@ describe("ContactSupportComponent", () => {
         ReactiveFormsModule,
         FormsModule,
         StoreModule.forRoot({ app: _usagerReducer }),
-        HttpClientTestingModule,
         NoopAnimationsModule,
-        RouterTestingModule,
+        RouterModule.forRoot([]),
+      ],
+      providers: [
+        provideHttpClient(),
+        { provide: APP_BASE_HREF, useValue: "/" },
       ],
-      providers: [{ provide: APP_BASE_HREF, useValue: "/" }],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });

packages/frontend/src/app/modules/general/components/errors/not-found/not-found.component.spec.ts

@@ -1,12 +1,12 @@
 import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
 
 import { APP_BASE_HREF } from "@angular/common";
-import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import { NotFoundComponent } from "./not-found.component";
-import { RouterTestingModule } from "@angular/router/testing";
+import { RouterModule } from "@angular/router";
+import { provideHttpClient } from "@angular/common/http";
 
 describe("NotFoundComponent", () => {
   let component: NotFoundComponent;
@@ -19,11 +19,12 @@ describe("NotFoundComponent", () => {
         NgbModule,
         ReactiveFormsModule,
         FormsModule,
-
-        HttpClientTestingModule,
-        RouterTestingModule,
+        RouterModule.forRoot([]),
+      ],
+      providers: [
+        provideHttpClient(),
+        { provide: APP_BASE_HREF, useValue: "/" },
       ],
-      providers: [{ provide: APP_BASE_HREF, useValue: "/" }],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));