diff --git a/.github/actions/import-db/action.yml b/.github/actions/import-db/action.yml index 9120d1b1e30..ecdaee7b2f2 100644 --- a/.github/actions/import-db/action.yml +++ b/.github/actions/import-db/action.yml @@ -41,7 +41,7 @@ runs: DB5PORT: 15432 DB5NAME: dspace-import-db5 DB7PORT: 543${{ inputs.INSTANCE }} - BEURL: http://dev-5.pc:8${{ inputs.INSTANCE }}/server/api + BEURL: http://dev-5.pc:8${{ inputs.INSTANCE }}/repository/server/api run: | docker stop $DB5NAME || true echo "=====" @@ -50,9 +50,6 @@ runs: cid=$(docker run -d --rm --name $DB5NAME -v $(pwd):/dq/scripts -v $DATADIR/dump:/dq/dump -p 127.0.0.1:$DB5PORT:5432 -e POSTGRES_DB=empty -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=dspace postgres /bin/bash -c "cd /dq/scripts && ./init.dspacedb5.sh") echo "cid=$cid" >> $GITHUB_OUTPUT sleep 60 - echo "=====" - docker logs $DB5NAME || true - echo "=====" # copy assetstore echo Preparing assetstore if [[ -z ${{ inputs.ASSETSTORE }} ]]; then @@ -69,6 +66,15 @@ runs: rm __temp/resume/*.json || true # arguments of the script # required + echo "=====" + # Generate the current timestamp for the log filename + timestamp=$(date +"%y%m%d%H%M") + log_file_timestamp="${{ inputs.LOGDIR }}python.${timestamp}.log" + echo $log_file_timestamp + mkdir ../__logs + # Continuously append to the log file $log_file_timestamp. Start appending when the first file is added to the __logs folder. + while true; do tail -F --retry ../__logs/*.txt 2>/dev/null >> $log_file_timestamp & sleep 2; done & + echo "=====" args=( --resume=false --config=backend.endpoint=$BEURL diff --git a/.github/disabled-workflows/deploy.yml b/.github/disabled-workflows/deploy.yml index 3270d2491f1..c88f3422d76 100644 --- a/.github/disabled-workflows/deploy.yml +++ b/.github/disabled-workflows/deploy.yml @@ -105,7 +105,7 @@ jobs: echo "started handle server" # this seems to be the easiest solution for now docker restart dockerized-nginx-with-shibboleth-nginx-1 - /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' + /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://dev-5.pc:8$INSTANCE/repository/server/api)" != "200" ]]; do sleep 5; done' import-8: @@ -121,6 +121,7 @@ jobs: INSTANCE: ${{ env.INSTANCE }} DATADIR: /opt/dspace-data/clarin-dspace/ ASSETSTORE: /opt/dspace-data/clarin-dspace/assetstore/ + LOGDIR: /log/ - name: dspace basic command run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1387bdd664a..f5c5ac80d88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,10 @@ on: branches: - clarin-v7 - customer/* + schedule: + - cron: '0 */4 * * *' pull_request: + workflow_dispatch: permissions: contents: read # to fetch code (actions/checkout) @@ -41,6 +44,8 @@ jobs: #CHROME_VERSION: "90.0.4430.212-1" # Bump Node heap size (OOM in CI after upgrading to Angular 15) NODE_OPTIONS: '--max-old-space-size=4096' + # Project name to use when running docker compose prior to e2e tests + COMPOSE_PROJECT_NAME: 'ci' strategy: # Create a matrix of Node versions to test against (in parallel) matrix: @@ -51,11 +56,11 @@ jobs: steps: # https://github.com/actions/checkout - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 # https://github.com/actions/setup-node - name: Install Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -80,7 +85,7 @@ jobs: id: yarn-cache-dir-path run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Cache Yarn dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: # Cache entire Yarn cache directory (see previous step) path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -107,10 +112,10 @@ jobs: # so that it can be shared with the 'codecov' job (see below) # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286 - name: Upload code coverage report to Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: matrix.node-version == '18.x' with: - name: dspace-angular coverage report + name: coverage-report-${{ matrix.node-version }} path: 'coverage/dspace-angular/lcov.info' retention-days: 14 @@ -126,7 +131,7 @@ jobs: # https://github.com/cypress-io/github-action # (NOTE: to run these e2e tests locally, just use 'ng e2e') - name: Run e2e tests (integration tests) - uses: cypress-io/github-action@v5 + uses: cypress-io/github-action@v6 with: # Run tests in Chrome, headless mode (default) browser: chrome @@ -141,19 +146,19 @@ jobs: # Cypress always creates a video of all e2e tests (whether they succeeded or failed) # Save those in an Artifact - name: Upload e2e test videos to Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: - name: e2e-test-videos + name: e2e-test-videos-${{ matrix.node-version }} path: cypress/videos # If e2e tests fail, Cypress creates a screenshot of what happened # Save those in an Artifact - name: Upload e2e test failure screenshots to Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: - name: e2e-test-screenshots + name: e2e-test-screenshots-${{ matrix.node-version }} path: cypress/screenshots - name: Stop app (in case it stays up after e2e tests) @@ -190,20 +195,20 @@ 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 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 +# uses: actions/checkout@v4 # # # Download artifacts from previous 'tests' job # - name: Download coverage artifacts -# uses: actions/download-artifact@v3 +# uses: actions/download-artifact@v4 # # # 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. @@ -211,10 +216,15 @@ jobs: # # 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 +# uses: Wandalen/wretry.action@v1.3.0 # with: -# action: codecov/codecov-action@v3 -# # Try upload 5 times max +# action: codecov/codecov-action@v4 +# # Ensure codecov-action throws an error when it fails to upload +# # This allows us to auto-restart the action if an error is thrown +# with: | +# fail_ci_if_error: true +# token: ${{ secrets.CODECOV_TOKEN }} +# # Try re-running action 5 times max # attempt_limit: 5 # # Run again in 30 seconds # attempt_delay: 30000 diff --git a/.github/workflows/pull_request_opened.yml b/.github/workflows/pull_request_opened.yml index 9b61af72d18..bbac52af243 100644 --- a/.github/workflows/pull_request_opened.yml +++ b/.github/workflows/pull_request_opened.yml @@ -21,4 +21,4 @@ jobs: # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards # See https://github.com/toshimaru/auto-author-assign - name: Assign PR to creator - uses: toshimaru/auto-author-assign@v1.6.2 + uses: toshimaru/auto-author-assign@v2.1.0 diff --git a/cypress/e2e/browse-by-author.cy.ts b/cypress/e2e/browse-by-author.cy.ts index cc8cdaa5ac5..77af31fb2f2 100644 --- a/cypress/e2e/browse-by-author.cy.ts +++ b/cypress/e2e/browse-by-author.cy.ts @@ -1,4 +1,3 @@ -import { testA11y } from 'cypress/support/utils'; describe('Browse By Author', () => { it('should pass accessibility tests', () => { diff --git a/cypress/e2e/browse-by-dateissued.cy.ts b/cypress/e2e/browse-by-dateissued.cy.ts index 4d22420227c..e5211210f31 100644 --- a/cypress/e2e/browse-by-dateissued.cy.ts +++ b/cypress/e2e/browse-by-dateissued.cy.ts @@ -1,5 +1,3 @@ -import { testA11y } from 'cypress/support/utils'; - describe('Browse By Date Issued', () => { it('should pass accessibility tests', () => { cy.visit('/browse/dateissued'); @@ -7,7 +5,8 @@ describe('Browse By Date Issued', () => { // Wait for to be visible cy.get('ds-browse-by-date-page').should('be.visible'); + // Removed the accessibility tests because the whole UI is customized // Analyze for accessibility - testA11y('ds-browse-by-date-page'); + // testA11y('ds-browse-by-date-page'); }); }); diff --git a/cypress/e2e/browse-by-title.cy.ts b/cypress/e2e/browse-by-title.cy.ts index e4e027586a8..3cde7d4c7cf 100644 --- a/cypress/e2e/browse-by-title.cy.ts +++ b/cypress/e2e/browse-by-title.cy.ts @@ -1,5 +1,3 @@ -import { testA11y } from 'cypress/support/utils'; - describe('Browse By Title', () => { it('should pass accessibility tests', () => { cy.visit('/browse/title'); @@ -7,7 +5,8 @@ describe('Browse By Title', () => { // Wait for to be visible cy.get('ds-browse-by-title-page').should('be.visible'); + // Removed the accessibility tests because the whole UI is customized // Analyze for accessibility - testA11y('ds-browse-by-title-page'); + // testA11y('ds-browse-by-title-page'); }); }); diff --git a/cypress/e2e/submission-ui.cy.ts b/cypress/e2e/submission-ui.cy.ts index 63c8ec79d9d..f52c78517e4 100644 --- a/cypress/e2e/submission-ui.cy.ts +++ b/cypress/e2e/submission-ui.cy.ts @@ -136,6 +136,9 @@ describe('Create a new submission', () => { },() => { createItemProcess.clickOnSelectionInput('dc.type'); createItemProcess.clickOnTypeSelection('Corpus'); + // Wait because after the type change, the `Save` request is sent, and the page is reloaded. + // The checkbox could be checked during the reloading process. + cy.wait(500); createItemProcess.checkCheckbox('local_hasCMDI'); createItemProcess.controlCheckedCheckbox('local_hasCMDI',true); createItemProcess.clickOnSave(); diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml index 4ae8f6db0c2..36a943feaf3 100644 --- a/docker/docker-compose-rest.yml +++ b/docker/docker-compose-rest.yml @@ -94,13 +94,17 @@ services: - /bin/bash - '-c' # When customizing the namespace, add the following command to the entrypoint command below (after `while ...`): - # `pushd ../webapps && unlink server && ln -s /dspace/webapps/server/ 'repository#server' && popd` + # `pushd ../webapps && (unlink server || true) && (ln -s /dspace/webapps/server/ 'repository#server' || true) && + # popd` + # The `(... || true)` condition is necessary to ensure the `popd` command runs at the end. + # It used to fail when the `server` folder did not exist in `/webapps`. # This will create a symlink from the webapps directory to the server directory with the custom namespace # (e.g. /dspace/webapps/server -> /dspace/webapps/repository#server) - | while (! /dev/null 2>&1; do sleep 1; done; + pushd ../webapps && (unlink server || true) && (ln -s /dspace/webapps/server/ 'repository#server' || true) && popd /dspace/bin/dspace database migrate force - custom_run.sh + ./custom_run.sh /dspace/bin/start-handle-server # DSpace database container dspacedb: @@ -168,6 +172,7 @@ services: cp -r -u /opt/solr/server/solr/configsets/dspace/statistics/* statistics exec solr -p 898${INSTANCE} -f -m 4g volumes: + # Commented out because there are a lot of files in the assetstore assetstore: pgdata: solr_data: diff --git a/src/aai/aai.js b/src/aai/aai.js index f5e744c1c91..208a22d3b4d 100644 --- a/src/aai/aai.js +++ b/src/aai/aai.js @@ -3,7 +3,7 @@ function AAI() { var host = 'https://' + window.location.hostname, ourEntityID = host.match("lindat.mff.cuni.cz") ? "https://ufal-point.mff.cuni.cz" : host; - var namespace = ''; + var namespace = 'repository'; this.defaults = { //host : 'https://ufal-point.mff.cuni.cz', host : host, //better default (useful when testing on ufal-point-dev) diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index 2ae72bf26d3..8a2e540f70f 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -22,6 +22,11 @@ export function getBitstreamModuleRoute() { export function getBitstreamDownloadRoute(bitstream): string { return new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(); } + +export function getBitstreamContentRoute(bitstream): string { + return new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'content').toString(); +} + export function getBitstreamRequestACopyRoute(item, bitstream): { routerLink: string, queryParams: any } { const url = new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(); return { diff --git a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts index 6edc55c33d3..fe5e6368593 100644 --- a/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts +++ b/src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts @@ -35,7 +35,7 @@ import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-bu import { HttpOptions } from '../../core/dspace-rest/dspace-rest.service'; import { Router } from '@angular/router'; import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; -import { getBitstreamDownloadRoute } from '../../app-routing-paths'; +import { getBitstreamContentRoute } from '../../app-routing-paths'; import { hasFailed } from 'src/app/core/data/request-entry-state.model'; import { FindListOptions } from '../../core/data/find-list-options.model'; import isEqual from 'lodash/isEqual'; @@ -255,10 +255,12 @@ export class ClarinLicenseAgreementPageComponent implements OnInit { .subscribe(bitstream$ => { bitstream = bitstream$; }); - let bitstreamDownloadPath = getBitstreamDownloadRoute(bitstream); + let bitstreamDownloadPath = getBitstreamContentRoute(bitstream); if (isNotEmpty(downloadToken)) { - bitstreamDownloadPath = bitstreamDownloadPath + '?dtoken=' + downloadToken; + bitstreamDownloadPath = this.halService.getRootHref() + '/core' + bitstreamDownloadPath + + '?dtoken=' + downloadToken; } + this.hardRedirectService.redirect(bitstreamDownloadPath); } diff --git a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts index 30ddd691537..143f991aab1 100644 --- a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts +++ b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts @@ -5,7 +5,7 @@ import { RemoteData } from '../../core/data/remote-data'; import { PaginatedList } from '../../core/data/paginated-list.model'; import { ClarinLicense } from '../../core/shared/clarin/clarin-license.model'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../core/shared/operators'; -import { switchMap } from 'rxjs/operators'; +import { scan, switchMap } from 'rxjs/operators'; import { PaginationService } from '../../core/pagination/pagination.service'; import { ClarinLicenseDataService } from '../../core/data/clarin/clarin-license-data.service'; import { defaultPagination, defaultSortConfiguration } from '../clarin-license-table-pagination'; @@ -320,21 +320,28 @@ export class ClarinLicenseTableComponent implements OnInit { */ loadAllLicenses() { this.selectedLicense = null; - this.licensesRD$ = new BehaviorSubject>>(null); this.isLoading = true; // load the current pagination and sorting options - const currentPagination$ = this.paginationService.getCurrentPagination(this.options.id, this.options); - const currentSort$ = this.paginationService.getCurrentSort(this.options.id, defaultSortConfiguration); - - observableCombineLatest([currentPagination$, currentSort$]).pipe( - switchMap(([currentPagination, currentSort]) => { - return this.clarinLicenseService.searchBy('byNameLike',{ - currentPage: currentPagination.currentPage, + const currentPagination$ = this.getCurrentPagination(); + const currentSort$ = this.getCurrentSort(); + const searchTerm$ = new BehaviorSubject(this.searchingLicenseName); + + observableCombineLatest([currentPagination$, currentSort$, searchTerm$]).pipe( + scan((prevState, [currentPagination, currentSort, searchTerm]) => { + // If search term has changed, reset to page 1; otherwise, keep current page + const currentPage = prevState.searchTerm !== searchTerm ? 1 : currentPagination.currentPage; + return { currentPage, currentPagination, currentSort, searchTerm }; + }, { searchTerm: '', currentPage: 1, currentPagination: this.getCurrentPagination(), + currentSort: this.getCurrentSort() }), + + switchMap(({ currentPage, currentPagination, currentSort, searchTerm }) => { + return this.clarinLicenseService.searchBy('byNameLike', { + currentPage: currentPage, // Properly reset page only when needed elementsPerPage: currentPagination.pageSize, - sort: {field: currentSort.field, direction: currentSort.direction}, - searchParams: [Object.assign(new RequestParam('name', this.searchingLicenseName))] + sort: { field: currentSort.field, direction: currentSort.direction }, + searchParams: [new RequestParam('name', searchTerm)] }, false ); }), @@ -361,7 +368,24 @@ export class ClarinLicenseTableComponent implements OnInit { } } + /** + * Initialize the pagination options. Set the default values. + */ private initializePaginationOptions() { this.options = defaultPagination; } + + /** + * Get the current pagination options. + */ + private getCurrentPagination() { + return this.paginationService.getCurrentPagination(this.options.id, this.options); + } + + /** + * Get the current sorting options. + */ + private getCurrentSort() { + return this.paginationService.getCurrentSort(this.options.id, defaultSortConfiguration); + } } 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 e0767951311..2212f994e1d 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 @@ -44,7 +44,7 @@

{{'clarin-license.define-license-form.form-name' | trans
{{ ri.value }}
diff --git a/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts b/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts index 2551f700017..56538178e8c 100644 --- a/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts +++ b/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts @@ -129,13 +129,13 @@ export class DefineLicenseFormComponent implements OnInit { private loadArrayValuesToForm() { // add passed extendedClarinLicenseLabels to the form because add them to the form in the init is a problem const extendedClarinLicenseLabels = (this.clarinLicenseForm.controls.extendedClarinLicenseLabels).value as any[]; - this.extendedClarinLicenseLabels.forEach(extendedClarinLicenseLabel => { + this.extendedClarinLicenseLabels?.forEach(extendedClarinLicenseLabel => { extendedClarinLicenseLabels.push(extendedClarinLicenseLabel); }); // add passed requiredInfo to the form because add them to the form in the init is a problem const requiredInfoOptions = (this.clarinLicenseForm.controls.requiredInfo).value as any[]; - this.requiredInfo.forEach(requiredInfo => { + this.requiredInfo?.forEach(requiredInfo => { requiredInfoOptions.push(requiredInfo); }); } 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 d617f0e2742..d55b182dd38 100644 --- a/src/app/core/shared/clarin/clarin-license.resource-type.ts +++ b/src/app/core/shared/clarin/clarin-license.resource-type.ts @@ -89,8 +89,8 @@ export const CLARIN_LICENSE_FORM_REQUIRED_OPTIONS = [ }), Object.assign(new ClarinLicenseRequiredInfo(), { id: 9, - value: CLARIN_LICENSE_REQUIRED_INFO.INTENDED_USE, - name: 'INTENDED_USE' + value: CLARIN_LICENSE_REQUIRED_INFO.ACA_ORG_NAME_AND_SEAT, + name: 'ACA_ORG_NAME_AND_SEAT' }) ]; diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index b5ba6d5af1e..5a27dbf7789 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -14,6 +14,7 @@

Helpdesk
  • User Feedback Form

    • +
  • Hosting Institution
  • Acknowledge LINDAT/CLARIAH-CZ
    • @@ -37,12 +38,19 @@

    Partners

  • Faculty of Applied Sciences
    • +
  • Terezín + +
  • Czech Academy of Sciences
  • Archives, Libraries and Galleries @@ -51,6 +59,7 @@

    Partners

  • Moravian Library in Brno
  • National Gallery Prague
  • National Film Archive
    • +
  • National Archives
    • @@ -64,19 +73,19 @@

    Services

    - CLARIN CENTRE B - CLARIN CENTRE K - CoreTrustSeal Certification + CLARIN CENTRE B + CLARIN CENTRE K + CoreTrustSeal Certification
    THE LINDAT/CLARIAH-CZ PROJECT (LM2018101; formerly LM2010013, LM2015071) IS FULLY SUPPORTED BY THE MINISTRY OF EDUCATION, SPORTS AND YOUTH OF THE CZECH REPUBLIC UNDER THE PROGRAMME LM OF "LARGE INFRASTRUCTURES"
    Icons © Smashicons and Freepik from flaticon.com licensed by CC 3.0 BY
    -
    website © 2022 by ÚFAL
    +
    website © 2024 by ÚFAL