Skip to content

Commit 40c13e6

Browse files
LotteHofstedeLotteHofstede
committed
Merge remote-tracking branch 'origin/main' into multiline-search-filter-badge_main
2 parents f4dc8ca + 474b70b commit 40c13e6

2,609 files changed

Lines changed: 191792 additions & 77074 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 & 11 deletions
This file was deleted.

‎.editorconfig‎

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

1616
[*.ts]
1717
quote_type = single
18+
19+
[*.json5]
20+
ij_json_keep_blank_lines_in_code = 3

‎.eslintrc.json‎

Lines changed: 266 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,266 @@
1+
{
2+
"root": true,
3+
"plugins": [
4+
"@typescript-eslint",
5+
"@angular-eslint/eslint-plugin",
6+
"eslint-plugin-import",
7+
"eslint-plugin-jsdoc",
8+
"eslint-plugin-deprecation",
9+
"unused-imports",
10+
"eslint-plugin-lodash",
11+
"eslint-plugin-jsonc"
12+
],
13+
"overrides": [
14+
{
15+
"files": [
16+
"*.ts"
17+
],
18+
"parserOptions": {
19+
"project": [
20+
"./tsconfig.json",
21+
"./cypress/tsconfig.json"
22+
],
23+
"createDefaultProgram": true
24+
},
25+
"extends": [
26+
"eslint:recommended",
27+
"plugin:@typescript-eslint/recommended",
28+
"plugin:@typescript-eslint/recommended-requiring-type-checking",
29+
"plugin:@angular-eslint/recommended",
30+
"plugin:@angular-eslint/template/process-inline-templates"
31+
],
32+
"rules": {
33+
"max-classes-per-file": [
34+
"error",
35+
1
36+
],
37+
"comma-dangle": [
38+
"off",
39+
"always-multiline"
40+
],
41+
"eol-last": [
42+
"error",
43+
"always"
44+
],
45+
"no-console": [
46+
"error",
47+
{
48+
"allow": [
49+
"log",
50+
"warn",
51+
"dir",
52+
"timeLog",
53+
"assert",
54+
"clear",
55+
"count",
56+
"countReset",
57+
"group",
58+
"groupEnd",
59+
"table",
60+
"debug",
61+
"info",
62+
"dirxml",
63+
"error",
64+
"groupCollapsed",
65+
"Console",
66+
"profile",
67+
"profileEnd",
68+
"timeStamp",
69+
"context"
70+
]
71+
}
72+
],
73+
"curly": "error",
74+
"brace-style": [
75+
"error",
76+
"1tbs",
77+
{
78+
"allowSingleLine": true
79+
}
80+
],
81+
"eqeqeq": [
82+
"error",
83+
"always",
84+
{
85+
"null": "ignore"
86+
}
87+
],
88+
"radix": "error",
89+
"guard-for-in": "error",
90+
"no-bitwise": "error",
91+
"no-restricted-imports": "error",
92+
"no-caller": "error",
93+
"no-debugger": "error",
94+
"no-redeclare": "error",
95+
"no-eval": "error",
96+
"no-fallthrough": "error",
97+
"no-trailing-spaces": "error",
98+
"space-infix-ops": "error",
99+
"keyword-spacing": "error",
100+
"no-var": "error",
101+
"no-unused-expressions": [
102+
"error",
103+
{
104+
"allowTernary": true
105+
}
106+
],
107+
"prefer-const": "off", // todo: re-enable & fix errors (more strict than it used to be in TSLint)
108+
"prefer-spread": "off",
109+
"no-underscore-dangle": "off",
110+
111+
// todo: disabled rules from eslint:recommended, consider re-enabling & fixing
112+
"no-prototype-builtins": "off",
113+
"no-useless-escape": "off",
114+
"no-case-declarations": "off",
115+
"no-extra-boolean-cast": "off",
116+
117+
"@angular-eslint/directive-selector": [
118+
"error",
119+
{
120+
"type": "attribute",
121+
"prefix": "ds",
122+
"style": "camelCase"
123+
}
124+
],
125+
"@angular-eslint/component-selector": [
126+
"error",
127+
{
128+
"type": "element",
129+
"prefix": "ds",
130+
"style": "kebab-case"
131+
}
132+
],
133+
"@angular-eslint/pipe-prefix": [
134+
"error",
135+
{
136+
"prefixes": [
137+
"ds"
138+
]
139+
}
140+
],
141+
"@angular-eslint/no-attribute-decorator": "error",
142+
"@angular-eslint/no-forward-ref": "error",
143+
"@angular-eslint/no-output-native": "warn",
144+
"@angular-eslint/no-output-on-prefix": "warn",
145+
"@angular-eslint/no-conflicting-lifecycle": "warn",
146+
147+
"@typescript-eslint/no-inferrable-types":[
148+
"error",
149+
{
150+
"ignoreParameters": true
151+
}
152+
],
153+
"@typescript-eslint/quotes": [
154+
"error",
155+
"single",
156+
{
157+
"avoidEscape": true,
158+
"allowTemplateLiterals": true
159+
}
160+
],
161+
"@typescript-eslint/semi": "error",
162+
"@typescript-eslint/no-shadow": "error",
163+
"@typescript-eslint/dot-notation": "error",
164+
"@typescript-eslint/consistent-type-definitions": "error",
165+
"@typescript-eslint/prefer-function-type": "error",
166+
"@typescript-eslint/naming-convention": [
167+
"error",
168+
{
169+
"selector": "property",
170+
"format": null
171+
}
172+
],
173+
"@typescript-eslint/member-ordering": [
174+
"error",
175+
{
176+
"default": [
177+
"static-field",
178+
"instance-field",
179+
"static-method",
180+
"instance-method"
181+
]
182+
}
183+
],
184+
"@typescript-eslint/type-annotation-spacing": "error",
185+
"@typescript-eslint/unified-signatures": "error",
186+
"@typescript-eslint/ban-types": "warn", // todo: deal with {} type issues & re-enable
187+
"@typescript-eslint/no-floating-promises": "warn",
188+
"@typescript-eslint/no-misused-promises": "warn",
189+
"@typescript-eslint/restrict-plus-operands": "warn",
190+
"@typescript-eslint/unbound-method": "off",
191+
"@typescript-eslint/ban-ts-comment": "off",
192+
"@typescript-eslint/no-var-requires": "off",
193+
"@typescript-eslint/no-unused-vars": "off",
194+
"@typescript-eslint/no-unnecessary-type-assertion": "off",
195+
"@typescript-eslint/no-explicit-any": "off",
196+
"@typescript-eslint/no-unsafe-assignment": "off",
197+
"@typescript-eslint/no-unsafe-member-access": "off",
198+
"@typescript-eslint/no-unsafe-call": "off",
199+
"@typescript-eslint/no-unsafe-argument": "off",
200+
"@typescript-eslint/no-unsafe-return": "off",
201+
"@typescript-eslint/restrict-template-expressions": "off",
202+
"@typescript-eslint/require-await": "off",
203+
204+
"deprecation/deprecation": "warn",
205+
206+
"import/order": "off",
207+
"import/no-deprecated": "warn",
208+
"import/no-namespace": "error",
209+
"unused-imports/no-unused-imports": "error",
210+
"lodash/import-scope": [
211+
"error",
212+
"method"
213+
]
214+
}
215+
},
216+
{
217+
"files": [
218+
"*.html"
219+
],
220+
"extends": [
221+
"plugin:@angular-eslint/template/recommended"
222+
],
223+
"rules": {
224+
// todo: re-enable & fix errors
225+
"@angular-eslint/template/no-negated-async": "off",
226+
"@angular-eslint/template/eqeqeq": "off"
227+
}
228+
},
229+
{
230+
"files": [
231+
"*.json5"
232+
],
233+
"extends": [
234+
"plugin:jsonc/recommended-with-jsonc"
235+
],
236+
"rules": {
237+
"no-irregular-whitespace": "error",
238+
"no-trailing-spaces": "error",
239+
"jsonc/comma-dangle": [
240+
"error",
241+
"always-multiline"
242+
],
243+
"jsonc/indent": [
244+
"error",
245+
2
246+
],
247+
"jsonc/key-spacing": [
248+
"error",
249+
{
250+
"beforeColon": false,
251+
"afterColon": true,
252+
"mode": "strict"
253+
}
254+
],
255+
"jsonc/no-dupe-keys": "off",
256+
"jsonc/quotes": [
257+
"error",
258+
"double",
259+
{
260+
"avoidEscape": false
261+
}
262+
]
263+
}
264+
}
265+
]
266+
}

‎.gitattributes‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# By default, auto detect text files and perform LF normalization
2+
# This ensures code is always checked in with LF line endings
3+
* text=auto
4+
5+
# JS and TS files must always use LF for Angular tools to work
6+
# Some Angular tools expect LF line endings, even on Windows.
7+
# This ensures Windows always checks out these files with LF line endings
8+
# We've copied many of these rules from https://github.com/angular/angular-cli/
9+
*.js eol=lf
10+
*.ts eol=lf
11+
*.json eol=lf
12+
*.json5 eol=lf
13+
*.css eol=lf
14+
*.scss eol=lf
15+
*.html eol=lf
16+
*.svg eol=lf

‎.github/disabled-workflows/pull_request_opened.yml‎

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

‎.github/pull_request_template.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## References
22
_Add references/links to any related issues or PRs. These may include:_
3-
* Fixes #[issue-number]
4-
* Requires DSpace/DSpace#[pr-number] (if a REST API PR is required to test this)
3+
* Fixes #`issue-number` (if this fixes an issue ticket)
4+
* Requires DSpace/DSpace#`pr-number` (if a REST API PR is required to test this)
55

66
## Description
77
Short summary of changes (1-2 sentences).
@@ -19,8 +19,10 @@ List of changes in this PR:
1919
_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
2020

2121
- [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
22-
- [ ] My PR passes [TSLint](https://palantir.github.io/tslint/) validation using `yarn run lint`
23-
- [ ] My PR doesn't introduce circular dependencies
22+
- [ ] My PR passes [ESLint](https://eslint.org/) validation using `yarn lint`
23+
- [ ] My PR doesn't introduce circular dependencies (verified via `yarn check-circ-deps`)
2424
- [ ] 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.
2525
- [ ] 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).
26-
- [ ] If my PR includes new, third-party 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.
26+
- [ ] 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.
27+
- [ ] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
28+
- [ ] If my PR fixes an issue ticket, I've [linked them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).

0 commit comments

Comments
 (0)