Skip to content

Commit 7a864f8

Browse files
author
Andrea Barbasso
committed
Merged in task/dspace-cris-2025_02_x/DSC-2256_dspace9_squashed (pull request DSpace#3995)
Task/dspace cris 2025 02 x/DSC-2256 dspace9 squashed Approved-by: Francesco Molinaro
2 parents 9202925 + d820641 commit 7a864f8

File tree

2,864 files changed

+261808
-282126
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,864 files changed

+261808
-282126
lines changed

.dockerignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ npm-debug.log.*
2525

2626
# Webpack files
2727
webpack.records.json
28-
package-lock.json
28+
29+
# Yarn no longer used
30+
yarn.lock

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ trim_trailing_whitespace = false
1515

1616
[*.ts]
1717
quote_type = single
18+
ij_typescript_enforce_trailing_comma = whenmultiline
19+
20+
[*.js]
21+
ij_javascript_enforce_trailing_comma = whenmultiline
1822

1923
[*.json5]
2024
ij_json_keep_blank_lines_in_code = 3

.eslintrc.json

Lines changed: 61 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"@angular-eslint/eslint-plugin",
66
"eslint-plugin-import",
77
"eslint-plugin-jsdoc",
8-
"eslint-plugin-deprecation",
98
"unused-imports",
109
"eslint-plugin-lodash",
1110
"eslint-plugin-jsonc",
12-
"eslint-plugin-rxjs",
11+
"@smarttools/rxjs",
1312
"eslint-plugin-simple-import-sort",
1413
"eslint-plugin-import-newlines",
14+
"@stylistic",
1515
"dspace-angular-ts",
1616
"dspace-angular-html"
1717
],
@@ -37,7 +37,7 @@
3737
"plugin:@typescript-eslint/recommended-requiring-type-checking",
3838
"plugin:@angular-eslint/recommended",
3939
"plugin:@angular-eslint/template/process-inline-templates",
40-
"plugin:rxjs/recommended"
40+
"plugin:@smarttools/rxjs/recommended-legacy"
4141
],
4242
"rules": {
4343
"indent": [
@@ -160,6 +160,9 @@
160160
]
161161
}
162162
],
163+
"@angular-eslint/prefer-standalone": [
164+
"error"
165+
],
163166
"@angular-eslint/no-attribute-decorator": "error",
164167
"@angular-eslint/no-output-native": "warn",
165168
"@angular-eslint/no-output-on-prefix": "warn",
@@ -172,15 +175,16 @@
172175
"ignoreParameters": true
173176
}
174177
],
175-
"@typescript-eslint/quotes": [
178+
"@angular-eslint/prefer-inject": "off",
179+
"@stylistic/quotes": [
176180
"error",
177181
"single",
178182
{
179183
"avoidEscape": true,
180184
"allowTemplateLiterals": true
181185
}
182186
],
183-
"@typescript-eslint/semi": "error",
187+
"@stylistic/semi": "error",
184188
"@typescript-eslint/no-shadow": "error",
185189
"@typescript-eslint/dot-notation": "error",
186190
"@typescript-eslint/consistent-type-definitions": "error",
@@ -203,9 +207,9 @@
203207
]
204208
}
205209
],
206-
"@typescript-eslint/type-annotation-spacing": "error",
210+
"@stylistic/type-annotation-spacing": "error",
207211
"@typescript-eslint/unified-signatures": "error",
208-
"@typescript-eslint/ban-types": "error",
212+
"@typescript-eslint/no-restricted-types": "error",
209213
"@typescript-eslint/no-floating-promises": "warn",
210214
"@typescript-eslint/no-misused-promises": "warn",
211215
"@typescript-eslint/restrict-plus-operands": "warn",
@@ -220,6 +224,7 @@
220224
"@typescript-eslint/no-unsafe-call": "off",
221225
"@typescript-eslint/no-unsafe-argument": "off",
222226
"@typescript-eslint/no-unsafe-return": "off",
227+
"@typescript-eslint/no-redundant-type-constituents": "off",
223228
"@typescript-eslint/restrict-template-expressions": "off",
224229
"@typescript-eslint/require-await": "off",
225230
"@typescript-eslint/no-base-to-string": [
@@ -232,7 +237,7 @@
232237
}
233238
],
234239

235-
"deprecation/deprecation": "warn",
240+
"@typescript-eslint/no-deprecated": "warn",
236241

237242
"simple-import-sort/imports": "error",
238243
"simple-import-sort/exports": "error",
@@ -250,19 +255,62 @@
250255
"forceSingleLine": true
251256
}
252257
],
258+
"import/enforce-node-protocol-usage": [
259+
"error",
260+
"always"
261+
],
253262

254263
"unused-imports/no-unused-imports": "error",
255264
"lodash/import-scope": [
256265
"error",
257266
"method"
258267
],
259268

260-
"rxjs/no-nested-subscribe": "off", // todo: go over _all_ cases
269+
"@smarttools/rxjs/no-nested-subscribe": "off", // todo: go over _all_ cases
261270

262271
// Custom DSpace Angular rules
263-
"dspace-angular-ts/themed-component-classes": "error",
272+
"dspace-angular-ts/alias-imports": [
273+
"error",
274+
{
275+
"aliases": [
276+
{
277+
"package": "rxjs",
278+
"imported": "of",
279+
"local": "of"
280+
}
281+
]
282+
}
283+
],
284+
"dspace-angular-ts/no-default-standalone-value": "error",
264285
"dspace-angular-ts/themed-component-selectors": "error",
265-
"dspace-angular-ts/themed-component-usages": "error"
286+
"dspace-angular-ts/themed-component-usages": "error",
287+
"dspace-angular-ts/themed-decorators": [
288+
"off",
289+
{
290+
"decorators": {
291+
"listableObjectComponent": 3,
292+
"rendersSectionForMenu": 2
293+
}
294+
}
295+
],
296+
"dspace-angular-ts/themed-wrapper-no-input-defaults": "error",
297+
"dspace-angular-ts/unique-decorators": [
298+
"off",
299+
{
300+
"decorators": [
301+
"listableObjectComponent"
302+
]
303+
}
304+
],
305+
"dspace-angular-ts/sort-standalone-imports": [
306+
"error",
307+
{
308+
"locale": "en-US",
309+
"maxItems": 0,
310+
"indent": 2,
311+
"trailingComma": true
312+
}
313+
]
266314
}
267315
},
268316
{
@@ -293,7 +341,8 @@
293341
"rules": {
294342
// Custom DSpace Angular rules
295343
"dspace-angular-html/themed-component-usages": "error",
296-
"dspace-angular-html/no-disabled-attribute-on-button": "error"
344+
"dspace-angular-html/no-disabled-attribute-on-button": "error",
345+
"@angular-eslint/template/prefer-control-flow": "error"
297346
}
298347
},
299348
{

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ assignees: ''
77

88
---
99

10-
**Describe the bug**
10+
## Describe the bug
1111
A clear and concise description of what the bug is. Include the version(s) of DSpace where you've seen this problem & what *web browser* you were using. Link to examples if they are public.
1212

13-
**To Reproduce**
13+
## To Reproduce
1414
Steps to reproduce the behavior:
1515
1. Do this
1616
2. Then this...
1717

18-
**Expected behavior**
18+
## Expected behavior
1919
A clear and concise description of what you expected to happen.
2020

21-
**Related work**
21+
## Related work
2222
Link to any related tickets or PRs here.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ assignees: ''
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
10+
## Is your feature request related to a problem? Please describe.
11+
A clear and concise description of what the problem or use case is. For example, I'm always frustrated when [...]
1212

13-
**Describe the solution you'd like**
13+
## Describe the solution you'd like
1414
A clear and concise description of what you want to happen.
1515

16-
**Describe alternatives or workarounds you've considered**
16+
## Describe alternatives or workarounds you've considered
1717
A clear and concise description of any alternative solutions or features you've considered.
1818

19-
**Additional context**
20-
Add any other context or screenshots about the feature request here.
19+
## Additional information
20+
Add any other information, related tickets or screenshots about the feature request here.

0 commit comments

Comments
 (0)