From 52f82d9430889e2325d9811f6df4efa60eb1dc4f Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 20 Jul 2021 02:41:30 +0300
Subject: [PATCH] fix reordered code

---
 .../app/modules/shared/services/filter.service.ts   |  2 +-
 .../modules/shared/services/screen-state.service.ts | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/red-ui/src/app/modules/shared/services/filter.service.ts b/apps/red-ui/src/app/modules/shared/services/filter.service.ts
index 357b4b41c..73fd37adc 100644
--- a/apps/red-ui/src/app/modules/shared/services/filter.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/filter.service.ts
@@ -7,10 +7,10 @@ import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 
 @Injectable()
 export class FilterService {
-    readonly showResetFilters$ = this._showResetFilters$;
     private readonly _filterGroups$ = new BehaviorSubject<FilterGroup[]>([]);
     private readonly _refresh$ = new BehaviorSubject(null);
     readonly filterGroups$ = this._refresh$.pipe(switchMap(() => this._filterGroups$.asObservable()));
+    readonly showResetFilters$ = this._showResetFilters$;
 
     get filterGroups(): FilterGroup[] {
         return Object.values(this._filterGroups$.getValue());
diff --git a/apps/red-ui/src/app/modules/shared/services/screen-state.service.ts b/apps/red-ui/src/app/modules/shared/services/screen-state.service.ts
index 5728833dc..4b0b52585 100644
--- a/apps/red-ui/src/app/modules/shared/services/screen-state.service.ts
+++ b/apps/red-ui/src/app/modules/shared/services/screen-state.service.ts
@@ -9,19 +9,22 @@ const toLengthValue = entities => entities?.length ?? 0;
 
 @Injectable()
 export class ScreenStateService<T> {
+    private readonly _allEntities$ = new BehaviorSubject<T[]>([]);
+    readonly allEntities$ = this._allEntities$.asObservable();
     readonly allEntitiesLength$ = this._allEntitiesLength$;
+
+    private readonly _displayedEntities$ = new BehaviorSubject<T[]>([]);
     readonly displayedEntities$ = this._getDisplayedEntities$;
     readonly displayedLength$ = this._displayedLength$;
+
+    private readonly _selectedEntities$ = new BehaviorSubject<T[]>([]);
+    readonly selectedEntities$ = this._selectedEntities$.asObservable();
     readonly selectedLength$ = this._selectedLength$;
+
     readonly noData$ = this._noData$;
     readonly areAllEntitiesSelected$ = this._areAllEntitiesSelected$;
     readonly areSomeEntitiesSelected$ = this._areSomeEntitiesSelected$;
     readonly notAllEntitiesSelected$ = this._notAllEntitiesSelected$;
-    private readonly _allEntities$ = new BehaviorSubject<T[]>([]);
-    readonly allEntities$ = this._allEntities$.asObservable();
-    private readonly _displayedEntities$ = new BehaviorSubject<T[]>([]);
-    private readonly _selectedEntities$ = new BehaviorSubject<T[]>([]);
-    readonly selectedEntities$ = this._selectedEntities$.asObservable();
 
     constructor(private readonly _filterService: FilterService, private readonly _searchService: SearchService<T>) {
         //     setInterval(() => {