Show "New Review" button, when enabled #821

Author: pdurbin

package-lock.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": "2.0.0-alpha.62",
+    "@iqss/dataverse-client-javascript": "2.0.0-pr360.cc77995",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

package.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"

public/locales/en/header.json

@@ -25,7 +25,11 @@ export interface DatasetRepository {
     includeDeaccessioned: boolean
   ) => Promise<DatasetVersionDiff>
 
-  create: (dataset: DatasetDTO, collectionId: string) => Promise<{ persistentId: string }>
+  create: (
+    dataset: DatasetDTO,
+    collectionId: string,
+    datasetType?: string
+  ) => Promise<{ persistentId: string }>
   updateMetadata: (
     datasetId: string | number,
     datasetDTO: DatasetDTO,

src/dataset/domain/repositories/DatasetRepository.ts

@@ -4,9 +4,10 @@ import { DatasetDTO } from './DTOs/DatasetDTO'
 export function createDataset(
   datasetRepository: DatasetRepository,
   dataset: DatasetDTO,
-  collectionId: string
+  collectionId: string,
+  datasetType?: string
 ): Promise<{ persistentId: string }> {
-  return datasetRepository.create(dataset, collectionId).catch((error: Error) => {
+  return datasetRepository.create(dataset, collectionId, datasetType).catch((error: Error) => {
     throw new Error(error.message)
   })
 }

src/dataset/domain/useCases/createDataset.ts

@@ -310,9 +310,13 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
       })
   }
 
-  create(dataset: DatasetDTO, collectionId: string): Promise<{ persistentId: string }> {
+  create(
+    dataset: DatasetDTO,
+    collectionId: string,
+    datasetType?: string
+  ): Promise<{ persistentId: string }> {
     return createDataset
-      .execute(DatasetDTOMapper.toJSDatasetDTO(dataset), collectionId)
+      .execute(DatasetDTOMapper.toJSDatasetDTO(dataset), collectionId, datasetType)
       .then((jsDatasetIdentifiers: JSDatasetIdentifiers) => ({
         persistentId: jsDatasetIdentifiers.persistentId
       }))

src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts

@@ -38,6 +38,9 @@ export const LoggedInHeaderActions = ({
 
   const canUserAddCollectionToRoot = Boolean(collectionUserPermissions?.canAddCollection)
   const canUserAddDatasetToRoot = Boolean(collectionUserPermissions?.canAddDataset)
+  // TODO: Enable/disable review creation based on config setting. See also AddDataActionsButton.tsx
+  // TODO: Longer term, query /api/datasets/datasetTypes and show those
+  const reviewCreationEnabled = false
 
   return (
     <>
@@ -51,6 +54,14 @@ 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}?datasetType=review`}
+            disabled={!canUserAddDatasetToRoot}>
+            {t('navigation.newReview')}
+          </Navbar.Dropdown.Item>
+        )}
       </Navbar.Dropdown>
       <Navbar.Dropdown title={user.displayName} id="dropdown-user">
         <Navbar.Dropdown.Item

src/sections/layout/header/LoggedInHeaderActions.tsx

@@ -21,6 +21,9 @@ export default function AddDataActionsButton({
 
   const createCollectionRoute = RouteWithParams.CREATE_COLLECTION(collectionId)
   const createDatasetRoute = RouteWithParams.CREATE_DATASET(collectionId)
+  // TODO: Enable/disable review creation based on config setting. See also LoggedInHeaderActions.tsx
+  // TODO: Longer term, query /api/datasets/datasetTypes and show those
+  const reviewCreationEnabled = false
 
   return (
     <DropdownButton
@@ -34,6 +37,14 @@ export default function AddDataActionsButton({
       <Dropdown.Item to={createDatasetRoute} as={Link} disabled={!canAddDataset}>
         {t('navigation.newDataset')}
       </Dropdown.Item>
+      {reviewCreationEnabled && (
+        <Dropdown.Item
+          to={`${createDatasetRoute}?datasetType=review`}
+          as={Link}
+          disabled={!canAddDataset}>
+          {t('navigation.newReview')}
+        </Dropdown.Item>
+      )}
     </DropdownButton>
   )
 }

src/sections/shared/add-data-actions/AddDataActionsButton.tsx

@@ -61,7 +61,13 @@ export function useSubmitDataset(
     )
 
     if (mode === 'create') {
-      createDataset(datasetRepository, formattedFormValues, collectionId)
+      let datasetType = 'dataset'
+      const urlParams = new URLSearchParams(window.location.search)
+      const datasetTypeIn = urlParams.get('datasetType')
+      if (datasetTypeIn) {
+        datasetType = datasetTypeIn
+      }
+      createDataset(datasetRepository, formattedFormValues, collectionId, datasetType)
         .then(({ persistentId }) => {
           setSubmitError(null)
           setSubmissionStatus(SubmissionStatus.SubmitComplete)