Skip to content

Commit 89e4d3b

Browse files
Merge branch 'w2p-115051_themed-admin-search-page_contribute-7.4' into new-themed-components_contribute-main
# Conflicts: # src/app/admin/admin-routing.module.ts # src/app/admin/admin-search-page/admin-search.module.ts # src/themes/custom/lazy-theme.module.ts
2 parents d74e672 + 99384a7 commit 89e4d3b

7 files changed

Lines changed: 50 additions & 3 deletions

File tree

src/app/admin/admin-routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
REGISTRIES_MODULE_PATH,
1212
REPORTS_MODULE_PATH,
1313
} from './admin-routing-paths';
14-
import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
14+
import { ThemedAdminSearchPageComponent } from './admin-search-page/themed-admin-search-page.component';
1515
import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
1616

1717
export const ROUTES: Route[] = [
@@ -28,7 +28,7 @@ export const ROUTES: Route[] = [
2828
{
2929
path: 'search',
3030
resolve: { breadcrumb: i18nBreadcrumbResolver },
31-
component: AdminSearchPageComponent,
31+
component: ThemedAdminSearchPageComponent,
3232
data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' },
3333
},
3434
{

src/app/admin/admin-search-page/admin-search-page.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Context } from '../../core/shared/context.model';
44
import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
55

66
@Component({
7-
selector: 'ds-admin-search-page',
7+
selector: 'ds-base-admin-search-page',
88
templateUrl: './admin-search-page.component.html',
99
styleUrls: ['./admin-search-page.component.scss'],
1010
standalone: true,
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { Component } from '@angular/core';
2+
3+
import { ThemedComponent } from '../../shared/theme-support/themed.component';
4+
import { AdminSearchPageComponent } from './admin-search-page.component';
5+
6+
/**
7+
* Themed wrapper for {@link AdminSearchPageComponent}
8+
*/
9+
@Component({
10+
selector: 'ds-admin-search-page',
11+
templateUrl: '../../shared/theme-support/themed.component.html',
12+
standalone: true,
13+
imports: [AdminSearchPageComponent],
14+
})
15+
export class ThemedAdminSearchPageComponent extends ThemedComponent<AdminSearchPageComponent> {
16+
17+
protected getComponentName(): string {
18+
return 'AdminSearchPageComponent';
19+
}
20+
21+
protected importThemedComponent(themeName: string): Promise<any> {
22+
return import(`../../../themes/${themeName}/app/admin/admin-search-page/admin-search-page.component`);
23+
}
24+
25+
protected importUnthemedComponent(): Promise<any> {
26+
return import('./admin-search-page.component');
27+
}
28+
29+
}

src/themes/custom/app/admin/admin-search-page/admin-search-page.component.html

Whitespace-only changes.

src/themes/custom/app/admin/admin-search-page/admin-search-page.component.scss

Whitespace-only changes.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { Component } from '@angular/core';
2+
3+
import { AdminSearchPageComponent as BaseComponent } from '../../../../../app/admin/admin-search-page/admin-search-page.component';
4+
import { ThemedConfigurationSearchPageComponent } from '../../../../../app/search-page/themed-configuration-search-page.component';
5+
6+
@Component({
7+
selector: 'ds-themed-admin-search-page',
8+
// styleUrls: ['./admin-search-page.component.scss'],
9+
styleUrls: ['../../../../../app/admin/admin-search-page/admin-search-page.component.scss'],
10+
// templateUrl: './admin-search-page.component.html',
11+
templateUrl: '../../../../../app/admin/admin-search-page/admin-search-page.component.html',
12+
standalone: true,
13+
imports: [ThemedConfigurationSearchPageComponent],
14+
})
15+
export class AdminSearchPageComponent extends BaseComponent {
16+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
1313

1414
import { RootModule } from '../../app/root.module';
1515
import { MetadataImportPageComponent } from './app/admin/admin-import-metadata-page/metadata-import-page.component';
16+
import { AdminSearchPageComponent } from './app/admin/admin-search-page/admin-search-page.component';
1617
import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
1718
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
1819
import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
@@ -194,6 +195,7 @@ const DECLARATIONS = [
194195
ProfilePageMetadataFormComponent,
195196
SubmissionUploadFilesComponent,
196197
ComcolPageContentComponent,
198+
AdminSearchPageComponent,
197199
];
198200

199201
@NgModule({

0 commit comments

Comments
 (0)