submit to this collection

This commit is contained in:
Ben Bosman
2020-01-08 17:41:29 +01:00
parent 4b67dbf10f
commit feced9f893
6 changed files with 49 additions and 10 deletions

View File

@@ -1,6 +1,6 @@
import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { Router } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { NO_ERRORS_SCHEMA, ViewContainerRef } from '@angular/core';
import { of as observableOf } from 'rxjs';
@@ -14,6 +14,7 @@ import { getMockTranslateService } from '../../shared/mocks/mock-translate.servi
import { RouterStub } from '../../shared/testing/router-stub';
import { mockSubmissionObject } from '../../shared/mocks/mock-submission';
import { SubmissionSubmitComponent } from './submission-submit.component';
import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
describe('SubmissionSubmitComponent Component', () => {
@@ -39,6 +40,7 @@ describe('SubmissionSubmitComponent Component', () => {
{ provide: SubmissionService, useClass: SubmissionServiceStub },
{ provide: TranslateService, useValue: getMockTranslateService() },
{ provide: Router, useValue: new RouterStub() },
{ provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
ViewContainerRef
],
schemas: [NO_ERRORS_SCHEMA]

View File

@@ -1,5 +1,5 @@
import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';
import { Router } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs';
@@ -27,6 +27,12 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
*/
public collectionId: string;
/**
* The collection id input to create a new submission
* @type {string}
*/
public collectionParam: string;
/**
* The submission self url
* @type {string}
@@ -60,13 +66,18 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
* @param {Router} router
* @param {TranslateService} translate
* @param {ViewContainerRef} viewContainerRef
* @param {ActivatedRoute} route
*/
constructor(private changeDetectorRef: ChangeDetectorRef,
private notificationsService: NotificationsService,
private router: Router,
private submissionService: SubmissionService,
private translate: TranslateService,
private viewContainerRef: ViewContainerRef) {
private viewContainerRef: ViewContainerRef,
private route: ActivatedRoute) {
this.route
.queryParams
.subscribe((params) => { this.collectionParam = (params.collection); });
}
/**
@@ -75,7 +86,7 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
ngOnInit() {
// NOTE execute the code on the browser side only, otherwise it is executed twice
this.subs.push(
this.submissionService.createSubmission()
this.submissionService.createSubmission(this.collectionParam)
.subscribe((submissionObject: SubmissionObject) => {
// NOTE new submission is created on the browser side only
if (isNotNull(submissionObject)) {