Skip to content

Commit b878f28

Browse files
alexandrevryghemalexandrevryghem
committed
Merge remote-tracking branch 'upstream/main' into retrieve-name-with-dsonameservice-main
# Conflicts: # src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
2 parents af7d99a + 8218ed5 commit b878f28

127 files changed

Lines changed: 4721 additions & 4352 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.browserslistrc‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
# When Chrome version is specified, we pin to a specific version of Chrome
3232
# Comment this out to use the latest release
3333
#CHROME_VERSION: "90.0.4430.212-1"
34+
# Bump Node heap size (OOM in CI after upgrading to Angular 15)
35+
NODE_OPTIONS: '--max-old-space-size=4096'
3436
strategy:
3537
# Create a matrix of Node versions to test against (in parallel)
3638
matrix:

‎angular.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,18 @@
274274
}
275275
}
276276
},
277-
"defaultProject": "dspace-angular",
278277
"cli": {
279278
"analytics": false,
280-
"defaultCollection": "@angular-eslint/schematics"
279+
"schematicCollections": [
280+
"@angular-eslint/schematics"
281+
]
282+
},
283+
"schematics": {
284+
"@angular-eslint/schematics:application": {
285+
"setParserOptionsProject": true
286+
},
287+
"@angular-eslint/schematics:library": {
288+
"setParserOptionsProject": true
289+
}
281290
}
282291
}

‎package.json‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"build:stats": "ng build --stats-json",
1818
"build:prod": "yarn run build:ssr",
1919
"build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
20-
"test": "ng test --sourceMap=true --watch=false --configuration test",
21-
"test:watch": "nodemon --exec \"ng test --sourceMap=true --watch=true --configuration test\"",
22-
"test:headless": "ng test --sourceMap=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
20+
"test": "ng test --source-map=true --watch=false --configuration test",
21+
"test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
22+
"test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
2323
"lint": "ng lint",
2424
"lint-fix": "ng lint --fix=true",
2525
"e2e": "ng e2e",
@@ -55,136 +55,136 @@
5555
"ts-node": "10.2.1"
5656
},
5757
"dependencies": {
58-
"@angular/animations": "~13.3.12",
59-
"@angular/cdk": "^13.2.6",
60-
"@angular/common": "~13.3.12",
61-
"@angular/compiler": "~13.3.12",
62-
"@angular/core": "~13.3.12",
63-
"@angular/forms": "~13.3.12",
64-
"@angular/localize": "13.3.12",
65-
"@angular/platform-browser": "~13.3.12",
66-
"@angular/platform-browser-dynamic": "~13.3.12",
67-
"@angular/platform-server": "~13.3.12",
68-
"@angular/router": "~13.3.12",
69-
"@babel/runtime": "7.17.2",
58+
"@angular/animations": "^15.2.8",
59+
"@angular/cdk": "^15.2.8",
60+
"@angular/common": "^15.2.8",
61+
"@angular/compiler": "^15.2.8",
62+
"@angular/core": "^15.2.8",
63+
"@angular/forms": "^15.2.8",
64+
"@angular/localize": "15.2.8",
65+
"@angular/platform-browser": "^15.2.8",
66+
"@angular/platform-browser-dynamic": "^15.2.8",
67+
"@angular/platform-server": "^15.2.8",
68+
"@angular/router": "^15.2.8",
69+
"@babel/runtime": "7.21.0",
7070
"@kolkov/ngx-gallery": "^2.0.1",
7171
"@material-ui/core": "^4.11.0",
72-
"@material-ui/icons": "^4.9.1",
72+
"@material-ui/icons": "^4.11.3",
7373
"@ng-bootstrap/ng-bootstrap": "^11.0.0",
7474
"@ng-dynamic-forms/core": "^15.0.0",
7575
"@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0",
76-
"@ngrx/effects": "^13.0.2",
77-
"@ngrx/router-store": "^13.0.2",
78-
"@ngrx/store": "^13.0.2",
79-
"@nguniversal/express-engine": "^13.0.2",
80-
"@ngx-translate/core": "^13.0.0",
81-
"@nicky-lenaers/ngx-scroll-to": "^13.0.0",
76+
"@ngrx/effects": "^15.4.0",
77+
"@ngrx/router-store": "^15.4.0",
78+
"@ngrx/store": "^15.4.0",
79+
"@nguniversal/express-engine": "^15.2.1",
80+
"@ngx-translate/core": "^14.0.0",
81+
"@nicky-lenaers/ngx-scroll-to": "^14.0.0",
8282
"@types/grecaptcha": "^3.0.4",
8383
"angular-idle-preload": "3.0.0",
84-
"angulartics2": "^12.0.0",
84+
"angulartics2": "^12.2.0",
8585
"axios": "^0.27.2",
8686
"bootstrap": "^4.6.1",
8787
"cerialize": "0.1.18",
88-
"cli-progress": "^3.8.0",
88+
"cli-progress": "^3.12.0",
8989
"colors": "^1.4.0",
9090
"compression": "^1.7.4",
91-
"cookie-parser": "1.4.5",
92-
"core-js": "^3.7.0",
91+
"cookie-parser": "1.4.6",
92+
"core-js": "^3.30.1",
9393
"date-fns": "^2.29.3",
9494
"date-fns-tz": "^1.3.7",
95-
"deepmerge": "^4.2.2",
96-
"ejs": "^3.1.8",
97-
"express": "^4.17.1",
95+
"deepmerge": "^4.3.1",
96+
"ejs": "^3.1.9",
97+
"express": "^4.18.2",
9898
"express-rate-limit": "^5.1.3",
99-
"fast-json-patch": "^3.0.0-1",
99+
"fast-json-patch": "^3.1.1",
100100
"filesize": "^6.1.0",
101101
"http-proxy-middleware": "^1.0.5",
102-
"isbot": "^3.6.5",
102+
"isbot": "^3.6.10",
103103
"js-cookie": "2.2.1",
104104
"js-yaml": "^4.1.0",
105-
"json5": "^2.2.2",
106-
"jsonschema": "1.4.0",
105+
"json5": "^2.2.3",
106+
"jsonschema": "1.4.1",
107107
"jwt-decode": "^3.1.2",
108108
"klaro": "^0.7.18",
109109
"lodash": "^4.17.21",
110110
"lru-cache": "^7.14.1",
111111
"markdown-it": "^13.0.1",
112-
"markdown-it-mathjax3": "^4.3.1",
112+
"markdown-it-mathjax3": "^4.3.2",
113113
"mirador": "^3.3.0",
114114
"mirador-dl-plugin": "^0.13.0",
115115
"mirador-share-plugin": "^0.11.0",
116116
"morgan": "^1.10.0",
117-
"ng-mocks": "^13.1.1",
117+
"ng-mocks": "^14.10.0",
118118
"ng2-file-upload": "1.4.0",
119119
"ng2-nouislider": "^1.8.3",
120-
"ngx-infinite-scroll": "^10.0.1",
121-
"ngx-pagination": "5.0.0",
120+
"ngx-infinite-scroll": "^15.0.0",
121+
"ngx-pagination": "6.0.3",
122122
"ngx-sortablejs": "^11.1.0",
123-
"ngx-ui-switch": "^13.0.2",
123+
"ngx-ui-switch": "^14.0.3",
124124
"nouislider": "^14.6.3",
125-
"pem": "1.14.4",
126-
"prop-types": "^15.7.2",
127-
"react-copy-to-clipboard": "^5.0.1",
125+
"pem": "1.14.7",
126+
"prop-types": "^15.8.1",
127+
"react-copy-to-clipboard": "^5.1.0",
128128
"reflect-metadata": "^0.1.13",
129-
"rxjs": "^7.5.5",
130-
"sanitize-html": "^2.7.2",
131-
"sortablejs": "1.13.0",
129+
"rxjs": "^7.8.0",
130+
"sanitize-html": "^2.10.0",
131+
"sortablejs": "1.15.0",
132132
"uuid": "^8.3.2",
133133
"webfontloader": "1.6.28",
134134
"zone.js": "~0.11.5"
135135
},
136136
"devDependencies": {
137-
"@angular-builders/custom-webpack": "~13.1.0",
138-
"@angular-devkit/build-angular": "~13.3.10",
139-
"@angular-eslint/builder": "13.1.0",
140-
"@angular-eslint/eslint-plugin": "13.1.0",
141-
"@angular-eslint/eslint-plugin-template": "13.1.0",
142-
"@angular-eslint/schematics": "13.1.0",
143-
"@angular-eslint/template-parser": "13.1.0",
144-
"@angular/cli": "~13.3.10",
145-
"@angular/compiler-cli": "~13.3.12",
146-
"@angular/language-service": "~13.3.12",
137+
"@angular-builders/custom-webpack": "~15.0.0",
138+
"@angular-devkit/build-angular": "^15.2.6",
139+
"@angular-eslint/builder": "15.2.1",
140+
"@angular-eslint/eslint-plugin": "15.2.1",
141+
"@angular-eslint/eslint-plugin-template": "15.2.1",
142+
"@angular-eslint/schematics": "15.2.1",
143+
"@angular-eslint/template-parser": "15.2.1",
144+
"@angular/cli": "^15.2.6",
145+
"@angular/compiler-cli": "^15.2.8",
146+
"@angular/language-service": "^15.2.8",
147147
"@cypress/schematic": "^1.5.0",
148-
"@fortawesome/fontawesome-free": "^6.2.1",
149-
"@ngrx/store-devtools": "^13.0.2",
150-
"@ngtools/webpack": "^13.2.6",
151-
"@nguniversal/builders": "^13.1.1",
148+
"@fortawesome/fontawesome-free": "^6.4.0",
149+
"@ngrx/store-devtools": "^15.4.0",
150+
"@ngtools/webpack": "^15.2.6",
151+
"@nguniversal/builders": "^15.2.1",
152152
"@types/deep-freeze": "0.1.2",
153-
"@types/ejs": "^3.1.1",
154-
"@types/express": "^4.17.9",
153+
"@types/ejs": "^3.1.2",
154+
"@types/express": "^4.17.17",
155155
"@types/jasmine": "~3.6.0",
156156
"@types/js-cookie": "2.2.6",
157-
"@types/lodash": "^4.14.165",
157+
"@types/lodash": "^4.14.194",
158158
"@types/node": "^14.14.9",
159-
"@types/sanitize-html": "^2.6.2",
160-
"@typescript-eslint/eslint-plugin": "5.11.0",
161-
"@typescript-eslint/parser": "5.11.0",
162-
"axe-core": "^4.4.3",
159+
"@types/sanitize-html": "^2.9.0",
160+
"@typescript-eslint/eslint-plugin": "^5.59.1",
161+
"@typescript-eslint/parser": "^5.59.1",
162+
"axe-core": "^4.7.0",
163163
"compression-webpack-plugin": "^9.2.0",
164164
"copy-webpack-plugin": "^6.4.1",
165165
"cross-env": "^7.0.3",
166-
"cypress": "12.9.0",
167-
"cypress-axe": "^1.1.0",
166+
"cypress": "12.10.0",
167+
"cypress-axe": "^1.4.0",
168168
"deep-freeze": "0.0.1",
169-
"eslint": "^8.2.0",
170-
"eslint-plugin-deprecation": "^1.3.2",
171-
"eslint-plugin-import": "^2.25.4",
169+
"eslint": "^8.39.0",
170+
"eslint-plugin-deprecation": "^1.4.1",
171+
"eslint-plugin-import": "^2.27.5",
172172
"eslint-plugin-jsdoc": "^39.6.4",
173173
"eslint-plugin-jsonc": "^2.6.0",
174174
"eslint-plugin-lodash": "^7.4.0",
175175
"eslint-plugin-unused-imports": "^2.0.0",
176-
"express-static-gzip": "^2.1.5",
176+
"express-static-gzip": "^2.1.7",
177177
"jasmine-core": "^3.8.0",
178178
"jasmine-marbles": "0.9.2",
179-
"karma": "^6.3.14",
180-
"karma-chrome-launcher": "~3.1.0",
181-
"karma-coverage-istanbul-reporter": "~3.0.2",
179+
"karma": "^6.4.2",
180+
"karma-chrome-launcher": "~3.2.0",
181+
"karma-coverage-istanbul-reporter": "~3.0.3",
182182
"karma-jasmine": "~4.0.0",
183183
"karma-jasmine-html-reporter": "^1.5.0",
184184
"karma-mocha-reporter": "2.2.5",
185185
"ngx-mask": "^13.1.7",
186-
"nodemon": "^2.0.20",
187-
"postcss": "^8.1",
186+
"nodemon": "^2.0.22",
187+
"postcss": "^8.4",
188188
"postcss-apply": "0.12.0",
189189
"postcss-import": "^14.0.0",
190190
"postcss-loader": "^4.0.3",
@@ -194,14 +194,14 @@
194194
"react-dom": "^16.14.0",
195195
"rimraf": "^3.0.2",
196196
"rxjs-spy": "^8.0.2",
197-
"sass": "~1.33.0",
197+
"sass": "~1.62.0",
198198
"sass-loader": "^12.6.0",
199-
"sass-resources-loader": "^2.1.1",
199+
"sass-resources-loader": "^2.2.5",
200200
"ts-node": "^8.10.2",
201-
"typescript": "~4.5.5",
202-
"webpack": "^5.76.0",
203-
"webpack-bundle-analyzer": "^4.4.0",
201+
"typescript": "~4.8.4",
202+
"webpack": "5.76.1",
203+
"webpack-bundle-analyzer": "^4.8.0",
204204
"webpack-cli": "^4.2.0",
205-
"webpack-dev-server": "^4.5.0"
205+
"webpack-dev-server": "^4.13.3"
206206
}
207207
}

‎src/app/access-control/epeople-registry/epeople-registry.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnDestroy, OnInit } from '@angular/core';
2-
import { FormBuilder } from '@angular/forms';
2+
import { UntypedFormBuilder } from '@angular/forms';
33
import { Router } from '@angular/router';
44
import { TranslateService } from '@ngx-translate/core';
55
import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
@@ -90,7 +90,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
9090
private translateService: TranslateService,
9191
private notificationsService: NotificationsService,
9292
private authorizationService: AuthorizationDataService,
93-
private formBuilder: FormBuilder,
93+
private formBuilder: UntypedFormBuilder,
9494
private router: Router,
9595
private modalService: NgbModal,
9696
private paginationService: PaginationService,

‎src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Observable, of as observableOf } from 'rxjs';
22
import { CommonModule } from '@angular/common';
33
import { NO_ERRORS_SCHEMA } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
5-
import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
5+
import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
66
import { BrowserModule, By } from '@angular/platform-browser';
77
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
88
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
@@ -116,9 +116,9 @@ describe('EPersonFormComponent', () => {
116116
const controlModel = model;
117117
const controlState = { value: controlModel.value, disabled: controlModel.disabled };
118118
const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
119-
controls[model.id] = new FormControl(controlState, controlOptions);
119+
controls[model.id] = new UntypedFormControl(controlState, controlOptions);
120120
});
121-
return new FormGroup(controls, options);
121+
return new UntypedFormGroup(controls, options);
122122
},
123123
createAbstractControlOptions(validatorsConfig = null, asyncValidatorsConfig = null, updateOn = null) {
124124
return {

‎src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
2-
import { FormGroup } from '@angular/forms';
2+
import { UntypedFormGroup } from '@angular/forms';
33
import {
44
DynamicCheckboxModel,
55
DynamicFormControlModel,
@@ -109,7 +109,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
109109
/**
110110
* A FormGroup that combines all inputs
111111
*/
112-
formGroup: FormGroup;
112+
formGroup: UntypedFormGroup;
113113

114114
/**
115115
* An EventEmitter that's fired whenever the form is being submitted

‎src/app/access-control/group-registry/group-form/group-form.component.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
22
import { HttpClient } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
5-
import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
5+
import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
66
import { BrowserModule, By } from '@angular/platform-browser';
77
import { ActivatedRoute, Router } from '@angular/router';
88
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -132,9 +132,9 @@ describe('GroupFormComponent', () => {
132132
const controlModel = model;
133133
const controlState = { value: controlModel.value, disabled: controlModel.disabled };
134134
const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
135-
controls[model.id] = new FormControl(controlState, controlOptions);
135+
controls[model.id] = new UntypedFormControl(controlState, controlOptions);
136136
});
137-
return new FormGroup(controls, options);
137+
return new UntypedFormGroup(controls, options);
138138
},
139139
createAbstractControlOptions(validatorsConfig = null, asyncValidatorsConfig = null, updateOn = null) {
140140
return {

‎src/app/access-control/group-registry/group-form/group-form.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, EventEmitter, HostListener, OnDestroy, OnInit, Output, ChangeDetectorRef } from '@angular/core';
2-
import { FormGroup } from '@angular/forms';
2+
import { UntypedFormGroup } from '@angular/forms';
33
import { ActivatedRoute, Router } from '@angular/router';
44
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
55
import {
@@ -96,7 +96,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
9696
/**
9797
* A FormGroup that combines all inputs
9898
*/
99-
formGroup: FormGroup;
99+
formGroup: UntypedFormGroup;
100100

101101
/**
102102
* An EventEmitter that's fired whenever the form is being submitted

‎src/app/access-control/group-registry/group-form/members-list/members-list.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
2-
import { FormBuilder } from '@angular/forms';
2+
import { UntypedFormBuilder } from '@angular/forms';
33
import { Router } from '@angular/router';
44
import { TranslateService } from '@ngx-translate/core';
55
import {
@@ -142,7 +142,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
142142
public ePersonDataService: EPersonDataService,
143143
protected translateService: TranslateService,
144144
protected notificationsService: NotificationsService,
145-
protected formBuilder: FormBuilder,
145+
protected formBuilder: UntypedFormBuilder,
146146
protected paginationService: PaginationService,
147147
protected router: Router,
148148
public dsoNameService: DSONameService,

0 commit comments

Comments
 (0)