From 933dde935dddbe38e9dfd44a33112659061e8aab Mon Sep 17 00:00:00 2001 From: "codegen-sh[bot]" <131295404+codegen-sh[bot]@users.noreply.github.com> Date: Sat, 31 May 2025 14:49:54 +0000 Subject: [PATCH] Add import validation behavior options - Add ImportValidationBehavior enum with Skip, Truncate, and Abort options - Update FileOperation options to include validationBehavior - Add validation behavior selection to DropToImport UI component - Update collections import API to accept validationBehavior parameter - Implement validation logic in ImportTask with document processing - Set Truncate as the new default behavior (was Abort) Addresses GitHub issue #9285 --- .../Settings/components/DropToImport.tsx | 41 +++++- app/stores/CollectionsStore.ts | 7 +- server/models/FileOperation.ts | 2 + server/queues/tasks/ImportTask.ts | 131 +++++++++++++++--- server/routes/api/collections/collections.ts | 4 +- server/routes/api/collections/schema.ts | 4 + shared/types.ts | 6 + 7 files changed, 173 insertions(+), 22 deletions(-) diff --git a/app/scenes/Settings/components/DropToImport.tsx b/app/scenes/Settings/components/DropToImport.tsx index a0a2f8e01c..baff9a87e3 100644 --- a/app/scenes/Settings/components/DropToImport.tsx +++ b/app/scenes/Settings/components/DropToImport.tsx @@ -6,10 +6,15 @@ import { useTranslation } from "react-i18next"; import { toast } from "sonner"; import styled from "styled-components"; import { s } from "@shared/styles"; -import { AttachmentPreset, CollectionPermission } from "@shared/types"; +import { + AttachmentPreset, + CollectionPermission, + ImportValidationBehavior, +} from "@shared/types"; import { bytesToHumanReadable } from "@shared/utils/files"; import Button from "~/components/Button"; import Flex from "~/components/Flex"; +import InputSelect from "~/components/InputSelect"; import InputSelectPermission from "~/components/InputSelectPermission"; import LoadingIndicator from "~/components/LoadingIndicator"; import Text from "~/components/Text"; @@ -33,6 +38,8 @@ function DropToImport({ disabled, onSubmit, children, format }: Props) { const [permission, setPermission] = useState( CollectionPermission.ReadWrite ); + const [validationBehavior, setValidationBehavior] = + useState(ImportValidationBehavior.Truncate); const handleFiles = (files: File[]) => { if (files.length > 1) { @@ -53,7 +60,11 @@ function DropToImport({ disabled, onSubmit, children, format }: Props) { name: file.name, preset: AttachmentPreset.WorkspaceImport, }); - await collections.import(attachment.id, { format, permission }); + await collections.import(attachment.id, { + format, + permission, + validationBehavior, + }); onSubmit(); toast.message(file.name, { description: t( @@ -117,6 +128,32 @@ function DropToImport({ disabled, onSubmit, children, format }: Props) { . +
+ + + {t( + "Choose how to handle documents that fail validation during import" + )} + . + +