merge develop and solve conflicts

Author: g-saracca

CHANGELOG.md

@@ -8,23 +8,54 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 
 ### Added
 
-- Dataset Templates Selector in the Create Dataset page.
+### Changed
+
+- Use of the new `sourceLastUpdateTime` query parameter from update dataset and file metadata endpoints to support optimistic concurrency control during editing operations. See [Edit Dataset Metadata](https://guides.dataverse.org/en/6.8/api/native-api.html#edit-dataset-metadata) and [Updating File Metadata](https://guides.dataverse.org/en/6.8/api/native-api.html#updating-file-metadata) guides for more details.
+
+### Fixed
+
+- Show toast notification when API token is copied to clipboard.
+
+### Removed
+
+---
+
+## [v0.2.0] -- 2025-10-03
+
+### Added
+
+- Dataset Templates integration in the Create Dataset form. (#745)
+- Advanced Search UI replicating legacy JSF, with persistence of queries and facet filters. (#760, dataverse#9993)
+- External Search integration with selectable search service and first-load fetch behavior. (#710)
+- File Edit Tags with populated categories dropdown. (#763)
+- DEMO environment option in deploy actions.
 - Metadata Export Dropdown to the metadata tab of Dataset Page and File Page.
 - External Tools integration. All types supported: Explore, Configure, Preview and Query tools in Dataset and File pages. Still not showing external tools for Auxiliary Files as additional development is needed.
-- Show toast notification when API token is copied to clipboard.
+- Dataset page: citation downloads available in multiple formats with copy-to-clipboard. (#786)
 
 ### Changed
 
-- Standardize Node.js version to 22 across all environments (docker dev environment, CI, production).
+- Standardized Node.js to v22 across environments (docker dev, CI, production).
+- 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)
 
 ### Fixed
 
-- Upgrade dependencies to drastically reduce vulnerabilities flagged by `npm audit`. Reduced from +100 including 12 critical and 33 high to only 2 moderate.
+- Guest user access: file info retrieval works on deaccessioned datasets. (#752)
+- Collection filter queries with values containing ":" now parsed correctly. (#812)
+- File upload: corrected "drop one file to replace" warning behavior. (#810)
+- Create Collection form: prevent numeric-only aliases. (#798)
+- Improved URL handling and wrapping across the UI. (#774)
 
-### Removed
+### Documentation
 
----
+- Introduced CHANGELOG and updated related documents. (#828)
+- Added Environments section to README.
+- Expanded Keycloak deployment documentation with realm setup and SPI guidance.
 
-## [v0.1.0] -- 2025-08-13
+### Security
 
-[Unreleased]: https://github.com/IQSS/dataverse-frontend/compare/v0.1.0...develop
+- Fixed dependencies vulnerabilities: reduced npm audit issues from 100+ (including 12 critical and 33 high) to only 2 moderate.
+
+## [v0.1.0] -- 2025-08-13

docs/making-releases.md

@@ -7,8 +7,8 @@
 - [Use the Latest Dataverse Client Javascript Version](#use-the-latest-dataverse-client-javascript-version)
 - [Merge "release branch" into "main"](#merge-release-branch-into-main)
 - [Create a Draft Release on GitHub and Tag the Version](#create-a-draft-release-on-github-and-tag-the-version)
-- [Merge "release branch" into "develop"](#merge-release-branch-into-develop)
-- [Delete "release branch"](#delete-release-branch)
+- [Sync "develop" branch with changes from "main"](#sync-develop-branch-with-changes-from-main)
+- [Delete "release branch" and "sync develop" branch](#delete-release-branch-and-sync-develop-branch)
 
 ## Introduction
 
@@ -83,8 +83,7 @@ Before releasing, ensure the changelog is properly prepared:
    ### Removed
    ```
 
-4. **Update the version links** at the bottom of the changelog files
-5. **Commit the changelog updates** as part of the release preparation
+4. **Commit the changelog updates** as part of the release preparation
 
 ## Use the Latest Dataverse Client Javascript Version
 
@@ -128,21 +127,18 @@ Go to https://github.com/IQSS/dataverse-frontend/releases/new to start creating
 
 At this point you can send around the draft release for any final feedback. Make corrections to the draft, if necessary. Publish once everything is ok.
 
-## Merge "release branch" into "develop"
+## Sync develop branch with changes from main
 
 After merging the release branch into `main`, ensure the develop branch is updated with the latest changes.
 
-```shell
-git checkout develop
-git merge release/X.X.X
-git push origin develop
-```
+Create a pull request to sync the `develop` branch with the `main` branch. Create the branch from `main` and name it `sync-develop-v[version-number]`.
 
-## Delete "release branch"
+This is a good time to revert or adjust any release-specific changes that are **not needed in `develop`**, such as:
 
-Once the release process is complete and the `release` branch has been merged into both `main` and `develop`, you can safely delete the `release` branch to keep the repository clean.
+- Using the npm version of the latest `@iqss/dataverse-client-javascript` package — check what alpha version is used in `develop` and revert to that version.
+- Updating the `E2E_DATAVERSE_IMAGE_TAG` in `workflows/test.yml` — revert it to the value used in `develop` (usually `unstable`).
+- Any other release-only changes or configuration updates that should not persist in `develop`.
 
-- Delete the branch locally from your repository.
-- Delete the branch remotely from the remote repository.
+## Delete "release branch" and "sync-develop" branch.
 
-This ensures that the `release` branch is no longer present in either your local or remote repositories.
+Once the release process is complete and the changes have been merged into both `main` and `develop`, you can delete the `release` branch and the `sync-develop` branch to keep the repository clean.

package-lock.json

@@ -1,10 +1,10 @@
 {
   "engines": {
-  "npm": ">=10",
-  "node": ">=22 <23"
+    "npm": ">=10",
+    "node": ">=22 <23"
   },
   "name": "dataverse-frontend",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "private": true,
   "workspaces": {
@@ -18,7 +18,7 @@
     "@dnd-kit/sortable": "8.0.0",
     "@dnd-kit/utilities": "3.2.2",
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-alpha.67",
+    "@iqss/dataverse-client-javascript": "2.0.0-alpha.76",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",
@@ -181,7 +181,6 @@
     "workerDirectory": "public"
   },
   "readme": "ERROR: No README data found!",
-  "_id": "[email protected]",
   "overrides": {
     "@parcel/watcher": "2.1.0",
     "form-data": "^4.0.0",

package.json

@@ -252,6 +252,12 @@ export class DatasetVersion {
     public readonly isInReview: boolean,
     public readonly latestVersionPublishingStatus: DatasetPublishingStatus,
     public readonly someDatasetVersionHasBeenReleased: boolean,
+    /**
+     * The timestamp of the last update to this dataset version.
+     * Format: ISO 8601 string (e.g., "2023-06-01T12:34:56Z").
+     * Used for optimistic concurrency control to detect concurrent updates.
+     */
+    public readonly lastUpdateTime: string,
     public readonly termsOfAccess?: TermsOfAccess,
     public readonly deaccessionNote?: string
   ) {}
@@ -268,6 +274,7 @@ export class DatasetVersion {
       public readonly isInReview: boolean,
       public readonly latestVersionPublishingStatus: DatasetPublishingStatus,
       public readonly someDatasetVersionHasBeenReleased: boolean,
+      public readonly lastUpdateTime: string,
       public readonly termsOfAccess?: TermsOfAccess,
       public readonly deaccessionNote?: string
     ) {
@@ -336,6 +343,7 @@ export class DatasetVersion {
         this.isInReview,
         this.latestVersionPublishingStatus,
         this.someDatasetVersionHasBeenReleased,
+        this.lastUpdateTime,
         this.termsOfAccess,
         this.deaccessionNote
       )

src/dataset/domain/models/Dataset.ts

@@ -30,7 +30,7 @@ export interface DatasetRepository {
   updateMetadata: (
     datasetId: string | number,
     datasetDTO: DatasetDTO,
-    internalVersionNumber: number
+    sourceLastUpdateTime?: string
   ) => Promise<void>
   deaccession: (
     datasetId: string | number,

src/dataset/domain/repositories/DatasetRepository.ts

@@ -5,10 +5,10 @@ export function updateDatasetMetadata(
   datasetRepository: DatasetRepository,
   datasetId: string | number,
   updatedDataset: DatasetDTO,
-  internalVersionNumber: number
+  sourceLastUpdateTime?: string
 ): Promise<void> {
   return datasetRepository
-    .updateMetadata(datasetId, updatedDataset, internalVersionNumber)
+    .updateMetadata(datasetId, updatedDataset, sourceLastUpdateTime)
     .catch((error: Error) => {
       throw new Error(error.message)
     })

src/dataset/domain/useCases/updateDatasetMetadata.ts

@@ -56,6 +56,7 @@ export class JSDatasetMapper {
       jsDataset.versionInfo,
       JSDatasetMapper.toDatasetTitle(jsDataset.metadataBlocks),
       jsDatasetCitation,
+      jsDataset.versionInfo.lastUpdateTime,
       jsDataset.publicationDate,
       jsDataset.termsOfUse?.termsOfAccess,
       jsDataset.versionInfo.deaccessionNote as string

src/dataset/infrastructure/mappers/JSDatasetMapper.ts

@@ -12,7 +12,8 @@ export class JSDatasetPreviewMapper {
         jsDatasetPreview.versionId,
         jsDatasetPreview.versionInfo,
         jsDatasetPreview.title,
-        jsDatasetPreview.citation
+        jsDatasetPreview.citation,
+        jsDatasetPreview.versionInfo.lastUpdateTime
       ),
       releaseOrCreateDate: JSDatasetPreviewMapper.toPreviewDate(jsDatasetPreview.versionInfo),
       description: jsDatasetPreview.description,

src/dataset/infrastructure/mappers/JSDatasetPreviewMapper.ts

@@ -15,6 +15,7 @@ export class JSDatasetVersionMapper {
     jsDatasetVersionInfo: JSDatasetVersionInfo,
     jsDatasetTitle: string,
     jsDatasetCitation: string,
+    jsDatasetLastUpdateTime: string,
     jsDatasetPublicationDate?: string,
     jsDatasettermsOfAccess?: TermsOfAccess,
     jsDatasetDeaccessionedNote?: string
@@ -29,6 +30,7 @@ export class JSDatasetVersionMapper {
       false, // TODO Connect with dataset version isInReview
       this.toStatus(jsDatasetVersionInfo.state),
       this.toSomeDatasetVersionHasBeenReleased(jsDatasetVersionInfo, jsDatasetPublicationDate),
+      jsDatasetLastUpdateTime,
       jsDatasettermsOfAccess,
       jsDatasetDeaccessionedNote
     )