Skip to content

Commit 7064014

Browse files
authored
Merge pull request DSpace#1832 from atmire/w2p-89685_themed-search-settings-component
make search-settings.component themed
2 parents 389ae85 + 27af7fa commit 7064014

7 files changed

Lines changed: 70 additions & 1 deletion

File tree

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import { Component, Input } from '@angular/core';
2+
import { ThemedComponent } from '../../theme-support/themed.component';
3+
import { SearchSettingsComponent } from './search-settings.component';
4+
import { SortOptions } from '../../../core/cache/models/sort-options.model';
5+
6+
/**
7+
* Themed wrapper for SearchSettingsComponent
8+
*/
9+
@Component({
10+
selector: 'ds-themed-search-settings',
11+
styleUrls: [],
12+
templateUrl: '../../theme-support/themed.component.html',
13+
})
14+
export class ThemedSearchSettingsComponent extends ThemedComponent<SearchSettingsComponent> {
15+
@Input() currentSortOption: SortOptions;
16+
@Input() sortOptionsList: SortOptions[];
17+
18+
19+
protected inAndOutputNames: (keyof SearchSettingsComponent & keyof this)[] = [
20+
'currentSortOption', 'sortOptionsList'];
21+
22+
protected getComponentName(): string {
23+
return 'SearchSettingsComponent';
24+
}
25+
26+
protected importThemedComponent(themeName: string): Promise<any> {
27+
return import(`../../../../themes/${themeName}/app/shared/search/search-settings/search-settings.component`);
28+
}
29+
30+
protected importUnthemedComponent(): Promise<any> {
31+
return import('./search-settings.component');
32+
}
33+
}

src/app/shared/search/search-sidebar/search-sidebar.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
[currentConfiguration]="configuration"
2222
[refreshFilters]="refreshFilters"
2323
[inPlaceSearch]="inPlaceSearch"></ds-search-filters>
24-
<ds-search-settings [currentSortOption]="currentSortOption" [sortOptionsList]="sortOptionsList"></ds-search-settings>
24+
<ds-themed-search-settings [currentSortOption]="currentSortOption"
25+
[sortOptionsList]="sortOptionsList"></ds-themed-search-settings>
2526
</div>
2627
</div>
2728
</div>

src/app/shared/search/search.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { SearchResultsComponent } from './search-results/search-results.componen
3030
import { SearchComponent } from './search.component';
3131
import { ThemedSearchComponent } from './themed-search.component';
3232
import { ThemedSearchResultsComponent } from './search-results/themed-search-results.component';
33+
import { ThemedSearchSettingsComponent } from './search-settings/themed-search-settings.component';
3334

3435
const COMPONENTS = [
3536
SearchComponent,
@@ -55,6 +56,7 @@ const COMPONENTS = [
5556
ConfigurationSearchPageComponent,
5657
ThemedConfigurationSearchPageComponent,
5758
ThemedSearchResultsComponent,
59+
ThemedSearchSettingsComponent,
5860
];
5961

6062
const ENTRY_COMPONENTS = [

src/themes/custom/app/shared/search/search-settings/search-settings.component.html

Whitespace-only changes.

src/themes/custom/app/shared/search/search-settings/search-settings.component.scss

Whitespace-only changes.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/**
2+
* The contents of this file are subject to the license and copyright
3+
* detailed in the LICENSE_ATMIRE and NOTICE_ATMIRE files at the root of the source
4+
* tree and available online at
5+
*
6+
* https://www.atmire.com/software-license/
7+
*/
8+
import { Component } from '@angular/core';
9+
import {
10+
SearchSettingsComponent as BaseComponent,
11+
} from '../../../../../../app/shared/search/search-settings/search-settings.component';
12+
import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
13+
import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
14+
15+
16+
@Component({
17+
selector: 'ds-search-settings',
18+
// styleUrls: ['./search-settings.component.scss'],
19+
styleUrls: ['../../../../../../app/shared/search/search-settings/search-settings.component.scss'],
20+
// templateUrl: './search-settings.component.html',
21+
templateUrl: '../../../../../../app/shared/search/search-settings/search-settings.component.html',
22+
providers: [
23+
{
24+
provide: SEARCH_CONFIG_SERVICE,
25+
useClass: SearchConfigurationService
26+
}
27+
]
28+
29+
})
30+
31+
export class SearchSettingsComponent extends BaseComponent {}

src/themes/custom/lazy-theme.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ import {
9999
import { LoadingComponent } from './app/shared/loading/loading.component';
100100
import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
101101
import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
102+
import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
102103
import {
103104
CommunityPageSubCommunityListComponent
104105
} from './app/community-page/sub-community-list/community-page-sub-community-list.component';
@@ -152,6 +153,7 @@ const DECLARATIONS = [
152153
LoadingComponent,
153154
SearchResultsComponent,
154155
AdminSidebarComponent,
156+
SearchSettingsComponent
155157
];
156158

157159
@NgModule({

0 commit comments

Comments
 (0)