Merged in task/dspace-cris-2025_02_x/DSC-2748 (pull request DSpace#4120)

DSC-2748

Approved-by: Fapohunda, Adamo

Author: vins01-4science

.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

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html

@@ -1,4 +1,5 @@
-@if ((moreThanOne$ | async) !== true) {
+@let moreThanOne = moreThanOne$ | async;
+@if (moreThanOne !== true) {
   <div class="add">
     <button class="btn btn-lg btn-outline-primary mt-1 ms-2"
       [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
@@ -8,7 +9,7 @@
     </button>
   </div>
 }
-@if ((moreThanOne$ | async)) {
+@if (moreThanOne === true) {
   <div class="add w-100" display="dynamic" placement="bottom-right"
     ngbDropdown
     >
@@ -24,7 +25,7 @@
       class="dropdown-menu p-0"
       id="importControlsDropdownMenu"
       aria-labelledby="dropdownImport">
-      <ds-entity-dropdown [isSubmission]="false" (selectionChange)="openPage($event)"></ds-entity-dropdown>
+      <ds-entity-dropdown [isSubmission]="false" [isImportFromExternalSource]="true" (selectionChange)="openPage($event)"></ds-entity-dropdown>
     </div>
   </div>
 }

src/app/root/root.component.ts

@@ -1,9 +1,11 @@
 import {
   AsyncPipe,
+  isPlatformBrowser,
   NgClass,
 } from '@angular/common';
 import {
   Component,
+  HostBinding,
   Inject,
   Input,
   OnInit,
@@ -70,6 +72,8 @@ import { SystemWideAlertBannerComponent } from '../system-wide-alert/alert-banne
   ],
 })
 export class RootComponent implements OnInit {
+  @HostBinding('attr.data-test') dataTestAttribute: string | null = null;
+
   theme: Observable<ThemeConfig> = of({} as any);
   isSidebarVisible$: Observable<boolean>;
   slideSidebarOver$: Observable<boolean>;
@@ -99,6 +103,7 @@ export class RootComponent implements OnInit {
     @Inject(NativeWindowService) private _window: NativeWindowRef,
   ) {
     this.notificationOptions = environment.notifications;
+    this.dataTestAttribute = isPlatformBrowser(platformId) ? 'ds-hydrated' : null;
   }
 
   ngOnInit() {

src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts

@@ -172,6 +172,24 @@ describe('EntityDropdownComponent', () => {
     expect((component as any).entityTypeService.getAllAuthorizedRelationshipType).toHaveBeenCalled();
   });
 
+  it('should init component with entities list when isImportFromExternalSource is true', () => {
+    component.isSubmission = false;
+    component.isImportFromExternalSource = true;
+    spyOn(component.subs, 'push');
+    spyOn(component, 'resetPagination');
+    spyOn(component, 'populateEntityList').and.callThrough();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    const elements = fixture.debugElement.queryAll(By.css('.entity-item'));
+
+    expect(elements.length).toEqual(5);
+    expect(component.subs.push).toHaveBeenCalled();
+    expect(component.resetPagination).toHaveBeenCalled();
+    expect(component.populateEntityList).toHaveBeenCalled();
+    expect((component as any).entityTypeService.getAllAuthorizedRelationshipTypeImport).toHaveBeenCalled();
+  });
+
   it('should trigger onSelect method when select a new entity from list', () => {
     scheduler.schedule(() => fixture.detectChanges());
     scheduler.flush();

src/app/shared/entity-dropdown/entity-dropdown.component.ts

@@ -91,6 +91,12 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
    */
   @Input() isSubmission: boolean;
 
+  /**
+   * TRUE if the main operation is "Import metadata from an external source", FALSE otherwise.
+   * Used to determine which list type to populate.
+   */
+  @Input() isImportFromExternalSource: boolean;
+
   /**
    * The entity to output to the parent component
    */
@@ -193,23 +199,26 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
    */
   public populateEntityList(page: number) {
     this.isLoadingList.next(true);
-    let searchListEntity$;
-    if (this.isSubmission) {
+    let searchListEntity$: Observable<RemoteData<PaginatedList<ItemType>>>;
+    if (this.isSubmission || this.isImportFromExternalSource) {
       // Set the pagination info
       const findOptions: FindListOptions = {
         elementsPerPage: 10,
         currentPage: page,
       };
-      searchListEntity$ =
-        this.entityTypeService.getAllAuthorizedRelationshipType(findOptions)
-          .pipe(
-            getFirstSucceededRemoteWithNotEmptyData(),
-            tap(entityType => {
-              if ((this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements) {
-                this.hasNextPage = false;
-              }
-            }),
-          );
+
+      searchListEntity$ = this.isSubmission ?
+        this.entityTypeService.getAllAuthorizedRelationshipType(findOptions) :
+        this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findOptions);
+
+      searchListEntity$ = searchListEntity$.pipe(
+        getFirstSucceededRemoteWithNotEmptyData(),
+        tap(entityType => {
+          if ((this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements) {
+            this.hasNextPage = false;
+          }
+        }),
+      );
     } else {
       searchListEntity$ =
         this.itemExportFormatService.byEntityTypeAndMolteplicity(null, ItemExportFormatMolteplicity.MULTIPLE)
@@ -227,6 +236,7 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
             tap(() => this.hasNextPage = false),
           );
     }
+
     this.searchListEntity$ = searchListEntity$.pipe(
       switchMap((entityType: RemoteData<PaginatedList<ItemType>>) => entityType.payload.page),
       map((item: ItemType) => {
@@ -239,6 +249,7 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
       reduce((acc: any, value: any) => [...acc, value], []),
       startWith([]),
     );
+
     this.subs.push(
       this.searchListEntity$.subscribe({
         next: (result: ItemType[]) => {

src/assets/i18n/en.json5

@@ -5501,6 +5501,8 @@
 
   "suggestion.type.orcidWorks": "Publication",
 
+  "suggestion.type.openalex": "OpenAlex",
+
   "register-email.title": "New user registration",
 
   "register-page.create-profile.header": "Create Profile",
@@ -9306,6 +9308,8 @@
 
   "item.preview.organization.alternateName": "Alternative name",
 
+  "item.preview.dc.identifier.openalex": "OpenAlex ID",
+
   "third-party-metrics-cookies.message": "{{ metricType }} badge is blocked by your ",
 
   "third-party-metrics-cookies.consent-settings": "consent settings",

src/assets/i18n/it.json5

@@ -8768,6 +8768,9 @@
   // TODO New key - Add a translation
   "suggestion.type.orcidWorks": "Publication",
 
+  // "suggestion.type.openalex" : "OpenAlex"
+  "suggestion.type.openalex": "OpenAlex",
+
   // "register-email.title": "New user registration",
   "register-email.title": "Registrazione nuovo utente",
 
@@ -15183,7 +15186,8 @@
   // TODO New key - Add a translation
   "item.preview.organization.alternateName": "Alternative name",
 
-
+  // "item.preview.dc.identifier.openalex" : "OpenAlex ID"
+  "item.preview.dc.identifier.openalex": "OpenAlex ID",