[DURACOM-303] resolve conflicts

src/config/app-config.interface.ts

@@ -23,6 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { SearchConfig } from "./search-page-config.interface";
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -50,6 +51,7 @@ interface AppConfig extends Config {
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
   liveRegion: LiveRegionConfig;
+  search: SearchConfig
 }
 
 /**

src/config/default-app-config.ts

@@ -23,6 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { SearchConfig } from "./search-page-config.interface";
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -442,4 +443,8 @@ export class DefaultAppConfig implements AppConfig {
     messageTimeOutDurationMs: 30000,
     isVisible: false,
   };
+
+  search: SearchConfig = {
+    defaultFilterCount: 2
+  }
 }

src/config/search-page-config.interface.ts

@@ -1,13 +1,6 @@
-import { AdvancedSearchConfig } from './advance-search-config.interface';
 import { Config } from './config.interface';
 
 export interface SearchConfig extends Config {
-
-    /**
-     * List of standard filter to select in adding advanced Search
-     * Used by {@link UploadBitstreamComponent}.
-     */
-    advancedFilters: AdvancedSearchConfig;
   /**
    * Number used to render n skeletons while the filters are loading
    */