updated to the latest 9.x version

This commit is contained in:
Giuseppe Digilio
2020-11-18 19:02:55 +01:00
parent 17d7e10ac3
commit 1b21af3191
35 changed files with 974 additions and 795 deletions

View File

@@ -55,16 +55,16 @@
"minimist": "^1.2.5"
},
"dependencies": {
"@angular/animations": "~8.2.14",
"@angular/animations": "~9.1.12",
"@angular/cdk": "8.2.3",
"@angular/common": "~8.2.14",
"@angular/compiler": "~8.2.14",
"@angular/core": "~8.2.14",
"@angular/forms": "~8.2.14",
"@angular/platform-browser": "~8.2.14",
"@angular/platform-browser-dynamic": "~8.2.14",
"@angular/platform-server": "~8.2.14",
"@angular/router": "~8.2.14",
"@angular/common": "~9.1.12",
"@angular/compiler": "~9.1.12",
"@angular/core": "~9.1.12",
"@angular/forms": "~9.1.12",
"@angular/platform-browser": "~9.1.12",
"@angular/platform-browser-dynamic": "~9.1.12",
"@angular/platform-server": "~9.1.12",
"@angular/router": "~9.1.12",
"@angularclass/bootloader": "1.0.1",
"@ng-bootstrap/ng-bootstrap": "5.2.1",
"@ng-dynamic-forms/core": "8.1.1",
@@ -112,20 +112,20 @@
"pem": "1.13.2",
"postcss-cli": "^6.0.0",
"reflect-metadata": "^0.1.13",
"rxjs": "~6.4.0",
"rxjs": "~6.6.3",
"rxjs-spy": "^7.5.1",
"sass-resources-loader": "^2.0.0",
"sortablejs": "1.7.0",
"tslib": "^1.10.0",
"webfontloader": "1.6.28",
"zone.js": "^0.9.1"
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-builders/custom-webpack": "8.4.1",
"@angular-devkit/build-angular": "~0.803.29",
"@angular/cli": "~8.3.29",
"@angular/compiler-cli": "~8.2.14",
"@angular/language-service": "~8.2.14",
"@angular-devkit/build-angular": "~0.901.12",
"@angular/cli": "~9.1.12",
"@angular/compiler-cli": "~9.1.12",
"@angular/language-service": "~9.1.12",
"@fortawesome/fontawesome-free": "^5.5.0",
"@ngrx/store-devtools": "^8.6.0",
"@ngtools/webpack": "^8.3.25",
@@ -136,8 +136,8 @@
"@types/jasminewd2": "~2.0.3",
"@types/js-cookie": "2.1.0",
"@types/lodash": "^4.14.110",
"@types/node": "11.15.3",
"codelyzer": "^5.0.0",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"compression-webpack-plugin": "^3.0.1",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "3.4.0",
@@ -174,7 +174,7 @@
"ts-loader": "^5.2.0",
"ts-node": "^8.8.1",
"tslint": "~5.15.0",
"typescript": "~3.5.3",
"typescript": "~3.8.3",
"webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.1.0",

View File

@@ -49,7 +49,7 @@ export class CollectionItemMapperComponent implements OnInit {
* A view on the tabset element
* Used to switch tabs programmatically
*/
@ViewChild('tabs', {static: false}) tabs;
@ViewChild('tabs') tabs;
/**
* The collection to map items to

View File

@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { Observable } from 'rxjs/internal/Observable';
import { RemoteData } from '../../../core/data/remote-data';
import { Item } from '../../../core/shared/item.model';
@@ -14,9 +14,7 @@ import { TranslateService } from '@ngx-translate/core';
import { PaginatedList } from '../../../core/data/paginated-list';
import { Bundle } from '../../../core/shared/bundle.model';
import { BundleDataService } from '../../../core/data/bundle-data.service';
import {
getFirstSucceededRemoteDataPayload
} from '../../../core/shared/operators';
import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
import { UploaderComponent } from '../../../shared/uploader/uploader.component';
import { RequestService } from '../../../core/data/request.service';
import { getBitstreamModuleRoute } from '../../../app-routing-paths';
@@ -33,7 +31,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
/**
* The file uploader component
*/
@ViewChild(UploaderComponent, {static: false}) uploaderComponent: UploaderComponent;
@ViewChild(UploaderComponent) uploaderComponent: UploaderComponent;
/**
* The ID of the item to upload a bitstream to

View File

@@ -45,7 +45,7 @@ export class ItemCollectionMapperComponent implements OnInit {
* A view on the tabset element
* Used to switch tabs programmatically
*/
@ViewChild('tabs', {static: false}) tabs;
@ViewChild('tabs') tabs;
/**
* The item to map to collections

View File

@@ -46,7 +46,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
/**
* Reference to uploaderComponent
*/
@ViewChild(UploaderComponent, { static: false }) uploaderComponent: UploaderComponent;
@ViewChild(UploaderComponent) uploaderComponent: UploaderComponent;
/**
* Initialize instance variables
@@ -55,9 +55,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
* @param {ChangeDetectorRef} changeDetectorRef
* @param {HALEndpointService} halService
* @param {NotificationsService} notificationsService
* @param {Store<SubmissionState>} store
* @param {TranslateService} translate
* @param {Router} router
* @param {NgbModal} modalService
*/
constructor(private authService: AuthService,

View File

@@ -392,7 +392,7 @@ export const models =
})
export class CoreModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<CoreModule> {
return {
ngModule: CoreModule,
providers: [

View File

@@ -1,8 +1,9 @@
import { EventEmitter, Input, Output } from '@angular/core';
import { EventEmitter, Input, Output, Directive } from '@angular/core';
/**
* Abstract class that represents value input components
*/
@Directive()
export abstract class ValueInputComponent<T> {
@Input() index: number;
/**

View File

@@ -26,7 +26,7 @@ export class ProfilePageComponent implements OnInit {
/**
* A reference to the metadata form component
*/
@ViewChild(ProfilePageMetadataFormComponent, {static: false}) metadataForm: ProfilePageMetadataFormComponent;
@ViewChild(ProfilePageMetadataFormComponent) metadataForm: ProfilePageMetadataFormComponent;
/**
* The authenticated user as observable

View File

@@ -22,7 +22,7 @@ export class SearchNavbarComponent {
isExpanded = 'collapsed';
// Search input field
@ViewChild('searchInput', {static: false}) searchField: ElementRef;
@ViewChild('searchInput') searchField: ElementRef;
constructor(private formBuilder: FormBuilder, private router: Router, private searchService: SearchService) {
this.searchForm = this.formBuilder.group(({

View File

@@ -40,7 +40,7 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
/**
* The logo uploader component
*/
@ViewChild(UploaderComponent, {static: false}) uploaderComponent: UploaderComponent;
@ViewChild(UploaderComponent) uploaderComponent: UploaderComponent;
/**
* DSpaceObject that the form represents

View File

@@ -1,4 +1,4 @@
import { Injectable, Input, OnInit } from '@angular/core';
import { Injectable, Input, OnInit, Directive } from '@angular/core';
import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import { RemoteData } from '../../../core/data/remote-data';
@@ -16,6 +16,7 @@ export enum SelectorActionType {
* Abstract base class that represents a wrapper for modal content used to select a DSpace Object
*/
@Directive()
@Injectable()
export abstract class DSOSelectorModalWrapperComponent implements OnInit {
/**

View File

@@ -24,7 +24,7 @@ export class DsDatePickerInlineComponent extends DynamicFormControlComponent {
@Output() change: EventEmitter<any> = new EventEmitter();
@Output() focus: EventEmitter<any> = new EventEmitter();
@ViewChild(NgbDatepicker, {static: false}) ngbDatePicker: NgbDatepicker;
@ViewChild(NgbDatepicker) ngbDatePicker: NgbDatepicker;
constructor(protected layoutService: DynamicFormLayoutService,
protected validationService: DynamicFormValidationService,

View File

@@ -1,4 +1,4 @@
import { EventEmitter, Input, Output } from '@angular/core';
import { EventEmitter, Input, Output, Directive } from '@angular/core';
import { FormGroup } from '@angular/forms';
import {
@@ -19,6 +19,7 @@ import { PageInfo } from '../../../../../core/shared/page-info.model';
/**
* An abstract class to be extended by form components that handle vocabulary
*/
@Directive()
export abstract class DsDynamicVocabularyComponent extends DynamicFormControlComponent {
@Input() abstract bindId = true;

View File

@@ -48,7 +48,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
@Output() change: EventEmitter<any> = new EventEmitter<any>();
@Output() focus: EventEmitter<any> = new EventEmitter<any>();
@ViewChild('instance', { static: false }) instance: NgbTypeahead;
@ViewChild('instance') instance: NgbTypeahead;
pageInfo: PageInfo = new PageInfo();
searching = false;

View File

@@ -57,7 +57,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
private selectedChipItem: ChipsItem;
private subs: Subscription[] = [];
@ViewChild('formRef', { static: false }) private formRef: FormComponent;
@ViewChild('formRef') private formRef: FormComponent;
constructor(private vocabularyService: VocabularyService,
private formBuilderService: FormBuilderService,

View File

@@ -36,7 +36,7 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
@Output() change: EventEmitter<any> = new EventEmitter<any>();
@Output() focus: EventEmitter<any> = new EventEmitter<any>();
@ViewChild('instance', { static: false }) instance: NgbTypeahead;
@ViewChild('instance') instance: NgbTypeahead;
chips: Chips;
hasAuthority: boolean;

View File

@@ -2,7 +2,6 @@ import {
Component,
ElementRef,
EventEmitter,
forwardRef,
Input,
OnChanges,
Output,
@@ -13,7 +12,7 @@ import {
} from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { hasValue, isNotEmpty } from '../empty.util';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { ControlValueAccessor } from '@angular/forms';
@Component({
selector: 'ds-input-suggestions',
@@ -92,7 +91,7 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
/**
* Reference to the input field component
*/
@ViewChild('inputField', {static: false}) queryInput: ElementRef;
@ViewChild('inputField') queryInput: ElementRef;
/**
* Reference to the suggestion components
*/

View File

@@ -1,4 +1,6 @@
import { Injectable } from "@angular/core";
/* tslint:disable:no-empty */
@Injectable()
export class AngularticsMock {
public eventTrack(action, properties) { }
public startTracking(): void {}

View File

@@ -1,4 +1,4 @@
import { EventEmitter, Input, Output } from '@angular/core';
import { EventEmitter, Input, Output, Directive } from '@angular/core';
import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
@@ -11,6 +11,7 @@ import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-
* - Add a @rendersWorkflowTaskOption annotation to your component providing the same enum value
* - Optionally overwrite createBody if the request body requires more than just the option
*/
@Directive()
export abstract class ClaimedTaskActionsAbstractComponent {
/**
* The workflow task option the child component represents

View File

@@ -1,5 +1,5 @@
import { Router } from '@angular/router';
import { Injector, Input } from '@angular/core';
import { Injector, Input, Directive } from '@angular/core';
import { find, take, tap } from 'rxjs/operators';
@@ -18,6 +18,7 @@ import { SearchService } from '../../core/shared/search/search.service';
/**
* Abstract class for all different representations of mydspace actions
*/
@Directive()
export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService extends DataService<T>> {
/**

View File

@@ -1,11 +1,13 @@
import { RouterStateSerializer } from '@ngrx/router-store';
import { Params, RouterStateSnapshot } from '@angular/router';
import { Injectable } from "@angular/core";
export interface RouterStateUrl {
url: string;
queryParams: Params;
}
@Injectable()
export class DSpaceRouterStateSerializer implements RouterStateSerializer<RouterStateUrl> {
serialize(routerState: RouterStateSnapshot): RouterStateUrl {
const { url } = routerState;

View File

@@ -1,4 +1,4 @@
import { EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
import { EventEmitter, Input, OnDestroy, OnInit, Output, Directive } from '@angular/core';
import { take } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { RemoteData } from '../../../core/data/remote-data';
@@ -10,6 +10,7 @@ import { SortOptions } from '../../../core/cache/models/sort-options.model';
/**
* An abstract component used to select DSpaceObjects from a specific list and returning the UUIDs of the selected DSpaceObjects
*/
@Directive()
export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestroy {
/**

View File

@@ -1,7 +1,7 @@
import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
import { ElementRef } from '@angular/core';
import { ElementRef, Directive } from '@angular/core';
import { Observable } from 'rxjs/internal/Observable';
import { PaginatedList } from '../../core/data/paginated-list';
import { RemoteData } from '../../core/data/remote-data';
@@ -14,6 +14,7 @@ import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
import { createPaginatedList } from '../testing/utils.test';
import { ObjectValuesPipe } from '../utils/object-values-pipe';
@Directive()
class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
constructor(protected objectUpdatesService: ObjectUpdatesService,

View File

@@ -6,11 +6,11 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
import { hasValue, isNotEmpty } from '../empty.util';
import { hasValue } from '../empty.util';
import { paginatedListToArray } from '../../core/shared/operators';
import { DSpaceObject } from '../../core/shared/dspace-object.model';
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
import { ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
import { Directive, ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
import { PaginationComponent } from '../pagination/pagination.component';
import { ObjectValuesPipe } from '../utils/object-values-pipe';
import { compareArraysUsing } from '../../+item-page/simple/item-types/shared/item-relationships-utils';
@@ -38,11 +38,12 @@ export const compareArraysUsingFieldUuids = () =>
*
* An example component extending from this abstract component: PaginatedDragAndDropBitstreamListComponent
*/
@Directive()
export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
/**
* A view on the child pagination component
*/
@ViewChild(PaginationComponent, {static: false}) paginationComponent: PaginationComponent;
@ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
/**
* Send an event when the user drops an object on the pagination

View File

@@ -1,5 +1,7 @@
import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap';
import { Injectable } from "@angular/core";
@Injectable()
export class PaginationComponentOptions extends NgbPaginationConfig {
/**
* ID for the pagination instance. Only useful if you wish to

View File

@@ -1,4 +1,4 @@
import { Inject, OnDestroy, OnInit } from '@angular/core';
import { Inject, OnDestroy, OnInit, Directive } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs/internal/Subscription';
import { FormControl, FormGroup } from '@angular/forms';
@@ -7,6 +7,7 @@ import { hasValue } from '../empty.util';
/**
* An abstract component to render StartsWith options
*/
@Directive()
export class StartsWithAbstractComponent implements OnInit, OnDestroy {
/**
* The currently selected startsWith in string format

View File

@@ -25,7 +25,7 @@ import { StatisticsService } from './statistics.service';
* This module handles the statistics
*/
export class StatisticsModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<StatisticsModule> {
return {
ngModule: StatisticsModule,
providers: [

View File

@@ -95,7 +95,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
/**
* The html child that contains the collections list
*/
@ViewChild(CollectionDropdownComponent, {static: false}) collectionDropdown: CollectionDropdownComponent;
@ViewChild(CollectionDropdownComponent) collectionDropdown: CollectionDropdownComponent;
/**
* A boolean representing if the collection section is available
@@ -107,11 +107,11 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
* Initialize instance variables
*
* @param {ChangeDetectorRef} cdr
* @param {CommunityDataService} communityDataService
* @param {CollectionDataService} collectionDataService
* @param {JsonPatchOperationsBuilder} operationsBuilder
* @param {SubmissionJsonPatchOperationsService} operationsService
* @param {SubmissionService} submissionService
* @param {SectionsService} sectionsService
*/
constructor(protected cdr: ChangeDetectorRef,
private collectionDataService: CollectionDataService,

View File

@@ -48,7 +48,7 @@ export class SubmissionSectionContainerComponent implements OnInit {
/**
* The SectionsDirective reference
*/
@ViewChild('sectionRef', {static: false}) sectionRef: SectionsDirective;
@ViewChild('sectionRef') sectionRef: SectionsDirective;
/**
* Initialize instance variables

View File

@@ -110,7 +110,7 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
/**
* The FormComponent reference
*/
@ViewChild('formRef', {static: false}) private formRef: FormComponent;
@ViewChild('formRef') private formRef: FormComponent;
/**
* Initialize instance variables

View File

@@ -86,7 +86,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
/**
* The FormComponent reference
*/
@ViewChild('formRef', {static: false}) private formRef: FormComponent;
@ViewChild('formRef') private formRef: FormComponent;
/**
* Initialize instance variables

View File

@@ -127,7 +127,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnChanges {
/**
* The FormComponent reference
*/
@ViewChild('formRef', {static: false}) public formRef: FormComponent;
@ViewChild('formRef') public formRef: FormComponent;
/**
* Initialize instance variables

View File

@@ -141,7 +141,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
* The [[SubmissionSectionUploadFileEditComponent]] reference
* @type {SubmissionSectionUploadFileEditComponent}
*/
@ViewChild(SubmissionSectionUploadFileEditComponent, {static: false}) fileEditComp: SubmissionSectionUploadFileEditComponent;
@ViewChild(SubmissionSectionUploadFileEditComponent) fileEditComp: SubmissionSectionUploadFileEditComponent;
/**
* Initialize instance variables

View File

@@ -12,7 +12,7 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"sourceMap": true,
"module": "es2015",
"module": "esnext",
"moduleResolution": "node",
"noEmitHelpers": true,
"importHelpers": true,

1641
yarn.lock

File diff suppressed because it is too large Load Diff