Merge branch 'develop' into TemplateUI

Author: ChengShi-1

.github/workflows/generate-war.yml

@@ -1,3 +1,4 @@
+# .github/workflows/generate-war.yml
 name: generate-war
 
 on:
@@ -11,6 +12,7 @@ on:
           - beta
           - qa
           - demo
+          - production
       basepath:
         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
@@ -77,6 +79,17 @@ jobs:
           OIDC_STORAGE_KEY_PREFIX: ${{ secrets.DEMO_OIDC_STORAGE_KEY_PREFIX }}
         run: node ./scripts/write-runtime-config.mjs
 
+      - name: Override runtime config.js for PRODUCTION
+        if: ${{ github.event.inputs.environment == 'production' }}
+        env:
+          DATAVERSE_BACKEND_URL: ${{ secrets.PROD_DATAVERSE_BACKEND_URL }}
+          OIDC_CLIENT_ID: ${{ secrets.PROD_OIDC_CLIENT_ID }}
+          OIDC_AUTHORIZATION_ENDPOINT: ${{ secrets.PROD_OIDC_AUTHORIZATION_ENDPOINT }}
+          OIDC_TOKEN_ENDPOINT: ${{ secrets.PROD_OIDC_TOKEN_ENDPOINT }}
+          OIDC_LOGOUT_ENDPOINT: ${{ secrets.PROD_OIDC_LOGOUT_ENDPOINT }}
+          OIDC_STORAGE_KEY_PREFIX: ${{ secrets.PROD_OIDC_STORAGE_KEY_PREFIX }}
+        run: node ./scripts/write-runtime-config.mjs
+
       - uses: actions/upload-artifact@v4
         with:
           name: built-site
@@ -92,7 +105,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: zulu
           java-version: '11'
 
       - uses: actions/download-artifact@v4

CHANGELOG.md

@@ -18,6 +18,12 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 
 ---
 
+## [v0.3.1] -- 2026-04-30
+
+- Added pagination to the Versions tabs on Dataset and File pages so version summaries are loaded and displayed one page at a time.
+
+---
+
 ## [v0.3.0] -- 2026-04-24
 
 ### Added

dev-env/docker-compose-dev.yml

@@ -155,7 +155,7 @@ services:
       dev_solr_initializer:
         condition: service_completed_successfully
     restart: on-failure
-    expose:
+    ports:
       - '8983:8983'
     networks:
       - dataverse

package-lock.json

@@ -4,7 +4,7 @@
     "node": ">=22 <23"
   },
   "name": "dataverse-frontend",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "private": true,
   "workspaces": {

package.json

@@ -7,7 +7,7 @@ window.__APP_CONFIG__ = {
   backendUrl: 'http://localhost:8000',
   // Optional banner shown at the top of the app when set. Basic HTML markup is supported.
   bannerMessage:
-    "You are using the new Dataverse <strong>Modern version</strong>. This is an early release and some features from the original site are not yet available. Please see the <a href='https://dataverse.harvard.edu/spa/featured-item/harvard/1'>Project Roadmap</a> for details.",
+    "You are using the new Dataverse <strong>Modern version</strong>. This is an early release and some features from the original site are not yet available. Please see the <a href='https://dataverse.harvard.edu/modern/featured-item/harvard/1'>Project Roadmap</a> for details.",
   // OIDC provider settings
   oidc: {
     clientId: 'test',

public/config.js

@@ -1,7 +1,17 @@
 import { PaginationInfo } from '../../../shared/pagination/domain/models/PaginationInfo'
 
 export class DatasetVersionPaginationInfo extends PaginationInfo<DatasetVersionPaginationInfo> {
-  constructor(page = 1, pageSize = 10, totalItems = 0, itemName = 'Version') {
+  constructor(
+    page = 1,
+    pageSize = 10,
+    totalItems = 0,
+    itemName = 'Version',
+    private readonly offsetOverride?: number
+  ) {
     super(page, pageSize, totalItems, itemName)
   }
+
+  get offset(): number {
+    return this.offsetOverride ?? super.offset
+  }
 }

src/dataset/domain/models/DatasetVersionPaginationInfo.ts

@@ -172,9 +172,8 @@ export function Dataset({
                     datasetId={dataset.persistentId}
                     currentVersionNumber={currentVersionNumber}
                     canUpdateDataset={canUpdateDataset}
-                    isInView={activeTab === 'versions'}
+                    isInView
                     key={dataset.internalVersionNumber}
-                    isCurrentVersionDeaccessioned={isCurrentVersionDeaccessioned}
                   />
                 </div>
               </Tabs.Tab>

src/sections/dataset/Dataset.tsx

@@ -34,6 +34,13 @@
   }
 }
 
+.dataset-versions-table-loading {
+  tbody {
+    opacity: 0.55;
+    transition: opacity 120ms ease-in-out;
+  }
+}
+
 .visually-hidden {
   position: absolute;
   clip: rect(1px, 1px, 1px, 1px);

src/sections/dataset/dataset-versions/DatasetVersions.module.scss

@@ -16,14 +16,15 @@ import { useDatasetVersionSummaryDescription } from './useDatasetVersionSummaryD
 import { DatasetViewDetailButton } from './DatasetViewDetailButton'
 import { DatasetVersionState } from '@/dataset/domain/models/Dataset'
 import styles from './DatasetVersions.module.scss'
+import { DatasetVersionPaginationInfo } from '@/dataset/domain/models/DatasetVersionPaginationInfo'
+import { PaginationControls } from '@/sections/shared/pagination/PaginationControls'
 
 interface DatasetVersionsProps {
   datasetRepository: DatasetRepository
   datasetId: string
   currentVersionNumber: string
   canUpdateDataset: boolean
   isInView: boolean
-  isCurrentVersionDeaccessioned?: boolean
 }
 
 const isVersionDeaccessioned = (version: DatasetVersionSummaryInfo) =>
@@ -36,11 +37,13 @@ export function DatasetVersions({
   datasetId,
   currentVersionNumber,
   canUpdateDataset,
-  isInView,
-  isCurrentVersionDeaccessioned
+  isInView
 }: DatasetVersionsProps) {
   const { t } = useTranslation('dataset')
   const [selectedVersions, setSelectedVersions] = useState<DatasetVersionSummaryInfo[]>([])
+  const [paginationInfo, setPaginationInfo] = useState<DatasetVersionPaginationInfo>(
+    new DatasetVersionPaginationInfo()
+  )
   const {
     datasetVersionSummaries,
     error,
@@ -49,7 +52,7 @@ export function DatasetVersions({
   } = useGetDatasetVersionsSummaries({
     datasetRepository,
     persistentId: datasetId,
-    autoFetch: isCurrentVersionDeaccessioned ? true : false
+    autoFetch: false
   })
 
   const handleCheckboxChange = (datasetSummary: DatasetVersionSummaryInfo) => {
@@ -64,25 +67,46 @@ export function DatasetVersions({
     })
   }
 
+  const visibleDatasetVersionSummaries = datasetVersionSummaries?.slice(0, paginationInfo.pageSize)
   const selectableVersions =
-    datasetVersionSummaries &&
-    datasetVersionSummaries.filter((version) => !isVersionDeaccessioned(version))
+    visibleDatasetVersionSummaries &&
+    visibleDatasetVersionSummaries.filter((version) => !isVersionDeaccessioned(version))
   const isCheckBoxValid = (selectableVersions?.length ?? 0) > 2
 
   useEffect(() => {
-    if (isInView && !datasetVersionSummaries) {
-      void fetchSummaries()
+    if (isInView) {
+      const paginationInfoToDisplay = new DatasetVersionPaginationInfo(
+        paginationInfo.page,
+        paginationInfo.pageSize
+      )
+      const paginationInfoToFetch = new DatasetVersionPaginationInfo(
+        paginationInfo.page,
+        paginationInfo.pageSize + 1,
+        0,
+        'Version',
+        paginationInfoToDisplay.offset
+      )
+
+      void fetchSummaries(paginationInfoToFetch).then((totalCount) => {
+        if (typeof totalCount === 'number') {
+          setPaginationInfo((currentPaginationInfo) => currentPaginationInfo.withTotal(totalCount))
+        }
+      })
     }
-  }, [isInView, fetchSummaries, datasetVersionSummaries])
+  }, [isInView, fetchSummaries, paginationInfo.page, paginationInfo.pageSize])
 
-  if (isLoadingDatasetVersionSummaries || !datasetVersionSummaries) {
-    return <DatasetVersionsLoadingSkeleton />
-  }
+  useEffect(() => {
+    setSelectedVersions([])
+  }, [paginationInfo.page, paginationInfo.pageSize])
 
   if (error) {
     return <Alert variant="danger">Error loading dataset versions</Alert>
   }
 
+  if (!datasetVersionSummaries) {
+    return <DatasetVersionsLoadingSkeleton />
+  }
+
   return (
     <>
       {selectedVersions.length === 2 && (
@@ -93,7 +117,12 @@ export function DatasetVersions({
         />
       )}
 
-      <div className={styles['dataset-versions-table']} data-testid="dataset-versions-table">
+      <div
+        className={`${styles['dataset-versions-table']} ${
+          isLoadingDatasetVersionSummaries ? styles['dataset-versions-table-loading'] : ''
+        }`}
+        data-testid="dataset-versions-table"
+        aria-busy={isLoadingDatasetVersionSummaries}>
         <Table>
           <thead>
             <tr>
@@ -110,7 +139,7 @@ export function DatasetVersions({
             </tr>
           </thead>
           <tbody>
-            {datasetVersionSummaries?.map((dataset, index) => {
+            {visibleDatasetVersionSummaries?.map((dataset, index) => {
               const findLastNonDeaccessionedPreviousVersion = () => {
                 for (let i = index + 1; i < datasetVersionSummaries.length; i++) {
                   const version = datasetVersionSummaries[i]
@@ -186,6 +215,10 @@ export function DatasetVersions({
           </tbody>
         </Table>
       </div>
+      <PaginationControls
+        initialPaginationInfo={paginationInfo}
+        onPaginationInfoChange={setPaginationInfo}
+      />
     </>
   )
 }