From f88d31197a807ff071a5181dce3772970fba14b1 Mon Sep 17 00:00:00 2001 From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:26:35 +0100 Subject: [PATCH] customer/uk-it-16 (#530) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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/fix-failing-it (#437) * Fixed integration tests - updated login via form - closed discojuice login. Updated licenses path to `licenses/manage-table` * Cancel discojuice if it is popped up in the tombstone test * 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 # Conflicts: # src/app/shared/log-in/log-in.component.html # src/app/shared/log-in/log-in.component.ts * 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 * 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 * update job name - removed 5 instance --------- Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com> Co-authored-by: Jozef Misutka <332350+vidiecan@users.noreply.github.com> Co-authored-by: jm Co-authored-by: MajoBerger 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 --- .github/workflows/build.yml | 56 +++---- .github/workflows/deploy.yml | 25 ++- .github/workflows/docker.yml | 147 ++++-------------- .github/workflows/import.yml | 35 ----- .github/workflows/reindex.yml | 14 -- scripts/sourceversion.py | 14 ++ src/aai/aai.js | 4 +- src/aai/discojuice/discojuice.js | 2 +- src/app/home-page/home-page.component.html | 41 +++-- src/app/home-page/home-page.component.scss | 7 +- src/app/home-page/home-page.component.ts | 11 ++ .../clarin-item-author-preview.component.html | 16 +- .../clarin-item-box-view.component.html | 15 +- .../clarin-item-box-view.component.scss | 3 +- .../clarin-item-box-view.component.ts | 20 ++- src/assets/i18n/cs.json5 | 12 ++ src/assets/i18n/en.json5 | 15 +- .../images/LINDAT-CLARIAH-cz-gray_0.svg | 26 ++++ src/assets/images/clarin.png | Bin 0 -> 10074 bytes src/assets/images/dariah-eu.png | Bin 0 -> 23385 bytes src/assets/images/item-types/Software.png | Bin 0 -> 14655 bytes .../item-types/application-x-zerosize.png | Bin 0 -> 4562 bytes src/assets/images/item-types/cite.png | Bin 0 -> 3392 bytes src/assets/images/{ => item-types}/corpus.png | Bin src/assets/images/item-types/deposit.png | Bin 0 -> 4744 bytes .../images/item-types/evaluationPackage.png | Bin 0 -> 13005 bytes src/assets/images/item-types/glass.png | Bin 0 -> 16147 bytes .../images/item-types/languageDescription.png | Bin 0 -> 4218 bytes .../item-types/lexicalConceptualResource.png | Bin 0 -> 16578 bytes .../item-types/technologyToolService.png | Bin 0 -> 22516 bytes src/assets/images/item-types/toolService.png | Bin 0 -> 17559 bytes src/styles/_clarin-styles.scss | 19 +++ 32 files changed, 252 insertions(+), 230 deletions(-) delete mode 100644 .github/workflows/import.yml delete mode 100644 .github/workflows/reindex.yml create mode 100644 scripts/sourceversion.py create mode 100644 src/assets/images/LINDAT-CLARIAH-cz-gray_0.svg create mode 100644 src/assets/images/clarin.png create mode 100644 src/assets/images/dariah-eu.png create mode 100644 src/assets/images/item-types/Software.png create mode 100644 src/assets/images/item-types/application-x-zerosize.png create mode 100644 src/assets/images/item-types/cite.png rename src/assets/images/{ => item-types}/corpus.png (100%) create mode 100644 src/assets/images/item-types/deposit.png create mode 100644 src/assets/images/item-types/evaluationPackage.png create mode 100644 src/assets/images/item-types/glass.png create mode 100644 src/assets/images/item-types/languageDescription.png create mode 100644 src/assets/images/item-types/lexicalConceptualResource.png create mode 100644 src/assets/images/item-types/technologyToolService.png create mode 100644 src/assets/images/item-types/toolService.png diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88e603088fc..a71e1a0e031 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,31 +188,31 @@ jobs: - name: Shutdown Docker containers run: docker-compose -f ./docker/docker-compose-ci.yml down - # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test - # job above. This is necessary because Codecov uploads seem to randomly fail at times. - # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954 - codecov: - # Must run after 'tests' job above - needs: tests - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - # Download artifacts from previous 'tests' job - - name: Download coverage artifacts - uses: actions/download-artifact@v3 - - # Now attempt upload to Codecov using its action. - # NOTE: We use a retry action to retry the Codecov upload if it fails the first time. - # - # Retry action: https://github.com/marketplace/actions/retry-action - # Codecov action: https://github.com/codecov/codecov-action - - name: Upload coverage to Codecov.io - uses: Wandalen/wretry.action@v1.0.36 - with: - action: codecov/codecov-action@v3 - # Try upload 5 times max - attempt_limit: 5 - # Run again in 30 seconds - attempt_delay: 30000 +# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test +# # job above. This is necessary because Codecov uploads seem to randomly fail at times. +# # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954 +# codecov: +# # Must run after 'tests' job above +# needs: tests +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v3 +# +# # Download artifacts from previous 'tests' job +# - name: Download coverage artifacts +# uses: actions/download-artifact@v3 +# +# # Now attempt upload to Codecov using its action. +# # NOTE: We use a retry action to retry the Codecov upload if it fails the first time. +# # +# # Retry action: https://github.com/marketplace/actions/retry-action +# # Codecov action: https://github.com/codecov/codecov-action +# - name: Upload coverage to Codecov.io +# uses: Wandalen/wretry.action@v1.0.36 +# with: +# action: codecov/codecov-action@v3 +# # Try upload 5 times max +# attempt_limit: 5 +# # Run again in 30 seconds +# attempt_delay: 30000 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d5bf9e259ce..b7cada7998a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,6 +12,10 @@ on: required: false default: true type: boolean + ERASE_DB: + required: false + default: false + type: boolean workflow_dispatch: inputs: @@ -28,10 +32,14 @@ on: required: true default: true type: boolean + ERASE_DB: + required: false + default: false + type: boolean jobs: deploy: - if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '2' + if: inputs.INSTANCE == '*' || inputs.INSTANCE == '2' runs-on: dspace-dep-1 timeout-minutes: 5 env: @@ -40,22 +48,33 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: ./.github/actions/erase-db + if: inputs.ERASE_DB + with: + INSTANCE: ${{ env.INSTANCE }} + NAME: dspace-${{ env.INSTANCE }} + - name: deploy to dev-5 working-directory: build-scripts/run/ run: | ./start.sh dspace-$INSTANCE deploy-8: - if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '8' + if: inputs.INSTANCE == '*' || inputs.INSTANCE == '8' runs-on: dspace-dep-1 timeout-minutes: 120 env: INSTANCE: '8' + # 2024/02: this .env replaces ENTRYPOINT to angular + # !!!!WARNING!!!! + # disable TSL checks = allowing to cooperate with https backend with invalid + # certificate ENVFILE: /opt/dspace-envs/.env.dspace.imported.dev-5 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/erase-db + if: inputs.ERASE_DB with: INSTANCE: ${{ env.INSTANCE }} NAME: dspace-${{ env.INSTANCE }} @@ -69,7 +88,7 @@ jobs: import-8: runs-on: dspace-dep-1 - if: github.event.inputs.IMPORT == 'true' + if: inputs.IMPORT needs: deploy-8 env: INSTANCE: '8' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a618a4ef3ac..2d6f7be61da 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,6 +3,9 @@ name: Docker images # Run this Build for all pushes to 'main' or maintenance branches, or tagged releases. # Also run for PRs to ensure PR doesn't break Docker build process +# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images +# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml +# on: push: branches: @@ -15,130 +18,44 @@ permissions: contents: read # to fetch code (actions/checkout) jobs: - docker: + dspace-angular: # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular' if: github.repository == 'dataquest-dev/dspace-angular' - runs-on: ubuntu-latest - env: - # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action) - # For a new commit on default branch (main), use the literal tag 'dspace-7_x' on Docker image. - # For a new commit on other branches, use the branch name as the tag for Docker image. - # For a new tag, copy that tag name as the tag for Docker image. - IMAGE_TAGS: | - type=raw,value=dspace-7_x,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }} - type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }} - type=ref,event=tag - # Define default tag "flavor" for docker/metadata-action per - # https://github.com/docker/metadata-action#flavor-input - # We turn off 'latest' tag by default. - TAGS_FLAVOR: | - latest=false - - steps: - # https://github.com/actions/checkout - - name: Checkout codebase - uses: actions/checkout@v3 - - # https://github.com/docker/setup-buildx-action - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - # https://github.com/docker/setup-qemu-action - - name: Set up QEMU emulation to build for multiple architectures - uses: docker/setup-qemu-action@v2 - - # https://github.com/docker/login-action - - name: Login to DockerHub - # Only login if not a PR, as PRs only trigger a Docker build and not a push - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - # https://github.com/docker/metadata-action - # Get Metadata for docker_build step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image - id: meta_build - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace-angular - tags: ${{ env.IMAGE_TAGS }} - flavor: ${{ env.TAGS_FLAVOR }} - - # https://github.com/docker/build-push-action - - name: Build and push 'dspace-angular' image - id: docker_build - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build.outputs.tags }} - labels: ${{ steps.meta_build.outputs.labels }} + uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev + with: + build_id: dspace-angular + image_name: dataquest/dspace-angular + dockerfile_path: ./Dockerfile + run_python_version_script: true + python_version_script_dest: src/static-files/VERSION_D.html + secrets: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} ############################################################# # Build/Push the 'dataquest/dspace-angular' image ('-dist' tag) ############################################################# dspace-angular-dist: # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace-angular' - if: github.repository == 'dataquest/dspace-angular' - runs-on: ubuntu-latest - - steps: - # https://github.com/actions/checkout - - name: Checkout codebase - uses: actions/checkout@v3 - - # https://github.com/docker/setup-buildx-action - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - # https://github.com/docker/setup-qemu-action - - name: Set up QEMU emulation to build for multiple architectures - uses: docker/setup-qemu-action@v2 - - # https://github.com/docker/login-action - - name: Login to DockerHub - # Only login if not a PR, as PRs only trigger a Docker build and not a push - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - # https://github.com/docker/metadata-action - # Get Metadata for docker_build_dist step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image - id: meta_build_dist - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace-angular - tags: ${{ env.IMAGE_TAGS }} - # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same - # tagging logic as the primary 'dspace/dspace-angular' image above. - flavor: ${{ env.TAGS_FLAVOR }} - suffix=-dist - - - name: Build and push 'dspace-angular-dist' image - id: docker_build_dist - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile.dist - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build_dist.outputs.tags }} - labels: ${{ steps.meta_build_dist.outputs.labels }} + if: github.repository == 'dataquest-dev/dspace-angular' && false # not used for now + uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev + with: + build_id: dspace-angular-dist + image_name: dspace/dspace-angular + dockerfile_path: ./Dockerfile.dist + # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same + # tagging logic as the primary 'dspace/dspace-angular' image above. + tags_flavor: suffix=-dist + run_python_version_script: true + python_version_script_dest: src/static-files/VERSION_D.html + secrets: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} deploy: - needs: docker + needs: dspace-angular uses: dataquest-dev/dspace-angular/.github/workflows/deploy.yml@customer/uk + with: + INSTANCE: '2' + IMPORT: false secrets: inherit diff --git a/.github/workflows/import.yml b/.github/workflows/import.yml deleted file mode 100644 index a0c22d2241a..00000000000 --- a/.github/workflows/import.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Import DSpace v5 - -on: - workflow_dispatch: - inputs: - INSTANCE: - required: true - default: '8' - type: choice - options: - - '8' - -jobs: - import: - runs-on: dspace-dep-1 - steps: - - - uses: actions/checkout@v4 - - - uses: ./.github/actions/erase-db - with: - INSTANCE: ${{ env.INSTANCE }} - NAME: dspace-${{ env.INSTANCE }} - - - name: deploy dspace-import on dev-5 - working-directory: build-scripts/run/ - run: | - ENVFILE=/opt/dspace-envs/.env.dspace.imported.dev-5 ./start.sh dspace-$INSTANCE - /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://dev-5.pc:8$INSTANCE/server/api)" != "200" ]]; do sleep 5; done' - - - uses: ./.github/actions/import-db - if: github.event.inputs.IMPORT != false - with: - INSTANCE: ${{ env.INSTANCE }} - DATADIR: /opt/dspace-data/clarin-dspace/ diff --git a/.github/workflows/reindex.yml b/.github/workflows/reindex.yml deleted file mode 100644 index 06aaa4d7aa3..00000000000 --- a/.github/workflows/reindex.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Reindex dev-5 -on: - workflow_dispatch: -jobs: - reindex: - runs-on: dspace-dep-1 - steps: - - uses: actions/checkout@v3 - - name: reindex everything - run: | - cd $GITHUB_WORKSPACE/build-scripts/run/ - pwd - ./reindex.sh - docker exec dspace /dspace/bin/dspace oai clean-cache diff --git a/scripts/sourceversion.py b/scripts/sourceversion.py new file mode 100644 index 00000000000..6ac25034273 --- /dev/null +++ b/scripts/sourceversion.py @@ -0,0 +1,14 @@ +import subprocess +from datetime import datetime + +if __name__ == '__main__': + ts = datetime.now() + print(f"timestamp: {ts}") + + cmd = 'git log -1 --pretty=format:"%h - %ai"' + print(f">{cmd}") + subprocess.check_call(cmd, shell=True) + + cmd = 'git status --porcelain' + print(f">{cmd}:") + subprocess.check_call(cmd, shell=True) diff --git a/src/aai/aai.js b/src/aai/aai.js index cdfc7fc508e..e40e1c388dc 100644 --- a/src/aai/aai.js +++ b/src/aai/aai.js @@ -43,7 +43,7 @@ // Encode the redirect URL targetUrl += window.encodeURIComponent(redirectUrl); - window.location = opts.host + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID=' + window.encodeURIComponent(e.entityID); + window.location = opts.host + opts.port + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID=' + window.encodeURIComponent(e.entityID); }; //console.log(opts); if(!opts.target){ @@ -56,7 +56,7 @@ opts.ourEntityID, opts.responseUrl, [ ], - opts.host + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID='); + opts.host + opts.port + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID='); djc.discoPath = window.location.origin + (namespace === '' ? namespace : '/' + namespace) + "/assets/"; djc.metadata = [opts.metadataFeed]; djc.subtitle = "Login via Your home institution (e.g. university)"; diff --git a/src/aai/discojuice/discojuice.js b/src/aai/discojuice/discojuice.js index 821562e0848..4fd1397fcb4 100644 --- a/src/aai/discojuice/discojuice.js +++ b/src/aai/discojuice/discojuice.js @@ -33,7 +33,7 @@ d+" entries listed"))},error:function(a){console.log("error"+a);this.popu DiscoJuice.Dict.helpMore),h=this.parent.Utils.options.get("subtitle",null),c='";var f=this,d=$("body");this.parent.Utils.options.get("useTarget",!1)&&(d=this.parent.Utils.options.get("target",d));/*console.log("Target is");console.log(d);*/this.parent.Utils.options.get("overlay",!0)&&(/*console.log("DiscoJuice Enable: adding overlay"),*/$('').appendTo($("body")));this.popup=$(c).appendTo(d); var that = this; diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html index 3506faa5c3f..f9f8ce50836 100644 --- a/src/app/home-page/home-page.component.html +++ b/src/app/home-page/home-page.component.html @@ -44,13 +44,16 @@