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

# Conflicts:
#	src/app/admin/admin-routing.module.ts
#	src/app/admin/admin.module.ts
#	src/themes/custom/lazy-theme.module.ts

src/app/admin/admin-import-metadata-page/themed-metadata-import-page.component.ts

@@ -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');
+  }
+}

src/app/admin/admin-routing.module.ts

@@ -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],
       },

src/app/admin/admin.module.ts

@@ -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,
+    ...DECLARATIONS,
-    MetadataImportPageComponent,
-    BatchImportPageComponent,
   ],
 })
 export class AdminModule {

src/themes/custom/app/admin/admin-import-metadata-page/metadata-import-page.component.ts

@@ -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 {
+}

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

@@ -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({