コミットを比較
5
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
3bb95880d4 | ||
|
|
61135de727 | ||
|
|
39efe8caae | ||
|
|
e13a52db9a | ||
|
|
23ee19eee7 |
@@ -153,6 +153,21 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
setDisabled (true)
|
setDisabled (true)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
const titleMissing = !title?.trim ()
|
||||||
|
const thumbnailMissing =
|
||||||
|
!titleMissing
|
||||||
|
&& !(post.thumbnail?.trim () || post.thumbnailBase?.trim ())
|
||||||
|
|
||||||
|
if ((titleMissing || thumbnailMissing)
|
||||||
|
&& !(await dialogue.confirm ({
|
||||||
|
title: titleMissing
|
||||||
|
? label ('edit.titleMissingConfirmation')
|
||||||
|
: label ('edit.thumbnailMissingConfirmation'),
|
||||||
|
confirmText: label ('shared:actions.update'),
|
||||||
|
cancelText: label ('shared:actions.cancel'),
|
||||||
|
closeLabel: label ('settings:actions.close') })))
|
||||||
|
return
|
||||||
|
|
||||||
await update ({ id: post.id, title, tags, parentPostIds,
|
await update ({ id: post.id, title, tags, parentPostIds,
|
||||||
duration: videoFlg ? duration : null,
|
duration: videoFlg ? duration : null,
|
||||||
originalCreatedFrom, originalCreatedBefore },
|
originalCreatedFrom, originalCreatedBefore },
|
||||||
|
|||||||
@@ -36,13 +36,10 @@ const replaceToken = (value: string, start: number, end: number, text: string) =
|
|||||||
type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
|
type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
|
||||||
tags: string
|
tags: string
|
||||||
setTags: (tags: string) => void
|
setTags: (tags: string) => void
|
||||||
label?: ReactNode
|
|
||||||
errors?: ReactNode[] }
|
errors?: ReactNode[] }
|
||||||
|
|
||||||
|
|
||||||
const PostFormTagsArea: FC<Props> = (
|
const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
|
||||||
{ tags, setTags, label: fieldLabel, errors, ...rest },
|
|
||||||
) => {
|
|
||||||
const { label } = useUITranslation ('navigation')
|
const { label } = useUITranslation ('navigation')
|
||||||
const locale = useLocale ()
|
const locale = useLocale ()
|
||||||
const ref = useRef<HTMLTextAreaElement> (null)
|
const ref = useRef<HTMLTextAreaElement> (null)
|
||||||
@@ -120,10 +117,7 @@ const PostFormTagsArea: FC<Props> = (
|
|||||||
}, [locale])
|
}, [locale])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FormField
|
<FormField className="relative w-full" label={label ('tags')} messages={errors}>
|
||||||
className="relative w-full"
|
|
||||||
label={fieldLabel ?? label ('tags')}
|
|
||||||
messages={errors}>
|
|
||||||
{({ describedBy, invalid }) => (
|
{({ describedBy, invalid }) => (
|
||||||
<>
|
<>
|
||||||
<TextArea
|
<TextArea
|
||||||
|
|||||||
@@ -70,6 +70,16 @@ describe ('SidebarComponent', () => {
|
|||||||
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
|
||||||
|
renderSidebar ()
|
||||||
|
|
||||||
|
// jsdom has no layout; guard the responsive classes responsible for clipping.
|
||||||
|
const sidebar = screen.getByText ('Sidebar body')
|
||||||
|
|
||||||
|
expect (sidebar).not.toHaveClass ('overflow-y-auto')
|
||||||
|
expect (sidebar).toHaveClass ('md:overflow-y-auto')
|
||||||
|
})
|
||||||
|
|
||||||
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
||||||
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
||||||
const onWidthChange = vi.fn ()
|
const onWidthChange = vi.fn ()
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
</style>
|
</style>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"_untranslated": ["edit.titleMissingConfirmation", "edit.thumbnailMissingConfirmation"],
|
||||||
"list": {
|
"list": {
|
||||||
"tagline": "{{brand}}",
|
"tagline": "{{brand}}",
|
||||||
"empty": "ミンタㇻ タ ネン カ イサㇺ",
|
"empty": "ミンタㇻ タ ネン カ イサㇺ",
|
||||||
@@ -31,6 +32,8 @@
|
|||||||
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
|
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
|
||||||
},
|
},
|
||||||
"edit": {
|
"edit": {
|
||||||
|
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
|
||||||
|
"thumbnailMissingConfirmation": "サムネールが設定されてゐません.更新しますか?",
|
||||||
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
|
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
|
||||||
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
|
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
|
||||||
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
|
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
|
||||||
|
|||||||
@@ -22,6 +22,8 @@
|
|||||||
"question": "表示しますか?", "showExternal": "外部ページを表示"
|
"question": "表示しますか?", "showExternal": "外部ページを表示"
|
||||||
},
|
},
|
||||||
"edit": {
|
"edit": {
|
||||||
|
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
|
||||||
|
"thumbnailMissingConfirmation": "サムネールが設定されてゐません.更新しますか?",
|
||||||
"validationFailed": "更新はできなかったよ……",
|
"validationFailed": "更新はできなかったよ……",
|
||||||
"conflictTitle": "競合が発生しました.",
|
"conflictTitle": "競合が発生しました.",
|
||||||
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
|
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
|
||||||
|
|||||||
@@ -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
|
api.apiGet
|
||||||
.mockResolvedValueOnce ({
|
.mockResolvedValueOnce ({
|
||||||
tags: [buildNicoTag ({ id: 7, name: 'nico:source' })],
|
tags: [buildNicoTag ({ id: 7, name: 'nico:source' })],
|
||||||
count: 1,
|
count: 1,
|
||||||
})
|
})
|
||||||
.mockResolvedValueOnce ([buildTag ({ id: 8, name: '連携先', postCount: 3 })])
|
|
||||||
.mockResolvedValueOnce ({
|
.mockResolvedValueOnce ({
|
||||||
tags: [
|
tags: [
|
||||||
buildNicoTag ({
|
buildNicoTag ({
|
||||||
@@ -184,24 +183,8 @@ describe ('NicoTagListPage', () => {
|
|||||||
renderPage ()
|
renderPage ()
|
||||||
|
|
||||||
fireEvent.click (await screen.findByRole ('button', { name: '編集' }))
|
fireEvent.click (await screen.findByRole ('button', { name: '編集' }))
|
||||||
const textarea = screen.getByLabelText ('連携する広場タグ')
|
fireEvent.change (screen.getByLabelText ('連携する広場タグ'), {
|
||||||
fireEvent.change (textarea, { target: { value: '既存 連携\n後続' } })
|
target: { value: '連携先' },
|
||||||
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.click (screen.getByRole ('button', { name: '保存' }))
|
fireEvent.click (screen.getByRole ('button', { name: '保存' }))
|
||||||
|
|
||||||
@@ -212,8 +195,6 @@ describe ('NicoTagListPage', () => {
|
|||||||
{ locale: 'ja', headers: { 'Content-Type': 'multipart/form-data' } },
|
{ 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 ()
|
expect (await screen.findByText ('1 件')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -6,10 +6,11 @@ import { useLocation } from 'react-router-dom'
|
|||||||
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
||||||
import TagLink from '@/components/TagLink'
|
import TagLink from '@/components/TagLink'
|
||||||
import SortHeader from '@/components/SortHeader'
|
import SortHeader from '@/components/SortHeader'
|
||||||
import PostFormTagsArea from '@/components/PostFormTagsArea'
|
import FieldError from '@/components/common/FieldError'
|
||||||
import FormField from '@/components/common/FormField'
|
import FormField from '@/components/common/FormField'
|
||||||
import PageTitle from '@/components/common/PageTitle'
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
import Pagination from '@/components/common/Pagination'
|
import Pagination from '@/components/common/Pagination'
|
||||||
|
import TextArea from '@/components/common/TextArea'
|
||||||
import useDialogue from '@/lib/dialogues/useDialogue'
|
import useDialogue from '@/lib/dialogues/useDialogue'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
@@ -356,18 +357,21 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
|||||||
dark:bg-rose-950/30">
|
dark:bg-rose-950/30">
|
||||||
<td colSpan={editable ? 5 : 4} className="p-3">
|
<td colSpan={editable ? 5 : 4} className="p-3">
|
||||||
<div className="space-y-2">
|
<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 }`}
|
id={`nico-links-${ tag.id }`}
|
||||||
label={label ('nico.tagsToLink')}
|
value={rawTags[tag.id] ?? ''}
|
||||||
aria-label={message ('nico.tagsToLink').text}
|
invalid={(errorsByTagId[tag.id] ?? []).length > 0}
|
||||||
tags={rawTags[tag.id] ?? ''}
|
|
||||||
errors={errors}
|
|
||||||
className="min-h-24 resize-y"
|
className="min-h-24 resize-y"
|
||||||
placeholder={message ('nico.tagsPlaceholder').text}
|
placeholder={message ('nico.tagsPlaceholder').text}
|
||||||
lang={message ('nico.tagsPlaceholder').language}
|
lang={message ('nico.tagsPlaceholder').language}
|
||||||
setTags={value => setRawTags (rawTags => ({
|
onChange={e => setRawTags (rawTags => ({
|
||||||
...rawTags,
|
...rawTags,
|
||||||
[tag.id]: value}))}/>
|
[tag.id]: e.target.value}))}/>
|
||||||
|
<FieldError messages={errors}/>
|
||||||
<div className="flex justify-end gap-2">
|
<div className="flex justify-end gap-2">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ const renderPage = () =>
|
|||||||
describe ('TagDetailPage', () => {
|
describe ('TagDetailPage', () => {
|
||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
|
tagsApi.fetchTag.mockReset ()
|
||||||
|
api.apiPut.mockReset ()
|
||||||
|
api.isApiError.mockReset ()
|
||||||
|
toastApi.toast.mockReset ()
|
||||||
api.isApiError.mockReturnValue (false)
|
api.isApiError.mockReturnValue (false)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it ('submits edited tag fields', async () => {
|
it ('submits edited tag fields', async () => {
|
||||||
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
|
||||||
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
|
tagsApi.fetchTag
|
||||||
|
.mockResolvedValue (updatedTag)
|
||||||
|
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||||
|
api.apiPut.mockResolvedValueOnce (updatedTag)
|
||||||
|
|
||||||
renderPage ()
|
renderPage ()
|
||||||
|
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする