From 8b72362bb4215acc8a0766257e19276d68b352e5 Mon Sep 17 00:00:00 2001
From: Oleksandr Vayda <oleksandr.vayda@gmail.com>
Date: Thu, 23 Sep 2021 13:15:40 +0200
Subject: [PATCH] issue #138 Merge "alwaysOnFilters" with the
 "defaultSearchParams.alwaysOnFilter"

---
 .../common/models/search-query/search-data-source.model.ts  | 5 -----
 .../overview/history/ds-overview-history.page.component.ts  | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ui/projects/spline-utils/main/src/common/models/search-query/search-data-source.model.ts b/ui/projects/spline-utils/main/src/common/models/search-query/search-data-source.model.ts
index ef11d13a..4837aaeb 100644
--- a/ui/projects/spline-utils/main/src/common/models/search-query/search-data-source.model.ts
+++ b/ui/projects/spline-utils/main/src/common/models/search-query/search-data-source.model.ts
@@ -34,7 +34,6 @@ import SearchParams = SearchQuery.SearchParams;
 
 export type SearchDataSourceConfig<TFilter extends SplineRecord = {}, TSortableFields = string> = {
     defaultSearchParams: Partial<SearchParams<TFilter, TSortableFields>>
-    alwaysOnFilters: TFilter
 }
 
 export abstract class SearchDataSource<TDataRecord = unknown,
@@ -73,10 +72,6 @@ export abstract class SearchDataSource<TDataRecord = unknown,
             const defaultSearchParams = {
                 ...DEFAULT_SEARCH_PARAMS,
                 ...config.defaultSearchParams,
-                alwaysOnFilter: {
-                    ...DEFAULT_SEARCH_PARAMS.alwaysOnFilter,
-                    ...config.alwaysOnFilters
-                }
             }
             this._defaultSearchParams = defaultSearchParams
             this._searchParams$ = new BehaviorSubject(defaultSearchParams)
diff --git a/ui/src/modules/data-sources/pages/overview/history/ds-overview-history.page.component.ts b/ui/src/modules/data-sources/pages/overview/history/ds-overview-history.page.component.ts
index 7b180d7b..546f2010 100644
--- a/ui/src/modules/data-sources/pages/overview/history/ds-overview-history.page.component.ts
+++ b/ui/src/modules/data-sources/pages/overview/history/ds-overview-history.page.component.ts
@@ -46,8 +46,10 @@ import { DsOverviewHistoryPage } from './ds-overview-history.page.models'
                         withLatestFrom(store.dataSourceInfo$),
                         filter(([isInitialized, dataSourceInfo]) => isInitialized && !!dataSourceInfo),
                         map(([, dataSourceInfo]) => ({
-                            alwaysOnFilters: {
-                                dataSourceUri: dataSourceInfo.uri
+                            defaultSearchParams: {
+                                alwaysOnFilter: {
+                                    dataSourceUri: dataSourceInfo.uri
+                                }
                             }
                         })))