Merge branch 'w2p-99521_themed-top-level-communities-component_contribute-7.4' into w2p-99521_themed-top-level-communities-component_contribute-main

src/app/home-page/home-page.component.html

@@ -4,6 +4,6 @@
     <ds-view-tracker [object]="site"></ds-view-tracker>
   </ng-container>
   <ds-search-form [inPlaceSearch]="false" [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-search-form>
-  <ds-top-level-community-list></ds-top-level-community-list>
+  <ds-themed-top-level-community-list></ds-themed-top-level-community-list>
   <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
 </div>

src/app/home-page/home-page.module.ts

@@ -12,11 +12,13 @@ import { ThemedHomePageComponent } from './themed-home-page.component';
 import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { ThemedTopLevelCommunityListComponent } from './top-level-community-list/themed-top-level-community-list.component';
 
 const DECLARATIONS = [
   HomePageComponent,
   ThemedHomePageComponent,
   TopLevelCommunityListComponent,
+  ThemedTopLevelCommunityListComponent,
   ThemedHomeNewsComponent,
   HomeNewsComponent,
   RecentItemListComponent

src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts

@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { TopLevelCommunityListComponent } from './top-level-community-list.component';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+
+@Component({
+  selector: 'ds-themed-top-level-community-list',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedTopLevelCommunityListComponent extends ThemedComponent<TopLevelCommunityListComponent> {
+  protected inAndOutputNames: (keyof TopLevelCommunityListComponent & keyof this)[];
+
+  protected getComponentName(): string {
+    return 'TopLevelCommunityListComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/home-page/top-level-community-list/top-level-community-list.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./top-level-community-list.component`);
+  }
+
+}

src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts

@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { TopLevelCommunityListComponent as BaseComponent } from '../../../../../app/home-page/top-level-community-list/top-level-community-list.component';
+
+@Component({
+  selector: 'ds-top-level-community-list',
+  // styleUrls: ['./top-level-community-list.component.scss'],
+  styleUrls: ['../../../../../app/home-page/top-level-community-list/top-level-community-list.component.scss'],
+  // templateUrl: './top-level-community-list.component.html'
+  templateUrl: '../../../../../app/home-page/top-level-community-list/top-level-community-list.component.html'
+})
+
+export class TopLevelCommunityListComponent extends BaseComponent {}
+

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

@@ -46,6 +46,7 @@ import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-b
 import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
 import { FileDownloadLinkComponent } from './app/shared/file-download-link/file-download-link.component';
+import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
 
 
 /**
@@ -58,11 +59,11 @@ const ENTRY_COMPONENTS = [
   JournalVolumeComponent,
   PublicationComponent,
   UntypedItemComponent,
-
   CommunityListElementComponent,
   CollectionListElementComponent,
   CollectionDropdownComponent,
   FileDownloadLinkComponent,
+  TopLevelCommunityListComponent,
 ];
 
 const DECLARATIONS = [

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

@@ -55,12 +55,8 @@ import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component
 import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
 import { ForbiddenComponent } from './app/forbidden/forbidden.component';
 import { PrivacyComponent } from './app/info/privacy/privacy.component';
-import {
+import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
-  CollectionStatisticsPageComponent
+import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
-} from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
-import {
-  CommunityStatisticsPageComponent
-} from './app/statistics-page/community-statistics-page/community-statistics-page.component';
 import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
 import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
 import { CommunityPageComponent } from './app/community-page/community-page.component';
@@ -76,15 +72,10 @@ import { ProfilePageComponent } from './app/profile-page/profile-page.component'
 import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
 import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
 import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
-import {
+import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
-  SubmissionImportExternalComponent
-} from './app/submission/import-external/submission-import-external.component';
 import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
-import { WorkflowItemDeleteComponent
+import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
-} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
+import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
-import {
-  WorkflowItemSendBackComponent
-} from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
 import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
@@ -102,12 +93,8 @@ import { SearchResultsComponent } from './app/shared/search/search-results/searc
 import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
 import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component';
 import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
-import {
+import { CommunityPageSubCommunityListComponent } from './app/community-page/sub-community-list/community-page-sub-community-list.component';
-  CommunityPageSubCommunityListComponent
+import { CommunityPageSubCollectionListComponent } from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
-} from './app/community-page/sub-community-list/community-page-sub-community-list.component';
-import {
-  CommunityPageSubCollectionListComponent
-} from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
 import { ObjectListComponent } from './app/shared/object-list/object-list.component';
 
 import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';