Merge branch 'develop' into 839-wrappers-break-when-entering-long-descriptions-without-spacing-on-datasets

ChengShi-1 · web-flow · commit d681473c7c7d · 2025-10-09T12:53:57.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,12 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 
 ### 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
 
 - Add word-break to items text to prevent layout issues when long descriptions without spaces are entered. (#839)
+- Show toast notification when API token is copied to clipboard.
 
 ### Removed
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",
diff --git a/public/locales/en/account.json b/public/locales/en/account.json
@@ -13,7 +13,8 @@
     "copyToClipboard": "Copy to Clipboard",
     "recreateToken": "Recreate Token",
     "revokeToken": "Revoke Token",
-    "createToken": "Create Token"
+    "createToken": "Create Token",
+    "copiedToClipboard": "API token copied to clipboard."
   },
   "info": {
     "username": "Username",
diff --git a/src/dataset/domain/models/Dataset.ts b/src/dataset/domain/models/Dataset.ts
@@ -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
       )
diff --git a/src/dataset/domain/repositories/DatasetRepository.ts b/src/dataset/domain/repositories/DatasetRepository.ts
@@ -30,7 +30,7 @@ export interface DatasetRepository {
   updateMetadata: (
     datasetId: string | number,
     datasetDTO: DatasetDTO,
-    internalVersionNumber: number
+    sourceLastUpdateTime?: string
   ) => Promise<void>
   deaccession: (
     datasetId: string | number,
diff --git a/src/dataset/domain/useCases/updateDatasetMetadata.ts b/src/dataset/domain/useCases/updateDatasetMetadata.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)
     })
diff --git a/src/dataset/infrastructure/mappers/JSDatasetMapper.ts b/src/dataset/infrastructure/mappers/JSDatasetMapper.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
diff --git a/src/dataset/infrastructure/mappers/JSDatasetPreviewMapper.ts b/src/dataset/infrastructure/mappers/JSDatasetPreviewMapper.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,
diff --git a/src/dataset/infrastructure/mappers/JSDatasetVersionMapper.ts b/src/dataset/infrastructure/mappers/JSDatasetVersionMapper.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
     )
diff --git a/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts b/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts
@@ -350,10 +350,10 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
   updateMetadata(
     datasetId: string | number,
     updatedDataset: DatasetDTO,
-    internalVersionNumber: number
+    sourceLastUpdateTime?: string
   ): Promise<void> {
     return updateDataset
-      .execute(datasetId, DatasetDTOMapper.toJSDatasetDTO(updatedDataset), internalVersionNumber)
+      .execute(datasetId, DatasetDTOMapper.toJSDatasetDTO(updatedDataset), sourceLastUpdateTime)
       .catch((error: WriteError) => {
         throw new Error(error.message)
       })
diff --git a/src/files/domain/repositories/FileRepository.ts b/src/files/domain/repositories/FileRepository.ts
@@ -54,7 +54,11 @@ export interface FileRepository {
   delete: (fileId: number | string) => Promise<void>
   replace: (fileId: number | string, uploadedFileDTO: UploadedFileDTO) => Promise<number>
   getFixityAlgorithm: () => Promise<FixityAlgorithm>
-  updateMetadata: (fileId: number | string, fileMetadata: FileMetadataDTO) => Promise<void>
+  updateMetadata: (
+    fileId: number | string,
+    fileMetadata: FileMetadataDTO,
+    sourceLastUpdateTime?: string
+  ) => Promise<void>
   restrict: (fileId: number | string, restrictFileDTO: RestrictFileDTO) => Promise<void>
   updateTabularTags: (
     fileId: number | string,
diff --git a/src/files/domain/useCases/editFileMetadata.ts b/src/files/domain/useCases/editFileMetadata.ts
@@ -4,7 +4,8 @@ import { FileMetadataDTO } from '@/files/domain/useCases/DTOs/FileMetadataDTO'
 export function editFileMetadata(
   fileRepository: FileRepository,
   fileId: number | string,
-  fileMetadata: FileMetadataDTO
+  fileMetadata: FileMetadataDTO,
+  sourceLastUpdateTime?: string
 ): Promise<void> {
-  return fileRepository.updateMetadata(fileId, fileMetadata)
+  return fileRepository.updateMetadata(fileId, fileMetadata, sourceLastUpdateTime)
 }
diff --git a/src/files/infrastructure/FileJSDataverseRepository.ts b/src/files/infrastructure/FileJSDataverseRepository.ts
@@ -356,8 +356,12 @@ export class FileJSDataverseRepository implements FileRepository {
       .then((newFileIdentifier) => newFileIdentifier)
   }
 
-  updateMetadata(fileId: number | string, fileMetadata: FileMetadataDTO): Promise<void> {
-    return updateFileMetadata.execute(fileId, fileMetadata)
+  updateMetadata(
+    fileId: number | string,
+    fileMetadata: FileMetadataDTO,
+    sourceLastUpdateTime?: string
+  ): Promise<void> {
+    return updateFileMetadata.execute(fileId, fileMetadata, sourceLastUpdateTime)
   }
   // TODO - Not a priority but could be nice to implement this use case in js-dataverse when having time
   getFixityAlgorithm(): Promise<FixityAlgorithm> {
diff --git a/src/files/infrastructure/mappers/JSFileMapper.ts b/src/files/infrastructure/mappers/JSFileMapper.ts
@@ -55,6 +55,7 @@ export class JSFileMapper {
       jsDataset.versionInfo,
       JSDatasetMapper.toDatasetTitle(jsDataset.metadataBlocks),
       datasetCitation,
+      jsDataset.versionInfo.lastUpdateTime,
       jsDataset.publicationDate,
       jsDataset.termsOfUse?.termsOfAccess
     )
diff --git a/src/sections/account/api-token-section/ApiTokenSection.tsx b/src/sections/account/api-token-section/ApiTokenSection.tsx
@@ -1,5 +1,6 @@
-import { Trans, useTranslation } from 'react-i18next'
 import { useEffect, useState } from 'react'
+import { toast } from 'react-toastify'
+import { Trans, useTranslation } from 'react-i18next'
 import { useGetApiToken } from './useGetCurrentApiToken'
 import { useRecreateApiToken } from './useRecreateApiToken'
 import { useRevokeApiToken } from './useRevokeApiToken'
@@ -54,11 +55,14 @@ export const ApiTokenSection = ({ repository }: ApiTokenSectionProps) => {
   }
 
   const copyToClipboard = (currentApiToken: string) => {
-    navigator.clipboard.writeText(currentApiToken).catch(
-      /* istanbul ignore next */ (error) => {
-        console.error('Failed to copy text:', error)
-      }
-    )
+    navigator.clipboard
+      .writeText(currentApiToken)
+      .then(() => toast.success(t('copiedToClipboard'), { autoClose: 2_500 }))
+      .catch(
+        /* istanbul ignore next */ (error) => {
+          console.error('Failed to copy text:', error)
+        }
+      )
   }
 
   if (isLoading || isRecreating || isRevoking) {
diff --git a/src/sections/edit-dataset-metadata/EditDatasetMetadata.tsx b/src/sections/edit-dataset-metadata/EditDatasetMetadata.tsx
@@ -70,7 +70,7 @@ export const EditDatasetMetadata = ({
               metadataBlockInfoRepository={metadataBlockInfoRepository}
               datasetPersistentID={dataset.persistentId}
               datasetMetadaBlocksCurrentValues={dataset.metadataBlocks}
-              datasetInternalVersionNumber={dataset.internalVersionNumber}
+              datasetLastUpdateTime={dataset.version.lastUpdateTime}
             />
           </div>
         </Tabs.Tab>
diff --git a/src/sections/edit-file-metadata/EditFileMetadata.tsx b/src/sections/edit-file-metadata/EditFileMetadata.tsx
@@ -73,6 +73,7 @@ export const EditFileMetadata = ({ fileId, fileRepository, referrer }: EditFileM
                 editFileMetadataFormData={createEditFileMetadataFormData(file)}
                 referrer={referrer}
                 datasetPersistentId={file.hierarchy.parent?.persistentId}
+                datasetLastUpdateTime={file.datasetVersion.lastUpdateTime}
               />
             </div>
           </Tabs.Tab>
diff --git a/src/sections/edit-file-metadata/EditFilesList.tsx b/src/sections/edit-file-metadata/EditFilesList.tsx
@@ -31,13 +31,15 @@ type EditFilesListProps = {
   editFileMetadataFormData: EditFileMetadataFormData
   referrer: EditFileMetadataReferrer
   datasetPersistentId?: string
+  datasetLastUpdateTime: string
 }
 
 export const EditFilesList = ({
   fileRepository,
   editFileMetadataFormData,
   referrer,
-  datasetPersistentId
+  datasetPersistentId,
+  datasetLastUpdateTime
 }: EditFilesListProps) => {
   const { t } = useTranslation('shared')
   const navigate = useNavigate()
@@ -56,7 +58,8 @@ export const EditFilesList = ({
   }
   const { submitForm, submissionStatus, submitError } = useSubmitFileMetadata(
     fileRepository,
-    onSubmitSucceed
+    onSubmitSucceed,
+    datasetLastUpdateTime
   )
   const isSaving = submissionStatus === SubmissionStatus.IsSubmitting
   const handleCancel = () => navigate(-1)
diff --git a/src/sections/edit-file-metadata/useSubmitFileMetadata.ts b/src/sections/edit-file-metadata/useSubmitFileMetadata.ts
@@ -27,7 +27,8 @@ type UseSubmitFileMetadataReturnType =
 
 export const useSubmitFileMetadata = (
   fileRepository: FileRepository,
-  onSubmitSucceed: () => void
+  onSubmitSucceed: () => void,
+  datasetLastUpdateTime: string
 ) => {
   const [submissionStatus, setSubmissionStatus] = useState<SubmissionStatus>(
     SubmissionStatus.NotSubmitted
@@ -45,7 +46,7 @@ export const useSubmitFileMetadata = (
             directoryLabel: file.fileDir,
             label: file.fileName
           }
-          await editFileMetadata(fileRepository, file.id, fileMetadataDTO)
+          await editFileMetadata(fileRepository, file.id, fileMetadataDTO, datasetLastUpdateTime)
         }
 
         setSubmitError(null)
diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/index.tsx b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/index.tsx
@@ -24,7 +24,7 @@ interface FormProps {
   metadataBlocksInfo: MetadataBlockInfo[]
   datasetRepository: DatasetRepository
   datasetPersistentID?: string
-  datasetInternalVersionNumber?: number
+  datasetLastUpdateTime?: string
   datasetTemplateInstructions?: DatasetTemplateInstruction[]
 }
 
@@ -35,7 +35,7 @@ export const MetadataForm = ({
   metadataBlocksInfo,
   datasetRepository,
   datasetPersistentID,
-  datasetInternalVersionNumber,
+  datasetLastUpdateTime,
   datasetTemplateInstructions
 }: FormProps) => {
   const { user } = useSession()
@@ -57,7 +57,7 @@ export const MetadataForm = ({
     datasetRepository,
     onSubmitDatasetError,
     datasetPersistentID,
-    datasetInternalVersionNumber
+    datasetLastUpdateTime
   )
 
   usePrefillFieldsWithUserData({ mode, user, formDefaultValues, setValue })
diff --git a/src/sections/shared/form/DatasetMetadataForm/index.tsx b/src/sections/shared/form/DatasetMetadataForm/index.tsx
@@ -18,7 +18,7 @@ type DatasetMetadataFormProps =
       datasetPersistentID?: never
       metadataBlockInfoRepository: MetadataBlockInfoRepository
       datasetMetadaBlocksCurrentValues?: never
-      datasetInternalVersionNumber?: never
+      datasetLastUpdateTime?: never
       datasetTemplate?: DatasetTemplate
     }
   | {
@@ -28,7 +28,7 @@ type DatasetMetadataFormProps =
       datasetPersistentID: string
       metadataBlockInfoRepository: MetadataBlockInfoRepository
       datasetMetadaBlocksCurrentValues: DatasetMetadataBlocks
-      datasetInternalVersionNumber: number
+      datasetLastUpdateTime?: string
       datasetTemplate?: never
     }
 
@@ -41,7 +41,7 @@ export const DatasetMetadataForm = ({
   datasetPersistentID,
   metadataBlockInfoRepository,
   datasetMetadaBlocksCurrentValues,
-  datasetInternalVersionNumber,
+  datasetLastUpdateTime,
   datasetTemplate
 }: DatasetMetadataFormProps) => {
   const { setIsLoading } = useLoading()
@@ -107,7 +107,7 @@ export const DatasetMetadataForm = ({
       metadataBlocksInfo={metadataBlocksInfo}
       datasetRepository={datasetRepository}
       datasetPersistentID={datasetPersistentID}
-      datasetInternalVersionNumber={datasetInternalVersionNumber}
+      datasetLastUpdateTime={datasetLastUpdateTime}
       datasetTemplateInstructions={datasetTemplate?.instructions}
     />
   )
diff --git a/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts b/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts
@@ -39,7 +39,7 @@ export function useSubmitDataset(
   datasetRepository: DatasetRepository,
   onSubmitErrorCallback: () => void,
   datasetPersistentID?: string,
-  datasetInternalVersionNumber?: number
+  datasetLastUpdateTime?: string
 ): UseSubmitDatasetReturnType {
   const navigate = useNavigate()
   const { t } = useTranslation('shared', { keyPrefix: 'datasetMetadataForm' })
@@ -89,7 +89,7 @@ export function useSubmitDataset(
         datasetRepository,
         currentEditedDatasetPersistentID,
         formattedFormValues,
-        datasetInternalVersionNumber as number
+        datasetLastUpdateTime as string
       )
         .then(() => {
           setSubmitError(null)
diff --git a/src/stories/shared/dataset-metadata-form/DatasetMetadataForm.stories.tsx b/src/stories/shared/dataset-metadata-form/DatasetMetadataForm.stories.tsx
@@ -40,7 +40,7 @@ export const EditMode: Story = {
       metadataBlockInfoRepository={new MetadataBlockInfoMockRepository()}
       datasetPersistentID={datasetToEditMock.persistentId}
       datasetMetadaBlocksCurrentValues={datasetToEditMock.metadataBlocks}
-      datasetInternalVersionNumber={1}
+      datasetLastUpdateTime="2023-06-01T12:34:56Z"
     />
   )
 }
diff --git a/tests/component/dataset/domain/models/DatasetMother.ts b/tests/component/dataset/domain/models/DatasetMother.ts
@@ -41,7 +41,8 @@ export class DatasetVersionMother {
       props?.isLatest ?? false,
       props?.isInReview ?? false,
       props?.latestVersionPublishingStatus ?? DatasetPublishingStatus.RELEASED,
-      props?.someDatasetVersionHasBeenReleased ?? faker.datatype.boolean()
+      props?.someDatasetVersionHasBeenReleased ?? faker.datatype.boolean(),
+      props?.lastUpdateTime ?? faker.date.recent().toISOString()
     )
   }
 
diff --git a/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts b/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
diff --git a/tests/component/sections/account/ApiTokenSection.spec.tsx b/tests/component/sections/account/ApiTokenSection.spec.tsx
diff --git a/tests/component/sections/edit-file-metadata/EditFilesList.spec.tsx b/tests/component/sections/edit-file-metadata/EditFilesList.spec.tsx
diff --git a/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx b/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
diff --git a/tests/e2e-integration/integration/datasets/DatasetJSDataverseRepository.spec.ts b/tests/e2e-integration/integration/datasets/DatasetJSDataverseRepository.spec.ts
