Merge branch 'main' into Issue/3985

# Conflicts:
#	package-lock.json
#	package.json

Author: oscar-escire

.github/workflows/build.yml

@@ -24,6 +24,7 @@ jobs:
       # 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
       DSPACE_UI_PORT: 4000
+      DSPACE_UI_BASEURL: http://127.0.0.1:4000
       # Ensure all SSR caching is disabled in test environment
       DSPACE_CACHE_SERVERSIDE_BOTCACHE_MAX: 0
       DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX: 0

.github/workflows/docker.yml

@@ -74,6 +74,8 @@ jobs:
       DSPACE_REST_HOST: 127.0.0.1
       # Override default dspace.ui.url to also use 127.0.0.1.
       dspace__P__ui__P__url: http://127.0.0.1:4000
+      # Override default ui.baseUrl to also use 127.0.0.1. This must match 'dspace.ui.url' for SSR to be enabled.
+      DSPACE_UI_BASEURL: http://127.0.0.1:4000
     steps:
       # Checkout our codebase (to get access to Docker Compose scripts)
       - name: Checkout codebase

config/config.example.yml

@@ -8,6 +8,9 @@ ui:
   ssl: false
   host: localhost
   port: 4000
+  # Specify the public URL that this user interface responds to. This corresponds to the "dspace.ui.url" property in your backend's local.cfg.
+  # SSR is only enabled when the client's "Host" HTTP header matches this baseUrl. The baseUrl is also used for redirects and SEO links (in robots.txt).
+  baseUrl: http://localhost:4000
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /
   # The rateLimiter settings limit each IP to a 'limit' of 500 requests per 'windowMs' (1 minute).
@@ -237,7 +240,12 @@ submission:
         - value: default
           style: text-muted
           icon: fa-circle-xmark
-
+      # Icons to be displayed next to an authority controlled value, to give indication of the source.
+      sourceIcons:
+        # Example of configuration for authority logo based on sources.
+        # The configured icon will be displayed next to the authority value in submission and on item page or search results.
+        - source: orcid
+        - path: assets/images/orcid.logo.icon.svg
 #  Fallback language in which the UI will be rendered if the user's browser language is not an active language
 fallbackLanguage: en
 
@@ -397,6 +405,30 @@ item:
     pageSize: 5
     # Show the bitstream access status label on the item page
     showAccessStatuses: false
+  # Configuration of metadata to be displayed in the item metadata link view popover
+  metadataLinkViewPopoverData:
+    # Metdadata list to be displayed for entities without a specific configuration
+    fallbackMetdataList:
+      - dc.description.abstract
+      - dc.description.note
+    # Configuration for each entity type
+    entityDataConfig:
+      - entityType: Person
+        # Descriptive metadata (popover body)
+        metadataList:
+          - person.affiliation.name
+          - person.email
+        # Title metadata (popover header)
+        titleMetadataList:
+          - person.givenName
+          - person.familyName
+    # Configuration for identifier subtypes, based on metadata like dc.identifier.ror where ror is the subtype.
+    # This is used to map the layout of the identifier in the popover and the icon displayed next to the metadata value.
+    identifierSubtypes:
+      - name: ror
+        icon: assets/images/ror.logo.icon.svg
+        iconPosition: IdentifierSubtypesIconPositionEnum.LEFT
+        link: https://ror.org
 
 # Community Page Config
 community:
@@ -645,3 +677,62 @@ geospatialMapViewer:
 accessibility:
   # The duration in days after which the accessibility settings cookie expires
   cookieExpirationDuration: 7
+
+# Configuration for layout customization of metadata rendering in Item page
+# Currently only the authority reference config is available, more will follow with the integration of the so called CRIS layout.
+layout:
+  # Configuration of icons and styles to be used for each authority controlled link
+  authorityRef:
+    - entityType: DEFAULT
+      entityStyle:
+        default:
+          icon: fa fa-user
+          style: text-info
+    - entityType: PERSON
+      entityStyle:
+        person:
+          icon: fa fa-user
+          style: text-success
+        default:
+          icon: fa fa-user
+          style: text-info
+    - entityType: ORGUNIT
+      entityStyle:
+        default:
+          icon: fa fa-university
+          style: text-success
+    - entityType: PROJECT
+      entityStyle:
+        default:
+          icon: fas fa-project-diagram
+          style: text-success
+
+# Configuration for customization of search results
+searchResults:
+  # Metadata fields to be displayed in the search results under the standard ones
+  additionalMetadataFields:
+    - dc.contributor.author
+    - dc.date.issued
+    - dc.type
+  # Metadata fields to be displayed in the search results for the author section
+  authorMetadata:
+    - dc.contributor.author
+    - dc.creator
+    - dc.contributor.*
+  # When the search results are retrieved, for each item type the metadata with a valid authority value are inspected.
+  # Referenced items will be fetched with a find all by id strategy to avoid individual rest requests
+  # to efficiently display the search results.
+  followAuthorityMetadata:
+    - type: Publication
+      metadata: dc.contributor.author
+    - type: Product
+      metadata: dc.contributor.author
+
+  # The maximum number of item to process when following authority metadata values.
+  followAuthorityMaxItemLimit: 100
+
+  # The maximum number of metadata values to process for each metadata key
+  # when following authority metadata values.
+  followAuthorityMetadataValuesLimit: 5
+
+

cypress/e2e/limit-public-config.cy.ts

@@ -0,0 +1,16 @@
+describe('Limit public config properties', () => {
+  it('Should not include cache.serverSide properties in the html source code',
+    () => {
+      cy.request('/').its('body').then((text: string) => {
+        expect(text).to.not.contain('"serverSide":');
+      });
+    },
+  );
+  it('Should not include cache.serverSide properties in the config.json',
+    () => {
+      cy.request('/assets/config.json').its('body').then((obj: any) => {
+        expect(obj.cache).to.not.haveOwnProperty('serverSide');
+      });
+    },
+  );
+});

cypress/e2e/my-dspace.cy.ts

@@ -255,9 +255,9 @@ describe('My DSpace page', () => {
     cy.get('[data-test="list-object"]')
       .then(($items) => {
         const itemWithClaim = [...$items].find(item =>
-          item.querySelector('[data-test="claim-button"]')
+          item.querySelector('[data-test="claim-button"]'),
         );
-        expect(itemWithClaim, 'item with claim button').to.exist;
+        cy.wrap(itemWithClaim).should('exist');
         cy.wrap(itemWithClaim).as('selectedItem');
         cy.wrap(itemWithClaim).within(() => {
           cy.get('ds-pool-task-actions').should('exist');

docker/cli.assetstore.yml

@@ -16,7 +16,7 @@ services:
   dspace-cli:
     environment:
       # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-      - LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz
+      - LOADASSETS=${LOADASSETS:-https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz}
     entrypoint:
       - /bin/bash
       - '-c'

docker/cli.ingest.yml

@@ -15,9 +15,9 @@
 services:
   dspace-cli:
     environment:
-    - AIPZIP=https://github.com/DSpace-Labs/AIP-Files/raw/main/dogAndReport.zip
-    - ADMIN_EMAIL=test@test.edu
-    - AIPDIR=/tmp/aip-dir
+    - AIPZIP=${AIPZIP:-https://github.com/DSpace-Labs/AIP-Files/raw/main/dogAndReport.zip}
+    - ADMIN_EMAIL=${ADMIN_EMAIL:-test@test.edu}
+    - AIPDIR=${AIPDIR:-/tmp/aip-dir}
     entrypoint:
       - /bin/bash
       - '-c'

docker/cli.yml

@@ -29,9 +29,9 @@ services:
       # __P__ => "." (e.g. dspace__P__dir => dspace.dir)
       # __D__ => "-" (e.g. google__D__metadata => google-metadata)
       # db.url: Ensure we are using the 'dspacedb' image for our database
-      db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
+      db__P__url: ${db__P__url:-jdbc:postgresql://dspacedb:5432/dspace}
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
-      solr__P__server: http://dspacesolr:8983/solr
+      solr__P__server: ${solr__P__server:-http://dspacesolr:8983/solr}
     networks:
     - dspacenet
     volumes:

docker/db.entities.yml

@@ -18,7 +18,7 @@ services:
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-      - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
+      - LOADSQL=${LOADSQL:-https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql}
   dspace:
     ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
     # Ensure that the database is ready BEFORE starting tomcat

docker/docker-compose-ci.yml

@@ -22,17 +22,17 @@ services:
       # __P__ => "." (e.g. dspace__P__dir => dspace.dir)
       # __D__ => "-" (e.g. google__D__metadata => google-metadata)
       # dspace.dir, dspace.server.url and dspace.ui.url
-      dspace__P__dir: /dspace
-      dspace__P__server__P__url: http://127.0.0.1:8080/server
-      dspace__P__ui__P__url: http://127.0.0.1:4000
+      dspace__P__dir: ${dspace__P__dir:-/dspace}
+      dspace__P__server__P__url: ${dspace__P__server__P__url:-http://127.0.0.1:8080/server}
+      dspace__P__ui__P__url: ${dspace__P__ui__P__url:-http://127.0.0.1:4000}
       # db.url: Ensure we are using the 'dspacedb' image for our database
-      db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
+      db__P__url: ${db__P__url:-jdbc:postgresql://dspacedb:5432/dspace}
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
-      solr__P__server: http://dspacesolr:8983/solr
+      solr__P__server: ${solr__P__server:-http://dspacesolr:8983/solr}
       # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit.
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
-      solr__D__statistics__P__autoCommit: 'false'
-      LOGGING_CONFIG: /dspace/config/log4j2-container.xml
+      solr__D__statistics__P__autoCommit: ${solr__D__statistics__P__autoCommit:-false}
+      LOGGING_CONFIG: ${LOGGING_CONFIG:-/dspace/config/log4j2-container.xml}
     image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb