hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 05:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added notify new section method to SubmissionService

Browse Source
This commit is contained in:
Giuseppe
2018-09-27 15:01:42 +02:00
parent 618e689258
commit f8620d5c12
2 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/submission/objects/submission-objects.effects.ts
View File

@@ -124,7 +124,9 @@ export class SubmissionObjectEffects {
.map(([action, currentState]: [SaveSubmissionFormSuccessAction | SaveSubmissionSectionFormSuccessAction, any]) => { .map(([action, currentState]: [SaveSubmissionFormSuccessAction | SaveSubmissionSectionFormSuccessAction, any]) => {
return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId], action.payload.submissionObject, action.payload.submissionId); return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId], action.payload.submissionObject, action.payload.submissionId);
}) })
.mergeMap((actions) => Observable.from(actions)); .mergeMap((actions) => {
return Observable.from(actions);
});
@Effect() saveSection$ = this.actions$ @Effect() saveSection$ = this.actions$
.ofType(SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM) .ofType(SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM)

23
src/app/submission/submission.service.ts
View File

@@ -82,7 +82,6 @@ export class SubmissionService {
const availableSections: SectionDataObject[] = []; const availableSections: SectionDataObject[] = [];
Object.keys(sections) Object.keys(sections)
.filter((sectionId) => !this.isSectionHidden(sections[sectionId] as SubmissionSectionObject)) .filter((sectionId) => !this.isSectionHidden(sections[sectionId] as SubmissionSectionObject))
// .filter((sectionId) => sections[sectionId].sectionType !== SectionsType.DetectDuplicate || isNotEmpty(sections[sectionId].data))
.forEach((sectionId) => { .forEach((sectionId) => {
const sectionObject: SectionDataObject = Object.create({}); const sectionObject: SectionDataObject = Object.create({});
sectionObject.config = sections[sectionId].config; sectionObject.config = sections[sectionId].config;
@@ -217,29 +216,13 @@ export class SubmissionService {
} }
} }
notifyNewSection(submissionId: string, sectionId: string, sectionType?: SectionsType) { notifyNewSection(sectionId: string, sectionType?: SectionsType) {
if (sectionType === SectionsType.DetectDuplicate) {
this.setActiveSection(submissionId, sectionId);
this.translate.get('submission.sections.detect-duplicate.duplicate-detected', {sectionId})
.take(1)
.subscribe((msg) => {
this.notificationsService.warning(null, msg, new NotificationOptions(0));
});
const config: ScrollToConfigOptions = {
target: sectionId,
offset: -70
};
this.scrollToService.scrollTo(config);
} else {
this.translate.get('submission.sections.general.metadata-extracted-new-section', {sectionId}) this.translate.get('submission.sections.general.metadata-extracted-new-section', {sectionId})
.take(1) .take(1)
.subscribe((msg) => { .subscribe((m) => {
this.notificationsService.info(null, msg, null, true); this.notificationsService.info(null, m, null, true);
}); });
} }
}
retrieveSubmission(submissionId): Observable<SubmissionObject> { retrieveSubmission(submissionId): Observable<SubmissionObject> {
return this.restService.getDataById(this.getSubmissionObjectLinkName(), submissionId) return this.restService.getDataById(this.getSubmissionObjectLinkName(), submissionId)
.filter((submissionObjects: SubmissionObject[]) => isNotUndefined(submissionObjects)) .filter((submissionObjects: SubmissionObject[]) => isNotUndefined(submissionObjects))