feat: add correct use cases to update terms

Author: ChengShi-1

package-lock.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.77",
+    "@iqss/dataverse-client-javascript": "2.1.0-pr389.ec2282b",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

package.json

@@ -104,6 +104,10 @@
       "heading": "Success!",
       "alertText": "The terms for this dataset have been updated."
     },
+    "licenseUpdated": {
+      "heading": "Success!",
+      "alertText": "The license for this dataset has been updated."
+    },
     "thumbnailUpdated": {
       "heading": "Success!",
       "alertText": "Dataset thumbnail updated."

public/locales/en/dataset.json

@@ -34,10 +34,6 @@ export interface DatasetRepository {
     datasetDTO: DatasetDTO,
     sourceLastUpdateTime?: string
   ) => Promise<void>
-  updateLicense: (
-    datasetId: string | number,
-    licenseUpdateRequest: DatasetLicenseUpdateRequest
-  ) => Promise<void>
   deaccession: (
     datasetId: string | number,
     version: string,
@@ -63,6 +59,10 @@ export interface DatasetRepository {
   ) => Promise<FormattedCitation>
   getTemplates: (collectionIdOrAlias: number | string) => Promise<DatasetTemplate[]>
   updateTermsOfAccess: (datasetId: string | number, termsOfAccess: TermsOfAccess) => Promise<void>
+  updateDatasetLicense: (
+    datasetId: string | number,
+    licenseUpdateRequest: DatasetLicenseUpdateRequest
+  ) => Promise<void>
   link(datasetId: string | number, collectionIdOrAlias: string | number): Promise<void>
   unlink(datasetId: string | number, collectionIdOrAlias: string | number): Promise<void>
   getDatasetLinkedCollections: (datasetId: string | number) => Promise<CollectionSummary[]>

src/dataset/domain/repositories/DatasetRepository.ts

@@ -0,0 +1,14 @@
+import { DatasetLicenseUpdateRequest } from '../models/DatasetLicenseUpdateRequest'
+import { DatasetRepository } from '../repositories/DatasetRepository'
+
+export function updateDatasetLicense(
+  datasetRepository: DatasetRepository,
+  datasetId: string | number,
+  licenseUpdateRequest: DatasetLicenseUpdateRequest
+): Promise<void> {
+  return datasetRepository
+    .updateDatasetLicense(datasetId, licenseUpdateRequest)
+    .catch((error: Error) => {
+      throw new Error(error.message)
+    })
+}

src/dataset/domain/useCases/updateDatasetLicense.ts

@@ -76,7 +76,7 @@ export class JSDatasetMapper {
       ),
       JSDatasetMapper.toDatasetPermissions(jsDatasetPermissions),
       JSDatasetMapper.toLocks(jsDatasetLocks),
-      true, // TODO Connect with dataset hasValidTermsOfAccess
+      jsDataset.termsOfUse.termsOfAccess.termsOfAccessForRestrictedFiles !== undefined,
       true, // TODO Connect with dataset hasOneTabularFileAtLeast
       true, // TODO Connect with dataset isValid
       JSDatasetMapper.toDownloadUrls(jsDataset.persistentId, version),

src/dataset/infrastructure/mappers/JSDatasetMapper.ts

@@ -1,6 +1,5 @@
 import { DatasetRepository } from '../../domain/repositories/DatasetRepository'
 import {
-  CustomTerms,
   Dataset,
   DatasetLock,
   DatasetNonNumericVersion,
@@ -43,7 +42,9 @@ import {
   getDatasetTemplates,
   linkDataset,
   unlinkDataset,
-  getDatasetLinkedCollections
+  getDatasetLinkedCollections,
+  updateTermsOfAccess,
+  updateDatasetLicense
 } from '@iqss/dataverse-client-javascript'
 import { JSDatasetMapper } from '../mappers/JSDatasetMapper'
 import { DatasetPaginationInfo } from '../../domain/models/DatasetPaginationInfo'
@@ -52,7 +53,7 @@ import { DatasetDTO } from '../../domain/useCases/DTOs/DatasetDTO'
 import { DatasetDTOMapper } from '../mappers/DatasetDTOMapper'
 import { DatasetsWithCount } from '../../domain/models/DatasetsWithCount'
 import { VersionUpdateType } from '../../domain/models/VersionUpdateType'
-import { DatasetVersionSummaryInfo } from '@/dataset/domain/models/DatasetVersionSummaryInfo'
+import { DatasetVersionSummarySubset } from '@/dataset/domain/models/DatasetVersionSummaryInfo'
 import { DatasetDownloadCount } from '@/dataset/domain/models/DatasetDownloadCount'
 import { FormattedCitation, CitationFormat } from '@/dataset/domain/models/DatasetCitation'
 import { DatasetLicenseUpdateRequest } from '../../domain/models/DatasetLicenseUpdateRequest'
@@ -381,10 +382,16 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
         throw new Error(error.message)
       })
   }
-  getDatasetVersionsSummaries(datasetId: number | string): Promise<DatasetVersionSummaryInfo[]> {
-    return getDatasetVersionsSummaries.execute(datasetId).catch((error: ReadError) => {
-      throw error
-    })
+  getDatasetVersionsSummaries(
+    datasetId: number | string,
+    limit?: number,
+    offset?: number
+  ): Promise<DatasetVersionSummarySubset> {
+    return getDatasetVersionsSummaries
+      .execute(datasetId, limit, offset)
+      .catch((error: ReadError) => {
+        throw error
+      })
   }
   getDownloadCount(
     datasetId: string | number,
@@ -455,63 +462,14 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
       })
   }
 
-  updateLicense(
+  updateDatasetLicense(
     datasetId: string | number,
     licenseUpdateRequest: DatasetLicenseUpdateRequest
   ): Promise<void> {
-    // return updateTermsOfAccess.execute(datasetId, licenseUpdateRequest)
-    // TODO: This method should use updateDatasetLicense from js-dataverse when available
-    // For now, implementing as a direct API call
-
-    // The license API requires numeric dataset ID, not persistentId
-    // We need to use the dataset.id (numeric) for license updates
-    const apiUrl = `${DatasetJSDataverseRepository.DATAVERSE_BACKEND_URL}/api/datasets/${datasetId}/license`
-
-    const payload: {
-      name?: string
-      customTerms?: CustomTerms
-    } = {}
-
-    if (licenseUpdateRequest.name) {
-      payload.name = licenseUpdateRequest.name
-    }
-
-    if (licenseUpdateRequest.customTerms) {
-      payload.customTerms = licenseUpdateRequest.customTerms
-    }
-
-    return axiosInstance
-      .put(apiUrl, payload)
-      .then(() => undefined)
-      .catch((error: unknown) => {
-        const errorMessage = error instanceof Error ? error.message : 'Unknown error'
-        throw new Error(`Failed to update dataset license: ${errorMessage}`)
-      })
+    return updateDatasetLicense.execute(datasetId, licenseUpdateRequest)
   }
 
   updateTermsOfAccess(datasetId: string | number, termsOfAccess: TermsOfAccess): Promise<void> {
-    // return updateTermsOfAccess.execute(datasetId, termsOfAccess)
-
-    // TODO: This method should use updateDatasetLicense from js-dataverse when available
-    // For now, implementing as a direct API call
-
-    const apiUrl = `${DatasetJSDataverseRepository.DATAVERSE_BACKEND_URL}/api/datasets/${datasetId}/access`
-
-    // Map client model field to API expected field name
-    const { termsOfAccessForRestrictedFiles, ...rest } = termsOfAccess
-    const payload = {
-      ...rest,
-      ...(termsOfAccessForRestrictedFiles !== undefined
-        ? { termsOfAccess: termsOfAccessForRestrictedFiles }
-        : {})
-    }
-
-    return axiosInstance
-      .put(apiUrl, { customTermsOfAccess: payload })
-      .then(() => undefined)
-      .catch((error: unknown) => {
-        const errorMessage = error instanceof Error ? error.message : 'Unknown error'
-        throw new Error(`Failed to update dataset terms of access: ${errorMessage}`)
-      })
+    return updateTermsOfAccess.execute(datasetId, termsOfAccess)
   }
 }

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -2,6 +2,7 @@ import { Col, Row } from '@iqss/dataverse-design-system'
 import { QuestionMarkTooltip } from '@iqss/dataverse-design-system'
 import { MarkdownComponent } from '@/sections/dataset/markdown/MarkdownComponent'
 import styles from '@/sections/dataset/dataset-terms/DatasetTerms.module.scss'
+import TurndownService from 'turndown'
 
 interface DatasetTermsRowProps {
   title: string
@@ -14,13 +15,20 @@ export function DatasetTermsRow({ title, tooltipMessage, value }: DatasetTermsRo
     return null
   }
 
+  const turndownService = new TurndownService()
+  function convertHtmlToMarkdown(html: string): string {
+    return turndownService.turndown(html)
+  }
+
   return (
     <Row className={styles['dataset-terms-row']}>
       <Col sm={3}>
         <strong>{title} </strong>
         <QuestionMarkTooltip placement="right" message={tooltipMessage} />
       </Col>
-      <Col>{value && <div>{<MarkdownComponent markdown={value} />}</div>}</Col>
+      <Col>
+        {value && <div>{<MarkdownComponent markdown={convertHtmlToMarkdown(value)} />}</div>}
+      </Col>
     </Row>
   )
 }

src/sections/dataset/dataset-terms/DatasetTermsRow.tsx

@@ -120,7 +120,10 @@ export const EditDatasetTerms = ({
         </Accordion>
       ) : (
         <Tabs activeKey={activeKey} onSelect={updateTabOnSelect}>
-          <Tabs.Tab eventKey={tabsKeys.datasetTerms} title={t('editTerms.tabs.datasetTerms')}>
+          <Tabs.Tab
+            eventKey={tabsKeys.datasetTerms}
+            title={t('editTerms.tabs.datasetTerms')}
+            disabled={true}>
             <div className={styles['tab-container']}>
               <DatasetTermsTab
                 licenseRepository={licenseRepository}
@@ -145,7 +148,10 @@ export const EditDatasetTerms = ({
             </div>
           </Tabs.Tab>
 
-          <Tabs.Tab eventKey={tabsKeys.guestBook} title={t('editTerms.tabs.guestBook')}>
+          <Tabs.Tab
+            eventKey={tabsKeys.guestBook}
+            title={t('editTerms.tabs.guestBook')}
+            disabled={true}>
             <div className={styles['tab-container']}>
               <GuestBookTab />
             </div>

src/sections/edit-dataset-terms/EditDatasetTerms.tsx

@@ -4,6 +4,7 @@ import { DatasetRepository } from '../../../dataset/domain/repositories/DatasetR
 import { DatasetLicenseUpdateRequest } from '../../../dataset/domain/models/DatasetLicenseUpdateRequest'
 import { JSDataverseWriteErrorHandler } from '../../../shared/helpers/JSDataverseWriteErrorHandler'
 import { WriteError } from '@iqss/dataverse-client-javascript'
+import { updateDatasetLicense } from '@/dataset/domain/useCases/updateDatasetLicense'
 
 export interface UseUpdateDatasetLicense {
   datasetRepository: DatasetRepository
@@ -35,7 +36,7 @@ export const useUpdateDatasetLicense = ({
     setError(null)
 
     try {
-      await datasetRepository.updateLicense(datasetId, licenseUpdateRequest)
+      await updateDatasetLicense(datasetRepository, datasetId, licenseUpdateRequest)
       onSuccessfulUpdateLicense()
     } catch (err: WriteError | unknown) {
       if (err instanceof WriteError) {