Feature/417 File upload integration

package.json

@@ -44,7 +44,8 @@
     "typescript": "4.9.5",
     "use-deep-compare": "1.2.1",
     "vite-plugin-istanbul": "4.0.1",
-    "web-vitals": "2.1.4"
+    "web-vitals": "2.1.4",
+    "js-md5": "0.8.3"
   },
   "scripts": {
     "start": "vite --base=/spa",

src/files/domain/models/FileUploadState.ts

@@ -17,6 +17,7 @@ export interface FileUploadState {
   description?: string
   tags: string[]
   restricted: boolean
+  checksumValue?: string
 }
 
 export interface FileUploaderState {
@@ -94,6 +95,18 @@ export class FileUploadTools {
     return { state: oldState.state, uploaded: this.toUploaded(oldState.state) }
   }
 
+  static checksum(
+    file: File,
+    checksumValue: string,
+    oldState: FileUploaderState
+  ): FileUploaderState {
+    const fileUploadState = oldState.state.get(this.key(file))
+    if (fileUploadState) {
+      fileUploadState.checksumValue = checksumValue
+    }
+    return { state: oldState.state, uploaded: this.toUploaded(oldState.state) }
+  }
+
   static failed(file: File, oldState: FileUploaderState): FileUploaderState {
     const fileUploadState = oldState.state.get(this.key(file))
     if (fileUploadState) {

src/files/domain/repositories/FileRepository.ts

@@ -43,9 +43,4 @@ export interface FileRepository {
     storageIdSetter: (storageId: string) => void
   ) => Promise<void>
   addUploadedFiles: (datasetId: number | string, files: FileUploadState[]) => Promise<void>
-  addUploadedFile: (
-    datasetId: number | string,
-    file: FileHolder,
-    storageId: string
-  ) => Promise<void>
 }

src/files/domain/useCases/addUploadedFiles.ts

@@ -14,18 +14,3 @@ export function addUploadedFiles(
     })
     .finally(done)
 }
-
-export function addUploadedFile(
-  fileRepository: FileRepository,
-  datasetId: number | string,
-  file: File,
-  storageId: string,
-  done: () => void
-): void {
-  fileRepository
-    .addUploadedFile(datasetId, { file: file }, storageId)
-    .catch((error: Error) => {
-      throw new Error(error.message)
-    })
-    .finally(done)
-}

src/files/infrastructure/FileJSDataverseRepository.ts

@@ -15,6 +15,8 @@ import {
   getFileDownloadCount,
   getFileUserPermissions,
   uploadFile as jsUploadFile,
+  addUploadedFilesToDataset,
+  UploadedFileDTO,
   ReadError
 } from '@iqss/dataverse-client-javascript'
 import { FileCriteria } from '../domain/models/FileCriteria'
@@ -300,13 +302,18 @@ export class FileJSDataverseRepository implements FileRepository {
       })
   }
 
-  addUploadedFiles(_datasetId: number | string, _files: FileUploadState[]): Promise<void> {
-    // TODO: not yet implemented
-    return new Promise<void>(() => {})
-  }
-
-  addUploadedFile(datasetId: number | string, file: FileHolder, storageId: string): Promise<void> {
-    return new Promise<void>(() => {})
-    // return addUploadedFilesToDataset.execute(datasetId, file.file)
+  addUploadedFiles(datasetId: number | string, files: FileUploadState[]): Promise<void> {
+    const uploadedFiles: UploadedFileDTO[] = files.map((x) => ({
+      fileName: x.fileName,
+      description: x.description,
+      directoryLabel: x.fileDir,
+      categories: x.tags,
+      restrict: x.restricted,
+      storageId: x.storageId as string,
+      checksumValue: x.checksumValue as string,
+      checksumType: 'md5',
+      mimeType: x.fileType
+    }))
+    return addUploadedFilesToDataset.execute(datasetId, uploadedFiles)
   }
 }

src/sections/upload-dataset-files/UploadDatasetFiles.tsx

@@ -9,7 +9,10 @@ import { FileUploader } from './FileUploader'
 import { FileUploadState, FileUploadTools } from '../../files/domain/models/FileUploadState'
 import { uploadFile } from '../../files/domain/useCases/uploadFile'
 import { UploadedFiles } from './uploaded-files-list/UploadedFiles'
-import { addUploadedFile, addUploadedFiles } from '../../files/domain/useCases/addUploadedFiles'
+import { addUploadedFiles } from '../../files/domain/useCases/addUploadedFiles'
+import { md5 } from 'js-md5'
+import { useNavigate } from 'react-router-dom'
+import { Route } from '../Route.enum'
 
 interface UploadDatasetFilesProps {
   fileRepository: FileRepository
@@ -22,6 +25,7 @@ export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDat
   const [fileUploaderState, setState] = useState(FileUploadTools.createNewState([]))
   const [uploadingToCancelMap, setUploadingToCancelMap] = useState(new Map<string, () => void>())
   const [semaphore, setSemaphore] = useState(new Set<string>())
+  const navigate = useNavigate()
 
   const sleep = (delay: number) => new Promise((res) => setTimeout(res, delay))
   const limit = 6
@@ -42,15 +46,36 @@ export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDat
     })
   }
 
-  const fileUploadFinished = (file: File) => {
-    const key = FileUploadTools.key(file)
+  const fileUploadFailed = (file: File) => {
     setUploadingToCancelMap((x) => {
-      x.delete(key)
+      x.delete(FileUploadTools.key(file))
       return x
     })
     releaseSemaphore(file)
   }
 
+  const fileUploadFinished = (file: File) => {
+    const hash = md5.create()
+    const reader = file.stream().getReader()
+    reader
+      .read()
+      .then(async function updateHash({ done, value }) {
+        if (done) {
+          FileUploadTools.checksum(file, hash.hex(), fileUploaderState)
+        } else {
+          hash.update(value)
+          await updateHash(await reader.read())
+        }
+      })
+      .finally(() => {
+        setUploadingToCancelMap((x) => {
+          x.delete(FileUploadTools.key(file))
+          return x
+        })
+        releaseSemaphore(file)
+      })
+  }
+
   const canUpload = (file: File) =>
     !uploadingToCancelMap.has(FileUploadTools.key(file)) &&
     !FileUploadTools.get(file, fileUploaderState).failed &&
@@ -71,17 +96,10 @@ export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDat
       () => {
         setState(FileUploadTools.done(file, fileUploaderState))
         fileUploadFinished(file)
-        addUploadedFile(
-          fileRepository,
-          dataset?.persistentId as string,
-          file,
-          FileUploadTools.get(file, fileUploaderState).storageId as string,
-          () => {}
-        )
       },
       () => {
         setState(FileUploadTools.failed(file, fileUploaderState))
-        fileUploadFinished(file)
+        fileUploadFailed(file)
       },
       (now) => setState(FileUploadTools.progress(file, now, fileUploaderState)),
       (storageId) => setState(FileUploadTools.storageId(file, storageId, fileUploaderState))
@@ -141,7 +159,10 @@ export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDat
 
   const addFiles = (state: FileUploadState[]) => {
     setIsLoading(true)
-    const done = () => setIsLoading(false)
+    const done = () => {
+      setIsLoading(false)
+      navigate(`${Route.DATASETS}?persistentId=${dataset?.persistentId as string}&version=:draft`)
+    }
     addUploadedFiles(fileRepository, dataset?.persistentId as string, state, done)
     cleanAllState()
   }

src/sections/upload-dataset-files/UploadDatasetFilesFactory.tsx

@@ -4,6 +4,7 @@ import { DatasetJSDataverseRepository } from '../../dataset/infrastructure/repos
 import { FileJSDataverseRepository } from '../../files/infrastructure/FileJSDataverseRepository'
 import { DatasetProvider } from '../dataset/DatasetProvider'
 import { UploadDatasetFiles } from './UploadDatasetFiles'
+import { DatasetNonNumericVersion } from '../../dataset/domain/models/Dataset'
 
 const datasetRepository = new DatasetJSDataverseRepository()
 const fileRepository = new FileJSDataverseRepository()
@@ -17,9 +18,12 @@ export class UploadDatasetFilesFactory {
 function UploadDatasetFilesWithSearchParams() {
   const [searchParams] = useSearchParams()
   const persistentId = searchParams.get('persistentId') ?? undefined
+  const version = searchParams.get('version') ?? DatasetNonNumericVersion.DRAFT
 
   return (
-    <DatasetProvider repository={datasetRepository} searchParams={{ persistentId: persistentId }}>
+    <DatasetProvider
+      repository={datasetRepository}
+      searchParams={{ persistentId: persistentId, version: version }}>
       <UploadDatasetFiles fileRepository={fileRepository} />
     </DatasetProvider>
   )

src/stories/file/FileMockRepository.ts

@@ -114,16 +114,4 @@ export class FileMockRepository implements FileRepository {
       }, FakerHelper.loadingTimout())
     })
   }
-
-  addUploadedFile(
-    _datasetId: number | string,
-    _file: FileHolder,
-    _storageId: string
-  ): Promise<void> {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve()
-      }, FakerHelper.loadingTimout())
-    })
-  }
 }