フォームのバリデーションとニコ連携の画面変更 (#090) (#355)

Reviewed-on: #355
Co-authored-by: miteruzo <miteruzo@naver.com>
Co-committed-by: miteruzo <miteruzo@naver.com>

frontend/src/pages/materials/MaterialNewPage.tsx

@@ -2,8 +2,9 @@ import { useState } from 'react'
 import { Helmet } from 'react-helmet-async'
 import { useLocation, useNavigate } from 'react-router-dom'
 
+import FieldError from '@/components/common/FieldError'
 import Form from '@/components/common/Form'
-import Label from '@/components/common/Label'
+import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import TagInput from '@/components/common/TagInput'
 import MainArea from '@/components/layout/MainArea'
@@ -11,9 +12,13 @@ import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
 import { apiPost } from '@/lib/api'
+import { inputClass } from '@/lib/utils'
+import { useValidationErrors } from '@/lib/useValidationErrors'
 
 import type { FC } from 'react'
 
+type MaterialFormField = 'tag' | 'file' | 'url'
+
 
 const MaterialNewPage: FC = () => {
   const location = useLocation ()
@@ -27,8 +32,12 @@ const MaterialNewPage: FC = () => {
   const [sending, setSending] = useState (false)
   const [tag, setTag] = useState (tagQuery)
   const [url, setURL] = useState ('')
+  const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
+      useValidationErrors<MaterialFormField> ()
 
   const handleSubmit = async () => {
+    clearValidationErrors ()
+
     const formData = new FormData
     if (tag)
       formData.append ('tag', tag)
@@ -44,8 +53,9 @@ const MaterialNewPage: FC = () => {
       toast ({ title: '送信成功!' })
       navigate (`/materials?tag=${ encodeURIComponent (tag) }`)
     }
-    catch
+    catch (e)
     {
+      applyValidationError (e)
       toast ({ title: '送信失敗……', description: '入力を見直してください．' })
     }
     finally
@@ -62,55 +72,66 @@ const MaterialNewPage: FC = () => {
 
 	<Form>
 	  <PageTitle>素材追加</PageTitle>
+	  <FieldError messages={baseErrors}/>
 
 	  {/* タグ */}
-	  <div>
-	    <Label>タグ</Label>
-	    <TagInput value={tag} setValue={setTag}/>
-	  </div>
+	  <FormField label="タグ" messages={fieldErrors.tag}>
+	    {({ describedBy, invalid }) => (
+		<TagInput
+		    describedBy={describedBy}
+		    invalid={invalid}
+		    value={tag}
+		    setValue={setTag}/>)}
+	  </FormField>
 
 	  {/* ファイル */}
-	  <div>
-	    <Label>ファイル</Label>
-	    <input
-		type="file"
-		accept="image/*,video/*,audio/*"
-		onChange={e => {
-		  const f = e.target.files?.[0]
-		  setFile (f ?? null)
-		  setFilePreview (f ? URL.createObjectURL (f) : '')
-		}}/>
-	    {(file && filePreview) && (
-		(/image\/.*/.test (file.type) && (
-		    <img
-			src={filePreview}
-			alt="preview"
-			className="mt-2 max-h-48 rounded border"/>))
-		|| (/video\/.*/.test (file.type) && (
-		    <video
-			src={filePreview}
-			controls
-			className="mt-2 max-h-48 rounded border"/>))
-		|| (/audio\/.*/.test (file.type) && (
-		    <audio
-			src={filePreview}
-			controls
-			className="mt-2 max-h-48"/>))
-		|| (
-		    <p className="text-red-600 dark:text-red-400">
-		      その形式のファイルには対応していません．
-		    </p>))}
-	  </div>
+	  <FormField label="ファイル" messages={fieldErrors.file}>
+	    {({ describedBy, invalid }) => (
+		<>
+		  <input
+		      type="file"
+		      accept="image/*,video/*,audio/*"
+		      aria-describedby={describedBy}
+		      aria-invalid={invalid}
+		      onChange={e => {
+			const f = e.target.files?.[0]
+			setFile (f ?? null)
+			setFilePreview (f ? URL.createObjectURL (f) : '')
+		      }}/>
+		  {(file && filePreview) && (
+		      (/image\/.*/.test (file.type) && (
+			  <img
+			      src={filePreview}
+			      alt="preview"
+			      className="mt-2 max-h-48 rounded border"/>))
+		      || (/video\/.*/.test (file.type) && (
+			  <video
+			      src={filePreview}
+			      controls
+			      className="mt-2 max-h-48 rounded border"/>))
+		      || (/audio\/.*/.test (file.type) && (
+			  <audio
+			      src={filePreview}
+			      controls
+			      className="mt-2 max-h-48"/>))
+		      || (
+			  <p className="text-red-600 dark:text-red-400">
+			    その形式のファイルには対応していません．
+			  </p>))}
+		</>)}
+	  </FormField>
 
 	  {/* 参考 URL */}
-	  <div>
-	    <Label>参考 URL</Label>
-	    <input
-		type="url"
-		value={url}
-		onChange={e => setURL (e.target.value)}
-		className="w-full border p-2 rounded"/>
-	  </div>
+	  <FormField label="参考 URL" messages={fieldErrors.url}>
+	    {({ describedBy, invalid }) => (
+		<input
+		    type="url"
+		    value={url}
+		    onChange={e => setURL (e.target.value)}
+		    aria-describedby={describedBy}
+		    aria-invalid={invalid}
+		    className={inputClass (invalid)}/>)}
+	  </FormField>
 
 	  {/* 送信 */}
 	  <Button
@@ -123,4 +144,4 @@ const MaterialNewPage: FC = () => {
       </MainArea>)
 }
 
-export default MaterialNewPage
+export default MaterialNewPage