Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File upload: alert when a file could not be added for upload #478

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions public/locales/en/uploadDatasetFiles.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,8 @@
"selectTags": "Select tags to add",
"saveChanges": "Save Changes",
"cancelChanges": "Cancel Changes"
},
"alerts": {
"fileNameNotUnique": "File {{name}} was already added and is ignored"
}
}
9 changes: 8 additions & 1 deletion src/sections/upload-dataset-files/FileUploader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { ChangeEventHandler, DragEventHandler, useEffect, useRef, useState } fro
import { Plus, X } from 'react-bootstrap-icons'
import { FileUploadTools, FileUploaderState } from '../../files/domain/models/FileUploadState'
import styles from './FileUploader.module.scss'
import { AlertVariant } from '@iqss/dataverse-design-system/src/lib/components/alert/AlertVariant'
import { useTranslation } from 'react-i18next'

export interface FileUploaderProps {
upload: (file: File) => void
Expand All @@ -13,6 +15,7 @@ export interface FileUploaderProps {
fileUploaderState: FileUploaderState
cancelUpload: (file: File) => void
cleanFileState: (file: File) => void
addAlert: (variant: AlertVariant, message: string) => void
}

export function FileUploader({
Expand All @@ -22,11 +25,13 @@ export function FileUploader({
selectText,
fileUploaderState,
cancelUpload,
cleanFileState
cleanFileState,
addAlert
}: FileUploaderProps) {
const theme = useTheme()
const [files, setFiles] = useState<File[]>([])
const [bgColor, setBackgroundColor] = useState(theme.color.primaryTextColor)
const { t } = useTranslation('uploadDatasetFiles')

const addFiles = (selectedFiles: FileList | null) => {
if (selectedFiles && selectedFiles.length > 0) {
Expand All @@ -38,6 +43,8 @@ export function FileUploader({
if (!files.some((x) => FileUploadTools.key(x) === FileUploadTools.key(file))) {
setFiles((oldFiles) => [...oldFiles, file])
upload(file)
} else {
addAlert('danger', t('alerts.fileNameNotUnique', { name: FileUploadTools.key(file) }))
}
}

Expand Down
21 changes: 21 additions & 0 deletions src/sections/upload-dataset-files/UploadDatasetFiles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,33 @@ import { UploadedFiles } from './uploaded-files-list/UploadedFiles'
import { addUploadedFiles } from '../../files/domain/useCases/addUploadedFiles'
import { Route } from '../Route.enum'
import { Stack } from '@iqss/dataverse-design-system'
import { Alert } from '@iqss/dataverse-design-system'
import { AlertVariant } from '@iqss/dataverse-design-system/src/lib/components/alert/AlertVariant'

interface UploadDatasetFilesProps {
fileRepository: FileRepository
}

interface FileUploadAlert {
key: string
variant: AlertVariant
message: string
}

export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDatasetFilesProps) => {
const { setIsLoading } = useLoading()
const { dataset, isLoading } = useDataset()
const { t } = useTranslation('uploadDatasetFiles')
const [fileUploaderState, setState] = useState(FileUploadTools.createNewState([]))
const [uploadingToCancelMap, setUploadingToCancelMap] = useState(new Map<string, () => void>())
const navigate = useNavigate()
const [alerts, setAlerts] = useState<FileUploadAlert[]>([])
let i = 0
const addAlert = (variant: AlertVariant, message: string) =>
setAlerts((current) => [
...current,
{ key: (i++).toString(), variant: variant, message: message }
])

const limit = 6
const semaphore = new Semaphore(limit)
Expand Down Expand Up @@ -171,6 +186,11 @@ export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDat
actionItemText={t('breadcrumbActionItem')}
/>
<article>
{alerts.map((alert) => (
<Alert variant={alert.variant} key={alert.key}>
{alert.message}
</Alert>
))}
<Stack direction="vertical" gap={3}>
<FileUploader
upload={upload}
Expand All @@ -180,6 +200,7 @@ export const UploadDatasetFiles = ({ fileRepository: fileRepository }: UploadDat
fileUploaderState={fileUploaderState}
cancelUpload={cancelUpload}
cleanFileState={cleanFileState}
addAlert={addAlert}
/>
<UploadedFiles
fileUploadState={fileUploaderState.uploaded}
Expand Down
Loading