scratch work for review datasetType

pdurbin · pdurbin · commit 543684126dca · 2025-09-08T09:54:51.000-04:00
Note that it depends on this PR: IQSS/dataverse-client-javascript#354 However, there's a new PR to try instead: IQSS/dataverse-client-javascript#360
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "@dnd-kit/sortable": "8.0.0",
     "@dnd-kit/utilities": "3.2.2",
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "v2.0.0-pr344.5fd4982",
+    "@iqss/dataverse-client-javascript": "v2.0.0-pr354.02efa3c",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",
diff --git a/public/locales/en/header.json b/public/locales/en/header.json
@@ -8,6 +8,7 @@
     "addData": "Add Data",
     "newCollection": "New Collection",
     "newDataset": "New Dataset",
+    "newReview": "New Review",
     "accountInfo": "Account Information",
     "apiToken": "API Token",
     "myData": "My Data"
diff --git a/src/dataset/domain/useCases/DTOs/DatasetDTO.ts b/src/dataset/domain/useCases/DTOs/DatasetDTO.ts
@@ -2,6 +2,7 @@ import { DatasetLicense } from '../../models/Dataset'
 
 export interface DatasetDTO {
   licence: DatasetLicense
+  datasetType?: string
   metadataBlocks: DatasetMetadataBlockValuesDTO[]
 }
 
diff --git a/src/dataset/domain/useCases/createDataset.ts b/src/dataset/domain/useCases/createDataset.ts
@@ -6,6 +6,7 @@ export function createDataset(
   dataset: DatasetDTO,
   collectionId: string
 ): Promise<{ persistentId: string }> {
+  console.log('createDataset called with dataset: ', dataset)
   return datasetRepository.create(dataset, collectionId).catch((error: Error) => {
     throw new Error(error.message)
   })
diff --git a/src/dataset/infrastructure/mappers/DatasetDTOMapper.ts b/src/dataset/infrastructure/mappers/DatasetDTOMapper.ts
@@ -7,8 +7,12 @@ import { defaultLicense } from '../../domain/models/Dataset'
 
 export class DatasetDTOMapper {
   public static toJSDatasetDTO(dataset: DatasetDTO): JSDatasetDTO {
+    console.log('toJSDatasetDTO dataset: ', dataset)
+    console.log('toJSDatasetDTOdataset.datasetType: ', dataset.datasetType)
     return {
       license: defaultLicense,
+      datasetType: dataset.datasetType,
+      // datasetType: 'trash',
       metadataBlockValues: dataset.metadataBlocks as JSMetadataBlocksDTO[]
     }
   }
diff --git a/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts b/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts
@@ -302,8 +302,12 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
   }
 
   create(dataset: DatasetDTO, collectionId: string): Promise<{ persistentId: string }> {
+    console.log('DatasetJSDataverseRepository create called with dataset: ', dataset)
+    const json = DatasetDTOMapper.toJSDatasetDTO(dataset);
+    console.log('JSON: ', json)
     return createDataset
-      .execute(DatasetDTOMapper.toJSDatasetDTO(dataset), collectionId)
+      // .execute(DatasetDTOMapper.toJSDatasetDTO(dataset), collectionId)
+      .execute(json, collectionId)
       .then((jsDatasetIdentifiers: JSDatasetIdentifiers) => ({
         persistentId: jsDatasetIdentifiers.persistentId
       }))
diff --git a/src/sections/layout/header/LoggedInHeaderActions.tsx b/src/sections/layout/header/LoggedInHeaderActions.tsx
@@ -38,6 +38,7 @@ export const LoggedInHeaderActions = ({
 
   const canUserAddCollectionToRoot = Boolean(collectionUserPermissions?.canAddCollection)
   const canUserAddDatasetToRoot = Boolean(collectionUserPermissions?.canAddDataset)
+  const reviewCreationEnabled = true
 
   return (
     <>
@@ -51,6 +52,16 @@ export const LoggedInHeaderActions = ({
         <Navbar.Dropdown.Item as={Link} to={createDatasetRoute} disabled={!canUserAddDatasetToRoot}>
           {t('navigation.newDataset')}
         </Navbar.Dropdown.Item>
+      {/* {reviewCreationEnabled && (
+        <Navbar.Dropdown.Item as={Link} to={createDatasetRoute} disabled={!canUserAddDatasetToRoot}>
+          {t('navigation.newReview')}
+        </Navbar.Dropdown.Item>
+      )} */}
+      {reviewCreationEnabled && (
+        <Navbar.Dropdown.Item as={Link} to={`${createDatasetRoute}?datasetType=review`} disabled={!canUserAddDatasetToRoot}>
+          {t('navigation.newReview')}
+        </Navbar.Dropdown.Item>
+      )}
       </Navbar.Dropdown>
       <Navbar.Dropdown title={user.displayName} id="dropdown-user">
         <Navbar.Dropdown.Item
diff --git a/src/sections/shared/add-data-actions/AddDataActionsButton.tsx b/src/sections/shared/add-data-actions/AddDataActionsButton.tsx
@@ -21,6 +21,7 @@ export default function AddDataActionsButton({
 
   const createCollectionRoute = RouteWithParams.CREATE_COLLECTION(collectionId)
   const createDatasetRoute = RouteWithParams.CREATE_DATASET(collectionId)
+  const reviewCreationEnabled = true
 
   return (
     <DropdownButton
@@ -34,6 +35,11 @@ export default function AddDataActionsButton({
       <Dropdown.Item to={createDatasetRoute} as={Link} disabled={!canAddDataset}>
         {t('navigation.newDataset')}
       </Dropdown.Item>
+      {reviewCreationEnabled && (
+        <Dropdown.Item to={createDatasetRoute} as={Link} disabled={!canAddDataset}>
+          {t('navigation.newReview')}
+        </Dropdown.Item>
+      )}
     </DropdownButton>
   )
 }
diff --git a/src/sections/shared/form/DatasetMetadataForm/MetadataForm/index.tsx b/src/sections/shared/form/DatasetMetadataForm/MetadataForm/index.tsx
@@ -76,6 +76,9 @@ export const MetadataForm = ({
         setValue('citation.datasetContact.0.datasetContactAffiliation', user.affiliation)
         setValue('citation.author.0.authorAffiliation', user.affiliation)
       }
+      // if (true) {
+      //   setValue('datasetType', 'review')
+      // }
     }
   }, [setValue, user, mode])
 
@@ -182,6 +185,32 @@ export const MetadataForm = ({
             </Alert>
           )}
 
+            <div>
+              num blocks: {metadataBlocksInfo.length}
+            </div>
+            <div>
+              {/* Show query params */}
+              <div>
+              Query params: {window.location.search}
+              {new URLSearchParams(window.location.search).get('datasetType') && (
+                <div>Dataset Type: {new URLSearchParams(window.location.search).get('datasetType')}</div>
+              )}
+              </div>
+            </div>
+            <Accordion defaultActiveKey="0" ref={accordionRef}>
+              {metadataBlocksInfo.map((metadataBlock, index) => (
+                <Accordion.Item
+                  eventKey={index.toString()}
+                  id={`metadata-block-item-${metadataBlock.name}`}
+                  key={metadataBlock.id}>
+                  <div>{metadataBlock.displayName}</div>
+                  {/* <Accordion.Body>
+                    <MetadataBlockFormFields metadataBlock={metadataBlock} />
+                  </Accordion.Body> */}
+                </Accordion.Item>
+              ))}
+            </Accordion>
+
           {metadataBlocksInfo.length > 0 && (
             <Accordion defaultActiveKey="0" ref={accordionRef}>
               {metadataBlocksInfo.map((metadataBlock, index) => (
diff --git a/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts b/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts
@@ -59,9 +59,18 @@ export function useSubmitDataset(
       formDataBackToOriginalKeys,
       mode
     )
+    console.log('Formatted form values: ', formattedFormValues)
+    const reviewFormattedFormValues = {
+      ...formattedFormValues,
+      foo: 'bar',
+      datasetType: 'review'
+      // datasetType: 'junk'
+    }
+    console.log('Review formatted form values: ', reviewFormattedFormValues)
 
     if (mode === 'create') {
-      createDataset(datasetRepository, formattedFormValues, collectionId)
+      // createDataset(datasetRepository, formattedFormValues, collectionId)
+      createDataset(datasetRepository, reviewFormattedFormValues, collectionId)
         .then(({ persistentId }) => {
           setSubmitError(null)
           setSubmissionStatus(SubmissionStatus.SubmitComplete)

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import { DatasetLicense } from '../../models/Dataset'`
`2`	`2`
`3`	`3`	`export interface DatasetDTO {`
`4`	`4`	`licence: DatasetLicense`
	`5`	`+ datasetType?: string`
`5`	`6`	`metadataBlocks: DatasetMetadataBlockValuesDTO[]`
`6`	`7`	`}`
`7`	`8`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,12 @@ import { defaultLicense } from '../../domain/models/Dataset'`
`7`	`7`
`8`	`8`	`export class DatasetDTOMapper {`
`9`	`9`	`public static toJSDatasetDTO(dataset: DatasetDTO): JSDatasetDTO {`
	`10`	`+ console.log('toJSDatasetDTO dataset: ', dataset)`
	`11`	`+ console.log('toJSDatasetDTOdataset.datasetType: ', dataset.datasetType)`
`10`	`12`	`return {`
`11`	`13`	`license: defaultLicense,`
	`14`	`+ datasetType: dataset.datasetType,`
	`15`	`+ // datasetType: 'trash',`
`12`	`16`	`metadataBlockValues: dataset.metadataBlocks as JSMetadataBlocksDTO[]`
`13`	`17`	`}`
`14`	`18`	`}`