Skip to content

Commit 681efd9

Browse files
author
Zahraa Chreim
committed
127047: Merge branch 'themed-SubmissionComponents_contribute-7.6' into 'themed-SubmissionComponents_contribute-main'
2 parents b44b7a6 + 261af2a commit 681efd9

16 files changed

+318
-7
lines changed

‎src/app/submission/edit/submission-edit.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="submission-submit-container" >
2-
<ds-submission-form [collectionId]="collectionId"
2+
<ds-themed-submission-form [collectionId]="collectionId"
33
[sections]="sections"
44
[selfUrl]="selfUrl"
55
[submissionDefinition]="submissionDefinition"
66
[submissionErrors]="submissionErrors"
77
[item]="item"
88
[collectionModifiable]="collectionModifiable"
9-
[submissionId]="submissionId"></ds-submission-form>
9+
[submissionId]="submissionId"></ds-themed-submission-form>
1010
</div>

‎src/app/submission/form/footer/themed-submission-form-footer.component.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
2+
import { SubmissionFormFooterComponent } from './submission-form-footer.component';
3+
import { Component, Input } from '@angular/core';
4+
5+
@Component({
6+
selector: 'ds-themed-submission-form-footer',
7+
styleUrls: [],
8+
templateUrl: '../../../shared/theme-support/themed.component.html',
9+
})
10+
export class ThemedSubmissionFormFooterComponent extends ThemedComponent<SubmissionFormFooterComponent> {
11+
@Input() submissionId: string;
12+
13+
protected inAndOutputNames: (keyof SubmissionFormFooterComponent & keyof this)[] = ['submissionId'];
14+
15+
protected getComponentName(): string {
16+
return 'SubmissionFormFooterComponent';
17+
}
18+
19+
protected importThemedComponent(themeName: string): Promise<any> {
20+
return import(`../../../../themes/${themeName}/app/submission/form/footer/submission-form-footer.component`);
21+
}
22+
23+
protected importUnthemedComponent(): Promise<any> {
24+
return import(`./submission-form-footer.component`);
25+
}
26+
27+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@
3131

3232
<div class="submission-form-content">
3333
@if ((isLoading() | async)) {
34-
<ds-loading message="Loading..."></ds-loading>
34+
<ds-themed-loading message="Loading..."></ds-themed-loading>
3535
}
3636
@for (object of $any(submissionSections | async); track object) {
37-
<ds-submission-section-container [collectionId]="collectionId"
37+
<ds-themed-submission-section-container [collectionId]="collectionId"
3838
[submissionId]="submissionId"
3939
[sectionData]="$any(object)">
40-
</ds-submission-section-container>
40+
</ds-themed-submission-section-container>
4141
}
4242
</div>
4343
@if ((isLoading() | async) !== true) {
4444
<div class="submission-form-footer mt-3 mb-3 position-sticky">
45-
<ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
45+
<ds-themed-submission-form-footer [submissionId]="submissionId"></ds-themed-submission-form-footer>
4646
</div>
4747
}
4848
</div>

‎src/app/submission/form/themed-submission-form.component.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { ThemedComponent } from '../../shared/theme-support/themed.component';
2+
import { SubmissionFormComponent } from './submission-form.component';
3+
import { Component, Input } from '@angular/core';
4+
import { Item } from '../../core/shared/item.model';
5+
import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
6+
import { SubmissionError } from '../objects/submission-error.model';
7+
import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
8+
9+
@Component({
10+
selector: 'ds-themed-submission-form',
11+
styleUrls: [],
12+
templateUrl: '../../shared/theme-support/themed.component.html',
13+
})
14+
export class ThemedSubmissionFormComponent extends ThemedComponent<SubmissionFormComponent> {
15+
@Input() collectionId: string;
16+
17+
@Input() item: Item;
18+
19+
@Input() collectionModifiable: boolean | null = null;
20+
21+
@Input() sections: WorkspaceitemSectionsObject;
22+
23+
@Input() submissionErrors: SubmissionError;
24+
25+
@Input() selfUrl: string;
26+
27+
@Input() submissionDefinition: SubmissionDefinitionsModel;
28+
29+
@Input() submissionId: string;
30+
31+
protected inAndOutputNames: (keyof SubmissionFormComponent & keyof this)[] = ['collectionId', 'item', 'collectionModifiable', 'sections', 'submissionErrors', 'selfUrl', 'submissionDefinition', 'submissionId'];
32+
33+
protected getComponentName(): string {
34+
return 'SubmissionFormComponent';
35+
}
36+
37+
protected importThemedComponent(themeName: string): Promise<any> {
38+
return import(`../../../themes/${themeName}/app/submission/form/submission-form.component`);
39+
}
40+
41+
protected importUnthemedComponent(): Promise<any> {
42+
return import(`./submission-form.component`);
43+
}
44+
}

‎src/app/submission/sections/container/themed-section-container.component.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
2+
import { SubmissionSectionContainerComponent } from './section-container.component';
3+
import { Component, Input } from '@angular/core';
4+
import { SectionDataObject } from '../models/section-data.model';
5+
6+
@Component({
7+
selector: 'ds-themed-submission-section-container',
8+
styleUrls: [],
9+
templateUrl: '../../../shared/theme-support/themed.component.html',
10+
})
11+
export class ThemedSubmissionSectionContainerComponent extends ThemedComponent<SubmissionSectionContainerComponent> {
12+
@Input() collectionId: string;
13+
@Input() sectionData: SectionDataObject;
14+
@Input() submissionId: string;
15+
16+
protected inAndOutputNames: (keyof SubmissionSectionContainerComponent & keyof this)[] = ['collectionId', 'sectionData', 'submissionId'];
17+
18+
protected getComponentName(): string {
19+
return 'SubmissionSectionContainerComponent';
20+
}
21+
22+
protected importThemedComponent(themeName: string): Promise<any> {
23+
return import(`../../../../themes/${themeName}/app/submission/sections/container/section-container.component`);
24+
}
25+
26+
protected importUnthemedComponent(): Promise<any> {
27+
return import(`./section-container.component`);
28+
}
29+
}

‎src/app/submission/submission.module.ts‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
import { NgModule } from '@angular/core';
2+
import { CoreModule } from '../core/core.module';
3+
import { SharedModule } from '../shared/shared.module';
4+
5+
import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
6+
import { SectionsDirective } from './sections/sections.directive';
7+
import { SectionsService } from './sections/sections.service';
8+
import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
9+
import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
10+
import { SubmissionFormComponent } from './form/submission-form.component';
11+
import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
12+
import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
13+
import { CommonModule } from '@angular/common';
14+
import { Action, StoreConfig, StoreModule } from '@ngrx/store';
15+
import { EffectsModule } from '@ngrx/effects';
16+
import { submissionReducers, SubmissionState } from './submission.reducers';
17+
import { submissionEffects } from './submission.effects';
18+
import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
19+
import { SectionUploadService } from './sections/upload/section-upload.service';
20+
import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
21+
import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
22+
import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
23+
import { SubmissionEditComponent } from './edit/submission-edit.component';
24+
import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
25+
import {
26+
SubmissionSectionUploadFileEditComponent
27+
} from './sections/upload/file/edit/section-upload-file-edit.component';
28+
import {
29+
SubmissionSectionUploadFileViewComponent
30+
} from './sections/upload/file/view/section-upload-file-view.component';
31+
import {
32+
SubmissionSectionUploadAccessConditionsComponent
33+
} from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
34+
import { SubmissionSubmitComponent } from './submit/submission-submit.component';
35+
import { storeModuleConfig } from '../app.reducer';
36+
import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
37+
import {
38+
SubmissionImportExternalSearchbarComponent
39+
} from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
40+
import {
41+
SubmissionImportExternalPreviewComponent
42+
} from './import-external/import-external-preview/submission-import-external-preview.component';
43+
import {
44+
SubmissionImportExternalCollectionComponent
45+
} from './import-external/import-external-collection/submission-import-external-collection.component';
46+
import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
47+
import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
48+
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
49+
import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
50+
import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
51+
import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
52+
import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
53+
import { FormModule } from '../shared/form/form.module';
54+
import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
55+
import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
56+
import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
57+
import { SectionAccessesService } from './sections/accesses/section-accesses.service';
58+
import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
59+
import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
60+
import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
61+
import {
62+
PublicationInformationComponent
63+
} from './sections/sherpa-policies/publication-information/publication-information.component';
64+
import { UploadModule } from '../shared/upload/upload.module';
65+
import {
66+
MetadataInformationComponent
67+
} from './sections/sherpa-policies/metadata-information/metadata-information.component';
68+
import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
69+
import {SubmissionSectionIdentifiersComponent} from './sections/identifiers/section-identifiers.component';
70+
import { ThemedSubmissionSectionContainerComponent } from './sections/container/themed-section-container.component';
71+
import { ThemedSubmissionFormFooterComponent } from './form/footer/themed-submission-form-footer.component';
72+
import { ThemedSubmissionFormComponent } from './form/themed-submission-form.component';
73+
74+
const ENTRY_COMPONENTS = [
75+
// put only entry components that use custom decorator
76+
SubmissionSectionUploadComponent,
77+
SubmissionSectionFormComponent,
78+
SubmissionSectionLicenseComponent,
79+
SubmissionSectionCcLicensesComponent,
80+
SubmissionSectionAccessesComponent,
81+
SubmissionSectionSherpaPoliciesComponent,
82+
];
83+
84+
const DECLARATIONS = [
85+
...ENTRY_COMPONENTS,
86+
SectionsDirective,
87+
SubmissionEditComponent,
88+
ThemedSubmissionEditComponent,
89+
SubmissionFormSectionAddComponent,
90+
SubmissionFormCollectionComponent,
91+
SubmissionFormComponent,
92+
SubmissionFormFooterComponent,
93+
SubmissionSubmitComponent,
94+
ThemedSubmissionSubmitComponent,
95+
SubmissionUploadFilesComponent,
96+
SubmissionSectionContainerComponent,
97+
SubmissionSectionUploadAccessConditionsComponent,
98+
SubmissionSectionUploadFileComponent,
99+
SubmissionSectionUploadFileEditComponent,
100+
SubmissionSectionUploadFileViewComponent,
101+
SubmissionSectionIdentifiersComponent,
102+
SubmissionImportExternalComponent,
103+
ThemedSubmissionImportExternalComponent,
104+
SubmissionImportExternalSearchbarComponent,
105+
SubmissionImportExternalPreviewComponent,
106+
SubmissionImportExternalCollectionComponent,
107+
ContentAccordionComponent,
108+
PublisherPolicyComponent,
109+
PublicationInformationComponent,
110+
MetadataInformationComponent,
111+
ThemedSubmissionSectionUploadFileComponent,
112+
ThemedSubmissionSectionContainerComponent,
113+
ThemedSubmissionFormFooterComponent,
114+
ThemedSubmissionFormComponent,
115+
];
116+
117+
@NgModule({
118+
imports: [
119+
CommonModule,
120+
CoreModule.forRoot(),
121+
SharedModule,
122+
StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
123+
EffectsModule.forFeature(submissionEffects),
124+
JournalEntitiesModule.withEntryComponents(),
125+
ResearchEntitiesModule.withEntryComponents(),
126+
FormModule,
127+
NgbModalModule,
128+
NgbCollapseModule,
129+
NgbAccordionModule,
130+
UploadModule,
131+
],
132+
declarations: DECLARATIONS,
133+
exports: [
134+
...DECLARATIONS,
135+
FormModule,
136+
],
137+
providers: [
138+
SectionUploadService,
139+
SectionsService,
140+
SubmissionUploadsConfigDataService,
141+
SubmissionAccessesConfigDataService,
142+
SectionAccessesService,
143+
SectionFormOperationsService,
144+
]
145+
})
146+
147+
/**
148+
* This module handles all components that are necessary for the submission process
149+
*/
150+
export class SubmissionModule {
151+
/**
152+
* NOTE: this method allows to resolve issue with components that using a custom decorator
153+
* which are not loaded during SSR otherwise
154+
*/
155+
static withEntryComponents() {
156+
return {
157+
ngModule: SubmissionModule,
158+
providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
159+
};
160+
}
161+
}

‎src/themes/custom/app/submission/form/footer/submission-form-footer.component.html‎

Whitespace-only changes.

‎src/themes/custom/app/submission/form/footer/submission-form-footer.component.scss‎

Whitespace-only changes.

‎src/themes/custom/app/submission/form/footer/submission-form-footer.component.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import {
2+
SubmissionFormFooterComponent as BaseComponent
3+
} from '../../../../../../app/submission/form/footer/submission-form-footer.component';
4+
import { Component } from '@angular/core';
5+
6+
@Component({
7+
selector: 'ds-submission-form-footer',
8+
// styleUrls: ['./submission-form-footer.component.scss'],
9+
styleUrls: ['../../../../../../app/submission/form/footer/submission-form-footer.component.scss'],
10+
// templateUrl: './submission-form-footer.component.html'
11+
templateUrl: '../../../../../../app/submission/form/footer/submission-form-footer.component.html'
12+
})
13+
export class SubmissionFormFooterComponent extends BaseComponent {
14+
15+
}

‎src/themes/custom/app/submission/form/submission-form.component.html‎

Whitespace-only changes.

0 commit comments

Comments
 (0)