Merge pull request #1627 from CSCfi/CSCTTV-3110

Cscttv 3110

angular.json

@@ -216,7 +216,6 @@
       }
     }
   },
-  "defaultProject": "research-fi",
   "cli": {
     "analytics": "62223fc9-a5db-4ac2-971b-f0c9a7c7c85e"
   }

package.json

@@ -23,18 +23,18 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^13.2.2",
-    "@angular/cdk": "^13.2.2",
-    "@angular/common": "^13.2.2",
-    "@angular/compiler": "^13.2.2",
-    "@angular/core": "^13.2.2",
-    "@angular/forms": "^13.2.2",
-    "@angular/localize": "^13.2.2",
-    "@angular/material": "^13.2.2",
-    "@angular/platform-browser": "^13.2.2",
-    "@angular/platform-browser-dynamic": "^13.2.2",
-    "@angular/platform-server": "^13.2.2",
-    "@angular/router": "^13.2.2",
+    "@angular/animations": "^14.2.12",
+    "@angular/cdk": "^14.2.7",
+    "@angular/common": "^14.2.12",
+    "@angular/compiler": "^14.2.12",
+    "@angular/core": "^14.2.12",
+    "@angular/forms": "^14.2.12",
+    "@angular/localize": "^14.2.12",
+    "@angular/material": "^14.2.7",
+    "@angular/platform-browser": "^14.2.12",
+    "@angular/platform-browser-dynamic": "^14.2.12",
+    "@angular/platform-server": "^14.2.12",
+    "@angular/router": "^14.2.12",
     "@elastic/apm-rum-angular": "^2.1.4",
     "@fortawesome/angular-fontawesome": "^0.10.1",
     "@fortawesome/fontawesome-svg-core": "^1.3.0",
@@ -84,10 +84,10 @@
     "zone.js": "~0.11.8"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^13.2.3",
-    "@angular/cli": "^13.2.6",
-    "@angular/compiler-cli": "^13.2.2",
-    "@angular/language-service": "^13.2.6",
+    "@angular-devkit/build-angular": "^14.2.10",
+    "@angular/cli": "^14.2.10",
+    "@angular/compiler-cli": "^14.2.12",
+    "@angular/language-service": "^14.2.12",
     "@babel/cli": "^7.18.10",
     "@babel/core": "^7.17.4",
     "@babel/preset-env": "^7.16.11",
@@ -123,4 +123,4 @@
   "optionalDependencies": {
     "esbuild-android-arm64": "^0.15.13"
   }
-}
+}

src/app/mydata/components/welcome-stepper/welcome-stepper.component.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { MatStepperModule } from '@angular/material/stepper'
-import { FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormBuilder, Validators } from '@angular/forms';
 import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper';
 import { ActivatedRoute, NavigationEnd, Router, RouterEvent } from '@angular/router';
 import { Observable } from 'rxjs';
@@ -45,7 +45,7 @@ export class WelcomeStepperComponent implements OnInit {
     $localize`:@@welcomeStepperStep4Caption:Esikatsele julkiseen profiiliisi lisäämiäsi tietoja ennen niiden julkaisemista.`,
     $localize`:@@welcomeStepperStep5Caption:Jaa halutessasi profiilisi tietoja myös muille tutkimustoimijoille.`,
     $localize`:@@welcomeStepperStep6Caption:Valmista!`,
-    ];
+  ];
 
   localizedStepContent = [$localize`:@@welcomeStepperStep1Caption:Suomi.fi-tunnistautumisen avulla vahvistamme henkilöllisyytesi. ORCID-tunnisteen avulla voit koota profiiliisi tiedot eri lähteistä.`,
     $localize`:@@welcomeStepperStep2Content1:Kun olet kirjautunut, voit valita, mitkä ORCID-tunnisteeseesi yhdistetyt tiedot haluat asettaa julkiseksi profiilissasi. Voit liittää profiiliin tietoja ORCID-palvelusta löytyvien tietojen lisäksi myös oman kotiorganisaatiosi tiedoista. Sinun tarvitsee vain valita julkiseksi asetettavat tiedot. Työkaluun ei ole mahdollista syöttää tietoja itse.`,
@@ -58,7 +58,7 @@ export class WelcomeStepperComponent implements OnInit {
   ];
 
   constructor(
-    private _formBuilder: FormBuilder,
+    private _formBuilder: UntypedFormBuilder,
     private dialogEvents: DialogEventsService,
     private oidcSecurityService: OidcSecurityService,
     private router: Router,

src/app/portal/components/news/news-card/news-card.component.scss

@@ -142,12 +142,12 @@ app-news-card {
     }
   }
 
-  @media screen and(max-width: 991px) {
+  @media screen and (max-width: 991px) {
     .mat-card-header-text {
       margin: 0 !important;
     }
   }
-  @media screen and(max-width: 515px) {
+  @media screen and (max-width: 515px) {
     .news-img {
       padding: 0px;
     }

src/app/portal/components/results/filters/filters.component.html

@@ -331,7 +331,7 @@ <h3 class="header" *ngIf="!mobile && !showButton">
           <mat-selection-list
             [attr.aria-label]="filter.field"
             (selectionChange)="
-              selectionChange(filter.field, $event.option.value)
+              selectionChange(filter.field, $event.options[0].value)
             "
           >
             <!-- Options -->

src/app/portal/components/science-politics/figures/figures.component.ts

@@ -27,7 +27,7 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import { faChartBar } from '@fortawesome/free-regular-svg-icons';
 import { isPlatformBrowser, ViewportScroller } from '@angular/common';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { TabChangeService } from 'src/app/portal/services/tab-change.service';
 import { ResizeService } from 'src/app/shared/services/resize.service';
@@ -57,7 +57,7 @@ export class FiguresComponent implements OnInit, AfterViewInit, OnDestroy {
   faChevronUp = faChevronUp;
 
   currentSection: any;
-  queryField: FormControl = new FormControl();
+  queryField: UntypedFormControl = new UntypedFormControl();
   figureData: Figure[] = [];
   filteredData: any[];
   queryResults: any[];

src/app/portal/components/search-bar/search-bar.component.ts

@@ -25,7 +25,7 @@ import { SearchService } from '@portal/services/search.service';
 import { SortService } from '@portal/services/sort.service';
 import { AutosuggestService } from '@portal/services/autosuggest.service';
 import { TabChangeService } from '@portal/services/tab-change.service';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
@@ -56,7 +56,7 @@ export class SearchBarComponent implements OnInit, AfterViewInit, OnDestroy {
   autoSuggestResponse: any;
   topData: any;
   otherData: any[];
-  queryField: FormControl = new FormControl();
+  queryField: UntypedFormControl = new UntypedFormControl();
   currentInput: any;
   showAutoSuggest = false;
   queryHistory: any;
@@ -152,7 +152,7 @@ export class SearchBarComponent implements OnInit, AfterViewInit, OnDestroy {
     this.inputSub = this.searchService.currentInput.subscribe(
       (input) => (this.currentTerm = input)
     );
-    this.queryField = new FormControl(this.currentTerm);
+    this.queryField = new UntypedFormControl(this.currentTerm);
 
     // Hotfix to set docList infrastructure field with locale
     this.docList[2].field = this.docList[2].field + this.currentLocale;

src/app/shared/components/search/search.component.ts

@@ -15,7 +15,7 @@ import {
   EventEmitter,
   AfterViewInit,
 } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+import { UntypedFormBuilder } from '@angular/forms';
 import { faSearch } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
@@ -39,7 +39,7 @@ export class SearchComponent implements OnInit, AfterViewInit {
 
   @ViewChild('searchInput') searchInput: ElementRef;
 
-  constructor(private formBuilder: FormBuilder) {}
+  constructor(private formBuilder: UntypedFormBuilder) {}
 
   ngOnInit(): void {
     if (this.initialTerm)

tsconfig.es5.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5"
+    "target": "es2020"
   },
   "include": ["src/**/*.d.ts"]
 }

tsconfig.json

@@ -13,7 +13,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es2015",
+    "target": "es2020",
     "typeRoots": ["node_modules/@types"],
     "lib": ["es2019", "dom", "esnext.array"],
     "paths": {