Ng upgrade

liquid-prep-app/package.json

@@ -16,41 +16,39 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/schematics": "^13.2.0",
-    "@angular/animations": "^13.2.0",
-    "@angular/cdk": "^10.2.7",
-    "@angular/common": "^13.2.0",
-    "@angular/compiler": "^13.2.0",
-    "@angular/core": "^13.2.0",
-    "@angular/flex-layout": "^11.0.0-beta.33",
-    "@angular/forms": "^13.2.0",
-    "@angular/material": "^10.2.7",
-    "@angular/platform-browser": "^13.2.0",
-    "@angular/platform-browser-dynamic": "^13.2.0",
-    "@angular/router": "^13.2.0",
-    "@angular/service-worker": "^13.2.0",
+    "@angular-devkit/schematics": "^15.2.11",
+    "@angular/animations": "^15.2.10",
+    "@angular/cdk": "^15.2.9",
+    "@angular/common": "^15.2.10",
+    "@angular/compiler": "^15.2.10",
+    "@angular/core": "^15.2.10",
+    "@angular/flex-layout": "^15.0.0-beta.42",
+    "@angular/forms": "^15.2.10",
+    "@angular/material": "^15.2.9",
+    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/router": "^15.2.10",
+    "@angular/service-worker": "^15.2.10",
     "guid-typescript": "^1.0.9",
     "ng2-search-filter": "^0.5.1",
     "ngx-swiper-wrapper": "^10.0.0",
     "ngx-webstorage-service": "^4.1.0",
     "rxjs": "^6.6.2",
     "swiper": "^6.2.0",
     "tslib": "^2.0.0",
-    "web-bluetooth": "^0.1.2",
     "webusb": "^2.2.0",
-    "zone.js": "~0.11.4"
+    "zone.js": "^0.13.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^13.2.0",
-    "@angular/cli": "^13.2.0",
-    "@angular/compiler-cli": "^13.2.0",
-    "@angular/language-service": "^13.2.0",
-    "@types/jasmine": "~3.6.0",
+    "@angular-devkit/build-angular": "^15.2.11",
+    "@angular/cli": "^15.2.11",
+    "@angular/compiler-cli": "^15.2.10",
+    "@angular/language-service": "^15.2.10",
+    "@types/jasmine": "~3.8.0",
     "@types/jasminewd2": "^2.0.3",
     "@types/node": "^14.11.1",
-    "@types/web-bluetooth": "^0.0.17",
     "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "^6.3.12",
     "karma-chrome-launcher": "~3.1.0",
@@ -60,6 +58,6 @@
     "protractor": "^7.0.0",
     "ts-node": "^8.10.2",
     "tslint": "^6.1.0",
-    "typescript": "^4.5.5"
+    "typescript": "^4.9.5"
   }
 }

liquid-prep-app/src/app/app-routing.module.ts

@@ -99,7 +99,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
+  imports: [RouterModule.forRoot(routes, {})],
   providers: [CropStaticInfoResolver],
   exports: [RouterModule],
 })

liquid-prep-app/src/app/app.module.ts

@@ -26,7 +26,7 @@ import { MatGridListModule } from '@angular/material/grid-list';
 import { MatSliderModule } from '@angular/material/slider';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatToolbarModule } from '@angular/material/toolbar';
-import {MAT_DIALOG_DATA, MatDialogModule} from '@angular/material/dialog';
+import { MAT_DIALOG_DATA, MatDialogModule} from '@angular/material/dialog';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDatepickerModule } from '@angular/material/datepicker';

liquid-prep-app/src/app/components/dashboard/fields/add-field/add-field.component.ts

@@ -2,13 +2,13 @@ import { Component, OnInit, TemplateRef } from '@angular/core';
 import { HeaderService } from 'src/app/service/header.service';
 import { HeaderConfig } from 'src/app/models/HeaderConfig.interface';
 import { FormArray, FormControl, FormGroup, Validators } from '@angular/forms';
-import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar';
 import { formatDate, Location } from '@angular/common';
 import { Router } from '@angular/router';
 import { FieldDataService } from 'src/app/service/FieldDataService';
 import { Guid } from 'guid-typescript';
 import { Field } from 'src/app/models/Field';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { SENSORS_MOCK_DATA } from '../../sensors/sensor-data';
 import { SensorListComponent } from '../sensor-list/sensor-list.component';
 import { CropDataService } from 'src/app/service/CropDataService';

liquid-prep-app/src/app/components/dashboard/fields/details/details.component.ts

@@ -8,7 +8,7 @@ import {
 import { Location } from '@angular/common';
 import { HeaderService } from 'src/app/service/header.service';
 import { HeaderConfig } from 'src/app/models/HeaderConfig.interface';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { Router, ActivatedRoute } from '@angular/router';
 import { FieldDataService } from 'src/app/service/FieldDataService';
 

liquid-prep-app/src/app/components/dashboard/fields/edit-field/edit-field.component.ts

@@ -14,8 +14,8 @@ import { FieldDataService } from 'src/app/service/FieldDataService';
 import { Guid } from 'guid-typescript';
 import { SENSORS_MOCK_DATA } from './../../sensors/sensor-data';
 import { Field } from 'src/app/models/Field';
-import { MatDialog } from '@angular/material/dialog';
-import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar';
 import { SensorListComponent } from './../sensor-list/sensor-list.component';
 import { CropDataService } from 'src/app/service/CropDataService';
 import { forkJoin, from } from 'rxjs';

liquid-prep-app/src/app/components/dashboard/fields/fields.component.ts

@@ -3,7 +3,7 @@ import { HeaderService } from 'src/app/service/header.service';
 import { HeaderConfig } from 'src/app/models/HeaderConfig.interface';
 import { SelectModalComponent } from 'src/app/components/select-modal/select-modal.component';
 import { Router } from '@angular/router';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { FieldDataService } from 'src/app/service/FieldDataService';
 
 @Component({

liquid-prep-app/src/app/components/dashboard/fields/sensor-list/sensor-list.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
 import { SENSORS_MOCK_DATA } from './../../sensors/sensor-data';
 import { SensorStorageService } from 'src/app/service/sensor-storage.service';

liquid-prep-app/src/app/components/dashboard/home/home.component.ts

@@ -1,13 +1,13 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import { HeaderService } from 'src/app/service/header.service';
 import { HeaderConfig } from 'src/app/models/HeaderConfig.interface';
-import { MatTabChangeEvent } from '@angular/material/tabs';
+import { MatLegacyTabChangeEvent as MatTabChangeEvent } from '@angular/material/legacy-tabs';
 import { GeoLocationService } from '../../../service/GeoLocationService';
 import { TodayWeather } from '../../../models/TodayWeather';
 import { formatDate } from '@angular/common';
 import { WeatherDataService } from '../../../service/WeatherDataService';
 import {Crop} from '../../../models/Crop';
-import {MAT_DIALOG_DATA, MatDialog} from '@angular/material/dialog';
+import {MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialog as MatDialog} from '@angular/material/legacy-dialog';
 import {WaterConfirmDialogComponent} from './water-confirm-dialog.component';
 import {DateTimeUtil} from '../../../utility/DateTimeUtil';
 import {WaterAdviceService} from '../../../service/WaterAdviceService';

liquid-prep-app/src/app/components/dashboard/home/water-confirm-dialog.component.ts

@@ -1,5 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA} from '@angular/material/legacy-dialog';
 import {Field} from "../../../models/Field";
 
 @Component({

liquid-prep-app/src/app/components/dashboard/sensors/edit-sensor/edit-sensor.component.ts

@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
 import { ActivatedRoute } from '@angular/router';
 import { HeaderService } from 'src/app/service/header.service';
 import { HeaderConfig } from 'src/app/models/HeaderConfig.interface';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { SensorLocatorModalComponent } from '../../../sensor-locator-modal/sensor-locator-modal.component';
 import { UnsavedChangesModalComponent } from '../../../unsaved-changes-modal/unsaved-changes-modal.component';
 import { SelectModalComponent } from '../../../select-modal/select-modal.component';

liquid-prep-app/src/app/components/dashboard/sensors/sensors.component.ts

@@ -1,7 +1,7 @@
 import { Component, ViewEncapsulation, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
 import { Router } from '@angular/router';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { HeaderService } from 'src/app/service/header.service';
 import { HeaderConfig } from 'src/app/models/HeaderConfig.interface';
 import { SelectModalComponent } from '../../select-modal/select-modal.component';

liquid-prep-app/src/app/components/delete-crop/delete-crop.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Output, EventEmitter } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 
 @Component({
   selector: 'app-delete-crop',

liquid-prep-app/src/app/components/my-crops/my-crops.component.ts

@@ -5,7 +5,7 @@ import {
   ApplicationRef,
   NgZone,
 } from '@angular/core';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 import { formatDate, Location } from '@angular/common';
 import { Router } from '@angular/router';
 import { ThemePalette } from '@angular/material/core';

liquid-prep-app/src/app/components/select-crop/select-crop.module.ts

@@ -6,7 +6,7 @@ import { SelectCropComponent } from './select-crop.component';
 import { MaterialModule } from '../../material/material.module';
 import { FormsModule } from '@angular/forms';
 import { Ng2SearchPipeModule } from 'ng2-search-filter';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatLegacyProgressSpinnerModule as MatProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
 
 
 @NgModule({

liquid-prep-app/src/app/components/select-modal/select-modal.component.ts

@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 
 @Component({
   selector: 'app-select-modal',

liquid-prep-app/src/app/components/sensor-locator-modal/sensor-locator-modal.component.ts

@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 import { Router } from '@angular/router';
 import { GeoLocationUtil } from '../../utility/GeoLocationUtil';
 

liquid-prep-app/src/app/components/unsaved-changes-modal/unsaved-changes-modal.component.ts

@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, Inject, OnInit, Input } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 import { Router } from '@angular/router';
 import { Location } from '@angular/common';
 

liquid-prep-app/src/app/components/watering-insights/moisture-logs/moisture-logs.component.spec.ts

@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatDialogRef } from '@angular/material/dialog';
+import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 import { MoistureLogsComponent } from './moisture-logs.component';
 
 describe('MoistureLogsComponent', () => {

liquid-prep-app/src/app/components/watering-insights/moisture-logs/moisture-logs.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
+import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
 import { Inject } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog';
 import { SensorStorageService } from 'src/app/service/sensor-storage.service';
 
 @Component({

liquid-prep-app/src/app/components/watering-insights/watering-insights.component.ts

@@ -4,12 +4,12 @@ import { HeaderConfig } from 'src/app/models/HeaderConfig.interface';
 import { Location } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 import { WaterAdviceService } from 'src/app/service/WaterAdviceService';
-import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar';
 import { Crop } from '../../models/Crop';
 import { CropDataService } from '../../service/CropDataService';
 import { CropStaticInfo } from '../../models/CropStatic';
 import { DatePipe } from '@angular/common';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { MoistureLogsComponent } from './moisture-logs/moisture-logs.component';
 import { SENSORS_MOCK_DATA } from 'src/app/components/dashboard/sensors/sensor-data';
 

liquid-prep-app/src/app/material/material.module.ts

@@ -2,18 +2,18 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { MatToolbarModule } from '@angular/material/toolbar';
-import { MatSelectModule } from '@angular/material/select';
-import { MatButtonModule } from '@angular/material/button';
+import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
 import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
 import { MatSidenavModule } from '@angular/material/sidenav';
-import { MatListModule } from '@angular/material/list';
-import { MatCardModule } from '@angular/material/card';
-import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list';
+import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
+import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
 import { MatGridListModule } from '@angular/material/grid-list';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { MatRadioModule } from '@angular/material/radio';
+import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle';
+import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio';
 
 
 

liquid-prep-app/src/connecting-dialog/connecting-dialog.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import {MatDialogRef} from '@angular/material/dialog';
+import {MatLegacyDialogRef as MatDialogRef} from '@angular/material/legacy-dialog';
 
 @Component({
   selector: 'app-connecting-dialog',

liquid-prep-app/src/styles.scss

@@ -1,8 +1,8 @@
 
 // Custom Theming for Angular Material
 // For more information: https://material.angular.io/guide/theming
-@import '~@angular/material/theming';
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
+@import '@angular/material/theming';
+@import "@angular/material/prebuilt-themes/indigo-pink.css";
 
 // Plus imports for other components in your app.
 

liquid-prep-app/src/test.ts

@@ -7,21 +7,10 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(), {
     teardown: { destroyAfterEach: false }
 }
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);