Skip to content

Commit b504af6

Browse files
126015: Sync standalone imports in custom theme
(cherry picked from commit fddc493)
1 parent 677c77e commit b504af6

File tree

10 files changed

+42
-55
lines changed

10 files changed

+42
-55
lines changed

src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ import {
4747
styleUrls: ['./create-community-parent-selector.component.scss'],
4848
templateUrl: './create-community-parent-selector.component.html',
4949
standalone: true,
50-
imports: [DSOSelectorComponent, TranslateModule, NgIf, AsyncPipe],
50+
imports: [
51+
AsyncPipe,
52+
DSOSelectorComponent,
53+
NgIf,
54+
TranslateModule,
55+
],
5156
})
5257
export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
5358
objectType = DSpaceObjectType.COMMUNITY;

src/app/shared/search/search-results/search-results.component.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,17 @@ export interface SelectionConfig {
5757
fadeInOut,
5858
],
5959
standalone: true,
60-
imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
60+
imports: [
61+
AsyncPipe,
62+
ErrorComponent,
63+
NgIf,
64+
NgxSkeletonLoaderModule,
65+
ObjectCollectionComponent,
66+
RouterLink,
67+
SearchExportCsvComponent,
68+
SearchResultsSkeletonComponent,
69+
TranslateModule,
70+
],
6171
})
6272

6373
/**

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
77

88
import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component';
99
import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
10-
import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
11-
import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
12-
import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
13-
import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
14-
import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
15-
import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
1610
import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
17-
import { VarDirective } from '../../../../../app/shared/utils/var.directive';
1811

1912
@Component({
2013
selector: 'ds-browse-by-date',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
2417
templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
2518
standalone: true,
2619
imports: [
27-
VarDirective,
2820
AsyncPipe,
29-
ComcolPageHeaderComponent,
30-
ComcolPageLogoComponent,
3121
NgIf,
32-
ThemedComcolPageHandleComponent,
33-
ThemedComcolPageContentComponent,
34-
DsoEditMenuComponent,
35-
ThemedComcolPageBrowseByComponent,
3622
TranslateModule,
3723
ThemedLoadingComponent,
3824
ThemedBrowseByComponent,

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
77

88
import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component';
99
import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
10-
import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
11-
import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
12-
import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
13-
import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
14-
import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
15-
import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
1610
import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
17-
import { VarDirective } from '../../../../../app/shared/utils/var.directive';
1811

1912
@Component({
2013
selector: 'ds-browse-by-metadata',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
2417
templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
2518
standalone: true,
2619
imports: [
27-
VarDirective,
2820
AsyncPipe,
29-
ComcolPageHeaderComponent,
30-
ComcolPageLogoComponent,
3121
NgIf,
32-
ThemedComcolPageHandleComponent,
33-
ThemedComcolPageContentComponent,
34-
DsoEditMenuComponent,
35-
ThemedComcolPageBrowseByComponent,
3622
TranslateModule,
3723
ThemedLoadingComponent,
3824
ThemedBrowseByComponent,

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
77

88
import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
99
import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
10-
import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
11-
import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
12-
import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
13-
import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
14-
import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
15-
import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
1610
import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
17-
import { VarDirective } from '../../../../../app/shared/utils/var.directive';
1811

1912
@Component({
2013
selector: 'ds-browse-by-title',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
2417
templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
2518
standalone: true,
2619
imports: [
27-
VarDirective,
2820
AsyncPipe,
29-
ComcolPageHeaderComponent,
30-
ComcolPageLogoComponent,
3121
NgIf,
32-
ThemedComcolPageHandleComponent,
33-
ThemedComcolPageContentComponent,
34-
DsoEditMenuComponent,
35-
ThemedComcolPageBrowseByComponent,
3622
TranslateModule,
3723
ThemedLoadingComponent,
3824
ThemedBrowseByComponent,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {
22
AsyncPipe,
33
NgForOf,
44
NgIf,
5+
NgTemplateOutlet,
56
} from '@angular/common';
67
import { Component } from '@angular/core';
78
import { TranslateModule } from '@ngx-translate/core';
@@ -33,6 +34,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
3334
NgIf,
3435
NgForOf,
3536
SuggestionsNotificationComponent,
37+
NgTemplateOutlet,
3638
PaginationComponent,
3739
ThemedLoadingComponent,
3840
ErrorComponent,

src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import {
2+
AsyncPipe,
3+
NgIf,
4+
} from '@angular/common';
15
import { Component } from '@angular/core';
26
import { TranslateModule } from '@ngx-translate/core';
37

@@ -11,7 +15,12 @@ import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../.
1115
// templateUrl: './create-community-parent-selector.component.html',
1216
templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html',
1317
standalone: true,
14-
imports: [DSOSelectorComponent, TranslateModule],
18+
imports: [
19+
AsyncPipe,
20+
DSOSelectorComponent,
21+
NgIf,
22+
TranslateModule,
23+
],
1524
})
1625
export class CreateCommunityParentSelectorComponent extends BaseComponent {
1726
}

src/themes/custom/app/shared/search/search-results/search-results.component.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,17 @@ import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/sea
2727
fadeInOut,
2828
],
2929
standalone: true,
30-
imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
30+
imports: [
31+
AsyncPipe,
32+
ErrorComponent,
33+
NgIf,
34+
NgxSkeletonLoaderModule,
35+
ObjectCollectionComponent,
36+
RouterLink,
37+
SearchExportCsvComponent,
38+
SearchResultsSkeletonComponent,
39+
TranslateModule,
40+
],
3141
})
3242
export class SearchResultsComponent extends BaseComponent {
3343

src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {
22
AsyncPipe,
3-
NgClass,
43
NgIf,
54
} from '@angular/common';
65
import { Component } from '@angular/core';
@@ -19,7 +18,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
1918
styleUrls: ['header-navbar-wrapper.component.scss'],
2019
templateUrl: 'header-navbar-wrapper.component.html',
2120
standalone: true,
22-
imports: [NgClass, ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
21+
imports: [ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
2322
animations: [slideMobileNav],
2423
})
2524
export class HeaderNavbarWrapperComponent extends BaseComponent {

src/themes/dspace/app/navbar/navbar.component.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@ import {
66
NgIf,
77
} from '@angular/common';
88
import { Component } from '@angular/core';
9-
import { RouterLink } from '@angular/router';
109
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
1110
import { TranslateModule } from '@ngx-translate/core';
12-
import { ThemedSearchNavbarComponent } from 'src/app/search-navbar/themed-search-navbar.component';
13-
import { ThemedLangSwitchComponent } from 'src/app/shared/lang-switch/themed-lang-switch.component';
1411

15-
import { ContextHelpToggleComponent } from '../../../../app/header/context-help-toggle/context-help-toggle.component';
1612
import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
1713
import { slideMobileNav } from '../../../../app/shared/animations/slide';
18-
import { ThemedAuthNavMenuComponent } from '../../../../app/shared/auth-nav-menu/themed-auth-nav-menu.component';
1914
import { ThemedUserMenuComponent } from '../../../../app/shared/auth-nav-menu/user-menu/themed-user-menu.component';
20-
import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-navbar/impersonate-navbar.component';
2115

2216
/**
2317
* Component representing the public navbar
@@ -28,7 +22,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
2822
templateUrl: './navbar.component.html',
2923
animations: [slideMobileNav],
3024
standalone: true,
31-
imports: [NgbDropdownModule, ThemedLangSwitchComponent, ThemedSearchNavbarComponent, NgClass, RouterLink, NgIf, NgFor, NgComponentOutlet, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, AsyncPipe, TranslateModule, ThemedUserMenuComponent],
25+
imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
3226
})
3327
export class NavbarComponent extends BaseComponent {
3428
}

0 commit comments

Comments
 (0)