Merge pull request #43 from ufal/dataquest/dtq-dev

dataquest -> lindat sync (lindat-2025.07.16502729677)

Author: kosarko

.github/workflows/trigger-ui-tests.yml

@@ -24,7 +24,14 @@ jobs:
 
           git fetch --prune origin
           BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/')
+          SKIP_BRANCHES=("customer/sav" "customer/vsb-tuo" "customer/zcu-data")
+          
           for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do
+            if [[ " ${SKIP_BRANCHES[@]} " =~ " ${branch} " ]]; then
+              echo "Skipping branch $branch"
+              continue
+            fi
+            
             echo "Triggering UI tests for branch: $branch"
             gh workflow run playwright-tests.yml --ref $branch
           done

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

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Bitstream } from '../../core/shared/bitstream.model';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { finalize, switchMap, take } from 'rxjs/operators';
+import { BehaviorSubject, firstValueFrom, Observable, of as observableOf } from 'rxjs';
+import { filter, finalize, switchMap, take } from 'rxjs/operators';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { ClarinUserRegistration } from '../../core/shared/clarin/clarin-user-registration.model';
 import { ClarinUserMetadata } from '../../core/shared/clarin/clarin-user-metadata.model';
@@ -35,13 +35,13 @@ 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 { 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';
 import cloneDeep from 'lodash/cloneDeep';
 import { ClarinUserMetadataDataService } from '../../core/data/clarin/clarin-user-metadata.service';
 import { HtmlContentService } from '../../shared/html-content.service';
+import { FileService } from '../../core/shared/file.service';
 
 /**
  * The component shows the user's filled in user metadata and the user can fill in other required user metadata.
@@ -143,7 +143,9 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
     private hardRedirectService: HardRedirectService,
     private requestService: RequestService,
     private clarinUserMetadataDataService: ClarinUserMetadataDataService,
-    private htmlContentService: HtmlContentService) { }
+    private htmlContentService: HtmlContentService,
+    protected fileService: FileService,
+    protected notificationsService: NotificationsService) { }
 
    ngOnInit(): void {
     // Load CurrentItem by bitstreamID to show itemHandle
@@ -242,7 +244,7 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
         } else {
           // Or just download the bitstream by download token
           const downloadToken = Object.values(responseRD$?.payload).join('');
-          this.redirectToDownload(downloadToken);
+          void this.redirectToDownload(downloadToken);
         }
       });
   }
@@ -255,23 +257,33 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
     return this.router.routerState.snapshot.url.endsWith('/zip');
   }
 
-  private redirectToDownload(downloadToken = null) {
-    // 1. Get bitstream
-    // 2. Get bitstream download link
-    // 3. Get bitstream content download link and check if there is `authorization-token` in to query params
-    let bitstream = null;
-    this.bitstream$
-      .pipe(take(1))
-      .subscribe(bitstream$ => {
-        bitstream = bitstream$;
-      });
-    let bitstreamDownloadPath = getBitstreamContentRoute(bitstream);
-    if (isNotEmpty(downloadToken)) {
-      bitstreamDownloadPath = this.halService.getRootHref() + '/core' + bitstreamDownloadPath +
-        '?dtoken=' + downloadToken;
+  /**
+   * Redirects to the download link of the bitstream.
+   * If a download token is provided, it appends it as a query parameter.
+   *
+   * @param downloadToken
+   * @private
+   */
+  private async redirectToDownload(downloadToken?: string): Promise<void> {
+    try {
+      const bitstream = await firstValueFrom(this.bitstream$.pipe(take(1)));
+
+      const fileLink = await firstValueFrom(
+        this.fileService.retrieveFileDownloadLink(bitstream._links.content.href).pipe(
+          filter(hasValue),
+          take(1)
+        )
+      );
+
+      // Determine whether the URL already contains query parameters
+      const hasQueryParams = fileLink.includes('?');
+      const tokenParam = downloadToken ? `${hasQueryParams ? '&' : '?'}dtoken=${downloadToken}` : '';
+
+      const redirectUrl = `${fileLink}${tokenParam}`;
+      this.hardRedirectService.redirect(redirectUrl);
+    } catch (error) {
+      this.notificationsService.error(this.translateService.instant('clarin-license-agreement-page.download-error'));
     }
-
-    this.hardRedirectService.redirect(bitstreamDownloadPath);
   }
 
   public getMetadataValueByKey(metadataKey: string) {

src/app/core/data/dso-redirect.service.ts

@@ -8,7 +8,7 @@
 /* eslint-disable max-classes-per-file */
 import { Injectable, Inject } from '@angular/core';
 import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { take, tap } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -19,7 +19,7 @@ import { RequestService } from './request.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { getDSORoute } from '../../app-routing-paths';
+import { getDSORoute, getForbiddenRoute } from '../../app-routing-paths';
 import { HardRedirectService } from '../services/hard-redirect.service';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { Router } from '@angular/router';
@@ -45,7 +45,7 @@ class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
       // interpolate id/uuid as query parameter
       (endpoint: string, resourceID: string): string => {
         return endpoint.replace(/{\?id}/, `?id=${resourceID}`)
-                       .replace(/{\?uuid}/, `?uuid=${resourceID}`);
+          .replace(/{\?uuid}/, `?uuid=${resourceID}`);
       },
     );
   }
@@ -108,12 +108,23 @@ export class DsoRedirectService {
             }
           }
         }
-        // Redirect to login page if the user is not authenticated to see the requested page
+        // Handle authentication errors: redirect unauthenticated users to login, authenticated users to forbidden page
         if (response.hasFailed && (response.statusCode === 401 || response.statusCode === 403)) {
-          // Extract redirect URL - remove `https://.../namespace` from the current URL. Keep only `handle/...`
-          const redirectUrl = this.extractHandlePath(window.location.href);
-          this.authService.setRedirectUrl(redirectUrl);
-          this.router.navigateByUrl('login');
+          const isAuthenticated$ = this.authService.isAuthenticated();
+          isAuthenticated$
+            .pipe(take(1))
+            .subscribe((isAuthenticated) => {
+              if (!isAuthenticated) {
+                // If the user is not authenticated, redirect to login page
+                // Extract redirect URL - remove `https://.../namespace` from the current URL. Keep only `handle/...`
+                const redirectUrl = this.extractHandlePath(window.location.href);
+                this.authService.setRedirectUrl(redirectUrl);
+                void this.router.navigateByUrl('login');
+              } else {
+                // If the user is authenticated but still has no access, redirect to forbidden page
+                void this.router.navigateByUrl(getForbiddenRoute());
+              }
+            });
         }
       })
     );

src/app/item-page/clarin-ref-citation/clarin-ref-citation.component.html

@@ -11,11 +11,7 @@
       </div>
     </div>
     <div class="pt-2 clarin-ref-box-body d-flex justify-content-between pl-2" >
-      <div class="clarin-ref-box-text pr-4">
-        <span>{{citationText + ', '}}</span>
-        <span><i>{{itemNameText + ', '}}</i></span>
-        <span>{{repositoryNameText + ', '}}</span>
-        <span><a [href]="identifierURI">{{prettifiedIdentifier | async}}</a></span>
+      <div class="clarin-ref-box-text pr-4" [innerHTML]="refboxContent | async">
       </div>
       <div class="clarin-ref-box-copy-wrapper" placement="bottom" [ngbTooltip]="'Copied!'" #tooltip="ngbTooltip"
            (click)="copyText()">