tslint arrow-parens rule (#4003)

This commit is contained in:
Eugenio Romano
2018-11-23 01:06:56 +00:00
committed by GitHub
parent 51bb6a420f
commit 34a30c0f14
194 changed files with 725 additions and 723 deletions

View File

@@ -60,7 +60,7 @@ export class SearchCheckListComponent implements SearchWidget, OnInit {
}
reset() {
this.options.items.forEach(opt => {
this.options.items.forEach((opt) => {
opt.checked = false;
});
@@ -77,8 +77,8 @@ export class SearchCheckListComponent implements SearchWidget, OnInit {
flush() {
const checkedValues = this.options.items
.filter(option => option.checked)
.map(option => option.value);
.filter((option) => option.checked)
.map((option) => option.value);
const query = checkedValues.join(` ${this.operator} `);

View File

@@ -120,7 +120,7 @@ describe('SearchControlComponent', () => {
of({ entry: { list: [] } })
);
let searchDisposable = component.searchChange.subscribe(value => {
let searchDisposable = component.searchChange.subscribe((value) => {
expect(value).toBe('customSearchTerm');
searchDisposable.unsubscribe();
done();
@@ -161,7 +161,7 @@ describe('SearchControlComponent', () => {
it('should still fire an event when user inputs a search term less than 3 characters', (done) => {
searchServiceSpy.and.returnValue(of(JSON.parse(JSON.stringify(results))));
let searchDisposable = component.searchChange.subscribe(value => {
let searchDisposable = component.searchChange.subscribe((value) => {
expect(value).toBe('cu');
searchDisposable.unsubscribe();
});

View File

@@ -22,7 +22,7 @@ export class ResponseFacetQueryList extends SearchFilterList<FacetQuery> {
constructor(items: FacetQuery[] = [], translationService, pageSize: number = 5) {
super(
items
.filter(item => {
.filter((item) => {
return item.count > 0;
}),
pageSize

View File

@@ -119,8 +119,8 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
if (field.buckets) {
this.selectedBuckets.push(
...this.queryBuilder.getUserFacetBuckets(field.field)
.filter(bucket => bucket.checked)
.map(bucket => {
.filter((bucket) => bucket.checked)
.map((bucket) => {
return { field, bucket };
})
);
@@ -133,7 +133,7 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
private updateSelectedFields() {
if (this.responseFacetQueries) {
this.selectedFacetQueries = this.responseFacetQueries.items.filter(item => item.checked);
this.selectedFacetQueries = this.responseFacetQueries.items.filter((item) => item.checked);
this.canResetSelectedQueries = this.selectedFacetQueries.length > 0;
} else {
this.selectedFacetQueries = [];
@@ -183,7 +183,7 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
canResetSelectedBuckets(field: FacetField): boolean {
if (field && field.buckets) {
return field.buckets.items.some(bucket => bucket.checked);
return field.buckets.items.some((bucket) => bucket.checked);
}
return false;
}
@@ -215,10 +215,10 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
if (!this.responseFacetFields) {
const configFacetFields = this.queryBuilder.config.facetFields && this.queryBuilder.config.facetFields.fields || [];
this.responseFacetFields = configFacetFields.map(field => {
const responseField = (context.facetsFields || []).find(response => response.label === field.label);
const buckets: FacetFieldBucket[] = ((responseField && responseField.buckets) || []).map(bucket => {
const selectedBucket = this.selectedBuckets.find(facetBucket =>
this.responseFacetFields = configFacetFields.map((field) => {
const responseField = (context.facetsFields || []).find((response) => response.label === field.label);
const buckets: FacetFieldBucket[] = ((responseField && responseField.buckets) || []).map((bucket) => {
const selectedBucket = this.selectedBuckets.find((facetBucket) =>
facetBucket.bucket.label === bucket.label && facetBucket.field.field === field.field);
return <FacetFieldBucket> {
@@ -249,13 +249,13 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
} else {
this.responseFacetFields = this.responseFacetFields
.map(field => {
.map((field) => {
let responseField = (context.facetsFields || []).find(response => response.label === field.label);
let responseField = (context.facetsFields || []).find((response) => response.label === field.label);
(field && field.buckets && field.buckets.items || [])
.map(bucket => {
const responseBucket = ((responseField && responseField.buckets) || []).find(respBucket => respBucket.label === bucket.label);
.map((bucket) => {
const responseBucket = ((responseField && responseField.buckets) || []).find((respBucket) => respBucket.label === bucket.label);
bucket.count = responseBucket ? responseBucket.count : 0;
return bucket;
@@ -271,10 +271,10 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
if (this.queryBuilder.config.facetQueries) {
const bkpResponseFacetQueries = Object.assign({}, this.responseFacetQueries);
const facetQueries = (this.queryBuilder.config.facetQueries.queries || [])
.map(query => {
.map((query) => {
const queryResult = responseQueries[query.label];
const bkpQuery = (bkpResponseFacetQueries.items || []).find(item => item.label === query.label);
const bkpQuery = (bkpResponseFacetQueries.items || []).find((item) => item.label === query.label);
if (bkpQuery) {
bkpQuery.count = queryResult.count;
@@ -304,7 +304,7 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
private getFacetQueryMap(context: any): { [key: string]: any } {
const result = {};
(context.facetQueries || []).forEach(query => {
(context.facetQueries || []).forEach((query) => {
result[query.label] = query;
});

View File

@@ -70,7 +70,7 @@ export class SearchRadioComponent implements SearchWidget, OnInit {
private getSelectedValue(): string {
const options: any[] = this.settings['options'] || [];
if (options && options.length > 0) {
let selected = options.find(opt => opt.default);
let selected = options.find((opt) => opt.default);
if (!selected) {
selected = options[0];
}

View File

@@ -51,7 +51,7 @@ export class SearchSortingPickerComponent implements OnInit {
private findOptionByKey(key: string): SearchSortingDefinition {
if (key) {
return this.options.find(opt => opt.key === key);
return this.options.find((opt) => opt.key === key);
}
return null;
}

View File

@@ -197,7 +197,7 @@ export class SearchTriggerDirective implements ControlValueAccessor, OnDestroy {
}),
takeUntil(this.onDestroy$)
)
.subscribe(event => this.setValueAndClose(event));
.subscribe((event) => this.setValueAndClose(event));
}
private setTriggerValue(value: any): void {

View File

@@ -78,7 +78,7 @@ export class SearchComponent implements AfterContentInit, OnChanges {
@Input('class')
set classList(classList: string) {
if (classList && classList.length) {
classList.split(' ').forEach(className => this._classList[className.trim()] = true);
classList.split(' ').forEach((className) => this._classList[className.trim()] = true);
this._elementRef.nativeElement.className = '';
}
}
@@ -119,8 +119,8 @@ export class SearchComponent implements AfterContentInit, OnChanges {
});
searchService.dataLoaded.subscribe(
data => this.onSearchDataLoaded(data),
error => this.onSearchDataError(error)
(data) => this.onSearchDataLoaded(data),
(error) => this.onSearchDataError(error)
);
}
@@ -162,13 +162,13 @@ export class SearchComponent implements AfterContentInit, OnChanges {
if (searchTerm) {
if (this.queryBody) {
this.searchService.searchByQueryBody(this.queryBody).subscribe(
result => this.onSearchDataLoaded(result),
err => this.onSearchDataError(err)
(result) => this.onSearchDataLoaded(result),
(err) => this.onSearchDataError(err)
);
} else {
this.searchService.search(searchTerm, this.maxResults, this.skipResults).subscribe(
result => this.onSearchDataLoaded(result),
err => this.onSearchDataError(err)
(result) => this.onSearchDataLoaded(result),
(err) => this.onSearchDataError(err)
);
}
} else {

View File

@@ -222,7 +222,7 @@ describe('SearchQueryBuilder', () => {
spyOn(builder, 'buildQuery').and.returnValue(query);
let eventArgs;
builder.updated.subscribe(args => eventArgs = args);
builder.updated.subscribe((args) => eventArgs = args);
await builder.execute();
expect(eventArgs).toBe(query);
@@ -237,7 +237,7 @@ describe('SearchQueryBuilder', () => {
spyOn(builder, 'buildQuery').and.returnValue({});
let eventArgs;
builder.executed.subscribe(args => eventArgs = args);
builder.executed.subscribe((args) => eventArgs = args);
await builder.execute();
expect(eventArgs).toBe(data);

View File

@@ -69,7 +69,7 @@ export class SearchQueryBuilderService {
const template = this.appConfig.get<SearchConfiguration>('search');
if (template) {
this.config = JSON.parse(JSON.stringify(template));
this.categories = (this.config.categories || []).filter(category => category.enabled);
this.categories = (this.config.categories || []).filter((category) => category.enabled);
this.filterQueries = this.config.filterQueries || [];
this.userFacetBuckets = {};
this.userFacetQueries = [];
@@ -81,7 +81,7 @@ export class SearchQueryBuilderService {
addUserFacetQuery(query: FacetQuery) {
if (query) {
const existing = this.userFacetQueries.find(facetQuery => facetQuery.label === query.label);
const existing = this.userFacetQueries.find((facetQuery) => facetQuery.label === query.label);
if (existing) {
existing.query = query.query;
} else {
@@ -93,14 +93,14 @@ export class SearchQueryBuilderService {
removeUserFacetQuery(query: FacetQuery) {
if (query) {
this.userFacetQueries = this.userFacetQueries
.filter(facetQuery => facetQuery.label !== query.label);
.filter((facetQuery) => facetQuery.label !== query.label);
}
}
addUserFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
if (field && field.field && bucket) {
const buckets = this.userFacetBuckets[field.field] || [];
const existing = buckets.find(facetBucket => facetBucket.label === bucket.label);
const existing = buckets.find((facetBucket) => facetBucket.label === bucket.label);
if (!existing) {
buckets.push(bucket);
}
@@ -116,13 +116,13 @@ export class SearchQueryBuilderService {
if (field && field.field && bucket) {
const buckets = this.userFacetBuckets[field.field] || [];
this.userFacetBuckets[field.field] = buckets
.filter(facetBucket => facetBucket.label !== bucket.label);
.filter((facetBucket) => facetBucket.label !== bucket.label);
}
}
addFilterQuery(query: string): void {
if (query) {
const existing = this.filterQueries.find(filterQuery => filterQuery.query === query);
const existing = this.filterQueries.find((filterQuery) => filterQuery.query === query);
if (!existing) {
this.filterQueries.push({ query: query });
}
@@ -132,13 +132,13 @@ export class SearchQueryBuilderService {
removeFilterQuery(query: string): void {
if (query) {
this.filterQueries = this.filterQueries
.filter(filterQuery => filterQuery.query !== query);
.filter((filterQuery) => filterQuery.query !== query);
}
}
getFacetQuery(label: string): FacetQuery {
if (label && this.hasFacetQueries) {
const result = this.config.facetQueries.queries.find(query => query.label === label);
const result = this.config.facetQueries.queries.find((query) => query.label === label);
if (result) {
return { ...result };
}
@@ -149,7 +149,7 @@ export class SearchQueryBuilderService {
getFacetField(label: string): FacetField {
if (label) {
const fields = this.config.facetFields.fields || [];
const result = fields.find(field => field.label === label);
const result = fields.find((field) => field.label === label);
if (result) {
return { ...result };
}
@@ -233,7 +233,7 @@ export class SearchQueryBuilderService {
}
protected get sort(): RequestSortDefinitionInner[] {
return this.sorting.map(def => {
return this.sorting.map((def) => {
return {
type: def.type,
field: def.field,
@@ -244,7 +244,7 @@ export class SearchQueryBuilderService {
protected get facetQueries(): FacetQuery[] {
if (this.hasFacetQueries) {
return this.config.facetQueries.queries.map(query => {
return this.config.facetQueries.queries.map((query) => {
return <FacetQuery> { ...query };
});
}
@@ -255,7 +255,7 @@ export class SearchQueryBuilderService {
protected getFinalQuery(): string {
let query = '';
this.categories.forEach(facet => {
this.categories.forEach((facet) => {
const customQuery = this.queryFragments[facet.id];
if (customQuery) {
if (query.length > 0) {
@@ -266,20 +266,20 @@ export class SearchQueryBuilderService {
});
let result = [this.userQuery, query]
.filter(entry => entry)
.filter((entry) => entry)
.join(' AND ');
if (this.userFacetQueries && this.userFacetQueries.length > 0) {
const combined = this.userFacetQueries
.map(userQuery => userQuery.query)
.map((userQuery) => userQuery.query)
.join(' OR ');
result += ` AND (${combined})`;
}
if (this.userFacetBuckets) {
Object.keys(this.userFacetBuckets).forEach(key => {
Object.keys(this.userFacetBuckets).forEach((key) => {
const subQuery = (this.userFacetBuckets[key] || [])
.map(bucket => bucket.filterQuery)
.map((bucket) => bucket.filterQuery)
.join(' OR ');
if (subQuery) {
if (result.length > 0) {
@@ -298,7 +298,7 @@ export class SearchQueryBuilderService {
if (facetFields && facetFields.length > 0) {
return {
facets: facetFields.map(facet => <RequestFacetField> {
facets: facetFields.map((facet) => <RequestFacetField> {
field: facet.field,
mincount: facet.mincount,
label: facet.label,