Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix: Add Error state for incorrect CSV/TSV file upload type (#67150)

github-actions[bot]05105be4c73b
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
index 47b2e159d22..2d23be0dbcc 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
@@ -1,6 +1,8 @@
+import { useDisclosure } from "@mantine/hooks";
import { useCallback, useEffect, useMemo, useState } from "react";
-import { useDropzone } from "react-dropzone";
+import { type FileRejection, useDropzone } from "react-dropzone";
import { usePrevious } from "react-use";
+import { match } from "ts-pattern";
import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
@@ -27,13 +29,13 @@ import {
} from "metabase/collections/utils";
import { getVisibleColumnsMap } from "metabase/common/components/ItemsTable/utils";
import ItemsDragLayer from "metabase/common/components/dnd/ItemsDragLayer";
+import { useToast } from "metabase/common/hooks";
import { useListSelect } from "metabase/common/hooks/use-list-select";
-import { useToggle } from "metabase/common/hooks/use-toggle";
import { Bookmarks } from "metabase/entities/bookmarks";
import { Collections } from "metabase/entities/collections";
import { Search } from "metabase/entities/search";
import { useDispatch } from "metabase/lib/redux";
-import { addUndo } from "metabase/redux/undo";
+import { MAX_UPLOAD_SIZE, MAX_UPLOAD_STRING } from "metabase/redux/uploads";
import type Database from "metabase-lib/v1/metadata/Database";
import type {
Bookmark,
@@ -90,14 +92,17 @@ const CollectionContentViewInner = ({
const [
isModelUploadModalOpen,
- { turnOn: openModelUploadModal, turnOff: closeModelUploadModal },
- ] = useToggle(false);
+ { open: openModelUploadModal, close: closeModelUploadModal },
+ ] = useDisclosure(false);
const [uploadedFile, setUploadedFile] = useState<File | null>(null);
- const saveFile = (file: File) => {
- setUploadedFile(file);
- openModelUploadModal();
- };
+ const saveFile = useCallback(
+ (file: File) => {
+ setUploadedFile(file);
+ openModelUploadModal();
+ },
+ [openModelUploadModal],
+ );
const handleUploadFile = useCallback<OnFileUpload>(
(uploadFileArgs: CollectionOrTableIdProps) => {
@@ -132,29 +137,65 @@ const CollectionContentViewInner = ({
}, [bookmarks, collectionId]);
const dispatch = useDispatch();
+ const [sendToast] = useToast();
const visibleColumnsMap = useMemo(
() => getVisibleColumnsMap(visibleColumns),
[visibleColumns],
);
- const onDrop = (acceptedFiles: File[]) => {
- if (!acceptedFiles.length) {
- dispatch(
- addUndo({
- message: t`Invalid file type`,
+ const handleFileRejections = useCallback(
+ (rejected: FileRejection[]) => {
+ if (!rejected.length) {
+ return;
+ }
+
+ if (rejected.length > 1) {
+ sendToast({
+ message: t`Please upload files individually`,
toastColor: "error",
icon: "warning",
- }),
- );
- return;
- }
- saveFile(acceptedFiles[0]);
- };
+ });
+ return;
+ }
+
+ const errorCode = rejected[0].errors[0].code;
+
+ const errorMessage = match(errorCode)
+ .with(
+ "file-invalid-type",
+ () => t`Sorry, this file type is not supported`,
+ )
+ .with(
+ "file-too-large",
+ () => t`Sorry, this file is too large (max ${MAX_UPLOAD_STRING} MB)`,
+ )
+ .otherwise(() => t`An error has occurred`);
+
+ sendToast({
+ message: errorMessage,
+ toastColor: "error",
+ icon: "warning",
+ });
+ },
+ [sendToast],
+ );
+
+ const onDrop = useCallback(
+ (acceptedFiles: File[], fileRejections: FileRejection[]) => {
+ if (fileRejections.length) {
+ handleFileRejections(fileRejections);
+ } else if (acceptedFiles.length === 1) {
+ saveFile(acceptedFiles[0]);
+ }
+ },
+ [handleFileRejections, saveFile],
+ );
const { getRootProps, isDragActive } = useDropzone({
onDrop,
maxFiles: 1,
+ maxSize: MAX_UPLOAD_SIZE,
noClick: true,
noDragEventsBubbling: true,
accept: { "text/csv": [".csv"], "text/tab-separated-values": [".tsv"] },