Merge branch 'master' into branding-css

fylein · Jan 21, 2025 · dfd75c5 · dfd75c5
2 parents c897659 + 1d05001
commit dfd75c5
Show file tree

Hide file tree

Showing 102 changed files with 12,848 additions and 5,016 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,18 +21,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/build-angular": "^17.3.8",
-    "@angular-eslint/schematics": "^17.5.1",
-    "@angular/animations": "^17.3.10",
-    "@angular/cli": "^17.3.8",
-    "@angular/common": "^17.3.10",
-    "@angular/compiler": "^17.3.10",
-    "@angular/compiler-cli": "^17.3.10",
-    "@angular/core": "^17.3.10",
-    "@angular/forms": "^17.3.10",
-    "@angular/platform-browser": "^17.3.10",
-    "@angular/platform-browser-dynamic": "^17.3.10",
-    "@angular/router": "^17.3.10",
+    "@angular-devkit/build-angular": "^18.2.12",
+    "@angular/animations": "^18.2.13",
+    "@angular/cli": "^18.2.12",
+    "@angular/common": "^18.2.13",
+    "@angular/compiler": "^18.2.13",
+    "@angular/compiler-cli": "^18.2.13",
+    "@angular/core": "^18.2.13",
+    "@angular/forms": "^18.2.13",
+    "@angular/platform-browser": "^18.2.13",
+    "@angular/platform-browser-dynamic": "^18.2.13",
+    "@angular/router": "^18.2.13",
     "@auth0/angular-jwt": "^5.1.0",
     "@rxweb/reactive-form-validators": "^2.1.6",
     "@sentry/angular": "^8.18.0",
@@ -55,6 +54,7 @@
     "@angular-eslint/builder": "14.1.2",
     "@angular-eslint/eslint-plugin": "14.1.2",
     "@angular-eslint/eslint-plugin-template": "14.1.2",
+    "@angular-eslint/schematics": "^18.4.3",
     "@angular-eslint/template-parser": "14.1.2",
     "@compodoc/compodoc": "^1.1.23",
     "@storybook/addon-docs": "^7.6.3",

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -5,7 +5,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 // External Libraries
 import { IconSpriteModule } from 'ng-svg-icon-sprite';
@@ -22,52 +22,46 @@ import { Sage300ConfigurationModule } from './integrations/sage300/sage300-main/
 import * as Sentry from "@sentry/angular";
 import { Router } from '@angular/router';
 
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule,
-    AppRoutingModule,
-    BrowserAnimationsModule,
-    HttpClientModule,
-    ToastModule,
-    SharedModule,
-    RippleModule,
-    IconSpriteModule.forRoot({ path: 'assets/sprites/sprite.svg' }),
-    Sage300ConfigurationModule
-  ],
-  providers: [
-    MessageService,
-    {
-      provide: JWT_OPTIONS,
-      useValue: JWT_OPTIONS
-    },
-    JwtHelperService,
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: JwtInterceptor,
-      multi: true
-    },
-    {
-      provide: ErrorHandler,
-      useClass: GlobalErrorHandler
-    },
-    {
-      provide: ErrorHandler,
-      useValue: Sentry.createErrorHandler()
-    },
-    {
-      provide: Sentry.TraceService,
-      deps: [Router]
-    },
-    {
-      provide: APP_INITIALIZER,
-      useFactory: (brandingService: BrandingService) => () => brandingService.init(),
-      deps: [BrandingService, Sentry.TraceService],
-      multi: true
-    }
-  ],
-  bootstrap: [AppComponent]
-})
+@NgModule({ declarations: [
+        AppComponent
+    ],
+    bootstrap: [AppComponent], imports: [BrowserModule,
+        AppRoutingModule,
+        BrowserAnimationsModule,
+        ToastModule,
+        SharedModule,
+        RippleModule,
+        IconSpriteModule.forRoot({ path: 'assets/sprites/sprite.svg' }),
+        Sage300ConfigurationModule], providers: [
+        MessageService,
+        {
+            provide: JWT_OPTIONS,
+            useValue: JWT_OPTIONS
+        },
+        JwtHelperService,
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: JwtInterceptor,
+            multi: true
+        },
+        {
+            provide: ErrorHandler,
+            useClass: GlobalErrorHandler
+        },
+        {
+            provide: ErrorHandler,
+            useValue: Sentry.createErrorHandler()
+        },
+        {
+            provide: Sentry.TraceService,
+            deps: [Router]
+        },
+        {
+            provide: APP_INITIALIZER,
+            useFactory: (brandingService: BrandingService) => () => brandingService.init(),
+            deps: [BrandingService, Sentry.TraceService],
+            multi: true
+        },
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
 export class AppModule { }
diff --git a/src/app/auth/login/login.component.spec.ts b/src/app/auth/login/login.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -23,23 +23,22 @@ xdescribe('LoginComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        HttpClientModule, RouterTestingModule
-      ],
-      declarations: [ LoginComponent ],
-      providers: [
+    declarations: [LoginComponent],
+    imports: [RouterTestingModule],
+    providers: [
         {
-          provide: ActivatedRoute,
-          useValue: {
-            queryParams: of({
-              code: 'dummy-auth-code'
-            })
-          }
+            provide: ActivatedRoute,
+            useValue: {
+                queryParams: of({
+                    code: 'dummy-auth-code'
+                })
+            }
         },
-        { provide: AuthService, useValue: service1},
-        { provide: Router, useValue: routerSpy }
-      ]
-    })
+        { provide: AuthService, useValue: service1 },
+        { provide: Router, useValue: routerSpy },
+        provideHttpClient(withInterceptorsFromDi())
+    ]
+})
     .compileComponents();
 
     fixture = TestBed.createComponent(LoginComponent);