Merge branch 'develop' into 947-manage-template-page-make-default

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:
@@ -41,25 +44,7 @@ jobs:
           OIDC_TOKEN_ENDPOINT: ${{ secrets.BETA_OIDC_TOKEN_ENDPOINT }}
           OIDC_LOGOUT_ENDPOINT: ${{ secrets.BETA_OIDC_LOGOUT_ENDPOINT }}
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.BETA_OIDC_STORAGE_KEY_PREFIX }}
-        run: |
-          mkdir -p ./dist
-          cat > ./dist/config.js <<EOF
-          window.__APP_CONFIG__ = {
-            backendUrl: "${DATAVERSE_BACKEND_URL}",
-            oidc: {
-              clientId: "${OIDC_CLIENT_ID}",
-              authorizationEndpoint: "${OIDC_AUTHORIZATION_ENDPOINT}",
-              tokenEndpoint: "${OIDC_TOKEN_ENDPOINT}",
-              logoutEndpoint: "${OIDC_LOGOUT_ENDPOINT}",
-              localStorageKeyPrefix: "${OIDC_STORAGE_KEY_PREFIX}"
-            },
-            languages: [
-              { code: 'en', name: 'English' },
-              { code: 'es', name: 'Español' }
-            ],
-            defaultLanguage: 'en'
-          }
-          EOF
+        run: node ./scripts/write-runtime-config.mjs
         shell: bash
 
       - uses: actions/upload-artifact@v4
@@ -115,4 +100,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
 
@@ -53,25 +53,7 @@ jobs:
           OIDC_TOKEN_ENDPOINT: ${{ secrets.BETA_OIDC_TOKEN_ENDPOINT }}
           OIDC_LOGOUT_ENDPOINT: ${{ secrets.BETA_OIDC_LOGOUT_ENDPOINT }}
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.BETA_OIDC_STORAGE_KEY_PREFIX }}
-        run: |
-          mkdir -p ./dist
-          cat > ./dist/config.js <<EOF
-          window.__APP_CONFIG__ = {
-            backendUrl: "${DATAVERSE_BACKEND_URL}",
-            oidc: {
-              clientId: "${OIDC_CLIENT_ID}",
-              authorizationEndpoint: "${OIDC_AUTHORIZATION_ENDPOINT}",
-              tokenEndpoint: "${OIDC_TOKEN_ENDPOINT}",
-              logoutEndpoint: "${OIDC_LOGOUT_ENDPOINT}",
-              localStorageKeyPrefix: "${OIDC_STORAGE_KEY_PREFIX}"
-            },
-            languages: [
-              { code: 'en', name: 'English' },
-              { code: 'es', name: 'Español' },
-            ],
-            defaultLanguage: 'en'
-          }
-          EOF
+        run: node ./scripts/write-runtime-config.mjs
 
       - name: Override runtime config.js for QA
         if: ${{ github.event.inputs.environment == 'qa' }}
@@ -82,25 +64,7 @@ jobs:
           OIDC_TOKEN_ENDPOINT: ${{ secrets.QA_OIDC_TOKEN_ENDPOINT }}
           OIDC_LOGOUT_ENDPOINT: ${{ secrets.QA_OIDC_LOGOUT_ENDPOINT }}
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.QA_OIDC_STORAGE_KEY_PREFIX }}
-        run: |
-          mkdir -p ./dist
-          cat > ./dist/config.js <<EOF
-          window.__APP_CONFIG__ = {
-            backendUrl: "${DATAVERSE_BACKEND_URL}",
-            oidc: {
-              clientId: "${OIDC_CLIENT_ID}",
-              authorizationEndpoint: "${OIDC_AUTHORIZATION_ENDPOINT}",
-              tokenEndpoint: "${OIDC_TOKEN_ENDPOINT}",
-              logoutEndpoint: "${OIDC_LOGOUT_ENDPOINT}",
-              localStorageKeyPrefix: "${OIDC_STORAGE_KEY_PREFIX}"
-            },
-            languages: [
-              { code: 'en', name: 'English' },
-              { code: 'es', name: 'Español' },
-            ],
-            defaultLanguage: 'en'
-          }
-          EOF
+        run: node ./scripts/write-runtime-config.mjs
 
       - name: Override runtime config.js for DEMO
         if: ${{ github.event.inputs.environment == 'demo' }}
@@ -111,25 +75,7 @@ jobs:
           OIDC_TOKEN_ENDPOINT: ${{ secrets.DEMO_OIDC_TOKEN_ENDPOINT }}
           OIDC_LOGOUT_ENDPOINT: ${{ secrets.DEMO_OIDC_LOGOUT_ENDPOINT }}
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.DEMO_OIDC_STORAGE_KEY_PREFIX }}
-        run: |
-          mkdir -p ./dist
-          cat > ./dist/config.js <<EOF
-          window.__APP_CONFIG__ = {
-            backendUrl: "${DATAVERSE_BACKEND_URL}",
-            oidc: {
-              clientId: "${OIDC_CLIENT_ID}",
-              authorizationEndpoint: "${OIDC_AUTHORIZATION_ENDPOINT}",
-              tokenEndpoint: "${OIDC_TOKEN_ENDPOINT}",
-              logoutEndpoint: "${OIDC_LOGOUT_ENDPOINT}",
-              localStorageKeyPrefix: "${OIDC_STORAGE_KEY_PREFIX}"
-            },
-            languages: [
-              { code: 'en', name: 'English' },
-              { code: 'es', name: 'Español' },
-            ],
-            defaultLanguage: 'en'
-          }
-          EOF
+        run: node ./scripts/write-runtime-config.mjs
 
       - uses: actions/upload-artifact@v4
         with:

.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
 
@@ -53,25 +53,7 @@ jobs:
           OIDC_TOKEN_ENDPOINT: ${{ secrets.BETA_OIDC_TOKEN_ENDPOINT }}
           OIDC_LOGOUT_ENDPOINT: ${{ secrets.BETA_OIDC_LOGOUT_ENDPOINT }}
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.BETA_OIDC_STORAGE_KEY_PREFIX }}
-        run: |
-          mkdir -p ./dist
-          cat > ./dist/config.js <<EOF
-          window.__APP_CONFIG__ = {
-            backendUrl: "${DATAVERSE_BACKEND_URL}",
-            oidc: {
-              clientId: "${OIDC_CLIENT_ID}",
-              authorizationEndpoint: "${OIDC_AUTHORIZATION_ENDPOINT}",
-              tokenEndpoint: "${OIDC_TOKEN_ENDPOINT}",
-              logoutEndpoint: "${OIDC_LOGOUT_ENDPOINT}",
-              localStorageKeyPrefix: "${OIDC_STORAGE_KEY_PREFIX}"
-            },
-            languages: [
-              { code: 'en', name: 'English' },
-              { code: 'es', name: 'Español' },
-            ],
-            defaultLanguage: 'en'
-          }
-          EOF
+        run: node ./scripts/write-runtime-config.mjs
 
       - name: Override runtime config.js for QA
         if: ${{ github.event.inputs.environment == 'qa' }}
@@ -82,25 +64,7 @@ jobs:
           OIDC_TOKEN_ENDPOINT: ${{ secrets.QA_OIDC_TOKEN_ENDPOINT }}
           OIDC_LOGOUT_ENDPOINT: ${{ secrets.QA_OIDC_LOGOUT_ENDPOINT }}
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.QA_OIDC_STORAGE_KEY_PREFIX }}
-        run: |
-          mkdir -p ./dist
-          cat > ./dist/config.js <<EOF
-          window.__APP_CONFIG__ = {
-            backendUrl: "${DATAVERSE_BACKEND_URL}",
-            oidc: {
-              clientId: "${OIDC_CLIENT_ID}",
-              authorizationEndpoint: "${OIDC_AUTHORIZATION_ENDPOINT}",
-              tokenEndpoint: "${OIDC_TOKEN_ENDPOINT}",
-              logoutEndpoint: "${OIDC_LOGOUT_ENDPOINT}",
-              localStorageKeyPrefix: "${OIDC_STORAGE_KEY_PREFIX}"
-            },
-            languages: [
-              { code: 'en', name: 'English' },
-              { code: 'es', name: 'Español' },
-            ],
-            defaultLanguage: 'en'
-          }
-          EOF
+        run: node ./scripts/write-runtime-config.mjs
 
       - name: Override runtime config.js for DEMO
         if: ${{ github.event.inputs.environment == 'demo' }}
@@ -111,25 +75,7 @@ jobs:
           OIDC_TOKEN_ENDPOINT: ${{ secrets.DEMO_OIDC_TOKEN_ENDPOINT }}
           OIDC_LOGOUT_ENDPOINT: ${{ secrets.DEMO_OIDC_LOGOUT_ENDPOINT }}
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.DEMO_OIDC_STORAGE_KEY_PREFIX }}
-        run: |
-          mkdir -p ./dist
-          cat > ./dist/config.js <<EOF
-          window.__APP_CONFIG__ = {
-            backendUrl: "${DATAVERSE_BACKEND_URL}",
-            oidc: {
-              clientId: "${OIDC_CLIENT_ID}",
-              authorizationEndpoint: "${OIDC_AUTHORIZATION_ENDPOINT}",
-              tokenEndpoint: "${OIDC_TOKEN_ENDPOINT}",
-              logoutEndpoint: "${OIDC_LOGOUT_ENDPOINT}",
-              localStorageKeyPrefix: "${OIDC_STORAGE_KEY_PREFIX}"
-            },
-            languages: [
-              { code: 'en', name: 'English' },
-              { code: 'es', name: 'Español' },
-            ],
-            defaultLanguage: 'en'
-          }
-          EOF
+        run: node ./scripts/write-runtime-config.mjs
 
       - uses: actions/upload-artifact@v4
         with:

CHANGELOG.md

@@ -8,6 +8,18 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 
 ### Added
 
+### Changed
+
+### Fixed
+
+### Removed
+
+---
+
+## [v0.3.0] -- 2026-04-24
+
+### Added
+
 - Added the value entered by the user in the error messages for metadata field validation errors in EMAIL and URL type fields. For example, instead of showing “Point of Contact E-mail is not a valid email address.“, we now show “Point of Contact E-mail foo is not a valid email address.”
 - Contact Owner button in File Page.
 - Share button in File Page.
@@ -19,6 +31,10 @@ 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
 - Dataset Templates UI integration, including create/edit flows, previews, and skeleton states.
+- Added a message note to the login page
+- Download with terms of use and guestbook.
+- Show terms modal before download when dataset has custom terms, a non-default license (not CC0 1.0), or a guestbook. Draft datasets and dataset editors bypass the modal.
+- Layout: added a configurable homepage banner for announcements and important messages. (#787)
 
 ### Changed
 
@@ -31,6 +47,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Added disclaimer text and custom popup text to Publish Dataset modal for better communication of the implications of publishing a dataset. The text can be configured through the runtime configuration.
 - Dataset page Terms tab title now depends on permissions: users with dataset update permission see `Terms and Guestbook`, and read-only users see `Terms`.
 - Avoided prop-drilling for collection repository, so used context to share epository instances.
+- Added frontend version to the footer of the application, which is retrieved from the `version` field in `package.json` at build time.
 
 ### Fixed
 
@@ -63,6 +80,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 -->