dataquest-dev
diff --git a/‎.github/workflows/deploy.yml‎
Lines changed: 24 additions & 27 deletions b/‎.github/workflows/deploy.yml‎
Lines changed: 24 additions & 27 deletions
diff --git a/‎.github/workflows/playwright-tests.yml‎
Lines changed: 39 additions & 0 deletions b/‎.github/workflows/playwright-tests.yml‎
Lines changed: 39 additions & 0 deletions
diff --git a/‎.github/workflows/trigger-ui-tests.yml‎
Lines changed: 30 additions & 0 deletions b/‎.github/workflows/trigger-ui-tests.yml‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.html‎
Lines changed: 7 additions & 1 deletion b/‎src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.html‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts‎
Lines changed: 9 additions & 2 deletions b/‎src/app/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts‎
Lines changed: 9 additions & 2 deletions
diff --git a/‎src/app/core/roles/role.service.ts‎
Lines changed: 3 additions & 5 deletions b/‎src/app/core/roles/role.service.ts‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎src/app/item-page/simple/field-components/preview-section/preview-section.component.html‎
Lines changed: 23 additions & 9 deletions b/‎src/app/item-page/simple/field-components/preview-section/preview-section.component.html‎
Lines changed: 23 additions & 9 deletions
diff --git a/‎src/app/item-page/simple/field-components/preview-section/preview-section.component.ts‎
Lines changed: 2 additions & 2 deletions b/‎src/app/item-page/simple/field-components/preview-section/preview-section.component.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-complex.model.ts‎
Lines changed: 1 addition & 8 deletions b/‎src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-complex.model.ts‎
Lines changed: 1 addition & 8 deletions
diff --git a/‎src/static-files/cs/LINDAT-Web-Crawl-Licence.html‎
Lines changed: 69 additions & 0 deletions b/‎src/static-files/cs/LINDAT-Web-Crawl-Licence.html‎
Lines changed: 69 additions & 0 deletions
@@ -224,37 +224,34 @@ jobs:
     if: inputs.IMPORT
     timeout-minutes: 45
     steps:
-      - name: run playwright
-        run: |
-          # wait until FE stabilizes a bit
-          sleep 3m
-
-          curl -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" \
-          --request POST \
-          https://api.github.com/repos/dataquest-dev/\
-          dspace-ui-tests/actions/workflows/cron-test.yml/dispatches \
-          --data "{\"ref\":\"refs/heads/master\"}" 2> /dev/null
-
-          # wait for it to start
-          sleep 30s
+      - name: Checkout Playwright tests
+        uses: actions/checkout@v4
+        with:
+          repository: dataquest-dev/dspace-ui-tests
+          path: dspace-ui-tests
+          token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
 
-          # get result of last job
-          RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-ui-tests/actions/workflows/cron-test.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
+      - name: Checkout main repository
+        uses: actions/checkout@v4
+        with:
+          path: this-repository
 
-          # while job did not finish, sleep
-          while [[ $RES == 'null' ]]; do
-            sleep 10s
-           RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-ui-tests/actions/workflows/cron-test.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-          done;
+      - name: Copy customer config to UI tests repository for merging
+        run: |
+          cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/
 
-          echo $RES
-          # if last result is not success, return -1 and fail
-          if [[ $RES != \"success\" ]]; then
+      - name: test
+        working-directory: dspace-ui-tests/scripts
+        env:
+          HOME_URL: https://dev-5.pc:8443/repository/
+          NAME: LINDAT
+        run: |
+          ./test.sh
 
-            echo "playwright tests have failed! check appropriate action run in the dspace-ui-tests repository"
-            exit 1
-          fi;
+      - uses: mazoea/ga-maz/end@master
+        with:
+          CHOWN_DIR: ./
+        if: ${{ always() }}
 
   rest-tests-after-import8:
     runs-on: ubuntu-latest
 
@@ -0,0 +1,39 @@
+name: Playwright tests
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  playwright-tests:
+    runs-on: dspace-test-1
+    timeout-minutes: 45
+    steps:
+      - name: Checkout Playwright tests
+        uses: actions/checkout@v4
+        with:
+          repository: dataquest-dev/dspace-ui-tests
+          path: dspace-ui-tests
+          token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
+
+      - name: Checkout main repository
+        uses: actions/checkout@v4
+        with:
+          path: this-repository
+
+      - name: Copy customer config to UI tests repository for merging
+        run: |
+          cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/
+
+      - name: test
+        working-directory: dspace-ui-tests/scripts
+        env:
+          HOME_URL: https://dev-5.pc:8443/repository/
+          NAME: LINDAT
+        run: |
+          ./test.sh
+
+      - uses: mazoea/ga-maz/end@master
+        with:
+          CHOWN_DIR: ./
+        if: ${{ always() }}
@@ -0,0 +1,30 @@
+name: Trigger UI Tests for All Customer Branches
+
+on:
+  workflow_dispatch:
+  workflow_call:
+  schedule:
+    - cron: '0 5 * * *'
+
+permissions:
+  actions: write # Grants permission to trigger workflows
+  contents: read # Access to repository contents
+
+jobs:
+  trigger-builds:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Get and Trigger Customer Branch UI Tests
+        run: |
+          # Authenticate with GitHub CLI using the token
+          echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+
+          git fetch --prune origin
+          BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/')
+          for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do
+            echo "Triggering UI tests for branch: $branch"
+            gh workflow run playwright-tests.yml --ref $branch
+          done
@@ -88,8 +88,14 @@ <h2 id="header" class="border-bottom pb-2">{{'clarin.license.agreement.title' |
   </div>
   <div class="row pt-3">
     <div class="col-12">
-      <button class="btn btn-success max-width" [disabled]="error$.value.length !== 0" (click)="accept()">
+      <button class="btn btn-success max-width" [disabled]="error$.value.length !== 0 || (isLoading | async)" (click)="accept()">
         {{'clarin.license.agreement.button.agree' | translate}}
+        <span
+          *ngIf="isLoading | async"
+          class="ml-1 spinner-border spinner-border-sm"
+          role="status"
+          aria-hidden="true"
+        ></span>
       </button>
     </div>
   </div>
 
@@ -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 { switchMap, take } from 'rxjs/operators';
+import { 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';
@@ -122,6 +122,11 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
    */
   licenseContentSeznam: BehaviorSubject<string> = new BehaviorSubject<string>('');
 
+  /**
+   * Indicates when the submission is in progress and resets after completion
+   */
+  isLoading: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
   constructor(
     protected clarinLicenseResourceMappingService: ClarinLicenseResourceMappingService,
     protected configurationDataService: ConfigurationDataService,
@@ -186,6 +191,8 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
       return;
     }
 
+    this.isLoading.next(true);
+
     const requestId = this.requestService.generateRequestId();
     // Response type must be `text` because it throws response as error byd status code is 200 (Success).
     const requestOptions: HttpOptions = Object.create({
@@ -216,7 +223,7 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
     const response = this.rdbService.buildFromRequestUUID(requestId);
     // Process response
     response
-      .pipe(getFirstCompletedRemoteData())
+      .pipe(getFirstCompletedRemoteData(), finalize(() => this.isLoading.next(false)))
       .subscribe(responseRD$ => {
         if (hasFailed(responseRD$.state)) {
           this.notificationService.error(
 
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged } from 'rxjs/operators';
+import { Observable, of, of as observableOf } from 'rxjs';
 
 import { RoleType } from './role-types';
 import { CollectionDataService } from '../data/collection-data.service';
@@ -24,9 +23,8 @@ export class RoleService {
    * Check if current user is a submitter
    */
   isSubmitter(): Observable<boolean> {
-    return this.collectionService.hasAuthorizedCollection().pipe(
-      distinctUntilChanged()
-    );
+    // TODO find a way to check if user has submitted items, not just if they have a collection with the submitter role
+    return of(true);
   }
 
   /**
 
@@ -1,10 +1,24 @@
-<!-- Loading Spinner -->
-<div *ngIf="(listOfFiles | async)?.length === 0" class="d-flex flex-column justify-content-center align-items-center my-3">
-  <div class="spinner-border text-primary" role="status"></div>
-  <div class="px-4 pt-2">{{'item.preview.loading-files' | translate}}
-    <a *ngIf="emailToContact" [href]="'mailto:' + emailToContact" class="email-text">{{ emailToContact }}</a>
+<ng-container *ngIf="(listOfFiles | async) as files; else loading">
+  <!-- Show "No files" message -->
+  <div *ngIf="(hasNoFiles | async)" class="text-center text-muted my-3">
+    {{ 'item.view.box.no-files.message' | translate }}
   </div>
-</div>
-<div *ngFor="let file of (listOfFiles | async)">
-  <ds-file-description [fileInput] = 'file'></ds-file-description>
-</div>
+
+  <!-- Show list of files -->
+  <div *ngFor="let file of files">
+    <ds-file-description [fileInput]="file"></ds-file-description>
+  </div>
+</ng-container>
+
+<!-- Spinner shown only while listOfFiles is null or undefined -->
+<ng-template #loading>
+  <div class="d-flex flex-column justify-content-center align-items-center my-3">
+    <div class="spinner-border text-primary" role="status"></div>
+    <div class="px-4 pt-2">
+      {{ 'item.preview.loading-files' | translate }}
+      <a *ngIf="emailToContact" [href]="'mailto:' + emailToContact" class="email-text">
+        {{ emailToContact }}
+      </a>
+    </div>
+  </div>
+</ng-template>
@@ -16,6 +16,7 @@ export class PreviewSectionComponent implements OnInit {
 
   listOfFiles: BehaviorSubject<MetadataBitstream[]> = new BehaviorSubject<MetadataBitstream[]>([] as any);
   emailToContact: string;
+  hasNoFiles: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
   constructor(protected registryService: RegistryService,
               private configService: ConfigurationDataService) {} // Modified
@@ -26,11 +27,10 @@ export class PreviewSectionComponent implements OnInit {
       .pipe(getAllSucceededRemoteListPayload())
       .subscribe((data: MetadataBitstream[]) => {
         this.listOfFiles.next(data);
+        this.hasNoFiles.next(!Array.isArray(data) || data.length === 0);
       });
     this.configService.findByPropertyName('lr.help.mail')?.subscribe(remoteData => {
       this.emailToContact = remoteData.payload?.values?.[0];
     });
   }
-
-
 }
@@ -109,8 +109,6 @@ export class DynamicComplexModel extends DynamicConcatModel {
     // remove undefined values
     values = values.filter(v => v);
 
-    // if funding type is `EU`
-    let isEUFund = false;
     values.forEach((val, index) =>  {
       if (val.value) {
         // do not set value if it bigger than allowed length
@@ -123,13 +121,8 @@ export class DynamicComplexModel extends DynamicConcatModel {
         if (this.name === SPONSOR_METADATA_NAME) {
           // if funding type is `EU`
           if (index === FUNDING_TYPE_INDEX && DEFAULT_EU_FUNDING_TYPES.includes(val.value)) {
-            isEUFund = true;
-          }
-          // if funding type is `EU` and input field is `openaire_id` -> show `openaire_id` readonly input field
-          if (index === EU_IDENTIFIER_INDEX && isEUFund && val.value.includes(EU_PROJECT_PREFIX)) {
+            // Show EU identifier input field
             (this.get(EU_IDENTIFIER_INDEX) as DsDynamicInputModel).hidden = false;
-          } else {
-            (this.get(EU_IDENTIFIER_INDEX) as DsDynamicInputModel).hidden = true;
           }
         }
       } else if (hasValue((this.get(index) as DsDynamicInputModel))) {
 
@@ -0,0 +1,69 @@
+<div id="faq-like">
+        <p><h1 id="anchor">LINDAT Web Crawl Licence</h1></p>
+        <div>(2024/12/13)</div>
+        <hr></hr>
+<div class="well">
+<h2>License Terms</h2>
+<p>LINDAT Web Crawl Licence (further as “Agreement”) between The
+publisher of the dataset (“The Publisher”) and The user of the dataset
+(“The User”).</p>
+<p>The User agrees to use the collection data set collected by The
+Publisher (the "Collection"). The User agrees to abide by the following
+understandings, terms and conditions. These understandings, terms and
+conditions apply equally to all or to part of the Collection, including
+any updates or new versions of the Collection supplied under this
+Agreement.</p>
+<p><h3 id="anchor-1">Copyright</h3></p>
+<p>The Collection has been obtained by crawling the Internet. Due to the
+size of the Collection it has not been practicable to obtain permission
+from copyright owners to provide the Collection for the uses permitted
+under this Agreement (“Permitted Uses”).</p>
+<p>The User understands that all the documents in the Collection are
+documents which have been at some time made publicly available on the
+Internet and which have been collected using a process which respects
+the commonly accepted methods (such as robots.txt) for indicating that
+the documents should not be so collected.</p>
+<p>Owners of copyright in individual documents may choose to request
+deletion of these documents from the Collection.</p>
+<p>The limitation on permitted use contained in the following section is
+intended to reduce the risk of any action being brought by copyright
+owners, but if this happens The User agrees to bear all associated
+liability.</p>
+<p><h3 id="anchor-2">Permitted Uses</h3></p>
+<p>The Collection may only be used for research and development of
+natural-language processing, information-retrieval or
+document-understanding systems.</p>
+<p>Summaries, analyses and interpretations of the linguistic properties
+of the Collection may be derived and published, provided it is not
+possible to reconstruct the Collection from these summaries.</p>
+<p>Small excerpts of the Collection may be displayed to others or
+published in a scientific or technical context, solely for the purpose
+of describing the research and development carried out and related
+issues.</p>
+<p>All efforts must be made not to infringe the rights of any third
+party including, but not limited to, the authors and publishers of any
+excerpts used in accordance with the clauses above in this “Permitted
+Uses” section.</p>
+<p>The User must make sure that they only display the Collection to or
+share the Collection with persons who also signed this Agreement with
+The Publisher.</p>
+<p><h3 id="anchor-3">Agreement to Delete Data on Request</h3></p>
+<p>The User undertakes to delete within thirty days of receiving notice
+all copies of any nominated document that is part of the Collection
+whenever requested to do so by either The Publisher or by the owner of
+copyright for the particular document.</p>
+<p><h3 id="anchor-4">No Warranty</h3></p>
+<p>The Collection is provided "as is", without warranty of any kind,
+express or implied, including but not limited to the warranties of
+merchantability, fitness for a particular purpose and noninfringement.
+In no event shall The Publisher be liable for any claim, damages or
+other liability, whether in an action of contract, tort or otherwise,
+arising in any way of the use of the Collection.</p>
+<p><h3 id="anchor-5">Termination</h3></p>
+<p>Either The Publisher or The User may terminate this Agreement at any time
+by notifying the other party in writing. On termination of the Agreement
+The User shall destroy all copies of the Collection.</p>
+<p><h3 id="anchor-6">Applicable Law</h3></p>
+<p>This Agreement is governed by the laws of the Czech Republic.</p>
+</div>
+</div>