Merge pull request #340 from bcgov/dev-JC-NP-FOIMOD-3405

Dev jc np foimod 3405
bcgov · Sep 10, 2024 · 5e630d3 · 5e630d3
2 parents 1781523 + 6d6d190
commit 5e630d3
Show file tree

Hide file tree

Showing 14 changed files with 570 additions and 489 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -28,30 +28,29 @@
     "@angular/router": "^18.2.1",
     "@danielmoncada/angular-datetime-picker": "^18.1.0",
     "@danielmoncada/angular-datetime-picker-moment-adapter": "^5.0.0",
-    "@fortawesome/angular-fontawesome": "^0.14.1",
+    "@fortawesome/angular-fontawesome": "^0.15.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.14.0",
     "bootstrap": "^4.2.1",
     "core-js": "^2.5.4",
     "jwt-decode": "^2.2.0",
     "keycloak-js": "^4.5.0",
     "loader-utils": "3.2.1",
-    "ng-pick-datetime": "^7.0.0",
-    "ngx-webstorage": "^13.0.1",
+    "ngx-webstorage": "^14.0.0",
     "rxjs": "~7.8.1",
-    "tslib": "^1.9.0",
-    "zone.js": "^0.11.4"
+    "tslib": "^2.7.0",
+    "zone.js": "^0.14.10"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^18.2.1",
     "@angular/cli": "^18.2.1",
     "@angular/compiler-cli": "^18.2.1",
     "@angular/language-service": "^18.2.1",
-    "@ngtools/webpack": "^17.3.8",
+    "@ngtools/webpack": "^18.2.3",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^8.9.5",
-    "codelyzer": "~4.5.0",
+    "codelyzer": "^6.0.2",
     "concurrently": "^4.1.0",
     "http-server": "^14.1.1",
     "jasmine-core": "~2.99.1",

diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts
@@ -1,48 +1,42 @@
-import { BrowserModule } from '@angular/platform-browser';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {APP_INITIALIZER, NgModule} from '@angular/core';
+import { BrowserModule } from "@angular/platform-browser";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { APP_INITIALIZER, NgModule } from "@angular/core";
 
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { CoreHeaderComponent } from './core-header/core-header.component';
-import { ProgressBarComponent } from './progress-bar/progress-bar.component';
-import { TransomApiClientService } from './transom-api-client.service';
-import { HttpClientModule } from '@angular/common/http';
-import { NgxWebstorageModule } from 'ngx-webstorage';
-import { ServicesModule } from './services/services.module';
-import { RouteComponentsModule } from './route-components/route-components.module';
-import { FooterComponent } from './footer/footer.component';
-import { ReactiveFormsModule } from '@angular/forms';
-import { SigninComponent } from './route-components/signin/signin.component';
-import {AppConfigService} from './services/app-config.service';
+import { AppRoutingModule } from "./app-routing.module";
+import { AppComponent } from "./app.component";
+import { CoreHeaderComponent } from "./core-header/core-header.component";
+import { ProgressBarComponent } from "./progress-bar/progress-bar.component";
+import { TransomApiClientService } from "./transom-api-client.service";
+import { HttpClientModule } from "@angular/common/http";
+import { provideNgxWebstorage } from "ngx-webstorage";
+import { ServicesModule } from "./services/services.module";
+import { RouteComponentsModule } from "./route-components/route-components.module";
+import { FooterComponent } from "./footer/footer.component";
+import { ReactiveFormsModule } from "@angular/forms";
+import { SigninComponent } from "./route-components/signin/signin.component";
+import { AppConfigService } from "./services/app-config.service";
 
 export function init_app(appConfigService: AppConfigService) {
   return () => appConfigService.load();
 }
 
-
 @NgModule({
-  declarations: [
-    AppComponent,
-    CoreHeaderComponent,
-    ProgressBarComponent,
-    FooterComponent,
-    SigninComponent
-  ],
+  declarations: [AppComponent, CoreHeaderComponent, ProgressBarComponent, FooterComponent, SigninComponent],
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
     AppRoutingModule,
     HttpClientModule,
     ServicesModule,
     RouteComponentsModule,
-    NgxWebstorageModule.forRoot(),
-    ReactiveFormsModule
+    // NgxWebstorageModule.forRoot(),
+    ReactiveFormsModule,
   ],
   providers: [
     TransomApiClientService,
     AppConfigService,
-    { provide: APP_INITIALIZER, useFactory: init_app, deps: [AppConfigService], multi: true }
+    { provide: APP_INITIALIZER, useFactory: init_app, deps: [AppConfigService], multi: true },
+    provideNgxWebstorage(),
 
     // {
     //   provide: APP_INITIALIZER,
@@ -51,6 +45,6 @@ export function init_app(appConfigService: AppConfigService) {
     //   multi: true
     // }
   ],
-  bootstrap: [AppComponent, FooterComponent]
+  bootstrap: [AppComponent, FooterComponent],
 })
-export class AppModule { }
+export class AppModule {}
diff --git a/web/src/app/route-components/adoptive-parents/adoptive-parents.component.spec.ts b/web/src/app/route-components/adoptive-parents/adoptive-parents.component.spec.ts
@@ -7,7 +7,7 @@ import { DataService } from "src/app/services/data.service";
 import { Router } from "@angular/router";
 import { FoiValidComponent } from "src/app/utils-components/foi-valid/foi-valid.component";
 import { FoiRequest } from "src/app/models/FoiRequest";
-import { NgxWebstorageModule } from "ngx-webstorage";
+import { provideNgxWebstorage } from "ngx-webstorage";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { OwlNativeDateTimeModule, OwlDateTimeModule } from "@danielmoncada/angular-datetime-picker";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
@@ -29,12 +29,11 @@ describe("AdoptiveParentsComponent", () => {
       imports: [
         HttpClientTestingModule,
         ReactiveFormsModule,
-        NgxWebstorageModule.forRoot(),
         OwlDateTimeModule,
         OwlNativeDateTimeModule,
         FontAwesomeModule,
       ],
-      providers: [DataService, { provide: Router, useClass: MockRouter }],
+      providers: [DataService, { provide: Router, useClass: MockRouter }, provideNgxWebstorage()],
     }).compileComponents();
   }));
 

diff --git a/web/src/app/route-components/another-information/another-information.component.spec.ts b/web/src/app/route-components/another-information/another-information.component.spec.ts
@@ -9,7 +9,7 @@ import { MockRouter } from "../../MockClasses";
 import { FoiValidComponent } from "src/app/utils-components/foi-valid/foi-valid.component";
 import { FoiFileinputComponent } from "src/app/utils-components/foi-fileinput/foi-fileinput.component";
 import { FoiRequest } from "src/app/models/FoiRequest";
-import { NgxWebstorageModule } from "ngx-webstorage";
+import { provideNgxWebstorage } from "ngx-webstorage";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
 import { OwlNativeDateTimeModule, OwlDateTimeModule } from "@danielmoncada/angular-datetime-picker";
@@ -24,12 +24,11 @@ describe("AnotherInformationComponent", () => {
       imports: [
         HttpClientTestingModule,
         ReactiveFormsModule,
-        NgxWebstorageModule.forRoot(),
         OwlDateTimeModule,
         OwlNativeDateTimeModule,
         FontAwesomeModule,
       ],
-      providers: [DataService, { provide: Router, useClass: MockRouter }],
+      providers: [DataService, { provide: Router, useClass: MockRouter }, provideNgxWebstorage()],
     }).compileComponents();
   }));
 

diff --git a/web/src/app/route-components/child-information/child-information.component.spec.ts b/web/src/app/route-components/child-information/child-information.component.spec.ts
@@ -9,7 +9,7 @@ import { Router } from "@angular/router";
 import { FoiValidComponent } from "src/app/utils-components/foi-valid/foi-valid.component";
 import { FoiFileinputComponent } from "src/app/utils-components/foi-fileinput/foi-fileinput.component";
 import { FoiRequest } from "src/app/models/FoiRequest";
-import { NgxWebstorageModule } from "ngx-webstorage";
+import { provideNgxWebstorage } from "ngx-webstorage";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
 import { OwlNativeDateTimeModule, OwlDateTimeModule } from "@danielmoncada/angular-datetime-picker";
@@ -24,12 +24,11 @@ describe("ChildInformationComponent", () => {
       imports: [
         HttpClientTestingModule,
         ReactiveFormsModule,
-        NgxWebstorageModule.forRoot(),
         OwlDateTimeModule,
         OwlNativeDateTimeModule,
         FontAwesomeModule,
       ],
-      providers: [DataService, { provide: Router, useClass: MockRouter }],
+      providers: [DataService, { provide: Router, useClass: MockRouter }, provideNgxWebstorage()],
     }).compileComponents();
   }));
 

diff --git a/web/src/app/route-components/contact-info-options/contact-info-options.component.spec.ts b/web/src/app/route-components/contact-info-options/contact-info-options.component.spec.ts
@@ -7,7 +7,7 @@ import { MockRouter } from "../../MockClasses";
 import { Router } from "@angular/router";
 import { FoiRequest } from "src/app/models/FoiRequest";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
-import { NgxWebstorageModule } from "ngx-webstorage";
+import { provideNgxWebstorage } from "ngx-webstorage";
 import { UtilsComponentsModule } from "src/app/utils-components/utils-components.module";
 
 describe("ContactInfoOptionsComponent", () => {
@@ -17,8 +17,8 @@ describe("ContactInfoOptionsComponent", () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ContactInfoOptionsComponent],
-      imports: [HttpClientTestingModule, ReactiveFormsModule, NgxWebstorageModule.forRoot(), UtilsComponentsModule],
-      providers: [DataService, { provide: Router, useClass: MockRouter }],
+      imports: [HttpClientTestingModule, ReactiveFormsModule, UtilsComponentsModule],
+      providers: [DataService, { provide: Router, useClass: MockRouter }, provideNgxWebstorage()],
     }).compileComponents();
   }));
 

diff --git a/web/src/app/route-components/contact-info/contact-info.component.spec.ts b/web/src/app/route-components/contact-info/contact-info.component.spec.ts
@@ -8,7 +8,7 @@ import { DataService } from "src/app/services/data.service";
 import { MockRouter } from "../../MockClasses";
 import { Router } from "@angular/router";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
-import { NgxWebstorageModule } from "ngx-webstorage";
+import { provideNgxWebstorage } from "ngx-webstorage";
 import { FoiRequest } from "src/app/models/FoiRequest";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
 import { OwlNativeDateTimeModule, OwlDateTimeModule } from "@danielmoncada/angular-datetime-picker";
@@ -23,12 +23,11 @@ describe("ContactInfoComponent", () => {
       imports: [
         HttpClientTestingModule,
         ReactiveFormsModule,
-        NgxWebstorageModule.forRoot(),
         OwlDateTimeModule,
         OwlNativeDateTimeModule,
         FontAwesomeModule,
       ],
-      providers: [DataService, { provide: Router, useClass: MockRouter }],
+      providers: [DataService, { provide: Router, useClass: MockRouter }, provideNgxWebstorage()],
     }).compileComponents();
   }));
 

diff --git a/web/src/app/route-components/description-timeframe/description-timeframe.component.spec.ts b/web/src/app/route-components/description-timeframe/description-timeframe.component.spec.ts
@@ -7,7 +7,7 @@ import { MockRouter } from "../../MockClasses";
 import { Router } from "@angular/router";
 import { FoiRequest } from "src/app/models/FoiRequest";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
-import { NgxWebstorageModule } from "ngx-webstorage";
+import { provideNgxWebstorage } from "ngx-webstorage";
 import { UtilsComponentsModule } from "src/app/utils-components/utils-components.module";
 import { OwlNativeDateTimeModule, OwlDateTimeModule } from "@danielmoncada/angular-datetime-picker";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
@@ -41,13 +41,12 @@ describe("DescriptionTimeframeComponent", () => {
       imports: [
         HttpClientTestingModule,
         ReactiveFormsModule,
-        NgxWebstorageModule.forRoot(),
         UtilsComponentsModule,
         OwlDateTimeModule,
         OwlNativeDateTimeModule,
         FontAwesomeModule,
       ],
-      providers: [DataService, { provide: Router, useClass: MockRouter }],
+      providers: [DataService, { provide: Router, useClass: MockRouter }, provideNgxWebstorage()],
     }).compileComponents();
   }));
 

diff --git a/web/src/app/route-components/verify-your-identity/verify-your-identity.component.spec.ts b/web/src/app/route-components/verify-your-identity/verify-your-identity.component.spec.ts
@@ -5,7 +5,7 @@ import { DataService } from "src/app/services/data.service";
 import { Router } from "@angular/router";
 import { MockRouter } from "../../MockClasses";
 import { UtilsComponentsModule } from "src/app/utils-components/utils-components.module";
-import { NgxWebstorageModule } from "ngx-webstorage";
+import { provideNgxWebstorage } from "ngx-webstorage";
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { FoiRequest } from "src/app/models/FoiRequest";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
@@ -21,13 +21,12 @@ describe("VerifyYourIdentityComponent", () => {
       imports: [
         HttpClientTestingModule,
         ReactiveFormsModule,
-        NgxWebstorageModule.forRoot(),
         UtilsComponentsModule,
         OwlDateTimeModule,
         OwlNativeDateTimeModule,
         FontAwesomeModule,
       ],
-      providers: [DataService, { provide: Router, useClass: MockRouter }],
+      providers: [DataService, { provide: Router, useClass: MockRouter }, provideNgxWebstorage()],
     }).compileComponents();
   }));