65240: AoT build error fixes

This commit is contained in:
Kristof De Langhe
2019-10-07 14:05:54 +02:00
parent d45b4eedfd
commit bfb2ef021a
8 changed files with 14 additions and 14 deletions

View File

@@ -3,7 +3,6 @@ import { DynamicFormService, DynamicInputModel, DynamicTextAreaModel } from '@ng
import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model'; import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
import { Collection } from '../../core/shared/collection.model'; import { Collection } from '../../core/shared/collection.model';
import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component'; import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
import { NormalizedCollection } from '../../core/cache/models/normalized-collection.model';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -27,7 +26,7 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> {
/** /**
* @type {Collection.type} This is a collection-type form * @type {Collection.type} This is a collection-type form
*/ */
protected type = Collection.type; type = Collection.type;
/** /**
* The dynamic form fields used for creating/editing a collection * The dynamic form fields used for creating/editing a collection

View File

@@ -12,7 +12,7 @@ import { getCollectionPageRoute } from '../collection-page-routing.module';
templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html' templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
}) })
export class EditCollectionPageComponent extends EditComColPageComponent<Collection> { export class EditCollectionPageComponent extends EditComColPageComponent<Collection> {
protected type = 'collection'; type = 'collection';
public constructor( public constructor(
protected router: Router, protected router: Router,

View File

@@ -27,7 +27,7 @@ export class CommunityFormComponent extends ComColFormComponent<Community> {
/** /**
* @type {Community.type} This is a community-type form * @type {Community.type} This is a community-type form
*/ */
protected type = Community.type; type = Community.type;
/** /**
* The dynamic form fields used for creating/editing a community * The dynamic form fields used for creating/editing a community

View File

@@ -12,7 +12,7 @@ import { getCommunityPageRoute } from '../community-page-routing.module';
templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html' templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
}) })
export class EditCommunityPageComponent extends EditComColPageComponent<Community> { export class EditCommunityPageComponent extends EditComColPageComponent<Community> {
protected type = 'community'; type = 'community';
public constructor( public constructor(
protected router: Router, protected router: Router,

View File

@@ -47,7 +47,7 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
/** /**
* Type of DSpaceObject that the form represents * Type of DSpaceObject that the form represents
*/ */
protected type: ResourceType; type: ResourceType;
/** /**
* @type {string} Key prefix used to generate form labels * @type {string} Key prefix used to generate form labels
@@ -95,7 +95,7 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
* Observable keeping track whether or not the uploader has finished initializing * Observable keeping track whether or not the uploader has finished initializing
* Used to start rendering the uploader component * Used to start rendering the uploader component
*/ */
private initializedUploaderOptions = new BehaviorSubject(false); initializedUploaderOptions = new BehaviorSubject(false);
/** /**
* Array to track all subscriptions and unsubscribe them onDestroy * Array to track all subscriptions and unsubscribe them onDestroy

View File

@@ -19,7 +19,7 @@ export class EditComColPageComponent<TDomain extends DSpaceObject> implements On
/** /**
* The type of DSpaceObject (used to create i18n messages) * The type of DSpaceObject (used to create i18n messages)
*/ */
protected type: string; public type: string;
/** /**
* The current page outlet string * The current page outlet string

View File

@@ -64,12 +64,12 @@ describe('Chips component', () => {
template: `` template: ``
}) })
class TestComponent { class TestComponent {
public uploadFilesOptions: UploaderOptions = { public uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
url: 'http://test', url: 'http://test',
authToken: null, authToken: null,
disableMultipart: false, disableMultipart: false,
itemAlias: null itemAlias: null
}; });
/* tslint:disable:no-empty */ /* tslint:disable:no-empty */
public onBeforeUpload = () => { public onBeforeUpload = () => {

View File

@@ -28,6 +28,7 @@ import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testin
import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
import { SharedModule } from '../../../shared/shared.module'; import { SharedModule } from '../../../shared/shared.module';
import { createTestComponent } from '../../../shared/testing/utils'; import { createTestComponent } from '../../../shared/testing/utils';
import { UploaderOptions } from '../../../shared/uploader/uploader-options.model';
describe('SubmissionUploadFilesComponent Component', () => { describe('SubmissionUploadFilesComponent Component', () => {
@@ -112,12 +113,12 @@ describe('SubmissionUploadFilesComponent Component', () => {
comp.submissionId = submissionId; comp.submissionId = submissionId;
comp.collectionId = collectionId; comp.collectionId = collectionId;
comp.sectionId = 'upload'; comp.sectionId = 'upload';
comp.uploadFilesOptions = { comp.uploadFilesOptions = Object.assign(new UploaderOptions(),{
url: '', url: '',
authToken: null, authToken: null,
disableMultipart: false, disableMultipart: false,
itemAlias: null itemAlias: null
}; });
}); });
@@ -208,11 +209,11 @@ class TestComponent {
submissionId = mockSubmissionId; submissionId = mockSubmissionId;
collectionId = mockSubmissionCollectionId; collectionId = mockSubmissionCollectionId;
sectionId = 'upload'; sectionId = 'upload';
uploadFilesOptions = { uploadFilesOptions = Object.assign(new UploaderOptions(), {
url: '', url: '',
authToken: null, authToken: null,
disableMultipart: false, disableMultipart: false,
itemAlias: null itemAlias: null
}; });
} }