Skip to content

Commit 198fd99

Browse files
Merge branch 'main' into DURACOM-383-BatchDeletingOfDSpaceObjects
2 parents ff2a35d + e308867 commit 198fd99

File tree

2,315 files changed

+33039
-20144
lines changed

Some content is hidden

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

2,315 files changed

+33039
-20144
lines changed

.eslintrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@
253253
"forceSingleLine": true
254254
}
255255
],
256+
"import/enforce-node-protocol-usage": [
257+
"error",
258+
"always"
259+
],
256260

257261
"unused-imports/no-unused-imports": "error",
258262
"lodash/import-scope": [

.github/dependabot.yml

Lines changed: 34 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ updates:
1111
# So, only this first section can include "applies-to: security-updates"
1212
- package-ecosystem: "npm"
1313
directory: "/"
14+
# Monthly dependency updates (NOTE: "schedule" doesn't apply to security updates)
1415
schedule:
15-
interval: "weekly"
16+
interval: "monthly"
1617
time: "05:00"
1718
# Allow up to 10 open PRs for dependencies
1819
open-pull-requests-limit: 10
@@ -23,14 +24,7 @@ updates:
2324
applies-to: version-updates
2425
patterns:
2526
- "@angular*"
26-
update-types:
27-
- "minor"
28-
- "patch"
29-
# Group together all security updates for Angular. Only accept minor/patch types.
30-
angular-security:
31-
applies-to: security-updates
32-
patterns:
33-
- "@angular*"
27+
- "@ngtools/webpack"
3428
update-types:
3529
- "minor"
3630
- "patch"
@@ -42,14 +36,6 @@ updates:
4236
update-types:
4337
- "minor"
4438
- "patch"
45-
# Group together all security updates for NgRx. Only accept minor/patch types.
46-
ngrx-security:
47-
applies-to: security-updates
48-
patterns:
49-
- "@ngrx*"
50-
update-types:
51-
- "minor"
52-
- "patch"
5339
# Group together all patch version updates for eslint in a single PR
5440
eslint:
5541
applies-to: version-updates
@@ -59,15 +45,6 @@ updates:
5945
update-types:
6046
- "minor"
6147
- "patch"
62-
# Group together all security updates for eslint.
63-
eslint-security:
64-
applies-to: security-updates
65-
patterns:
66-
- "@typescript-eslint*"
67-
- "eslint*"
68-
update-types:
69-
- "minor"
70-
- "patch"
7148
# Group together any testing related version updates
7249
testing:
7350
applies-to: version-updates
@@ -81,19 +58,6 @@ updates:
8158
update-types:
8259
- "minor"
8360
- "patch"
84-
# Group together any testing related security updates
85-
testing-security:
86-
applies-to: security-updates
87-
patterns:
88-
- "@cypress*"
89-
- "axe-*"
90-
- "cypress*"
91-
- "jasmine*"
92-
- "karma*"
93-
- "ng-mocks"
94-
update-types:
95-
- "minor"
96-
- "patch"
9761
# Group together any postcss related version updates
9862
postcss:
9963
applies-to: version-updates
@@ -102,14 +66,6 @@ updates:
10266
update-types:
10367
- "minor"
10468
- "patch"
105-
# Group together any postcss related security updates
106-
postcss-security:
107-
applies-to: security-updates
108-
patterns:
109-
- "postcss*"
110-
update-types:
111-
- "minor"
112-
- "patch"
11369
# Group together any sass related version updates
11470
sass:
11571
applies-to: version-updates
@@ -118,14 +74,6 @@ updates:
11874
update-types:
11975
- "minor"
12076
- "patch"
121-
# Group together any sass related security updates
122-
sass-security:
123-
applies-to: security-updates
124-
patterns:
125-
- "sass*"
126-
update-types:
127-
- "minor"
128-
- "patch"
12977
# Group together any webpack related version updates
13078
webpack:
13179
applies-to: version-updates
@@ -134,22 +82,13 @@ updates:
13482
update-types:
13583
- "minor"
13684
- "patch"
137-
# Group together any webpack related seurity updates
138-
webpack-security:
139-
applies-to: security-updates
140-
patterns:
141-
- "webpack*"
142-
update-types:
143-
- "minor"
144-
- "patch"
145-
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
146-
zonejs:
147-
applies-to: version-updates
148-
patterns:
149-
- "zone.js"
150-
update-types:
151-
- "patch"
15285
ignore:
86+
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
87+
- dependency-name: "zone.js"
88+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
89+
# Restrict typescript updates to patch level because that's what our package.json says
90+
- dependency-name: "typescript"
91+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
15392
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
15493
- dependency-name: "*"
15594
update-types: ["version-update:semver-major"]
@@ -160,7 +99,7 @@ updates:
16099
directory: "/"
161100
target-branch: dspace-9_x
162101
schedule:
163-
interval: "weekly"
102+
interval: "monthly"
164103
time: "05:00"
165104
# Allow up to 10 open PRs for dependencies
166105
open-pull-requests-limit: 10
@@ -171,6 +110,7 @@ updates:
171110
applies-to: version-updates
172111
patterns:
173112
- "@angular*"
113+
- "@ngtools/webpack"
174114
update-types:
175115
- "minor"
176116
- "patch"
@@ -179,6 +119,7 @@ updates:
179119
applies-to: version-updates
180120
patterns:
181121
- "@ngrx*"
122+
- "@ngtools/webpack"
182123
update-types:
183124
- "minor"
184125
- "patch"
@@ -228,14 +169,13 @@ updates:
228169
update-types:
229170
- "minor"
230171
- "patch"
231-
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
232-
zonejs:
233-
applies-to: version-updates
234-
patterns:
235-
- "zone.js"
236-
update-types:
237-
- "patch"
238172
ignore:
173+
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
174+
- dependency-name: "zone.js"
175+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
176+
# Restrict typescript updates to patch level because that's what our package.json says
177+
- dependency-name: "typescript"
178+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
239179
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
240180
- dependency-name: "*"
241181
update-types: ["version-update:semver-major"]
@@ -246,7 +186,7 @@ updates:
246186
directory: "/"
247187
target-branch: dspace-8_x
248188
schedule:
249-
interval: "weekly"
189+
interval: "monthly"
250190
time: "05:00"
251191
# Allow up to 10 open PRs for dependencies
252192
open-pull-requests-limit: 10
@@ -257,6 +197,7 @@ updates:
257197
applies-to: version-updates
258198
patterns:
259199
- "@angular*"
200+
- "@ngtools/webpack"
260201
update-types:
261202
- "minor"
262203
- "patch"
@@ -314,14 +255,13 @@ updates:
314255
update-types:
315256
- "minor"
316257
- "patch"
317-
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
318-
zonejs:
319-
applies-to: version-updates
320-
patterns:
321-
- "zone.js"
322-
update-types:
323-
- "patch"
324258
ignore:
259+
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
260+
- dependency-name: "zone.js"
261+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
262+
# Restrict typescript updates to patch level because that's what our package.json says
263+
- dependency-name: "typescript"
264+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
325265
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
326266
- dependency-name: "*"
327267
update-types: ["version-update:semver-major"]
@@ -332,7 +272,7 @@ updates:
332272
directory: "/"
333273
target-branch: dspace-7_x
334274
schedule:
335-
interval: "weekly"
275+
interval: "monthly"
336276
time: "05:00"
337277
# Allow up to 10 open PRs for dependencies
338278
open-pull-requests-limit: 10
@@ -343,6 +283,7 @@ updates:
343283
applies-to: version-updates
344284
patterns:
345285
- "@angular*"
286+
- "@ngtools/webpack"
346287
update-types:
347288
- "minor"
348289
- "patch"
@@ -392,17 +333,16 @@ updates:
392333
update-types:
393334
- "minor"
394335
- "patch"
395-
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
396-
zonejs:
397-
applies-to: version-updates
398-
patterns:
399-
- "zone.js"
400-
update-types:
401-
- "patch"
402336
ignore:
403337
# 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
404338
# See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489
405339
- dependency-name: "webpack"
340+
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
341+
- dependency-name: "zone.js"
342+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
343+
# Restrict typescript updates to patch level because that's what our package.json says
344+
- dependency-name: "typescript"
345+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
406346
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
407347
- dependency-name: "*"
408348
update-types: ["version-update:semver-major"]

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ However, reviewers may request that you complete any actions in this list if you
2525
- [ ] My PR **doesn't introduce circular dependencies** (verified via `npm run check-circ-deps`)
2626
- [ ] My PR **includes [TypeDoc](https://typedoc.org/) comments** for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
2727
- [ ] My PR **passes all specs/tests and includes new/updated specs or tests** based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
28-
- [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)** if it makes changes to the user interface.
28+
- [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC9x/Accessibility)** if it makes changes to the user interface.
2929
- [ ] My PR **uses i18n (internationalization) keys** instead of hardcoded English text, to allow for translations.
3030
- [ ] My PR **includes details on how to test it**. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
3131
- [ ] If my PR includes new libraries/dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.

.github/workflows/codescan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
# Initializes the CodeQL tools for scanning.
4141
# https://github.com/github/codeql-action
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@v2
43+
uses: github/codeql-action/init@v3
4444
with:
4545
languages: javascript
4646

4747
# Autobuild attempts to build any compiled languages
4848
- name: Autobuild
49-
uses: github/codeql-action/autobuild@v2
49+
uses: github/codeql-action/autobuild@v3
5050

5151
# Perform GitHub Code Scanning.
5252
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@v2
53+
uses: github/codeql-action/analyze@v3

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ DSpace is a community built and supported project. We do not have a centralized
1010
## Contribute new code via a Pull Request
1111

1212
We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
13-
Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC8x/Release+Notes).
13+
Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC9x/Release+Notes).
1414

1515
Code Contribution Checklist
1616
- [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
1717
- [ ] PRs **must** pass [ESLint](https://eslint.org/) validation using `yarn lint`
1818
- [ ] PRs **must** not introduce circular dependencies (verified via `yarn check-circ-deps`)
1919
- [ ] PRs **must** include [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. Large or complex private methods should also have TypeDoc.
2020
- [ ] PRs **must** pass all automated pecs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
21-
- [ ] User interface changes **must** align with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)
21+
- [ ] User interface changes **must** align with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC9x/Accessibility)
2222
- [ ] PRs **must** use i18n (internationalization) keys instead of hardcoded English text, to allow for translations.
2323
- [ ] Details on how to test the PR **must** be provided. Reviewers must be aware of any steps they need to take to successfully test your fix or feature.
2424
- [ ] If a PR includes new libraries/dependencies (in `package.json`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/dspace-angular/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Overview
1010

1111
DSpace open source software is a turnkey repository application used by more than
1212
2,000 organizations and institutions worldwide to provide durable access to digital resources.
13-
For more information, visit http://www.dspace.org/
13+
For more information, visit https://www.dspace.org/
1414

1515
DSpace consists of both a Java-based backend and an Angular-based frontend.
1616

@@ -30,7 +30,7 @@ Downloads
3030
Documentation for each release may be viewed online or downloaded via our [Documentation Wiki](https://wiki.lyrasis.org/display/DSDOC/).
3131

3232
The latest DSpace Installation instructions are available at:
33-
https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
33+
https://wiki.lyrasis.org/display/DSDOC9x/Installing+DSpace
3434

3535
Quick start
3636
-----------
@@ -349,7 +349,7 @@ See our [DSpace Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code
349349
Documentation
350350
--------------
351351
352-
Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC7x/
352+
Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC9x/
353353
354354
Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of this codebase.
355355
@@ -552,7 +552,7 @@ Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Suppor
552552

553553
DSpace also has an active service provider network. If you'd rather hire a service provider to
554554
install, upgrade, customize or host DSpace, then we recommend getting in touch with one of our
555-
[Registered Service Providers](http://www.dspace.org/service-providers).
555+
[Registered Service Providers](https://dspace.org/registered-service-providers/).
556556

557557

558558
Issue Tracker
@@ -565,7 +565,7 @@ DSpace uses GitHub to track issues:
565565
License
566566
-------
567567
DSpace source code is freely available under a standard [BSD 3-Clause license](https://opensource.org/licenses/BSD-3-Clause).
568-
The full license is available in the [LICENSE](LICENSE) file or online at http://www.dspace.org/license/
568+
The full license is available in the [LICENSE](LICENSE) file or online at https://www.dspace.org/license/
569569

570570
DSpace uses third-party libraries which may be distributed under different licenses. Those licenses are listed
571571
in the [LICENSES_THIRD_PARTY](LICENSES_THIRD_PARTY) file.

config/config.example.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,9 @@ languages:
265265
- code: es
266266
label: Español
267267
active: true
268+
- code: fa
269+
label: فارسی
270+
active: true
268271
- code: fi
269272
label: Suomi
270273
active: true

cypress/plugins/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const fs = require('fs');
1+
const fs = require('node:fs');
22

33
// These two global variables are used to store information about the REST API used
44
// by these e2e tests. They are filled out prior to running any tests in the before()

cypress/support/commands.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import {
77
AuthTokenInfo,
88
TOKENITEM,
9-
} from 'src/app/core/auth/models/auth-token-info.model';
9+
} from '@dspace/core/auth/models/auth-token-info.model';
1010
import {
1111
DSPACE_XSRF_COOKIE,
1212
XSRF_REQUEST_HEADER,
13-
} from 'src/app/core/xsrf/xsrf.constants';
13+
} from '@dspace/core/xsrf/xsrf.constants';
1414
import { v4 as uuidv4 } from 'uuid';
1515

1616
// Declare Cypress namespace to help with Intellisense & code completion in IDEs

0 commit comments

Comments
 (0)