hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-12 20:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'w2p-97184_theme-feedback_contribute-7.4' into w2p-97184_theme-feedback_contribute-main

Browse Source
This commit is contained in:
lotte
2023-01-23 13:48:47 +01:00
parent 7abcea1d03 4682507b25
commit a27a27905f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/object-collection/shared/listable-object/themed-listable-object-component-loader.component.ts
View File

@@ -7,12 +7,12 @@ import { Context } from '../../../../core/shared/context.model';
import { CollectionElementLinkType } from '../../collection-element-link.type'; import { CollectionElementLinkType } from '../../collection-element-link.type';
/** /**
* Themed wrapper for SearchComponent * Themed wrapper for ListableObjectComponentLoaderComponent
*/ */
@Component({ @Component({
selector: 'ds-themed-listable-object-component-loader', selector: 'ds-themed-listable-object-component-loader',
styleUrls: [], styleUrls: [],
templateUrl: '../theme-support/themed.component.html', templateUrl: '../../../theme-support/themed.component.html',
}) })
export class ThemedListableObjectComponentLoaderComponent extends ThemedComponent<ListableObjectComponentLoaderComponent> { export class ThemedListableObjectComponentLoaderComponent extends ThemedComponent<ListableObjectComponentLoaderComponent> {
protected inAndOutputNames: (keyof ListableObjectComponentLoaderComponent & keyof this)[] = [ protected inAndOutputNames: (keyof ListableObjectComponentLoaderComponent & keyof this)[] = [
@@ -34,7 +34,7 @@ export class ThemedListableObjectComponentLoaderComponent extends ThemedComponen
} }
protected importThemedComponent(themeName: string): Promise<any> { protected importThemedComponent(themeName: string): Promise<any> {
return import(`../../../themes/${themeName}/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component`); return import(`../../../../../themes/${themeName}/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component`);
} }
protected importUnthemedComponent(): Promise<any> { protected importUnthemedComponent(): Promise<any> {

9
src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
View File

@@ -5,7 +5,9 @@ import { SearchConfigurationOption } from '../search-switch-configuration/search
import { SortOptions } from '../../../core/cache/models/sort-options.model'; import { SortOptions } from '../../../core/cache/models/sort-options.model';
import { ViewMode } from '../../../core/shared/view-mode.model'; import { ViewMode } from '../../../core/shared/view-mode.model';
import { PaginatedSearchOptions } from '../models/paginated-search-options.model'; import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
import { Observable } from 'rxjs'; import { BehaviorSubject, Observable } from 'rxjs';
import { RemoteData } from '../../../core/data/remote-data';
import { SearchFilterConfig } from '../models/search-filter-config.model';
/** /**
* Themed wrapper for SearchSidebarComponent * Themed wrapper for SearchSidebarComponent
@@ -21,20 +23,21 @@ export class ThemedSearchSidebarComponent extends ThemedComponent<SearchSidebarC
@Input() configurationList: SearchConfigurationOption[]; @Input() configurationList: SearchConfigurationOption[];
@Input() currentScope: string; @Input() currentScope: string;
@Input() currentSortOption: SortOptions; @Input() currentSortOption: SortOptions;
@Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
@Input() resultCount; @Input() resultCount;
@Input() viewModeList: ViewMode[]; @Input() viewModeList: ViewMode[];
@Input() showViewModes = true; @Input() showViewModes = true;
@Input() inPlaceSearch; @Input() inPlaceSearch;
@Input() searchOptions: PaginatedSearchOptions; @Input() searchOptions: PaginatedSearchOptions;
@Input() sortOptionsList: SortOptions[]; @Input() sortOptionsList: SortOptions[];
@Input() refreshFilters: Observable<any>; @Input() refreshFilters: BehaviorSubject<boolean>;
@Output() toggleSidebar = new EventEmitter<boolean>(); @Output() toggleSidebar = new EventEmitter<boolean>();
@Output() changeConfiguration: EventEmitter<SearchConfigurationOption> = new EventEmitter<SearchConfigurationOption>(); @Output() changeConfiguration: EventEmitter<SearchConfigurationOption> = new EventEmitter<SearchConfigurationOption>();
@Output() changeViewMode: EventEmitter<ViewMode> = new EventEmitter<ViewMode>(); @Output() changeViewMode: EventEmitter<ViewMode> = new EventEmitter<ViewMode>();
protected inAndOutputNames: (keyof SearchSidebarComponent & keyof this)[] = [ protected inAndOutputNames: (keyof SearchSidebarComponent & keyof this)[] = [
'configuration', 'configurationList', 'currentScope', 'currentSortOption', 'configuration', 'configurationList', 'currentScope', 'currentSortOption',
'resultCount', 'viewModeList', 'showViewModes', 'inPlaceSearch', 'resultCount', 'filters', 'viewModeList', 'showViewModes', 'inPlaceSearch',
'searchOptions', 'sortOptionsList', 'refreshFilters', 'toggleSidebar', 'changeConfiguration', 'changeViewMode']; 'searchOptions', 'sortOptionsList', 'refreshFilters', 'toggleSidebar', 'changeConfiguration', 'changeViewMode'];
protected getComponentName(): string { protected getComponentName(): string {