Added notify new section method to SubmissionService

This commit is contained in:
Giuseppe
2018-09-27 15:01:42 +02:00
parent c7b4c1b056
commit 261b863d83
2 changed files with 14 additions and 6 deletions

View File

@@ -319,11 +319,7 @@ export class SubmissionObjectEffects {
const sectionErrors = errorsList[sectionId] || []; const sectionErrors = errorsList[sectionId] || [];
const sectionData = sections[sectionId] || {}; const sectionData = sections[sectionId] || {};
if (!currentState.sections[sectionId].enabled) { if (!currentState.sections[sectionId].enabled) {
this.translate.get('submission.sections.general.metadata-extracted-new-section', {sectionId}) this.submissionService.notifyNewSection(sectionId);
.take(1)
.subscribe((m) => {
this.notificationsService.info(null, m, null, true);
});
} }
mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, sectionErrors)); mappedActions.push(new UpdateSectionDataAction(submissionId, sectionId, sectionData, sectionErrors));
}); });

View File

@@ -23,6 +23,9 @@ import { SectionDataObject } from './sections/models/section-data.model';
import { SubmissionScopeType } from '../core/submission/submission-scope-type'; import { SubmissionScopeType } from '../core/submission/submission-scope-type';
import { SubmissionObject } from '../core/submission/models/submission-object.model'; import { SubmissionObject } from '../core/submission/models/submission-object.model';
import { RouteService } from '../shared/services/route.service'; import { RouteService } from '../shared/services/route.service';
import { SectionsType } from './sections/sections-type';
import { TranslateService } from '@ngx-translate/core';
import { NotificationsService } from '../shared/notifications/notifications.service';
@Injectable() @Injectable()
export class SubmissionService { export class SubmissionService {
@@ -31,10 +34,12 @@ export class SubmissionService {
protected timerObs: Observable<any>; protected timerObs: Observable<any>;
constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig, constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
protected notificationsService: NotificationsService,
protected restService: SubmissionRestService, protected restService: SubmissionRestService,
protected router: Router, protected router: Router,
protected routeService: RouteService, protected routeService: RouteService,
protected store: Store<SubmissionState>) { protected store: Store<SubmissionState>,
protected translate: TranslateService) {
} }
createSubmission(): Observable<SubmissionObject> { createSubmission(): Observable<SubmissionObject> {
@@ -200,6 +205,13 @@ export class SubmissionService {
} }
} }
notifyNewSection(sectionId: string, sectionType?: SectionsType) {
this.translate.get('submission.sections.general.metadata-extracted-new-section', {sectionId})
.take(1)
.subscribe((m) => {
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))