Skip to content

Commit 8b29a71

Browse files
alexandrevryghemnona-luypaert
authored andcommitted
Themed SubmissionUploadFilesComponent
1 parent 404ccd9 commit 8b29a71

7 files changed

Lines changed: 56 additions & 4 deletions

File tree

src/app/submission/form/submission-form.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div class="container-fluid">
22
<div *ngIf="!(isLoading() | async)" class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
33
<div *ngIf="(uploadEnabled$ | async)" class="w-100">
4-
<ds-submission-upload-files [submissionId]="submissionId"
4+
<ds-themed-submission-upload-files [submissionId]="submissionId"
55
[collectionId]="collectionId"
6-
[uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>
6+
[uploadFilesOptions]="uploadFilesOptions"></ds-themed-submission-upload-files>
77
<div class="clearfix"></div>
88
</div>
99

src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ describe('SubmissionUploadFilesComponent Component', () => {
8181
// synchronous beforeEach
8282
beforeEach(() => {
8383
const html = `
84-
<ds-submission-upload-files [submissionId]="submissionId"
84+
<ds-themed-submission-upload-files [submissionId]="submissionId"
8585
[collectionId]="collectionId"
86-
[uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>`;
86+
[uploadFilesOptions]="uploadFilesOptions"></ds-themed-submission-upload-files>`;
8787

8888
testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
8989
testComp = testFixture.componentInstance;
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { Component, Input } from '@angular/core';
2+
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
3+
import { SubmissionUploadFilesComponent } from './submission-upload-files.component';
4+
import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
5+
6+
/**
7+
* Themed wrapper for {@link SubmissionUploadFilesComponent}
8+
*/
9+
@Component({
10+
selector: 'ds-themed-submission-upload-files',
11+
templateUrl: '../../../shared/theme-support/themed.component.html',
12+
})
13+
export class ThemedSubmissionUploadFilesComponent extends ThemedComponent<SubmissionUploadFilesComponent> {
14+
15+
@Input() collectionId: string;
16+
17+
@Input() submissionId: string;
18+
19+
@Input() uploadFilesOptions: UploaderOptions;
20+
21+
protected inAndOutputNames: (keyof SubmissionUploadFilesComponent & keyof this)[] = [
22+
'collectionId',
23+
'submissionId',
24+
'uploadFilesOptions'
25+
];
26+
27+
protected getComponentName(): string {
28+
return 'SubmissionUploadFilesComponent';
29+
}
30+
31+
protected importThemedComponent(themeName: string): Promise<any> {
32+
return import(`../../../../themes/${themeName}/app/submission/form/submission-upload-files/submission-upload-files.component.ts`);
33+
}
34+
35+
protected importUnthemedComponent(): Promise<any> {
36+
return import('./submission-upload-files.component');
37+
}
38+
}

src/app/submission/submission.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import {
6767
} from './sections/sherpa-policies/metadata-information/metadata-information.component';
6868
import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
6969
import {SubmissionSectionIdentifiersComponent} from './sections/identifiers/section-identifiers.component';
70+
import { ThemedSubmissionUploadFilesComponent } from './form/submission-upload-files/themed-submission-upload-files.component';
7071

7172
const ENTRY_COMPONENTS = [
7273
// put only entry components that use custom decorator
@@ -90,6 +91,7 @@ const DECLARATIONS = [
9091
SubmissionSubmitComponent,
9192
ThemedSubmissionSubmitComponent,
9293
SubmissionUploadFilesComponent,
94+
ThemedSubmissionUploadFilesComponent,
9395
SubmissionSectionContainerComponent,
9496
SubmissionSectionUploadAccessConditionsComponent,
9597
SubmissionSectionUploadFileComponent,

src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.html

Whitespace-only changes.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Component } from '@angular/core';
2+
import { SubmissionUploadFilesComponent as BaseComponent } from '../../../../../../app/submission/form/submission-upload-files/submission-upload-files.component';
3+
4+
@Component({
5+
selector: 'ds-submission-upload-files',
6+
// templateUrl: './submission-upload-files.component.html',
7+
templateUrl: '../../../../../../app/submission/form/submission-upload-files/submission-upload-files.component.html',
8+
})
9+
export class SubmissionUploadFilesComponent extends BaseComponent {
10+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/
156156
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
157157
import { FormModule } from '../../app/shared/form/form.module';
158158
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
159+
import { SubmissionUploadFilesComponent } from './app/submission/form/submission-upload-files/submission-upload-files.component';
159160

160161
const DECLARATIONS = [
161162
FileSectionComponent,
@@ -239,6 +240,7 @@ const DECLARATIONS = [
239240
SubmissionSectionUploadFileComponent,
240241
ItemStatusComponent,
241242
EditBitstreamPageComponent,
243+
SubmissionUploadFilesComponent,
242244
];
243245

244246
@NgModule({

0 commit comments

Comments
 (0)