From e252680c65ed566fd5f3481b1da6cd6ba06f688c Mon Sep 17 00:00:00 2001
From: Amritanshu <git@tanshu.com>
Date: Fri, 31 May 2024 10:13:42 +0530
Subject: [PATCH] Chore: Upgraded to Angular v18
---
overlord/package.json | 48 +++++++++----------
.../app/account/account-type.service.spec.ts | 6 +--
overlord/src/app/app.module.ts | 7 ++-
.../app/attendance/attendance.service.spec.ts | 6 +--
overlord/src/app/auth/auth.service.spec.ts | 6 +--
.../app/auth/login/login.component.spec.ts | 5 +-
.../app/auth/logout/logout.component.spec.ts | 5 +-
.../balance-sheet.service.spec.ts | 6 +--
.../batch-integrity-report.component.spec.ts | 5 +-
.../batch-integrity-report.service.spec.ts | 6 +--
.../app/cash-flow/cash-flow.service.spec.ts | 6 +--
.../src/app/client/client.service.spec.ts | 6 +--
.../closing-stock.service.spec.ts | 6 +--
overlord/src/app/core/account.service.spec.ts | 6 +--
overlord/src/app/core/tag.service.spec.ts | 6 +--
overlord/src/app/core/voucher.service.spec.ts | 6 +--
.../cost-centre/cost-centre.service.spec.ts | 6 +--
.../src/app/daybook/daybook.service.spec.ts | 6 +--
.../src/app/employee/employee.service.spec.ts | 6 +--
.../src/app/entries/entries.component.spec.ts | 5 +-
.../src/app/entries/entries.service.spec.ts | 6 +--
.../src/app/issue/issue-grid.service.spec.ts | 6 +--
.../src/app/ledger/ledger.component.spec.ts | 5 +-
.../src/app/ledger/ledger.service.spec.ts | 6 +--
.../net-transactions.service.spec.ts | 6 +--
.../non-contract-purchase.component.spec.ts | 5 +-
.../non-contract-purchase.service.spec.ts | 6 +--
.../src/app/period/period.service.spec.ts | 6 +--
.../product-group.service.spec.ts | 6 +--
.../product-ledger.component.spec.ts | 5 +-
.../product-ledger.service.spec.ts | 6 +--
.../src/app/product/product.service.spec.ts | 6 +--
.../profit-loss/profit-loss.service.spec.ts | 6 +--
.../purchase-entries.service.spec.ts | 6 +--
.../app/purchases/purchases.service.spec.ts | 6 +--
.../rate-contract.service.spec.ts | 6 +--
.../raw-material-cost.service.spec.ts | 6 +--
.../recipe-template.service.spec.ts | 6 +--
.../src/app/recipe/recipe.service.spec.ts | 6 +--
overlord/src/app/role/role.service.spec.ts | 6 +--
.../stock-movement.service.spec.ts | 6 +--
.../trial-balance.service.spec.ts | 6 +--
overlord/src/app/user/user.service.spec.ts | 6 +--
43 files changed, 150 insertions(+), 144 deletions(-)
diff --git a/overlord/package.json b/overlord/package.json
index e546ac67..5b01c0a6 100644
--- a/overlord/package.json
+++ b/overlord/package.json
@@ -14,17 +14,17 @@
},
"private": true,
"dependencies": {
- "@angular/animations": "^17.3.6",
- "@angular/cdk": "^17.3.6",
- "@angular/common": "^17.3.6",
- "@angular/compiler": "^17.3.6",
- "@angular/core": "^17.3.6",
- "@angular/forms": "^17.3.6",
- "@angular/material": "^17.3.6",
- "@angular/material-moment-adapter": "^17.3.6",
- "@angular/platform-browser": "^17.3.6",
- "@angular/platform-browser-dynamic": "^17.3.6",
- "@angular/router": "^17.3.6",
+ "@angular/animations": "^18.0.1",
+ "@angular/cdk": "^18.0.1",
+ "@angular/common": "^18.0.1",
+ "@angular/compiler": "^18.0.1",
+ "@angular/core": "^18.0.1",
+ "@angular/forms": "^18.0.1",
+ "@angular/material": "^18.0.1",
+ "@angular/material-moment-adapter": "^18.0.1",
+ "@angular/platform-browser": "^18.0.1",
+ "@angular/platform-browser-dynamic": "^18.0.1",
+ "@angular/router": "^18.0.1",
"@ngx-loading-bar/core": "^6.0.2",
"@ngx-loading-bar/http-client": "^6.0.2",
"@ngx-loading-bar/router": "^6.0.2",
@@ -37,18 +37,18 @@
"zone.js": "~0.14.4"
},
"devDependencies": {
- "@angular-devkit/build-angular": "^17.3.6",
- "@angular-eslint/builder": "^17.3.0",
- "@angular-eslint/eslint-plugin": "^17.3.0",
- "@angular-eslint/eslint-plugin-template": "^17.3.0",
- "@angular-eslint/schematics": "^17.3.0",
- "@angular-eslint/template-parser": "^17.3.0",
- "@angular/cli": "^17.3.6",
- "@angular/compiler-cli": "^17.3.6",
- "@angular/language-service": "^17.3.6",
+ "@angular-devkit/build-angular": "^18.0.2",
+ "@angular-eslint/builder": "^18.0.1",
+ "@angular-eslint/eslint-plugin": "^18.0.1",
+ "@angular-eslint/eslint-plugin-template": "^18.0.1",
+ "@angular-eslint/schematics": "^18.0.1",
+ "@angular-eslint/template-parser": "^18.0.1",
+ "@angular/cli": "^18.0.2",
+ "@angular/compiler-cli": "^18.0.1",
+ "@angular/language-service": "^18.0.1",
"@types/jasmine": "~5.1.4",
- "@typescript-eslint/eslint-plugin": "^7.2.0",
- "@typescript-eslint/parser": "^7.2.0",
+ "@typescript-eslint/eslint-plugin": "^7.11.0",
+ "@typescript-eslint/parser": "^7.11.0",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
@@ -62,7 +62,7 @@
"karma-coverage": "~2.2.1",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
- "lint-staged": "^15.2.2",
+ "lint-staged": "^15.2.5",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"standard-version": "^9.5.0",
@@ -82,4 +82,4 @@
"npx eslint --cache --fix"
]
}
-}
+}
\ No newline at end of file
diff --git a/overlord/src/app/account/account-type.service.spec.ts b/overlord/src/app/account/account-type.service.spec.ts
index f0e5e8e7..713fc88a 100644
--- a/overlord/src/app/account/account-type.service.spec.ts
+++ b/overlord/src/app/account/account-type.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { AccountTypeService } from './account-type.service';
@@ -6,8 +6,8 @@ import { AccountTypeService } from './account-type.service';
describe('AccountTypeService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [AccountTypeService],
+ imports: [],
+ providers: [AccountTypeService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/app.module.ts b/overlord/src/app/app.module.ts
index 242d0d69..13938a3e 100644
--- a/overlord/src/app/app.module.ts
+++ b/overlord/src/app/app.module.ts
@@ -1,6 +1,6 @@
import { LayoutModule } from '@angular/cdk/layout';
import { registerLocaleData } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import enIN from '@angular/common/locales/en-IN';
import { LOCALE_ID, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
@@ -35,11 +35,11 @@ registerLocaleData(enIN);
@NgModule({
declarations: [AppComponent, LoginComponent, LogoutComponent, HomeComponent],
+ bootstrap: [AppComponent],
imports: [
BrowserModule,
BrowserAnimationsModule,
HotkeyModule.forRoot(),
- HttpClientModule,
LayoutModule,
MatButtonModule,
MatCardModule,
@@ -60,7 +60,6 @@ registerLocaleData(enIN);
CoreModule,
AppRoutingModule,
],
- providers: [{ provide: LOCALE_ID, useValue: 'en-IN' }, AuthService],
- bootstrap: [AppComponent],
+ providers: [{ provide: LOCALE_ID, useValue: 'en-IN' }, AuthService, provideHttpClient(withInterceptorsFromDi())],
})
export class AppModule {}
diff --git a/overlord/src/app/attendance/attendance.service.spec.ts b/overlord/src/app/attendance/attendance.service.spec.ts
index 4814f723..d2c1cf8c 100644
--- a/overlord/src/app/attendance/attendance.service.spec.ts
+++ b/overlord/src/app/attendance/attendance.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { AttendanceService } from './attendance.service';
@@ -6,8 +6,8 @@ import { AttendanceService } from './attendance.service';
describe('AttendanceService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [AttendanceService],
+ imports: [],
+ providers: [AttendanceService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/auth/auth.service.spec.ts b/overlord/src/app/auth/auth.service.spec.ts
index 60c47166..8961b355 100644
--- a/overlord/src/app/auth/auth.service.spec.ts
+++ b/overlord/src/app/auth/auth.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { AuthService } from './auth.service';
@@ -6,8 +6,8 @@ import { AuthService } from './auth.service';
describe('AuthService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [AuthService],
+ imports: [],
+ providers: [AuthService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/auth/login/login.component.spec.ts b/overlord/src/app/auth/login/login.component.spec.ts
index a9ad8809..e962a3f4 100644
--- a/overlord/src/app/auth/login/login.component.spec.ts
+++ b/overlord/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, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
@@ -10,8 +10,9 @@ describe('LoginComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule, RouterTestingModule],
declarations: [LoginComponent],
+ imports: [RouterTestingModule],
+ providers: [provideHttpClient(withInterceptorsFromDi())],
}).compileComponents();
}));
diff --git a/overlord/src/app/auth/logout/logout.component.spec.ts b/overlord/src/app/auth/logout/logout.component.spec.ts
index f8a7f04a..36b2ed8f 100644
--- a/overlord/src/app/auth/logout/logout.component.spec.ts
+++ b/overlord/src/app/auth/logout/logout.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
@@ -10,8 +10,9 @@ describe('LogoutComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule, RouterTestingModule],
declarations: [LogoutComponent],
+ imports: [RouterTestingModule],
+ providers: [provideHttpClient(withInterceptorsFromDi())],
}).compileComponents();
}));
diff --git a/overlord/src/app/balance-sheet/balance-sheet.service.spec.ts b/overlord/src/app/balance-sheet/balance-sheet.service.spec.ts
index dbd8e1cb..d04e3545 100644
--- a/overlord/src/app/balance-sheet/balance-sheet.service.spec.ts
+++ b/overlord/src/app/balance-sheet/balance-sheet.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { BalanceSheetService } from './balance-sheet.service';
@@ -6,8 +6,8 @@ import { BalanceSheetService } from './balance-sheet.service';
describe('BalanceSheetService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [BalanceSheetService],
+ imports: [],
+ providers: [BalanceSheetService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.spec.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.spec.ts
index 4acee8eb..d636c6e3 100644
--- a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.spec.ts
+++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
@@ -10,8 +10,9 @@ describe('BatchIntegrityComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule, RouterTestingModule],
declarations: [BatchIntegrityReportComponent],
+ imports: [RouterTestingModule],
+ providers: [provideHttpClient(withInterceptorsFromDi())],
}).compileComponents();
}));
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts
index f2347459..9a84b68f 100644
--- a/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts
+++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { BatchIntegrityReportService } from './batch-integrity-report.service';
@@ -6,8 +6,8 @@ import { BatchIntegrityReportService } from './batch-integrity-report.service';
describe('BatchIntegrityService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [BatchIntegrityReportService],
+ imports: [],
+ providers: [BatchIntegrityReportService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/cash-flow/cash-flow.service.spec.ts b/overlord/src/app/cash-flow/cash-flow.service.spec.ts
index 76fd1dd1..e0e343c5 100644
--- a/overlord/src/app/cash-flow/cash-flow.service.spec.ts
+++ b/overlord/src/app/cash-flow/cash-flow.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { CashFlowService } from './cash-flow.service';
@@ -6,8 +6,8 @@ import { CashFlowService } from './cash-flow.service';
describe('CashFlowService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [CashFlowService],
+ imports: [],
+ providers: [CashFlowService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/client/client.service.spec.ts b/overlord/src/app/client/client.service.spec.ts
index ccfe428f..4f5581dd 100644
--- a/overlord/src/app/client/client.service.spec.ts
+++ b/overlord/src/app/client/client.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ClientService } from './client.service';
@@ -6,8 +6,8 @@ import { ClientService } from './client.service';
describe('ClientService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [ClientService],
+ imports: [],
+ providers: [ClientService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/closing-stock/closing-stock.service.spec.ts b/overlord/src/app/closing-stock/closing-stock.service.spec.ts
index 7cf3d6c3..b606ec13 100644
--- a/overlord/src/app/closing-stock/closing-stock.service.spec.ts
+++ b/overlord/src/app/closing-stock/closing-stock.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ClosingStockService } from './closing-stock.service';
@@ -6,8 +6,8 @@ import { ClosingStockService } from './closing-stock.service';
describe('ClosingStockService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [ClosingStockService],
+ imports: [],
+ providers: [ClosingStockService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/core/account.service.spec.ts b/overlord/src/app/core/account.service.spec.ts
index 24338dd7..8749da6a 100644
--- a/overlord/src/app/core/account.service.spec.ts
+++ b/overlord/src/app/core/account.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { AccountService } from './account.service';
@@ -6,8 +6,8 @@ import { AccountService } from './account.service';
describe('AccountService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [AccountService],
+ imports: [],
+ providers: [AccountService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/core/tag.service.spec.ts b/overlord/src/app/core/tag.service.spec.ts
index 72d89f75..c5e5ae16 100644
--- a/overlord/src/app/core/tag.service.spec.ts
+++ b/overlord/src/app/core/tag.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { TagService } from './tag.service';
@@ -6,8 +6,8 @@ import { TagService } from './tag.service';
describe('TagService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [TagService],
+ imports: [],
+ providers: [TagService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/core/voucher.service.spec.ts b/overlord/src/app/core/voucher.service.spec.ts
index 42c96843..d1a71b35 100644
--- a/overlord/src/app/core/voucher.service.spec.ts
+++ b/overlord/src/app/core/voucher.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { VoucherService } from './voucher.service';
@@ -6,8 +6,8 @@ import { VoucherService } from './voucher.service';
describe('VoucherService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [VoucherService],
+ imports: [],
+ providers: [VoucherService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/cost-centre/cost-centre.service.spec.ts b/overlord/src/app/cost-centre/cost-centre.service.spec.ts
index 40925391..bcdb964d 100644
--- a/overlord/src/app/cost-centre/cost-centre.service.spec.ts
+++ b/overlord/src/app/cost-centre/cost-centre.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { CostCentreService } from './cost-centre.service';
@@ -6,8 +6,8 @@ import { CostCentreService } from './cost-centre.service';
describe('CostCentreService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [CostCentreService],
+ imports: [],
+ providers: [CostCentreService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/daybook/daybook.service.spec.ts b/overlord/src/app/daybook/daybook.service.spec.ts
index 80e55074..cc68f73a 100644
--- a/overlord/src/app/daybook/daybook.service.spec.ts
+++ b/overlord/src/app/daybook/daybook.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { DaybookService } from './daybook.service';
@@ -6,8 +6,8 @@ import { DaybookService } from './daybook.service';
describe('DaybookService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [DaybookService],
+ imports: [],
+ providers: [DaybookService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/employee/employee.service.spec.ts b/overlord/src/app/employee/employee.service.spec.ts
index 6cc0f65c..84318c71 100644
--- a/overlord/src/app/employee/employee.service.spec.ts
+++ b/overlord/src/app/employee/employee.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { EmployeeService } from './employee.service';
@@ -6,8 +6,8 @@ import { EmployeeService } from './employee.service';
describe('EmployeeService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [EmployeeService],
+ imports: [],
+ providers: [EmployeeService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/entries/entries.component.spec.ts b/overlord/src/app/entries/entries.component.spec.ts
index cd38d636..e5cce750 100644
--- a/overlord/src/app/entries/entries.component.spec.ts
+++ b/overlord/src/app/entries/entries.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
@@ -10,8 +10,9 @@ describe('EntriesComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule, RouterTestingModule],
declarations: [EntriesComponent],
+ imports: [RouterTestingModule],
+ providers: [provideHttpClient(withInterceptorsFromDi())],
}).compileComponents();
}));
diff --git a/overlord/src/app/entries/entries.service.spec.ts b/overlord/src/app/entries/entries.service.spec.ts
index 47f28f3d..60b8ab79 100644
--- a/overlord/src/app/entries/entries.service.spec.ts
+++ b/overlord/src/app/entries/entries.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { EntriesService } from './entries.service';
@@ -6,8 +6,8 @@ import { EntriesService } from './entries.service';
describe('EntriesService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [EntriesService],
+ imports: [],
+ providers: [EntriesService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/issue/issue-grid.service.spec.ts b/overlord/src/app/issue/issue-grid.service.spec.ts
index 34783a30..746f3bb6 100644
--- a/overlord/src/app/issue/issue-grid.service.spec.ts
+++ b/overlord/src/app/issue/issue-grid.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { TestBed, inject } from '@angular/core/testing';
import { IssueGridService } from './issue-grid.service';
@@ -6,8 +6,8 @@ import { IssueGridService } from './issue-grid.service';
describe('IssueGridService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [IssueGridService],
+ imports: [],
+ providers: [IssueGridService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/ledger/ledger.component.spec.ts b/overlord/src/app/ledger/ledger.component.spec.ts
index f4949db6..2d9165ed 100644
--- a/overlord/src/app/ledger/ledger.component.spec.ts
+++ b/overlord/src/app/ledger/ledger.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing';
@@ -11,8 +11,9 @@ describe('LedgerComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule, ReactiveFormsModule, RouterTestingModule],
declarations: [LedgerComponent],
+ imports: [ReactiveFormsModule, RouterTestingModule],
+ providers: [provideHttpClient(withInterceptorsFromDi())],
}).compileComponents();
}));
diff --git a/overlord/src/app/ledger/ledger.service.spec.ts b/overlord/src/app/ledger/ledger.service.spec.ts
index e6e9a754..37e04827 100644
--- a/overlord/src/app/ledger/ledger.service.spec.ts
+++ b/overlord/src/app/ledger/ledger.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { LedgerService } from './ledger.service';
@@ -6,8 +6,8 @@ import { LedgerService } from './ledger.service';
describe('LedgerService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [LedgerService],
+ imports: [],
+ providers: [LedgerService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/net-transactions/net-transactions.service.spec.ts b/overlord/src/app/net-transactions/net-transactions.service.spec.ts
index 915e74c5..a183e07c 100644
--- a/overlord/src/app/net-transactions/net-transactions.service.spec.ts
+++ b/overlord/src/app/net-transactions/net-transactions.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { NetTransactionsService } from './net-transactions.service';
@@ -6,8 +6,8 @@ import { NetTransactionsService } from './net-transactions.service';
describe('NetTransactionsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [NetTransactionsService],
+ imports: [],
+ providers: [NetTransactionsService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.spec.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.spec.ts
index be4a6d06..6c1de391 100644
--- a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.spec.ts
+++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
@@ -10,8 +10,9 @@ describe('NonContractPurchaseComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule, RouterTestingModule],
declarations: [NonContractPurchaseComponent],
+ imports: [RouterTestingModule],
+ providers: [provideHttpClient(withInterceptorsFromDi())],
}).compileComponents();
}));
diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts
index b9165ffa..5e84ea3e 100644
--- a/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts
+++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { NonContractPurchaseService } from './non-contract-purchase.service';
@@ -6,8 +6,8 @@ import { NonContractPurchaseService } from './non-contract-purchase.service';
describe('NonContractPurchaseService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [NonContractPurchaseService],
+ imports: [],
+ providers: [NonContractPurchaseService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/period/period.service.spec.ts b/overlord/src/app/period/period.service.spec.ts
index a550c507..a46fb1c5 100644
--- a/overlord/src/app/period/period.service.spec.ts
+++ b/overlord/src/app/period/period.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { PeriodService } from './period.service';
@@ -6,8 +6,8 @@ import { PeriodService } from './period.service';
describe('PeriodService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [PeriodService],
+ imports: [],
+ providers: [PeriodService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/product-group/product-group.service.spec.ts b/overlord/src/app/product-group/product-group.service.spec.ts
index 474fdb14..8d38a4c3 100644
--- a/overlord/src/app/product-group/product-group.service.spec.ts
+++ b/overlord/src/app/product-group/product-group.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ProductGroupService } from './product-group.service';
@@ -6,8 +6,8 @@ import { ProductGroupService } from './product-group.service';
describe('ProductGroupService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [ProductGroupService],
+ imports: [],
+ providers: [ProductGroupService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/product-ledger/product-ledger.component.spec.ts b/overlord/src/app/product-ledger/product-ledger.component.spec.ts
index c97282f3..dfbcfab8 100644
--- a/overlord/src/app/product-ledger/product-ledger.component.spec.ts
+++ b/overlord/src/app/product-ledger/product-ledger.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing';
@@ -11,8 +11,9 @@ describe('ProductLedgerComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule, ReactiveFormsModule, RouterTestingModule],
declarations: [ProductLedgerComponent],
+ imports: [ReactiveFormsModule, RouterTestingModule],
+ providers: [provideHttpClient(withInterceptorsFromDi())],
}).compileComponents();
}));
diff --git a/overlord/src/app/product-ledger/product-ledger.service.spec.ts b/overlord/src/app/product-ledger/product-ledger.service.spec.ts
index eb4864c5..f0b03184 100644
--- a/overlord/src/app/product-ledger/product-ledger.service.spec.ts
+++ b/overlord/src/app/product-ledger/product-ledger.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ProductLedgerService } from './product-ledger.service';
@@ -6,8 +6,8 @@ import { ProductLedgerService } from './product-ledger.service';
describe('ProductLedgerService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [ProductLedgerService],
+ imports: [],
+ providers: [ProductLedgerService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/product/product.service.spec.ts b/overlord/src/app/product/product.service.spec.ts
index 85555f5e..c8fcb560 100644
--- a/overlord/src/app/product/product.service.spec.ts
+++ b/overlord/src/app/product/product.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ProductService } from './product.service';
@@ -6,8 +6,8 @@ import { ProductService } from './product.service';
describe('ProductService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [ProductService],
+ imports: [],
+ providers: [ProductService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/profit-loss/profit-loss.service.spec.ts b/overlord/src/app/profit-loss/profit-loss.service.spec.ts
index 8fd3bac2..0dc90189 100644
--- a/overlord/src/app/profit-loss/profit-loss.service.spec.ts
+++ b/overlord/src/app/profit-loss/profit-loss.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { ProfitLossService } from './profit-loss.service';
@@ -6,8 +6,8 @@ import { ProfitLossService } from './profit-loss.service';
describe('ProfitLossService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [ProfitLossService],
+ imports: [],
+ providers: [ProfitLossService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/purchase-entries/purchase-entries.service.spec.ts b/overlord/src/app/purchase-entries/purchase-entries.service.spec.ts
index 5cbe8741..0fbbc419 100644
--- a/overlord/src/app/purchase-entries/purchase-entries.service.spec.ts
+++ b/overlord/src/app/purchase-entries/purchase-entries.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { PurchaseEntriesService } from './purchase-entries.service';
@@ -6,8 +6,8 @@ import { PurchaseEntriesService } from './purchase-entries.service';
describe('PurchaseEntriesService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [PurchaseEntriesService],
+ imports: [],
+ providers: [PurchaseEntriesService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/purchases/purchases.service.spec.ts b/overlord/src/app/purchases/purchases.service.spec.ts
index 3e5fc216..3dffedbe 100644
--- a/overlord/src/app/purchases/purchases.service.spec.ts
+++ b/overlord/src/app/purchases/purchases.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { PurchasesService } from './purchases.service';
@@ -6,8 +6,8 @@ import { PurchasesService } from './purchases.service';
describe('PurchasesService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [PurchasesService],
+ imports: [],
+ providers: [PurchasesService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/rate-contract/rate-contract.service.spec.ts b/overlord/src/app/rate-contract/rate-contract.service.spec.ts
index 5a4897bc..8abbbf2b 100644
--- a/overlord/src/app/rate-contract/rate-contract.service.spec.ts
+++ b/overlord/src/app/rate-contract/rate-contract.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { RateContractService } from './rate-contract.service';
@@ -6,8 +6,8 @@ import { RateContractService } from './rate-contract.service';
describe('RateContractService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [RateContractService],
+ imports: [],
+ providers: [RateContractService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.service.spec.ts b/overlord/src/app/raw-material-cost/raw-material-cost.service.spec.ts
index 905d9a12..169d0519 100644
--- a/overlord/src/app/raw-material-cost/raw-material-cost.service.spec.ts
+++ b/overlord/src/app/raw-material-cost/raw-material-cost.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { RawMaterialCostService } from './raw-material-cost.service';
@@ -6,8 +6,8 @@ import { RawMaterialCostService } from './raw-material-cost.service';
describe('RawMaterialCostService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [RawMaterialCostService],
+ imports: [],
+ providers: [RawMaterialCostService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/recipe-template/recipe-template.service.spec.ts b/overlord/src/app/recipe-template/recipe-template.service.spec.ts
index 8a4cf405..a0f31fac 100644
--- a/overlord/src/app/recipe-template/recipe-template.service.spec.ts
+++ b/overlord/src/app/recipe-template/recipe-template.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { RecipeTemplateService } from './recipe-template.service';
@@ -6,8 +6,8 @@ import { RecipeTemplateService } from './recipe-template.service';
describe('RecipeTemplateService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [RecipeTemplateService],
+ imports: [],
+ providers: [RecipeTemplateService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/recipe/recipe.service.spec.ts b/overlord/src/app/recipe/recipe.service.spec.ts
index d17f5b2c..5d821a01 100644
--- a/overlord/src/app/recipe/recipe.service.spec.ts
+++ b/overlord/src/app/recipe/recipe.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { RecipeService } from './recipe.service';
@@ -6,8 +6,8 @@ import { RecipeService } from './recipe.service';
describe('ProductService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [RecipeService],
+ imports: [],
+ providers: [RecipeService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/role/role.service.spec.ts b/overlord/src/app/role/role.service.spec.ts
index 93ad5341..5c6a1df3 100644
--- a/overlord/src/app/role/role.service.spec.ts
+++ b/overlord/src/app/role/role.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { RoleService } from './role.service';
@@ -6,8 +6,8 @@ import { RoleService } from './role.service';
describe('RoleService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [RoleService],
+ imports: [],
+ providers: [RoleService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/stock-movement/stock-movement.service.spec.ts b/overlord/src/app/stock-movement/stock-movement.service.spec.ts
index 142788b8..9659a20f 100644
--- a/overlord/src/app/stock-movement/stock-movement.service.spec.ts
+++ b/overlord/src/app/stock-movement/stock-movement.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { StockMovementService } from './stock-movement.service';
@@ -6,8 +6,8 @@ import { StockMovementService } from './stock-movement.service';
describe('StockMovementService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [StockMovementService],
+ imports: [],
+ providers: [StockMovementService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/trial-balance/trial-balance.service.spec.ts b/overlord/src/app/trial-balance/trial-balance.service.spec.ts
index 769faeb0..b834e0ea 100644
--- a/overlord/src/app/trial-balance/trial-balance.service.spec.ts
+++ b/overlord/src/app/trial-balance/trial-balance.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { TrialBalanceService } from './trial-balance.service';
@@ -6,8 +6,8 @@ import { TrialBalanceService } from './trial-balance.service';
describe('TrialBalanceService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [TrialBalanceService],
+ imports: [],
+ providers: [TrialBalanceService, provideHttpClient(withInterceptorsFromDi())],
});
});
diff --git a/overlord/src/app/user/user.service.spec.ts b/overlord/src/app/user/user.service.spec.ts
index cb61fe54..88495aaa 100644
--- a/overlord/src/app/user/user.service.spec.ts
+++ b/overlord/src/app/user/user.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { UserService } from './user.service';
@@ -6,8 +6,8 @@ import { UserService } from './user.service';
describe('UserService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientModule],
- providers: [UserService],
+ imports: [],
+ providers: [UserService, provideHttpClient(withInterceptorsFromDi())],
});
});