Skip to content

Commit 958064f

Browse files
milanmajchrakamgciadevalexandrevryghemtdonohueNathan Buckingham
authored
Upgrade CLARIN-DSpace to 7.5 (#228)
* Update recent-item-list.component.ts Update PaginatedSearchOptions to only retrieve items * 98863: Prevent retrieval of the domains on TYPE_REQUEST_FORGOT form & fixed error message when no emails are set * Refactor to two caches. One for bots and one for anonymous users * Fix test configuration * Add test for xsrf and change to Post so xsrf is tested for validity * collection is displayed below the submitter * [CST-7757] Remove subscription button from item pages * [CST-7757] Response parameters fixed; submit button disabled if frequency is missing * [CST-7757] D-W-M fixed * [CST-7757] Show object name * 98855: Remove temp themed ng-content container This is problematic when ng-content is provided but it's not used * [CST-7221] Opaque search bar * [CST-7757] Minor fixes * [CST-7757] Labels renamed * [CST-7755] updated PR to latest REST changes * 97298: Added form validator tests for restricted domains * 99053: Invalidate cache by default when performing the WorkflowItemActionPageComponent action * 99053: Added DeclinedTask search result banner * 99053: Fixed AdvancedWorkflowActionRatingComponent's rating from validation * 99053: Added missing documentation * [TLC-380] Support browse links and regex links in metadata display (resolved conflicts jan 2023) * [TLC-380] Lint fixes * [TLC-380] Lint fixes * [TLC-380] Unit test (provider injection) fixes (resolved conflict jan 16) * [TLC-380] lint fix * [TLC-380] further browse link unit test fixes (waitForAsync) * [TLC-380] Refactor browse links to use new /browses endpoint * [TLC-249] Fix circular dependency in browse services * [TLC-249] Larger refactor to field, item components for browse links * [TLC-249] Lint fixes * [TLC-249] Lint fixes * [TLC-380] Fix mock service to return proper payload * [TLC-380] Simplify / strip browse service from components * [TLC-380] Lint fixes for mock browse def service * [TLC-380] Template link, spec test, doc fixup as per review * [TLC-380] Refactor metadata rep list comp after rebase * [TLC-380] Lint fixes * [TLC-380] Template link fixes, spec test fixes Correct use of routerLink and queryParams Removed unused method from browse service, specs New spec tests for MetadataRepresentationListElementComponent * [TLC-380] Lint fixes on spec test * [TLC-380] Fix item page field test to supply router * [TLC-249] Show Identifier Step angular 7.x * [TLC-249] Remove CRIS7 visibility refs from component, i18n * [TLC-249] Lint fixes * [TLC-249] LGTM unused import fixes * [TLC-249] Register DOI operation and button in item status page * [TLC-249] Linting * [TLC-337] Unit tests for register DOI component * [TLC-249] Lint fixes * [TLC-249] Update data service usage since rebasing * [TLC-249] Update data service usage since rebasing * [TLC-249] Ensure identifier data model mapped to type * [TLC-249] Update spec test for new config form data service * [TLC-249] Addressing review feedback Adding comments and tidying some comments, imports Expect text for status not integer Send a 'type' parameter with a DOI registration Rename item-status.register to registerDOI As per todonohue's feedback on 2022-01-18 * [TLC-249] Addressing review feedback #2 Update WorkspaceitemSectionIdentifiersObject model to include a display types string array, so identifier types can be included or excluded from the step as needed. Update section template to work with the above new data As per todonohue's feedback on 2022-01-18 * [TLC-249] Lint fixes (imports, quotes) * [TLC-249] Improve model of identifier data in workspace section * [TLC-249] Update en.json5 with DOI status labels * [TLC-249] Identifier mock data updated in unit test * [TLC-249] Identifier mock data updated in unit test * [TLC-380] Renaming, changes as per review feedback * [TLC-380] WIP trying new routing / create flow * [TLC-380] Refactor to use new endpoints, better naming * [TLC-380] Refactor to use new endpoints, better naming * [TLC-249] Attempting art's sub fix (doesn't work) * [TLC-249] Update item status button logic to avoid nested subs * [TLC-249] Lint * [TLC-249] Fix import typo (from merge conflict) * [TLC-249] Further test fixes * Retrieve the XSRF token first, and set it as both the XSRF header and cookie * Fix direct CSR By moving from environment.ts to config.yml we made it so the environment is _not_ up to date with the server configuration when main.js is first loaded. Because of this the app behaved as if CSR always happened _after_ SSR, effectively breaking direct CSR. Here the "criterion" for SSR/non-SSR HTML is changed from the related configuration property to the presence of Angular Universal transfer state. This means we can correctly determine when to bootstrap the app for direct CSR, and it's' now "safe" to just send index.html by itself. * Fix lint and test issues * Add "debug" config and "allowStale" configs * Add done() to async tests * 99053: Added test to check that the TYPE_REQUEST_FORGOT doesn't use the authentication-password.domain.valid * 97732 Remove unnecessary subscriptions * [CST-7757] subscriptions data service tests * Fixed text (without HTML tags) not being passed to child components * Fixed default @input() values not working for themed components * [CST-7757] subscription modal tests * [CST-7757] modal fixes * [CST-7757] modal fixes * [CST-7217] Add margins to better align badge * [CST-7757] Hide delete info for new subscriptions and fix issue with unavailable items * Keep SSL sessions alive between xhr2 requests * [CST-7755] added cancel button to modal and updated message returned when a supervision order already exists * [CST-7755] lint fix * Fix bug where allowStale couldn't be disabled * 99053: Removed ngx-bootstrap dependency * 99053: Fixed encoded parameters being encoded twice in WorkflowItemActionPageComponent.previousPage() * 99053: Passed previousSearchQuery to AdvancedWorkflowActionSelectReviewerComponent * 99053: Passed previousSearchQuery to AdvancedWorkflowActionSelectReviewerComponent * 99053: Pass all queryParameters to advanced workflow pages by default * 99053: Save queryParams in init to prevent them being overwritten * Bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](kornelski/http-cache-semantics@v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * [CST-7755] WIP refactoring * [CST-7757] Missing label * fixed issue in browser console * [CST-7755] WIP revert changes on list components * [CST-7757] Fix delete message * [CST-7755] Complete refactoring * Fix for "cannot read properties of undefined" error * [CST-8914] Add flag to show/hide csv export button * src/assets/i18n: Improve English strings for file upload Simple improvement to the wording in the file upload section of the item submission form. Also add a period at the end of the string. Fixes: DSpace#2096 * [CST-8935] Fix issue with missing matcher providers * translation fixes in security form * remove minimum passwort length value from translated messages * fixed missing comma * added comma to default translation * suggestionOption.name displayed * [CST-8952] Fix issue with admin reset password functionality * avoiding console.log errors * Fix param to send user the forgot password email * Update version tag for release * Fixed a lot of compilation errors, but there is a need to refactor services. * Added yarn.lock * Fixed some service updates * Fixed some service updates * Solved some errors, but it is still not working. * Something starting to work - the problem is in loading the modules * Updated database testing dump for integration tests * Fixed unit tests * Fixed admin menu * Fixed lint issues * Fixed handle page circular dependency * Fixed AuthorNameLink circular dependency * Fixed compilation errors * Fixed failing Unit tests * Integration tests should take image `migrate-to-7.5` * Integration tests should take image `migrate-to-7.5` * revert docker-compose-ci.yml changes * Updated BE envs * Changed localhost to 127.0.0.1 * Added DSPACE_UI_HOST and DSPACE_UI_PORT to 127.0.0.1:4000 * Changed logging in the IT * Fixed login * Maybe fixed integration tests * Copied a new code from the actual dtq-dev * Fixed discojuice login pop up * added S3 config to docker-compose-rest.yml * Fixed IT * Integration tests should not fail on console log error. * Removed failing test what is not needed. * SUbmitter user changed to admin * Commenteed failing tests. * added values for S3 to cli.yml * Added flags into discojuice * Added flags into discojuice * Added another icons into discojuice * discoPath is cleared in the discojuice.js * Create migrate-docker.yml to create docker image * create tag migrate-to-7.5 * Fixed some shibboleth problems * Fixed problem during downloading restricted bitstreams. * Migrate to 7.5 (#174) * 97742: Add missing export * Make ThemedComponent reproject slots to wrapped component * [CST-7217] Implement short number pipe * 97425: Fix minor issues * Remove flex-wrap * 99053: Fixed previous page not always returning the correct value - Fixed previousPage not correctly redirecting to urls with queryParams - Fixed previousPage returning to wrong page because of ReviewersListComponent * 99053: Hide return to pool button for second step of SelectSingleReviewer * [CST-7217] Use short number pipe and fix badge alignment * Fix typo * Add SSR caching via lru-cache. Update Cache-Control header to 1 week, but tell browsers not to cache index.html * Update SSR caching to only work when unauthenticated. Enhance config comments * Add missing test configs * Updates to defaults of cache.control setting and enhanced comments * Remove unused import * Rename enableCache() to initCache() to make code easier to understand * Avoid caching a page twice in a row * adding role for ul and li i have added roles for ul and li (tablist and tab) * w2p-99039 Add xsrf token to createShortLivedToken get request * Update recent-item-list.component.ts Update PaginatedSearchOptions to only retrieve items * 98863: Prevent retrieval of the domains on TYPE_REQUEST_FORGOT form & fixed error message when no emails are set * Refactor to two caches. One for bots and one for anonymous users * Fix test configuration * Add test for xsrf and change to Post so xsrf is tested for validity * collection is displayed below the submitter * [CST-7757] Remove subscription button from item pages * [CST-7757] Response parameters fixed; submit button disabled if frequency is missing * [CST-7757] D-W-M fixed * [CST-7757] Show object name * 98855: Remove temp themed ng-content container This is problematic when ng-content is provided but it's not used * [CST-7221] Opaque search bar * [CST-7757] Minor fixes * [CST-7757] Labels renamed * [CST-7755] updated PR to latest REST changes * 97298: Added form validator tests for restricted domains * 99053: Invalidate cache by default when performing the WorkflowItemActionPageComponent action * 99053: Added DeclinedTask search result banner * 99053: Fixed AdvancedWorkflowActionRatingComponent's rating from validation * 99053: Added missing documentation * [TLC-380] Support browse links and regex links in metadata display (resolved conflicts jan 2023) * [TLC-380] Lint fixes * [TLC-380] Lint fixes * [TLC-380] Unit test (provider injection) fixes (resolved conflict jan 16) * [TLC-380] lint fix * [TLC-380] further browse link unit test fixes (waitForAsync) * [TLC-380] Refactor browse links to use new /browses endpoint * [TLC-249] Fix circular dependency in browse services * [TLC-249] Larger refactor to field, item components for browse links * [TLC-249] Lint fixes * [TLC-249] Lint fixes * [TLC-380] Fix mock service to return proper payload * [TLC-380] Simplify / strip browse service from components * [TLC-380] Lint fixes for mock browse def service * [TLC-380] Template link, spec test, doc fixup as per review * [TLC-380] Refactor metadata rep list comp after rebase * [TLC-380] Lint fixes * [TLC-380] Template link fixes, spec test fixes Correct use of routerLink and queryParams Removed unused method from browse service, specs New spec tests for MetadataRepresentationListElementComponent * [TLC-380] Lint fixes on spec test * [TLC-380] Fix item page field test to supply router * [TLC-249] Show Identifier Step angular 7.x * [TLC-249] Remove CRIS7 visibility refs from component, i18n * [TLC-249] Lint fixes * [TLC-249] LGTM unused import fixes * [TLC-249] Register DOI operation and button in item status page * [TLC-249] Linting * [TLC-337] Unit tests for register DOI component * [TLC-249] Lint fixes * [TLC-249] Update data service usage since rebasing * [TLC-249] Update data service usage since rebasing * [TLC-249] Ensure identifier data model mapped to type * [TLC-249] Update spec test for new config form data service * [TLC-249] Addressing review feedback Adding comments and tidying some comments, imports Expect text for status not integer Send a 'type' parameter with a DOI registration Rename item-status.register to registerDOI As per todonohue's feedback on 2022-01-18 * [TLC-249] Addressing review feedback #2 Update WorkspaceitemSectionIdentifiersObject model to include a display types string array, so identifier types can be included or excluded from the step as needed. Update section template to work with the above new data As per todonohue's feedback on 2022-01-18 * [TLC-249] Lint fixes (imports, quotes) * [TLC-249] Improve model of identifier data in workspace section * [TLC-249] Update en.json5 with DOI status labels * [TLC-249] Identifier mock data updated in unit test * [TLC-249] Identifier mock data updated in unit test * [TLC-380] Renaming, changes as per review feedback * [TLC-380] WIP trying new routing / create flow * [TLC-380] Refactor to use new endpoints, better naming * [TLC-380] Refactor to use new endpoints, better naming * [TLC-249] Attempting art's sub fix (doesn't work) * [TLC-249] Update item status button logic to avoid nested subs * [TLC-249] Lint * [TLC-249] Fix import typo (from merge conflict) * [TLC-249] Further test fixes * Retrieve the XSRF token first, and set it as both the XSRF header and cookie * Fix direct CSR By moving from environment.ts to config.yml we made it so the environment is _not_ up to date with the server configuration when main.js is first loaded. Because of this the app behaved as if CSR always happened _after_ SSR, effectively breaking direct CSR. Here the "criterion" for SSR/non-SSR HTML is changed from the related configuration property to the presence of Angular Universal transfer state. This means we can correctly determine when to bootstrap the app for direct CSR, and it's' now "safe" to just send index.html by itself. * Fix lint and test issues * Add "debug" config and "allowStale" configs * Add done() to async tests * 99053: Added test to check that the TYPE_REQUEST_FORGOT doesn't use the authentication-password.domain.valid * 97732 Remove unnecessary subscriptions * [CST-7757] subscriptions data service tests * Fixed text (without HTML tags) not being passed to child components * Fixed default @input() values not working for themed components * [CST-7757] subscription modal tests * [CST-7757] modal fixes * [CST-7757] modal fixes * [CST-7217] Add margins to better align badge * [CST-7757] Hide delete info for new subscriptions and fix issue with unavailable items * Keep SSL sessions alive between xhr2 requests * [CST-7755] added cancel button to modal and updated message returned when a supervision order already exists * [CST-7755] lint fix * Fix bug where allowStale couldn't be disabled * 99053: Removed ngx-bootstrap dependency * 99053: Fixed encoded parameters being encoded twice in WorkflowItemActionPageComponent.previousPage() * 99053: Passed previousSearchQuery to AdvancedWorkflowActionSelectReviewerComponent * 99053: Passed previousSearchQuery to AdvancedWorkflowActionSelectReviewerComponent * 99053: Pass all queryParameters to advanced workflow pages by default * 99053: Save queryParams in init to prevent them being overwritten * Bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](kornelski/http-cache-semantics@v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * [CST-7755] WIP refactoring * [CST-7757] Missing label * fixed issue in browser console * [CST-7755] WIP revert changes on list components * [CST-7757] Fix delete message * [CST-7755] Complete refactoring * Fix for "cannot read properties of undefined" error * [CST-8914] Add flag to show/hide csv export button * src/assets/i18n: Improve English strings for file upload Simple improvement to the wording in the file upload section of the item submission form. Also add a period at the end of the string. Fixes: DSpace#2096 * [CST-8935] Fix issue with missing matcher providers * translation fixes in security form * remove minimum passwort length value from translated messages * fixed missing comma * added comma to default translation * suggestionOption.name displayed * [CST-8952] Fix issue with admin reset password functionality * avoiding console.log errors * Fix param to send user the forgot password email * Update version tag for release * Fixed a lot of compilation errors, but there is a need to refactor services. * Added yarn.lock * Fixed some service updates * Fixed some service updates * Solved some errors, but it is still not working. * Something starting to work - the problem is in loading the modules * Updated database testing dump for integration tests * Fixed unit tests * Fixed admin menu * Fixed lint issues * Fixed handle page circular dependency * Fixed AuthorNameLink circular dependency * Fixed compilation errors * Fixed failing Unit tests * Integration tests should take image `migrate-to-7.5` * Integration tests should take image `migrate-to-7.5` * revert docker-compose-ci.yml changes * Updated BE envs * Changed localhost to 127.0.0.1 * Added DSPACE_UI_HOST and DSPACE_UI_PORT to 127.0.0.1:4000 * Changed logging in the IT * Fixed login * Maybe fixed integration tests * Copied a new code from the actual dtq-dev * Fixed discojuice login pop up * added S3 config to docker-compose-rest.yml * Fixed IT * Integration tests should not fail on console log error. * Removed failing test what is not needed. * SUbmitter user changed to admin * Commenteed failing tests. * added values for S3 to cli.yml * Added flags into discojuice * Added flags into discojuice * Added another icons into discojuice * discoPath is cleared in the discojuice.js * Create migrate-docker.yml to create docker image * create tag migrate-to-7.5 * Fixed some shibboleth problems * Fixed problem during downloading restricted bitstreams. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org> Co-authored-by: Kristof De Langhe <kristof.delanghe@atmire.com> Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.it> Co-authored-by: Yura Bondarenko <yura.bondarenko@atmire.com> Co-authored-by: Yana De Pauw <yana@atmire.com> Co-authored-by: Alexandre Vryghem <alexandre@atmire.com> Co-authored-by: Cristian Emanuelle Guzmán Suárez <cristian.guzman.contacto@gmail.com> Co-authored-by: Nathan Buckingham <nathan.buckingham@atmire.com> Co-authored-by: Agustina Martinez <am857@cam.ac.uk> Co-authored-by: Davide Negretti <davide.negretti@4science.it> Co-authored-by: corrado lombardi <corrado.lombardi@4science.com> Co-authored-by: Marie Verdonck <maria.verdonck@atmire.com> Co-authored-by: Kim Shepherd <kim@shepherd.nz> Co-authored-by: Art Lowel <art.lowel@gmail.com> Co-authored-by: Yury Bondarenko <ybnd@tuta.io> Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com> Co-authored-by: Pascal-Nicolas Becker <pnbecker@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alan Orth <alan.orth@gmail.com> Co-authored-by: Sascha Szott <szott@gmx.de> Co-authored-by: MajoBerger <marian.berger@dataquest.sk> * Fixed lint errors and updated server url * Created search instance in the services. * separate ports for multiple instance run (#230) * separate ports for multiple instance run * modified deploy * parametrized dspace project name in docker compose * fixed .env for deployment on dev-5 * fix forgotten -p parameter on deploy * fixed region * fixed bucket name * add DSPACE_VER variable to deploy * remove automatic deploy * unify erasing db * Autoregistration privacy policy redirect (#239) * Added missing searchData into metadataValueData service. * The user could be redirected into privacy policy page from the autoregistration welcome page. * Update erase_db.yml * Migrated 7.5/funding option wrong values (#241) * Fixed error when the part of the local sponsor value includes the SEPARATOR character. * The funds are properly loaded into complex input field. * revert replacing of the metadata value sequence, it will be fixed in the python * Revert "The funds are properly loaded into complex input field." This reverts commit 3f68b79. * Added search button (#244) * Copied working code from the DSpace Vanilla 7.6 (#243) * add redeploy to dev-5 -> curl call to deploy action * format * remove forgotten action file (#252) * remove useless file * forgotten " * allow configuring host (#248) * migrated-7.5/look-and-feel-is-broken (#245) * Fixed item-view padding of the header * Fixed license label padding * Added margin right class into item view and if the item doesn't have the license it shows nothing in the license box in the item view. * Fixed loading of the license icons and padding. * Fixed padding of share buttons. * Fixed badges margin * Fixed item-box-view messaged, non-file message and padding. * Fixed files border. * Fixed clarin dropdown buttons because of Angular 13 and added padding into License table buttons * Added padding into handle table buttons. * Fixed ref box identifier url * Added missing method to the `clarin-search.component` (#247) * internal/shibboleth-missing-one-error-page * Update docker-compose-ci.yml Updated Integration Tests dump * Update build.yml Change DSPACE_CI_IMAGE to dtq-dev-7.5 * trigger docker images on correct branch * added password for dspace (#257) * added non-amazon-params (#260) * Update build.yml * Update build.yml * Internal/fix conflicts (#307) * trigger docker images on correct branch * fix updated postgres image on docker hub (#256) * internal-7.2/add-cz-language (#271) * Added a czech translation * Updated menu navbar and added translations. * disable deploy on dev-5 on version 7.2 * disabled deploy on dev-5 of dspace v7.2 --------- Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com> Co-authored-by: MajoBerger <marian.berger@dataquest.sk> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Agustina Martinez <am857@cam.ac.uk> Co-authored-by: Alexandre Vryghem <alexandre@atmire.com> Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org> Co-authored-by: Nathan Buckingham <nathan.buckingham@atmire.com> Co-authored-by: Cristian Emanuelle Guzmán Suárez <cristian.guzman.contacto@gmail.com> Co-authored-by: Davide Negretti <davide.negretti@4science.it> Co-authored-by: Yana De Pauw <yana@atmire.com> Co-authored-by: corrado lombardi <corrado.lombardi@4science.com> Co-authored-by: Marie Verdonck <maria.verdonck@atmire.com> Co-authored-by: Kim Shepherd <kim@shepherd.nz> Co-authored-by: Art Lowel <art.lowel@gmail.com> Co-authored-by: Yury Bondarenko <ybnd@tuta.io> Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com> Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.it> Co-authored-by: Pascal-Nicolas Becker <pnbecker@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alan Orth <alan.orth@gmail.com> Co-authored-by: Sascha Szott <szott@gmx.de> Co-authored-by: MajoBerger <marian.berger@dataquest.sk> Co-authored-by: Kristof De Langhe <kristof.delanghe@atmire.com> Co-authored-by: Yura Bondarenko <yura.bondarenko@atmire.com> Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com>
1 parent 5fc75c4 commit 958064f

File tree

2,613 files changed

+141667
-53938
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,613 files changed

+141667
-53938
lines changed

.browserslistrc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
# For additional information regarding the format and rule options, please see:
33
# https://github.com/browserslist/browserslist#queries
44

5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
58
# You can see what browsers were selected by your queries by running:
69
# npx browserslist
710

8-
> 0.5%
9-
last 2 versions
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
1016
Firefox ESR
11-
not IE 9-11 # For IE 9-11 support, remove 'not'.
17+
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

.eslintrc.json

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

.gitattributes

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
1-
*.sh text eol=lf
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/issue_opened.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,22 @@ on:
55
issues:
66
types: [opened]
77

8+
permissions: {}
89
jobs:
910
automation:
1011
runs-on: ubuntu-latest
1112
steps:
1213
# Add the new issue to a project board, if it needs triage
13-
# See https://github.com/marketplace/actions/create-project-card-action
14-
- name: Add issue to project board
14+
# See https://github.com/actions/add-to-project
15+
- name: Add issue to triage board
1516
# Only add to project board if issue is flagged as "needs triage" or has no labels
1617
# NOTE: By default we flag new issues as "needs triage" in our issue template
1718
if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
18-
uses: technote-space/create-project-card-action@v1
19+
uses: actions/add-to-project@v0.3.0
1920
# Note, the authentication token below is an ORG level Secret.
20-
# It must be created/recreated manually via a personal access token with "public_repo" and "admin:org" permissions
21+
# It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
2122
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token
2223
# This is necessary because the "DSpace Backlog" project is an org level project (i.e. not repo specific)
2324
with:
24-
GITHUB_TOKEN: ${{ secrets.ORG_PROJECT_TOKEN }}
25-
PROJECT: DSpace Backlog
26-
COLUMN: Triage
27-
CHECK_ORG_PROJECT: true
28-
# Ignore errors
29-
continue-on-error: true
25+
github-token: ${{ secrets.TRIAGE_PROJECT_TOKEN }}
26+
project-url: https://github.com/orgs/DSpace/projects/24

.github/disabled-workflows/label_merge_conflicts.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,32 @@ name: Check for merge conflicts
55
# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
66
on:
77
push:
8-
branches:
9-
- main
8+
branches: [ main ]
9+
# So that the `conflict_label_name` is removed if conflicts are resolved,
10+
# we allow this to run for `pull_request_target` so that github secrets are available.
11+
pull_request_target:
12+
types: [ synchronize ]
13+
14+
permissions: {}
1015

1116
jobs:
1217
triage:
18+
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
19+
if: github.repository == 'dspace/dspace-angular'
1320
runs-on: ubuntu-latest
21+
permissions:
22+
pull-requests: write
1423
steps:
15-
# See: https://github.com/mschilde/auto-label-merge-conflicts/
24+
# See: https://github.com/prince-chrismc/label-merge-conflicts-action
1625
- name: Auto-label PRs with merge conflicts
17-
uses: mschilde/auto-label-merge-conflicts@v2.0
26+
uses: prince-chrismc/label-merge-conflicts-action@v2
1827
# Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
1928
# Note, the authentication token is created automatically
2029
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
2130
with:
22-
CONFLICT_LABEL_NAME: 'merge conflict'
23-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24-
# Ignore errors
25-
continue-on-error: true
31+
conflict_label_name: 'merge conflict'
32+
github_token: ${{ secrets.GITHUB_TOKEN }}
33+
conflict_comment: |
34+
Hi @${author},
35+
Conflicts have been detected against the base branch.
36+
Please [resolve these conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) as soon as you can. Thanks!

0 commit comments

Comments
 (0)