コミットを比較

..
1 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker c0f42ea0c0 AI: address issue #170 2026-11-13 12:50:57 +09:00
7個のファイルの変更、155行の追加、87行の削除
+74 -2
ファイルの表示
@@ -1,6 +1,8 @@
import { useQuery } from '@tanstack/react-query'
import { useEffect, useMemo, useState } from 'react'
import { useLocale } from '@/lib/useLocale'
import PostList from '@/components/PostList'
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
import FieldError from '@/components/common/FieldError'
import PostDurationField from '@/components/posts/PostDurationField'
@@ -10,14 +12,15 @@ import { Button } from '@/components/ui/button'
import { toast } from '@/components/ui/use-toast'
import { isApiError } from '@/lib/api'
import useDialogue from '@/lib/dialogues/useDialogue'
import { updatePost } from '@/lib/posts'
import { fetchPosts, updatePost } from '@/lib/posts'
import { postsKeys } from '@/lib/queryKeys'
import { msToTime } from '@/lib/utils'
import { useValidationErrors } from '@/lib/useValidationErrors'
import { useUITranslation } from '@/lib/useUITranslation'
import type { FC, FormEvent } from 'react'
import type { Post, TagWithSections } from '@/types'
import type { FetchPostsParams, Post, TagWithSections } from '@/types'
type PostFormField =
'parentPostIds' | 'tags' | 'videoMs'
@@ -68,6 +71,33 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
const [title, setTitle] = useState (post.title)
const [importVisible, setImportVisible] = useState (false)
const [sourceTitle, setSourceTitle] = useState ('')
const [sourcePage, setSourcePage] = useState (1)
const sourceParams: FetchPostsParams = {
title: sourceTitle, page: sourcePage, limit: 20,
url: '', tags: '', match: 'all', order: 'original_created_at:desc',
originalCreatedFrom: '', originalCreatedTo: '',
createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '' }
const { data: sources, isError: sourceError } = useQuery ({
queryKey: postsKeys.index (sourceParams, locale),
queryFn: () => fetchPosts (sourceParams, locale),
enabled: importVisible && !disabled })
const importTags = (source: Post) => {
if (disabled)
return
setTags (current => {
const existing = new Set (current.split (/\s+/))
const additions = tagsToStr (source.tags).split (/\s+/)
.filter (tag => tag !== '' && !existing.has (tag))
return additions.length > 0
? `${current}${current.trim () === '' ? '' : ' '}${additions.join (' ')}`
: current
})
setImportVisible (false)
}
const videoFlg =
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
[tags])
@@ -192,6 +222,48 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
setTags={setTags}
errors={fieldErrors.tags}/>
<Button
type="button"
variant="outline"
disabled={disabled}
aria-expanded={importVisible}
onClick={() => setImportVisible (visible => !visible)}>
{label ('edit.import')}
</Button>
{importVisible && (
<div className="space-y-2" onKeyDown={event => {
if (event.key === 'Enter' && event.target instanceof HTMLInputElement)
event.preventDefault ()
}}>
<PostTextField
label={label ('shared:labels.title')}
type="search"
value={sourceTitle}
disabled={disabled}
onChange={value => {
setSourceTitle (value)
setSourcePage (1)
}}/>
<FieldError messages={sourceError ? [label ('common:fetchError')] : []}/>
{!disabled && <PostList posts={sources?.posts ?? []} onSelect={importTags}/>}
<div className="flex flex-col gap-2 md:flex-row">
<Button
type="button"
variant="outline"
disabled={disabled || sourcePage <= 1}
onClick={() => setSourcePage (page => page - 1)}>
{label ('common:pagination.previous')}
</Button>
<Button
type="button"
variant="outline"
disabled={disabled || sourcePage * 20 >= (sources?.count ?? 0)}
onClick={() => setSourcePage (page => page + 1)}>
{label ('common:pagination.next')}
</Button>
</div>
</div>)}
{/* オリジナルの作成日時 */}
<PostOriginalCreatedTimeField
disabled={disabled}
+2 -8
ファイルの表示
@@ -36,13 +36,10 @@ 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, label: fieldLabel, errors, ...rest },
) => {
const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
const { label } = useUITranslation ('navigation')
const locale = useLocale ()
const ref = useRef<HTMLTextAreaElement> (null)
@@ -120,10 +117,7 @@ const PostFormTagsArea: FC<Props> = (
}, [locale])
return (
<FormField
className="relative w-full"
label={fieldLabel ?? label ('tags')}
messages={errors}>
<FormField className="relative w-full" label={label ('tags')} messages={errors}>
{({ describedBy, invalid }) => (
<>
<TextArea
+61 -47
ファイルの表示
@@ -3,6 +3,7 @@ import { useRef } from 'react'
import { useLocation } from 'react-router-dom'
import PrefetchLink from '@/components/PrefetchLink'
import { Button } from '@/components/ui/button'
import { useUITranslation } from '@/lib/useUITranslation'
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { cn } from '@/lib/utils'
@@ -13,10 +14,11 @@ import type { FC, MouseEvent } from 'react'
import type { Post } from '@/types'
type Props = { posts: Post[]
onSelect?: (post: Post) => void
onClick?: (event: MouseEvent<HTMLElement>) => void }
const PostList: FC<Props> = ({ posts, onClick }) => {
const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
const { label } = useUITranslation ('shared')
const location = useLocation ()
const behaviourSettings = useClientBehaviourSettings ()
@@ -39,7 +41,63 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
const sharedId = `page-${ post.id }`
const layoutId = sharedId
return (
const card = (
<motion.div
ref={cardRef}
layout={animationMode === 'off' ? false : true}
layoutId={(onSelect || animationMode === 'off') ? undefined : layoutId}
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
'transform-gpu will-change-transform',
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
whileHover={{ scale: 1.02 }}
onLayoutAnimationStart={() => {
if (!(cardRef.current))
return
cardRef.current.style.position = 'relative'
cardRef.current.style.zIndex = '9999'
}}
onLayoutAnimationComplete={() => {
if (!(cardRef.current))
return
cardRef.current.style.zIndex = ''
cardRef.current.style.position = ''
}}
transition={{ layout: cardLayoutTransition }}>
{thumbnailMode === 'off'
? (
<div className="flex h-full w-full items-center justify-center
bg-muted text-center text-xs text-muted-foreground">
{label ('labels.noThumbnail')}
</div>)
: (
<img
src={post.thumbnail || post.thumbnailBase || undefined}
alt={post.title || post.url}
title={post.title || post.url || undefined}
loading={
thumbnailMode === 'light'
? 'lazy'
: (i < 12 ? 'eager' : 'lazy')
}
decoding="async"
className="object-cover w-full h-full"/>)}
</motion.div>)
return onSelect
? (
<Button
key={post.id}
type="button"
variant="ghost"
className="w-40 h-40 p-0"
aria-label={post.title || post.url}
onClick={() => onSelect (post)}>
{card}
</Button>)
: (
<PrefetchLink
to={`/posts/${ post.id }`}
key={post.id}
@@ -49,51 +107,7 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
setForLocationKey (location.key, sharedId)
onClick?.(e)
}}>
<motion.div
ref={cardRef}
layout={animationMode === 'off' ? false : true}
layoutId={animationMode === 'off' ? undefined : layoutId}
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
'transform-gpu will-change-transform',
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
whileHover={{ scale: 1.02 }}
onLayoutAnimationStart={() => {
if (!(cardRef.current))
return
cardRef.current.style.position = 'relative'
cardRef.current.style.zIndex = '9999'
}}
onLayoutAnimationComplete={() => {
if (!(cardRef.current))
return
cardRef.current.style.zIndex = ''
cardRef.current.style.position = ''
}}
transition={{ layout: cardLayoutTransition }}>
{thumbnailMode === 'off'
? (
<div className="flex h-full w-full items-center justify-center
bg-muted text-center text-xs text-muted-foreground">
{label ('labels.noThumbnail')}
</div>)
: (
<img
src={post.thumbnail || post.thumbnailBase || undefined}
alt={post.title || post.url}
title={post.title || post.url || undefined}
loading={
thumbnailMode === 'light'
? 'lazy'
: i < 12
? 'eager'
: 'lazy'
}
decoding="async"
className="object-cover w-full h-full"/>)}
</motion.div>
{card}
</PrefetchLink>)
})}
</div>)
+2
ファイルの表示
@@ -1,4 +1,5 @@
{
"_untranslated": ["edit.import"],
"list": {
"tagline": "{{brand}}",
"empty": "ミンタㇻ タ ネン カ イサㇺ",
@@ -31,6 +32,7 @@
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
},
"edit": {
"import": "インポート",
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
+1
ファイルの表示
@@ -22,6 +22,7 @@
"question": "表示しますか?", "showExternal": "外部ページを表示"
},
"edit": {
"import": "インポート",
"validationFailed": "更新はできなかったよ……",
"conflictTitle": "競合が発生しました.",
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
+3 -22
ファイルの表示
@@ -162,13 +162,12 @@ describe ('NicoTagListPage', () => {
})
})
it ('saves links after completing the tag at the cursor', async () => {
it ('updates links from a tag card', async () => {
api.apiGet
.mockResolvedValueOnce ({
tags: [buildNicoTag ({ id: 7, name: 'nico:source' })],
count: 1,
})
.mockResolvedValueOnce ([buildTag ({ id: 8, name: '連携先', postCount: 3 })])
.mockResolvedValueOnce ({
tags: [
buildNicoTag ({
@@ -184,24 +183,8 @@ describe ('NicoTagListPage', () => {
renderPage ()
fireEvent.click (await screen.findByRole ('button', { name: '編集' }))
const textarea = screen.getByLabelText ('連携する広場タグ')
fireEvent.change (textarea, { target: { value: '既存 連携\n後続' } })
fireEvent.focus (textarea)
fireEvent.select (textarea, {
target: { selectionStart: 4, selectionEnd: 4 } })
await waitFor (() => {
expect (api.apiGet).toHaveBeenCalledWith (
'/tags/autocomplete',
{ locale: 'ja', params: { q: '連携', nico: '0' },
signal: expect.any (AbortSignal) })
})
fireEvent.mouseDown (await screen.findByText ('連携先'))
expect (textarea).toHaveValue ('既存 連携先 \n後続')
await waitFor (() => {
expect ((textarea as HTMLTextAreaElement).selectionStart).toBe (7)
expect ((textarea as HTMLTextAreaElement).selectionEnd).toBe (7)
fireEvent.change (screen.getByLabelText ('連携する広場タグ'), {
target: { value: '連携先' },
})
fireEvent.click (screen.getByRole ('button', { name: '保存' }))
@@ -212,8 +195,6 @@ describe ('NicoTagListPage', () => {
{ locale: 'ja', headers: { 'Content-Type': 'multipart/form-data' } },
)
})
const payload = api.apiPut.mock.calls[0][1] as FormData
expect (payload.get ('tags')).toBe ('既存 連携先 \n後続')
expect (await screen.findByText ('1 件')).toBeInTheDocument ()
})
+12 -8
ファイルの表示
@@ -6,10 +6,11 @@ import { useLocation } from 'react-router-dom'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import SortHeader from '@/components/SortHeader'
import PostFormTagsArea from '@/components/PostFormTagsArea'
import FieldError from '@/components/common/FieldError'
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'
@@ -356,18 +357,21 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
dark:bg-rose-950/30">
<td colSpan={editable ? 5 : 4} className="p-3">
<div className="space-y-2">
<PostFormTagsArea
<label htmlFor={`nico-links-${ tag.id }`}
className="block text-sm font-semibold">
{label ('nico.tagsToLink')}
</label>
<TextArea
id={`nico-links-${ tag.id }`}
label={label ('nico.tagsToLink')}
aria-label={message ('nico.tagsToLink').text}
tags={rawTags[tag.id] ?? ''}
errors={errors}
value={rawTags[tag.id] ?? ''}
invalid={(errorsByTagId[tag.id] ?? []).length > 0}
className="min-h-24 resize-y"
placeholder={message ('nico.tagsPlaceholder').text}
lang={message ('nico.tagsPlaceholder').language}
setTags={value => setRawTags (rawTags => ({
onChange={e => setRawTags (rawTags => ({
...rawTags,
[tag.id]: value}))}/>
[tag.id]: e.target.value}))}/>
<FieldError messages={errors}/>
<div className="flex justify-end gap-2">
<button
type="button"