Skip to content

Commit c4a7641

Browse files
tdonohuetdonohue
authored
Merge pull request DSpace#2753 from alexandrevryghem/minor-themed-component-fixes_contribute-main
Themed component fixes
2 parents 075700a + c24e58e commit c4a7641

77 files changed

Lines changed: 605 additions & 151 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
2121
import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';
2222

2323
@Component({
24-
selector: 'ds-metadata-import-page',
24+
selector: 'ds-base-metadata-import-page',
2525
templateUrl: './metadata-import-page.component.html',
2626
imports: [
27-
TranslateModule,
28-
FormsModule,
2927
FileDropzoneNoUploaderComponent,
28+
FormsModule,
29+
TranslateModule,
3030
],
3131
standalone: true,
3232
})

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { Component } from '@angular/core';
2+
3+
import { ThemedComponent } from '../../shared/theme-support/themed.component';
4+
import { MetadataImportPageComponent } from './metadata-import-page.component';
5+
6+
/**
7+
* Themed wrapper for {@link MetadataImportPageComponent}.
8+
*/
9+
@Component({
10+
selector: 'ds-metadata-import-page',
11+
templateUrl: '../../shared/theme-support/themed.component.html',
12+
standalone: true,
13+
imports: [MetadataImportPageComponent],
14+
})
15+
export class ThemedMetadataImportPageComponent extends ThemedComponent<MetadataImportPageComponent> {
16+
protected getComponentName(): string {
17+
return 'MetadataImportPageComponent';
18+
}
19+
20+
protected importThemedComponent(themeName: string): Promise<any> {
21+
return import(`../../../themes/${themeName}/app/admin/admin-import-metadata-page/metadata-import-page.component`);
22+
}
23+
24+
protected importUnthemedComponent(): Promise<any> {
25+
return import('./metadata-import-page.component');
26+
}
27+
}

‎src/app/admin/admin-routes.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Route } from '@angular/router';
33
import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
44
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
55
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
6-
import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
6+
import { ThemedMetadataImportPageComponent } from './admin-import-metadata-page/themed-metadata-import-page.component';
77
import {
88
LDN_PATH,
99
NOTIFICATIONS_MODULE_PATH,
@@ -46,7 +46,7 @@ export const ROUTES: Route[] = [
4646
{
4747
path: 'metadata-import',
4848
resolve: { breadcrumb: i18nBreadcrumbResolver },
49-
component: MetadataImportPageComponent,
49+
component: ThemedMetadataImportPageComponent,
5050
data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' },
5151
},
5252
{

‎src/app/browse-by/browse-by-date/browse-by-date.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { RemoteData } from '../../core/data/remote-data';
3636
import { PaginationService } from '../../core/pagination/pagination.service';
3737
import { Item } from '../../core/shared/item.model';
3838
import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
39-
import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component';
39+
import { ThemedComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
4040
import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
4141
import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
4242
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
@@ -68,7 +68,7 @@ import {
6868
ComcolPageLogoComponent,
6969
NgIf,
7070
ThemedComcolPageHandleComponent,
71-
ComcolPageContentComponent,
71+
ThemedComcolPageContentComponent,
7272
DsoEditMenuComponent,
7373
ThemedComcolPageBrowseByComponent,
7474
TranslateModule,

‎src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import { Context } from '../../core/shared/context.model';
4646
import { Item } from '../../core/shared/item.model';
4747
import { getFirstSucceededRemoteData } from '../../core/shared/operators';
4848
import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
49-
import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component';
49+
import { ThemedComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
5050
import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
5151
import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
5252
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
@@ -74,7 +74,7 @@ export const BBM_PAGINATION_ID = 'bbm';
7474
ComcolPageLogoComponent,
7575
NgIf,
7676
ThemedComcolPageHandleComponent,
77-
ComcolPageContentComponent,
77+
ThemedComcolPageContentComponent,
7878
DsoEditMenuComponent,
7979
ThemedComcolPageBrowseByComponent,
8080
TranslateModule,

‎src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models
2929
import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
3030
import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
3131
import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
32-
import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component';
32+
import { ThemedComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
3333
import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
3434
import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
3535
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
@@ -51,7 +51,7 @@ import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
5151
ComcolPageLogoComponent,
5252
NgIf,
5353
ThemedComcolPageHandleComponent,
54-
ComcolPageContentComponent,
54+
ThemedComcolPageContentComponent,
5555
DsoEditMenuComponent,
5656
ThemedComcolPageBrowseByComponent,
5757
TranslateModule,

‎src/app/browse-by/browse-by-title/browse-by-title.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '../../core/cache/models/sort-options.model';
1818
import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
1919
import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
20-
import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component';
20+
import { ThemedComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
2121
import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
2222
import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
2323
import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
@@ -43,7 +43,7 @@ import {
4343
ComcolPageLogoComponent,
4444
NgIf,
4545
ThemedComcolPageHandleComponent,
46-
ComcolPageContentComponent,
46+
ThemedComcolPageContentComponent,
4747
DsoEditMenuComponent,
4848
ThemedComcolPageBrowseByComponent,
4949
TranslateModule,

‎src/app/collection-page/collection-page.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@
5858
<ds-loading *ngIf="collectionRD?.isLoading"
5959
message="{{'loading.collection' | translate}}"></ds-loading>
6060
</div>
61-
</div>
61+
</div>

‎src/app/collection-page/collection-page.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
fadeInOut,
3737
} from '../shared/animations/fade';
3838
import { ThemedComcolPageBrowseByComponent } from '../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
39-
import { ComcolPageContentComponent } from '../shared/comcol/comcol-page-content/comcol-page-content.component';
39+
import { ThemedComcolPageContentComponent } from '../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
4040
import { ThemedComcolPageHandleComponent } from '../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
4141
import { ComcolPageHeaderComponent } from '../shared/comcol/comcol-page-header/comcol-page-header.component';
4242
import { ComcolPageLogoComponent } from '../shared/comcol/comcol-page-logo/comcol-page-logo.component';
@@ -63,7 +63,7 @@ import { getCollectionPageRoute } from './collection-page-routing-paths';
6363
fadeInOut,
6464
],
6565
imports: [
66-
ComcolPageContentComponent,
66+
ThemedComcolPageContentComponent,
6767
ErrorComponent,
6868
NgIf,
6969
ThemedLoadingComponent,

‎src/app/community-page/community-page.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { Community } from '../core/shared/community.model';
3232
import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
3333
import { fadeInOut } from '../shared/animations/fade';
3434
import { ThemedComcolPageBrowseByComponent } from '../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
35-
import { ComcolPageContentComponent } from '../shared/comcol/comcol-page-content/comcol-page-content.component';
35+
import { ThemedComcolPageContentComponent } from '../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
3636
import { ThemedComcolPageHandleComponent } from '../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
3737
import { ComcolPageHeaderComponent } from '../shared/comcol/comcol-page-header/comcol-page-header.component';
3838
import { ComcolPageLogoComponent } from '../shared/comcol/comcol-page-logo/comcol-page-logo.component';
@@ -53,7 +53,7 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com
5353
changeDetection: ChangeDetectionStrategy.OnPush,
5454
animations: [fadeInOut],
5555
imports: [
56-
ComcolPageContentComponent,
56+
ThemedComcolPageContentComponent,
5757
ErrorComponent,
5858
ThemedLoadingComponent,
5959
NgIf,

0 commit comments

Comments
 (0)