Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 17 additions & 10 deletions src/components/forms/create-manual-response-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ export function CreateManualResponseDialog({
},
})

const isBusy = isSubmitting || createManualResponse.isPending

const onSubmit = async (data: FormData) => {
if (isBusy) return

if (!selectedUserId) {
toast({
title: "Atenção",
Expand All @@ -159,11 +163,15 @@ export function CreateManualResponseDialog({
// Converter dados do formulário para o formato esperado
const responses = [data]

await createManualResponse.mutateAsync({
formId,
userId: selectedUserId,
responses,
})
try {
await createManualResponse.mutateAsync({
formId,
userId: selectedUserId,
responses,
})
} catch {
// Tratado pelo onError da mutation
}
}

// Filtrar usuários baseado na busca
Expand Down Expand Up @@ -368,12 +376,12 @@ export function CreateManualResponseDialog({
reset()
setSelectedUserId(null)
}}
disabled={isSubmitting}
disabled={isBusy}
>
Cancelar
</Button>
<Button type="submit" disabled={isSubmitting || !selectedUserId}>
{isSubmitting ? (
<Button type="submit" disabled={isBusy || !selectedUserId}>
{isBusy ? (
<>
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
Criando...
Expand All @@ -387,5 +395,4 @@ export function CreateManualResponseDialog({
</DialogContent>
</Dialog>
)
}

}
33 changes: 21 additions & 12 deletions src/components/forms/form-response.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,11 @@ export function FormResponseComponent({
},
})

const isProcessing = uploadingFiles || submitResponse.isPending || (customIsSubmitting ?? isSubmitting)

const onSubmit = async (data: z.infer<typeof formSchema>) => {
if (isProcessing) return
let isUploading = true
try {
setUploadingFiles(true)
const processedData: Record<string, unknown> = {}
Expand Down Expand Up @@ -305,21 +309,26 @@ export function FormResponseComponent({
}
}

isUploading = false
setUploadingFiles(false)

if (isEditing && customOnSubmit) {
customOnSubmit(processedData)
} else {
submitResponse.mutate({
await submitResponse.mutateAsync({
formId,
responses: [processedData],
})
}
} catch (err) {
console.error(err)
toast({
title: "Erro no envio",
description: "Ocorreu um erro ao processar os arquivos.",
variant: "destructive",
})
if (isUploading) {
console.error(err)
toast({
title: "Erro no envio",
description: "Ocorreu um erro ao processar os arquivos.",
variant: "destructive",
})
}
} finally {
setUploadingFiles(false)
}
Expand Down Expand Up @@ -525,18 +534,18 @@ export function FormResponseComponent({
<Button
type="submit"
className="mt-6 w-full sm:w-auto rounded-xl gap-2 font-semibold shadow-xs"
disabled={uploadingFiles || (customIsSubmitting ?? isSubmitting)}
disabled={isProcessing}
>
{uploadingFiles || customIsSubmitting || isSubmitting ? (
{isProcessing ? (
<Loader2 className="h-3.5 w-3.5 animate-spin" />
) : (
!isEditing && <Send className="h-3.5 w-3.5" />
)}
{uploadingFiles
? "Enviando anexos..."
: customIsSubmitting !== undefined
? (customIsSubmitting ? "Salvando..." : "Salvar Alterações")
: (isSubmitting ? "Enviando..." : (isEditing ? "Salvar Alterações" : "Enviar solicitação"))
: submitResponse.isPending || (customIsSubmitting ?? isSubmitting)
? (isEditing ? "Salvando..." : "Enviando...")
: (isEditing ? "Salvar Alterações" : "Enviar solicitação")
}
</Button>
</form>
Expand Down
Loading