Skip to content

Commit

Permalink
Record and reuse terms on data load
Browse files Browse the repository at this point in the history
  • Loading branch information
andyjmaclean committed Sep 23, 2021
1 parent c7f65a5 commit a26b423
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 20 deletions.
19 changes: 2 additions & 17 deletions src/app/overview/overview.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
import { ActivatedRoute, Params } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { BehaviorSubject } from 'rxjs';
import {
FormBuilder,
FormControl,
FormGroup,
ReactiveFormsModule
} from '@angular/forms';
import { FormBuilder, FormControl, ReactiveFormsModule } from '@angular/forms';
import { IsScrollableDirective } from '../_directives/is-scrollable';
import { today } from '../_helpers';
import {
Expand All @@ -27,11 +22,10 @@ import {
MockGridComponent
} from '../_mocked';
import {
BreakdownResults,
BreakdownResult,
BreakdownResults,
DimensionName,
NameLabel,
NameValuePercent,
RequestFilter,
RequestFilterRange
} from '../_models';
Expand Down Expand Up @@ -209,15 +203,6 @@ describe('OverviewComponent', () => {
]
};

spyOn(component, 'storeSeries').and.callFake(
(
_: boolean,
__: boolean,
___: Array<NameValuePercent>,
____: number
) => {}
);

component.extractSeriesServerData(br);
expect(component.storeSeries).toHaveBeenCalled();

Expand Down
18 changes: 15 additions & 3 deletions src/app/overview/overview.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ export class OverviewComponent extends DataPollingComponent implements OnInit {
];

filterStates: { [key: string]: FilterState } = {};
userFilterSearchTerms = facetNames.reduce((map, item: string) => {
map[item] = '';
return map;
}, {});

contentTiersOptions = Array(5)
.fill(0)
.map((x, index) => `${x + index}`);
Expand Down Expand Up @@ -453,7 +458,12 @@ export class OverviewComponent extends DataPollingComponent implements OnInit {
return -1;
});
this.filterData[facetName] = safeOps;
this.filterDisplayData({ term: '', dimension: facetName });

const previousTerm = this.userFilterSearchTerms[facetName];
this.filterDisplayData({
term: previousTerm ? previousTerm : '',
dimension: facetName
});
}
});

Expand Down Expand Up @@ -788,14 +798,16 @@ export class OverviewComponent extends DataPollingComponent implements OnInit {

/** filterDisplayData
/* @param {FilterInfo} filterInfo
/* updates this.displayedFilterData
/* updates the form object
/* updates this.displayedFilterData to a filtered and truncated subset for display
/* (called on initialisation and in response to a search term changing)
*/
filterDisplayData(filterInfo: FilterInfo): void {
if (!filterInfo.dimension) {
filterInfo.dimension = this.form.value.facetParameter;
}

this.userFilterSearchTerms[filterInfo.dimension] = filterInfo.term;

const term = replaceDiacritics(filterInfo.term);
const reg = new RegExp(appendDiacriticEquivalents(term), 'gi');
const toDisplay = this.filterData[filterInfo.dimension]
Expand Down

0 comments on commit a26b423

Please sign in to comment.