Merge branch 'feature/Upgrade_to_angular_14' into develop

.gitignore

@@ -33,6 +33,7 @@ speed-measure-plugin.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

angular.json

@@ -148,18 +148,6 @@
               "src/assets"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -179,15 +167,6 @@
               "devServerTarget": "farmmaps-lib-app:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -216,18 +195,6 @@
             "tsConfig": "projects/common/tsconfig.spec.json",
             "karmaConfig": "projects/common/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/common/tsconfig.lib.json",
-              "projects/common/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -256,18 +223,6 @@
             "tsConfig": "projects/common-map/tsconfig.spec.json",
             "karmaConfig": "projects/common-map/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/common-map/tsconfig.lib.json",
-              "projects/common-map/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -296,21 +251,8 @@
             "tsConfig": "projects/common-map3d/tsconfig.spec.json",
             "karmaConfig": "projects/common-map3d/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/common-map3d/tsconfig.lib.json",
-              "projects/common-map3d/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
         }
       }
     }
   }
-  },
-  "defaultProject": "farmmaps-lib-app"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -11,28 +11,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~12.2.8",
+    "@angular/animations": "^14.1.3",
-    "@angular/common": "~12.2.8",
+    "@angular/common": "^14.1.3",
-    "@angular/compiler": "~12.2.8",
+    "@angular/compiler": "^14.1.3",
-    "@angular/core": "~12.2.8",
+    "@angular/core": "^14.1.3",
-    "@angular/forms": "~12.2.8",
+    "@angular/forms": "^14.1.3",
-    "@angular/platform-browser": "~12.2.8",
+    "@angular/platform-browser": "^14.1.3",
-    "@angular/platform-browser-dynamic": "~12.2.8",
+    "@angular/platform-browser-dynamic": "^14.1.3",
-    "@angular/router": "~12.2.8",
+    "@angular/router": "^14.1.3",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
     "@microsoft/signalr": "^3.1.16",
-    "@ng-bootstrap/ng-bootstrap": "^9.0",
+    "@ng-bootstrap/ng-bootstrap": "^9.1.3",
-    "@ngrx/effects": "^12.0",
+    "@ngrx/effects": "^14",
-    "@ngrx/router-store": "^12.0",
+    "@ngrx/router-store": "^14",
-    "@ngrx/store": "^12.0",
+    "@ngrx/store": "^14",
-    "angular-oauth2-oidc": "^12.0",
+    "angular-oauth2-oidc": "^13",
+    "ngrx-store-localstorage": "^14",
     "bootstrap": "^4.6.0",
     "cesium": "^1.82.1",
     "core-js": "^2.6.12",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
-    "ngrx-store-localstorage": "^12.0",
     "ngx-avatar": "^4.1.0",
     "ngx-clipboard": "^14.0.1",
     "ngx-image-cropper": "^3.3.5",
@@ -43,16 +43,16 @@
     "resumablejs": "^1.1.0",
     "rxjs": "^6.6.7",
     "tassign": "^1.0.0",
-    "tslib": "^2.2.0",
+    "tslib": "^2.4.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^12.1.3",
+    "@angular-builders/custom-webpack": "^14",
-    "@angular-devkit/build-angular": "^12.2.8",
+    "@angular-devkit/build-angular": "^14.1.3",
-    "@angular/cli": "^12.2.8",
+    "@angular/cli": "^14.1.3",
-    "@angular/compiler-cli": "~12.2.8",
+    "@angular/compiler-cli": "^14.1.3",
-    "@angular/language-service": "~12.2.8",
+    "@angular/language-service": "^14.1.3",
-    "@angular/localize": "^12.2.8",
+    "@angular/localize": "^14.1.3",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",
@@ -60,15 +60,15 @@
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.3.3",
+    "karma": "^6.3.20",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.6.0",
-    "ng-packagr": "^12.2.2",
+    "ng-packagr": "^14.1.0",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.3.5"
+    "typescript": "~4.6.4"
   }
 }

projects/common-map/package.json

@@ -8,11 +8,11 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": "~12.2.8",
+    "@angular/core": "~14",
-    "ngrx-store-localstorage": "^12.0",
+    "ngrx-store-localstorage": "^14",
-    "@ngrx/effects": "^12.0",
+    "@ngrx/effects": "^14",
-    "@ngrx/router-store":"^12.0",
+    "@ngrx/router-store":"^14",
-    "@ngrx/store":"^12.0",
+    "@ngrx/store":"^14",
     "tassign": "^1.0.0",
     "@farmmaps/common": "~2.0",
     "ngx-openlayers": "1.0.0-next.19",

projects/common-map/src/fm-map/common-map.module.ts

@@ -224,21 +224,6 @@ export {
         LayerValuesComponent,
         GeometryThumbnailComponent
     ],
-  entryComponents: [
-    FeatureListComponent,
-    FeatureListCroppingschemeComponent,
-    FeatureListCropfieldComponent,
-    FeatureListFeatureComponent,
-    FeatureListFeatureCroppingschemeComponent,
-    FeatureListFeatureCropfieldComponent,
-    SelectedItemComponent,
-    SelectedItemCropfieldComponent,
-    SelectedItemGeotiffComponent,
-    SelectedItemTemporalComponent,
-    SelectedItemShapeComponent,
-    ItemListComponent,
-    ItemListItemComponent,
-  ],
     exports: [
         ItemVectorSourceComponent,
         ItemLayersComponent,

projects/common-map/src/fm-map/components/meta-data-modal/meta-data-modal.component.ts

@@ -1,5 +1,5 @@
 import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
-import { FormGroup,FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup,UntypedFormBuilder, Validators } from '@angular/forms';
 import { IListItem } from '@farmmaps/common';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
 import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap";
@@ -33,9 +33,9 @@ export class MetaDataModalComponent {
   @Output() onCloseModal = new EventEmitter<any>();
   @Output() onAddFilesWithMetaData = new EventEmitter<IMetaData>();
 
-  constructor(private modalService: NgbModal, public fb: FormBuilder) { }
+  constructor(private modalService: NgbModal, public fb: UntypedFormBuilder) { }
 
-  public metaDataForm: FormGroup;
+  public metaDataForm: UntypedFormGroup;
 
   handleMetaDataEntered(event) {
     if (this.metaDataForm.valid) {

projects/common-map/src/test.ts

@@ -14,7 +14,9 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

projects/common-map/tsconfig.lib.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common-map/tsconfig.lib.prod.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common-map3d/package.json

@@ -5,8 +5,8 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@angular/common":  "~12.2.8",
+    "@angular/common":  "~14",
-    "@angular/core":  "~12.2.8",
+    "@angular/core":  "~14",
     "ngx-openlayers": "1.0.0-next.19",
     "cesium": "^1.82.1",
     "ol-cesium": "^2.13.0"

projects/common-map3d/src/test.ts

@@ -18,7 +18,9 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

projects/common/ng-package.json

@@ -2,10 +2,7 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/common",
   "lib": {
-    "entryFile": "src/public-api.ts",
+    "entryFile": "src/public-api.ts"
-    "umdModuleIds": {
-      "my-data": "my-data"
-    }
   },
   "allowedNonPeerDependencies": [
     "."

projects/common/package.json

@@ -6,17 +6,17 @@
   },
   "peerDependencies": {
     "@ng-bootstrap/ng-bootstrap": "^7.0",
-    "@angular/common": "~12.2.8",
+    "@angular/common": "~14",
-    "@angular/core": "~12.2.8",
+    "@angular/core": "~14",
-    "@angular/forms": "~12.2.8",
+    "@angular/forms": "~14",
-    "@ngrx/effects": "^12.0",
+    "@ngrx/effects": "^14",
-    "@ngrx/router-store": "^12.0",
+    "@ngrx/router-store": "^14",
-    "@ngrx/store": "^12.0",
+    "@ngrx/store": "^14",
     "tassign": "^1.0.0",
     "bootstrap": "^4.4.1",
     "@microsoft/signalr": "^3.1.3",
     "ngx-uploadx": "^3.3.4",
-    "angular-oauth2-oidc": "^12.0",
+    "angular-oauth2-oidc": "^13",
     "moment": "^2.27.0",
     "ngx-avatar": "^4.0.0",
     "ngx-image-cropper": "^3.3.5",

projects/common/src/test.ts

@@ -14,7 +14,9 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

projects/common/tsconfig.lib.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common/tsconfig.lib.prod.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

src/polyfills.ts

@@ -18,16 +18,6 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

src/test.ts

@@ -12,7 +12,9 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

tsconfig.json

@@ -13,7 +13,7 @@
     "allowSyntheticDefaultImports": true,
     "importHelpers": true,
     "skipLibCheck": true,
-    "target": "es2015",
+    "target": "es2020",
     "typeRoots": [
       "node_modules/@types"
     ],