Merged dspace-cris-2025_02_x into task/dspace-cris-2025_02_x/DSC-2607

Author: Andrea Barbasso

.github/workflows/build.yml

@@ -7,8 +7,8 @@ name: Build
 on: [push, pull_request]
 
 permissions:
-  contents: read  # to fetch code (actions/checkout)
-  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
+  contents: read # to fetch code (actions/checkout)
+  packages: read # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -19,7 +19,7 @@ jobs:
       # NOTE: These settings should be kept in sync with those in [src]/docker/docker-compose-ci.yml
       DSPACE_REST_HOST: 127.0.0.1
       DSPACE_REST_PORT: 8080
-      DSPACE_REST_NAMESPACE: '/server'
+      DSPACE_REST_NAMESPACE: "/server"
       DSPACE_REST_SSL: false
       # Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 20+
       DSPACE_UI_HOST: 127.0.0.1
@@ -35,9 +35,9 @@ jobs:
       # Comment this out to use the latest release
       #CHROME_VERSION: "116.0.5845.187-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
-      NODE_OPTIONS: '--max-old-space-size=4096'
+      NODE_OPTIONS: "--max-old-space-size=4096"
       # Project name to use when running "docker compose" prior to e2e tests
-      COMPOSE_PROJECT_NAME: 'ci'
+      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
@@ -117,7 +117,7 @@ jobs:
         if: matrix.node-version == '20.x'
         with:
           name: coverage-report-${{ matrix.node-version }}
-          path: 'coverage/dspace-angular/lcov.info'
+          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.
@@ -142,6 +142,7 @@ jobs:
       - name: Run e2e tests (integration tests)
         uses: cypress-io/github-action@v6
         with:
+          install-command: npm ci
           # Run tests in Chrome, headless mode (default)
           browser: chrome
           # Start app before running tests (will be stopped automatically after tests finish)
@@ -234,9 +235,9 @@ jobs:
       # the name of the project. If it does, then SSR is working.
       - name: Verify SSR on a Project page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/project/1e3451e4-60d7-46a8-962e-5b94b62c63ff)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/project/28f8f49a-1aaf-4acc-93a9-203f3cf7ba62)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Test DSC-1819"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "TEST PROJECT"
 
       # Get a specific orgunit in our test data and verify that the <meta name="title"> tag includes
       # the name of the orgunit. If it does, then SSR is working.
@@ -262,7 +263,6 @@ jobs:
           echo "$result"
           echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "test funding"
 
-
       # Verify 301 Handle redirect behavior
       # Note: /handle/123456789/260 is the same test Publication used by our e2e tests
       - name: Verify 301 redirect from '/handle' URLs

cypress/e2e/my-dspace.cy.ts

@@ -119,7 +119,7 @@ describe('My DSpace page', () => {
     // Open the New Import dropdown
     cy.get('button[data-test="import-dropdown"]').click();
     // Click on the "Item" type in that dropdown
-    cy.get('#importControlsDropdownMenu button[title="Equipment"]').click();
+    cy.get('#importControlsDropdownMenu button[title="Funding"]').click();
 
     // New URL should include /import-external, as we've moved to the import page
     cy.url().should('include', '/import-external');

cypress/support/e2e.ts

@@ -21,6 +21,12 @@ import 'cypress-axe';
 
 import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
 
+Cypress.Commands.overwrite('visit', (originalFn, url, options) => {
+  return originalFn(url, options).then(() => {
+    cy.get('[data-test="ds-hydrated"]');
+  });
+});
+
 // We might receive uncaught exceptions from external libraries (e.g. it happened before with a broken
 // version of the addToAny plugin). These should not cause our tests to fail, so we catch them here.
 Cypress.on('uncaught:exception', (err, runnable) => {

docker/db.entities.yml

@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-postgres-pgcrypto:${DSPACE_VER:-dspace-cris-2025_02_x}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-4science}/dspace-cris-postgres-loadsql:${DSPACE_VER:-dspace-cris-2025_02_x}"
     environment:
       # This LOADSQL should be kept in sync with the URL in 4Science/DSpace
       # This SQL is available from https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2025.02.00/db-entities.sql

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2025.02.00-SNAPSHOT",
+  "version": "2025.02.01-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "test:rest": "ts-node --project ./tsconfig.ts-node.json scripts/test-rest.ts",

src/app/audit-page/object-audit-overview/object-audit-overview.component.html

@@ -5,7 +5,9 @@ <h2 class="flex-grow-1">{{'audit.object.overview.title' | translate}}</h2>
 
   @if (object) {
     <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
-    @if ((auditsRD$ | async)?.payload; as audits) {
+    @let auditRD = (auditsRD$ | async);
+    @let audits = auditRD?.payload;
+    @if (audits) {
       @if (audits.totalElements === 0) {
         <div>
           No audits found.
@@ -29,22 +31,25 @@ <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
                 </tr>
               </thead>
               <tbody>
-                @for (audit of audits.page; track audit) {
+                @for (audit of audits.page; track audit.id) {
                   <tr>
                     <!-- <td><a [routerLink]="['/auditlogs/', audit.id]">{{audit.id}}</a></td> -->
                     <td>{{ audit.eventType }}</td>
-                    <td *ngVar="(getEpersonName(audit) | async) as ePersonName">{{ePersonName}}</td>
+                    <td>
+                      @let epersonName = (audit?.epersonName | async);
+                      @if (epersonName) {
+                        <span>{{epersonName}}</span>
+                      } @else {
+                        <em>{{ 'audit.overview.table.eperson.anonymous' | translate }}</em>
+                      }
+                    </td>
                     <td>{{ audit.timeStamp | date:dateFormat}}</td>
                     <td>
                       @if (object.id === audit.objectUUID) {
-                        <span>
-                          <!-- object.id === audit.objectUUID -->
-                          @if ((getOtherObject(audit, object.id) | async); as subject) {
-                            @if (subject) {
-                              {{ subject.name }} <em>({{ subject.type }})</em>
-                            }
-                          }
-                        </span>
+                        @let subject =  $any(audit.subject | async);
+                        @if (subject) {
+                          <span>{{ subject?.name }} <em>({{ subject?.type }})</em></span>
+                        }
                       }
                       @if (object.id === audit.subjectUUID) {
                         <span>
@@ -62,7 +67,7 @@ <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
       <a class="btn btn-light mt-3" [routerLink]="['/items', object.id]"><i class="fas fa-arrow-left"></i> Back to Item</a>
       <!-- <a class="btn btn-light mt-3" [routerLink]="'/auditlogs'">{{'audit.detail.back' | translate}}</a> -->
     }
-    @if ((auditsRD$ | async)?.statusCode === 404) {
+    @if (auditRD?.statusCode === 404) {
       <h4 class="mt-4 mb-4">{{'audit.object.overview.disabled.message' | translate}}</h4>
     }
   }

src/app/audit-page/object-audit-overview/object-audit-overview.component.ts

@@ -26,8 +26,10 @@ import {
 } from 'rxjs/operators';
 
 import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
-import { AuditDataService } from '../../core/audit/audit-data.service';
-import { Audit } from '../../core/audit/model/audit.model';
+import {
+  AuditDataService,
+  AuditDetails,
+} from '../../core/audit/audit-data.service';
 import { AuthService } from '../../core/auth/auth.service';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
@@ -44,7 +46,6 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { VarDirective } from '../../shared/utils/var.directive';
 
 /**
  * Component displaying a list of all audit about a object in a paginated table
@@ -58,7 +59,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
     PaginationComponent,
     RouterLink,
     TranslateModule,
-    VarDirective,
   ],
 })
 export class ObjectAuditOverviewComponent implements OnInit {
@@ -71,7 +71,7 @@ export class ObjectAuditOverviewComponent implements OnInit {
   /**
    * List of all audits
    */
-  auditsRD$: Observable<RemoteData<PaginatedList<Audit>>>;
+  auditsRD$: Observable<RemoteData<PaginatedList<AuditDetails>>>;
 
   /**
    * The current pagination configuration for the page used by the FindAll method
@@ -143,9 +143,13 @@ export class ObjectAuditOverviewComponent implements OnInit {
 
 
     this.auditsRD$ = combineLatest([isAdmin$, config$, this.owningCollection$, parentCommunity$]).pipe(
-      mergeMap(([isAdmin, config,  owningCollection, parentCommunity]) => {
+      mergeMap(([isAdmin, config, owningCollection, parentCommunity]) => {
         if (isAdmin) {
-          return this.auditService.findByObject(this.object.id, config, owningCollection.id, parentCommunity.id);
+          return this.auditService.findByObject(this.object.id, config, owningCollection.id, parentCommunity.id)
+            .pipe(
+              getFirstCompletedRemoteData(),
+              map(data => this.auditService.mapToAuditDetails(data)),
+            );
         }
 
         return of(null);
@@ -166,16 +170,5 @@ export class ObjectAuditOverviewComponent implements OnInit {
     );
   }
 
-  /**
-   * Get the name of an EPerson by ID
-   * @param audit  Audit object
-   */
-  getEpersonName(audit: Audit): Observable<string> {
-    return this.auditService.getEpersonName(audit);
-  }
-
-  getOtherObject(audit: Audit, contextObjectId: string): Observable<any> {
-    return this.auditService.getOtherObject(audit, contextObjectId);
-  }
 
 }

src/app/audit-page/overview/audit-overview.component.html

@@ -3,16 +3,18 @@
     <h2 class="flex-grow-1">{{'audit.overview.title' | translate}}</h2>
   </div>
 
-  @if (isAdmin$ | async) {
-    @if ((auditsRD$ | async)?.payload?.totalElements === 0) {
+  @let isAdmin = (isAdmin$ | async);
+  @if (isAdmin) {
+    @let audits = (auditsRD$ | async)?.payload;
+    @if (audits?.totalElements === 0) {
       <div>
         No audits found.
       </div>
     }
-    @if ((auditsRD$ | async)?.payload?.totalElements > 0) {
+    @if (audits?.totalElements > 0) {
       <ds-pagination
         [paginationOptions]="pageConfig"
-        [collectionSize]="(auditsRD$ | async)?.payload?.totalElements"
+        [collectionSize]="audits?.totalElements"
         [hideGear]="true"
         [hidePagerWhenSinglePage]="true">
         <div class="table-responsive">
@@ -30,7 +32,8 @@ <h2 class="flex-grow-1">{{'audit.overview.title' | translate}}</h2>
               </tr>
             </thead>
             <tbody>
-              @for (audit of (auditsRD$ | async)?.payload?.page; track audit) {
+              @for (audit of audits?.page; track audit.id) {
+                @let epersonName = (audit.epersonName | async);
                 <tr>
                   <td><a [routerLink]="['/auditlogs/', audit.id]">{{audit.id}}</a></td>
                   <td>{{ audit.eventType }}</td>
@@ -40,7 +43,13 @@ <h2 class="flex-grow-1">{{'audit.overview.title' | translate}}</h2>
                   <td>{{ audit.objectType }}</td>
                   <td>{{ audit.subjectUUID }}</td>
                   <td>{{ audit.subjectType }}</td>
-                  <td *ngVar="(getEpersonName(audit) | async) as ePersonName">{{ePersonName}}</td>
+                  <td>
+                    @if (epersonName) {
+                      <span>{{epersonName}}</span>
+                    } @else {
+                      <span><em>{{ 'audit.overview.table.eperson.anonymous' | translate }}</em></span>
+                    }
+                  </td>
                   <td>{{ audit.timeStamp | date:dateFormat}}</td>
                 </tr>
               }

src/app/audit-page/overview/audit-overview.component.spec.ts

@@ -1,6 +1,7 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
@@ -9,13 +10,22 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { AuditDataService } from '../../core/audit/audit-data.service';
+import {
+  AuditDataService,
+  AuditDetails,
+} from '../../core/audit/audit-data.service';
 import { Audit } from '../../core/audit/model/audit.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { AuditMock } from '../../shared/testing/audit.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import {
+  AuditDetailsMock,
+  AuditMock,
+} from '../../shared/testing/audit.mock';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -28,15 +38,21 @@ describe('AuditOverviewComponent', () => {
   let auditService: AuditDataService;
   let authorizationService: any;
   let audits: Audit[];
+  let auditDetails: AuditDetails[];
   const paginationService = new PaginationServiceStub();
 
   function init() {
-    audits = [ AuditMock, AuditMock, AuditMock ];
-    auditService = jasmine.createSpyObj('processService', {
+    audits = [AuditMock, AuditMock, AuditMock];
+    auditDetails = [AuditDetailsMock, AuditDetailsMock, AuditDetailsMock];
+    auditService = jasmine.createSpyObj('auditService', {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList(audits)),
       getEpersonName: of('Eperson Name'),
+      mapToAuditDetails: createSuccessfulRemoteDataObject(createPaginatedList(auditDetails)),
+    });
+
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: jasmine.createSpy('isAuthorized'),
     });
-    authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
   }
 
   beforeEach(waitForAsync(() => {
@@ -54,13 +70,13 @@ describe('AuditOverviewComponent', () => {
 
   describe('if the current user is an admin', () => {
 
-    beforeEach(() => {
-      authorizationService.isAuthorized.and.callFake(() => of(true));
+    beforeEach(fakeAsync(() => {
+      authorizationService.isAuthorized.and.returnValue(of(true));
 
       fixture = TestBed.createComponent(AuditOverviewComponent);
       component = fixture.componentInstance;
       fixture.detectChanges();
-    });
+    }));
 
     describe('table structure', () => {
       let rowElements;
@@ -118,7 +134,7 @@ describe('AuditOverviewComponent', () => {
       it('should display the eperson name in the seventh column', () => {
         rowElements.forEach((rowElement, index) => {
           const el = rowElement.query(By.css('td:nth-child(7)')).nativeElement;
-          expect(el.textContent).toContain('Eperson Name');
+          expect(el.textContent).toContain('Eperson Test');
         });
       });