diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts
index 1ee097af71..16cc9b6262 100644
--- a/src/app/shared/mocks/submission.mock.ts
+++ b/src/app/shared/mocks/submission.mock.ts
@@ -1101,91 +1101,6 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
}
});
-export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.assign({}, {
- 826: {
- collection: mockSubmissionCollectionId,
- definition: 'traditional',
- selfUrl: mockSubmissionSelfUrl,
- activeSection: null,
- sections: {
- extraction: {
- config: '',
- mandatory: true,
- sectionType: 'utils',
- visibility: {
- main: 'HIDDEN',
- other: 'HIDDEN'
- },
- collapsed: false,
- enabled: true,
- data: {},
- errors: [],
- isLoading: false,
- isValid: false
- } as any,
- collection: {
- config: '',
- mandatory: true,
- sectionType: 'collection',
- visibility: {
- main: 'HIDDEN',
- other: 'HIDDEN'
- },
- collapsed: false,
- enabled: true,
- data: {},
- errors: [],
- isLoading: false,
- isValid: false
- } as any,
- traditionalpageone: {
- header: 'submit.progressbar.describe.stepone',
- config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
- mandatory: true,
- sectionType: 'submission-form',
- collapsed: false,
- enabled: true,
- data: {},
- errors: [],
- formId: '2_traditionalpageone',
- isLoading: false,
- isValid: false
- } as any,
- traditionalpagetwo: {
- header: 'submit.progressbar.describe.steptwo',
- config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo',
- mandatory: false,
- sectionType: 'submission-form',
- collapsed: false,
- enabled: false,
- data: {},
- errors: [],
- isLoading: false,
- isValid: false
- } as any,
- license: {
- header: 'submit.progressbar.license',
- config: '',
- mandatory: true,
- sectionType: 'license',
- visibility: {
- main: null,
- other: 'READONLY'
- },
- collapsed: false,
- enabled: true,
- data: {},
- errors: [],
- isLoading: false,
- isValid: false
- } as any
- },
- isLoading: false,
- savePending: false,
- depositPending: false
- }
-});
-
export const mockSectionsState = Object.assign({}, {
extraction: {
config: '',
diff --git a/src/app/shared/uploader/uploader.component.ts b/src/app/shared/uploader/uploader.component.ts
index a0dd0e5bba..0e19c38b55 100644
--- a/src/app/shared/uploader/uploader.component.ts
+++ b/src/app/shared/uploader/uploader.component.ts
@@ -1,16 +1,29 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostListener, Input, Output, ViewEncapsulation, } from '@angular/core';
+import {
+ ChangeDetectionStrategy,
+ ChangeDetectorRef,
+ Component,
+ EventEmitter,
+ HostListener,
+ Input,
+ Output,
+ ViewEncapsulation,
+} from '@angular/core';
import { of as observableOf } from 'rxjs';
import { FileUploader } from 'ng2-file-upload';
import { uniqueId } from 'lodash';
-import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+import { ScrollToConfigOptions, ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
import { UploaderOptions } from './uploader-options.model';
import { hasValue, isNotEmpty, isUndefined } from '../empty.util';
import { UploaderService } from './uploader.service';
import { UploaderProperties } from './uploader-properties.model';
import { HttpXsrfTokenExtractor } from '@angular/common/http';
-import { XSRF_COOKIE, XSRF_REQUEST_HEADER, XSRF_RESPONSE_HEADER } from '../../core/xsrf/xsrf.interceptor';
+import {
+ XSRF_REQUEST_HEADER,
+ XSRF_RESPONSE_HEADER,
+ XSRF_COOKIE
+} from '../../core/xsrf/xsrf.interceptor';
import { CookieService } from '../../core/services/cookie.service';
@Component({
@@ -133,6 +146,12 @@ export class UploaderComponent {
this.uploader.options.headers = [{ name: XSRF_REQUEST_HEADER, value: this.tokenExtractor.getToken() }];
this.onBeforeUpload();
this.isOverDocumentDropZone = observableOf(false);
+
+ // Move page target to the uploader
+ const config: ScrollToConfigOptions = {
+ target: this.uploaderId
+ };
+ this.scrollToService.scrollTo(config);
};
if (hasValue(this.uploadProperties)) {
this.uploader.onBuildItemForm = (item, form) => {
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 33b5d4be12..7376b1e10b 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -1,36 +1,35 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+