From bf531ab3f302fde3e98e232adafa80716f341a63 Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Tue, 25 Jun 2024 08:03:21 +0200 Subject: [PATCH] Customer uk merge dtq-dev after rebase(#643) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * internal/complex-input-type-validation (#137) * Initial commit * Added maximum length in the complex input type. --------- Co-authored-by: MilanMajchrák * internal/search-page-fix-wrong-pr (#140) search-component: missing `clarin-search` * Initial commit * Added maximum length in the complex input type. * Added `clarin-search` component to the search-page --------- Co-authored-by: MilanMajchrák * Search is working - it redirect (#142) Co-authored-by: MilanMajchrák * internal/downloading-bitstreams-by-license-not-work (#144) add email info * Fixed loading the license into selection and fixed assigning wrong license after choosing it. * Fixed sending an email with download link - added email input field. * Removed console log messages. --------- Co-authored-by: MilanMajchrák * enable debug of backend * internal/item-page-lookfeel (#147)changed item page * Trying to compose required information to the item page. * Raw version of the updated item-page. * Fixed ref-box when the item has more authors. * Removed unused files. * Removed logging to the console. * Export new component from the item-page.module * Refactoring - beautify the code * Removed disabled components from the item-page.module * Removed unuseful tests. --------- Co-authored-by: MilanMajchrák * fixed matomo container deployment * custom run (with debug enabled) for dspace container * internal/missing-search-page-paggination (#150) object-list component changed * Fixed search pagination. * Updated object-list was used by more components. Use CLARIN changes only in the search-page. It is separated by the config.id. --------- Co-authored-by: MilanMajchrák * internal/license-selector-not-assignee-license Co-authored-by: MilanMajchrák * migration2clarin7/unfinished-submissions-not-listed (#153) * Show ClarinItemBoxView only in searching, not in the /mydspace page * Updated tombstoned items based on the updated database model. * Updated loading of the dump for the integration tests. * Commented out failing test. * Changed test dump --------- Co-authored-by: MilanMajchrák * migration2clarin7/fix-different-separator-in-crosswalks (#155) * Added validation for the complex input field * Commented out failing test. * Changed test dump --------- Co-authored-by: MilanMajchrák * migration2clarin7/authors-name-surname-autocomplete (#161) * Created clarin-name input field * Suggestions for the author name are showed up * Show author input field which consist of autocomplete and input * Lastname autocomplete add a value into both input fields. * Fixed some graphic and easy issues, failing tests and refactoring * The input fields value wasn't filled in after selecting the option. * Uncomment commented integration tests * Little refactoring and added docs * Changed test dump * Changed IT expected values, just trying. * Changed IT just check it there is two input fields. --------- Co-authored-by: MilanMajchrák * migration2clarin7/license-dropdown-missing-labels-2 (#164) * Trying to create own component for selecting the Clarin License. * The dropdown select is scrollable. * Added default option. * Added searching for the license selector. * Maybe finally I've done that lovely license selector. * Fixed lint error after solving the conflicts. * Refactoring and added docs. * Beautified license selector. --------- Co-authored-by: MilanMajchrák * migration2clarin7/notice-step-is-missing (#159) * Added a new empty notice step. * Set up Notice Step body. * Created a test for the new step * Beautify code * Added integration tests for the Notice Step * Changed dump for test environment. --------- Co-authored-by: MilanMajchrák * 70-FE/license-page-missing-pagination-sorting (#166) * Fixed pagination and added a new search input field for better overview in the licenses. * Fixed tests * Fixed integration tests. --------- Co-authored-by: MilanMajchrák * 11-FE/after-login-show-discojuice (#170) * Make discojuice active on login button * When the user click on the `Local authentication` - redirect him to `/login` page. --------- Co-authored-by: MilanMajchrák * 66-FE/clickable-metadata-item-view (#168) * After clicking on the author the user is redirected into search page with current author. * Some fields are fixed * Added subject and some fields are fixed. * Added author metadata field, the clarin-author-preview component was created and added into clarin-item-box-view.component * Acknowledgement was overlaying the metadata value - fixed * Refacroting and added docs. * Refactored if --------- Co-authored-by: MilanMajchrák * fix target so it matches dspace7 (#175) repoPath already contains hostname and port. use authn/shibboleth instead of shibboleth-login * 103-fe/shibboleth-login-wrong-error-page (#177) * Removed redirecting in the FE - redirecting is made in the BE. * Commented failing test. * Added todo into commented test. * 109-fe/license-label-icons-are-not-seen (#180) * Updated ClarinItemViewBox * Fixed NewHandleComponent tess * Removed unused imports * Fixed search redirection and license icons (#183) * Added encoding if the license name contains the plus character. (#185) * added erase database workflow * redeploy after erase database * Also restart other containers, not just db * Updated css colors. (#196) * 114-fe/cannot-download-item-with-restricted-license (#187) * The user is redirected to the license agreement page * ClarinAuthorization request must be completed * 122-fe/restricted-item-download-issues (#222) * Initial commit * The user metadata value couldn't be seen. * Updated unit test according to new changes. * Just updated the dump. (#224) * Internal/multideploy support (#238) * all done.. but will it work? * fix -p * added multiinstance support * moved to standard port 80 * fixed .env for deployment on dev-5 * use correct version for cli docker * added DSPACE_VER * remove automatic deploy * update erasing database * space issues * renames and redo deploy * redeploy always * set correct instance * correct message * further separation, better comments * get rid of space at end attempt 0 * erase trailing space attempt 1 * erase trailing space attempt 2 * erase trailing space attempt 3 * erase trailing space attempt 4 * fix correct branch in call after erase_db * add redeploy to dev-5 -> curl call to deploy action * forgotten " in github action * correct redeploy branch in github action * 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 * 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](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] * [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: #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](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] * [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: #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] Co-authored-by: Tim Donohue Co-authored-by: Kristof De Langhe Co-authored-by: Giuseppe Digilio Co-authored-by: Yura Bondarenko Co-authored-by: Yana De Pauw Co-authored-by: Alexandre Vryghem Co-authored-by: Cristian Emanuelle Guzmán Suárez Co-authored-by: Nathan Buckingham Co-authored-by: Agustina Martinez Co-authored-by: Davide Negretti Co-authored-by: corrado lombardi Co-authored-by: Marie Verdonck Co-authored-by: Kim Shepherd Co-authored-by: Art Lowel Co-authored-by: Yury Bondarenko Co-authored-by: Koen Pauwels Co-authored-by: Pascal-Nicolas Becker Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alan Orth Co-authored-by: Sascha Szott Co-authored-by: MajoBerger * 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 3f68b7955ccaf6eb722cd225c0bac02a678017af. * 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 --------- Signed-off-by: dependabot[bot] Co-authored-by: Agustina Martinez Co-authored-by: Alexandre Vryghem Co-authored-by: Tim Donohue Co-authored-by: Nathan Buckingham Co-authored-by: Cristian Emanuelle Guzmán Suárez Co-authored-by: Davide Negretti Co-authored-by: Yana De Pauw Co-authored-by: corrado lombardi Co-authored-by: Marie Verdonck Co-authored-by: Kim Shepherd Co-authored-by: Art Lowel Co-authored-by: Yury Bondarenko Co-authored-by: Koen Pauwels Co-authored-by: Giuseppe Digilio Co-authored-by: Pascal-Nicolas Becker Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alan Orth Co-authored-by: Sascha Szott Co-authored-by: MajoBerger Co-authored-by: Kristof De Langhe Co-authored-by: Yura Bondarenko Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com> * tul/merge-into-clarin-dspace (#316) (#317) * tul/merge-into-clarin-dspace (#316) * [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](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] * [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: #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. * Disabled end user agreement page with footer options (#220) * Full customization for TUL (#217) * customize header, footer and homepage * add hover on button and contact us in the footer * add hover for logo and fix UI * transform into valina page and apply the hover style for the link * change search page into Vanila space default * fix exapandable navbar item behaviour * change the background of side admin bar and hide some options of it * replace dspace logo with tul logo * fix gray border of button * add new component for CitacePRO and handle with dynamic data from item object * fix merged issues * make the url as the constant value * hide the clarin license * add description into en.json5 * change the position of the citation and edit test * retrieve the constants from the BE * change the fixed value * calling new API from BE * remove privacy policy in the footer * add new page without content * create content for the contact page and add text in i18n for translation * receive email property from BE and add,fix unit tests * edit the href for contact page * change the fetch address --------- Co-authored-by: HieuHorizonsfl Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com> Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com> * Tul/fixing (#225) * customize header, footer and homepage * add hover on button and contact us in the footer * add hover for logo and fix UI * transform into valina page and apply the hover style for the link * change search page into Vanila space default * fix exapandable navbar item behaviour * change the background of side admin bar and hide some options of it * replace dspace logo with tul logo * fix gray border of button * add new component for CitacePRO and handle with dynamic data from item object * fix merged issues * make the url as the constant value * hide the clarin license * add description into en.json5 * change the position of the citation and edit test * retrieve the constants from the BE * change the fixed value * calling new API from BE * remove privacy policy in the footer * add new page without content * create content for the contact page and add text in i18n for translation * receive email property from BE and add,fix unit tests * edit the href for contact page * change the fetch address --------- Co-authored-by: HieuHorizonsfl Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com> Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com> * Internal/multideploy support 2 (#240) * fixed deployment values for TUL customer * added DSPACE_VER * actually append to the .env file * remove automatic deploy * unify erasing db * fix correct branch in call after erase_db * add redeploy to dev-5 -> curl call to deploy action * forgotten " in github action * correct redeploy branch in github action * trigger docker images on correct branch * added password env var (#258) * added non-amazon params (#261) * Tul/customize fe (#254) * Disabled end user agreement page with footer options * Added padding to icon * If the citacePro properties is not defined in the BE, do not throw the errors * Added dtq sign into footer * Dataquest URL is loaded from the cfg * Load the company name which has customized this DSpace from the cfg * Updated Home News page header * Prettify the code * Update deploy.yml * Update build.yml * Update build.yml * Update docker-compose-ci.yml Updated dump for the integration tests * Added purple into .btn-dark class (#263) * Internal/update and secure docker compose (#269) * added timezone * added IP spec to all open ports on prod docker-composes * removed now-false disclaimer about similarity to backend docker composes * removed redundant host parameter in Dockerfile * changed port on which to expect REST * make envinronment production * revert to serve for now * revert to serve for now * typo * revert run command in dockerfile * no need to run on host 0.0.0.0 * needed due to upgrade to docker compose v2 * tul/login-case-sensitive * port change (so as not to expose 8086) * tul/turn-off-language-translations * Show error message from the error response (#275) * Tul/fix integration tests (#276) * Fixed admin spec IT - TUL doesn't have supported /licenses and /handle * Commented out test class `submission-ui` because it is suitable only for the CLARIN-DSpace * Commented out CLARIN license step for the submission IT * Changed klaro cookies modal styles according to TUL requirements. (#288) * tul/after_test-3-badge-color (#289) * Updated badge color * badge style rule moved for the _clarin-styles.scss * Fixed conflicts * Removed thumbnail message (#290) * tul/after_test-6-underlined-links (#291) * All links are underlined except buttons, facet filters and nav links. * Fixed ugly coflicts * tul/after_test-8-navbar-gasps * Updated topLevelCommunityList pagination (#293) * tul/13-add-czech-language (#272) * Added CLARIN-DSpace-7.2. czech language * Added script to find out which messages must be translated. * Updated czech login message because text was too big * Keep allowed only EN and CZ language * Updated new czech translations * Updated new czech translations * "Sbírka" translated to "Kolekce" * Updated final version of czech translation * Revert "Updated final version of czech translation" This reverts commit 0261c85909c1fa83a9d3faa54f26e64a53232cbb. * Revert "Revert "Updated final version of czech translation"" This reverts commit 644cfaa5fd7e0fde526141ac1827af7f99a80e3b. * Merged customer/TUL files * pretyfied python script file * Tul/13 add czech language (#297) * Added CLARIN-DSpace-7.2. czech language * Added script to find out which messages must be translated. * Updated czech login message because text was too big * Keep allowed only EN and CZ language * Updated new czech translations * Updated new czech translations * "Sbírka" translated to "Kolekce" * Updated final version of czech translation * Revert "Updated final version of czech translation" This reverts commit 0261c85909c1fa83a9d3faa54f26e64a53232cbb. * Revert "Revert "Updated final version of czech translation"" This reverts commit 644cfaa5fd7e0fde526141ac1827af7f99a80e3b. * Merged customer/TUL files * pretyfied python script file * Updated some messages * modified to production config (#296) * added dummy local.cfg and set up docker-compose (#278) * tul/after_test-9-set-up-banner (#294) * Updated topLevelCommunityList pagination * Prepared home-page for a banner * Banner in the top * Refactoring * Updated TUL favicon (#300) * tul/fix-wrong-favicon (#302) * Updated message and favicon icon * trying to fix ssr github action error * Added deleted favicon.ico * revert language changes * revert language changes * revert language changes * Changed Domov message * Removed DSpace Angular :: message * Removed DSpace Angular :: message * Updated prefix DSpace * Customer/tul wrong dockerfile missing pm2 (#304) * added pm2 * forgot pm2, of course * customer/TUL-mount-prod-cfg-2 * 7 pm2 nodes (#313) * 7 pm2 nodes * mistake fix * tul/show-doi (#315) * Show DOI full link in the identifier field in the item view. * Just prettify * Fixed failing test * Just prettify --------- Signed-off-by: dependabot[bot] Co-authored-by: Davide Negretti Co-authored-by: Alexandre Vryghem Co-authored-by: Yana De Pauw Co-authored-by: corrado lombardi Co-authored-by: Tim Donohue Co-authored-by: Marie Verdonck Co-authored-by: Kim Shepherd Co-authored-by: Art Lowel Co-authored-by: Yury Bondarenko Co-authored-by: Nathan Buckingham Co-authored-by: Koen Pauwels Co-authored-by: Giuseppe Digilio Co-authored-by: Agustina Martinez Co-authored-by: Pascal-Nicolas Becker Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cris Co-authored-by: Alan Orth Co-authored-by: Sascha Szott Co-authored-by: MajoBerger Co-authored-by: HieuHorizonsfl Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com> Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com> Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com> * pretiffy commit * Git revert unwanted changes * temp commit * Updated dtq-dev * Fixed removing of empty row * Added forgotten functionalities into clarin merge * Fixed review requirements * removed unwanted tests * Updated help script comment * Updated test image for FE integration tests --------- Signed-off-by: dependabot[bot] Co-authored-by: Davide Negretti Co-authored-by: Alexandre Vryghem Co-authored-by: Yana De Pauw Co-authored-by: corrado lombardi Co-authored-by: Tim Donohue Co-authored-by: Marie Verdonck Co-authored-by: Kim Shepherd Co-authored-by: Art Lowel Co-authored-by: Yury Bondarenko Co-authored-by: Nathan Buckingham Co-authored-by: Koen Pauwels Co-authored-by: Giuseppe Digilio Co-authored-by: Agustina Martinez Co-authored-by: Pascal-Nicolas Becker Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: cris Co-authored-by: Alan Orth Co-authored-by: Sascha Szott Co-authored-by: MajoBerger Co-authored-by: HieuHorizonsfl Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com> Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com> Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com> * ufal/some-messages-are-missing (#328) * Added missing item-view-box messages. * Added commented english messages. * new project issue assign * After click on Item link you won't be redirected to handle url. (#331) * ufal/fe-date-is-not-showed-in-the-item-view * ufal/update-index-for-language (#340) * Updated language in the item view * Fixed language facet in the search * changed entrypoint for dspace angular container (#343) * store logs in volume (#336) * enable deployment of clarin * internal/fe-redirect-user-after-local-login (#341) * The redirectUrl is passed from the discojuice login into state.redirectUrl * Prettifying the code * fix deployment (#346) * correct tag (#347) * correct BE port * correct REST port for deployment * ufal/fe-show-login-modal-no-redirect (#344) * The redirectUrl is passed from the discojuice login into state.redirectUrl * Prettifying the code * Show discojuice on login page * Refactoring * Discojuice after click on close the use won't be redirected to the home page. * Fixed failing tests * Added accidentally removed timeout. * Fixed merge conflict * Fixed lint error * modify expected .env and docker composes (#349) * Update docker.yml * Update deploy.yml * ufal/fe-license-has-only-one-type * The Item type is fetched from the `metashare.ResourceInfo#ContentInfo.mediaType` metadata * Removed unwanted change * fix escaped variables in deploy * correct version of images * correct deploy port for FE * added anonymous caching for frontend (#364) * added anonymous caching for frontend * newlineeee * srsly * ufal/fe-22-54-download-preview-item (#362) * create new component and add model file and service file * build the user interface and calling the api from backend * add logic for handling data from BE and refactor the UI * fix the lint error and fix the collapse/hide behaviour * add UI for download buttons and fix UI for the ZIP Preview * getting data from backend and make the download feature * handle with the dynamic input * fix the collapese/hide behaviour and handle more cases * add more conditions for checking permission to preview and download files * fix lint error * fix failed test * Lock/download preview (#311) * create new component and add model file and service file * build the user interface and calling the api from backend * add logic for handling data from BE and refactor the UI * fix the lint error and fix the collapse/hide behaviour --------- Co-authored-by: HuynhKhoa1601 * Resolved conflicts * Revert unnecessary changes * Refactoring and removed font awesome loading from node modules * Updated preview file box look and feel * Fixed file preview icons * Fixed html preview scrolling * Show scrollbar in txt preview * Some refactoring * Refactoring and the dspace BE is loaded from configuration property. * Added messages * Fixed tests * Added download buttons and fixed downloading * Added messages * Added image to the assetstore instead of url from lindat --------- Co-authored-by: HuynhKhoa1601 * ufal/fe-assetstore-files-are-not-loaded (#371) * Redirection was broken after updating the namespace. The redirection links was changed from `href` to `routerLink` * Fixed test * Fixed test * namespace could be empty * ufal/fe-cannot-load-license-images-on-the-first-load (#373) * The license labels are loaded in the same way than in the clarin item view box. * Fixed failing unit test * Update Dockerfile Increase network timeout * docker/build-push-action@v3 to v4 * Update Dockerfile * updated node to version 18:18 and generated a new yarn.lock file * build images on dev-5 * internal/ngx-mask-update-fix (#375) * ngx-mask library made an update and it destroyed project build * Downgraded @yarnpkg/parsers to version 3.0.0-rc.32 because node v16 cannot run * Update docker.yml * Update erase_db.yml Enabled redeploy * internal/fe-redirection-from-where-login-was-initiated-still-not-working-properly * ufal/fe-license-static-pages-are-missing (#380) * Added static files and redirection * Html content is loaded from the static file and rendered in the component. * The html file content is showed in the `static/` route with the error page. The translation works. * Created routing for the `licenses` page and changed administrator license table to `licenses/manage-table` path * Show all licenses data. * All licenses are filtered by license label - PUB, ACA, RES * Added loading bar * Added redirect from license selector * Fixed tests. * Refactoring * Fixed lint error - unused import * Added docs and translations. * Removed accidentally added semicolon. * Added simple test if the html file content will be loaded. * ufal/ref-box-content-is-not-immediately-copied * ufal/fe-bottom-menu-during-submission-creation-must-be-fixed * ufal/fe-remove-grid-option-in-the-search-page (#386) * Removed Grid view from the initial viewModeList * Fixed failing test on clarin all licenses page. * add sample file to assetstore on every deploy * ufal/fe-update-vanilla-table-item-versions * Updated item versions table and defined translations. * Removed test of removed columns * Versions temp commit * All versions are shown * Show all versions from metadata * Added docs and comments. * The user is redirected to the right download page after clicking on `Download file` button. * ufal/there-is-static-source-in-html-preview * turn off S3 * [devOps] create new dspace instance with imported data * ufal/fe-history-table-is-still-seen (#392) * The version table is hidden if the item doesn't have any versions and the name is of the version is properly loaded. * Undo unwanted changes. * [devOps] enable reusing, multiple instances * debug and fix deploy and import * linux, not windows * [devOps] import/erase/deploy workflows refactored * [devOps] import/erase workflows * [devOps] import/erase workflows * [devOps] import/erase workflows * [devOps] import/erase workflows * use composite actions instead of reusable workflows * [devOps] using composite * [devOps] using composite * [devOps] using composite * [devOps] using composite * Update deploy.yml, increase timeout * Update deploy.yml * fix deploy to respect "import" switch * ufal/downloading-restricted-bitstreams-not-working-properly (#393) * Get redirect from previous page. * The user is redirected to the downloading of the bitstream after login. * Show right breadcrumbs during downloading the bitstream * The user is redirected to the zip download page. * The auth token is send in the file download link. * Added default tests * Fixed typo and checked that url won't be broken in two places. * by default only deploy to INSTANCE=5 * give more time for postgres init * add even more time * Update action.yml (#405) Run import from main branch * ufal/fe-update-json-messages Added missing tranlates and updated messages after running the script * ufal/fe-initiated-login-not-redirecting-from-collection Redirect to login with `redirectUrl` param because it is lost after click on `local` login button. (#404) * [devOps] add dspace commands after import * ufal/fe-add-default-static-pages (#406) * Added static pages from the lindat git * Fixed redirection and created safeHtml pipe. * Could redirect out of namespace url, small refactoring. * Updated tests. * Added images into the static pages. * ufal/fe-shibboleth-validate-emails * Encoded query params (#407) * placeholder configs to be mounted into docker * change entrypoint so that containers has less logs and restarts (#412) * ufal/fe-get-user-ip-address (#420) * The clients IP address is fetched from the BE API. * Replace LegacyBitstreamUrlResolver by BitstreamBreadcrumbResolver because the first one throws errors to the console. * ufal/fe-fix-static-page-redirect (#421) * Fixed static page redirects. * Refactored processing links. * ufal/fe-download-bitstream-back-to-item (#423) * Separated toggling of DiscoJuice popup from the workign with redirect URL * The downloading page is loaded before downloading. * Login redirect works. * Removed storing cookies in the aai.js * ufal/fe-oversized-file-upload-message (#424) * If the file exceeds the upload max file size the uploading will be stopped before starting and the user will see proper error message. * Fixed unit tests - added configurationDataService * ufal/fe-item-view-license-box (#427) * Do not show licenses if the Item doesn't have any file. * ufal/fe-email-restricted-download (#430) * ClarinAuthorization passed, but vanilla not because of vanilla check - I added dtoken into vanilla authorization url and because of that the vanilla authorization will be passed. * Added message for the expiration token message - it was hardcoded. * ufal/fe-not-show-shib-welcome-page * Loaded property from the cfg and check if the page with idp attributes could be showed up. If not redirect the user to the home page. (#431) * ufal/fe-s3-customization (#428) * The admin could see in the bitstream admin UI if the bitstream is stored in both storages (S3, local). * Fixed failing unit test - updated columnSizes object * ufal/curate-translation-missing Added curate collection edit translation and curation task name. (#434) * ufal/upload-on-first-attempt-fix (#435) * Moved file size limit into FileUploader options and handled Upload cancelation. * Check that uploading is successful * ufal/fe-show-checksum-result (#432) * BitstreamChecksum values are fetched and parsed from the BE * Checksum info is showed up. * Added messages and translations. * Added docs and refactored code * Fixed failing tests * Fixed wrong czech translations. * ufal/shibboleth-redirect-from-login (#433) * Send redirectUrl param to the IdP in the target url * The code is updated to be more readable. * internal/increase-server-memory-limit (#411) * Update docker-compose-rest.yml Increase memory limit to 4GB * Load JAVA_OPTS from the .env file. * ufal/shibboleth-encode-redirecturl (#438) * Compose redirectURL if the redirection is initiated from the login page and encode that URL because server cannot process decoded URL. * Removed unused getCookie method. * Updated if condition - it was made more readable * Avoid accessing an out-of-bounds index in the split question marks array. * internal/docker-remove-orphans (#439) * Removed --remove-orphans flag because it doesn't have any effect. * internal/update-config * Copied missing parts from TUL:config/config.yml (#441) * internal/fe-upgrade-clarin-dspace-7.6 (#450) * Fix accessibility of date sliders by adding aria-labels (cherry picked from commit 2a881791ba76091d2f85d0b068f926043ef33bc9) * Minor fixes to cypress tests (cherry picked from commit 70a7bbe3cbdd24abaf7f6f791ef60e88a3ae8922) * Fix heading order accessibility issue in search filters/facets (cherry picked from commit 276d80895e38225fcbde38cab01d79cd31a34e9b) * Spanish translation updated to 7.6 (cherry picked from commit 4cc4192e93aea3eb7dddc8486fe1fad35b6103bc) * Some lint errors fixed (cherry picked from commit 1885638ba6fadca4c99043db4ce52646bce435a3) * 🐛 fix when navbar expands on firefox (cherry picked from commit 60706720e47abc19b7528719e63676b9b5fa50be) * 🐛 Fix Value of dropdown changes automatically on item submission page (cherry picked from commit 651305952d706f6c45eb47ff37dfb94f91979760) * ✅change test event, click by mousedown on dynamic-scrollable-dropdown.component.spec.ts (cherry picked from commit 25479e17942bbd23e56a5f5a479d2e0dcc798087) * config/config.example.yml: fix example syntax As of DSpace Angular 7.2 the syntax has changed from TypeScript to YAML. (cherry picked from commit 9e46b5310b5038fb3433db2bdd829d48c8107a70) * Fix VocabularyTreeview not updating + i18n for nsi (cherry picked from commit b5a70e8f95d1046bed0e33d5b0bdc8109d645676) * 104189: Allow CSV export on related entity search (cherry picked from commit cac1407f08290adbc1a827fb1769011d3ecba803) * 104189: CSV export add fixedFilter (cherry picked from commit 45ad5f73168ccdf3d4f7ab617d44a0e28c94545a) * Minor pt-PT translation fixes (cherry picked from commit a6c1120700398fb0cf99ffd6e1a7ff52e5858a40) * remove redundant cache default values from server.ts (cherry picked from commit e53abcb69ea3d26461c24bd67894b7de1104a8cb) * 🚸remove thumbnail from file-upload section and show bitstream format and checksum (cherry picked from commit 4c8ec8a4f22fcc4930b898581de098e317e08b5d) * 🎨revert unnecessary format (cherry picked from commit 13e4052c4da07014a1c01087bfc6d293a8bb71c5) * Update workspaceitem-section-upload-file.model.ts Fix code comment (cherry picked from commit 01c8a4d9c3347cb5b30d4d912a3f7e18b81f989a) * ♻️ refactor chain of observables to avoid async issues (cherry picked from commit 2dc9fd44d7e151f7e96bff16665edf0a09226249) * 🐛 fix bug of caching when add new schema (cherry picked from commit 9fb9e5848c70274b7917bead52643e3611308174) * 🎨 revert format (cherry picked from commit 3e5524de69fa09808e3a7d0ab4042e5e3ffc98e0) * Fix innerText still being undefined in ssr mode * Correct text of help info on edit group page (cherry picked from commit 49247430e50a708996bef1790c7cc2af2271113a) * Graceful shutdown on SIGINT (e.g. from 'pm2 stop'). (cherry picked from commit 6709c3bb5ffe4f4c056debb1295ce499a6ea6932) * Properly await termination. (cherry picked from commit 4449737aed9b96c13ba6a34e2ff72feb1aaebe92) * Document a modified method as required by PR guidelines. (cherry picked from commit bf9b2b82e1d1d6cd7a901b674d8df92af073794c) * 106974: Angular SSR menu issues * src/app/shared/search: don't capitalize metadata values Don't capitalize metadata values for display purposes. * fix issue where more than one api call was made on every route change * fix issue where invalidateRootCache didn't happen when the page first loaded * remove obsolete label element in metadata-schema.component.html (cherry picked from commit 6847c30e582773b492747dc5dc88d4406f003a91) * removed trailing whitespaces as suggested by reviewer (cherry picked from commit 43f19e7d918d0457184160744e9f781db9cd491c) * [Port dspace-7_x] Update fi.json5 (#2516) * Update fi.json5 Two last translations to the Finnish file. (cherry picked from commit c3a908bccb5ebb52c08c57efd7d02c91e0e5de02) * Fix routes not working with baseHref (cherry picked from commit 18febff7a6c8e92d3d30016e6a4d93f7fe521dd0) * [Port dspace-7_x] Serbian (Latin) translation (#2520) * Serbian (latin) translation added. --------- Co-authored-by: imilos * [Port dspace-7_x] Fix missing or wrong Italian translations (#2522) [DURACOM-184] fix missing or wrong Italian translations --------- Co-authored-by: Andrea Barbasso <´andrea.barbasso@4science.com´> * fix dev mode issue where retrieving the login options fails * roll back unintended change to the responseMsToLive for RootDataservice * [DURACOM-185] Fix pointer on language dropdown menu (cherry picked from commit 6b5708cffda28620460f33ddc4fbf58ad9c6cb1d) * Move subscription button to DSO edit menu (cherry picked from commit c9558167b2dc2df22428b8d1fcfbd9b77e4b855e) * Update DSO edit menu resolver tests - Abstract away the different "subsections" ~ DSO type (the tests should not care about this) Instead, retrieve sections of interest by ID & assert whether they're there & how they should look - Test separately for Communities, Collections & Items - Test newly added menu section (cherry picked from commit 18b7a9c7de6e399d5ed27ff22caa082ab7e8ef2a) * Issue#2535: Hide add more button in submission if no disabled sections * translate community as 'Bereich' in de.json5 (cherry picked from commit 0139670371ffd7d8530f3d93ce9f120bc687433c) * Fix browse by visual bug (cherry picked from commit d0b4e15db42298aec6803d640916c951b97eab55) * Bump postcss from 8.4.23 to 8.4.31 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.23 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.23...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] (cherry picked from commit 3c5079e9ce9dcadcc1fc99bfd872b65ffbe336f0) * check cssRules existence before css variables are get from stylesheet (cherry picked from commit 367cda2de02f7524465dccc112438c57dce5cafe) * checkstyle remove unused extra lines (cherry picked from commit 5f8a9dea34159fc1e7f067b1bbcb5dabc6bf4145) * 107664: Normalized ePerson & group edit url and moved error message to translation file * Bump @babel/traverse from 7.21.4 to 7.23.2 Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.4 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] (cherry picked from commit 97f7a5e82aa30a41d64974fe4c553bd3358dc6b1) * Revert "Check cssRules before css variables are read from stylesheet (#2454)" This reverts commit fa79c358c09cb52ed142ef122e08b77de880685d. (cherry picked from commit 6f73b65d530ad8d2e8297af179e111f401823bce) * Update email-request-copy.component.html Message is optional: remove req in [disabled] (cherry picked from commit 94c756d52dfedbae470cbb5febab84c69da743cd) * Fix RequestService test failing because of different lastUpdated time (cherry picked from commit fb315335c90a0e2dde367e473a2e73729fedc429) * Use gap instead of individual paddings for header icons (cherry picked from commit 9f2a1d048bd3a9a413cc15492ce6bbf6c4dd65b2) * Themed LangSwitchComponent (cherry picked from commit f9b4460e70d21de0e82ee272492d0bd5c1d653a3) * Applied same gap between header icons in the dspace theme and made the search field non-focusable when collapsed (cherry picked from commit 58d31dd73f9762a341e774df261d909d97c4b3e2) * Fixed invalid html structure the ExpandableNavbarSectionComponent had an ul tag containing non-li tags (cherry picked from commit fa56d5dfb719c14d99080ef8fe208b5ee129c72f) * Added Serbian cyrilic translation and corrected Serbian latin translation. (cherry picked from commit ad12e5a7f2c72dfed5dd0b2e3e12d0b9c7457874) * Added Serbian cyrilic translation and corrected Serbian latin translation. (cherry picked from commit aa9e12dcfe10fab31d9fcc9f96088ccf31f8e843) * Merge branch 'fix-display-order-authentication-methods_contribute-7.4' into fix-display-order-authentication-methods_contribute-7.6 * Added themed-user-menu component. * Corrected missing semicolon. * Replaced tags for ds-user-menu. * Included user-menu component in custom theme. * Removed default value from inExpandableNavbar. * [DURACOM-190] Fix i18n labels in vocabulary-treeview (cherry picked from commit b321d6f72778aef9c47901f13c2e99195aea8530) * [DURACOM-190] Fix alignment in vocabulary-treeview (cherry picked from commit feb2b2be53272cae025f7e02ad9c6a30728ed0d2) * allow to insert multi-line scope notes in MD field registry (cherry picked from commit 5bc5dd859e18a601c6eadf9e2c3496b1fb8b4589) * Added support for changing the color of the navbar (cherry picked from commit f6649e1c3861012d388ec4d7bf46a54e84fb9962) * Fixed header bg color not being set in default (no) theme (cherry picked from commit 14b1ce5e50f819e1f7b555f205cef8c9b7aee6d8) * Fixed breadcrumb padding using incorrect syntax (cherry picked from commit 6c48238fa2d42d3b278741b23e8bd123237e16a1) * Added new variables for the expandable navbar section (cherry picked from commit 2ca2a3881f701b7668258c8607e1180ebfeb9828) * New themed components & minor CSS fixes (#2442) * 100839: Created themeable BrowseByComponent * 100839: Added themed BrowseByComponent to custom theme * 100839: Added themed BrowseEntryListElementComponent to custom theme * Added PersonComponent to custom theme * Themed LogInComponent * Fix focus on navbar using different color * Fix ccLicense checkbox margin * Fix long search facets name not displaying correctly * Removed RecentItemListComponent's unnecessary float causing alignment issues when adding components underneath it * Themed RegisterEmailFormComponent * more error-prone check of cssRules existence before css variables are get from stylesheet check the existence off cssRules property before the variables are readed from this stylesheet https://github.com/DSpace/dspace-angular/issues/2450 (cherry picked from commit 4dd334f2e76adfabb972095acc80a391c6c91b38) * fix(pt-BR.json5): fix and update the language file Fix and update the pt-BR language file * fix(pt-BR.json5): fix and update the language file and previous errors Fix and update the pt-BR language file and the previous errors * Merged in DSC-106 (pull request #643) [DSC-106] Date input usable via keyboard using tab Approved-by: Vincenzo Mecca (cherry picked from commit 543b4ad576b740b27ecf7b3bfc607f021bde1494) * [DURACOM-194] fixed year input value on input type date (cherry picked from commit c412c1fa13b30ac5140259ff2542a60e8646382e) * Ensure e2e tests run in production mode (cherry picked from commit 7dcaae846547a48bf1cbe1fe4241ac661e20d71f) * Specify user agent to avoid being detected as a "bot" by backend (cherry picked from commit 72cda4173124c2d2b3125e4cfed106338dc70ad9) * [DURACOM-177] gap-* classes (cherry picked from commit 930a381e4a6beda611a87510e5b76a94d1c4c9af) * [DURACOM-177] Use gap-* classes on navbar buttons (cherry picked from commit a35629536e70f8d4b691fa95fd0b8342a8d717a1) * [DURACOM-197] Fix cache issue when depositing a submission (cherry picked from commit f992ff66713ea820e47cb44a28b5fd612d64fae2) * Add UI nameSpace context path to Mirador viewer path (cherry picked from commit 3228c457a33710354c85b92efad5f6945af66e58) * 108055: fix issue 8686: unable to enter freetext values in the submission form for vocabulary (cherry picked from commit 0dcf6cb8855cc5c74f781fd7490f2daaeea29092) * 108055: add user input to tag list (cherry picked from commit aac58e612d7fb01f87dc7a6a46b92c9c4c2fe685) * Support type-bind of elements based on repeatable list type-bound element (CHECKBOX_GROUP) (cherry picked from commit 09aaa46875146081cf812ed6f904178740ae8d30) * [DURACOM-195] Simplify vertical spacing in header and breadcrumbs (cherry picked from commit a3e6d9b09a2d6e529dc28f7d1a1924b2830077e6) * [DURACOM-180] Prevent header from covering media viewer controls (dspace theme) (cherry picked from commit 0208a784378bf3f6226e6d9020523ae0fd38f9b4) * [DURACOM-180] Prevent header from covering media viewer controls (base theme) (cherry picked from commit c042cd8d1154af59310b162c9a97e7d3820a1592) * Update condition to render show more node `loadingNode` ends up being the current `node` after clicking it preventing it from rendering when more pages available. Update community list component spec Make the show more flat node id unique The nodes with same id are conflicting when added to the tree. Clicking on the second with same id places the show more button under the wrong branch and expands the wrong page. (cherry picked from commit 11d3771e72e3f54f73bb60a23abd970eff5d66a3) * Filter expanded nodes by id Co-Authored-By: Art Lowel <1567693+artlowel@users.noreply.github.com> (cherry picked from commit dc2ef989e612c305ae98932be491db15a1fc74a4) * Added skip to main content button * Limit getMembers() and getSubgroups() to only fetching one object. These lists are only used to find the size of each (cherry picked from commit 0da7c15f2eff6229caafccae1be8dd7b10ebc629) * Remove isSubgroupOfGroup() functionality as it loads every subgroup at once. Bad peformance for large groups (cherry picked from commit 97479a29453eaf18031e095b612c1c054f9bb31f) * Fix bug where linked Community/Collection info was sometimes listed many times in a row (cherry picked from commit 229236634a06f5468dc078eb5d814981ecf3d497) * Remove "isMemberOfGroup()" from members-list component. (cherry picked from commit 43d37196fbaf45648dbd5e604a3ee8d5df2a129e) * Remove unnecessary EpersonDtoModel. Rework code and tests to use EPerson instead. (cherry picked from commit bffae54b10ea7a4c883cb25512f9c9ac4949f97a) * Also remove unnecessary EpersonDtoModel from extending ReviewersListComponent. Remove "memberOfGroup" from EpersonDtoModel as it is no longer used (cherry picked from commit b598f1b5ca9b54c4b5fe23daa3d7b502ee0dc6b2) * Fix subgroups-list specs so they align with new members-list specs (cherry picked from commit 64f968b246774140b2e3d4f134be7608ab7a6207) * Refactor members-list and subgroups-list components to use new isNotMemberOf endpoints (via services) (cherry picked from commit 8a10888d2ad7916570472173070370da61320a72) * Refactor subgroups-list component's "search()" to act same as member-list component's "search()". Avoids reloading the page as frequently. (cherry picked from commit 2eb1a17e4e0fd0eb6a13f30c6f8b847f6d9d7a89) * Remove seemingly unnecessary page reload after new search. (cherry picked from commit d163db13f219ab81ca821e1695a2193edb38c79a) * Address feedback. Run empty search on init. Reorder sections to list current members before add members (for both eperson and groups) (cherry picked from commit 9117ac005f575277bf2e025d18afb878d18b0589) * Bump axios from 0.27.2 to 1.6.0 Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] (cherry picked from commit ef9f31d3c612b5aa93a9f8950888bd034ad03d01) * 108045: Fix for repeatable date field labels * Fixed test * Fix handle redirect not working with custom nameSpace (cherry picked from commit b894dce3b0d4e98c7859efe40a1112bbb3265538) * adding new access-status-list-element-badge css classes (cherry picked from commit e847e4ef51aab604d1d07b79860003551eafe467) * Create new access-status-badge.component.scss (cherry picked from commit 3bf2eb1997aff92abc9bb7f642d5e7c77866d552) * new accessStatusClass atribute (cherry picked from commit 6378dbec4afc635a3e3e3dc37f573122a5097746) * remove replaceAll and use an object property (cherry picked from commit c7eae9242a69cb9a598c2a55843dda72f5125ca5) * adding ngOnDestroy for dealing with unsubscribe (cherry picked from commit 75b788d05b819715feefc31e645d97368ae63054) * 107671: Fix handle theme not working with canonical prefix https://hdl.handle.net/ (cherry picked from commit a7faf7d449a44ce793bfe4b72cf7b377445ae181) * 107671: Split Theme model & ThemeConfig classes in separate files to prevent circular dependencies (cherry picked from commit da8880e5ba4ca1bff5936618391d14ce9a8d6153) * 107671: Fixed bug where config property would still sometimes be undefined whey calling the ngOnDestroy in the ThemedComponent (cherry picked from commit 4e54cca6004e0e28d532c175ac29895fe7e7c0db) * 107671: Fixed theme matching by handle not working in production mode (cherry picked from commit 7529ed8b350878bda844138a3c78a6587a3034a9) * [DURACOM-202] feature: item edit pages are accessible by administrator (cherry picked from commit ccf1cc45473a8a92d117215adc0eb650a27d6d77) * [DURACOM-202] refactor: code (cherry picked from commit b6d515ff09011d6ceef358c6836f2616cc059657) * [DURACOM-202] refactor: code (cherry picked from commit 6f64db1645623d9ac735ccab107439c77cc9969f) * fix: random order of buttons in status tab (cherry picked from commit 35f8b55f588985146482313a6ebad80154b6edbd) * refactor: code (cherry picked from commit fbbbc18844b44f6f56b7c5f1f5e07e4886877d20) * 107685: menu-component re-render section on store update * 107902: Created test case for 2f26e686cc * Update version tag for release * Fixed lint errors * Fixed compilation errors which were created by mistakes from upgrade * Fixed wrong resolved conlicts for test files and copied yarn.lock from the dspace761 image * Update charts, toggle dependencies in the package.json * updated yarn.lock - from 7.6.1 and run yarn install * Revert "updated yarn.lock - from 7.6.1 and run yarn install" This reverts commit 2dabb7176beb17d2bfb986769125f0c47d708402. * updated yarn.lock - from 7.6.1 and run yarn install * Fixed lint errors * Fixed semicolon lint error. * update clarin item statistics * After deleting `.browserlistrc` the errors are gone.. that file is totally empty, it isn't into Vanilla 7.6. and makes me so many problems.. https://github.com/ReactiveX/rxjs/discussions/5976 * Fixed clarin-zip-download-page.component.spec.ts tests - if payload was null it throws an error * Fixed section-form.component.spec.ts tests - delay was missing in tests and some duplicate of the code has occurred. * Checkout vocabulary-treeview.component.html file because it was removed during resolving conflicts. * Updated router.mock.ts - one method was missing from clarin routerstub * Fixed log-in-password.component.spec.ts - authService was used in the wrong way * Removed set timeout in tests `section-form.component.spec.ts` * Removed duplicate cypress config file * Updated complex input field test * spy on reinitializeForm method * Fixed warn in the `bypassSecurityTrustResourceUrl` when the url contains `undefined` * Removed `id` - it doesn't help in the failing tests. * Commented out failing tests. * Renamed integration test names following a new cypress version. * WorkspaceitemsEditPage resolver was missing. * Removed green line from the navbar. * Fixed crossing home page into nav and footer. * Fixed home page to the navbar and footer * Added missing messages into en.json * `my-cs` main content must be used, I updated margin of home page * Updated padding between language flags * Show license type in the default grey color in the item view box * Updated license selector padding and colors * Do not show empty item type box in the item view box * The sponsor values are showed in the Item View. * Added unit tests for testing showing of the Acknowledgement * Added messages for the acknowledgement component. * Fixed lint errors from the `cs.json5` * Added translate module into clarin-sponsor-item-field.component.spec.ts because it was missing * Updated IT database dump - a DB was updated by Vanilla * Fixed `collection-statistics.cy.ts` test, it wanted to see `menu` option which was removed in the CLARIN-DSpace update. * Call index-discovery in the docker-compose-ci.yml instead of `cli.assetstore.yml` because it is not run from the `cli.assetstore.yml` * Commented out the `login-modal.cy.ts` because the CLARIN-DSpace has different login * Commented out the accessibility violations in the `my-dspace.cy.ts` * Fixed calling indexing of the solr * Commented community statistics menu from the `community-statistics.cy` integration test * Commented out the search navbar tests * Login and language flags was covered by the menu navbar - I updated z-index * Commented out item-page accessibility tests * Updated submission.cy.ts process - license granting * Commented out the item statistics menu test * Commented out the accessibility tests * Added missing .env properties into `cypress` * Fixed failing IT --------- Co-authored-by: Tim Donohue Co-authored-by: Sergio Fernández Celorio Co-authored-by: Hugo Dominguez Co-authored-by: Alan Orth Co-authored-by: Nona Luypaert Co-authored-by: Kristof De Langhe Co-authored-by: José Carvalho Co-authored-by: Sascha Szott Co-authored-by: Alexandre Vryghem Co-authored-by: Mark H. Wood Co-authored-by: Yana De Pauw Co-authored-by: Art Lowel Co-authored-by: DSpace Bot <68393067+dspace-bot@users.noreply.github.com> Co-authored-by: Hrafn Malmquist Co-authored-by: imilos Co-authored-by: Andrea Barbasso <´andrea.barbasso@4science.com´> Co-authored-by: Davide Negretti Co-authored-by: Yury Bondarenko Co-authored-by: Marie Verdonck Co-authored-by: Janne Jensen Co-authored-by: Pascal-Nicolas Becker Co-authored-by: Jens Vannerum Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gantner, Florian Klaus Co-authored-by: Agustina Martinez Co-authored-by: Eike Martin Löhden Co-authored-by: Marco Aurelio Cardoso Co-authored-by: Alisa Ismailati Co-authored-by: Alisa Ismailati Co-authored-by: Giuseppe Digilio Co-authored-by: William Welling Co-authored-by: Andreas Mahnke Co-authored-by: lotte Co-authored-by: Paulo Graça Co-authored-by: Vlad Nouski * Update docker.yml (#452) It was run only for `dspace` repository * The BE was started without instance (#453) * Copying of solr configs were missing from the docker-compose-rest (#454) * configured path (#455) try to append server/ to test gh action * Internal/run container in production mode (#456) * Added NODE_ENV=production because the container is trying to run in development mode * Use Vanilla dspace-ui.json instead of ours from root. * Updated path for running `dspace-ui.json` * Use ENV - production in the dspace-ui.json (#457) * The docker-compose-rest has defined network which is not the same like in the cli.yml - it throws an error (#458) * Update deploy.yml (#459) Allowed S3 * Update deploy.yml (#461) Use .env file from the dev5 instead of createing a new one in the github action * Update deploy.yml (#462) Working directory was missing * ufal/cannot-login-after-upgrade Merge pull request #2731 from DSpace/backport-2670-to-main (#512) [Port main] Ensure HALEndpointService doesn't use stale responses Co-authored-by: Tim Donohue * ufal/cannot-load-user-metadata Added searchData because it was null (#514) * ufal/license-agreement-multiple-records (#516) * Load required input fields only if are loaded user metadata or the user is anonymous * Added ID into ClarinUserRegistration model * Added a search method in the userMetadataService * The filtered user metadata are loaded from the BE * internal/update-deploy-s3-props (#448) * Update deploying customer/uk - there weren't right S3 properties. * ufal/discojuice-not-popped-up (#515) * Use cookie to popup discojuice login. * Added Cookie Service into tests * Close discojuice if it is popped up * Do not import commands in the constants file. * commands must be imported in the e2e.ts * ufal/search-page-without-results (#517) * Use ClarinSearch instead of Vanilla one - updated themed component * Added updates from the vanilla upgrade into clarin-search.component.ts * Removed empty my-dspace file * Maybe IT will be passed with vanilla search component * Fixed my-dspace integration tests, they failed because the clarin-search was filtering only Items and integration tests exceted publication and other types * Do not close discojuice login if it is not popped up * internal/fix-deploy-s3-props * ufal/s3-checksum-improvements (#518) * Do not compute checksum on null object.. * The checksum is computed only after the download button is clicked. * Added tests to check the checksum won't be loaded on init * Fixed accidentally updated message key * add information about modified entrypoint (#520) * add information about modified entrypoint * accept jm's suggestion Co-authored-by: Jozef Misutka <332350+vidiecan@users.noreply.github.com> --------- Co-authored-by: Jozef Misutka <332350+vidiecan@users.noreply.github.com> * correct branches for main gh actions * Internal/rework actions (#523) * no longer needed gh action * deploy after images not working * five is five! * corrected indent * removed unused action * is it plane? is it duck? is it string? * same repo needs other syntax? * run, not runs * this if is wrong * just inputs, not github.event.inputs * correct inputs to gh actions * full build and fixed deploy.yml * last polish * final v2 * ipranges must also be separated by instance number (#522) * internal/discojuice-missing-port Do not ignore port when connecting to Shibboleth.SSO (#524) * make deploy action work (#525) * Fix erase options on deploy (#526) * condify the erase_db * remove wrong comment * remove useless line * rm unused import action (#527) * add version to FE + improve build action (#528) * python script for version * reworked build * correct dependency on deploy job * tmp different branch * correct tmp different branch * correct tmp different branch as well * merge-ready branches * formatting * longer deploy limit * Fix all mistakes in the /home page (#529) * Fix Catalogue message in the header navbar to Catalog * The Lindat icon in the header must be stored in our assets, not from the current lindat page * Do not redirect to /home page after click on lindat icon in the navbar * Downloaded clarin icons instead of fetching them from lindat page. Changed routerLink to absolute https://lindat.mff.cuni.cz/ path. * The user is redirected to the search page after click on Enter - only if there is some value in the input. * After click on Lindat icon on the navbar menu the user will be redirected into /home page for better develoment using * Override the search classes for the home page from the global styles because ::ng-deep is deprecated * Our custom search is replaced by vanilla search component * Added `Description` translation into clarin-item-box-view.component * The item name should be underscored in the item-view-box.component * The space should not be in the author string before `;` separator * Show correct message if the item contains one file. * Added `and` translation into authors in the item-view-box.component * Added `Show everyone` translation into authors in the item-view-box.component * Do not cut links in the fast search in the home page * Updated fast search links to be correctly responsive * Removed unused css class * Added `... View More` browsing filter button * Do not redirect to home page after click on `Please help, I cannot find my provider` in the discojuice * Added RSS feed button to the home page * Show image for every item type in the item view box * Do not overlay text on the item type icon * View More message in the fast search should be in the new row * Item view box already show more than 20 files info * Fixed linting mistake - import breadcrumbs * wrongly commited file * introduce release pipeline add run link to VERSION_D.html comment sourceversion script so that future programmers hate me less add tag-release workflow correct old mistakes that were found underway * add necessary attribute to release-action * warning comment for erase-db action * correct support images while testing (solr) (#534) only solr was changed, since PG remains the original one, as is the case on upstream INSTANCE was added so that cli connects to the correct DB * fix ipranges in docker composes (#536) removed redundant network spec, added config from upstream * Create create_bitstreams.yml * fix a bad save * Fixed all mistakes in the Item View page (#532) * Redirect the user to the new browser page after click on featured service. * Show dropdown options in the featured services button - it was not working * Added the copy button into metadata field row. * Added missing Demo Uri metadata field * The referenced by is a hyperlink, the translations was added and fixed overlaying of big cz translation. * Replaced unwanted separator values in the Size metadata field. I've created a new pipe - dsReplaced * Updated messages for the full item page redirect * Updated metadata field translations * Show cursor on hover in the author preview component * Show handle and DOI identifier following the cfg. * Show different date messages in special occurrences * Show description with line breaks and redirection links. * Updated language and other metadata spacing with separator. * Added citation type to the bottom of the citation box. * Ref box should have full width * Fixed big spacing between metadata fields. It was because of d-inline-flex. * The full item view page looks almost the same as in the v5. * Make metadata values in the full item page clickable when there is a link and remove the separator `;` from the medata value. * Show language info only for admin * Added icons for every mimetype, that icon is showed up in the bitstream file box. * Collection component is aligned to other metadata values. * License info is different for CZ language and EN * Update button and form colors * Featured service dropdown options fixed. * fixed failing unit tests * Removed commented out and not used code. * Fixed all mistakes in the Search page (#537) * Composing of the Item's date was refactored and moved into shared service. * The item view box was refactored. The item view box is different for the search result. The label title is triggered on mouse hover. * Show workspace items in the `/mydspace` - there were problem with filtering `dsoTypes` in the `clarin-search.component` * Use Vanilla file size in the Item View and search results in the item view box. * Updated sorting option names * Updated search filter head messages * Defined search options in the themed-search.component.ts following CLARIN requirements. * Default configuration list must be set to null instead of empty array, because it shows empty space. * Use homepage configuration which contains searching by dc.date.accessioned * Updated border in the item view box * Updated `Has files` filter messages * Show Item type in the Item view from the `emd.type` * Fixed searching by publisher. * Added languages for `Community` and `Rights` filtering. * Updated `Search all of DSpace` button color. * Fixed showing license label icons when there is czech translation. * Updated messages on sidebar search and results header. * Updated RSS Feed description button and css * Prettied Copy button of handle in the Item View page * Updated favicon icon * Update item view box: Fixed occurrences when the author is null. * Remove `DSpace Repository ::` from the browser page title. * Use `LINDAT/CLARIAH-CZ Repository title prefix` * Fixed unit tests * Fixed linting errors * Commented out check for view options in the Search page - for CLARIN that options was disabled. * Fixed Verify SSR - do not check if there is DSpace in the title * Prettified the DOI metadata field - removed the DOI resolver from metadata value (#539) * Prettify the DOI metadata field. Remove the DOI resolver from that metadata value. * Fixed failing unit test * Internal/fix create bitstreams (#541) * fixed non-created admin user * fixed order * Show DOI in the refbox if the Item has some. (#540) * Show authors from the `dc.contributor.other` metadata field (#544) * Show authors from the `dc.contributor.other` metadata field * UI - fixed small changes (#543) * Removed duplicate author message and added `:` char into specific messages. * Show breadcumbs full text on hover * Fixed pinned sidebar translation * Update translates and sorting (#551) * Do not show error to the console when the Item does not have any data. * Fixed issue when a collection is null. * Added translation for browsing by the `language. * Changed `Vydavatel` cs translation to `Nakladatel` * Changed Ascending czech translation. * Show keywords only if there are more values in the search. * Fixed refbox and copied citations - ignore authors if they are unknown and show all authors if there are less than 5 of them. (#552) * Load only first values of the `subject` facet in the home page. (#553) * Load only first values of the `subject` facet in the home page. * Fetch facets from `homepage` configuration in the home page. * Call reindexing solr and oai-pmh after data pump migration (#556) * Update docker compose command (#588) `docker-compose` to `docker compose` because of a new version of docker. * Updated text color in the license page (#593) * Add czech translation to Edit Item - Curate (#592) * Increased timeout for selecting content from 100 to 300ms (#594) * [devOps] testing create_bitstreams task (#601) authored by: jm * rearrange build (#603) * codestyle create_bitstreams.yml * [devOps] simplifying create bitstreams * [devOps] fix urls, make pip install quiet * fix deploy action(#604) * [devOps] renamed import project to to dspace-import * [devOps] fix path * strip / at the end * Updated style for outlined buttons (#597) * Updated browsing links to do not overflow to the next line (#598) * Updated browsing links to do not overflow to the next line * Add truncate length to some constant * Update ref box - show publisher if there are not authors 1. Show publisher in the refbox if the Item has no authors. (#599) 2. Revert changes from the PR where the `:uknow author` was hidden - this feature is more complex and will be developed with the configurable ref box issue. * Encoded every search parameter. (#600) * dspace-cli needs configs (#555) - local.cfg has passwords etc. - ui url is used when minting dois - logging for cli * Run playwright after deploy with cURL * remove references to TUL * deploy shows playwright result (#609) * License label - do not require icon and Edit license - correctly loaded required info (#595) * Load max 100 license labels in the edit license page * The icon is not required during creation of the clarin license label * Updated creating of the clarin license label - refactored code, the icon is not required * Fixed issue with wrong loaded required info. * Updated test which controlles creating license label without icon * Replaced `if` condition by `catch`. * tune up playwright after deploy * correct wait times * correct " in action * correct condition in deploy-playwright-tests * Rreplace lindat repository url in static pages (#596) * Removed static files with license definitions. They are not already used because license definitions are loaded from the BE. * Updated download cmd command and removed copy button * Updated `lindat.mff.cuni.cz/repository/xoai/..` with `lindat.mff.cuni.cz/repository/static` * Removed hardcoded lindat url from static pages. * Fixed redirecting to distribution license (#613) * Load discojuice in browser, not in the server (#614) * Check if the IP address is in the download form. Add IP address as user metadata into request. (#611) * Internal/rest test after deploy (#615) * Login if restricted Item - accessing via `..handle/` url (#612) * Redirect to login page if the user is not authenticated to see the requested page * Added missing parts into failing unit test * Empty commit to run actions * Show `Download all as ZIP` button only when all conditions are met (#606) * Show download all in zip button only when all conditions are met * Updated test because of new updates * Download restricted zip (#618) * Added items/download/zip path for the email download link. * Add dtoken to the download request because of authorization. * Call the right download request if the user downloads ZIP. * Redirect to download/zip page for authorization when the user is downloading the ZIP * Edit Item's license (#619) * Added authorization and basic redirect to the `Edit Item - License` component * Show current license * Added a selector for licenses * Added `Update` and `Return` buttons and all html messages into EN language. * Send the request to the BE endpoint with a new licenseId * The current license is updated after the request is successfull. Added notification. Added redirect for defining a new license. * Translated messages to cs * Updated test file for passing tests * Translation `zmáčkněte změnit` changed to `zmáčkněte aktualizovat`. * Complex input field issues (#617) * Show EU funding name instead of organization name. * Show required character in the submission complex input field `*` however the whole complex input field is not required. * Refactored adding of error messages into complex input field. * Mark nested input field from the complex input field as required, however the complex input field is not required. * Removed complex input field when the value is `N/A` * Merge pull request #2802 from DSpace/backport-2766-to-dspace-7_x (#621) [Port dspace-7_x] Fix missing Register DOI button if configuration enabled Co-authored-by: Tim Donohue * use images built by dataquest, not DSpace or other (#627) * use dtq solr image * use dtq dspace image * Added a new required info (#623) * CS translation: `Klika polozky` translated to `Handle polozky` * Added a new required info. Changed the way how the required messages are rendered. Updated old required info messages. * Updated messages - for being consistent * Cherry picked ORCID updated from customer/uk. (#629) Co-authored-by: Ondřej Košarko * Clear funding input type only when the type is `N/A` (#631) * Fix editing license bugs: confirmation, required info messages (#634) * Updated license definition form messages for required info labels. * The confirmation default value is loaded. * Update deploy.yml [devOps] show healthcheck in a separate step * Update deploy.yml (#636) add forgotten var * Internal/synchro upstream (#638) * Show error message from the error response (cherry picked from commit e6546b4499fe87a9308dab7ff2c6767f9f256c67) * fix(i18n): add and update missing status strings New strings for status filter entries: search.filters.namedresourcetype.* Refactored strings introduced with #2068 (refactor badged), e.g. mydspace.status.archived -> mydspace.status.mydspaceArchived * 104126: ProcessDetailComponent test improvement * Bump word-wrap from 1.2.3 to 1.2.5 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] (cherry picked from commit 2fec33e70af5de3a2533f4ff33aabaff4aae03fc) * Replace mentions of demo7.dspace.org and api7.dspace.org with demo or sandbox * Update default configs to use https://demo.dspace.org/server/ * 2437 Correct and clarify commented-out code in several custom components - Correct the path in commented-out code in the custom theme's components - Clarify that the workflow-item-sen-back.component.scss file is a stub - It has no corresponding SCSS file in the base theme (cherry picked from commit 0906234a293a3dbe9057ef13cc4c5b690b1cf25b) * fix lint error in workflow-item-send-back.component.ts (cherry picked from commit 518cc714f2286889d2e66a4f013b954660e7ba5c) * Enable new skip merge commit feature * 103818 Add warning tooltip to "Inherit policies" checkbox on item move page * 103818 Adjusted "Inherit policies" tooltip * Update pl.json5 Update from 7.4 to 7.6 version (cherry picked from commit b439ab4484d864a4cdcf8c17541cf9d00b62b68b) * Update pl.json5 Translation update of 2 spaces instead of 3 (cherry picked from commit cfd753f928a0ed8829ef7d7a00f727b81d782d35) * Update pl.json5 fix issues from tests (cherry picked from commit 93299ec83da645189b1183806faee1d11a8e2e20) * Update pl.json5 fix test 2 spaces instead of 1 (cherry picked from commit f58a7a2e9b4ea09359c48604d1867ca94185977b) * 105265: Made the DsDynamicListComponent's checkbox & radio buttons ids unique for each metadata field to prevent other value-pairs having the same id (cherry picked from commit 4c419e1eee9aca0287216654da38362bce93044e) * Fix lint issue. * 103176: Fix vcr not being defined yet in OnInit hook * 101577: Ensure the component is always destroyed before rendering the new component * Reset to base theme when no default theme is set and leaving UUID/handle theme * Merge branch 'fix-ngonchanges-not-working-for-themed-components_contribute-7.2' into fix-ngonchanges-not-working-for-themed-components_contribute-7.4 * 🐛 go to first page after submit search (cherry picked from commit 88a7088b47a09c9927a869ebf67e9c174dd1f713) * ✅ add first page condition when search submit (cherry picked from commit 044230209c3c0d817da9628802b8ef6d0b6aab86) * Replace h5 with a span (cherry picked from commit 5ef4a827f5a2f4e03fc373eece317fd1e52aaac0) * Replace h2 with a h1 (cherry picked from commit 05c53ad1d49da41af474322364891289494a5f02) * Add trackby function so cdktree can differentiate between new and old nodes (cherry picked from commit 5f71de885bc811152729b3fefcb6fefbeda3001e) * Improve documentation (cherry picked from commit d9b6e9d81f2fba70f7c13a1377e2f2472c20d592) * Reorder instance method to come after member declaration (cherry picked from commit e59913acab0e782a743a4f18634e2930de9b71e8) * fix(i18m): curation-task.task.registerdoi.label changed curation-task.task.register-doi.label back to curation-task.task.registerdoi.label and added German translation (cherry picked from commit 0ec72f679bb8d1bb7611c1de2125f92cb718b1a9) * Implemented i18n cache busting * Update to latest cypress (cherry picked from commit 68a3323fcaf9b97d260f5032c9eb2fa5f6096bc2) * Update to latest axe-core (cherry picked from commit 50899f1d1b16e322e323507ad7dd42e5173cfbe5) * Reenable accessibility check fixed in #2251 (cherry picked from commit 158ebb0e3268a314e18bc4855457166d8b57f2e8) * Enable excessibility checking of login menu, and remove unnecessary exclusion from header (cherry picked from commit 339ed63734d4192fb37a12e67b0395aa1669acdb) * Fix heading order issue with item page & update accessibility tests to prove it now passes (cherry picked from commit ba244bf6b14bfed06f1b1052cc6407f2537a175b) * Update ng2-nouislider and nouislider to latest versions (cherry picked from commit 91d8b7e4f7187b68f70c1cf2906f4e6e8d8af2b9) * Fix accessibility of date sliders by adding aria-labels (cherry picked from commit 2a881791ba76091d2f85d0b068f926043ef33bc9) * Minor fixes to cypress tests (cherry picked from commit 70a7bbe3cbdd24abaf7f6f791ef60e88a3ae8922) * Fix heading order accessibility issue in search filters/facets (cherry picked from commit 276d80895e38225fcbde38cab01d79cd31a34e9b) * Spanish translation updated to 7.6 (cherry picked from commit 4cc4192e93aea3eb7dddc8486fe1fad35b6103bc) * Some lint errors fixed (cherry picked from commit 1885638ba6fadca4c99043db4ce52646bce435a3) * 🐛 fix when navbar expands on firefox (cherry picked from commit 60706720e47abc19b7528719e63676b9b5fa50be) * 🐛 Fix Value of dropdown changes automatically on item submission page (cherry picked from commit 651305952d706f6c45eb47ff37dfb94f91979760) * ✅change test event, click by mousedown on dynamic-scrollable-dropdown.component.spec.ts (cherry picked from commit 25479e17942bbd23e56a5f5a479d2e0dcc798087) * config/config.example.yml: fix example syntax As of DSpace Angular 7.2 the syntax has changed from TypeScript to YAML. (cherry picked from commit 9e46b5310b5038fb3433db2bdd829d48c8107a70) * Fix VocabularyTreeview not updating + i18n for nsi (cherry picked from commit b5a70e8f95d1046bed0e33d5b0bdc8109d645676) * 104189: Allow CSV export on related entity search (cherry picked from commit cac1407f08290adbc1a827fb1769011d3ecba803) * 104189: CSV export add fixedFilter (cherry picked from commit 45ad5f73168ccdf3d4f7ab617d44a0e28c94545a) * Minor pt-PT translation fixes (cherry picked from commit a6c1120700398fb0cf99ffd6e1a7ff52e5858a40) * remove redundant cache default values from server.ts (cherry picked from commit e53abcb69ea3d26461c24bd67894b7de1104a8cb) * 🚸remove thumbnail from file-upload section and show bitstream format and checksum (cherry picked from commit 4c8ec8a4f22fcc4930b898581de098e317e08b5d) * 🎨revert unnecessary format (cherry picked from commit 13e4052c4da07014a1c01087bfc6d293a8bb71c5) * Update workspaceitem-section-upload-file.model.ts Fix code comment (cherry picked from commit 01c8a4d9c3347cb5b30d4d912a3f7e18b81f989a) * ♻️ refactor chain of observables to avoid async issues (cherry picked from commit 2dc9fd44d7e151f7e96bff16665edf0a09226249) * 🐛 fix bug of caching when add new schema (cherry picked from commit 9fb9e5848c70274b7917bead52643e3611308174) * 🎨 revert format (cherry picked from commit 3e5524de69fa09808e3a7d0ab4042e5e3ffc98e0) * Fix innerText still being undefined in ssr mode * Correct text of help info on edit group page (cherry picked from commit 49247430e50a708996bef1790c7cc2af2271113a) * Graceful shutdown on SIGINT (e.g. from 'pm2 stop'). (cherry picked from commit 6709c3bb5ffe4f4c056debb1295ce499a6ea6932) * Properly await termination. (cherry picked from commit 4449737aed9b96c13ba6a34e2ff72feb1aaebe92) * Document a modified method as required by PR guidelines. (cherry picked from commit bf9b2b82e1d1d6cd7a901b674d8df92af073794c) * 106974: Angular SSR menu issues * src/app/shared/search: don't capitalize metadata values Don't capitalize metadata values for display purposes. * fix issue where more than one api call was made on every route change * fix issue where invalidateRootCache didn't happen when the page first loaded * remove obsolete label element in metadata-schema.component.html (cherry picked from commit 6847c30e582773b492747dc5dc88d4406f003a91) * removed trailing whitespaces as suggested by reviewer (cherry picked from commit 43f19e7d918d0457184160744e9f781db9cd491c) * [Port dspace-7_x] Update fi.json5 (#2516) * Update fi.json5 Two last translations to the Finnish file. (cherry picked from commit c3a908bccb5ebb52c08c57efd7d02c91e0e5de02) * Fix routes not working with baseHref (cherry picked from commit 18febff7a6c8e92d3d30016e6a4d93f7fe521dd0) * [Port dspace-7_x] Serbian (Latin) translation (#2520) * Serbian (latin) translation added. --------- Co-authored-by: imilos * [Port dspace-7_x] Fix missing or wrong Italian translations (#2522) [DURACOM-184] fix missing or wrong Italian translations --------- Co-authored-by: Andrea Barbasso <´andrea.barbasso@4science.com´> * fix dev mode issue where retrieving the login options fails * roll back unintended change to the responseMsToLive for RootDataservice * [DURACOM-185] Fix pointer on language dropdown menu (cherry picked from commit 6b5708cffda28620460f33ddc4fbf58ad9c6cb1d) * Move subscription button to DSO edit menu (cherry picked from commit c9558167b2dc2df22428b8d1fcfbd9b77e4b855e) * Update DSO edit menu resolver tests - Abstract away the different "subsections" ~ DSO type (the tests should not care about this) Instead, retrieve sections of interest by ID & assert whether they're there & how they should look - Test separately for Communities, Collections & Items - Test newly added menu section (cherry picked from commit 18b7a9c7de6e399d5ed27ff22caa082ab7e8ef2a) * Issue#2535: Hide add more button in submission if no disabled sections * translate community as 'Bereich' in de.json5 (cherry picked from commit 0139670371ffd7d8530f3d93ce9f120bc687433c) * Fix browse by visual bug (cherry picked from commit d0b4e15db42298aec6803d640916c951b97eab55) * Bump postcss from 8.4.23 to 8.4.31 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.23 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.23...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] (cherry picked from commit 3c5079e9ce9dcadcc1fc99bfd872b65ffbe336f0) * check cssRules existence before css variables are get from stylesheet (cherry picked from commit 367cda2de02f7524465dccc112438c57dce5cafe) * checkstyle remove unused extra lines (cherry picked from commit 5f8a9dea34159fc1e7f067b1bbcb5dabc6bf4145) * 107664: Normalized ePerson & group edit url and moved error message to translation file * Bump @babel/traverse from 7.21.4 to 7.23.2 Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.4 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] (cherry picked from commit 97f7a5e82aa30a41d64974fe4c553bd3358dc6b1) * Revert "Check cssRules before css variables are read from stylesheet (#2454)" This reverts commit fa79c358c09cb52ed142ef122e08b77de880685d. (cherry picked from commit 6f73b65d530ad8d2e8297af179e111f401823bce) * Update email-request-copy.component.html Message is optional: remove req in [disabled] (cherry picked from commit 94c756d52dfedbae470cbb5febab84c69da743cd) * Fix RequestService test failing because of different lastUpdated time (cherry picked from commit fb315335c90a0e2dde367e473a2e73729fedc429) * Use gap instead of individual paddings for header icons (cherry picked from commit 9f2a1d048bd3a9a413cc15492ce6bbf6c4dd65b2) * Themed LangSwitchComponent (cherry picked from commit f9b4460e70d21de0e82ee272492d0bd5c1d653a3) * Applied same gap between header icons in the dspace theme and made the search field non-focusable when collapsed (cherry picked from commit 58d31dd73f9762a341e774df261d909d97c4b3e2) * Fixed invalid html structure the ExpandableNavbarSectionComponent had an ul tag containing non-li tags (cherry picked from commit fa56d5dfb719c14d99080ef8fe208b5ee129c72f) * Added Serbian cyrilic translation and corrected Serbian latin translation. (cherry picked from commit ad12e5a7f2c72dfed5dd0b2e3e12d0b9c7457874) * Added Serbian cyrilic translation and corrected Serbian latin translation. (cherry picked from commit aa9e12dcfe10fab31d9fcc9f96088ccf31f8e843) * Merge branch 'fix-display-order-authentication-methods_contribute-7.4' into fix-display-order-authentication-methods_contribute-7.6 * Added themed-user-menu component. * Corrected missing semicolon. * Replaced tags for ds-user-menu. * Included user-menu component in custom theme. * Removed default value from inExpandableNavbar. * [DURACOM-190] Fix i18n labels in vocabulary-treeview (cherry picked from commit b321d6f72778aef9c47901f13c2e99195aea8530) * [DURACOM-190] Fix alignment in vocabulary-treeview (cherry picked from commit feb2b2be53272cae025f7e02ad9c6a30728ed0d2) * allow to insert multi-line scope notes in MD field registry (cherry picked from commit 5bc5dd859e18a601c6eadf9e2c3496b1fb8b4589) * Added support for changing the color of the navbar (cherry picked from commit f6649e1c3861012d388ec4d7bf46a54e84fb9962) * Fixed header bg color not being set in default (no) theme (cherry picked from commit 14b1ce5e50f819e1f7b555f205cef8c9b7aee6d8) * Fixed breadcrumb padding using incorrect syntax (cherry picked from commit 6c48238fa2d42d3b278741b23e8bd123237e16a1) * Added new variables for the expandable navbar section (cherry picked from commit 2ca2a3881f701b7668258c8607e1180ebfeb9828) * New themed components & minor CSS fixes (#2442) * 100839: Created themeable BrowseByComponent * 100839: Added themed BrowseByComponent to custom theme * 100839: Added themed BrowseEntryListElementComponent to custom theme * Added PersonComponent to custom theme * Themed LogInComponent * Fix focus on navbar using different color * Fix ccLicense checkbox margin * Fix long search facets name not displaying correctly * Removed RecentItemListComponent's unnecessary float causing alignment issues when adding components underneath it * Themed RegisterEmailFormComponent * more error-prone check of cssRules existence before css variables are get from stylesheet check the existence off cssRules property before the variables are readed from this stylesheet https://github.com/DSpace/dspace-angular/issues/2450 (cherry picked from commit 4dd334f2e76adfabb972095acc80a391c6c91b38) * fix(pt-BR.json5): fix and update the language file Fix and update the pt-BR language file * fix(pt-BR.json5): fix and update the language file and previous errors Fix and update the pt-BR language file and the previous errors * Merged in DSC-106 (pull request #643) [DSC-106] Date input usable via keyboard using tab Approved-by: Vincenzo Mecca (cherry picked from commit 543b4ad576b740b27ecf7b3bfc607f021bde1494) * [DURACOM-194] fixed year input value on input type date (cherry picked from commit c412c1fa13b30ac5140259ff2542a60e8646382e) * Ensure e2e tests run in production mode (cherry picked from commit 7dcaae846547a48bf1cbe1fe4241ac661e20d71f) * Specify user agent to avoid being detected as a "bot" by backend (cherry picked from commit 72cda4173124c2d2b3125e4cfed106338dc70ad9) * [DURACOM-177] gap-* classes (cherry picked from commit 930a381e4a6beda611a87510e5b76a94d1c4c9af) * [DURACOM-177] Use gap-* classes on navbar buttons (cherry picked from commit a35629536e70f8d4b691fa95fd0b8342a8d717a1) * [DURACOM-197] Fix cache issue when depositing a submission (cherry picked from commit f992ff66713ea820e47cb44a28b5fd612d64fae2) * Add UI nameSpace context path to Mirador viewer path (cherry picked from commit 3228c457a33710354c85b92efad5f6945af66e58) * 108055: fix issue 8686: unable to enter freetext values in the submission form for vocabulary (cherry picked from commit 0dcf6cb8855cc5c74f781fd7490f2daaeea29092) * 108055: add user input to tag list (cherry picked from commit aac58e612d7fb01f87dc7a6a46b92c9c4c2fe685) * Support type-bind of elements based on repeatable list type-bound element (CHECKBOX_GROUP) (cherry picked from commit 09aaa46875146081cf812ed6f904178740ae8d30) * [DURACOM-195] Simplify vertical spacing in header and breadcrumbs (cherry picked from commit a3e6d9b09a2d6e529dc28f7d1a1924b2830077e6) * [DURACOM-180] Prevent header from covering media viewer controls (dspace theme) (cherry picked from commit 0208a784378bf3f6226e6d9020523ae0fd38f9b4) * [DURACOM-180] Prevent header from covering media viewer controls (base theme) (cherry picked from commit c042cd8d1154af59310b162c9a97e7d3820a1592) * Update condition to render show more node `loadingNode` ends up being the current `node` after clicking it preventing it from rendering when more pages available. Update community list component spec Make the show more flat node id unique The nodes with same id are conflicting when added to the tree. Clicking on the second with same id places the show more button under the wrong branch and expands the wrong page. (cherry picked from commit 11d3771e72e3f54f73bb60a23abd970eff5d66a3) * Filter expanded nodes by id Co-Authored-By: Art Lowel <1567693+artlowel@users.noreply.github.com> (cherry picked from commit dc2ef989e612c305ae98932be491db15a1fc74a4) * Added skip to main content button * Limit getMembers() and getSubgroups() to only fetching one object. These lists are only used to find the size of each (cherry picked from commit 0da7c15f2eff6229caafccae1be8dd7b10ebc629) * Remove isSubgroupOfGroup() functionality as it loads every subgroup at once. Bad peformance for large groups (cherry picked from commit 97479a29453eaf18031e095b612c1c054f9bb31f) * Fix bug where linked Community/Collection info was sometimes listed many times in a row (cherry picked from commit 229236634a06f5468dc078eb5d814981ecf3d497) * Remove "isMemberOfGroup()" from members-list component. (cherry picked from commit 43d37196fbaf45648dbd5e604a3ee8d5df2a129e) * Remove unnecessary EpersonDtoModel. Rework code and tests to use EPerson instead. (cherry picked from commit bffae54b10ea7a4c883cb25512f9c9ac4949f97a) * Also remove unnecessary EpersonDtoModel from extending ReviewersListComponent. Remove "memberOfGroup" from EpersonDtoModel as it is no longer used (cherry picked from commit b598f1b5ca9b54c4b5fe23daa3d7b502ee0dc6b2) * Fix subgroups-list specs so they align with new members-list specs (cherry picked from commit 64f968b246774140b2e3d4f134be7608ab7a6207) * Refactor members-list and subgroups-list components to use new isNotMemberOf endpoints (via services) (cherry picked from commit 8a10888d2ad7916570472173070370da61320a72) * Refactor subgroups-list component's "search()" to act same as member-list component's "search()". Avoids reloading the page as frequently. (cherry picked from commit 2eb1a17e4e0fd0eb6a13f30c6f8b847f6d9d7a89) * Remove seemingly unnecessary page reload after new search. (cherry picked from commit d163db13f219ab81ca821e1695a2193edb38c79a) * Address feedback. Run empty search on init. Reorder sections to list current members before add members (for both eperson and groups) (cherry picked from commit 9117ac005f575277bf2e025d18afb878d18b0589) * Bump axios from 0.27.2 to 1.6.0 Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] (cherry picked from commit ef9f31d3c612b5aa93a9f8950888bd034ad03d01) * 108045: Fix for repeatable date field labels * Fixed test * Fix handle redirect not working with custom nameSpace (cherry picked from commit b894dce3b0d4e98c7859efe40a1112bbb3265538) * adding new access-status-list-element-badge css classes (cherry picked from commit e847e4ef51aab604d1d07b79860003551eafe467) * Create new access-status-badge.component.scss (cherry picked from commit 3bf2eb1997aff92abc9bb7f642d5e7c77866d552) * new accessStatusClass atribute (cherry picked from commit 6378dbec4afc635a3e3e3dc37f573122a5097746) * remove replaceAll and use an object property (cherry picked from commit c7eae9242a69cb9a598c2a55843dda72f5125ca5) * adding ngOnDestroy for dealing with unsubscribe (cherry picked from commit 75b788d05b819715feefc31e645d97368ae63054) * 107671: Fix handle theme not working with canonical prefix https://hdl.handle.net/ (cherry picked from commit a7faf7d449a44ce793bfe4b72cf7b377445ae181) * 107671: Split Theme model & ThemeConfig classes in separate files to prevent circular dependencies (cherry picked from commit da8880e5ba4ca1bff5936618391d14ce9a8d6153) * 107671: Fixed bug where config property would still sometimes be undefined whey calling the ngOnDestroy in the ThemedComponent (cherry picked from commit 4e54cca6004e0e28d532c175ac29895fe7e7c0db) * 107671: Fixed theme matching by handle not working in production mode (cherry picked from commit 7529ed8b350878bda844138a3c78a6587a3034a9) * [DURACOM-202] feature: item edit pages are accessible by administrator (cherry picked from commit ccf1cc45473a8a92d117215adc0eb650a27d6d77) * [DURACOM-202] refactor: code (cherry picked from commit b6d515ff09011d6ceef358c6836f2616cc059657) * [DURACOM-202] refactor: code (cherry picked from commit 6f64db1645623d9ac735ccab107439c77cc9969f) * fix: random order of buttons in status tab (cherry picked from commit 35f8b55f588985146482313a6ebad80154b6edbd) * refactor: code (cherry picked from commit fbbbc18844b44f6f56b7c5f1f5e07e4886877d20) * 107685: menu-component re-render section on store update * 107902: Created test case for 2f26e686cc * Update version tag for release * empty commit - force checks * remove double permissions * Removed duplicated attributes * Use our docker workflow and docker compose * Removed empty row --------- Co-authored-by: milanmajchrak Co-authored-by: Alan Orth Co-authored-by: Mirko Scherf Co-authored-by: Tim Donohue Co-authored-by: Kristof De Langhe Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hardy Pottinger Co-authored-by: Koen Pauwels Co-authored-by: Michał Dykas <96572102+michdyk@users.noreply.github.com> Co-authored-by: Alexandre Vryghem Co-authored-by: Hugo Dominguez Co-authored-by: Hrafn Malmquist Co-authored-by: Sergio Fernández Celorio Co-authored-by: Nona Luypaert Co-authored-by: José Carvalho Co-authored-by: Sascha Szott Co-authored-by: Mark H. Wood Co-authored-by: Yana De Pauw Co-authored-by: Art Lowel Co-authored-by: DSpace Bot <68393067+dspace-bot@users.noreply.github.com> Co-authored-by: imilos Co-authored-by: Andrea Barbasso <´andrea.barbasso@4science.com´> Co-authored-by: Davide Negretti Co-authored-by: Yury Bondarenko Co-authored-by: Marie Verdonck Co-authored-by: Janne Jensen Co-authored-by: Pascal-Nicolas Becker Co-authored-by: Jens Vannerum Co-authored-by: Gantner, Florian Klaus Co-authored-by: Agustina Martinez Co-authored-by: Eike Martin Löhden Co-authored-by: Marco Aurelio Cardoso Co-authored-by: Alisa Ismailati Co-authored-by: Alisa Ismailati Co-authored-by: Giuseppe Digilio Co-authored-by: William Welling Co-authored-by: Andreas Mahnke Co-authored-by: lotte Co-authored-by: Paulo Graça Co-authored-by: Vlad Nouski * Fetch the right files from the dtq-dev branch * copying assetstore from dev-5 to instance * removed -r flag * redefination of input * added -r flag * replaced cp by docker cp * removed assetstore and add path to python * TEST: assesttore * removed only assetstore not all from dspace * removed removing assetstore - it is part of erase database, not import * run import on the main branch * empty assetstore control * test assetstore folder * correct branch after test * forgotten slash * Sync files due to dtq-dev update * Fetch the right files from the dtq-dev branch * Use deploy from customer/uk * Cherry-picked from dtq-dev updating deploy - add healthcheck * Removed duplicity from the en.json5 --------- Signed-off-by: dependabot[bot] Co-authored-by: MilanMajchrák Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com> Co-authored-by: MajoBerger Co-authored-by: Ondřej Košarko Co-authored-by: Agustina Martinez Co-authored-by: Alexandre Vryghem Co-authored-by: Tim Donohue Co-authored-by: Nathan Buckingham Co-authored-by: Cristian Emanuelle Guzmán Suárez Co-authored-by: Davide Negretti Co-authored-by: Yana De Pauw Co-authored-by: corrado lombardi Co-authored-by: Marie Verdonck Co-authored-by: Kim Shepherd Co-authored-by: Art Lowel Co-authored-by: Yury Bondarenko Co-authored-by: Koen Pauwels Co-authored-by: Giuseppe Digilio Co-authored-by: Pascal-Nicolas Becker Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alan Orth Co-authored-by: Sascha Szott Co-authored-by: Kristof De Langhe Co-authored-by: Yura Bondarenko Co-authored-by: HieuHorizonsfl Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com> Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com> Co-authored-by: jm Co-authored-by: Jozef Misutka <332350+vidiecan@users.noreply.github.com> Co-authored-by: Sergio Fernández Celorio Co-authored-by: Hugo Dominguez Co-authored-by: Nona Luypaert Co-authored-by: José Carvalho Co-authored-by: Mark H. Wood Co-authored-by: DSpace Bot <68393067+dspace-bot@users.noreply.github.com> Co-authored-by: Hrafn Malmquist Co-authored-by: imilos Co-authored-by: Andrea Barbasso <´andrea.barbasso@4science.com´> Co-authored-by: Davide Negretti Co-authored-by: Janne Jensen Co-authored-by: Jens Vannerum Co-authored-by: Gantner, Florian Klaus Co-authored-by: Eike Martin Löhden Co-authored-by: Marco Aurelio Cardoso Co-authored-by: Alisa Ismailati Co-authored-by: Alisa Ismailati Co-authored-by: Giuseppe Digilio Co-authored-by: William Welling Co-authored-by: Andreas Mahnke Co-authored-by: lotte Co-authored-by: Paulo Graça Co-authored-by: Vlad Nouski Co-authored-by: Mirko Scherf Co-authored-by: Hardy Pottinger Co-authored-by: Michał Dykas <96572102+michdyk@users.noreply.github.com> Co-authored-by: Paurikova2 Co-authored-by: Paurikova2 <107862249+Paurikova2@users.noreply.github.com> --- .github/workflows/deploy.yml | 5 +- .../integration/collection-statistics.spec.ts | 0 cypress/integration/community-list.spec.ts | 0 .../integration/community-statistics.spec.ts | 0 .../integration/homepage-statistics.spec.ts | 0 cypress/integration/item-page.spec.ts | 0 cypress/integration/search-navbar.spec.ts | 0 cypress/integration/search-page.spec.ts | 0 cypress/support/index.ts | 0 .../define-license-form.component.html | 2 +- .../data/external-source-data.service.spec.ts | 107 ++++++++++++++++++ .../clarin/clarin-license.resource-type.ts | 14 +-- ...c-sponsor-scrollable-dropdown.component.ts | 14 ++- .../my-dspace-item-status.component.spec.ts | 0 .../my-dspace-item-status.component.ts | 0 .../shared/theme-support/themed.component.ts | 1 + src/config/theme.model.ts | 0 .../dspace/app/navbar/navbar.component.scss | 14 ++- 18 files changed, 145 insertions(+), 12 deletions(-) delete mode 100644 cypress/integration/collection-statistics.spec.ts delete mode 100644 cypress/integration/community-list.spec.ts delete mode 100644 cypress/integration/community-statistics.spec.ts delete mode 100644 cypress/integration/homepage-statistics.spec.ts delete mode 100644 cypress/integration/item-page.spec.ts delete mode 100644 cypress/integration/search-navbar.spec.ts delete mode 100644 cypress/integration/search-page.spec.ts delete mode 100644 cypress/support/index.ts delete mode 100644 src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts delete mode 100644 src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts delete mode 100644 src/config/theme.model.ts diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 02fdc13b4d4..1b9f076d39e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -105,7 +105,7 @@ jobs: INSTANCE: ${{ env.INSTANCE }} DATADIR: /opt/dspace-data/clarin-dspace/ - - name: dspace command + - name: dspace basic command run: | export DNAME=dspace$INSTANCE docker logs -n 50 $DNAME @@ -125,6 +125,9 @@ jobs: echo "dspace checker:" docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace checker -v -l" + - name: dspace healthcheck + run: | + export DNAME=dspace$INSTANCE echo "dspace healthcheck:" docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace healthcheck -v" diff --git a/cypress/integration/collection-statistics.spec.ts b/cypress/integration/collection-statistics.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cypress/integration/community-list.spec.ts b/cypress/integration/community-list.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cypress/integration/community-statistics.spec.ts b/cypress/integration/community-statistics.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cypress/integration/homepage-statistics.spec.ts b/cypress/integration/homepage-statistics.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cypress/integration/item-page.spec.ts b/cypress/integration/item-page.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cypress/integration/search-navbar.spec.ts b/cypress/integration/search-navbar.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cypress/integration/search-page.spec.ts b/cypress/integration/search-page.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/cypress/support/index.ts b/cypress/support/index.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.html b/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.html index 3026dd8378c..e0767951311 100644 --- a/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.html +++ b/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.html @@ -21,7 +21,7 @@

{{'clarin-license.define-license-form.form-name' | trans
diff --git a/src/app/core/data/external-source-data.service.spec.ts b/src/app/core/data/external-source-data.service.spec.ts index e69de29bb2d..723d7f9bed6 100644 --- a/src/app/core/data/external-source-data.service.spec.ts +++ b/src/app/core/data/external-source-data.service.spec.ts @@ -0,0 +1,107 @@ +import { ExternalSourceDataService } from './external-source-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { createPaginatedList } from '../../shared/testing/utils.test'; +import { ExternalSourceEntry } from '../shared/external-source-entry.model'; +import { of as observableOf } from 'rxjs'; +import { GetRequest } from './request.models'; +import { testSearchDataImplementation } from './base/search-data.spec'; +import { take } from 'rxjs/operators'; + +describe('ExternalSourceService', () => { + let service: ExternalSourceDataService; + + let requestService; + let rdbService; + let halService; + + const entries = [ + Object.assign(new ExternalSourceEntry(), { + id: '0001-0001-0001-0001', + display: 'John Doe', + value: 'John, Doe', + metadata: { + 'dc.identifier.uri': [ + { + value: 'https://orcid.org/0001-0001-0001-0001' + } + ] + } + }), + Object.assign(new ExternalSourceEntry(), { + id: '0001-0001-0001-0002', + display: 'Sampson Megan', + value: 'Sampson, Megan', + metadata: { + 'dc.identifier.uri': [ + { + value: 'https://orcid.org/0001-0001-0001-0002' + } + ] + } + }) + ]; + + function init() { + requestService = jasmine.createSpyObj('requestService', { + generateRequestId: 'request-uuid', + send: {} + }); + rdbService = jasmine.createSpyObj('rdbService', { + buildList: createSuccessfulRemoteDataObject$(createPaginatedList(entries)) + }); + halService = jasmine.createSpyObj('halService', { + getEndpoint: observableOf('external-sources-REST-endpoint'), + }); + service = new ExternalSourceDataService(requestService, rdbService, undefined, halService); + } + + beforeEach(() => { + init(); + }); + + describe('composition', () => { + const initService = () => new ExternalSourceDataService(null, null, null, null); + testSearchDataImplementation(initService); + }); + + describe('getExternalSourceEntries', () => { + + describe('when no error response is cached', () => { + let result; + beforeEach(() => { + spyOn(service, 'hasCachedErrorResponse').and.returnValue(observableOf(false)); + result = service.getExternalSourceEntries('test'); + }); + + it('should send a GetRequest', () => { + result.pipe(take(1)).subscribe(); + expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest), true); + }); + + it('should return the entries', () => { + result.subscribe((resultRD) => { + expect(resultRD.payload.page).toBe(entries); + }); + }); + }); + + describe('when an error response is cached', () => { + let result; + beforeEach(() => { + spyOn(service, 'hasCachedErrorResponse').and.returnValue(observableOf(true)); + result = service.getExternalSourceEntries('test'); + }); + + it('should send a GetRequest', () => { + result.pipe(take(1)).subscribe(); + expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest), false); + }); + + it('should return the entries', () => { + result.subscribe((resultRD) => { + expect(resultRD.payload.page).toBe(entries); + }); + }); + }); + }); +}); diff --git a/src/app/core/shared/clarin/clarin-license.resource-type.ts b/src/app/core/shared/clarin/clarin-license.resource-type.ts index bee038f5e2e..d617f0e2742 100644 --- a/src/app/core/shared/clarin/clarin-license.resource-type.ts +++ b/src/app/core/shared/clarin/clarin-license.resource-type.ts @@ -26,16 +26,16 @@ export class ClarinLicenseRequiredInfo { * Required info possible values. */ export const CLARIN_LICENSE_REQUIRED_INFO = { - SEND_TOKEN: 'Email', - NAME: 'Name (given name and surname)', + SEND_TOKEN: 'The user will receive an email with download instructions.', + NAME: 'User Name', DOB: 'Date of birth', ADDRESS: 'Address', COUNTRY: 'Country', - EXTRA_EMAIL: 'Email', - ORGANIZATION: 'Organization', - REQUIRED_ORGANIZATION: 'Organization', - INTENDED_USE: 'Intended use', - ACA_ORG_NAME_AND_SEAT: 'Name and seat (address) of your academic institution', + EXTRA_EMAIL: 'Ask user for another email address', + ORGANIZATION: 'Ask user for organization (optional)', + REQUIRED_ORGANIZATION: 'Ask user for organization (mandatory)', + INTENDED_USE: 'Ask user for his intentions with the item', + ACA_ORG_NAME_AND_SEAT: 'Ask for the name and seat (address) of user\'s academic institution', }; /** diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/sponsor-scrollable-dropdown/dynamic-sponsor-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/sponsor-scrollable-dropdown/dynamic-sponsor-scrollable-dropdown.component.ts index fece3308784..37b2fcf34f2 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/sponsor-scrollable-dropdown/dynamic-sponsor-scrollable-dropdown.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/sponsor-scrollable-dropdown/dynamic-sponsor-scrollable-dropdown.component.ts @@ -111,7 +111,10 @@ export class DsDynamicSponsorScrollableDropdownComponent extends DsDynamicScroll (input as DsDynamicInputModel).value = ''; break; case DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN: - (input as DynamicScrollableDropdownModel).value = ''; + // Remove it only if the funding type is `N/A` + if (this.fundingTypeIsNotApplicable(fundingTypeValue)) { + (input as DynamicScrollableDropdownModel).value = ''; + } break; default: break; @@ -142,10 +145,17 @@ export class DsDynamicSponsorScrollableDropdownComponent extends DsDynamicScroll } // if the funding type is `N/A` -> clean inputs - if (isEqual(fundingTypeValue, this.translateService.instant('autocomplete.suggestion.sponsor.empty'))) { + if (this.fundingTypeIsNotApplicable(fundingTypeValue)) { return true; } return false; } + + /** + * Check if the funding type is `N/A` + */ + fundingTypeIsNotApplicable(fundingTypeValue) { + return isEqual(fundingTypeValue, this.translateService.instant('autocomplete.suggestion.sponsor.empty')); + } } diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts index 41decc84100..ded83aaf326 100644 --- a/src/app/shared/theme-support/themed.component.ts +++ b/src/app/shared/theme-support/themed.component.ts @@ -127,6 +127,7 @@ export abstract class ThemedComponent implements AfterViewInit, OnDestroy, On } this.compRef$.next(this.compRef); this.cdr.markForCheck(); + this.themedElementContent.nativeElement.remove(); }); } diff --git a/src/config/theme.model.ts b/src/config/theme.model.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss index 0a1fc7fc008..bad6f841142 100644 --- a/src/themes/dspace/app/navbar/navbar.component.scss +++ b/src/themes/dspace/app/navbar/navbar.component.scss @@ -11,7 +11,19 @@ nav.navbar { border-top: 1px var(--ds-header-navbar-border-top-color) solid; border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid; align-items: baseline; - color: var(--ds-header-icon-color); + + .navbar-inner-container { + border-top: 1px var(--ds-header-navbar-border-top-color) solid; + } +} + +.navbar-nav { + background-color: var(--ds-navbar-bg); +} + +.clarin-logo { + height: var(--ds-login-logo-height); + width: var(--ds-login-logo-width); } .clarin-logo {