Skip to content

Commit 5b6121e

Browse files
hbaltypYassine
andauthored
feat(admin): ⬆️ update to Angular V18
* chore(admin): upgrading core angular to 18 * fix(admins): retrograde matomo & date-fns * fix(admins): fixing typescript supported version & updating devkit/architect * fix(admins): migration testing modules * fix(admins): fixing matomo version conflict * fix(admin): update packages --------- Co-authored-by: Yassine R. <riffi.yassine@gmail.com>
1 parent 04e8920 commit 5b6121e

36 files changed

+134
-133
lines changed

.talismanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ fileignoreconfig:
2020
- filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
2121
checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
2222
- filename: yarn.lock
23-
checksum: 2724a73393a5b8c99b70618747aa501c5eddc444d4a3a26b635faacd9d9cb6e1
23+
checksum: 4ce26d3d2734a1b84df51abc67dd6fd9391bd3fb1c4b5469e892d3b88f96285c
2424
threshold: medium
2525
version: "1.0"

packages/portail-admins/angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"outputPath": "dist/domifa-portail-admins",
1818
"index": "src/index.html",
1919
"main": "src/main.ts",
20-
"polyfills": "src/polyfills.ts",
20+
"polyfills": ["@angular/localize/init", "zone.js"],
2121
"tsConfig": "./tsconfig.app.json",
2222
"assets": ["src/assets"],
2323
"styles": [

packages/portail-admins/jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module.exports = {
22
preset: "jest-preset-angular",
33
setupFilesAfterEnv: ["<rootDir>/setup-jest.ts"],
4-
globalSetup: "jest-preset-angular/global-setup",
54
moduleNameMapper: {
65
"^src/(.*)$": "<rootDir>/src/$1",
76
"^app/(.*)$": "<rootDir>/src/app/$1",

packages/portail-admins/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"private": true,
1919
"dependencies": {
2020
"@angular/animations": "^18.2.13",
21-
"@angular/cdk": "^18.2.13",
21+
"@angular/cdk": "^18.2.14",
2222
"@angular/common": "^18.2.13",
2323
"@angular/compiler": "^18.2.13",
2424
"@angular/core": "^18.2.13",
@@ -50,15 +50,15 @@
5050
},
5151
"devDependencies": {
5252
"@angular-devkit/architect": "^0.2001.5",
53-
"@angular-devkit/build-angular": "^18.2.13",
54-
"@angular-devkit/core": "^18.2.13",
55-
"@angular-devkit/schematics": "^18.1.1",
53+
"@angular-devkit/build-angular": "^18.2.20",
54+
"@angular-devkit/core": "^18.2.20",
55+
"@angular-devkit/schematics": "^18.2.20",
5656
"@angular-eslint/builder": "^17.5.3",
5757
"@angular-eslint/eslint-plugin": "^17.5.3",
5858
"@angular-eslint/eslint-plugin-template": "^17.5.3",
5959
"@angular-eslint/schematics": "^17.5.3",
6060
"@angular-eslint/template-parser": "^17.5.3",
61-
"@angular/cli": "^18.2.13",
61+
"@angular/cli": "^18.2.20",
6262
"@angular/compiler-cli": "^18.2.13",
6363
"@angular/language-service": "^18.2.13",
6464
"@schematics/update": "^0.1102.18",

packages/portail-admins/src/app/app.component.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { HttpClientTestingModule } from "@angular/common/http/testing";
21
import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from "@angular/core";
32
import { TestBed, waitForAsync } from "@angular/core/testing";
43
import { RouterModule } from "@angular/router";
54
import { AppComponent } from "./app.component";
5+
import { provideHttpClient } from "@angular/common/http";
66

77
describe("AppComponent", () => {
88
beforeEach(waitForAsync(() => {
99
TestBed.configureTestingModule({
1010
declarations: [AppComponent],
11-
imports: [HttpClientTestingModule, RouterModule.forRoot([])],
11+
imports: [RouterModule.forRoot([])],
12+
providers: [provideHttpClient()],
1213
schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
1314
}).compileComponents();
1415
}));

packages/portail-admins/src/app/app.module.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { HttpClientModule, HTTP_INTERCEPTORS } from "@angular/common/http";
1+
import {
2+
HTTP_INTERCEPTORS,
3+
provideHttpClient,
4+
withInterceptorsFromDi,
5+
} from "@angular/common/http";
26
import {
37
CUSTOM_ELEMENTS_SCHEMA,
48
ErrorHandler,
@@ -49,13 +53,13 @@ registerLocaleData(localeFr, "fr");
4953
GeneralModule,
5054
BrowserModule,
5155
FormsModule,
52-
HttpClientModule,
5356
NgbModule,
5457
SharedModule,
5558
ReactiveFormsModule,
5659
MATOMO_INJECTORS,
5760
],
5861
providers: [
62+
provideHttpClient(withInterceptorsFromDi()),
5963
{ provide: LOCALE_ID, useValue: "fr" },
6064
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
6165
{

packages/portail-admins/src/app/guards/auth-guard.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { APP_BASE_HREF } from "@angular/common";
2-
import { HttpClientTestingModule } from "@angular/common/http/testing";
32
import { inject, TestBed } from "@angular/core/testing";
43
import {
54
ActivatedRouteSnapshot,
@@ -10,6 +9,7 @@ import { RouterModule } from "@angular/router";
109
import { AdminAuthService } from "../modules/admin-auth/services/admin-auth.service";
1110
import { AuthGuard } from "./auth-guard";
1211
import { CustomToastService } from "../modules/shared/services";
12+
import { provideHttpClient } from "@angular/common/http";
1313

1414
describe("AuthGuard", () => {
1515
let authGuard: AuthGuard;
@@ -19,8 +19,9 @@ describe("AuthGuard", () => {
1919
let toastService: CustomToastService;
2020
beforeEach(() => {
2121
TestBed.configureTestingModule({
22-
imports: [HttpClientTestingModule, RouterModule],
22+
imports: [RouterModule],
2323
providers: [
24+
provideHttpClient(),
2425
AuthGuard,
2526
{
2627
provide: ActivatedRouteSnapshot,

packages/portail-admins/src/app/guards/redirect-guard.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { APP_BASE_HREF } from "@angular/common";
2-
import { HttpClientTestingModule } from "@angular/common/http/testing";
32
import { inject, TestBed } from "@angular/core/testing";
43
import { Router } from "@angular/router";
54
import { RouterModule } from "@angular/router";
65
import { AdminAuthService } from "../modules/admin-auth/services/admin-auth.service";
76
import { RoleRedirectGuard } from "./redirect-guard";
7+
import { provideHttpClient } from "@angular/common/http";
88

99
describe("RoleRedirectGuard", () => {
1010
let guard: RoleRedirectGuard;
@@ -13,8 +13,9 @@ describe("RoleRedirectGuard", () => {
1313

1414
beforeEach(() => {
1515
TestBed.configureTestingModule({
16-
imports: [HttpClientTestingModule, RouterModule],
16+
imports: [RouterModule],
1717
providers: [
18+
provideHttpClient(),
1819
RoleRedirectGuard,
1920
AdminAuthService,
2021
{ provide: APP_BASE_HREF, useValue: "/" },
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
import { CommonModule } from "@angular/common";
2-
import { HttpClientModule } from "@angular/common/http";
32
import { NgModule } from "@angular/core";
43
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
54
import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
65
import { SharedModule } from "../shared/shared.module";
76
import { AdminAuthRoutingModule } from "./admin-auth-routing.module";
87
import { AdminLoginComponent } from "./admin-login/admin-login.component";
98
import { AdminAuthService } from "./services/admin-auth.service";
9+
import {
10+
provideHttpClient,
11+
withInterceptorsFromDi,
12+
} from "@angular/common/http";
1013

1114
@NgModule({
1215
declarations: [AdminLoginComponent],
1316
imports: [
1417
CommonModule,
1518
AdminAuthRoutingModule,
16-
HttpClientModule,
1719
FormsModule,
1820
FontAwesomeModule,
1921
SharedModule,
2022
ReactiveFormsModule,
2123
],
22-
providers: [AdminAuthService],
24+
providers: [provideHttpClient(withInterceptorsFromDi()), AdminAuthService],
2325
})
2426
export class AdminAuthModule {}

packages/portail-admins/src/app/modules/admin-auth/admin-login/admin-login.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { HttpClientTestingModule } from "@angular/common/http/testing";
21
import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from "@angular/core";
32
import { ComponentFixture, TestBed } from "@angular/core/testing";
43
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
54
import { RouterModule } from "@angular/router";
65
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
76
import { AdminLoginComponent } from "./admin-login.component";
7+
import { provideHttpClient } from "@angular/common/http";
88

99
describe("AdminLoginComponent", () => {
1010
let component: AdminLoginComponent;
@@ -14,12 +14,12 @@ describe("AdminLoginComponent", () => {
1414
await TestBed.configureTestingModule({
1515
declarations: [AdminLoginComponent],
1616
imports: [
17-
HttpClientTestingModule,
1817
ReactiveFormsModule,
1918
NgbModule,
2019
FormsModule,
2120
RouterModule.forRoot([]),
2221
],
22+
providers: [provideHttpClient()],
2323
schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
2424
}).compileComponents();
2525
});

0 commit comments

Comments
 (0)