Merge pull request #1621 from UUDigitalHumanitieslab/bugfix/nn-reset

use params.get instead of lodash get
CentreForDigitalHumanities · Jul 5, 2024 · e83ce0b · e83ce0b
2 parents 6093a65 + 20d25dc
commit e83ce0b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/frontend/src/app/param/param-directive.ts b/frontend/src/app/param/param-directive.ts
@@ -1,5 +1,5 @@
 import { Directive, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
+import { ActivatedRoute, ParamMap, Params, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 import * as _ from 'lodash';
 
@@ -57,5 +57,5 @@ export abstract class ParamDirective implements OnDestroy, OnInit {
 
     abstract teardown();
 
-    abstract setStateFromParams(params: Params);
+    abstract setStateFromParams(params: ParamMap);
 }
diff --git a/frontend/src/app/visualization/barchart/barchart-options.component.ts b/frontend/src/app/visualization/barchart/barchart-options.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
+import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import * as _ from 'lodash';
 import { ParamDirective } from '../../param/param-directive';
 import { Normalizer, ChartType, ChartParameters } from '../../models';
@@ -85,7 +85,7 @@ export class BarchartOptionsComponent
 
     teardown() {}
 
-    setStateFromParams(params: Params) {
+    setStateFromParams(params: ParamMap) {
         if (params.has('normalize')) {
             this.currentNormalizer = params.get('normalize') as Normalizer;
         } else {

diff --git a/...src/app/visualization/barchart/term-comparison-editor/term-comparison-editor.component.ts b/...src/app/visualization/barchart/term-comparison-editor/term-comparison-editor.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
+import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 
 import { ParamDirective } from '../../../param/param-directive';
 import { ParamService } from '../../../services';
@@ -44,7 +44,7 @@ export class TermComparisonEditorComponent
 
     teardown() {}
 
-    setStateFromParams(params: Params) {
+    setStateFromParams(params: ParamMap) {
         if (params.has('compareTerm')) {
             this.queries = params.getAll('compareTerm');
             this.queriesChanged.emit(this.queries);

diff --git a/frontend/src/app/word-models/related-words/related-words.component.ts b/frontend/src/app/word-models/related-words/related-words.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, HostBinding, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
+import { ActivatedRoute, ParamMap, Params, Router } from '@angular/router';
 import { BehaviorSubject } from 'rxjs';
 import * as _ from 'lodash';
 import { showLoading } from '../../utils/utils';
@@ -26,7 +26,7 @@ export class RelatedWordsComponent extends ParamDirective implements OnChanges {
 
     isLoading$ = new BehaviorSubject<boolean>(false);
 
-    neighbours = 5;
+    neighbours: number = 5;
 
     timeIntervals: string[] = [];
     totalData: WordSimilarity[]; // similarities of overall nearest neighbours per time period
@@ -60,8 +60,8 @@ export class RelatedWordsComponent extends ParamDirective implements OnChanges {
 
     teardown() {}
 
-    setStateFromParams(params: Params) {
-        this.neighbours = _.get(params, 'neighbours', 5);
+    setStateFromParams(params: ParamMap) {
+        this.neighbours = Number(params.get('neighbours'));
     }
 
     getData(): void {

diff --git a/frontend/src/app/word-models/word-models.component.ts b/frontend/src/app/word-models/word-models.component.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, HostListener, ViewChild } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
+import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import * as _ from 'lodash';
 
 import { Corpus, QueryFeedback, User, WordInModelResult } from '../models';
@@ -83,7 +83,7 @@ export class WordModelsComponent extends ParamDirective {
 
     teardown() {}
 
-    setStateFromParams(params: Params) {
+    setStateFromParams(params: ParamMap) {
         const queryFromParams = params.get('query');
         if (queryFromParams !== this.activeQuery) {
             this.queryText = queryFromParams;
@@ -99,7 +99,7 @@ export class WordModelsComponent extends ParamDirective {
             this.queryFeedback = { status: 'success' };
         }
         if (params.has('show')) {
-            this.currentTab = params.get('show');
+            this.currentTab = params.get('show') as 'relatedwords' | 'wordsimilarity';
         } else {
             this.currentTab = 'relatedwords';
         }