From fddc4936e88173dc56c7b0d976c07a5fbcee3c41 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 5 Feb 2025 10:32:40 +0100 Subject: [PATCH] 126015: Sync standalone imports in custom theme --- .../create-community-parent-selector.component.ts | 7 ++++++- .../search-results/search-results.component.ts | 12 +++++++++++- .../browse-by-date/browse-by-date.component.ts | 14 -------------- .../browse-by-metadata.component.ts | 14 -------------- .../browse-by-title/browse-by-title.component.ts | 14 -------------- .../app/profile-page/profile-page.component.ts | 2 ++ .../create-community-parent-selector.component.ts | 11 ++++++++++- .../search-results/search-results.component.ts | 12 +++++++++++- .../header-navbar-wrapper.component.ts | 3 +-- src/themes/dspace/app/navbar/navbar.component.ts | 8 +------- 10 files changed, 42 insertions(+), 55 deletions(-) diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index d4e9b312451..dc49fcaa8af 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -47,7 +47,12 @@ import { styleUrls: ['./create-community-parent-selector.component.scss'], templateUrl: './create-community-parent-selector.component.html', standalone: true, - imports: [DSOSelectorComponent, TranslateModule, NgIf, AsyncPipe], + imports: [ + AsyncPipe, + DSOSelectorComponent, + NgIf, + TranslateModule, + ], }) export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { objectType = DSpaceObjectType.COMMUNITY; diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts index f9da77ed753..e8f66d01f9b 100644 --- a/src/app/shared/search/search-results/search-results.component.ts +++ b/src/app/shared/search/search-results/search-results.component.ts @@ -57,7 +57,17 @@ export interface SelectionConfig { fadeInOut, ], standalone: true, - imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule], + imports: [ + AsyncPipe, + ErrorComponent, + NgIf, + NgxSkeletonLoaderModule, + ObjectCollectionComponent, + RouterLink, + SearchExportCsvComponent, + SearchResultsSkeletonComponent, + TranslateModule, + ], }) /** diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts index d4582dcf25d..ffcb504a7fc 100644 --- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts @@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; -import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; -import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component'; -import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; -import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; -import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; -import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; -import { VarDirective } from '../../../../../app/shared/utils/var.directive'; @Component({ selector: 'ds-browse-by-date', @@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html', standalone: true, imports: [ - VarDirective, AsyncPipe, - ComcolPageHeaderComponent, - ComcolPageLogoComponent, NgIf, - ThemedComcolPageHandleComponent, - ThemedComcolPageContentComponent, - DsoEditMenuComponent, - ThemedComcolPageBrowseByComponent, TranslateModule, ThemedLoadingComponent, ThemedBrowseByComponent, diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts index d2894fce3aa..9b29bf93bec 100644 --- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts @@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; -import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; -import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component'; -import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; -import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; -import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; -import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; -import { VarDirective } from '../../../../../app/shared/utils/var.directive'; @Component({ selector: 'ds-browse-by-metadata', @@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html', standalone: true, imports: [ - VarDirective, AsyncPipe, - ComcolPageHeaderComponent, - ComcolPageLogoComponent, NgIf, - ThemedComcolPageHandleComponent, - ThemedComcolPageContentComponent, - DsoEditMenuComponent, - ThemedComcolPageBrowseByComponent, TranslateModule, ThemedLoadingComponent, ThemedBrowseByComponent, diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts index 578663c43ca..6a3b612b575 100644 --- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts @@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; -import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; -import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component'; -import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; -import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; -import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; -import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; -import { VarDirective } from '../../../../../app/shared/utils/var.directive'; @Component({ selector: 'ds-browse-by-title', @@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html', standalone: true, imports: [ - VarDirective, AsyncPipe, - ComcolPageHeaderComponent, - ComcolPageLogoComponent, NgIf, - ThemedComcolPageHandleComponent, - ThemedComcolPageContentComponent, - DsoEditMenuComponent, - ThemedComcolPageBrowseByComponent, TranslateModule, ThemedLoadingComponent, ThemedBrowseByComponent, diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts index e810ca09daf..68292450fc5 100644 --- a/src/themes/custom/app/profile-page/profile-page.component.ts +++ b/src/themes/custom/app/profile-page/profile-page.component.ts @@ -2,6 +2,7 @@ import { AsyncPipe, NgForOf, NgIf, + NgTemplateOutlet, } from '@angular/common'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -33,6 +34,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive'; NgIf, NgForOf, SuggestionsNotificationComponent, + NgTemplateOutlet, PaginationComponent, ThemedLoadingComponent, ErrorComponent, diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index 6c4aa8082c6..d1d2a4a1f0d 100644 --- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -1,3 +1,7 @@ +import { + AsyncPipe, + NgIf, +} from '@angular/common'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @@ -11,7 +15,12 @@ import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../. // templateUrl: './create-community-parent-selector.component.html', templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html', standalone: true, - imports: [DSOSelectorComponent, TranslateModule], + imports: [ + AsyncPipe, + DSOSelectorComponent, + NgIf, + TranslateModule, + ], }) export class CreateCommunityParentSelectorComponent extends BaseComponent { } diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts index e2c44277448..b7c84f0fcce 100644 --- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts +++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts @@ -27,7 +27,17 @@ import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/sea fadeInOut, ], standalone: true, - imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule], + imports: [ + AsyncPipe, + ErrorComponent, + NgIf, + NgxSkeletonLoaderModule, + ObjectCollectionComponent, + RouterLink, + SearchExportCsvComponent, + SearchResultsSkeletonComponent, + TranslateModule, + ], }) export class SearchResultsComponent extends BaseComponent { diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts index cc9a3d727e8..45e39d11abe 100644 --- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts +++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts @@ -1,6 +1,5 @@ import { AsyncPipe, - NgClass, NgIf, } from '@angular/common'; import { Component } from '@angular/core'; @@ -19,7 +18,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide'; styleUrls: ['header-navbar-wrapper.component.scss'], templateUrl: 'header-navbar-wrapper.component.html', standalone: true, - imports: [NgClass, ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf], + imports: [ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf], animations: [slideMobileNav], }) export class HeaderNavbarWrapperComponent extends BaseComponent { diff --git a/src/themes/dspace/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts index 5713a161e18..8cce626006a 100644 --- a/src/themes/dspace/app/navbar/navbar.component.ts +++ b/src/themes/dspace/app/navbar/navbar.component.ts @@ -6,18 +6,12 @@ import { NgIf, } from '@angular/common'; import { Component } from '@angular/core'; -import { RouterLink } from '@angular/router'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { ThemedSearchNavbarComponent } from 'src/app/search-navbar/themed-search-navbar.component'; -import { ThemedLangSwitchComponent } from 'src/app/shared/lang-switch/themed-lang-switch.component'; -import { ContextHelpToggleComponent } from '../../../../app/header/context-help-toggle/context-help-toggle.component'; import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component'; import { slideMobileNav } from '../../../../app/shared/animations/slide'; -import { ThemedAuthNavMenuComponent } from '../../../../app/shared/auth-nav-menu/themed-auth-nav-menu.component'; import { ThemedUserMenuComponent } from '../../../../app/shared/auth-nav-menu/user-menu/themed-user-menu.component'; -import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-navbar/impersonate-navbar.component'; /** * Component representing the public navbar @@ -28,7 +22,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n templateUrl: './navbar.component.html', animations: [slideMobileNav], standalone: true, - imports: [NgbDropdownModule, ThemedLangSwitchComponent, ThemedSearchNavbarComponent, NgClass, RouterLink, NgIf, NgFor, NgComponentOutlet, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, AsyncPipe, TranslateModule, ThemedUserMenuComponent], + imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule], }) export class NavbarComponent extends BaseComponent { }