From 38a3ee7010d65619f8d86d44813d3837c2b8557a Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Fri, 1 Jul 2022 17:52:58 +0200 Subject: [PATCH] =?UTF-8?q?fix(bot):=20=F0=9F=90=9B=20Accept=20file=20uplo?= =?UTF-8?q?ad=20without=20fileType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../[typebotId]/blocks/[blockId]/storage/upload-url.ts | 5 +++-- .../components/ChatGroup/ChatBlock/inputs/FileUploadForm.tsx | 2 +- packages/utils/src/api/storage.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts index 3f433d00b..3cfdfcae9 100644 --- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts +++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts @@ -23,14 +23,15 @@ const handler = async ( const fileType = req.query.fileType as string | undefined const typebotId = req.query.typebotId as string const blockId = req.query.blockId as string - if (!filePath || !fileType) return badRequest(res) + if (!filePath) return badRequest(res, 'Missing filePath or fileType') const typebot = (await prisma.publicTypebot.findFirst({ where: { typebotId }, })) as unknown as PublicTypebot const fileUploadBlock = typebot.groups .flatMap((g) => g.blocks) .find(byId(blockId)) - if (fileUploadBlock?.type !== InputBlockType.FILE) return badRequest(res) + if (fileUploadBlock?.type !== InputBlockType.FILE) + return badRequest(res, 'Not a file upload block') const sizeLimit = fileUploadBlock.options.sizeLimit ? Math.min(fileUploadBlock.options.sizeLimit, 500) : 10 diff --git a/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/FileUploadForm.tsx b/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/FileUploadForm.tsx index 65d1d5437..1590e3645 100644 --- a/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/FileUploadForm.tsx +++ b/packages/bot-engine/src/components/ChatGroup/ChatBlock/inputs/FileUploadForm.tsx @@ -24,7 +24,7 @@ export const FileUploadForm = ({ const { resultId } = useAnswers() const [selectedFiles, setSelectedFiles] = useState([]) const [isUploading, setIsUploading] = useState(false) - const [uploadProgressPercent, setUploadProgressPercent] = useState(20) + const [uploadProgressPercent, setUploadProgressPercent] = useState(10) const [isDraggingOver, setIsDraggingOver] = useState(false) const [errorMessage, setErrorMessage] = useState() diff --git a/packages/utils/src/api/storage.ts b/packages/utils/src/api/storage.ts index 4e5fd3b20..4aea91c22 100644 --- a/packages/utils/src/api/storage.ts +++ b/packages/utils/src/api/storage.ts @@ -2,7 +2,7 @@ import { config, Endpoint, S3 } from 'aws-sdk' type GeneratePresignedUrlProps = { filePath: string - fileType: string + fileType?: string sizeLimit?: number }