Skip to content

Commit 25e2e29

Browse files
Merge remote-tracking 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-workflow-page/admin-workflow.module.ts # src/themes/custom/lazy-theme.module.ts
2 parents 61e52cd + 970b19b commit 25e2e29

7 files changed

Lines changed: 55 additions & 4 deletions

File tree

src/app/admin/admin-routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
REPORTS_MODULE_PATH,
1313
} from './admin-routing-paths';
1414
import { ThemedAdminSearchPageComponent } from './admin-search-page/themed-admin-search-page.component';
15-
import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
15+
import { ThemedAdminWorkflowPageComponent } from './admin-workflow-page/themed-admin-workflow-page.component';
1616

1717
export const ROUTES: Route[] = [
1818
{
@@ -34,7 +34,7 @@ export const ROUTES: Route[] = [
3434
{
3535
path: 'workflow',
3636
resolve: { breadcrumb: i18nBreadcrumbResolver },
37-
component: AdminWorkflowPageComponent,
37+
component: ThemedAdminWorkflowPageComponent,
3838
data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' },
3939
},
4040
{

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ 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-workflow-page',
7+
selector: 'ds-base-admin-workflow-page',
88
templateUrl: './admin-workflow-page.component.html',
99
styleUrls: ['./admin-workflow-page.component.scss'],
1010
standalone: true,
11-
imports: [ThemedConfigurationSearchPageComponent],
11+
imports: [
12+
ThemedConfigurationSearchPageComponent,
13+
],
1214
})
1315

1416
/**
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 { AdminWorkflowPageComponent } from './admin-workflow-page.component';
5+
6+
/**
7+
* Themed wrapper for {@link AdminWorkflowPageComponent}
8+
*/
9+
@Component({
10+
selector: 'ds-admin-workflow-page',
11+
templateUrl: '../../shared/theme-support/themed.component.html',
12+
standalone: true,
13+
imports: [AdminWorkflowPageComponent],
14+
})
15+
export class ThemedAdminWorkflowPageComponent extends ThemedComponent<AdminWorkflowPageComponent> {
16+
17+
protected getComponentName(): string {
18+
return 'AdminWorkflowPageComponent';
19+
}
20+
21+
protected importThemedComponent(themeName: string): Promise<any> {
22+
return import(`../../../themes/${themeName}/app/admin/admin-workflow-page/admin-workflow-page.component`);
23+
}
24+
25+
protected importUnthemedComponent(): Promise<any> {
26+
return import('./admin-workflow-page.component');
27+
}
28+
29+
}

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

Whitespace-only changes.

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

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { RootModule } from '../../app/root.module';
1515
import { MetadataImportPageComponent } from './app/admin/admin-import-metadata-page/metadata-import-page.component';
1616
import { AdminSearchPageComponent } from './app/admin/admin-search-page/admin-search-page.component';
1717
import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
18+
import { AdminWorkflowPageComponent } from './app/admin/admin-workflow-page/admin-workflow-page.component';
1819
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
1920
import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
2021
import { BrowseByDateComponent } from './app/browse-by/browse-by-date/browse-by-date.component';
@@ -196,6 +197,7 @@ const DECLARATIONS = [
196197
SubmissionUploadFilesComponent,
197198
ComcolPageContentComponent,
198199
AdminSearchPageComponent,
200+
AdminWorkflowPageComponent,
199201
];
200202

201203
@NgModule({

0 commit comments

Comments
 (0)