321 default dataset version

src/dataset/domain/models/Dataset.ts

@@ -211,7 +211,11 @@ export enum DatasetPublishingStatus {
 
 export enum DatasetNonNumericVersion {
   LATEST = ':latest',
-  DRAFT = ':draft'
+  DRAFT = ':draft',
+  LATEST_PUBLISHED = ':latest-published'
+}
+export enum DatasetVersionNonNumericSearchParam {
+  DRAFT = 'DRAFT'
 }
 
 export class DatasetVersionNumber {

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -1,5 +1,5 @@
 import { DatasetRepository } from '../../domain/repositories/DatasetRepository'
-import { Dataset } from '../../domain/models/Dataset'
+import { Dataset, DatasetNonNumericVersion } from '../../domain/models/Dataset'
 import {
   getDataset,
   getAllDatasetPreviews,
@@ -116,9 +116,10 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
 
   getByPersistentId(
     persistentId: string,
-    version?: string,
+    version: string = DatasetNonNumericVersion.LATEST_PUBLISHED,
     requestedVersion?: string
   ): Promise<Dataset | undefined> {
+    console.log('getByPersistentId', persistentId, version, requestedVersion)
     return getDataset
       .execute(persistentId, version, includeDeaccessioned)
       .then((jsDataset) => this.fetchDatasetDetails(jsDataset, version))
@@ -147,10 +148,14 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
       })
       .catch((error: ReadError) => {
         console.error(error)
-        if (!version) {
+        if (version === DatasetNonNumericVersion.LATEST_PUBLISHED) {
           throw new Error(`Failed to get dataset by persistent ID: ${error.message}`)
         }
-        return this.getByPersistentId(persistentId, undefined, (requestedVersion = version))
+        return this.getByPersistentId(
+          persistentId,
+          DatasetNonNumericVersion.LATEST_PUBLISHED,
+          (requestedVersion = version)
+        )
       })
   }
   getByPrivateUrlToken(privateUrlToken: string): Promise<Dataset | undefined> {

src/sections/collection/datasets-list/dataset-card/DatasetCardHeader.tsx

@@ -3,17 +3,33 @@ import { LinkToPage } from '../../../shared/link-to-page/LinkToPage'
 import { Route } from '../../../Route.enum'
 import { DatasetLabels } from '../../../dataset/dataset-labels/DatasetLabels'
 import { DatasetIcon } from '../../../dataset/dataset-icon/DatasetIcon'
-import { DatasetVersion } from '../../../../dataset/domain/models/Dataset'
+import {
+  DatasetPublishingStatus,
+  DatasetVersion,
+  DatasetVersionNonNumericSearchParam
+} from '../../../../dataset/domain/models/Dataset'
 
 interface DatasetCardHeaderProps {
   persistentId: string
   version: DatasetVersion
 }
+function getSearchParams(
+  persistentId: string,
+  publishingStatus: DatasetPublishingStatus
+): Record<string, string> {
+  const params: Record<string, string> = { persistentId: persistentId }
+  if (publishingStatus === DatasetPublishingStatus.DRAFT) {
+    params.version = DatasetVersionNonNumericSearchParam.DRAFT
+  }
+  return params
+}
 export function DatasetCardHeader({ persistentId, version }: DatasetCardHeaderProps) {
   return (
     <div className={styles.header}>
       <div className={styles.title}>
-        <LinkToPage page={Route.DATASETS} searchParams={{ persistentId: persistentId }}>
+        <LinkToPage
+          page={Route.DATASETS}
+          searchParams={getSearchParams(persistentId, version.publishingStatus)}>
           {version.title}
         </LinkToPage>
         <DatasetLabels labels={version.labels} />

src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts

@@ -8,6 +8,7 @@ import { MetadataFieldsHelper, type DatasetMetadataFormValues } from './Metadata
 import { getValidationFailedFieldError } from '../../../../metadata-block-info/domain/models/fieldValidations'
 import { type DatasetMetadataFormMode } from '.'
 import { Route } from '../../../Route.enum'
+import { DatasetVersionNonNumericSearchParam } from '../../../../dataset/domain/models/Dataset'
 
 export enum SubmissionStatus {
   NotSubmitted = 'NotSubmitted',
@@ -56,11 +57,12 @@ export function useSubmitDataset(
     )
 
     if (mode === 'create') {
+      const DRAFT_PARAM = DatasetVersionNonNumericSearchParam.DRAFT
       createDataset(datasetRepository, formattedFormValues, collectionId)
         .then(({ persistentId }) => {
           setSubmitError(null)
           setSubmissionStatus(SubmissionStatus.SubmitComplete)
-          navigate(`${Route.DATASETS}?persistentId=${persistentId}`, {
+          navigate(`${Route.DATASETS}?persistentId=${persistentId}&version=${DRAFT_PARAM}`, {
             state: { created: true }
           })
           return

tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx

@@ -1,4 +1,7 @@
-import { DatasetLabelValue } from '../../../../../src/dataset/domain/models/Dataset'
+import {
+  DatasetLabelValue,
+  DatasetVersionNonNumericSearchParam
+} from '../../../../../src/dataset/domain/models/Dataset'
 import { TestsUtils } from '../../../shared/TestsUtils'
 import { DatasetHelper, DatasetResponse } from '../../../shared/datasets/DatasetHelper'
 import { FileHelper } from '../../../shared/files/FileHelper'
@@ -9,6 +12,7 @@ import { FILES_TAB_INFINITE_SCROLL_ENABLED } from '../../../../../src/sections/d
 type Dataset = {
   datasetVersion: { metadataBlocks: { citation: { fields: { value: string }[] } } }
 }
+const DRAFT_PARAM = DatasetVersionNonNumericSearchParam.DRAFT
 
 describe('Dataset', () => {
   before(() => {
@@ -24,7 +28,7 @@ describe('Dataset', () => {
       cy.wrap(DatasetHelper.create())
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.fixture('dataset-finch1.json').then((dataset: Dataset) => {
             cy.findByRole('heading', {
@@ -72,7 +76,7 @@ describe('Dataset', () => {
         .its('persistentId')
         .then((persistentId: string) => {
           cy.wrap(TestsUtils.logout())
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Page Not Found').should('exist')
         })
@@ -181,7 +185,7 @@ describe('Dataset', () => {
       )
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Root').should('exist')
           cy.findByRole('link', { name: 'Scientific Research' }).should('exist').click()
@@ -196,7 +200,7 @@ describe('Dataset', () => {
       cy.wrap(DatasetHelper.create())
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Files').should('exist')
 
@@ -208,7 +212,7 @@ describe('Dataset', () => {
       cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(3)), { timeout: 5000 })
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Files').should('exist')
 
@@ -228,7 +232,7 @@ describe('Dataset', () => {
         cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(30)), { timeout: 20000 })
           .its('persistentId')
           .then((persistentId: string) => {
-            cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+            cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
             cy.findByText('Files').should('exist')
 
@@ -252,7 +256,7 @@ describe('Dataset', () => {
         cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(30)), { timeout: 20000 })
           .its('persistentId')
           .then((persistentId: string) => {
-            cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+            cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
             cy.findByText('Files').should('exist')
 
@@ -282,7 +286,7 @@ describe('Dataset', () => {
       cy.wrap(DatasetHelper.createWithFiles(FileHelper.createMany(3)))
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Files').should('exist')
 
@@ -319,7 +323,7 @@ describe('Dataset', () => {
       cy.wrap(DatasetHelper.createWithFiles(FileHelper.createManyRestricted(1)))
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Files').should('exist')
 
@@ -402,7 +406,7 @@ describe('Dataset', () => {
           .then((persistentId: string) => {
             cy.wait(1500) // Wait for the files to be embargoed
 
-            cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+            cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
             cy.wait(1500) // Wait for the files to be loaded
 
@@ -460,7 +464,7 @@ describe('Dataset', () => {
       cy.wrap(DatasetHelper.createWithFiles(files))
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Files').should('exist')
 
@@ -580,7 +584,7 @@ describe('Dataset', () => {
       cy.wrap(FileHelper.createImage().then((file) => DatasetHelper.createWithFiles([file])))
         .its('persistentId')
         .then((persistentId: string) => {
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`/spa/datasets?persistentId=${persistentId}&version=${DRAFT_PARAM}`)
 
           cy.findByText('Files').should('exist')
 

tests/e2e-integration/integration/datasets/DatasetJSDataverseRepository.spec.ts

@@ -6,6 +6,7 @@ import {
   DatasetLabel,
   DatasetLabelSemanticMeaning,
   DatasetLockReason,
+  DatasetNonNumericVersion,
   DatasetPublishingStatus,
   DatasetVersion,
   MetadataBlockName
@@ -19,6 +20,7 @@ import {
 import { DatasetPaginationInfo } from '../../../../src/dataset/domain/models/DatasetPaginationInfo'
 import { DatasetDTO } from '../../../../src/dataset/domain/useCases/DTOs/DatasetDTO'
 import { CollectionHelper } from '../../shared/collection/CollectionHelper'
+const DRAFT_PARAM = DatasetNonNumericVersion.DRAFT
 
 chai.use(chaiAsPromised)
 const expect = chai.expect
@@ -142,23 +144,25 @@ describe('Dataset JSDataverse Repository', () => {
   it('gets the dataset by persistentId', async () => {
     const datasetResponse = await DatasetHelper.create(collectionId)
 
-    await datasetRepository.getByPersistentId(datasetResponse.persistentId).then((dataset) => {
-      if (!dataset) {
-        throw new Error('Dataset not found')
-      }
-      const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
+    await datasetRepository
+      .getByPersistentId(datasetResponse.persistentId, DRAFT_PARAM)
+      .then((dataset) => {
+        if (!dataset) {
+          throw new Error('Dataset not found')
+        }
+        const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
 
-      expect(dataset.license).to.deep.equal(datasetExpected.license)
-      expect(dataset.metadataBlocks).to.deep.equal(datasetExpected.metadataBlocks)
-      expect(dataset.summaryFields).to.deep.equal(datasetExpected.summaryFields)
-      expect(dataset.version).to.deep.equal(datasetExpected.version)
-      expect(dataset.metadataBlocks[0].fields.publicationDate).not.to.exist
-      expect(dataset.metadataBlocks[0].fields.citationDate).not.to.exist
-      expect(dataset.permissions).to.deep.equal(datasetExpected.permissions)
-      expect(dataset.locks).to.deep.equal(datasetExpected.locks)
-      expect(dataset.downloadUrls).to.deep.equal(datasetExpected.downloadUrls)
-      expect(dataset.fileDownloadSizes).to.deep.equal(datasetExpected.fileDownloadSizes)
-    })
+        expect(dataset.license).to.deep.equal(datasetExpected.license)
+        expect(dataset.metadataBlocks).to.deep.equal(datasetExpected.metadataBlocks)
+        expect(dataset.summaryFields).to.deep.equal(datasetExpected.summaryFields)
+        expect(dataset.version).to.deep.equal(datasetExpected.version)
+        expect(dataset.metadataBlocks[0].fields.publicationDate).not.to.exist
+        expect(dataset.metadataBlocks[0].fields.citationDate).not.to.exist
+        expect(dataset.permissions).to.deep.equal(datasetExpected.permissions)
+        expect(dataset.locks).to.deep.equal(datasetExpected.locks)
+        expect(dataset.downloadUrls).to.deep.equal(datasetExpected.downloadUrls)
+        expect(dataset.fileDownloadSizes).to.deep.equal(datasetExpected.fileDownloadSizes)
+      })
   })
 
   it('gets a published dataset by persistentId without user authentication', async () => {
@@ -247,7 +251,7 @@ describe('Dataset JSDataverse Repository', () => {
     const datasetResponse = await DatasetHelper.create(collectionId)
 
     await datasetRepository
-      .getByPersistentId(datasetResponse.persistentId, 'DRAFT')
+      .getByPersistentId(datasetResponse.persistentId, DRAFT_PARAM)
       .then((dataset) => {
         if (!dataset) {
           throw new Error('Dataset not found')
@@ -338,20 +342,22 @@ describe('Dataset JSDataverse Repository', () => {
     const datasetResponse = await DatasetHelper.create(collectionId)
     await DatasetHelper.lock(datasetResponse.id, DatasetLockReason.FINALIZE_PUBLICATION)
 
-    await datasetRepository.getByPersistentId(datasetResponse.persistentId).then((dataset) => {
-      if (!dataset) {
-        throw new Error('Dataset not found')
-      }
-      const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
-
-      expect(dataset.version.title).to.deep.equal(datasetExpected.title)
-      expect(dataset.locks).to.deep.equal([
-        {
-          userPersistentId: 'dataverseAdmin',
-          reason: DatasetLockReason.FINALIZE_PUBLICATION
+    await datasetRepository
+      .getByPersistentId(datasetResponse.persistentId, DRAFT_PARAM)
+      .then((dataset) => {
+        if (!dataset) {
+          throw new Error('Dataset not found')
         }
-      ])
-    })
+        const datasetExpected = datasetData(dataset.persistentId, dataset.version.id)
+
+        expect(dataset.version.title).to.deep.equal(datasetExpected.title)
+        expect(dataset.locks).to.deep.equal([
+          {
+            userPersistentId: 'dataverseAdmin',
+            reason: DatasetLockReason.FINALIZE_PUBLICATION
+          }
+        ])
+      })
   })
 
   it('creates a new dataset from DatasetDTO', async () => {