create-nextjs-cms 0.9.30 → 0.9.31

package/templates/default/components/pages/log-page.tsx

@@ -1,107 +1,107 @@
-'use client'
-
-import { useI18n } from 'nextjs-cms/translations/client'
-import { trpc } from '@/app/_trpc/client'
-import { Badge } from '@/components/ui/badge'
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'
-import ErrorComponent from '@/components/feedback/error-component'
-import { Spinner } from '@/components/ui/spinner'
-
-type LogMetadata = {
-    fields?: string[]
-    previousUsername?: string
-    newUsername?: string
-}
-
-const formatTimestamp = (value: Date | string | null) => {
-    if (!value) return ''
-    const date = value instanceof Date ? value : new Date(value)
-    if (Number.isNaN(date.getTime())) return ''
-    return date.toLocaleString()
-}
-
-const parseMetadata = (metadata?: string | null): LogMetadata | null => {
-    if (!metadata) return null
-    try {
-        return JSON.parse(metadata) as LogMetadata
-    } catch (error) {
-        return null
-    }
-}
-
-export default function LogPage() {
-    const t = useI18n()
-    const { data, isLoading, isError, error } = trpc.logs.list.useQuery({
-        limit: 50,
-        offset: 0,
-    })
-
-    if (isLoading) {
-        return (
-            <div className='flex w-full items-center justify-center p-8'>
-                <Spinner className='size-8' aria-label={t('loading') as string} />
-            </div>
-        )
-    }
-
-    if (isError) {
-        return <ErrorComponent message={error?.message || t('noAccessToSection')} />
-    }
-
-    const logs = data?.items ?? []
-    return (
-        <div className='w-full'>
-            <div className='text-foreground bg-linear-to-r from-sky-200 via-emerald-300 to-blue-600 p-8 font-extrabold dark:from-blue-800 dark:via-amber-700 dark:to-rose-900'>
-                <h1 className='text-3xl'>{t('logs')}</h1>
-            </div>
-
-            <div className='flex flex-col gap-4 p-4'>
-                <Table>
-                    <TableHeader>
-                        <TableRow>
-                            <TableHead>{t('date')}</TableHead>
-                            <TableHead>{t('action')}</TableHead>
-                            <TableHead>{t('admin')}</TableHead>
-                            <TableHead>{t('section')}</TableHead>
-                            <TableHead>{t('details')}</TableHead>
-                        </TableRow>
-                    </TableHeader>
-                    <TableBody>
-                        {logs.length === 0 ? (
-                            <TableRow>
-                                <TableCell colSpan={5} className='text-muted-foreground text-center'>
-                                    {t('noData')}
-                                </TableCell>
-                            </TableRow>
-                        ) : (
-                            logs.map((log) => {
-                                const metadata = parseMetadata(log.metadata)
-                                const fields = metadata?.fields?.length ? metadata.fields.join(', ') : null
-                                const usernameChange =
-                                    metadata?.previousUsername && metadata?.newUsername
-                                        ? `${metadata.previousUsername} -> ${metadata.newUsername}`
-                                        : null
-
-                                return (
-                                    <TableRow key={log.id}>
-                                        <TableCell>{formatTimestamp(log.createdAt)}</TableCell>
-                                        <TableCell>
-                                            <Badge variant='outline'>{log.eventType}</Badge>
-                                        </TableCell>
-                                        <TableCell>{log.actorUsername || log.actorId || '-'}</TableCell>
-                                        <TableCell>{log.sectionName || '-'}</TableCell>
-                                        <TableCell className='text-muted-foreground'>
-                                            {log.entityLabel || log.entityId || '-'}
-                                            {fields ? ` | ${fields}` : ''}
-                                            {usernameChange ? ` | ${usernameChange}` : ''}
-                                        </TableCell>
-                                    </TableRow>
-                                )
-                            })
-                        )}
-                    </TableBody>
-                </Table>
-            </div>
-        </div>
-    )
-}
+'use client'
+
+import { useI18n } from 'nextjs-cms/translations/client'
+import { trpc } from '@/app/_trpc/client'
+import { Badge } from '@/components/ui/badge'
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'
+import ErrorComponent from '@/components/feedback/error-component'
+import { Spinner } from '@/components/ui/spinner'
+
+type LogMetadata = {
+    fields?: string[]
+    previousUsername?: string
+    newUsername?: string
+}
+
+const formatTimestamp = (value: Date | string | null) => {
+    if (!value) return ''
+    const date = value instanceof Date ? value : new Date(value)
+    if (Number.isNaN(date.getTime())) return ''
+    return date.toLocaleString()
+}
+
+const parseMetadata = (metadata?: string | null): LogMetadata | null => {
+    if (!metadata) return null
+    try {
+        return JSON.parse(metadata) as LogMetadata
+    } catch (error) {
+        return null
+    }
+}
+
+export default function LogPage() {
+    const t = useI18n()
+    const { data, isLoading, isError, error } = trpc.logs.list.useQuery({
+        limit: 50,
+        offset: 0,
+    })
+
+    if (isLoading) {
+        return (
+            <div className='flex w-full items-center justify-center p-8'>
+                <Spinner className='size-8' aria-label={t('loading') as string} />
+            </div>
+        )
+    }
+
+    if (isError) {
+        return <ErrorComponent message={error?.message || t('noAccessToSection')} />
+    }
+
+    const logs = data?.items ?? []
+    return (
+        <div className='w-full'>
+            <div className='text-foreground bg-linear-to-r from-sky-200 via-emerald-300 to-blue-600 p-8 font-extrabold dark:from-blue-800 dark:via-amber-700 dark:to-rose-900'>
+                <h1 className='text-3xl'>{t('logs')}</h1>
+            </div>
+
+            <div className='flex flex-col gap-4 p-4'>
+                <Table>
+                    <TableHeader>
+                        <TableRow>
+                            <TableHead>{t('date')}</TableHead>
+                            <TableHead>{t('action')}</TableHead>
+                            <TableHead>{t('admin')}</TableHead>
+                            <TableHead>{t('section')}</TableHead>
+                            <TableHead>{t('details')}</TableHead>
+                        </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                        {logs.length === 0 ? (
+                            <TableRow>
+                                <TableCell colSpan={5} className='text-muted-foreground text-center'>
+                                    {t('noData')}
+                                </TableCell>
+                            </TableRow>
+                        ) : (
+                            logs.map((log) => {
+                                const metadata = parseMetadata(log.metadata)
+                                const fields = metadata?.fields?.length ? metadata.fields.join(', ') : null
+                                const usernameChange =
+                                    metadata?.previousUsername && metadata?.newUsername
+                                        ? `${metadata.previousUsername} -> ${metadata.newUsername}`
+                                        : null
+
+                                return (
+                                    <TableRow key={log.id}>
+                                        <TableCell>{formatTimestamp(log.createdAt)}</TableCell>
+                                        <TableCell>
+                                            <Badge variant='outline'>{log.eventType}</Badge>
+                                        </TableCell>
+                                        <TableCell>{log.actorUsername || log.actorId || '-'}</TableCell>
+                                        <TableCell>{log.sectionName || '-'}</TableCell>
+                                        <TableCell className='text-muted-foreground'>
+                                            {log.entityLabel || log.entityId || '-'}
+                                            {fields ? ` | ${fields}` : ''}
+                                            {usernameChange ? ` | ${usernameChange}` : ''}
+                                        </TableCell>
+                                    </TableRow>
+                                )
+                            })
+                        )}
+                    </TableBody>
+                </Table>
+            </div>
+        </div>
+    )
+}

package/templates/default/components/pages/new-page.tsx

@@ -1,183 +1,183 @@
-'use client'
-
-import { useAxiosPrivate } from 'nextjs-cms/api/client'
-import { RefObject, useEffect, useRef, useState } from 'react'
-import { SectionType } from 'nextjs-cms/core/types'
-import { useI18n } from 'nextjs-cms/translations/client'
-import { useModal } from '@/components/feedback/modal-context'
-import { AxiosError } from 'axios'
-import InfoCard from '@/components/feedback/info-card'
-import { useToast } from '@/components/ui/use-toast'
-import { useRouter } from 'next/navigation'
-import { DropzoneHandles } from '@/components/media/dropzone'
-import { trpc } from '@/app/_trpc/client'
-import Form from '@/components/form/form'
-import ErrorComponent from '@/components/feedback/error-component'
-
-export default function NewPage({
-    section,
-    sectionType,
-    hiddenInputs,
-    action,
-}: {
-    section: string
-    sectionType: SectionType
-    hiddenInputs?: {
-        name: string
-        value: any
-    }[]
-    action?: any
-}) {
-    const t = useI18n()
-    const [progress, setProgress] = useState(0)
-    const [progressVariant, setProgressVariant] = useState<'determinate' | 'query'>('determinate')
-    const [isSubmitting, setIsSubmitting] = useState(false)
-    const [response, setResponse] = useState<any>(null)
-    const { setModal } = useModal()
-    const axiosPrivate = useAxiosPrivate()
-    const controller = new AbortController()
-    const { toast } = useToast()
-    const router = useRouter()
-    const dropzoneRef: RefObject<DropzoneHandles | null> = useRef(null)
-    const utils = trpc.useUtils()
-
-    const [data, { error, isError }] = trpc.hasItemsSections.newItem.useSuspenseQuery({
-        sectionName: section,
-    })
-
-    const handleSubmit = async (formData: FormData) => {
-        setIsSubmitting(true)
-        if (isSubmitting) return
-        setResponse(null)
-        formData.append('sectionName', section)
-        formData.append('formType', 'new')
-        formData.append('sectionType', sectionType)
-
-        // Retrieve the files from the Dropzone's state
-        if (dropzoneRef.current) {
-            const files: File[] = dropzoneRef.current.getFiles()
-            // Add files to the body
-            files.forEach((file, index) => {
-                formData.append(`dropzoneFiles`, file)
-            })
-        }
-
-        // Check if there are any hidden inputs passed to the component
-        if (hiddenInputs) {
-            // Add hidden inputs to the body
-            hiddenInputs.forEach((input) => {
-                if (!input.value) return
-                formData.append(input.name, input.value)
-            })
-        }
-
-        // const body = Object.fromEntries(formData.entries())
-        try {
-            const res = await axiosPrivate.post(`/submit/section/item`, formData, {
-                signal: controller.signal,
-                onUploadProgress: (progressEvent) => {
-                    if (!progressEvent.total) return
-                    const progress = Math.round((progressEvent.loaded / progressEvent.total) * 100)
-                    // Update progress bar value here
-                    setProgress(progress)
-
-                    if (progress === 100) {
-                        setProgressVariant('query')
-                    }
-                },
-                headers: {
-                    'Content-Type': 'multipart/form-data',
-                },
-            })
-
-            if (res) {
-                setIsSubmitting(false)
-                setProgress(0)
-                setProgressVariant('determinate')
-                if (res.status === 200) {
-                    toast({
-                        variant: res.data?.errors?.length ? 'warning' : 'success',
-                        title: t('itemCreatedSuccessfully'),
-                        description: res.data?.errors?.length ? t('errorsInSubmit') : t('itemCreatedSuccessfully'),
-                    })
-
-                    switch (sectionType) {
-                        case 'categorized':
-                            // Just close the modal and refetch the page
-                            setModal(null)
-
-                            if (action) {
-                                await action().then(() => {
-                                    setModal(null)
-                                    router.refresh()
-                                })
-                            }
-
-                            break
-
-                        case 'has_items':
-                            // Just display a success toast and refetch the page
-                            setResponse(null)
-                            // Redirect to the edit page
-                            // router.push(`/edit/${section}/${res.data.identifier}`)
-                            // Or redirect to the browse page
-                            await utils.hasItemsSections.listItems.invalidate({
-                                sectionName: section,
-                            })
-                            router.push(`/browse/${section}`)
-                            break
-                    }
-                }
-            }
-        } catch (error: AxiosError | any) {
-            setIsSubmitting(false)
-            setProgress(0)
-            setProgressVariant('determinate')
-            if (error?.response?.data) {
-                setResponse(<InfoCard result={{ key: 'danger', title: error.response.data.error, status: false }} />)
-            }
-        }
-    }
-
-    function cancelSubmit() {
-        controller.abort()
-        setIsSubmitting(false)
-        setProgress(0)
-        setProgressVariant('determinate')
-    }
-
-    useEffect(() => {
-        return () => {
-            cancelSubmit()
-        }
-    }, [])
-
-    if (data.error) {
-        return <ErrorComponent message={data.error.message} />
-    }
-
-    return (
-        <div className='flex w-full flex-col overflow-hidden'>
-            <div className='flex w-full flex-col'>
-                <div className='text-foreground relative z-1 border-b-2 p-8 pt-12 font-extrabold'>
-                    <div className='absolute top-0 left-0 z-2 h-4 w-full bg-linear-to-r from-emerald-800 via-emerald-400 to-sky-600'></div>
-                    <h1 className='pb-4 text-4xl'>{data.section?.title.section}</h1>
-                    <span>
-                        /{t('new')} {data.section?.title.singular}
-                    </span>
-                </div>
-                <Form
-                    formType='new'
-                    progressVariant={progressVariant}
-                    response={response}
-                    progress={progress}
-                    data={data}
-                    dropzoneRef={dropzoneRef}
-                    handleSubmit={handleSubmit}
-                    isSubmitting={isSubmitting}
-                    contentLocale={data.defaultLocale ?? undefined}
-                />
-            </div>
-        </div>
-    )
-}
+'use client'
+
+import { useAxiosPrivate } from 'nextjs-cms/api/client'
+import { RefObject, useEffect, useRef, useState } from 'react'
+import { SectionType } from 'nextjs-cms/core/types'
+import { useI18n } from 'nextjs-cms/translations/client'
+import { useModal } from '@/components/feedback/modal-context'
+import { AxiosError } from 'axios'
+import InfoCard from '@/components/feedback/info-card'
+import { useToast } from '@/components/ui/use-toast'
+import { useRouter } from 'next/navigation'
+import { DropzoneHandles } from '@/components/media/dropzone'
+import { trpc } from '@/app/_trpc/client'
+import Form from '@/components/form/form'
+import ErrorComponent from '@/components/feedback/error-component'
+
+export default function NewPage({
+    section,
+    sectionType,
+    hiddenInputs,
+    action,
+}: {
+    section: string
+    sectionType: SectionType
+    hiddenInputs?: {
+        name: string
+        value: any
+    }[]
+    action?: any
+}) {
+    const t = useI18n()
+    const [progress, setProgress] = useState(0)
+    const [progressVariant, setProgressVariant] = useState<'determinate' | 'query'>('determinate')
+    const [isSubmitting, setIsSubmitting] = useState(false)
+    const [response, setResponse] = useState<any>(null)
+    const { setModal } = useModal()
+    const axiosPrivate = useAxiosPrivate()
+    const controller = new AbortController()
+    const { toast } = useToast()
+    const router = useRouter()
+    const dropzoneRef: RefObject<DropzoneHandles | null> = useRef(null)
+    const utils = trpc.useUtils()
+
+    const [data, { error, isError }] = trpc.hasItemsSections.newItem.useSuspenseQuery({
+        sectionName: section,
+    })
+
+    const handleSubmit = async (formData: FormData) => {
+        setIsSubmitting(true)
+        if (isSubmitting) return
+        setResponse(null)
+        formData.append('sectionName', section)
+        formData.append('formType', 'new')
+        formData.append('sectionType', sectionType)
+
+        // Retrieve the files from the Dropzone's state
+        if (dropzoneRef.current) {
+            const files: File[] = dropzoneRef.current.getFiles()
+            // Add files to the body
+            files.forEach((file, index) => {
+                formData.append(`dropzoneFiles`, file)
+            })
+        }
+
+        // Check if there are any hidden inputs passed to the component
+        if (hiddenInputs) {
+            // Add hidden inputs to the body
+            hiddenInputs.forEach((input) => {
+                if (!input.value) return
+                formData.append(input.name, input.value)
+            })
+        }
+
+        // const body = Object.fromEntries(formData.entries())
+        try {
+            const res = await axiosPrivate.post(`/submit/section/item`, formData, {
+                signal: controller.signal,
+                onUploadProgress: (progressEvent) => {
+                    if (!progressEvent.total) return
+                    const progress = Math.round((progressEvent.loaded / progressEvent.total) * 100)
+                    // Update progress bar value here
+                    setProgress(progress)
+
+                    if (progress === 100) {
+                        setProgressVariant('query')
+                    }
+                },
+                headers: {
+                    'Content-Type': 'multipart/form-data',
+                },
+            })
+
+            if (res) {
+                setIsSubmitting(false)
+                setProgress(0)
+                setProgressVariant('determinate')
+                if (res.status === 200) {
+                    toast({
+                        variant: res.data?.errors?.length ? 'warning' : 'success',
+                        title: t('itemCreatedSuccessfully'),
+                        description: res.data?.errors?.length ? t('errorsInSubmit') : t('itemCreatedSuccessfully'),
+                    })
+
+                    switch (sectionType) {
+                        case 'categorized':
+                            // Just close the modal and refetch the page
+                            setModal(null)
+
+                            if (action) {
+                                await action().then(() => {
+                                    setModal(null)
+                                    router.refresh()
+                                })
+                            }
+
+                            break
+
+                        case 'has_items':
+                            // Just display a success toast and refetch the page
+                            setResponse(null)
+                            // Redirect to the edit page
+                            // router.push(`/edit/${section}/${res.data.identifier}`)
+                            // Or redirect to the browse page
+                            await utils.hasItemsSections.listItems.invalidate({
+                                sectionName: section,
+                            })
+                            router.push(`/browse/${section}`)
+                            break
+                    }
+                }
+            }
+        } catch (error: AxiosError | any) {
+            setIsSubmitting(false)
+            setProgress(0)
+            setProgressVariant('determinate')
+            if (error?.response?.data) {
+                setResponse(<InfoCard result={{ key: 'danger', title: error.response.data.error, status: false }} />)
+            }
+        }
+    }
+
+    function cancelSubmit() {
+        controller.abort()
+        setIsSubmitting(false)
+        setProgress(0)
+        setProgressVariant('determinate')
+    }
+
+    useEffect(() => {
+        return () => {
+            cancelSubmit()
+        }
+    }, [])
+
+    if (data.error) {
+        return <ErrorComponent message={data.error.message} />
+    }
+
+    return (
+        <div className='flex w-full flex-col overflow-hidden'>
+            <div className='flex w-full flex-col'>
+                <div className='text-foreground relative z-1 border-b-2 p-8 pt-12 font-extrabold'>
+                    <div className='absolute top-0 left-0 z-2 h-4 w-full bg-linear-to-r from-emerald-800 via-emerald-400 to-sky-600'></div>
+                    <h1 className='pb-4 text-4xl'>{data.section?.title.section}</h1>
+                    <span>
+                        /{t('new')} {data.section?.title.singular}
+                    </span>
+                </div>
+                <Form
+                    formType='new'
+                    progressVariant={progressVariant}
+                    response={response}
+                    progress={progress}
+                    data={data}
+                    dropzoneRef={dropzoneRef}
+                    handleSubmit={handleSubmit}
+                    isSubmitting={isSubmitting}
+                    contentLocale={data.defaultLocale ?? undefined}
+                />
+            </div>
+        </div>
+    )
+}