issue #138 Merge "alwaysOnFilters" with the "defaultSearchParams.alwa…

…ysOnFilter"
AbsaOSS · Sep 23, 2021 · 8b72362 · 8b72362
1 parent 33db697
commit 8b72362
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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
+                                }
                             }
                         })))