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

Merge remote-tracking branch 'contributions/w2p-107950_themed-metadata-import-page-component' into minor-themed-component-fixes_contribute-main

Browse Source 
# Conflicts:
#	src/app/admin/admin-routing.module.ts
#	src/app/admin/admin.module.ts
#	src/themes/custom/lazy-theme.module.ts
This commit is contained in:
Alexandre Vryghem
2024-03-09 14:11:22 +01:00
parent a18bcb7493 22b596b3aa
commit bb490f827b
6 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/admin/admin-import-metadata-page/themed-metadata-import-page.component.ts Normal file
View File

@@ -0,0 +1,25 @@
import { Component } from '@angular/core';
import { ThemedComponent } from '../../shared/theme-support/themed.component';
import { MetadataImportPageComponent } from './metadata-import-page.component';
/**
* Themed wrapper for {@link MetadataImportPageComponent}.
*/
@Component({
selector: 'ds-themed-metadata-import-page',
templateUrl: '../../shared/theme-support/themed.component.html',
})
export class ThemedMetadataImportPageComponent extends ThemedComponent<MetadataImportPageComponent>{
protected getComponentName(): string {
return 'MetadataImportPageComponent';
}
protected importThemedComponent(themeName: string): Promise<any> {
return import(`../../../themes/${themeName}/app/admin/admin-import-metadata-page/metadata-import-page.component`);
}
protected importUnthemedComponent(): Promise<any> {
return import('./metadata-import-page.component');
}
}

4
src/app/admin/admin-routing.module.ts
View File

@@ -6,7 +6,7 @@ import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.ser
import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
import { ThemedMetadataImportPageComponent } from './admin-import-metadata-page/themed-metadata-import-page.component';
import {
LDN_PATH,
NOTIFICATIONS_MODULE_PATH,
@@ -55,7 +55,7 @@ import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow
{
path: 'metadata-import',
resolve: { breadcrumb: I18nBreadcrumbResolver },
component: MetadataImportPageComponent,
component: ThemedMetadataImportPageComponent,
data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' },
canActivate: [SiteAdministratorGuard],
},

11
src/app/admin/admin.module.ts
View File

@@ -7,6 +7,7 @@ import { UploadModule } from '../shared/upload/upload.module';
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
import { ThemedMetadataImportPageComponent } from './admin-import-metadata-page/themed-metadata-import-page.component';
import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
import { AdminReportsModule } from './admin-reports/admin-reports.module';
import { AdminRoutingModule } from './admin-routing.module';
@@ -21,6 +22,12 @@ const ENTRY_COMPONENTS = [
ExpandableAdminSidebarSectionComponent,
];
const DECLARATIONS = [
AdminCurationTasksComponent,
MetadataImportPageComponent,
ThemedMetadataImportPageComponent,
BatchImportPageComponent,
];
@NgModule({
imports: [
@@ -35,9 +42,7 @@ const ENTRY_COMPONENTS = [
UploadModule,
],
declarations: [
AdminCurationTasksComponent,
MetadataImportPageComponent,
BatchImportPageComponent,
...DECLARATIONS,
],
})
export class AdminModule {

0
src/themes/custom/app/admin/admin-import-metadata-page/metadata-import-page.component.html Normal file
View File

11
src/themes/custom/app/admin/admin-import-metadata-page/metadata-import-page.component.ts Normal file
View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
import { MetadataImportPageComponent as BaseComponent } from '../../../../../app/admin/admin-import-metadata-page/metadata-import-page.component';
@Component({
selector: 'ds-metadata-import-page',
// templateUrl: './metadata-import-page.component.html',
templateUrl: '../../../../../app/admin/admin-import-metadata-page/metadata-import-page.component.html',
})
export class MetadataImportPageComponent extends BaseComponent {
}

2
src/themes/custom/lazy-theme.module.ts
View File

@@ -55,6 +55,7 @@ import { StatisticsModule } from '../../app/statistics/statistics.module';
import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module';
import { SubmissionModule } from '../../app/submission/submission.module';
import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
import { MetadataImportPageComponent } from './app/admin/admin-import-metadata-page/metadata-import-page.component';
import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
@@ -227,6 +228,7 @@ const DECLARATIONS = [
RegisterEmailFormComponent,
SearchComponent,
ItemListPreviewComponent,
MetadataImportPageComponent,
];
@NgModule({