UFAL/Release hotfix 2026 02 26 - merge PR (#1225)

* Fix incorrect translation of "withdraw" (#1191)

* used stahnout instead of odstranit

* Update confirmation text for withdrawal action

* added empty lines as in origin

* removed spaces

---------

Co-authored-by: Kasinhou <129340513+Kasinhou@users.noreply.github.com>

* UFAL/Removed green line from the home page (#1204)

* UFAL/Added import-5 to deploy (#1206)

* UFAL/Removed unused github docker registry (#1212)

* internal/Renamed dspace-import to dspace-import-clarin in import action (#1209)

* renamed dspace-import to dspace-import-clarin

* removed unwanted changes

* UFAL/Editing similar process parameters (#1195)

* Preserve parameters when creating similar process

* Extract duplicate deep copy logic into helper

* Fix redundant parameter logic prevent empty accumulation

* UFAL/Display all versions in version history (#1213)

* Override pagesize and display all versions

* Changed hardcoded variable

---------

Co-authored-by: Matus Kasak <matus.kasak@dataquest.sk>

* UFAL/Missing translation for new curation task (#1208)

(cherry picked from commit 5465283)

* UFAL/We expect (in metadata) the path to be "licence" (#1193)

(cherry picked from commit 21521d1)
(cherry picked from commit c296d87)

* UFAL/Rewrite OAI links in static page HTML with rest.baseUrl (ufal#90) (#1189)

* Rewrite OAI links in static page HTML with rest.baseUrl

Updated StaticPageComponent to rewrite OAI links in loaded HTML content to use the configured rest.baseUrl, ensuring correct API endpoint references. Added comprehensive tests to verify link rewriting, handling of missing baseUrl, avoidance of double slashes, and cases with no OAI links.

* Remove unused ComponentFixture import in test

Cleaned up the static-page.component.spec.ts file by removing the unused ComponentFixture import to improve code clarity.

* Fix OAI URL construction and improve test coverage

Corrects the construction of the OAI URL in StaticPageComponent to avoid double slashes by removing the extra slash in the base URL. Also updates the unit test to properly instantiate the component and check its creation.

(cherry picked from commit cb86d07)

Co-authored-by: Amad Ul Hassan <hassan@ufal.mff.cuni.cz>

* Update path for dspace-import in action.yml (#1216)

Use dspace-import-clarin path instead of dspace-import

* Refactor erase-db action to clean up comments

Removed unnecessary comments and improved logging for volume removal.

* Use `dspace:dspace` permissions for the assetstore - not ubuntu:ubuntu (#1222)

* Use `dspace:dspace` permissions for the assetstore - not ubuntu:ubuntu

* Change permissions as root

* UFAL/Fix: generate correct curl download URLs using backend handle endpoint (#1215)

* fix: generate correct curl download URLs using backend handle endpoint

Updates the curl command generation to use the new backend endpoint
GET /api/core/bitstreams/handle/{prefix}/{suffix}/{filename} instead
of the non-existent /api/bitstream/{handle}/{seq}/{filename}.

Key changes:
- Uses correct backend endpoint path: /core/bitstreams/handle/{handle}/
- Removes unnecessary sequence index from URLs (uses filename only)
- Quotes the URL to prevent shell brace expansion
- For single file, uses -o with explicit filename

Fixes: #1210

* Fixed formatting of the file names

* fix: use -o with real filename to avoid percent-encoded names from curl -O

curl -O uses the URL path as the saved filename, so percent-encoded
characters (e.g. %20, %2B, %28) stay encoded in the output file.

Now generates separate 'curl -o realname url' for each file joined
with &&, ensuring files are saved with their actual names.

* fix: use curl -OJ with brace expansion for compact download command

* removed duplicates logic

* fix: use curl -o instead of -OJ to fix non-ASCII filenames on Windows

curl -J (Content-Disposition) cannot create files with non-ASCII characters
on Windows because it interprets the header bytes using the console code page.
Changed to curl -o filename url format where the shell passes the
filename directly to the OS, correctly handling Unicode on all platforms.
Also added tests for UTF-8 filenames and double-quote escaping.

* fix: use inline encodeURIComponent instead of encodeRFC3986URIComponent

encodeRFC3986URIComponent calls decodeURIComponent first, which throws
URIError on filenames containing a literal percent sign (e.g. '100% done.txt')
because '%' followed by non-hex chars is not a valid escape sequence.

Replaced with inline encodeURIComponent() + parentheses encoding directly
on the raw filename. Added test for literal percent sign in filenames.

* fix: restore brace expansion {} in curl URL with -o for filenames

curl command now uses brace expansion for compact URL:
  curl -o file1 -o file2 baseUrl{/encoded1,/encoded2}

This combines:
- {} brace expansion in the URL (compact, one URL for all files)
- -o flags with real filenames (handles UTF-8 correctly via shell)

* test: add complex filename test (diacritics, plus, hash, unmatched paren)

New FE test for 'Media (+)#9) ano' verifying correct URL encoding in brace
expansion and real filename in -o flag.

* fix: use separate -o url pairs instead of curl brace expansion

curl URL globbing ({}) does NOT support per-file -o flags. When using
  curl -o f1 -o f2 url{/a,/b}
curl maps the -o flags to URL arguments, not to globbed expansions,
resulting in 'Got more output options than URLs' and only one file saved.

Changed to separate -o + URL pairs per file:
  curl -o file1 url/file1 -o file2 url/file2

Updated all 12 test expectations to match.

* feat: show curl command in modal dialog with copy button

Replace inline command display with a centered NgbModal (size: lg) that
shows the curl command in a scrollable pre block. Includes a copy-to-clipboard
button with visual feedback (checkmark + 'Copied!' for 2s).

- Added NgbModal injection and openCommandModal()/copyCommand() methods
- Removed old isCommandLineVisible toggle and #command-div hover styles
- Added i18n keys for en, cs, de (copy/copied/close)
- Updated spec to import NgbModalModule

* Revert unnecessary changes

* Address Copilot review suggestions: accessibility, security, test fixes

- Reset canShowCurlDownload at start of generateCurlCommand()
- Add aria-labelledby to modal for screen reader accessibility
- Add .catch() to navigator.clipboard.writeText() for error handling
- Escape dollar signs and backticks in filenames for shell safety
- Fix ConfigurationDataService mock to return RemoteData-shaped object
- Add tests for canShowCurlDownload reset and shell injection protection

* fix: add fakeAsync/tick to CC license test for debounced getCcLicenseLink

---------

Co-authored-by: Paurikova2 <michaela.paurikova@dataquest.sk>

* UFAL/CURL downloads issue - fix integration test

---------

Co-authored-by: Paurikova2 <107862249+Paurikova2@users.noreply.github.com>
Co-authored-by: Kasinhou <129340513+Kasinhou@users.noreply.github.com>
Co-authored-by: Matus Kasak <matus.kasak@dataquest.sk>
Co-authored-by: Ondřej Košarko <ko_ok@centrum.cz>
Co-authored-by: Amad Ul Hassan <hassan@ufal.mff.cuni.cz>
Co-authored-by: Jozef Misutka <332350+vidiecan@users.noreply.github.com>
Co-authored-by: Paurikova2 <michaela.paurikova@dataquest.sk>

Author: 7 people

.github/actions/erase-db/action.yml

@@ -28,9 +28,6 @@ runs:
       env:
         NAME: ${{ inputs.NAME }}
       run: |
-          # # condition below was found by accident and appears to be useless. Investigate later.
-          # be sure to have INSTANCE set
-          # if [[ "x${NAME}" != "dspace-" ]]; then
-            docker volume rm $(docker volume ls --filter name="${NAME}_" -q) || true
-          # fi;
+          echo "Removing volumes for $(docker volume ls --filter name="${NAME}_" -q)"
+          docker volume rm $(docker volume ls --filter name="${NAME}_" -q) || true
 

.github/actions/import-db/action.yml

@@ -30,16 +30,16 @@ runs:
 
     - uses: actions/checkout@v4
       with:
-        repository: dataquest-dev/dspace-import
+        repository: dataquest-dev/dspace-import-clarin
         ref: 'main'
         submodules: 'recursive'
-        path: 'dspace-import'
+        path: 'dspace-import-clarin'
 
 
     - name: stop and remove containers
       id: import
       shell: bash
-      working-directory: dspace-import/scripts
+      working-directory: dspace-import-clarin/scripts
       env:
         DATADIR: ${{ inputs.DATADIR }}
         DB5PORT: 15432
@@ -62,6 +62,7 @@ runs:
             echo Location of assetstore folder is empty. Not copping assetstore
           else
             docker cp ${{ inputs.ASSETSTORE }} dspace${{ inputs.INSTANCE }}:/dspace/
+            docker exec -u root dspace${{ inputs.INSTANCE }} chown -R dspace:dspace /dspace/assetstore
           fi
           echo "====="
           cd ../

.github/workflows/build.yml

@@ -49,9 +49,6 @@ jobs:
       NODE_OPTIONS: '--max-old-space-size=4096'
       # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
-      # Docker Registry to use for Docker compose scripts below.
-      # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
-      DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
@@ -125,14 +122,6 @@ jobs:
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
-      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)

.github/workflows/deploy.yml

@@ -109,6 +109,48 @@ jobs:
           /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-5:
+    runs-on: dspace-dep-1
+    if: inputs.IMPORT
+    needs: deploy-5
+    env:
+      INSTANCE: '5'
+      ENVFILE: /opt/dspace-envs/.env.dspace.dev-5
+    steps:
+      - uses: ./.github/actions/import-db
+        with:
+          INSTANCE: ${{ env.INSTANCE }}
+          DATADIR: /opt/dspace-data/clarin-dspace-oxford/
+          ASSETSTORE: /opt/dspace-data/clarin-dspace-oxford/assetstore/
+          LOGDIR: /log/
+          ADMIN_PASSWORD: ${{ secrets.DSPACE_ADMIN_PASSWORD }}
+
+      - name: dspace basic command
+        run: |
+          export DNAME=dspace$INSTANCE
+          docker logs -n 50 $DNAME
+
+          echo "dspace version:"
+          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace version"
+
+          echo "dspace cleanup:"
+          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace cleanup -v"
+
+          echo "dspace reindex solr:"
+          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace index-discovery -b"
+
+          echo "dspace reindex OAI-PMH:"
+          docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace oai import -c"
+
+          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"
+
   import-8:
     runs-on: dspace-dep-1
     if: inputs.IMPORT

build-scripts/run/start.sh

@@ -48,6 +48,7 @@ popd
 echo "====="
 echo "Copy assetstore"
 docker cp assetstore dspace${INSTANCE}:/dspace/
+docker exec -u root dspace${INSTANCE} chown -R dspace:dspace /dspace/assetstore
 
 echo "====="
 echo "Finished start.sh"

src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts

@@ -115,7 +115,7 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
   /**
    * The path to the Seznam dataset license content.
    */
-  LICENSE_PATH_SEZNAM_CZ = 'szn-dataset-license.html';
+  LICENSE_PATH_SEZNAM_CZ = 'szn-dataset-licence.html';
 
   /**
    * The content of the Seznam dataset license. Fetch from the static file.

src/app/item-page/clarin-files-section/clarin-files-section.component.html

@@ -3,15 +3,33 @@
   <h6><i class="fa fa-paperclip">&nbsp;</i>{{'item.page.files.head' | translate}}</h6>
   <div class="pb-3">
     <span class="pr-1">
-      <a class="btn btn-download" (click)="setCommandline()" style="text-decoration: none"
+      <a class="btn btn-download" (click)="openCommandModal(commandModal)" style="text-decoration: none"
          *ngIf="canShowCurlDownload">
         <i class="fa fa-download fa-3x" style="display: block">&nbsp;</i>
         {{'item.page.download.button.command.line' | translate}}
       </a>
     </span>
-    <div id="command-div" *ngIf="isCommandLineVisible">
-        <pre class="command-pre">{{ command }}</pre>
-    </div>
+
+    <ng-template #commandModal let-modal>
+      <div class="modal-header">
+        <h5 class="modal-title" id="commandModalTitle">{{'item.page.download.button.command.line' | translate}}</h5>
+        <button type="button" class="close" aria-label="Close" (click)="modal.dismiss()">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <pre class="command-pre mb-0">{{ command }}</pre>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-outline-secondary" (click)="copyCommand()">
+          <i class="fa" [ngClass]="commandCopied ? 'fa-check' : 'fa-clipboard'"></i>
+          {{ commandCopied ? ('item.page.download.command.copied' | translate) : ('item.page.download.command.copy' | translate) }}
+        </button>
+        <button class="btn btn-secondary" (click)="modal.close()">
+          {{'item.page.download.command.close' | translate}}
+        </button>
+      </div>
+    </ng-template>
     <span>
       <a *ngIf="
       (totalFileSizes | async) > (downloadZipMinFileSize | async) &&

src/app/item-page/clarin-files-section/clarin-files-section.component.scss

@@ -17,44 +17,17 @@ The styling file for the `clarin-files-section.component`
 
 .command-pre {
   display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
+  padding: 12px 16px;
+  margin: 0;
   font-size: 13px;
-  line-height: 1.428571429;
+  line-height: 1.5;
+  white-space: pre-wrap;
   word-break: break-all;
   word-wrap: break-word;
   background-color: #d9edf7;
   color: #3a87ad;
   border: 1px solid #ccc;
   border-radius: 4px;
-}
-
-#command-div .repo-copy-btn {
-  opacity: 0;
-  -webkit-transition: opacity 0.3s ease-in-out;
-  -o-transition: opacity 0.3s ease-in-out;
-  transition: opacity 0.3s ease-in-out;
-}
-
-#command-div:hover .repo-copy-btn, #command-div .repo-copy-btn:focus {
-  opacity: 1;
-}
-
-.repo-copy-btn {
-  width: 20px;
-  height: 20px;
-  position: relative;
-  display: inline-block;
-  padding: 0 !important;
-}
-
-.repo-copy-btn:before {
-  content: " ";
-  background-size: 13px 15px;
-  background-repeat: no-repeat;
-  background-color: red;
-  display: inline-block;
-  width: 13px;
-  height: 15px;
-  padding: 0 !important;
+  max-height: 60vh;
+  overflow-y: auto;
 }