fix: replaceFile and file uploader

ChengShi-1 · ChengShi-1 · commit a1c99dc0cb91 · 2026-04-28T13:17:53.000-04:00
diff --git a/src/sections/replace-file/ReplaceFile.tsx b/src/sections/replace-file/ReplaceFile.tsx
@@ -1,7 +1,6 @@
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Col, Row, Tabs } from '@iqss/dataverse-design-system'
-import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 import { FileRepository } from '@/files/domain/repositories/FileRepository'
 import { useFile } from '../file/useFile'
 import { useLoading } from '../../shared/contexts/loading/LoadingContext'
@@ -14,7 +13,6 @@ import styles from './ReplaceFile.module.scss'
 
 interface ReplaceFileProps {
   fileRepository: FileRepository
-  datasetRepository: DatasetRepository
   fileIdFromParams: number
   datasetPidFromParams: string
   datasetVersionFromParams: string
@@ -29,7 +27,6 @@ export enum ReplaceFileReferrer {
 
 export const ReplaceFile = ({
   fileRepository,
-  datasetRepository,
   fileIdFromParams,
   datasetPidFromParams,
   datasetVersionFromParams,
@@ -81,7 +78,6 @@ export const ReplaceFile = ({
           <div className={styles.tab_container}>
             <FileUploader
               fileRepository={fileRepository}
-              datasetRepository={datasetRepository}
               datasetPersistentId={datasetPidFromParams}
               storageType="S3"
               operationType={OperationType.REPLACE_FILE}
diff --git a/src/sections/replace-file/ReplaceFileFactory.tsx b/src/sections/replace-file/ReplaceFileFactory.tsx
@@ -1,13 +1,11 @@
 import { ReactElement } from 'react'
 import { useSearchParams } from 'react-router-dom'
 import { FileJSDataverseRepository } from '@/files/infrastructure/FileJSDataverseRepository'
-import { DatasetJSDataverseRepository } from '@/dataset/infrastructure/repositories/DatasetJSDataverseRepository'
 import { ReplaceFile, ReplaceFileReferrer } from './ReplaceFile'
 import { QueryParamKey } from '../Route.enum'
 import { searchParamVersionToDomainVersion } from '@/router'
 
 const fileRepository = new FileJSDataverseRepository()
-const datasetRepository = new DatasetJSDataverseRepository()
 
 export class ReplaceFileFactory {
   static create(): ReactElement {
@@ -39,7 +37,6 @@ function ReplaceFileWithParams() {
   return (
     <ReplaceFile
       fileRepository={fileRepository}
-      datasetRepository={datasetRepository}
       fileIdFromParams={fileId}
       datasetPidFromParams={datasetId}
       datasetVersionFromParams={datasetVersionNumber}
diff --git a/src/sections/shared/file-uploader/FileUploader.tsx b/src/sections/shared/file-uploader/FileUploader.tsx
@@ -1,7 +1,6 @@
 import { File as FileModel } from '@/files/domain/models/File'
 import { FileRepository } from '@/files/domain/repositories/FileRepository'
 import { DatasetUploadLimits } from '@/dataset/domain/models/DatasetUploadLimits'
-import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 import { ReplaceFileReferrer } from '@/sections/replace-file/ReplaceFile'
 import { FileUploaderProvider } from './context/FileUploaderContext'
 import { useGetFixityAlgorithm } from './useGetFixityAlgorithm'
@@ -12,29 +11,21 @@ import FileUploaderPanel from './FileUploaderPanel'
 export type FileUploaderProps =
   | {
       fileRepository: FileRepository
-      datasetRepository: DatasetRepository
       datasetPersistentId: string
       storageType: StorageType
       operationType: OperationType.REPLACE_FILE
       originalFile: FileModel
       referrer?: ReplaceFileReferrer
-      fetchUploadLimits?: (
-        datasetId: string | number,
-        datasetRepository: DatasetRepository
-      ) => Promise<DatasetUploadLimits>
+      fetchUploadLimits?: (datasetId: string | number) => Promise<DatasetUploadLimits>
     }
   | {
       fileRepository: FileRepository
-      datasetRepository: DatasetRepository
       datasetPersistentId: string
       storageType: StorageType
       operationType: OperationType.ADD_FILES_TO_DATASET
       originalFile?: never
       referrer?: never
-      fetchUploadLimits?: (
-        datasetId: string | number,
-        datasetRepository: DatasetRepository
-      ) => Promise<DatasetUploadLimits>
+      fetchUploadLimits?: (datasetId: string | number) => Promise<DatasetUploadLimits>
     }
 
 export type StorageType = 'S3'
@@ -49,7 +40,6 @@ export enum OperationType {
 
 export const FileUploader = ({
   fileRepository,
-  datasetRepository,
   datasetPersistentId,
   storageType,
   operationType,
@@ -81,7 +71,6 @@ export const FileUploader = ({
     <FileUploaderProvider initialConfig={initialConfig}>
       <FileUploaderPanel
         fileRepository={fileRepository}
-        datasetRepository={datasetRepository}
         datasetPersistentId={datasetPersistentId}
         fetchUploadLimits={fetchUploadLimits}
         referrer={referrer}
diff --git a/src/sections/shared/file-uploader/FileUploaderPanel.tsx b/src/sections/shared/file-uploader/FileUploaderPanel.tsx
@@ -7,7 +7,6 @@ import { Stack } from '@iqss/dataverse-design-system'
 import { FileRepository } from '@/files/domain/repositories/FileRepository'
 import { QueryParamKey, Route } from '@/sections/Route.enum'
 import { DatasetNonNumericVersionSearchParam } from '@/dataset/domain/models/Dataset'
-import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 import { ReplaceFileReferrer } from '@/sections/replace-file/ReplaceFile'
 import { useFileUploaderContext } from './context/FileUploaderContext'
 import FileUploadInput from './file-upload-input/FileUploadInput'
@@ -17,18 +16,13 @@ import { DatasetUploadLimits } from '@/dataset/domain/models/DatasetUploadLimits
 
 interface FileUploaderPanelProps {
   fileRepository: FileRepository
-  datasetRepository: DatasetRepository
   datasetPersistentId: string
   referrer?: ReplaceFileReferrer
-  fetchUploadLimits?: (
-    datasetId: string | number,
-    datasetRepository: DatasetRepository
-  ) => Promise<DatasetUploadLimits>
+  fetchUploadLimits?: (datasetId: string | number) => Promise<DatasetUploadLimits>
 }
 
 const FileUploaderPanel = ({
   fileRepository,
-  datasetRepository,
   datasetPersistentId,
   referrer,
   fetchUploadLimits
@@ -112,7 +106,6 @@ const FileUploaderPanel = ({
     <Stack gap={4}>
       <FileUploadInput
         fileRepository={fileRepository}
-        datasetRepository={datasetRepository}
         datasetPersistentId={datasetPersistentId}
         fetchUploadLimits={fetchUploadLimits}
       />
diff --git a/src/sections/shared/file-uploader/file-upload-input/FileUploadInput.tsx b/src/sections/shared/file-uploader/file-upload-input/FileUploadInput.tsx
@@ -9,7 +9,6 @@ import { FileRepository } from '@/files/domain/repositories/FileRepository'
 import MimeTypeDisplay from '@/files/domain/models/FileTypeToFriendlyTypeMap'
 import { uploadFile } from '@/files/domain/useCases/uploadFile'
 import { DatasetUploadLimits } from '@/dataset/domain/models/DatasetUploadLimits'
-import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 import { useFileUploaderContext } from '../context/FileUploaderContext'
 import { FileUploadState, FileUploadStatus } from '../context/fileUploaderReducer'
 import { OperationType } from '../FileUploader'
@@ -20,12 +19,8 @@ import { useUploadLimit } from './useUploadLimit'
 
 type FileUploadInputProps = {
   fileRepository: FileRepository
-  datasetRepository: DatasetRepository
   datasetPersistentId: string
-  fetchUploadLimits?: (
-    datasetId: string | number,
-    datasetRepository: DatasetRepository
-  ) => Promise<DatasetUploadLimits>
+  fetchUploadLimits?: (datasetId: string | number) => Promise<DatasetUploadLimits>
 }
 
 const limit = 6
@@ -35,7 +30,6 @@ const maxFilesPerUpload = 1000
 
 const FileUploadInput = ({
   fileRepository,
-  datasetRepository,
   datasetPersistentId,
   fetchUploadLimits
 }: FileUploadInputProps) => {
@@ -59,7 +53,7 @@ const FileUploadInput = ({
   const inputRef = useRef<HTMLInputElement>(null)
 
   const [isDragging, setIsDragging] = useState(false)
-  const { uploadLimit } = useUploadLimit(datasetPersistentId, datasetRepository, fetchUploadLimits)
+  const { uploadLimit } = useUploadLimit(datasetPersistentId, fetchUploadLimits)
 
   const totalFiles = Object.keys(fileUploaderState.files).length
 
diff --git a/src/sections/shared/file-uploader/file-upload-input/useUploadLimit.ts b/src/sections/shared/file-uploader/file-upload-input/useUploadLimit.ts
@@ -1,34 +1,39 @@
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { ReadError } from '@iqss/dataverse-client-javascript'
 import { FileSize, FileSizeUnit } from '@/files/domain/models/FileMetadata'
 import { getDatasetUploadLimits } from '@/dataset/domain/useCases/getDatasetUploadLimits'
 import { DatasetUploadLimits } from '@/dataset/domain/models/DatasetUploadLimits'
-import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
+import { DatasetJSDataverseRepository } from '@/dataset/infrastructure/repositories/DatasetJSDataverseRepository'
 import { JSDataverseReadErrorHandler } from '@/shared/helpers/JSDataverseReadErrorHandler'
 
 interface UploadLimit {
   maxFilesAvailableToUploadFormatted?: string
   storageQuotaRemainingFormatted?: string
 }
 
+const defaultDatasetRepository = new DatasetJSDataverseRepository()
+
 export function useUploadLimit(
   datasetPersistentId: string,
-  datasetRepository: DatasetRepository,
-  fetchUploadLimits: (
-    datasetId: string | number,
-    datasetRepository: DatasetRepository
-  ) => Promise<DatasetUploadLimits> = getDatasetUploadLimits
+  fetchUploadLimits?: (datasetId: string | number) => Promise<DatasetUploadLimits>
 ) {
   const [uploadLimit, setUploadLimit] = useState<UploadLimit>({})
   const [isLoadingUploadLimits, setIsLoadingUploadLimits] = useState<boolean>(true)
   const [errorUploadLimits, setErrorUploadLimits] = useState<string | null>(null)
 
+  const fetcher = useMemo<(datasetId: string | number) => Promise<DatasetUploadLimits>>(
+    () =>
+      fetchUploadLimits ??
+      ((datasetId) => getDatasetUploadLimits(datasetId, defaultDatasetRepository)),
+    [fetchUploadLimits]
+  )
+
   const fetchUploadLimitsCallback = useCallback(async () => {
     setIsLoadingUploadLimits(true)
     setErrorUploadLimits(null)
 
     try {
-      const limits = await fetchUploadLimits(datasetPersistentId, datasetRepository)
+      const limits = await fetcher(datasetPersistentId)
 
       if (Object.keys(limits).length === 0) {
         setUploadLimit({})
@@ -59,7 +64,7 @@ export function useUploadLimit(
     } finally {
       setIsLoadingUploadLimits(false)
     }
-  }, [datasetPersistentId, datasetRepository, fetchUploadLimits])
+  }, [datasetPersistentId, fetcher])
 
   useEffect(() => {
     void fetchUploadLimitsCallback()
diff --git a/src/sections/upload-dataset-files/UploadDatasetFiles.tsx b/src/sections/upload-dataset-files/UploadDatasetFiles.tsx
@@ -1,7 +1,6 @@
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Tabs } from '@iqss/dataverse-design-system'
-import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 import { FileRepository } from '../../files/domain/repositories/FileRepository'
 import { useLoading } from '../../shared/contexts/loading/LoadingContext'
 import { useDataset } from '../dataset/DatasetContext'
@@ -13,13 +12,9 @@ import styles from './UploadDatasetFiles.module.scss'
 
 interface UploadDatasetFilesProps {
   fileRepository: FileRepository
-  datasetRepository: DatasetRepository
 }
 
-export const UploadDatasetFiles = ({
-  fileRepository: fileRepository,
-  datasetRepository
-}: UploadDatasetFilesProps) => {
+export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDatasetFilesProps) => {
   const { setIsLoading } = useLoading()
   const { dataset, isLoading: isLoadingDataset } = useDataset()
   const { t } = useTranslation('uploadDatasetFiles')
@@ -49,7 +44,6 @@ export const UploadDatasetFiles = ({
           <div className={styles.tab_container}>
             <FileUploader
               fileRepository={fileRepository}
-              datasetRepository={datasetRepository}
               datasetPersistentId={dataset.persistentId}
               storageType="S3"
               operationType={OperationType.ADD_FILES_TO_DATASET}
diff --git a/src/sections/upload-dataset-files/UploadDatasetFilesFactory.tsx b/src/sections/upload-dataset-files/UploadDatasetFilesFactory.tsx
@@ -25,7 +25,7 @@ function UploadDatasetFilesWithSearchParams() {
     <DatasetProvider
       repository={datasetRepository}
       searchParams={{ persistentId: persistentId, version: version }}>
-      <UploadDatasetFiles fileRepository={fileRepository} datasetRepository={datasetRepository} />
+      <UploadDatasetFiles fileRepository={fileRepository} />
     </DatasetProvider>
   )
 }
diff --git a/src/stories/replace-file/ReplaceFile.stories.tsx b/src/stories/replace-file/ReplaceFile.stories.tsx
@@ -4,7 +4,6 @@ import { WithLayout } from '../WithLayout'
 import { FileMockRepository } from '../file/FileMockRepository'
 import { WithDataset } from '../dataset/WithDataset'
 import { ReplaceFile } from '@/sections/replace-file/ReplaceFile'
-import { DatasetMockRepository } from '@/stories/dataset/DatasetMockRepository'
 import { WithToasts } from '../WithToasts'
 
 const meta: Meta<typeof ReplaceFile> = {
@@ -25,7 +24,6 @@ export const Default: Story = {
   render: () => (
     <ReplaceFile
       fileRepository={new FileMockRepository()}
-      datasetRepository={new DatasetMockRepository()}
       fileIdFromParams={1}
       datasetPidFromParams="doi:10.5072/FK2/8YOKQI"
       datasetVersionFromParams=":draft"
diff --git a/src/stories/shared/file-uploader/FileUploadInput.stories.tsx b/src/stories/shared/file-uploader/FileUploadInput.stories.tsx
@@ -1,7 +1,6 @@
 import FileUploadInput from '@/sections/shared/file-uploader/file-upload-input/FileUploadInput'
 import { FileUploadStatus } from '@/sections/shared/file-uploader/context/fileUploaderReducer'
 import { OperationType } from '@/sections/shared/file-uploader/FileUploader'
-import { DatasetMockRepository } from '@/stories/dataset/DatasetMockRepository'
 import { FileMockRepository } from '@/stories/file/FileMockRepository'
 import { WithI18next } from '@/stories/WithI18next'
 import { WithToasts } from '@/stories/WithToasts'
@@ -28,7 +27,6 @@ export const ReplaceMode: Story = {
       <FileUploadInput
         datasetPersistentId="doi:10.5072/FK2/8YOKQI"
         fileRepository={new FileMockRepository()}
-        datasetRepository={new DatasetMockRepository()}
       />
     </WithFileUploaderContext>
   )
@@ -41,7 +39,6 @@ export const AddMode: Story = {
       <FileUploadInput
         datasetPersistentId="doi:10.5072/FK2/8YOKQI"
         fileRepository={new FileMockRepository()}
-        datasetRepository={new DatasetMockRepository()}
       />
     </WithFileUploaderContext>
   )
@@ -54,7 +51,6 @@ export const WithUploadLimits: Story = {
       <FileUploadInput
         datasetPersistentId="doi:10.5072/FK2/8YOKQI"
         fileRepository={new FileMockRepository()}
-        datasetRepository={new DatasetMockRepository()}
         fetchUploadLimits={() =>
           Promise.resolve({ numberOfFilesRemaining: 5, storageQuotaRemaining: 1024 * 1024 * 1024 })
         }
@@ -102,7 +98,6 @@ export const WithUploadingFiles: Story = {
       <FileUploadInput
         datasetPersistentId="doi:10.5072/FK2/8YOKQI"
         fileRepository={new FileMockRepository()}
-        datasetRepository={new DatasetMockRepository()}
       />
     </WithFileUploaderContext>
   )
@@ -131,7 +126,6 @@ export const WithFailedFile: Story = {
       <FileUploadInput
         datasetPersistentId="doi:10.5072/FK2/8YOKQI"
         fileRepository={new FileMockRepository()}
-        datasetRepository={new DatasetMockRepository()}
       />
     </WithFileUploaderContext>
   )
diff --git a/src/stories/shared/file-uploader/FileUploader.stories.tsx b/src/stories/shared/file-uploader/FileUploader.stories.tsx
@@ -1,5 +1,4 @@
 import { FileUploader, OperationType } from '@/sections/shared/file-uploader/FileUploader'
-import { DatasetMockRepository } from '@/stories/dataset/DatasetMockRepository'
 import { FileMockRepository } from '@/stories/file/FileMockRepository'
 import { WithI18next } from '@/stories/WithI18next'
 import { WithToasts } from '@/stories/WithToasts'
@@ -28,7 +27,6 @@ export const ReplaceMode: Story = {
       storageType="S3"
       operationType={OperationType.REPLACE_FILE}
       originalFile={FileMother.createRealistic()}
-      datasetRepository={new DatasetMockRepository()}
     />
   )
 }
@@ -41,7 +39,6 @@ export const AddFilesToDataset: Story = {
       datasetPersistentId="doi:10.5072/FK2/8YOKQI"
       storageType="S3"
       operationType={OperationType.ADD_FILES_TO_DATASET}
-      datasetRepository={new DatasetMockRepository()}
     />
   )
 }
diff --git a/src/stories/upload-dataset-files/UploadDatasetFiles.stories.tsx b/src/stories/upload-dataset-files/UploadDatasetFiles.stories.tsx
@@ -3,7 +3,6 @@ import { WithI18next } from '../WithI18next'
 import { WithLayout } from '../WithLayout'
 import { UploadDatasetFiles } from '../../sections/upload-dataset-files/UploadDatasetFiles'
 import { FileMockRepository } from '../file/FileMockRepository'
-import { DatasetMockRepository } from '../dataset/DatasetMockRepository'
 import { WithDataset } from '../dataset/WithDataset'
 
 const meta: Meta<typeof UploadDatasetFiles> = {
@@ -21,10 +20,5 @@ type Story = StoryObj<typeof UploadDatasetFiles>
 
 export const Default: Story = {
   decorators: [WithLayout, WithDataset],
-  render: () => (
-    <UploadDatasetFiles
-      fileRepository={new FileMockRepository()}
-      datasetRepository={new DatasetMockRepository()}
-    />
-  )
+  render: () => <UploadDatasetFiles fileRepository={new FileMockRepository()} />
 }
diff --git a/tests/component/sections/shared/file-uploader/FileUploader.spec.tsx b/tests/component/sections/shared/file-uploader/FileUploader.spec.tsx
diff --git a/tests/component/sections/shared/file-uploader/useUploadLimit.spec.tsx b/tests/component/sections/shared/file-uploader/useUploadLimit.spec.tsx

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function UploadDatasetFilesWithSearchParams() {`
`25`	`25`	`<DatasetProvider`
`26`	`26`	`repository={datasetRepository}`
`27`	`27`	`searchParams={{ persistentId: persistentId, version: version }}>`
`28`		`- <UploadDatasetFiles fileRepository={fileRepository} datasetRepository={datasetRepository} />`
	`28`	`+ <UploadDatasetFiles fileRepository={fileRepository} />`
`29`	`29`	`</DatasetProvider>`
`30`	`30`	`)`
`31`	`31`	`}`