Compare commits
2 Commits
e51e88fddd
...
796bde22e7
| Author | SHA1 | Date | |
|---|---|---|---|
| 796bde22e7 | |||
| 12ce70e495 |
@@ -199,7 +199,7 @@
|
||||
- Implement skeleton loaders
|
||||
- _Requirements: 7.3_
|
||||
|
||||
- [ ] 16. Implement error handling
|
||||
- [x] 16. Implement error handling
|
||||
- Add try-catch blocks to all server actions
|
||||
- Implement error boundaries in React components
|
||||
- Add user-friendly error messages
|
||||
@@ -207,7 +207,7 @@
|
||||
- Implement retry logic for failed operations
|
||||
- _Requirements: All (error handling is cross-cutting)_
|
||||
|
||||
- [ ] 17. Add input validation
|
||||
- [x] 17. Add input validation
|
||||
- Validate all form inputs before submission
|
||||
- Add inline validation errors
|
||||
- Prevent empty task/list creation
|
||||
|
||||
46
app/error.tsx
Normal file
46
app/error.tsx
Normal file
@@ -0,0 +1,46 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect } from 'react'
|
||||
import { AlertTriangle } from 'lucide-react'
|
||||
|
||||
export default function Error({
|
||||
error,
|
||||
reset,
|
||||
}: {
|
||||
error: Error & { digest?: string }
|
||||
reset: () => void
|
||||
}) {
|
||||
useEffect(() => {
|
||||
console.error('Page error:', error)
|
||||
}, [error])
|
||||
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center p-4 bg-gray-50">
|
||||
<div className="max-w-md w-full bg-white rounded-lg shadow-lg p-6 sm:p-8">
|
||||
<div className="flex items-center justify-center w-12 h-12 sm:w-16 sm:h-16 bg-red-100 rounded-full mx-auto mb-4">
|
||||
<AlertTriangle className="w-6 h-6 sm:w-8 sm:h-8 text-red-600" />
|
||||
</div>
|
||||
<h2 className="text-xl sm:text-2xl font-bold text-gray-900 text-center mb-2">
|
||||
Something went wrong
|
||||
</h2>
|
||||
<p className="text-sm sm:text-base text-gray-600 text-center mb-6">
|
||||
{error.message || 'We encountered an unexpected error. Please try again.'}
|
||||
</p>
|
||||
<div className="flex flex-col sm:flex-row gap-3">
|
||||
<button
|
||||
onClick={reset}
|
||||
className="flex-1 px-4 py-3 bg-blue-500 hover:bg-blue-600 active:bg-blue-700 text-white rounded-lg transition-colors font-medium text-sm sm:text-base tap-target"
|
||||
>
|
||||
Try Again
|
||||
</button>
|
||||
<button
|
||||
onClick={() => window.location.href = '/'}
|
||||
className="flex-1 px-4 py-3 bg-gray-200 hover:bg-gray-300 active:bg-gray-400 text-gray-700 rounded-lg transition-colors font-medium text-sm sm:text-base tap-target"
|
||||
>
|
||||
Go Home
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
50
app/global-error.tsx
Normal file
50
app/global-error.tsx
Normal file
@@ -0,0 +1,50 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect } from 'react'
|
||||
import { AlertTriangle } from 'lucide-react'
|
||||
|
||||
export default function GlobalError({
|
||||
error,
|
||||
reset,
|
||||
}: {
|
||||
error: Error & { digest?: string }
|
||||
reset: () => void
|
||||
}) {
|
||||
useEffect(() => {
|
||||
console.error('Global error:', error)
|
||||
}, [error])
|
||||
|
||||
return (
|
||||
<html lang="en">
|
||||
<body className="bg-gray-50 min-h-screen">
|
||||
<div className="min-h-screen flex items-center justify-center p-4">
|
||||
<div className="max-w-md w-full bg-white rounded-lg shadow-lg p-6 sm:p-8">
|
||||
<div className="flex items-center justify-center w-12 h-12 sm:w-16 sm:h-16 bg-red-100 rounded-full mx-auto mb-4">
|
||||
<AlertTriangle className="w-6 h-6 sm:w-8 sm:h-8 text-red-600" />
|
||||
</div>
|
||||
<h2 className="text-xl sm:text-2xl font-bold text-gray-900 text-center mb-2">
|
||||
Application Error
|
||||
</h2>
|
||||
<p className="text-sm sm:text-base text-gray-600 text-center mb-6">
|
||||
A critical error occurred. Please refresh the page or contact support if the problem persists.
|
||||
</p>
|
||||
<div className="flex flex-col sm:flex-row gap-3">
|
||||
<button
|
||||
onClick={reset}
|
||||
className="flex-1 px-4 py-3 bg-blue-500 hover:bg-blue-600 active:bg-blue-700 text-white rounded-lg transition-colors font-medium text-sm sm:text-base"
|
||||
>
|
||||
Try Again
|
||||
</button>
|
||||
<button
|
||||
onClick={() => window.location.href = '/'}
|
||||
className="flex-1 px-4 py-3 bg-gray-200 hover:bg-gray-300 active:bg-gray-400 text-gray-700 rounded-lg transition-colors font-medium text-sm sm:text-base"
|
||||
>
|
||||
Go Home
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
)
|
||||
}
|
||||
@@ -3,6 +3,7 @@ import './globals.css'
|
||||
import ServiceWorkerRegistration from '@/components/ServiceWorkerRegistration'
|
||||
import OfflineIndicator from '@/components/OfflineIndicator'
|
||||
import { ToastProvider } from '@/components/ToastContainer'
|
||||
import ErrorBoundary from '@/components/ErrorBoundary'
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: 'Ultimate Lists',
|
||||
@@ -68,11 +69,13 @@ export default function RootLayout({
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
</head>
|
||||
<body className="bg-gray-50 min-h-screen">
|
||||
<ToastProvider>
|
||||
<ServiceWorkerRegistration />
|
||||
<OfflineIndicator />
|
||||
{children}
|
||||
</ToastProvider>
|
||||
<ErrorBoundary>
|
||||
<ToastProvider>
|
||||
<ServiceWorkerRegistration />
|
||||
<OfflineIndicator />
|
||||
{children}
|
||||
</ToastProvider>
|
||||
</ErrorBoundary>
|
||||
</body>
|
||||
</html>
|
||||
)
|
||||
|
||||
53
app/list/[id]/error.tsx
Normal file
53
app/list/[id]/error.tsx
Normal file
@@ -0,0 +1,53 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect } from 'react'
|
||||
import { AlertTriangle } from 'lucide-react'
|
||||
import Link from 'next/link'
|
||||
|
||||
export default function ListError({
|
||||
error,
|
||||
reset,
|
||||
}: {
|
||||
error: Error & { digest?: string }
|
||||
reset: () => void
|
||||
}) {
|
||||
useEffect(() => {
|
||||
console.error('List page error:', error)
|
||||
}, [error])
|
||||
|
||||
const isNotFound = error.message.includes('not found')
|
||||
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center p-4 bg-gray-50">
|
||||
<div className="max-w-md w-full bg-white rounded-lg shadow-lg p-6 sm:p-8">
|
||||
<div className="flex items-center justify-center w-12 h-12 sm:w-16 sm:h-16 bg-red-100 rounded-full mx-auto mb-4">
|
||||
<AlertTriangle className="w-6 h-6 sm:w-8 sm:h-8 text-red-600" />
|
||||
</div>
|
||||
<h2 className="text-xl sm:text-2xl font-bold text-gray-900 text-center mb-2">
|
||||
{isNotFound ? 'List Not Found' : 'Error Loading List'}
|
||||
</h2>
|
||||
<p className="text-sm sm:text-base text-gray-600 text-center mb-6">
|
||||
{isNotFound
|
||||
? 'The list you are looking for does not exist or has been deleted.'
|
||||
: error.message || 'We encountered an error loading this list. Please try again.'}
|
||||
</p>
|
||||
<div className="flex flex-col sm:flex-row gap-3">
|
||||
{!isNotFound && (
|
||||
<button
|
||||
onClick={reset}
|
||||
className="flex-1 px-4 py-3 bg-blue-500 hover:bg-blue-600 active:bg-blue-700 text-white rounded-lg transition-colors font-medium text-sm sm:text-base tap-target"
|
||||
>
|
||||
Try Again
|
||||
</button>
|
||||
)}
|
||||
<Link
|
||||
href="/"
|
||||
className="flex-1 px-4 py-3 bg-gray-200 hover:bg-gray-300 active:bg-gray-400 text-gray-700 rounded-lg transition-colors font-medium text-sm sm:text-base tap-target text-center"
|
||||
>
|
||||
Back to Lists
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
55
app/list/[id]/item/[itemId]/error.tsx
Normal file
55
app/list/[id]/item/[itemId]/error.tsx
Normal file
@@ -0,0 +1,55 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect } from 'react'
|
||||
import { AlertTriangle } from 'lucide-react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
|
||||
export default function ItemError({
|
||||
error,
|
||||
reset,
|
||||
}: {
|
||||
error: Error & { digest?: string }
|
||||
reset: () => void
|
||||
}) {
|
||||
const router = useRouter()
|
||||
|
||||
useEffect(() => {
|
||||
console.error('Item page error:', error)
|
||||
}, [error])
|
||||
|
||||
const isNotFound = error.message.includes('not found')
|
||||
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center p-4 bg-gray-50">
|
||||
<div className="max-w-md w-full bg-white rounded-lg shadow-lg p-6 sm:p-8">
|
||||
<div className="flex items-center justify-center w-12 h-12 sm:w-16 sm:h-16 bg-red-100 rounded-full mx-auto mb-4">
|
||||
<AlertTriangle className="w-6 h-6 sm:w-8 sm:h-8 text-red-600" />
|
||||
</div>
|
||||
<h2 className="text-xl sm:text-2xl font-bold text-gray-900 text-center mb-2">
|
||||
{isNotFound ? 'Item Not Found' : 'Error Loading Item'}
|
||||
</h2>
|
||||
<p className="text-sm sm:text-base text-gray-600 text-center mb-6">
|
||||
{isNotFound
|
||||
? 'The item you are looking for does not exist or has been deleted.'
|
||||
: error.message || 'We encountered an error loading this item. Please try again.'}
|
||||
</p>
|
||||
<div className="flex flex-col sm:flex-row gap-3">
|
||||
{!isNotFound && (
|
||||
<button
|
||||
onClick={reset}
|
||||
className="flex-1 px-4 py-3 bg-blue-500 hover:bg-blue-600 active:bg-blue-700 text-white rounded-lg transition-colors font-medium text-sm sm:text-base tap-target"
|
||||
>
|
||||
Try Again
|
||||
</button>
|
||||
)}
|
||||
<button
|
||||
onClick={() => router.back()}
|
||||
className="flex-1 px-4 py-3 bg-gray-200 hover:bg-gray-300 active:bg-gray-400 text-gray-700 rounded-lg transition-colors font-medium text-sm sm:text-base tap-target"
|
||||
>
|
||||
Go Back
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
81
components/ErrorBoundary.tsx
Normal file
81
components/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,81 @@
|
||||
'use client'
|
||||
|
||||
import React, { Component, ReactNode } from 'react'
|
||||
import { AlertTriangle } from 'lucide-react'
|
||||
|
||||
interface Props {
|
||||
children: ReactNode
|
||||
fallback?: ReactNode
|
||||
}
|
||||
|
||||
interface State {
|
||||
hasError: boolean
|
||||
error: Error | null
|
||||
}
|
||||
|
||||
export class ErrorBoundary extends Component<Props, State> {
|
||||
constructor(props: Props) {
|
||||
super(props)
|
||||
this.state = { hasError: false, error: null }
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(error: Error): State {
|
||||
return { hasError: true, error }
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
|
||||
console.error('Error caught by boundary:', error, errorInfo)
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
if (this.props.fallback) {
|
||||
return this.props.fallback
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center p-4 bg-gray-50">
|
||||
<div className="max-w-md w-full bg-white rounded-lg shadow-lg p-6 sm:p-8">
|
||||
<div className="flex items-center justify-center w-12 h-12 sm:w-16 sm:h-16 bg-red-100 rounded-full mx-auto mb-4">
|
||||
<AlertTriangle className="w-6 h-6 sm:w-8 sm:h-8 text-red-600" />
|
||||
</div>
|
||||
<h2 className="text-xl sm:text-2xl font-bold text-gray-900 text-center mb-2">
|
||||
Something went wrong
|
||||
</h2>
|
||||
<p className="text-sm sm:text-base text-gray-600 text-center mb-6">
|
||||
We encountered an unexpected error. Please try refreshing the page.
|
||||
</p>
|
||||
{this.state.error && (
|
||||
<details className="mb-6 p-3 sm:p-4 bg-gray-50 rounded-lg text-xs sm:text-sm">
|
||||
<summary className="cursor-pointer font-medium text-gray-700 mb-2">
|
||||
Error details
|
||||
</summary>
|
||||
<pre className="text-red-600 overflow-auto whitespace-pre-wrap break-words">
|
||||
{this.state.error.message}
|
||||
</pre>
|
||||
</details>
|
||||
)}
|
||||
<div className="flex flex-col sm:flex-row gap-3">
|
||||
<button
|
||||
onClick={() => window.location.reload()}
|
||||
className="flex-1 px-4 py-3 bg-blue-500 hover:bg-blue-600 active:bg-blue-700 text-white rounded-lg transition-colors font-medium text-sm sm:text-base tap-target"
|
||||
>
|
||||
Refresh Page
|
||||
</button>
|
||||
<button
|
||||
onClick={() => window.location.href = '/'}
|
||||
className="flex-1 px-4 py-3 bg-gray-200 hover:bg-gray-300 active:bg-gray-400 text-gray-700 rounded-lg transition-colors font-medium text-sm sm:text-base tap-target"
|
||||
>
|
||||
Go Home
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return this.props.children
|
||||
}
|
||||
}
|
||||
|
||||
export default ErrorBoundary
|
||||
@@ -5,6 +5,7 @@ import { useRouter } from 'next/navigation'
|
||||
import { createItem } from '@/lib/actions'
|
||||
import { Plus } from 'lucide-react'
|
||||
import { useToast } from './ToastContainer'
|
||||
import { validateItemTitle, sanitizeString } from '@/lib/validation'
|
||||
|
||||
interface InlineItemCreateProps {
|
||||
listId: string
|
||||
@@ -16,25 +17,36 @@ export default function InlineItemCreate({ listId }: InlineItemCreateProps) {
|
||||
const [isCreating, setIsCreating] = useState(false)
|
||||
const [title, setTitle] = useState('')
|
||||
const [isSubmitting, setIsSubmitting] = useState(false)
|
||||
const [error, setError] = useState('')
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
|
||||
if (!title.trim() || isSubmitting) {
|
||||
// Validate title
|
||||
const validationResult = validateItemTitle(title)
|
||||
if (!validationResult.isValid) {
|
||||
setError(validationResult.error || 'Invalid title')
|
||||
return
|
||||
}
|
||||
|
||||
if (isSubmitting) {
|
||||
return
|
||||
}
|
||||
|
||||
setIsSubmitting(true)
|
||||
setError('')
|
||||
|
||||
try {
|
||||
await createItem(listId, title.trim())
|
||||
await createItem(listId, sanitizeString(title))
|
||||
showToast('Task added successfully', 'success')
|
||||
setTitle('')
|
||||
setIsCreating(false)
|
||||
router.refresh()
|
||||
} catch (error) {
|
||||
console.error('Error creating item:', error)
|
||||
showToast('Failed to add task', 'error')
|
||||
const errorMessage = error instanceof Error ? error.message : 'Failed to add task'
|
||||
setError(errorMessage)
|
||||
showToast(errorMessage, 'error')
|
||||
} finally {
|
||||
setIsSubmitting(false)
|
||||
}
|
||||
@@ -65,15 +77,30 @@ export default function InlineItemCreate({ listId }: InlineItemCreateProps) {
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="bg-white border-2 border-blue-400 rounded-lg p-4 sm:p-5 shadow-sm">
|
||||
<input
|
||||
type="text"
|
||||
value={title}
|
||||
onChange={(e) => setTitle(e.target.value)}
|
||||
onKeyDown={handleKeyDown}
|
||||
placeholder="Enter task title..."
|
||||
autoFocus
|
||||
className="w-full px-3 sm:px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 mb-3 sm:mb-4 text-sm sm:text-base"
|
||||
/>
|
||||
<div className="mb-3 sm:mb-4">
|
||||
<input
|
||||
type="text"
|
||||
value={title}
|
||||
onChange={(e) => {
|
||||
setTitle(e.target.value)
|
||||
setError('')
|
||||
}}
|
||||
onKeyDown={handleKeyDown}
|
||||
placeholder="Enter task title..."
|
||||
autoFocus
|
||||
maxLength={200}
|
||||
className={`w-full px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 text-sm sm:text-base ${
|
||||
error ? 'border-red-500 focus:ring-red-500' : 'border-gray-300 focus:ring-blue-500'
|
||||
}`}
|
||||
aria-invalid={error ? 'true' : 'false'}
|
||||
aria-describedby={error ? 'inline-title-error' : undefined}
|
||||
/>
|
||||
{error && (
|
||||
<p id="inline-title-error" className="mt-1.5 text-xs sm:text-sm text-red-600">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-col-reverse sm:flex-row gap-2 sm:gap-3">
|
||||
<button
|
||||
type="button"
|
||||
|
||||
@@ -1,9 +1,18 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useState, useEffect } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { updateItem, createItem } from '@/lib/actions'
|
||||
import { useToast } from './ToastContainer'
|
||||
import {
|
||||
validateItemTitle,
|
||||
validateDescription,
|
||||
validateDateString,
|
||||
validateTag,
|
||||
validateTags,
|
||||
validateNotes,
|
||||
sanitizeString,
|
||||
} from '@/lib/validation'
|
||||
|
||||
interface ItemFormProps {
|
||||
listId: string
|
||||
@@ -24,6 +33,7 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
const { showToast } = useToast()
|
||||
const [isSubmitting, setIsSubmitting] = useState(false)
|
||||
const [errors, setErrors] = useState<Record<string, string>>({})
|
||||
const [touched, setTouched] = useState<Record<string, boolean>>({})
|
||||
|
||||
// Form state
|
||||
const [title, setTitle] = useState(item?.title || '')
|
||||
@@ -40,18 +50,107 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
const [tagInput, setTagInput] = useState('')
|
||||
const [notes, setNotes] = useState(item?.notes || '')
|
||||
|
||||
// Inline validation for title
|
||||
useEffect(() => {
|
||||
if (touched.title) {
|
||||
const result = validateItemTitle(title)
|
||||
setErrors((prev) => ({
|
||||
...prev,
|
||||
title: result.isValid ? '' : result.error || '',
|
||||
}))
|
||||
}
|
||||
}, [title, touched.title])
|
||||
|
||||
// Inline validation for description
|
||||
useEffect(() => {
|
||||
if (touched.description) {
|
||||
const result = validateDescription(description)
|
||||
setErrors((prev) => ({
|
||||
...prev,
|
||||
description: result.isValid ? '' : result.error || '',
|
||||
}))
|
||||
}
|
||||
}, [description, touched.description])
|
||||
|
||||
// Inline validation for due date
|
||||
useEffect(() => {
|
||||
if (touched.dueDate && dueDate) {
|
||||
const result = validateDateString(dueDate)
|
||||
setErrors((prev) => ({
|
||||
...prev,
|
||||
dueDate: result.isValid ? '' : result.error || '',
|
||||
}))
|
||||
} else if (touched.dueDate && !dueDate) {
|
||||
setErrors((prev) => ({ ...prev, dueDate: '' }))
|
||||
}
|
||||
}, [dueDate, touched.dueDate])
|
||||
|
||||
// Inline validation for notes
|
||||
useEffect(() => {
|
||||
if (touched.notes) {
|
||||
const result = validateNotes(notes)
|
||||
setErrors((prev) => ({
|
||||
...prev,
|
||||
notes: result.isValid ? '' : result.error || '',
|
||||
}))
|
||||
}
|
||||
}, [notes, touched.notes])
|
||||
|
||||
// Validate tags whenever they change
|
||||
useEffect(() => {
|
||||
const result = validateTags(tags)
|
||||
setErrors((prev) => ({
|
||||
...prev,
|
||||
tags: result.isValid ? '' : result.error || '',
|
||||
}))
|
||||
}, [tags])
|
||||
|
||||
const handleBlur = (field: string) => {
|
||||
setTouched((prev) => ({ ...prev, [field]: true }))
|
||||
}
|
||||
|
||||
const validateForm = () => {
|
||||
const newErrors: Record<string, string> = {}
|
||||
|
||||
if (!title.trim()) {
|
||||
newErrors.title = 'Title is required'
|
||||
// Validate title
|
||||
const titleResult = validateItemTitle(title)
|
||||
if (!titleResult.isValid) {
|
||||
newErrors.title = titleResult.error || ''
|
||||
}
|
||||
|
||||
if (title.length > 200) {
|
||||
newErrors.title = 'Title must be less than 200 characters'
|
||||
// Validate description
|
||||
const descResult = validateDescription(description)
|
||||
if (!descResult.isValid) {
|
||||
newErrors.description = descResult.error || ''
|
||||
}
|
||||
|
||||
// Validate due date
|
||||
if (dueDate) {
|
||||
const dateResult = validateDateString(dueDate)
|
||||
if (!dateResult.isValid) {
|
||||
newErrors.dueDate = dateResult.error || ''
|
||||
}
|
||||
}
|
||||
|
||||
// Validate tags
|
||||
const tagsResult = validateTags(tags)
|
||||
if (!tagsResult.isValid) {
|
||||
newErrors.tags = tagsResult.error || ''
|
||||
}
|
||||
|
||||
// Validate notes
|
||||
const notesResult = validateNotes(notes)
|
||||
if (!notesResult.isValid) {
|
||||
newErrors.notes = notesResult.error || ''
|
||||
}
|
||||
|
||||
setErrors(newErrors)
|
||||
setTouched({
|
||||
title: true,
|
||||
description: true,
|
||||
dueDate: true,
|
||||
notes: true,
|
||||
})
|
||||
return Object.keys(newErrors).length === 0
|
||||
}
|
||||
|
||||
@@ -59,6 +158,7 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
e.preventDefault()
|
||||
|
||||
if (!validateForm()) {
|
||||
showToast('Please fix validation errors', 'error')
|
||||
return
|
||||
}
|
||||
|
||||
@@ -66,12 +166,12 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
|
||||
try {
|
||||
const data = {
|
||||
title: title.trim(),
|
||||
description: description.trim() || null,
|
||||
title: sanitizeString(title),
|
||||
description: sanitizeString(description) || null,
|
||||
priority,
|
||||
dueDate: dueDate ? new Date(dueDate) : null,
|
||||
tags,
|
||||
notes: notes.trim() || null,
|
||||
tags: tags.map(sanitizeString),
|
||||
notes: sanitizeString(notes) || null,
|
||||
}
|
||||
|
||||
if (mode === 'create') {
|
||||
@@ -90,19 +190,39 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error saving item:', error)
|
||||
setErrors({ submit: 'Failed to save item. Please try again.' })
|
||||
showToast('Failed to save task', 'error')
|
||||
const errorMessage = error instanceof Error ? error.message : 'Failed to save item. Please try again.'
|
||||
setErrors({ submit: errorMessage })
|
||||
showToast(errorMessage, 'error')
|
||||
} finally {
|
||||
setIsSubmitting(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleAddTag = () => {
|
||||
const tag = tagInput.trim()
|
||||
if (tag && !tags.includes(tag)) {
|
||||
setTags([...tags, tag])
|
||||
setTagInput('')
|
||||
const tag = sanitizeString(tagInput)
|
||||
|
||||
// Validate tag
|
||||
const tagResult = validateTag(tag)
|
||||
if (!tagResult.isValid) {
|
||||
setErrors((prev) => ({ ...prev, tagInput: tagResult.error || '' }))
|
||||
return
|
||||
}
|
||||
|
||||
// Check for duplicates
|
||||
if (tags.includes(tag)) {
|
||||
setErrors((prev) => ({ ...prev, tagInput: 'Tag already exists' }))
|
||||
return
|
||||
}
|
||||
|
||||
// Check max tags
|
||||
if (tags.length >= 20) {
|
||||
setErrors((prev) => ({ ...prev, tagInput: 'Maximum 20 tags allowed' }))
|
||||
return
|
||||
}
|
||||
|
||||
setTags([...tags, tag])
|
||||
setTagInput('')
|
||||
setErrors((prev) => ({ ...prev, tagInput: '' }))
|
||||
}
|
||||
|
||||
const handleRemoveTag = (tagToRemove: string) => {
|
||||
@@ -128,13 +248,21 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
id="title"
|
||||
value={title}
|
||||
onChange={(e) => setTitle(e.target.value)}
|
||||
className={`w-full px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 text-sm sm:text-base ${
|
||||
errors.title ? 'border-red-500' : 'border-gray-300'
|
||||
onBlur={() => handleBlur('title')}
|
||||
className={`w-full px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 text-sm sm:text-base ${
|
||||
errors.title && touched.title
|
||||
? 'border-red-500 focus:ring-red-500'
|
||||
: 'border-gray-300 focus:ring-blue-500'
|
||||
}`}
|
||||
placeholder="Enter task title"
|
||||
maxLength={200}
|
||||
aria-invalid={errors.title && touched.title ? 'true' : 'false'}
|
||||
aria-describedby={errors.title && touched.title ? 'title-error' : undefined}
|
||||
/>
|
||||
{errors.title && (
|
||||
<p className="mt-1.5 text-xs sm:text-sm text-red-600">{errors.title}</p>
|
||||
{errors.title && touched.title && (
|
||||
<p id="title-error" className="mt-1.5 text-xs sm:text-sm text-red-600">
|
||||
{errors.title}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -147,10 +275,23 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
id="description"
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
onBlur={() => handleBlur('description')}
|
||||
rows={3}
|
||||
className="w-full px-3 sm:px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 text-sm sm:text-base resize-y"
|
||||
className={`w-full px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 text-sm sm:text-base resize-y ${
|
||||
errors.description && touched.description
|
||||
? 'border-red-500 focus:ring-red-500'
|
||||
: 'border-gray-300 focus:ring-blue-500'
|
||||
}`}
|
||||
placeholder="Add a description"
|
||||
maxLength={2000}
|
||||
aria-invalid={errors.description && touched.description ? 'true' : 'false'}
|
||||
aria-describedby={errors.description && touched.description ? 'description-error' : undefined}
|
||||
/>
|
||||
{errors.description && touched.description && (
|
||||
<p id="description-error" className="mt-1.5 text-xs sm:text-sm text-red-600">
|
||||
{errors.description}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Priority */}
|
||||
@@ -180,14 +321,28 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
id="dueDate"
|
||||
value={dueDate}
|
||||
onChange={(e) => setDueDate(e.target.value)}
|
||||
className="w-full px-3 sm:px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 text-sm sm:text-base tap-target"
|
||||
onBlur={() => handleBlur('dueDate')}
|
||||
className={`w-full px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 text-sm sm:text-base tap-target ${
|
||||
errors.dueDate && touched.dueDate
|
||||
? 'border-red-500 focus:ring-red-500'
|
||||
: 'border-gray-300 focus:ring-blue-500'
|
||||
}`}
|
||||
min="1900-01-01"
|
||||
max="2100-12-31"
|
||||
aria-invalid={errors.dueDate && touched.dueDate ? 'true' : 'false'}
|
||||
aria-describedby={errors.dueDate && touched.dueDate ? 'dueDate-error' : undefined}
|
||||
/>
|
||||
{errors.dueDate && touched.dueDate && (
|
||||
<p id="dueDate-error" className="mt-1.5 text-xs sm:text-sm text-red-600">
|
||||
{errors.dueDate}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Tags */}
|
||||
<div>
|
||||
<label htmlFor="tags" className="block text-sm font-medium text-gray-700 mb-2">
|
||||
Tags
|
||||
Tags {tags.length > 0 && <span className="text-gray-500">({tags.length}/20)</span>}
|
||||
</label>
|
||||
<div className="flex gap-2 mb-2 sm:mb-3">
|
||||
<input
|
||||
@@ -196,17 +351,33 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
value={tagInput}
|
||||
onChange={(e) => setTagInput(e.target.value)}
|
||||
onKeyDown={handleKeyDown}
|
||||
className="flex-1 px-3 sm:px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 text-sm sm:text-base"
|
||||
className={`flex-1 px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 text-sm sm:text-base ${
|
||||
errors.tagInput
|
||||
? 'border-red-500 focus:ring-red-500'
|
||||
: 'border-gray-300 focus:ring-blue-500'
|
||||
}`}
|
||||
placeholder="Add a tag"
|
||||
maxLength={50}
|
||||
aria-invalid={errors.tagInput ? 'true' : 'false'}
|
||||
aria-describedby={errors.tagInput ? 'tagInput-error' : undefined}
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleAddTag}
|
||||
className="px-4 sm:px-5 py-3 bg-gray-200 hover:bg-gray-300 active:bg-gray-400 text-gray-700 rounded-lg transition-colors tap-target text-sm sm:text-base font-medium"
|
||||
disabled={tags.length >= 20}
|
||||
className="px-4 sm:px-5 py-3 bg-gray-200 hover:bg-gray-300 active:bg-gray-400 disabled:bg-gray-100 disabled:text-gray-400 text-gray-700 rounded-lg transition-colors tap-target text-sm sm:text-base font-medium"
|
||||
>
|
||||
Add
|
||||
</button>
|
||||
</div>
|
||||
{errors.tagInput && (
|
||||
<p id="tagInput-error" className="mb-2 text-xs sm:text-sm text-red-600">
|
||||
{errors.tagInput}
|
||||
</p>
|
||||
)}
|
||||
{errors.tags && (
|
||||
<p className="mb-2 text-xs sm:text-sm text-red-600">{errors.tags}</p>
|
||||
)}
|
||||
{tags.length > 0 && (
|
||||
<div className="flex flex-wrap gap-2">
|
||||
{tags.map((tag) => (
|
||||
@@ -238,10 +409,23 @@ export default function ItemForm({ listId, item, mode = 'edit' }: ItemFormProps)
|
||||
id="notes"
|
||||
value={notes}
|
||||
onChange={(e) => setNotes(e.target.value)}
|
||||
onBlur={() => handleBlur('notes')}
|
||||
rows={5}
|
||||
className="w-full px-3 sm:px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 text-sm sm:text-base resize-y"
|
||||
className={`w-full px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 text-sm sm:text-base resize-y ${
|
||||
errors.notes && touched.notes
|
||||
? 'border-red-500 focus:ring-red-500'
|
||||
: 'border-gray-300 focus:ring-blue-500'
|
||||
}`}
|
||||
placeholder="Add additional notes"
|
||||
maxLength={5000}
|
||||
aria-invalid={errors.notes && touched.notes ? 'true' : 'false'}
|
||||
aria-describedby={errors.notes && touched.notes ? 'notes-error' : undefined}
|
||||
/>
|
||||
{errors.notes && touched.notes && (
|
||||
<p id="notes-error" className="mt-1.5 text-xs sm:text-sm text-red-600">
|
||||
{errors.notes}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Error message */}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useState, useEffect } from 'react'
|
||||
import { createList, updateList } from '@/lib/actions'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { useToast } from './ToastContainer'
|
||||
import { validateListTitle } from '@/lib/validation'
|
||||
|
||||
interface ListFormProps {
|
||||
list?: {
|
||||
@@ -33,12 +34,30 @@ export default function ListForm({ list, onCancel, onSuccess }: ListFormProps) {
|
||||
const [color, setColor] = useState(list?.color || PRESET_COLORS[0])
|
||||
const [isSubmitting, setIsSubmitting] = useState(false)
|
||||
const [error, setError] = useState('')
|
||||
const [touched, setTouched] = useState(false)
|
||||
|
||||
// Inline validation when title changes
|
||||
useEffect(() => {
|
||||
if (touched) {
|
||||
const result = validateListTitle(title)
|
||||
setError(result.isValid ? '' : result.error || '')
|
||||
}
|
||||
}, [title, touched])
|
||||
|
||||
const handleTitleBlur = () => {
|
||||
setTouched(true)
|
||||
const result = validateListTitle(title)
|
||||
setError(result.isValid ? '' : result.error || '')
|
||||
}
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
|
||||
if (!title.trim()) {
|
||||
setError('List title is required')
|
||||
// Validate before submission
|
||||
const result = validateListTitle(title)
|
||||
if (!result.isValid) {
|
||||
setError(result.error || 'Invalid input')
|
||||
setTouched(true)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -62,8 +81,9 @@ export default function ListForm({ list, onCancel, onSuccess }: ListFormProps) {
|
||||
router.refresh()
|
||||
}
|
||||
} catch (err) {
|
||||
setError('Failed to save list. Please try again.')
|
||||
showToast('Failed to save list', 'error')
|
||||
const errorMessage = err instanceof Error ? err.message : 'Failed to save list. Please try again.'
|
||||
setError(errorMessage)
|
||||
showToast(errorMessage, 'error')
|
||||
console.error(err)
|
||||
} finally {
|
||||
setIsSubmitting(false)
|
||||
@@ -74,18 +94,31 @@ export default function ListForm({ list, onCancel, onSuccess }: ListFormProps) {
|
||||
<form onSubmit={handleSubmit} className="space-y-4 sm:space-y-5">
|
||||
<div>
|
||||
<label htmlFor="title" className="block text-sm font-medium text-gray-700 mb-2">
|
||||
List Title
|
||||
List Title *
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
id="title"
|
||||
value={title}
|
||||
onChange={(e) => setTitle(e.target.value)}
|
||||
className="w-full px-3 sm:px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 text-sm sm:text-base"
|
||||
onBlur={handleTitleBlur}
|
||||
className={`w-full px-3 sm:px-4 py-3 border rounded-lg focus:outline-none focus:ring-2 text-sm sm:text-base ${
|
||||
error && touched
|
||||
? 'border-red-500 focus:ring-red-500'
|
||||
: 'border-gray-300 focus:ring-blue-500'
|
||||
}`}
|
||||
placeholder="Enter list title"
|
||||
disabled={isSubmitting}
|
||||
autoFocus
|
||||
maxLength={200}
|
||||
aria-invalid={error && touched ? 'true' : 'false'}
|
||||
aria-describedby={error && touched ? 'title-error' : undefined}
|
||||
/>
|
||||
{error && touched && (
|
||||
<p id="title-error" className="mt-1.5 text-xs sm:text-sm text-red-600">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@@ -111,10 +144,6 @@ export default function ListForm({ list, onCancel, onSuccess }: ListFormProps) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="text-red-600 text-xs sm:text-sm font-medium">{error}</div>
|
||||
)}
|
||||
|
||||
<div className="flex flex-col-reverse sm:flex-row gap-2 sm:gap-3 justify-end pt-2">
|
||||
{onCancel && (
|
||||
<button
|
||||
|
||||
744
lib/actions.ts
744
lib/actions.ts
@@ -2,49 +2,162 @@
|
||||
|
||||
import { prisma } from './db'
|
||||
import { revalidatePath } from 'next/cache'
|
||||
import {
|
||||
validateListTitle,
|
||||
validateItemTitle,
|
||||
validateColor,
|
||||
validateDateString,
|
||||
validateTags,
|
||||
sanitizeString,
|
||||
} from './validation'
|
||||
|
||||
// Retry utility for database operations
|
||||
async function retryOperation<T>(
|
||||
operation: () => Promise<T>,
|
||||
maxRetries: number = 3,
|
||||
delayMs: number = 1000
|
||||
): Promise<T> {
|
||||
let lastError: Error | undefined
|
||||
|
||||
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
||||
try {
|
||||
return await operation()
|
||||
} catch (error) {
|
||||
lastError = error as Error
|
||||
|
||||
// Don't retry on validation errors or not found errors
|
||||
if (
|
||||
error instanceof Error &&
|
||||
(error.message.includes('Unique constraint') ||
|
||||
error.message.includes('Record to update not found') ||
|
||||
error.message.includes('Record to delete does not exist'))
|
||||
) {
|
||||
throw error
|
||||
}
|
||||
|
||||
// Wait before retrying (exponential backoff)
|
||||
if (attempt < maxRetries - 1) {
|
||||
await new Promise(resolve => setTimeout(resolve, delayMs * Math.pow(2, attempt)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
throw lastError
|
||||
}
|
||||
|
||||
export async function getLists() {
|
||||
return await prisma.list.findMany({
|
||||
include: {
|
||||
items: true,
|
||||
},
|
||||
orderBy: {
|
||||
updatedAt: 'desc',
|
||||
},
|
||||
})
|
||||
try {
|
||||
return await retryOperation(() =>
|
||||
prisma.list.findMany({
|
||||
include: {
|
||||
items: true,
|
||||
},
|
||||
orderBy: {
|
||||
updatedAt: 'desc',
|
||||
},
|
||||
})
|
||||
)
|
||||
} catch (error) {
|
||||
console.error('Error fetching lists:', error)
|
||||
throw new Error('Failed to load lists. Please check your connection and try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function createList(title: string, color: string = '#3B82F6') {
|
||||
const list = await prisma.list.create({
|
||||
data: {
|
||||
title,
|
||||
color,
|
||||
},
|
||||
})
|
||||
revalidatePath('/')
|
||||
return list
|
||||
try {
|
||||
// Validate and sanitize input
|
||||
const titleResult = validateListTitle(title)
|
||||
if (!titleResult.isValid) {
|
||||
throw new Error(titleResult.error)
|
||||
}
|
||||
|
||||
const colorResult = validateColor(color)
|
||||
if (!colorResult.isValid) {
|
||||
throw new Error(colorResult.error)
|
||||
}
|
||||
|
||||
const sanitizedTitle = sanitizeString(title)
|
||||
|
||||
const list = await retryOperation(() =>
|
||||
prisma.list.create({
|
||||
data: {
|
||||
title: sanitizedTitle,
|
||||
color,
|
||||
},
|
||||
})
|
||||
)
|
||||
|
||||
revalidatePath('/')
|
||||
return list
|
||||
} catch (error) {
|
||||
console.error('Error creating list:', error)
|
||||
if (error instanceof Error && (error.message.includes('required') || error.message.includes('must be'))) {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to create list. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function getListWithItems(listId: string) {
|
||||
return await prisma.list.findUnique({
|
||||
where: { id: listId },
|
||||
include: {
|
||||
items: {
|
||||
orderBy: {
|
||||
createdAt: 'desc',
|
||||
try {
|
||||
if (!listId) {
|
||||
throw new Error('List ID is required')
|
||||
}
|
||||
|
||||
const list = await retryOperation(() =>
|
||||
prisma.list.findUnique({
|
||||
where: { id: listId },
|
||||
include: {
|
||||
items: {
|
||||
orderBy: {
|
||||
createdAt: 'desc',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
})
|
||||
)
|
||||
|
||||
if (!list) {
|
||||
throw new Error('List not found')
|
||||
}
|
||||
|
||||
return list
|
||||
} catch (error) {
|
||||
console.error('Error fetching list:', error)
|
||||
if (error instanceof Error && error.message === 'List not found') {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to load list. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function getItem(itemId: string) {
|
||||
return await prisma.item.findUnique({
|
||||
where: { id: itemId },
|
||||
include: {
|
||||
list: true,
|
||||
},
|
||||
})
|
||||
try {
|
||||
if (!itemId) {
|
||||
throw new Error('Item ID is required')
|
||||
}
|
||||
|
||||
const item = await retryOperation(() =>
|
||||
prisma.item.findUnique({
|
||||
where: { id: itemId },
|
||||
include: {
|
||||
list: true,
|
||||
},
|
||||
})
|
||||
)
|
||||
|
||||
if (!item) {
|
||||
throw new Error('Item not found')
|
||||
}
|
||||
|
||||
return item
|
||||
} catch (error) {
|
||||
console.error('Error fetching item:', error)
|
||||
if (error instanceof Error && error.message === 'Item not found') {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to load item. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function createItem(
|
||||
@@ -58,31 +171,86 @@ export async function createItem(
|
||||
notes?: string | null
|
||||
}
|
||||
) {
|
||||
const item = await prisma.item.create({
|
||||
data: {
|
||||
title,
|
||||
description,
|
||||
listId,
|
||||
...(metadata?.priority && { priority: metadata.priority }),
|
||||
...(metadata?.dueDate !== undefined && { dueDate: metadata.dueDate }),
|
||||
...(metadata?.tags && { tags: metadata.tags }),
|
||||
...(metadata?.notes !== undefined && { notes: metadata.notes }),
|
||||
},
|
||||
})
|
||||
revalidatePath(`/list/${listId}`)
|
||||
return item
|
||||
try {
|
||||
// Validate input
|
||||
if (!listId) {
|
||||
throw new Error('List ID is required')
|
||||
}
|
||||
|
||||
const titleResult = validateItemTitle(title)
|
||||
if (!titleResult.isValid) {
|
||||
throw new Error(titleResult.error)
|
||||
}
|
||||
|
||||
// Validate tags if provided
|
||||
if (metadata?.tags) {
|
||||
const tagsResult = validateTags(metadata.tags)
|
||||
if (!tagsResult.isValid) {
|
||||
throw new Error(tagsResult.error)
|
||||
}
|
||||
}
|
||||
|
||||
// Sanitize inputs
|
||||
const sanitizedTitle = sanitizeString(title)
|
||||
const sanitizedDescription = description ? sanitizeString(description) : null
|
||||
const sanitizedNotes = metadata?.notes ? sanitizeString(metadata.notes) : null
|
||||
const sanitizedTags = metadata?.tags ? metadata.tags.map(sanitizeString) : undefined
|
||||
|
||||
const item = await retryOperation(() =>
|
||||
prisma.item.create({
|
||||
data: {
|
||||
title: sanitizedTitle,
|
||||
description: sanitizedDescription,
|
||||
listId,
|
||||
...(metadata?.priority && { priority: metadata.priority }),
|
||||
...(metadata?.dueDate !== undefined && { dueDate: metadata.dueDate }),
|
||||
...(sanitizedTags && { tags: sanitizedTags }),
|
||||
...(sanitizedNotes !== undefined && { notes: sanitizedNotes }),
|
||||
},
|
||||
})
|
||||
)
|
||||
|
||||
revalidatePath(`/list/${listId}`)
|
||||
return item
|
||||
} catch (error) {
|
||||
console.error('Error creating item:', error)
|
||||
if (error instanceof Error && (error.message.includes('required') || error.message.includes('must be') || error.message.includes('Invalid'))) {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to create item. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function toggleItem(itemId: string) {
|
||||
const item = await prisma.item.findUnique({ where: { id: itemId } })
|
||||
if (!item) return null
|
||||
|
||||
const updated = await prisma.item.update({
|
||||
where: { id: itemId },
|
||||
data: { completed: !item.completed },
|
||||
})
|
||||
revalidatePath(`/list/${item.listId}`)
|
||||
return updated
|
||||
try {
|
||||
if (!itemId) {
|
||||
throw new Error('Item ID is required')
|
||||
}
|
||||
|
||||
const item = await retryOperation(() =>
|
||||
prisma.item.findUnique({ where: { id: itemId } })
|
||||
)
|
||||
|
||||
if (!item) {
|
||||
throw new Error('Item not found')
|
||||
}
|
||||
|
||||
const updated = await retryOperation(() =>
|
||||
prisma.item.update({
|
||||
where: { id: itemId },
|
||||
data: { completed: !item.completed },
|
||||
})
|
||||
)
|
||||
|
||||
revalidatePath(`/list/${item.listId}`)
|
||||
return updated
|
||||
} catch (error) {
|
||||
console.error('Error toggling item:', error)
|
||||
if (error instanceof Error && error.message === 'Item not found') {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to update item. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function updateItem(
|
||||
@@ -97,34 +265,126 @@ export async function updateItem(
|
||||
notes?: string | null
|
||||
}
|
||||
) {
|
||||
const item = await prisma.item.findUnique({ where: { id: itemId } })
|
||||
if (!item) return null
|
||||
try {
|
||||
if (!itemId) {
|
||||
throw new Error('Item ID is required')
|
||||
}
|
||||
|
||||
// Validate and sanitize title if provided
|
||||
if (data.title !== undefined) {
|
||||
const titleResult = validateItemTitle(data.title)
|
||||
if (!titleResult.isValid) {
|
||||
throw new Error(titleResult.error)
|
||||
}
|
||||
data.title = sanitizeString(data.title)
|
||||
}
|
||||
|
||||
// Sanitize description if provided
|
||||
if (data.description !== undefined && data.description !== null) {
|
||||
data.description = sanitizeString(data.description) || null
|
||||
}
|
||||
|
||||
// Validate tags if provided
|
||||
if (data.tags !== undefined) {
|
||||
const tagsResult = validateTags(data.tags)
|
||||
if (!tagsResult.isValid) {
|
||||
throw new Error(tagsResult.error)
|
||||
}
|
||||
data.tags = data.tags.map(sanitizeString)
|
||||
}
|
||||
|
||||
// Sanitize notes if provided
|
||||
if (data.notes !== undefined && data.notes !== null) {
|
||||
data.notes = sanitizeString(data.notes) || null
|
||||
}
|
||||
|
||||
const item = await retryOperation(() =>
|
||||
prisma.item.findUnique({ where: { id: itemId } })
|
||||
)
|
||||
|
||||
if (!item) {
|
||||
throw new Error('Item not found')
|
||||
}
|
||||
|
||||
const updated = await prisma.item.update({
|
||||
where: { id: itemId },
|
||||
data,
|
||||
})
|
||||
revalidatePath(`/list/${item.listId}`)
|
||||
return updated
|
||||
const updated = await retryOperation(() =>
|
||||
prisma.item.update({
|
||||
where: { id: itemId },
|
||||
data,
|
||||
})
|
||||
)
|
||||
|
||||
revalidatePath(`/list/${item.listId}`)
|
||||
return updated
|
||||
} catch (error) {
|
||||
console.error('Error updating item:', error)
|
||||
if (error instanceof Error && (error.message.includes('not found') || error.message.includes('required') || error.message.includes('cannot be') || error.message.includes('Invalid'))) {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to update item. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function deleteItem(itemId: string) {
|
||||
const item = await prisma.item.findUnique({ where: { id: itemId } })
|
||||
if (!item) return null
|
||||
try {
|
||||
if (!itemId) {
|
||||
throw new Error('Item ID is required')
|
||||
}
|
||||
|
||||
const item = await retryOperation(() =>
|
||||
prisma.item.findUnique({ where: { id: itemId } })
|
||||
)
|
||||
|
||||
if (!item) {
|
||||
throw new Error('Item not found')
|
||||
}
|
||||
|
||||
await prisma.item.delete({
|
||||
where: { id: itemId },
|
||||
})
|
||||
revalidatePath(`/list/${item.listId}`)
|
||||
return { success: true }
|
||||
await retryOperation(() =>
|
||||
prisma.item.delete({
|
||||
where: { id: itemId },
|
||||
})
|
||||
)
|
||||
|
||||
revalidatePath(`/list/${item.listId}`)
|
||||
return { success: true }
|
||||
} catch (error) {
|
||||
console.error('Error deleting item:', error)
|
||||
if (error instanceof Error && error.message === 'Item not found') {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to delete item. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function deleteList(listId: string) {
|
||||
await prisma.list.delete({
|
||||
where: { id: listId },
|
||||
})
|
||||
revalidatePath('/')
|
||||
return { success: true }
|
||||
try {
|
||||
if (!listId) {
|
||||
throw new Error('List ID is required')
|
||||
}
|
||||
|
||||
// Check if list exists
|
||||
const list = await retryOperation(() =>
|
||||
prisma.list.findUnique({ where: { id: listId } })
|
||||
)
|
||||
|
||||
if (!list) {
|
||||
throw new Error('List not found')
|
||||
}
|
||||
|
||||
await retryOperation(() =>
|
||||
prisma.list.delete({
|
||||
where: { id: listId },
|
||||
})
|
||||
)
|
||||
|
||||
revalidatePath('/')
|
||||
return { success: true }
|
||||
} catch (error) {
|
||||
console.error('Error deleting list:', error)
|
||||
if (error instanceof Error && error.message === 'List not found') {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to delete list. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function updateList(
|
||||
@@ -134,85 +394,126 @@ export async function updateList(
|
||||
color?: string
|
||||
}
|
||||
) {
|
||||
const updated = await prisma.list.update({
|
||||
where: { id: listId },
|
||||
data,
|
||||
})
|
||||
revalidatePath('/')
|
||||
revalidatePath(`/list/${listId}`)
|
||||
return updated
|
||||
try {
|
||||
if (!listId) {
|
||||
throw new Error('List ID is required')
|
||||
}
|
||||
|
||||
// Validate and sanitize title if provided
|
||||
if (data.title !== undefined) {
|
||||
const titleResult = validateListTitle(data.title)
|
||||
if (!titleResult.isValid) {
|
||||
throw new Error(titleResult.error)
|
||||
}
|
||||
data.title = sanitizeString(data.title)
|
||||
}
|
||||
|
||||
// Validate color if provided
|
||||
if (data.color !== undefined) {
|
||||
const colorResult = validateColor(data.color)
|
||||
if (!colorResult.isValid) {
|
||||
throw new Error(colorResult.error)
|
||||
}
|
||||
}
|
||||
|
||||
const updated = await retryOperation(() =>
|
||||
prisma.list.update({
|
||||
where: { id: listId },
|
||||
data,
|
||||
})
|
||||
)
|
||||
|
||||
revalidatePath('/')
|
||||
revalidatePath(`/list/${listId}`)
|
||||
return updated
|
||||
} catch (error) {
|
||||
console.error('Error updating list:', error)
|
||||
if (error instanceof Error && (error.message.includes('not found') || error.message.includes('required') || error.message.includes('cannot be') || error.message.includes('Invalid'))) {
|
||||
throw error
|
||||
}
|
||||
throw new Error('Failed to update list. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function searchItems(query: string, listId?: string) {
|
||||
if (!query.trim()) {
|
||||
return []
|
||||
}
|
||||
try {
|
||||
if (!query || !query.trim()) {
|
||||
return []
|
||||
}
|
||||
|
||||
const searchTerm = query.toLowerCase()
|
||||
const searchTerm = query.toLowerCase()
|
||||
|
||||
// Build the where clause
|
||||
const whereClause: any = {
|
||||
OR: [
|
||||
{
|
||||
title: {
|
||||
contains: query,
|
||||
mode: 'insensitive' as const,
|
||||
// Build the where clause
|
||||
const whereClause: any = {
|
||||
OR: [
|
||||
{
|
||||
title: {
|
||||
contains: query,
|
||||
mode: 'insensitive' as const,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
description: {
|
||||
contains: query,
|
||||
mode: 'insensitive' as const,
|
||||
{
|
||||
description: {
|
||||
contains: query,
|
||||
mode: 'insensitive' as const,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
notes: {
|
||||
contains: query,
|
||||
mode: 'insensitive' as const,
|
||||
{
|
||||
notes: {
|
||||
contains: query,
|
||||
mode: 'insensitive' as const,
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
// Add list scope if specified
|
||||
if (listId) {
|
||||
whereClause.listId = listId
|
||||
}
|
||||
// Add list scope if specified
|
||||
if (listId) {
|
||||
whereClause.listId = listId
|
||||
}
|
||||
|
||||
const items = await prisma.item.findMany({
|
||||
where: whereClause,
|
||||
include: {
|
||||
list: true,
|
||||
},
|
||||
orderBy: {
|
||||
updatedAt: 'desc',
|
||||
},
|
||||
})
|
||||
|
||||
// Also search in tags (stored as JSON)
|
||||
const allItems = listId
|
||||
? await prisma.item.findMany({
|
||||
where: { listId },
|
||||
include: { list: true },
|
||||
const items = await retryOperation(() =>
|
||||
prisma.item.findMany({
|
||||
where: whereClause,
|
||||
include: {
|
||||
list: true,
|
||||
},
|
||||
orderBy: {
|
||||
updatedAt: 'desc',
|
||||
},
|
||||
})
|
||||
: await prisma.item.findMany({
|
||||
include: { list: true },
|
||||
})
|
||||
|
||||
const tagMatches = allItems.filter((item) => {
|
||||
const tags = Array.isArray(item.tags) ? item.tags : []
|
||||
return tags.some((tag) =>
|
||||
typeof tag === 'string' && tag.toLowerCase().includes(searchTerm)
|
||||
)
|
||||
})
|
||||
|
||||
// Combine results and remove duplicates
|
||||
const combinedResults = [...items, ...tagMatches]
|
||||
const uniqueResults = Array.from(
|
||||
new Map(combinedResults.map((item) => [item.id, item])).values()
|
||||
)
|
||||
// Also search in tags (stored as JSON)
|
||||
const allItems = await retryOperation(() =>
|
||||
listId
|
||||
? prisma.item.findMany({
|
||||
where: { listId },
|
||||
include: { list: true },
|
||||
})
|
||||
: prisma.item.findMany({
|
||||
include: { list: true },
|
||||
})
|
||||
)
|
||||
|
||||
return uniqueResults
|
||||
const tagMatches = allItems.filter((item) => {
|
||||
const tags = Array.isArray(item.tags) ? item.tags : []
|
||||
return tags.some((tag) =>
|
||||
typeof tag === 'string' && tag.toLowerCase().includes(searchTerm)
|
||||
)
|
||||
})
|
||||
|
||||
// Combine results and remove duplicates
|
||||
const combinedResults = [...items, ...tagMatches]
|
||||
const uniqueResults = Array.from(
|
||||
new Map(combinedResults.map((item) => [item.id, item])).values()
|
||||
)
|
||||
|
||||
return uniqueResults
|
||||
} catch (error) {
|
||||
console.error('Error searching items:', error)
|
||||
throw new Error('Failed to search items. Please try again.')
|
||||
}
|
||||
}
|
||||
|
||||
export async function getItemsByFilter(
|
||||
@@ -226,93 +527,100 @@ export async function getItemsByFilter(
|
||||
sortOrder?: 'asc' | 'desc'
|
||||
} = {}
|
||||
) {
|
||||
// Build the where clause with compound filters (AND logic)
|
||||
const whereClause: any = {}
|
||||
try {
|
||||
// Build the where clause with compound filters (AND logic)
|
||||
const whereClause: any = {}
|
||||
|
||||
// Add list scope if specified
|
||||
if (listId) {
|
||||
whereClause.listId = listId
|
||||
}
|
||||
|
||||
// Filter by priority
|
||||
if (filters.priority) {
|
||||
whereClause.priority = filters.priority
|
||||
}
|
||||
|
||||
// Filter by completed status
|
||||
if (filters.completed !== undefined && filters.completed !== null) {
|
||||
whereClause.completed = filters.completed
|
||||
}
|
||||
|
||||
// Filter by due date range
|
||||
if (filters.dueDateRange) {
|
||||
const { start, end } = filters.dueDateRange
|
||||
if (start || end) {
|
||||
whereClause.dueDate = {}
|
||||
if (start) {
|
||||
whereClause.dueDate.gte = start
|
||||
}
|
||||
if (end) {
|
||||
whereClause.dueDate.lte = end
|
||||
}
|
||||
// Add list scope if specified
|
||||
if (listId) {
|
||||
whereClause.listId = listId
|
||||
}
|
||||
}
|
||||
|
||||
// Fetch items from database
|
||||
const items = await prisma.item.findMany({
|
||||
where: whereClause,
|
||||
include: {
|
||||
list: true,
|
||||
},
|
||||
})
|
||||
// Filter by priority
|
||||
if (filters.priority) {
|
||||
whereClause.priority = filters.priority
|
||||
}
|
||||
|
||||
// Filter by tags (client-side since tags are stored as JSON)
|
||||
let filteredItems = items
|
||||
if (filters.tags && filters.tags.length > 0) {
|
||||
filteredItems = items.filter((item) => {
|
||||
const itemTags = Array.isArray(item.tags) ? item.tags : []
|
||||
return filters.tags!.every((filterTag) =>
|
||||
itemTags.some((itemTag) => typeof itemTag === 'string' && itemTag === filterTag)
|
||||
)
|
||||
})
|
||||
}
|
||||
// Filter by completed status
|
||||
if (filters.completed !== undefined && filters.completed !== null) {
|
||||
whereClause.completed = filters.completed
|
||||
}
|
||||
|
||||
// Sort items
|
||||
const sortBy = filters.sortBy || 'createdAt'
|
||||
const sortOrder = filters.sortOrder || 'desc'
|
||||
|
||||
const sortedItems = [...filteredItems].sort((a, b) => {
|
||||
let comparison = 0
|
||||
|
||||
switch (sortBy) {
|
||||
case 'createdAt':
|
||||
comparison = a.createdAt.getTime() - b.createdAt.getTime()
|
||||
break
|
||||
case 'dueDate':
|
||||
// Handle null due dates - place at end
|
||||
if (a.dueDate === null && b.dueDate === null) {
|
||||
comparison = 0
|
||||
} else if (a.dueDate === null) {
|
||||
comparison = 1 // a goes after b
|
||||
} else if (b.dueDate === null) {
|
||||
comparison = -1 // b goes after a
|
||||
} else {
|
||||
comparison = a.dueDate.getTime() - b.dueDate.getTime()
|
||||
// Filter by due date range
|
||||
if (filters.dueDateRange) {
|
||||
const { start, end } = filters.dueDateRange
|
||||
if (start || end) {
|
||||
whereClause.dueDate = {}
|
||||
if (start) {
|
||||
whereClause.dueDate.gte = start
|
||||
}
|
||||
break
|
||||
case 'priority':
|
||||
const priorityOrder = { low: 1, medium: 2, high: 3 }
|
||||
const aPriority = priorityOrder[a.priority as keyof typeof priorityOrder] || 2
|
||||
const bPriority = priorityOrder[b.priority as keyof typeof priorityOrder] || 2
|
||||
comparison = aPriority - bPriority
|
||||
break
|
||||
case 'title':
|
||||
comparison = a.title.localeCompare(b.title)
|
||||
break
|
||||
if (end) {
|
||||
whereClause.dueDate.lte = end
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return sortOrder === 'asc' ? comparison : -comparison
|
||||
})
|
||||
// Fetch items from database
|
||||
const items = await retryOperation(() =>
|
||||
prisma.item.findMany({
|
||||
where: whereClause,
|
||||
include: {
|
||||
list: true,
|
||||
},
|
||||
})
|
||||
)
|
||||
|
||||
return sortedItems
|
||||
// Filter by tags (client-side since tags are stored as JSON)
|
||||
let filteredItems = items
|
||||
if (filters.tags && filters.tags.length > 0) {
|
||||
filteredItems = items.filter((item) => {
|
||||
const itemTags = Array.isArray(item.tags) ? item.tags : []
|
||||
return filters.tags!.every((filterTag) =>
|
||||
itemTags.some((itemTag) => typeof itemTag === 'string' && itemTag === filterTag)
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
// Sort items
|
||||
const sortBy = filters.sortBy || 'createdAt'
|
||||
const sortOrder = filters.sortOrder || 'desc'
|
||||
|
||||
const sortedItems = [...filteredItems].sort((a, b) => {
|
||||
let comparison = 0
|
||||
|
||||
switch (sortBy) {
|
||||
case 'createdAt':
|
||||
comparison = a.createdAt.getTime() - b.createdAt.getTime()
|
||||
break
|
||||
case 'dueDate':
|
||||
// Handle null due dates - place at end
|
||||
if (a.dueDate === null && b.dueDate === null) {
|
||||
comparison = 0
|
||||
} else if (a.dueDate === null) {
|
||||
comparison = 1 // a goes after b
|
||||
} else if (b.dueDate === null) {
|
||||
comparison = -1 // b goes after a
|
||||
} else {
|
||||
comparison = a.dueDate.getTime() - b.dueDate.getTime()
|
||||
}
|
||||
break
|
||||
case 'priority':
|
||||
const priorityOrder = { low: 1, medium: 2, high: 3 }
|
||||
const aPriority = priorityOrder[a.priority as keyof typeof priorityOrder] || 2
|
||||
const bPriority = priorityOrder[b.priority as keyof typeof priorityOrder] || 2
|
||||
comparison = aPriority - bPriority
|
||||
break
|
||||
case 'title':
|
||||
comparison = a.title.localeCompare(b.title)
|
||||
break
|
||||
}
|
||||
|
||||
return sortOrder === 'asc' ? comparison : -comparison
|
||||
})
|
||||
|
||||
return sortedItems
|
||||
} catch (error) {
|
||||
console.error('Error filtering items:', error)
|
||||
throw new Error('Failed to filter items. Please try again.')
|
||||
}
|
||||
}
|
||||
18
lib/db.ts
18
lib/db.ts
@@ -4,6 +4,22 @@ const globalForPrisma = globalThis as unknown as {
|
||||
prisma: PrismaClient | undefined
|
||||
}
|
||||
|
||||
export const prisma = globalForPrisma.prisma ?? new PrismaClient()
|
||||
// Create Prisma client with connection error handling
|
||||
export const prisma = globalForPrisma.prisma ?? new PrismaClient({
|
||||
log: process.env.NODE_ENV === 'development' ? ['error', 'warn'] : ['error'],
|
||||
})
|
||||
|
||||
// Handle connection errors
|
||||
prisma.$connect().catch((error) => {
|
||||
console.error('Failed to connect to database:', error)
|
||||
// Don't throw here - let individual queries handle connection errors
|
||||
})
|
||||
|
||||
// Graceful shutdown
|
||||
if (typeof window === 'undefined') {
|
||||
process.on('beforeExit', async () => {
|
||||
await prisma.$disconnect()
|
||||
})
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
|
||||
303
lib/validation.ts
Normal file
303
lib/validation.ts
Normal file
@@ -0,0 +1,303 @@
|
||||
/**
|
||||
* Input validation utilities for the Ultimate Lists App
|
||||
* Provides validation functions and sanitization for user inputs
|
||||
*/
|
||||
|
||||
export interface ValidationResult {
|
||||
isValid: boolean
|
||||
error?: string
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitize string input by trimming whitespace
|
||||
*/
|
||||
export function sanitizeString(input: string | null | undefined): string {
|
||||
if (input === null || input === undefined) {
|
||||
return ''
|
||||
}
|
||||
return input.trim()
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate list title
|
||||
*/
|
||||
export function validateListTitle(title: string): ValidationResult {
|
||||
const sanitized = sanitizeString(title)
|
||||
|
||||
if (!sanitized) {
|
||||
return { isValid: false, error: 'List title is required' }
|
||||
}
|
||||
|
||||
if (sanitized.length > 200) {
|
||||
return { isValid: false, error: 'List title must be less than 200 characters' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate item/task title
|
||||
*/
|
||||
export function validateItemTitle(title: string): ValidationResult {
|
||||
const sanitized = sanitizeString(title)
|
||||
|
||||
if (!sanitized) {
|
||||
return { isValid: false, error: 'Task title is required' }
|
||||
}
|
||||
|
||||
if (sanitized.length > 200) {
|
||||
return { isValid: false, error: 'Task title must be less than 200 characters' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate hex color format
|
||||
*/
|
||||
export function validateColor(color: string): ValidationResult {
|
||||
const hexColorRegex = /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/
|
||||
|
||||
if (!hexColorRegex.test(color)) {
|
||||
return { isValid: false, error: 'Invalid color format. Use hex format (e.g., #3B82F6)' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate priority value
|
||||
*/
|
||||
export function validatePriority(priority: string): ValidationResult {
|
||||
const validPriorities = ['low', 'medium', 'high']
|
||||
|
||||
if (!validPriorities.includes(priority)) {
|
||||
return { isValid: false, error: 'Priority must be low, medium, or high' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate date string format (ISO 8601 or YYYY-MM-DD)
|
||||
*/
|
||||
export function validateDateString(dateString: string): ValidationResult {
|
||||
if (!dateString) {
|
||||
return { isValid: true } // Empty date is valid (optional field)
|
||||
}
|
||||
|
||||
// Try to parse the date
|
||||
const date = new Date(dateString)
|
||||
|
||||
// Check if date is valid
|
||||
if (isNaN(date.getTime())) {
|
||||
return { isValid: false, error: 'Invalid date format. Use YYYY-MM-DD format' }
|
||||
}
|
||||
|
||||
// Check if date is reasonable (not too far in past or future)
|
||||
const minDate = new Date('1900-01-01')
|
||||
const maxDate = new Date('2100-12-31')
|
||||
|
||||
if (date < minDate || date > maxDate) {
|
||||
return { isValid: false, error: 'Date must be between 1900 and 2100' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate tag string
|
||||
*/
|
||||
export function validateTag(tag: string): ValidationResult {
|
||||
const sanitized = sanitizeString(tag)
|
||||
|
||||
if (!sanitized) {
|
||||
return { isValid: false, error: 'Tag cannot be empty' }
|
||||
}
|
||||
|
||||
if (sanitized.length > 50) {
|
||||
return { isValid: false, error: 'Tag must be less than 50 characters' }
|
||||
}
|
||||
|
||||
// Disallow special characters that might cause issues
|
||||
const invalidCharsRegex = /[<>\"']/
|
||||
if (invalidCharsRegex.test(sanitized)) {
|
||||
return { isValid: false, error: 'Tag contains invalid characters' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate array of tags
|
||||
*/
|
||||
export function validateTags(tags: string[]): ValidationResult {
|
||||
if (!Array.isArray(tags)) {
|
||||
return { isValid: false, error: 'Tags must be an array' }
|
||||
}
|
||||
|
||||
if (tags.length > 20) {
|
||||
return { isValid: false, error: 'Maximum 20 tags allowed' }
|
||||
}
|
||||
|
||||
for (const tag of tags) {
|
||||
const result = validateTag(tag)
|
||||
if (!result.isValid) {
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate description text
|
||||
*/
|
||||
export function validateDescription(description: string | null | undefined): ValidationResult {
|
||||
if (!description) {
|
||||
return { isValid: true } // Description is optional
|
||||
}
|
||||
|
||||
if (description.length > 2000) {
|
||||
return { isValid: false, error: 'Description must be less than 2000 characters' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate notes text
|
||||
*/
|
||||
export function validateNotes(notes: string | null | undefined): ValidationResult {
|
||||
if (!notes) {
|
||||
return { isValid: true } // Notes are optional
|
||||
}
|
||||
|
||||
if (notes.length > 5000) {
|
||||
return { isValid: false, error: 'Notes must be less than 5000 characters' }
|
||||
}
|
||||
|
||||
return { isValid: true }
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitize HTML to prevent XSS attacks
|
||||
* Basic implementation - strips HTML tags
|
||||
*/
|
||||
export function sanitizeHtml(input: string): string {
|
||||
return input.replace(/<[^>]*>/g, '')
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate and sanitize list creation data
|
||||
*/
|
||||
export function validateListData(data: { title: string; color?: string }): {
|
||||
isValid: boolean
|
||||
errors: Record<string, string>
|
||||
sanitized: { title: string; color: string }
|
||||
} {
|
||||
const errors: Record<string, string> = {}
|
||||
|
||||
// Validate title
|
||||
const titleResult = validateListTitle(data.title)
|
||||
if (!titleResult.isValid) {
|
||||
errors.title = titleResult.error!
|
||||
}
|
||||
|
||||
// Validate color if provided
|
||||
const color = data.color || '#3B82F6'
|
||||
const colorResult = validateColor(color)
|
||||
if (!colorResult.isValid) {
|
||||
errors.color = colorResult.error!
|
||||
}
|
||||
|
||||
return {
|
||||
isValid: Object.keys(errors).length === 0,
|
||||
errors,
|
||||
sanitized: {
|
||||
title: sanitizeString(data.title),
|
||||
color,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate and sanitize item creation data
|
||||
*/
|
||||
export function validateItemData(data: {
|
||||
title: string
|
||||
description?: string | null
|
||||
priority?: string
|
||||
dueDate?: string | null
|
||||
tags?: string[]
|
||||
notes?: string | null
|
||||
}): {
|
||||
isValid: boolean
|
||||
errors: Record<string, string>
|
||||
sanitized: {
|
||||
title: string
|
||||
description: string | null
|
||||
priority: 'low' | 'medium' | 'high'
|
||||
dueDate: Date | null
|
||||
tags: string[]
|
||||
notes: string | null
|
||||
}
|
||||
} {
|
||||
const errors: Record<string, string> = {}
|
||||
|
||||
// Validate title
|
||||
const titleResult = validateItemTitle(data.title)
|
||||
if (!titleResult.isValid) {
|
||||
errors.title = titleResult.error!
|
||||
}
|
||||
|
||||
// Validate description
|
||||
const descResult = validateDescription(data.description)
|
||||
if (!descResult.isValid) {
|
||||
errors.description = descResult.error!
|
||||
}
|
||||
|
||||
// Validate priority
|
||||
const priority = data.priority || 'medium'
|
||||
const priorityResult = validatePriority(priority)
|
||||
if (!priorityResult.isValid) {
|
||||
errors.priority = priorityResult.error!
|
||||
}
|
||||
|
||||
// Validate due date
|
||||
let dueDate: Date | null = null
|
||||
if (data.dueDate) {
|
||||
const dateResult = validateDateString(data.dueDate)
|
||||
if (!dateResult.isValid) {
|
||||
errors.dueDate = dateResult.error!
|
||||
} else {
|
||||
dueDate = new Date(data.dueDate)
|
||||
}
|
||||
}
|
||||
|
||||
// Validate tags
|
||||
const tags = data.tags || []
|
||||
const tagsResult = validateTags(tags)
|
||||
if (!tagsResult.isValid) {
|
||||
errors.tags = tagsResult.error!
|
||||
}
|
||||
|
||||
// Validate notes
|
||||
const notesResult = validateNotes(data.notes)
|
||||
if (!notesResult.isValid) {
|
||||
errors.notes = notesResult.error!
|
||||
}
|
||||
|
||||
return {
|
||||
isValid: Object.keys(errors).length === 0,
|
||||
errors,
|
||||
sanitized: {
|
||||
title: sanitizeString(data.title),
|
||||
description: data.description ? sanitizeString(data.description) : null,
|
||||
priority: priority as 'low' | 'medium' | 'high',
|
||||
dueDate,
|
||||
tags: tags.map(sanitizeString),
|
||||
notes: data.notes ? sanitizeString(data.notes) : null,
|
||||
},
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user