From b8c3b76e56ee888a93d62d7a8fd8fbcaec1a7153 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 9 Feb 2023 22:13:37 +0200 Subject: [PATCH] rename function any to some to be consistent with the array method --- src/lib/filtering/filter.service.ts | 4 ++-- src/lib/filtering/popup-filter/popup-filter.component.ts | 4 ++-- src/lib/listing/services/listing.service.ts | 4 ++-- src/lib/utils/operators.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/filtering/filter.service.ts b/src/lib/filtering/filter.service.ts index b9be669..dd055c4 100644 --- a/src/lib/filtering/filter.service.ts +++ b/src/lib/filtering/filter.service.ts @@ -4,7 +4,7 @@ import { map, startWith, switchMap } from 'rxjs/operators'; import { processFilters, toFlatFilters } from './filter-utils'; import { IFilterGroup } from './models/filter-group.model'; import { INestedFilter } from './models/nested-filter.model'; -import { any, get, shareDistinctLast, shareLast } from '../utils'; +import { get, shareDistinctLast, shareLast, some } from '../utils'; import { NestedFilter } from './models/nested-filter'; import { Filter } from './models/filter'; import { IFilter } from './models/filter.model'; @@ -42,7 +42,7 @@ export class FilterService { private get _showResetFilters$(): Observable { return this.filterGroups$.pipe( map(value => toFlatFilters(value)), - any(filter => !!filter.checked), + some(filter => !!filter.checked), shareDistinctLast(), ); } diff --git a/src/lib/filtering/popup-filter/popup-filter.component.ts b/src/lib/filtering/popup-filter/popup-filter.component.ts index 19fd9eb..f587751 100644 --- a/src/lib/filtering/popup-filter/popup-filter.component.ts +++ b/src/lib/filtering/popup-filter/popup-filter.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit, TemplateRef } from '@angular/core'; import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; import { delay, map } from 'rxjs/operators'; -import { any, shareDistinctLast, shareLast } from '../../utils'; +import { shareDistinctLast, shareLast, some } from '../../utils'; import { FilterService } from '../filter.service'; import { IFilterGroup } from '../models/filter-group.model'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -32,7 +32,7 @@ export class PopupFilterComponent implements OnInit { private get _hasActiveFilters$() { return combineLatest([this.primaryFilterGroup$, this.secondaryFilterGroup$]).pipe( map(([primary, secondary]) => [...(primary?.filters || []), ...(secondary?.filters || [])]), - any(f => f.checked || !!f.indeterminate), + some(f => f.checked || !!f.indeterminate), shareDistinctLast(), ); } diff --git a/src/lib/listing/services/listing.service.ts b/src/lib/listing/services/listing.service.ts index 740771c..e291712 100644 --- a/src/lib/listing/services/listing.service.ts +++ b/src/lib/listing/services/listing.service.ts @@ -5,7 +5,7 @@ import { FilterService, getFilteredEntities } from '../../filtering'; import { SearchService } from '../../search'; import { Id, IListable } from '../models'; import { EntitiesService } from './entities.service'; -import { any, getLength, shareDistinctLast, shareLast } from '../../utils'; +import { getLength, shareDistinctLast, shareLast, some } from '../../utils'; import { SortingService } from '../../sorting'; @Injectable() @@ -114,7 +114,7 @@ export class ListingService, PrimaryKey exte isSelected$(entity: Class): Observable { return this._selected$.pipe( - any(selectedId => selectedId === entity.id), + some(selectedId => selectedId === entity.id), shareLast(), ); } diff --git a/src/lib/utils/operators.ts b/src/lib/utils/operators.ts index 4231120..5ef4377 100644 --- a/src/lib/utils/operators.ts +++ b/src/lib/utils/operators.ts @@ -6,7 +6,7 @@ export function get(predicate: (value: T, index: number) => boolean): Operato return map(entities => entities.find(predicate)); } -export function any(predicate: (value: T, index: number) => boolean): OperatorFunction { +export function some(predicate: (value: T, index: number) => boolean): OperatorFunction { return map(entities => entities.some(predicate)); }