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

Block upload if size exceeds capacity #2053

Merged
merged 19 commits into from
Apr 1, 2022
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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 packages/common-components/src/FileInput/FileInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ const useStyles = makeStyles(({ constants, palette, overrides }: ITheme) =>
},
error: {
color: palette.error.main,
backgroundColor: palette.additional["gray"][3],
paddingLeft: 40,
paddingBottom: 4,
FSM1 marked this conversation as resolved.
Show resolved Hide resolved
...overrides?.FileInput?.error
},
item: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import getFilesFromDataTransferItems from "../../../Utils/getFilesFromDataTransf
import { Helmet } from "react-helmet-async"

const CSFFileBrowser: React.FC<IFileBrowserModuleProps> = () => {
const { downloadFile, uploadFiles, buckets } = useFiles()
const { downloadFile, uploadFiles, buckets, storageSummary } = useFiles()
const { accountRestricted } = useFilesApi()
const { filesApiClient } = useFilesApi()
const { addToast } = useToasts()
Expand Down Expand Up @@ -173,12 +173,23 @@ const CSFFileBrowser: React.FC<IFileBrowserModuleProps> = () => {
return
}

const availableStorage = storageSummary?.available_storage || 0
const uploadSize = files?.reduce((total: number, file: File) => total += file.size, 0) || 0

if (uploadSize > availableStorage) {
addToast({
type: "error",
title: t`Upload size exceeds plan capacity`,
subtitle: t`Please select fewer files to upload`
})
return
}
const flattenedFiles = await getFilesFromDataTransferItems(fileItems)
const paths = [...new Set(flattenedFiles.map(f => f.filepath))]
paths.forEach(p => {
uploadFiles(bucket, flattenedFiles.filter(f => f.filepath === p), getPathWithFile(path, p))
})
}, [uploadFiles, bucket, accountRestricted, addToast])
}, [bucket, accountRestricted, storageSummary, addToast, uploadFiles])

const viewFolder = useCallback((cid: string) => {
const fileSystemItem = pathContents.find(f => f.cid === cid)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const useStyles = makeStyles(({ constants, palette }: CSFTheme) =>
}))

const SharedFileBrowser = () => {
const { downloadFile, uploadFiles, buckets, getStorageSummary, refreshBuckets } = useFiles()
const { downloadFile, uploadFiles, buckets, getStorageSummary, refreshBuckets, storageSummary } = useFiles()
const { filesApiClient, accountRestricted } = useFilesApi()
const classes = useStyles()
const { addToast } = useToasts()
Expand Down Expand Up @@ -205,20 +205,31 @@ const SharedFileBrowser = () => {

const handleUploadOnDrop = useCallback(async (files: File[], fileItems: DataTransferItemList, path: string) => {
if (!bucket) return
if (accountRestricted) {
if (accountRestricted && bucket.permission === "owner") {
addToast({
type:"error",
title: t`Uploads disabled`,
subtitle: t`Your account is restricted. Until you&apos;ve settled up, you can&apos;t upload any new content.`
})
return
}
const availableStorage = storageSummary?.available_storage || 0
const uploadSize = files?.reduce((total: number, file: File) => total += file.size, 0) || 0

if (bucket.permission === "owner" && uploadSize > availableStorage) {
addToast({
type: "error",
title: t`Upload size exceeds plan capacity`,
subtitle: t`Please select fewer files to upload`
})
return
}
const flattenedFiles = await getFilesFromDataTransferItems(fileItems)
const paths = [...new Set(flattenedFiles.map(f => f.filepath))]
paths.forEach(p => {
uploadFiles(bucket, flattenedFiles.filter(f => f.filepath === p), getPathWithFile(path, p))
})
}, [uploadFiles, bucket, accountRestricted, addToast])
}, [bucket, accountRestricted, storageSummary, addToast, uploadFiles])

const bulkOperations: IBulkOperations = useMemo(() => ({
[CONTENT_TYPES.Directory]: ["download", "move", "delete", "share"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Button, FileInput } from "@chainsafe/common-components"
import { useFiles } from "../../../Contexts/FilesContext"
import { createStyles, makeStyles } from "@chainsafe/common-theme"
import React, { useCallback, useState } from "react"
import { Formik, Form } from "formik"
import React, { useCallback, useMemo, useState } from "react"
import { Form, useFormik, FormikProvider } from "formik"
import { array, object } from "yup"
import CustomModal from "../../Elements/CustomModal"
import { Trans, t } from "@lingui/macro"
Expand Down Expand Up @@ -83,8 +83,19 @@ const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
const [isDoneDisabled, setIsDoneDisabled] = useState(true)
const { uploadFiles } = useFiles()
const { currentPath, refreshContents, bucket } = useFileBrowser()
const { storageSummary } = useFiles()

const UploadSchema = object().shape({ files: array().required(t`Please select a file to upload`) })
const UploadSchema = useMemo(() => object().shape({
files: array().required(t`Please select a file to upload`)
.test("Upload Size",
t`Upload size exceeds plan capacity`,
(files) => {
const isOwner = bucket?.permission === "owner"
const availableStorage = storageSummary?.available_storage || 0
const uploadSize = files?.reduce((total: number, file: File) => total += file.size, 0) || 0
return !(isOwner && uploadSize > availableStorage)
FSM1 marked this conversation as resolved.
Show resolved Hide resolved
})
}), [bucket, storageSummary])

const onFileNumberChange = useCallback((filesNumber: number) => {
setIsDoneDisabled(filesNumber === 0)
Expand All @@ -106,7 +117,13 @@ const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
console.error(error)
}
helpers.setSubmitting(false)
}, [close, currentPath, uploadFiles, refreshContents, bucket])
}, [bucket, close, refreshContents, uploadFiles, currentPath])

const formik = useFormik({
initialValues: { files: [] },
validationSchema: UploadSchema,
onSubmit: onSubmit
})

return (
<CustomModal
Expand All @@ -117,10 +134,8 @@ const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
inner: classes.modalInner
}}
>
<Formik
initialValues={{ files: [] }}
validationSchema={UploadSchema}
onSubmit={onSubmit}
<FormikProvider
value={formik}
>
FSM1 marked this conversation as resolved.
Show resolved Hide resolved
<Form
data-cy="form-upload-file"
Expand Down Expand Up @@ -159,13 +174,13 @@ const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
type="submit"
variant="primary"
className={clsx(classes.okButton, "wide")}
disabled={isDoneDisabled}
disabled={isDoneDisabled || !formik.isValid}
>
<Trans>Start Upload</Trans>
</Button>
</footer>
</Form>
</Formik>
</FormikProvider>
</CustomModal>
)
}
Expand Down
6 changes: 6 additions & 0 deletions packages/files-ui/src/locales/de/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,9 @@ msgstr "Bitte geben Sie ein Passwort an"
msgid "Please select a file to upload"
msgstr "Bitte wählen Sie eine Datei zum Hochladen"

msgid "Please select fewer files to upload"
msgstr ""

msgid "Preview"
msgstr "Vorschau"

Expand Down Expand Up @@ -1036,6 +1039,9 @@ msgstr ""
msgid "Upload"
msgstr ""

msgid "Upload size exceeds plan capacity"
msgstr ""

msgid "Uploads cancelled"
msgstr ""

Expand Down
6 changes: 6 additions & 0 deletions packages/files-ui/src/locales/en/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,9 @@ msgstr "Please provide a password"
msgid "Please select a file to upload"
msgstr "Please select a file to upload"

msgid "Please select fewer files to upload"
msgstr "Please select fewer files to upload"

msgid "Preview"
msgstr "Preview"

Expand Down Expand Up @@ -1039,6 +1042,9 @@ msgstr "Update your credit card"
msgid "Upload"
msgstr "Upload"

msgid "Upload size exceeds plan capacity"
msgstr "Upload size exceeds plan capacity"

msgid "Uploads cancelled"
msgstr "Uploads cancelled"

Expand Down
6 changes: 6 additions & 0 deletions packages/files-ui/src/locales/es/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,9 @@ msgstr "Por favor ingrese una contraseña"
msgid "Please select a file to upload"
msgstr ""

msgid "Please select fewer files to upload"
msgstr ""

msgid "Preview"
msgstr "Avance"

Expand Down Expand Up @@ -1040,6 +1043,9 @@ msgstr ""
msgid "Upload"
msgstr ""

msgid "Upload size exceeds plan capacity"
msgstr ""

msgid "Uploads cancelled"
msgstr ""

Expand Down
6 changes: 6 additions & 0 deletions packages/files-ui/src/locales/fr/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,9 @@ msgstr "Merci de donner un mot de passe"
msgid "Please select a file to upload"
msgstr "Merci de sélectionner un fichier à téléverser"

msgid "Please select fewer files to upload"
msgstr ""

msgid "Preview"
msgstr "Aperçu"

Expand Down Expand Up @@ -1040,6 +1043,9 @@ msgstr "Mettre à jour votre carte de crédit"
msgid "Upload"
msgstr "Téléverser"

msgid "Upload size exceeds plan capacity"
msgstr ""

msgid "Uploads cancelled"
msgstr "Téléversements annulés"

Expand Down
6 changes: 6 additions & 0 deletions packages/files-ui/src/locales/no/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,9 @@ msgstr "Angi et passord"
msgid "Please select a file to upload"
msgstr "Velg en fil å laste opp"

msgid "Please select fewer files to upload"
msgstr ""

msgid "Preview"
msgstr "Forhåndsvis"

Expand Down Expand Up @@ -1036,6 +1039,9 @@ msgstr ""
msgid "Upload"
msgstr ""

msgid "Upload size exceeds plan capacity"
msgstr ""

msgid "Uploads cancelled"
msgstr ""

Expand Down