コミットを比較

..
1 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker 76ca985096 AI: address issue #320 2026-11-13 07:40:54 +09:00
3個のファイルの変更、20行の追加、71行の削除
+4 -57
ファイルの表示
@@ -15,7 +15,7 @@ import { msToTime } from '@/lib/utils'
import { useValidationErrors } from '@/lib/useValidationErrors'
import { useUITranslation } from '@/lib/useUITranslation'
import type { FC, FormEvent, ReactNode } from 'react'
import type { FC, FormEvent } from 'react'
import type { Post, TagWithSections } from '@/types'
@@ -23,8 +23,6 @@ type PostFormField =
'parentPostIds' | 'tags' | 'videoMs'
| 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
type PostEditData = Omit<Parameters<typeof updatePost>[0], 'id'>
const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
[...new Set (values.flatMap (value => value ?? []))]
@@ -152,63 +150,12 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
const handleSubmit = async (e: FormEvent) => {
e.preventDefault ()
if (disabled) return
setDisabled (true)
try
{
const current: PostEditData = {
title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore }
const fields: {
[Key in keyof PostEditData]-?: {
name: ReactNode
prev: PostEditData[Key] } } = {
title: { name: label ('shared:labels.title'), prev: post.title },
parentPostIds: {
name: label ('shared:labels.parentPosts'),
prev: (post.parentPosts ?? []).map (parent => parent.id).join (' ') },
tags: { name: label ('tags:title'), prev: tagsToStr (post.tags) },
duration: {
name: label ('shared:labels.duration'),
prev: videoMsToDurationValue (post.videoMs) },
originalCreatedFrom: {
name: <>{label ('shared:labels.originalCreatedAt')}{' '}
{label ('shared:labels.since')}</>,
prev: post.originalCreatedFrom },
originalCreatedBefore: {
name: <>{label ('shared:labels.originalCreatedAt')}{' '}
{label ('shared:labels.before')}</>,
prev: post.originalCreatedBefore } }
const differences = (Object.keys (fields) as (keyof PostEditData)[])
.map (key => ({ key, name: fields[key].name,
prev: fields[key].prev ?? '', current: current[key] ?? '' }))
.filter (row => row.prev !== row.current)
if (!(await dialogue.confirm ({
title: label ('shared:actions.diff'),
confirmText: label ('shared:actions.update'),
description: (
<dl className="max-h-[60dvh] overflow-y-auto space-y-3 text-left">
{differences.map (row => (
<div key={row.key}>
<dt className="font-semibold">{row.name}</dt>
<dd className="whitespace-pre-wrap break-words">
{row.prev && (
<del className="block text-red-600 dark:text-red-400">
{row.prev}
</del>)}
{row.current && (
<ins className="block text-green-700 dark:text-green-400">
{row.current}
</ins>)}
</dd>
</div>))}
</dl>) })))
return
await update ({ id: post.id, ...current },
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo: post.versionNo })
}
finally
+8 -2
ファイルの表示
@@ -36,10 +36,13 @@ const replaceToken = (value: string, start: number, end: number, text: string) =
type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
tags: string
setTags: (tags: string) => void
label?: ReactNode
errors?: ReactNode[] }
const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
const PostFormTagsArea: FC<Props> = (
{ tags, setTags, label: fieldLabel, errors, ...rest },
) => {
const { label } = useUITranslation ('navigation')
const locale = useLocale ()
const ref = useRef<HTMLTextAreaElement> (null)
@@ -117,7 +120,10 @@ const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
}, [locale])
return (
<FormField className="relative w-full" label={label ('tags')} messages={errors}>
<FormField
className="relative w-full"
label={fieldLabel ?? label ('tags')}
messages={errors}>
{({ describedBy, invalid }) => (
<>
<TextArea
+8 -12
ファイルの表示
@@ -6,11 +6,10 @@ import { useLocation } from 'react-router-dom'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import SortHeader from '@/components/SortHeader'
import FieldError from '@/components/common/FieldError'
import PostFormTagsArea from '@/components/PostFormTagsArea'
import FormField from '@/components/common/FormField'
import PageTitle from '@/components/common/PageTitle'
import Pagination from '@/components/common/Pagination'
import TextArea from '@/components/common/TextArea'
import useDialogue from '@/lib/dialogues/useDialogue'
import MainArea from '@/components/layout/MainArea'
import { toast } from '@/components/ui/use-toast'
@@ -357,21 +356,18 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
dark:bg-rose-950/30">
<td colSpan={editable ? 5 : 4} className="p-3">
<div className="space-y-2">
<label htmlFor={`nico-links-${ tag.id }`}
className="block text-sm font-semibold">
{label ('nico.tagsToLink')}
</label>
<TextArea
<PostFormTagsArea
id={`nico-links-${ tag.id }`}
value={rawTags[tag.id] ?? ''}
invalid={(errorsByTagId[tag.id] ?? []).length > 0}
label={label ('nico.tagsToLink')}
aria-label={message ('nico.tagsToLink').text}
tags={rawTags[tag.id] ?? ''}
errors={errors}
className="min-h-24 resize-y"
placeholder={message ('nico.tagsPlaceholder').text}
lang={message ('nico.tagsPlaceholder').language}
onChange={e => setRawTags (rawTags => ({
setTags={value => setRawTags (rawTags => ({
...rawTags,
[tag.id]: e.target.value}))}/>
<FieldError messages={errors}/>
[tag.id]: value}))}/>
<div className="flex justify-end gap-2">
<button
type="button"