hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 22:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into metadata-and-relationships-combined-in-submission

Browse Source
This commit is contained in:
lotte
2020-05-12 17:19:08 +02:00
parent f3ecd3837e 33be8a4a91
commit aa9570c776
545 changed files with 5995 additions and 9581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@ import {
} from './objects/submission-objects.reducer';
import { submissionObjectFromIdSelector } from './selectors';
import { GlobalConfig } from '../../config/global-config.interface';
import { GLOBAL_CONFIG } from '../../config';
import { HttpOptions } from '../core/dspace-rest-v2/dspace-rest-v2.service';
import { SubmissionRestService } from '../core/submission/submission-rest.service';
import { SectionDataObject } from './sections/models/section-data.model';
@@ -43,10 +42,11 @@ import { WorkspaceitemSectionsObject } from '../core/submission/models/workspace
import { RemoteData } from '../core/data/remote-data';
import { ErrorResponse } from '../core/cache/response.models';
import { RemoteDataError } from '../core/data/remote-data-error';
import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject } from '../shared/testing/utils';
import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
import { RequestService } from '../core/data/request.service';
import { SearchService } from '../core/shared/search/search.service';
import { Item } from '../core/shared/item.model';
import { environment } from '../../environments/environment';
/**
* A service that provides methods used in submission process.
@@ -78,8 +78,7 @@ export class SubmissionService {
* @param {SearchService} searchService
* @param {RequestService} requestService
*/
constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
protected notificationsService: NotificationsService,
constructor(protected notificationsService: NotificationsService,
protected restService: SubmissionRestService,
protected router: Router,
protected routeService: RouteService,
@@ -552,7 +551,7 @@ export class SubmissionService {
this.stopAutoSave();
// AUTOSAVE submission
// Retrieve interval from config and convert to milliseconds
const duration = this.EnvConfig.submission.autosave.timer * (1000 * 60);
const duration = environment.submission.autosave.timer * (1000 * 60);
// Dispatch save action after given duration
this.timer$ = observableTimer(duration, duration);
this.autoSaveSub = this.timer$