Merge branch 'develop' into 930-add-warning-message-to-login-page

Author: ChengShi-1

.github/workflows/deploy-beta-testing.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - develop
 
+env:
+  FRONTEND_BASE_PATH: /modern
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -31,7 +34,7 @@ jobs:
         run: npm run build
 
       - name: Build with base path
-        run: npm run build -- --base=/spa
+        run: npm run build -- --base=${{ env.FRONTEND_BASE_PATH }}
 
       - name: Override runtime config.js for BETA
         env:
@@ -115,4 +118,4 @@ jobs:
             ASADMIN='/usr/local/payara6/bin/asadmin --user admin'
             DATAVERSE_FRONTEND=`$ASADMIN list-applications |grep $APPLICATION_NAME |awk '{print $1}'`
             $ASADMIN undeploy $DATAVERSE_FRONTEND
-            $ASADMIN deploy --name $APPLICATION_NAME --contextroot /spa $APPLICATION_WAR_PATH
+            $ASADMIN deploy --name $APPLICATION_NAME --contextroot ${{ env.FRONTEND_BASE_PATH }} $APPLICATION_WAR_PATH

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ on:
           - qa
           - demo
       basepath:
-        description: 'Server base path (without slashes) for serving the application (e.g., spa). If left blank, it will try to deploy to the root base path.'
+        description: 'Server base path (without slashes) for serving the application (e.g., modern). If left blank, it will try to deploy to the root base path.'
         type: string
         required: false
 

.github/workflows/generate-war.yml

@@ -12,7 +12,7 @@ on:
           - qa
           - demo
       basepath:
-        description: 'Server base path (without slashes) for serving the application (e.g., spa). If left blank, it will try to deploy to the root base path.'
+        description: 'Server base path (without slashes) for serving the application (e.g., modern). If left blank, it will try to deploy to the root base path.'
         type: string
         required: false
 

CHANGELOG.md

@@ -19,6 +19,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Added runtime configuration options for homepage branding and support link.
 - Added an environment variable to docker-compose-dev.yml to hide the OIDC client used in the SPA from the JSF frontend: DATAVERSE_AUTH_OIDC_HIDDEN_JSF: 1
 - Added a message note to the login page
+- Download with terms of use and guestbook.
 
 ### Changed
 
@@ -63,6 +64,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Upgrade Keycloak to 26.3.2; updated SPI and test realm JSON.
 - Truncate long collection and dataset descriptions with expandable content. (#789)
 - UI polish: Files Table always shows action buttons. (#800)
+- Removed hard-coded references to /spa path and SPA name, changed to /modern (#945)
 
 ### Fixed
 

DEVELOPER_GUIDE.md

@@ -236,7 +236,7 @@ project files and shut down any running containers.
 
 Once the script has finished, you will be able to access Dataverse via:
 
-- Dataverse SPA Frontend: [http://localhost:8000/spa][dv_app_localhost_spa_url]
+- Dataverse MODERN Frontend: [http://localhost:8000/modern][dv_app_localhost_modern_url]
 - Dataverse JSF Application: [http://localhost:8000][dv_app_localhost_legacy_url]
 
 Note: The Dataverse configbaker takes some time to start the application, so the application will not be accessible until
@@ -802,7 +802,7 @@ describe('Create Dataset', () => {
   })
 
   it('navigates to the new dataset after submitting a valid form', () => {
-    cy.visit('/spa/datasets/root/create')
+    cy.visit(`${FRONTEND_BASE_PATH}/datasets/root/create`)
 
     cy.findByLabelText(/Title/i).type('Test Dataset Title')
     cy.findByLabelText(/Author Name/i).type('Test author name', { force: true })
@@ -885,7 +885,7 @@ it(
       }
     )
 
-    cy.visit('/spa/')
+    cy.visit(`${FRONTEND_BASE_PATH}/`)
 
     // Assertions that rely on your overridden config
     cy.findByText('English').should('exist')
@@ -1134,7 +1134,7 @@ path included will redirect to the frontend application.
 [dv_app_localhost_build_url]: http://localhost:5173
 [dv_app_localhost_storybook_url]: http://localhost:6006/
 [dv_app_localhost_designsystem_url]: http://localhost:6007/
-[dv_app_localhost_spa_url]: http://localhost:8000/spa
+[dv_app_localhost_modern_url]: http://localhost:8000/modern
 [dv_app_localhost_legacy_url]: http://localhost:8000/
 
 <!-- @gdcc/dataverse -->

README.md

@@ -32,7 +32,7 @@
     <br />
     <br />
     <a href="https://www.dataverse.org">Website</a> |
-    <a href="https://beta.dataverse.org/spa">View Demo (BETA)</a> |
+    <a href="https://beta.dataverse.org/modern">View Demo (BETA)</a> |
     <a href="https://github.com/IQSS/dataverse-frontend/issues">Report Bug</a> |
     <a href="https://github.com/IQSS/dataverse-frontend/issues">Request Feature</a>
   </p>
@@ -139,21 +139,21 @@ All environments follow an “all-in-one” setup, where the frontend and backen
 The **Beta** environment provides a remote space for testing the latest changes. GitHub Actions automatically deploy the current `develop` branches of both the frontend and backend.
 
 - **Audience:** Development team, QA analysts, project managers, selected users for early feedback
-- **URL:** [beta.dataverse.org/spa][dv_app_beta_spa_url]
+- **URL:** [beta.dataverse.org/modern][dv_app_beta_modern_url]
 
 #### Demo
 
 The **Demo** environment showcases the latest officially released version of the SPA, compatible with the latest Dataverse backend release. Deployments target specific tagged releases (e.g., `0.1.0`) and are performed on demand.
 
 - **Audience:** Project managers, curation team, early adoption testers
-- **URL:** [demo.dataverse.org/spa][dv_app_demo_spa_url]
+- **URL:** [demo.dataverse.org/modern][dv_app_demo_modern_url]
 
 #### QA
 
 The **QA** environment is a dedicated, short-lived testing space. It is deployed on demand with feature branches (e.g., `feature/xxx`), frequently overwritten, and used for validating new features and bug fixes before merging into development.
 
 - **Audience:** QA analysts, development team
-- **URL:** [qa.dataverse.org/spa][dv_app_qa_spa_url]
+- **URL:** [qa.dataverse.org/modern][dv_app_qa_modern_url]
 
 #### Spike Environments
 
@@ -397,15 +397,15 @@ Distributed under the Apache License, Version 2.0. See [LICENSE](LICENSE) for mo
 <!-- Application Instances -->
 <!-- [dv_app_] -->
 
-[dv_app_beta_spa_url]: https://beta.dataverse.org/spa
-[dv_app_demo_spa_url]: https://demo.dataverse.org/spa
-[dv_app_qa_spa_url]: https://qa.dataverse.org/spa
+[dv_app_beta_modern_url]: https://beta.dataverse.org/modern
+[dv_app_demo_modern_url]: https://demo.dataverse.org/modern
+[dv_app_qa_modern_url]: https://qa.dataverse.org/modern
 [dv_app_beta_legacyjsf_url]: https://beta.dataverse.org
 [dv_app_legacyjsf_demo_url]: https://demo.dataverse.org/
 [dv_app_localhost_build_url]: http://localhost:5173
 [dv_app_localhost_storybook_url]: http://localhost:6006/
 [dv_app_localhost_designsystem_url]: http://localhost:6007/
-[dv_app_localhost_spa_url]: http://localhost:8000/spa
+[dv_app_localhost_modern_url]: http://localhost:8000/modern
 [dv_app_localhost_legacy_url]: http://localhost:8000/
 
 <!-- @gdcc/dataverse -->

cypress.config.ts

@@ -35,6 +35,7 @@ export default defineConfig({
     }
   },
   env: {
+    frontendBasePath: '/modern',
     backendUrl: 'http://localhost:8000',
     oidcClientId: 'test',
     oidcAuthorizationEndpoint: 'http://localhost:8000/realms/test/protocol/openid-connect/auth',

dev-env/docker-compose-dev.yml

@@ -72,8 +72,8 @@ services:
         -Ddataverse.files.s3.connection-pool-size=2048
         -Ddataverse.files.s3.custom-endpoint-region=us-east-1
         -Ddataverse.files.s3.custom-endpoint-url=https://s3.us-east-1.amazonaws.com
-    # We publish the port on the host machine instead of just exposing it within the network, so that the browser can access the URLs of images generated by Dataverse (http://localhost:8080...). 
-    # This is necessary because the dev_nginx proxy is placed on top of the Dataverse service, making those URLs unreachable unless this port is exposed. 
+    # We publish the port on the host machine instead of just exposing it within the network, so that the browser can access the URLs of images generated by Dataverse (http://localhost:8080...).
+    # This is necessary because the dev_nginx proxy is placed on top of the Dataverse service, making those URLs unreachable unless this port is exposed.
     # This workaround is only necessary and intended for the local dev environment and will not be used in the remote environment, where we use a production DNS.
     ports:
       - '8080:8080'
@@ -156,7 +156,7 @@ services:
         condition: service_completed_successfully
     restart: on-failure
     expose:
-      - '8983'
+      - '8983:8983'
     networks:
       - dataverse
     command:
@@ -214,7 +214,7 @@ services:
       - DATAVERSE_DB_PORT=5432
       - DATAVERSE_DB_USER=${DATAVERSE_DB_USER}
       - DATAVERSE_DB_PASSWORD=secret
-      - DATAVERSE_BASE_URL=http://dataverse:8080
+      - DATAVERSE_BASE_URL=http://localhost:8000
     networks:
       dataverse:
         aliases:

dev-env/nginx.conf

@@ -9,6 +9,11 @@ http {
     # Default route for other URLs
     location / {
       proxy_pass http://dataverse:8080;
+      proxy_set_header    Host               $http_host;
+      proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto  $scheme;
+      proxy_set_header    X-Forwarded-Host   $http_host;
+      proxy_set_header    X-Forwarded-Port   $server_port;
     }
 
     # Keycloak reverse proxy for /realms
@@ -23,31 +28,61 @@ http {
     # Specific route for /resources/images
     location /resources/images {
       proxy_pass http://dataverse:8080;
+      proxy_set_header    Host               $http_host;
+      proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto  $scheme;
+      proxy_set_header    X-Forwarded-Host   $http_host;
+      proxy_set_header    X-Forwarded-Port   $server_port;
     }
 
     # Specific route for /resources/css
     location /resources/css {
       proxy_pass http://dataverse:8080;
+      proxy_set_header    Host               $http_host;
+      proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto  $scheme;
+      proxy_set_header    X-Forwarded-Host   $http_host;
+      proxy_set_header    X-Forwarded-Port   $server_port;
     }
 
     # Specific route for /resources/js
     location /resources/js {
       proxy_pass http://dataverse:8080;
+      proxy_set_header    Host               $http_host;
+      proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto  $scheme;
+      proxy_set_header    X-Forwarded-Host   $http_host;
+      proxy_set_header    X-Forwarded-Port   $server_port;
     }
 
     # Specific route for /resources/dev
     location /resources/dev {
       proxy_pass http://dataverse:8080;
+      proxy_set_header    Host               $http_host;
+      proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto  $scheme;
+      proxy_set_header    X-Forwarded-Host   $http_host;
+      proxy_set_header    X-Forwarded-Port   $server_port;
     }
 
     # Specific route for /resources/fontcustom
     location /resources/fontcustom {
       proxy_pass http://dataverse:8080;
+      proxy_set_header    Host               $http_host;
+      proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto  $scheme;
+      proxy_set_header    X-Forwarded-Host   $http_host;
+      proxy_set_header    X-Forwarded-Port   $server_port;
     }
 
     # Specific route for /resources/iqbs
     location /resources/iqbs {
       proxy_pass http://dataverse:8080;
+      proxy_set_header    Host               $http_host;
+      proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto  $scheme;
+      proxy_set_header    X-Forwarded-Host   $http_host;
+      proxy_set_header    X-Forwarded-Port   $server_port;
     }
 
     # General route for other /resources routes, handled by Keycloak
@@ -69,7 +104,7 @@ http {
     }
 
     # Route for SPA frontend
-    location /spa {
+    location /modern {
       proxy_pass http://frontend:5173;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;

dev-env/shib-dev-env/docker-compose-dev.yml

@@ -208,7 +208,7 @@ services:
       - DATAVERSE_DB_PORT=5432
       - DATAVERSE_DB_USER=${DATAVERSE_DB_USER}
       - DATAVERSE_DB_PASSWORD=secret
-      - DATAVERSE_BASE_URL=http://dataverse:8080
+      - DATAVERSE_BASE_URL=https://localhost
     networks:
       dataverse:
         aliases: