hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DURACOM-303] resolve conflicts

Browse Source
This commit is contained in:
FrancescoMolinaro
2025-01-24 17:03:47 +01:00
parent 126f3c71f4
commit 61eb14783e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/app-config.interface.ts
View File

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

5
src/config/default-app-config.ts
View File

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

7
src/config/search-page-config.interface.ts
View File

@@ -1,13 +1,6 @@
import { AdvancedSearchConfig } from './advance-search-config.interface';
import { Config } from './config.interface'; import { Config } from './config.interface';
export interface SearchConfig extends Config { 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 * Number used to render n skeletons while the filters are loading
*/ */