Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

rename sortingOptionChanged$ to sortingOption$

Browse Source
This commit is contained in:
Dan Percic 2021-07-28 22:33:28 +03:00
parent f8c632ba2f
commit 024645651f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/shared/base/base-listing.component.ts
View File

@ -50,7 +50,7 @@ export abstract class BaseListingComponent<T> extends AutoUnsubscribeComponent i
} }
private get _sortedDisplayedEntities$(): Observable<T[]> { private get _sortedDisplayedEntities$(): Observable<T[]> {
return this.sortingService.sortingOptionChanged$.pipe( return this.sortingService.sortingOption$.pipe(
switchMap(() => this.screenStateService.displayedEntities$.pipe(map(entities => this.sortingService.defaultSort(entities)))) switchMap(() => this.screenStateService.displayedEntities$.pipe(map(entities => this.sortingService.defaultSort(entities))))
); );
} }

2
apps/red-ui/src/app/modules/shared/components/table-col-name/table-col-name.component.html
View File

@ -3,7 +3,7 @@
<span class="all-caps-label">{{ label }}</span> <span class="all-caps-label">{{ label }}</span>
<mat-icon *ngIf="!!rightIcon" [matTooltip]="rightIconTooltip" [svgIcon]="rightIcon" matTooltipPosition="above"></mat-icon> <mat-icon *ngIf="!!rightIcon" [matTooltip]="rightIconTooltip" [svgIcon]="rightIcon" matTooltipPosition="above"></mat-icon>
<ng-container *ngIf="sortingService?.sortingOptionChanged$ | async as sortingOption"> <ng-container *ngIf="sortingService?.sortingOption$ | async as sortingOption">
<div *ngIf="withSort" [class.force-display]="sortingOption.column === column" class="sort-arrows-container"> <div *ngIf="withSort" [class.force-display]="sortingOption.column === column" class="sort-arrows-container">
<mat-icon *ngIf="sortingOption.order === 'asc'" svgIcon="red:sort-asc"></mat-icon> <mat-icon *ngIf="sortingOption.order === 'asc'" svgIcon="red:sort-asc"></mat-icon>
<mat-icon *ngIf="sortingOption.order === 'desc'" svgIcon="red:sort-desc"></mat-icon> <mat-icon *ngIf="sortingOption.order === 'desc'" svgIcon="red:sort-desc"></mat-icon>

2
apps/red-ui/src/app/services/sorting.service.ts
View File

@ -19,7 +19,7 @@ export interface SortingOption {
}) })
export class SortingService { export class SortingService {
private readonly _sortingOption$ = new BehaviorSubject<SortingOption>(null); private readonly _sortingOption$ = new BehaviorSubject<SortingOption>(null);
readonly sortingOptionChanged$ = this._sortingOption$.asObservable(); readonly sortingOption$ = this._sortingOption$.asObservable();
get sortingOption(): SortingOption { get sortingOption(): SortingOption {
return this._sortingOption$.getValue(); return this._sortingOption$.getValue();