The minimalistic document archiving platform.
fix(translations): update error messages for file size limits across multiple languages (#492)
Corentin Thomasset54514e15db5d
diff --git a/.changeset/better-spiders-bathe.md b/.changeset/better-spiders-bathe.mdnew file mode 100644index 00000000..0ecec87c--- /dev/null+++ b/.changeset/better-spiders-bathe.md@@ -0,0 +1,6 @@+---+"@papra/app-client": patch+"@papra/app-server": patch+---++Added a client side guard for rejecting too-big filesdiff --git a/.changeset/metal-turtles-live.md b/.changeset/metal-turtles-live.mdnew file mode 100644index 00000000..6b0c192e--- /dev/null+++ b/.changeset/metal-turtles-live.md@@ -0,0 +1,5 @@+---+"@papra/app-client": patch+---++Fix i18n messages when a file-too-big error happensdiff --git a/.changeset/ninety-signs-know.md b/.changeset/ninety-signs-know.mdnew file mode 100644index 00000000..afa696c0--- /dev/null+++ b/.changeset/ninety-signs-know.md@@ -0,0 +1,5 @@+---+"@papra/app-client": patch+---++Clean all upload method to happen through the import status modaldiff --git a/apps/papra-client/src/locales/de.dictionary.ts b/apps/papra-client/src/locales/de.dictionary.tsindex 31d7ed2c..4d22e58f 100644--- a/apps/papra-client/src/locales/de.dictionary.ts+++ b/apps/papra-client/src/locales/de.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'Das Dokument existiert bereits',- 'api-errors.document.file_too_big': 'Die Dokumentdatei ist zu groß',+ 'api-errors.document.size_too_large': 'Die Datei ist zu groß','api-errors.intake_email.limit_reached': 'Die maximale Anzahl an Eingangse-Mails für diese Organisation wurde erreicht. Bitte aktualisieren Sie Ihren Plan, um weitere Eingangse-Mails zu erstellen.','api-errors.user.max_organization_count_reached': 'Sie haben die maximale Anzahl an Organisationen erreicht, die Sie erstellen können. Wenn Sie weitere erstellen möchten, kontaktieren Sie bitte den Support.','api-errors.default': 'Beim Verarbeiten Ihrer Anfrage ist ein Fehler aufgetreten.',diff --git a/apps/papra-client/src/locales/en.dictionary.ts b/apps/papra-client/src/locales/en.dictionary.tsindex ec78bf6b..7523db34 100644--- a/apps/papra-client/src/locales/en.dictionary.ts+++ b/apps/papra-client/src/locales/en.dictionary.ts@@ -538,7 +538,7 @@ export const translations = {// API errors'api-errors.document.already_exists': 'The document already exists',- 'api-errors.document.file_too_big': 'The document file is too big',+ 'api-errors.document.size_too_large': 'The file size is too large','api-errors.intake_email.limit_reached': 'The maximum number of intake emails for this organization has been reached. Please upgrade your plan to create more intake emails.','api-errors.user.max_organization_count_reached': 'You have reached the maximum number of organizations you can create, if you need to create more, please contact support.','api-errors.default': 'An error occurred while processing your request.',diff --git a/apps/papra-client/src/locales/es.dictionary.ts b/apps/papra-client/src/locales/es.dictionary.tsindex b62399a3..3a356b39 100644--- a/apps/papra-client/src/locales/es.dictionary.ts+++ b/apps/papra-client/src/locales/es.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'El documento ya existe',- 'api-errors.document.file_too_big': 'El archivo del documento es demasiado grande',+ 'api-errors.document.size_too_large': 'El archivo es demasiado grande','api-errors.intake_email.limit_reached': 'Se ha alcanzado el número máximo de correos de ingreso para esta organización. Por favor, mejora tu plan para crear más correos de ingreso.','api-errors.user.max_organization_count_reached': 'Has alcanzado el número máximo de organizaciones que puedes crear, si necesitas crear más, contacta al soporte.','api-errors.default': 'Ocurrió un error al procesar tu solicitud.',diff --git a/apps/papra-client/src/locales/fr.dictionary.ts b/apps/papra-client/src/locales/fr.dictionary.tsindex 7aeed8af..eedb8dcf 100644--- a/apps/papra-client/src/locales/fr.dictionary.ts+++ b/apps/papra-client/src/locales/fr.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'Le document existe déjà',- 'api-errors.document.file_too_big': 'Le fichier du document est trop grand',+ 'api-errors.document.size_too_large': 'Le fichier est trop volumineux','api-errors.intake_email.limit_reached': 'Le nombre maximum d\'emails de réception pour cette organisation a été atteint. Veuillez mettre à niveau votre plan pour créer plus d\'emails de réception.','api-errors.user.max_organization_count_reached': 'Vous avez atteint le nombre maximum d\'organisations que vous pouvez créer, si vous avez besoin de créer plus, veuillez contacter le support.','api-errors.default': 'Une erreur est survenue lors du traitement de votre requête.',diff --git a/apps/papra-client/src/locales/it.dictionary.ts b/apps/papra-client/src/locales/it.dictionary.tsindex fd9ab6c4..85291993 100644--- a/apps/papra-client/src/locales/it.dictionary.ts+++ b/apps/papra-client/src/locales/it.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'Il documento esiste già',- 'api-errors.document.file_too_big': 'Il file del documento è troppo grande',+ 'api-errors.document.size_too_large': 'Il file è troppo grande','api-errors.intake_email.limit_reached': 'È stato raggiunto il numero massimo di email di acquisizione per questa organizzazione. Aggiorna il tuo piano per crearne altre.','api-errors.user.max_organization_count_reached': 'Hai raggiunto il numero massimo di organizzazioni che puoi creare, se hai bisogno di crearne altre contatta il supporto.','api-errors.default': 'Si è verificato un errore durante l\'elaborazione della richiesta.',diff --git a/apps/papra-client/src/locales/pl.dictionary.ts b/apps/papra-client/src/locales/pl.dictionary.tsindex 21cc47e6..63badcc5 100644--- a/apps/papra-client/src/locales/pl.dictionary.ts+++ b/apps/papra-client/src/locales/pl.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'Dokument już istnieje',- 'api-errors.document.file_too_big': 'Plik dokumentu jest zbyt duży',+ 'api-errors.document.size_too_large': 'Plik jest zbyt duży','api-errors.intake_email.limit_reached': 'Osiągnięto maksymalną liczbę adresów e-mail do przyjęć dla tej organizacji. Aby utworzyć więcej adresów e-mail do przyjęć, zaktualizuj swój plan.','api-errors.user.max_organization_count_reached': 'Osiągnięto maksymalną liczbę organizacji, które możesz utworzyć. Jeśli potrzebujesz utworzyć więcej, skontaktuj się z pomocą techniczną.','api-errors.default': 'Wystąpił błąd podczas przetwarzania żądania.',diff --git a/apps/papra-client/src/locales/pt-BR.dictionary.ts b/apps/papra-client/src/locales/pt-BR.dictionary.tsindex 72049c86..debeae99 100644--- a/apps/papra-client/src/locales/pt-BR.dictionary.ts+++ b/apps/papra-client/src/locales/pt-BR.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'O documento já existe',- 'api-errors.document.file_too_big': 'O arquivo do documento é muito grande',+ 'api-errors.document.size_too_large': 'O arquivo é muito grande','api-errors.intake_email.limit_reached': 'O número máximo de e-mails de entrada para esta organização foi atingido. Faça um upgrade no seu plano para criar mais e-mails de entrada.','api-errors.user.max_organization_count_reached': 'Você atingiu o número máximo de organizações que pode criar. Se precisar criar mais, entre em contato com o suporte.','api-errors.default': 'Ocorreu um erro ao processar sua solicitação.',diff --git a/apps/papra-client/src/locales/pt.dictionary.ts b/apps/papra-client/src/locales/pt.dictionary.tsindex 9ad90535..8516be9c 100644--- a/apps/papra-client/src/locales/pt.dictionary.ts+++ b/apps/papra-client/src/locales/pt.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'O documento já existe',- 'api-errors.document.file_too_big': 'O arquivo do documento é muito grande',+ 'api-errors.document.size_too_large': 'O arquivo é muito grande','api-errors.intake_email.limit_reached': 'O número máximo de e-mails de entrada para esta organização foi atingido. Faça um upgrade no seu plano para criar mais e-mails de entrada.','api-errors.user.max_organization_count_reached': 'Atingiu o número máximo de organizações que pode criar. Se precisar de criar mais, entre em contato com o suporte.','api-errors.default': 'Ocorreu um erro ao processar a solicitação.',diff --git a/apps/papra-client/src/locales/ro.dictionary.ts b/apps/papra-client/src/locales/ro.dictionary.tsindex 99f1be5b..8f0037f3 100644--- a/apps/papra-client/src/locales/ro.dictionary.ts+++ b/apps/papra-client/src/locales/ro.dictionary.ts@@ -540,7 +540,7 @@ export const translations: Partial<TranslationsDictionary> = {// API errors'api-errors.document.already_exists': 'Documentul există deja',- 'api-errors.document.file_too_big': 'Fișierul documentului este prea mare',+ 'api-errors.document.size_too_large': 'Fișierul este prea mare','api-errors.intake_email.limit_reached': 'Numărul maxim de email-uri de primire pentru această organizație a fost atins. Te rugăm să-ți îmbunătățești planul pentru a crea mai multe email-uri de primire.','api-errors.user.max_organization_count_reached': 'Ai atins numărul maxim de organizații pe care le poți crea. Dacă ai nevoie să creezi mai multe, te rugăm să contactezi asistența.','api-errors.default': 'A apărut o eroare la procesarea cererii.',diff --git a/apps/papra-client/src/modules/config/config.ts b/apps/papra-client/src/modules/config/config.tsindex bc0d3b34..76721725 100644--- a/apps/papra-client/src/modules/config/config.ts+++ b/apps/papra-client/src/modules/config/config.ts@@ -38,6 +38,9 @@ export const buildTimeConfig = {isEnabled: asBoolean(import.meta.env.VITE_INTAKE_EMAILS_IS_ENABLED, false),},isSubscriptionsEnabled: asBoolean(import.meta.env.VITE_IS_SUBSCRIPTIONS_ENABLED, false),+ documentsStorage: {+ maxUploadSize: asNumber(import.meta.env.VITE_DOCUMENTS_STORAGE_MAX_UPLOAD_SIZE, 10 * 1024 * 1024),+ },} as const;export type Config = typeof buildTimeConfig;diff --git a/apps/papra-client/src/modules/documents/components/document-import-status.component.tsx b/apps/papra-client/src/modules/documents/components/document-import-status.component.tsxindex ec122501..7d6df575 100644--- a/apps/papra-client/src/modules/documents/components/document-import-status.component.tsx+++ b/apps/papra-client/src/modules/documents/components/document-import-status.component.tsx@@ -5,6 +5,7 @@ import { A } from '@solidjs/router';import { throttle } from 'lodash-es';import { createContext, createSignal, For, Match, Show, Switch, useContext } from 'solid-js';import { Portal } from 'solid-js/web';+import { useConfig } from '@/modules/config/config.provider';import { useI18n } from '@/modules/i18n/i18n.provider';import { promptUploadFiles } from '@/modules/shared/files/upload';import { useI18nApiErrors } from '@/modules/shared/http/composables/i18n-api-errors';@@ -57,6 +58,7 @@ export const DocumentUploadProvider: ParentComponent = (props) => {const throttledInvalidateOrganizationDocumentsQuery = throttle(invalidateOrganizationDocumentsQuery, 500);const { getErrorMessage } = useI18nApiErrors();const { t } = useI18n();+ const { config } = useConfig();const [getState, setState] = createSignal<'open' | 'closed' | 'collapsed'>('closed');const [getTasks, setTasks] = createSignal<Task[]>([]);@@ -72,6 +74,11 @@ export const DocumentUploadProvider: ParentComponent = (props) => {await Promise.all(files.map(async (file) => {updateTaskStatus({ file, status: 'uploading' });+ if (file.size > config.documentsStorage.maxUploadSize) {+ updateTaskStatus({ file, status: 'error', error: Object.assign(new Error('File too large'), { code: 'document.size_too_large' }) });+ return;+ }+const [result, error] = await safely(uploadDocument({ file, organizationId }));if (error) {diff --git a/apps/papra-client/src/modules/documents/components/document-upload-area.component.tsx b/apps/papra-client/src/modules/documents/components/document-upload-area.component.tsxindex 4bd8b146..3c5903d0 100644--- a/apps/papra-client/src/modules/documents/components/document-upload-area.component.tsx+++ b/apps/papra-client/src/modules/documents/components/document-upload-area.component.tsx@@ -1,11 +1,9 @@import type { Component } from 'solid-js';import { useParams } from '@solidjs/router';import { createSignal } from 'solid-js';-import { promptUploadFiles } from '@/modules/shared/files/upload';-import { queryClient } from '@/modules/shared/query/query-client';import { cn } from '@/modules/shared/style/cn';import { Button } from '@/modules/ui/components/button';-import { uploadDocument } from '../documents.services';+import { useDocumentUpload } from './document-import-status.component';export const DocumentUploadArea: Component<{ organizationId?: string }> = (props) => {const [isDragging, setIsDragging] = createSignal(false);@@ -13,21 +11,7 @@ export const DocumentUploadArea: Component<{ organizationId?: string }> = (propsconst getOrganizationId = () => props.organizationId ?? params.organizationId;- const uploadFiles = async ({ files }: { files: File[] }) => {- for (const file of files) {- await uploadDocument({ file, organizationId: getOrganizationId() });- }-- await queryClient.invalidateQueries({- queryKey: ['organizations', getOrganizationId(), 'documents'],- refetchType: 'all',- });- };-- const promptImport = async () => {- const { files } = await promptUploadFiles();- await uploadFiles({ files });- };+ const { promptImport, uploadDocuments } = useDocumentUpload({ getOrganizationId });const handleDragOver = (event: DragEvent) => {event.preventDefault();@@ -46,7 +30,7 @@ export const DocumentUploadArea: Component<{ organizationId?: string }> = (props}const files = [...event.dataTransfer.files].filter(file => file.type === 'application/pdf');- await uploadFiles({ files });+ await uploadDocuments({ files });};return (diff --git a/apps/papra-client/src/modules/documents/documents.composables.tsx b/apps/papra-client/src/modules/documents/documents.composables.tsxindex 2a9515e4..0800d4bf 100644--- a/apps/papra-client/src/modules/documents/documents.composables.tsx+++ b/apps/papra-client/src/modules/documents/documents.composables.tsx@@ -1,13 +1,9 @@import type { Document } from './documents.types';-import { safely } from '@corentinth/chisels';-import { throttle } from 'lodash-es';import { createSignal } from 'solid-js';import { useConfirmModal } from '../shared/confirm';-import { promptUploadFiles } from '../shared/files/upload';-import { isHttpErrorWithCode } from '../shared/http/http-errors';import { queryClient } from '../shared/query/query-client';import { createToast } from '../ui/components/sonner';-import { deleteDocument, restoreDocument, uploadDocument } from './documents.services';+import { deleteDocument, restoreDocument } from './documents.services';export function invalidateOrganizationDocumentsQuery({ organizationId }: { organizationId: string }) {return queryClient.invalidateQueries({@@ -76,57 +72,3 @@ export function useRestoreDocument() {},};}--function toastUploadError({ error, file }: { error: Error; file: File }) {- if (isHttpErrorWithCode({ error, code: 'document.already_exists' })) {- createToast({- type: 'error',- message: 'Document already exists',- description: `The document ${file.name} already exists, it has not been uploaded.`,- });-- return;- }-- if (isHttpErrorWithCode({ error, code: 'document.file_too_big' })) {- createToast({- type: 'error',- message: 'Document too big',- description: `The document ${file.name} is too big, it has not been uploaded.`,- });-- return;- }-- createToast({- type: 'error',- message: 'Failed to upload document',- description: error.message,- });-}--export function useUploadDocuments({ organizationId }: { organizationId: string }) {- const uploadDocuments = async ({ files }: { files: File[] }) => {- const throttledInvalidateOrganizationDocumentsQuery = throttle(invalidateOrganizationDocumentsQuery, 500);-- await Promise.all(files.map(async (file) => {- const [, error] = await safely(uploadDocument({ file, organizationId }));-- if (error) {- toastUploadError({ error, file });- }-- await throttledInvalidateOrganizationDocumentsQuery({ organizationId });- }),- );- };-- return {- uploadDocuments,- promptImport: async () => {- const { files } = await promptUploadFiles();-- await uploadDocuments({ files });- },- };-}diff --git a/apps/papra-client/src/modules/organizations/pages/organization.page.tsx b/apps/papra-client/src/modules/organizations/pages/organization.page.tsxindex 56984c3c..6e80822c 100644--- a/apps/papra-client/src/modules/organizations/pages/organization.page.tsx+++ b/apps/papra-client/src/modules/organizations/pages/organization.page.tsx@@ -3,9 +3,9 @@ import { formatBytes } from '@corentinth/chisels';import { useParams } from '@solidjs/router';import { createQueries, keepPreviousData } from '@tanstack/solid-query';import { createSignal, Show, Suspense } from 'solid-js';+import { useDocumentUpload } from '@/modules/documents/components/document-import-status.component';import { DocumentUploadArea } from '@/modules/documents/components/document-upload-area.component';import { createdAtColumn, DocumentsPaginatedList, standardActionsColumn, tagsColumn } from '@/modules/documents/components/documents-list.component';-import { useUploadDocuments } from '@/modules/documents/documents.composables';import { fetchOrganizationDocuments, getOrganizationDocumentsStats } from '@/modules/documents/documents.services';import { useI18n } from '@/modules/i18n/i18n.provider';import { Button } from '@/modules/ui/components/button';@@ -32,7 +32,7 @@ export const OrganizationPage: Component = () => {],}));- const { promptImport } = useUploadDocuments({ organizationId: params.organizationId });+ const { promptImport } = useDocumentUpload({ getOrganizationId: () => params.organizationId });return (<div class="p-6 mt-4 pb-32 max-w-5xl mx-auto">diff --git a/apps/papra-server/src/modules/config/config.models.test.ts b/apps/papra-server/src/modules/config/config.models.test.tsindex 5c44a8e8..c2300f99 100644--- a/apps/papra-server/src/modules/config/config.models.test.ts+++ b/apps/papra-server/src/modules/config/config.models.test.ts@@ -69,6 +69,9 @@ describe('config models', () => {intakeEmails: {isEnabled: true,},+ documentsStorage: {+ maxUploadSize: 10485760,+ },},});});diff --git a/apps/papra-server/src/modules/config/config.models.ts b/apps/papra-server/src/modules/config/config.models.tsindex 72bb14e5..986e897d 100644--- a/apps/papra-server/src/modules/config/config.models.ts+++ b/apps/papra-server/src/modules/config/config.models.ts@@ -13,6 +13,7 @@ export function getPublicConfig({ config }: { config: Config }) {'auth.providers.github.isEnabled','auth.providers.google.isEnabled','documents.deletedDocumentsRetentionDays',+ 'documentsStorage.maxUploadSize','intakeEmails.isEnabled',]),{