Skip to content

Commit 863f8fa

Browse files
committed
Merge remote-tracking branch 'github4science/main' into task/main/DURACOM-327
# Conflicts: # src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts # src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts # src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts # src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts # src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts # src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts # src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts # src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
2 parents 158249c + 80865ef commit 863f8fa

79 files changed

Lines changed: 1034 additions & 1505 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.

.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: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ updates:
2828
update-types:
2929
- "minor"
3030
- "patch"
31-
# Group together all security updates for Angular. Only accept minor/patch types.
32-
angular-security:
33-
applies-to: security-updates
34-
patterns:
35-
- "@angular*"
36-
- "@ngtools/webpack"
37-
update-types:
38-
- "minor"
39-
- "patch"
4031
# Group together all minor/patch version updates for NgRx in a single PR
4132
ngrx:
4233
applies-to: version-updates
@@ -45,14 +36,6 @@ updates:
4536
update-types:
4637
- "minor"
4738
- "patch"
48-
# Group together all security updates for NgRx. Only accept minor/patch types.
49-
ngrx-security:
50-
applies-to: security-updates
51-
patterns:
52-
- "@ngrx*"
53-
update-types:
54-
- "minor"
55-
- "patch"
5639
# Group together all patch version updates for eslint in a single PR
5740
eslint:
5841
applies-to: version-updates
@@ -62,15 +45,6 @@ updates:
6245
update-types:
6346
- "minor"
6447
- "patch"
65-
# Group together all security updates for eslint.
66-
eslint-security:
67-
applies-to: security-updates
68-
patterns:
69-
- "@typescript-eslint*"
70-
- "eslint*"
71-
update-types:
72-
- "minor"
73-
- "patch"
7448
# Group together any testing related version updates
7549
testing:
7650
applies-to: version-updates
@@ -84,19 +58,6 @@ updates:
8458
update-types:
8559
- "minor"
8660
- "patch"
87-
# Group together any testing related security updates
88-
testing-security:
89-
applies-to: security-updates
90-
patterns:
91-
- "@cypress*"
92-
- "axe-*"
93-
- "cypress*"
94-
- "jasmine*"
95-
- "karma*"
96-
- "ng-mocks"
97-
update-types:
98-
- "minor"
99-
- "patch"
10061
# Group together any postcss related version updates
10162
postcss:
10263
applies-to: version-updates
@@ -105,14 +66,6 @@ updates:
10566
update-types:
10667
- "minor"
10768
- "patch"
108-
# Group together any postcss related security updates
109-
postcss-security:
110-
applies-to: security-updates
111-
patterns:
112-
- "postcss*"
113-
update-types:
114-
- "minor"
115-
- "patch"
11669
# Group together any sass related version updates
11770
sass:
11871
applies-to: version-updates
@@ -121,14 +74,6 @@ updates:
12174
update-types:
12275
- "minor"
12376
- "patch"
124-
# Group together any sass related security updates
125-
sass-security:
126-
applies-to: security-updates
127-
patterns:
128-
- "sass*"
129-
update-types:
130-
- "minor"
131-
- "patch"
13277
# Group together any webpack related version updates
13378
webpack:
13479
applies-to: version-updates
@@ -137,14 +82,6 @@ updates:
13782
update-types:
13883
- "minor"
13984
- "patch"
140-
# Group together any webpack related seurity updates
141-
webpack-security:
142-
applies-to: security-updates
143-
patterns:
144-
- "webpack*"
145-
update-types:
146-
- "minor"
147-
- "patch"
14885
ignore:
14986
# Restrict zone.js updates to patch level to avoid dependency conflicts with @angular/core
15087
- dependency-name: "zone.js"

.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.

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()

lint/generate-docs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
readFileSync,
1313
rmSync,
1414
writeFileSync,
15-
} from 'fs';
16-
import { join } from 'path';
15+
} from 'node:fs';
16+
import { join } from 'node:path';
1717

1818
import { default as htmlPlugin } from './src/rules/html';
1919
import { default as tsPlugin } from './src/rules/ts';

lint/src/util/theme-support.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
* http://www.dspace.org/license/
77
*/
88

9+
import { readFileSync } from 'node:fs';
10+
import { basename } from 'node:path';
11+
912
import { TSESTree } from '@typescript-eslint/utils';
1013
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
11-
import { readFileSync } from 'fs';
12-
import { basename } from 'path';
1314
import ts, { Identifier } from 'typescript';
1415

1516
import {

0 commit comments

Comments
 (0)