Merge pull request #2984 from atmire/w2p-114732_CustomThemeNoLongerWorks

Synced the imports of the custom theme with the imports of the base component so custom theme works again

src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts

@@ -3,7 +3,7 @@ import {
   NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component';
@@ -32,16 +32,16 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
     ComcolPageHeaderComponent,
     ComcolPageLogoComponent,
     NgIf,
-    RouterModule,
     ThemedComcolPageHandleComponent,
     ComcolPageContentComponent,
     DsoEditMenuComponent,
     ThemedComcolPageBrowseByComponent,
-    VocabularyTreeviewComponent,
     BrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
+    VocabularyTreeviewComponent,
+    RouterLink,
   ],
 })
 export class BrowseByTaxonomyComponent extends BaseComponent {

src/themes/custom/app/collection-page/collection-page.component.ts

@@ -43,7 +43,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
     ComcolPageContentComponent,
     ErrorComponent,
     NgIf,
-    RouterOutlet,
     ThemedLoadingComponent,
     TranslateModule,
     ViewTrackerComponent,
@@ -55,6 +54,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
     DsoEditMenuComponent,
     ThemedComcolPageBrowseByComponent,
     ObjectCollectionComponent,
+    RouterOutlet,
   ],
 })
 /**

src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts

@@ -11,6 +11,7 @@ import { ThemedDsoEditMetadataComponent } from '../../../../../app/dso-shared/ds
 import { AlertComponent } from '../../../../../app/shared/alert/alert.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
 import { VarDirective } from '../../../../../app/shared/utils/var.directive';
+import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component';
 
 @Component({
   selector: 'ds-edit-item-template-page',
@@ -20,6 +21,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   standalone: true,
   imports: [
     ThemedDsoEditMetadataComponent,
+    DsoEditMetadataComponent,
     RouterLink,
     AsyncPipe,
     VarDirective,

src/themes/custom/app/community-page/community-page.component.ts

@@ -6,7 +6,10 @@ import {
   ChangeDetectionStrategy,
   Component,
 } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {
+  RouterModule,
+  RouterOutlet,
+} from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { CommunityPageComponent as BaseComponent } from '../../../../app/community-page/community-page.component';
@@ -50,6 +53,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
     AsyncPipe,
     ViewTrackerComponent,
     VarDirective,
+    RouterOutlet,
     RouterModule,
   ],
 })

src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts

@@ -1,6 +1,15 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
+import { ErrorComponent } from '../../../../../../../app/shared/error/error.component';
+import { ThemedLoadingComponent } from '../../../../../../../app/shared/loading/themed-loading.component';
+import { ObjectCollectionComponent } from '../../../../../../../app/shared/object-collection/object-collection.component';
+import { VarDirective } from '../../../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-community-page-sub-collection-list',
@@ -8,6 +17,15 @@ import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../
   styleUrls: ['../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss'],
   // templateUrl: './community-page-sub-collection-list.component.html',
   templateUrl: '../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html',
+  imports: [
+    ObjectCollectionComponent,
+    ErrorComponent,
+    ThemedLoadingComponent,
+    NgIf,
+    TranslateModule,
+    AsyncPipe,
+    VarDirective,
+  ],
   standalone: true,
 })
 export class CommunityPageSubCollectionListComponent extends BaseComponent {

src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts

@@ -12,8 +12,7 @@ import { RegisterEmailFormComponent } from '../../../../../app/register-email-fo
   templateUrl: '../../../../../app/forgot-password/forgot-password-email/forgot-email.component.html',
   standalone: true,
   imports: [
-    RegisterEmailFormComponent,
+    RegisterEmailFormComponent, ThemedRegisterEmailFormComponent,
-    ThemedRegisterEmailFormComponent,
   ],
 })
 /**

src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts

@@ -18,8 +18,8 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   standalone: true,
   imports: [
     TranslateModule,
-    ProfilePageSecurityFormComponent,
     BrowserOnlyPipe,
+    ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
   ],

src/themes/custom/app/header/header.component.ts

@@ -1,3 +1,7 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -21,7 +25,7 @@ import { LangSwitchComponent } from '../../../../app/shared/lang-switch/lang-swi
   // templateUrl: 'header.component.html',
   templateUrl: '../../../../app/header/header.component.html',
   standalone: true,
-  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, LangSwitchComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule],
+  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, LangSwitchComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe, NgIf],
 })
 export class HeaderComponent extends BaseComponent {
 }

src/themes/custom/app/home-page/home-page.component.ts

@@ -2,6 +2,7 @@ import {
   AsyncPipe,
   NgClass,
   NgIf,
+  NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -25,7 +26,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
   // templateUrl: './home-page.component.html'
   templateUrl: '../../../../app/home-page/home-page.component.html',
   standalone: true,
-  imports: [ThemedHomeNewsComponent, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, ConfigurationSearchPageComponent, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
+  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, ConfigurationSearchPageComponent, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
 })
 export class HomePageComponent extends BaseComponent {
 

src/themes/custom/app/item-page/simple/item-page.component.ts

@@ -44,11 +44,11 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/
     ItemVersionsComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NotifyRequestsStatusComponent,
-    QaEventNotificationComponent,
     TranslateModule,
     AsyncPipe,
     NgIf,
+    NotifyRequestsStatusComponent,
+    QaEventNotificationComponent,
   ],
 })
 export class ItemPageComponent extends BaseComponent {

src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts

@@ -1,4 +1,7 @@
-import { CommonModule } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -39,26 +42,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   templateUrl: '../../../../../../../app/item-page/simple/item-types/publication/publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [
+  imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
-    CommonModule,
-    ThemedResultsBackButtonComponent,
-    MiradorViewerComponent,
-    ThemedItemPageTitleFieldComponent,
-    DsoEditMenuComponent,
-    MetadataFieldWrapperComponent,
-    ThemedThumbnailComponent,
-    ThemedMediaViewerComponent,
-    ThemedFileSectionComponent,
-    ItemPageDateFieldComponent,
-    ThemedMetadataRepresentationListComponent,
-    GenericItemPageFieldComponent,
-    RelatedItemsComponent,
-    ItemPageAbstractFieldComponent,
-    TranslateModule,
-    ItemPageUriFieldComponent,
-    CollectionsComponent,
-    RouterLink,
-  ],
 })
 export class PublicationComponent extends BaseComponent {
 

src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts

@@ -1,4 +1,7 @@
-import { CommonModule } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -38,25 +41,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   templateUrl: '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [
+  imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
-    CommonModule,
-    ThemedItemPageTitleFieldComponent,
-    DsoEditMenuComponent,
-    MetadataFieldWrapperComponent,
-    ThemedThumbnailComponent,
-    ThemedMediaViewerComponent,
-    ThemedFileSectionComponent,
-    ItemPageDateFieldComponent,
-    ThemedMetadataRepresentationListComponent,
-    GenericItemPageFieldComponent,
-    TranslateModule,
-    MiradorViewerComponent,
-    ThemedResultsBackButtonComponent,
-    CollectionsComponent,
-    RouterLink,
-    ItemPageUriFieldComponent,
-    ItemPageAbstractFieldComponent,
-  ],
 })
 export class UntypedItemComponent extends BaseComponent {
 }

src/themes/custom/app/login-page/login-page.component.ts

@@ -15,7 +15,7 @@ import { LogInComponent } from '../../../../app/shared/log-in/log-in.component';
   // templateUrl: './login-page.component.html'
   templateUrl: '../../../../app/login-page/login-page.component.html',
   standalone: true,
-  imports: [LogInComponent, ThemedLogInComponent ,TranslateModule],
+  imports: [LogInComponent, ThemedLogInComponent, TranslateModule],
 })
 export class LoginPageComponent extends BaseComponent {
 }

src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts

@@ -40,11 +40,11 @@ import { ThemedSearchComponent } from '../../../../app/shared/search/themed-sear
   imports: [
     ThemedSearchComponent,
     MyDSpaceNewSubmissionComponent,
-    MyDspaceQaEventsNotificationsComponent,
-    SuggestionsNotificationComponent,
     AsyncPipe,
     RoleDirective,
     NgIf,
+    SuggestionsNotificationComponent,
+    MyDspaceQaEventsNotificationsComponent,
   ],
 })
 export class MyDSpacePageComponent extends BaseComponent {

src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts

@@ -1,7 +1,15 @@
+import {
+  AsyncPipe,
+  NgComponentOutlet,
+  NgFor,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
+import { RouterLinkActive } from '@angular/router';
 
 import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
+import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 /**
  * Represents an expandable section in the navbar
@@ -14,6 +22,7 @@ import { slide } from '../../../../../app/shared/animations/slide';
   styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
   animations: [slide],
   standalone: true,
+  imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
 })
 export class ExpandableNavbarSectionComponent extends BaseComponent {
 }

src/themes/custom/app/profile-page/profile-page.component.ts

@@ -23,13 +23,13 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
   imports: [
     ProfilePageMetadataFormComponent,
     ProfilePageSecurityFormComponent,
-    SuggestionsNotificationComponent,
     AsyncPipe,
     TranslateModule,
     ProfilePageResearcherFormComponent,
     VarDirective,
     NgIf,
     NgForOf,
+    SuggestionsNotificationComponent,
   ],
 })
 /**

src/themes/custom/app/register-page/register-email/register-email.component.ts

@@ -12,8 +12,7 @@ import { RegisterEmailComponent as BaseComponent } from '../../../../../app/regi
   templateUrl: '../../../../../app/register-page/register-email/register-email.component.html',
   standalone: true,
   imports: [
-    RegisterEmailFormComponent,
+    RegisterEmailFormComponent, ThemedRegisterEmailFormComponent,
-    ThemedRegisterEmailFormComponent,
   ],
 })
 /**

src/themes/custom/app/shared/browse-by/browse-by.component.ts

@@ -30,8 +30,7 @@ import { StartsWithLoaderComponent } from '../../../../../app/shared/starts-with
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent,
+  imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
-    ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
 })
 export class BrowseByComponent extends BaseComponent {
 }

src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts

@@ -1,6 +1,7 @@
 import {
   AsyncPipe,
   NgForOf,
+  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
@@ -30,6 +31,7 @@ import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../app
     RouterLinkActive,
     TranslateModule,
     AsyncPipe,
+    NgIf,
   ],
 })
 export class ComcolPageBrowseByComponent extends BaseComponent {}

src/themes/custom/app/shared/lang-switch/lang-switch.component.ts

@@ -1,5 +1,5 @@
 import {
-  NgForOf,
+  NgFor,
   NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -15,7 +15,7 @@ import { LangSwitchComponent as BaseComponent } from '../../../../../app/shared/
   // templateUrl: './lang-switch.component.html',
   templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html',
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgForOf, TranslateModule],
+  imports: [NgIf, NgbDropdownModule, NgFor, TranslateModule],
 })
 export class LangSwitchComponent extends BaseComponent {
 }

src/themes/custom/app/shared/loading/loading.component.ts

@@ -1,3 +1,4 @@
+import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
@@ -9,6 +10,7 @@ import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loa
   templateUrl: '../../../../../app/shared/loading/loading.component.html',
   // templateUrl: './loading.component.html'
   standalone: true,
+  imports: [NgIf],
 })
 export class LoadingComponent extends BaseComponent {
 

src/themes/custom/app/shared/object-list/object-list.component.ts

@@ -22,10 +22,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'],
   // templateUrl: './object-list.component.html'
   templateUrl: '../../../../../app/shared/object-list/object-list.component.html',
-  imports: [
+  imports: [PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
-    PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent,
-    ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe,
-  ],
   standalone: true,
 })