AI: address review on PR #465
このコミットが含まれているのは:
@@ -15,7 +15,7 @@ import { msToTime } from '@/lib/utils'
|
||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
|
||||
import type { FC, FormEvent } from 'react'
|
||||
import type { FC, FormEvent, ReactNode } from 'react'
|
||||
|
||||
import type { Post, TagWithSections } from '@/types'
|
||||
|
||||
@@ -23,6 +23,8 @@ 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 ?? []))]
|
||||
|
||||
@@ -155,23 +157,33 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
setDisabled (true)
|
||||
try
|
||||
{
|
||||
const differences = [
|
||||
{ name: label ('shared:labels.title'),
|
||||
prev: post.title ?? '', current: title ?? '' },
|
||||
{ name: label ('shared:labels.parentPosts'),
|
||||
prev: (post.parentPosts ?? []).map (parent => parent.id).join (' '),
|
||||
current: parentPostIds },
|
||||
{ name: label ('tags:title'),
|
||||
prev: tagsToStr (post.tags), current: tags },
|
||||
{ name: label ('shared:labels.duration'),
|
||||
prev: videoMsToDurationValue (post.videoMs),
|
||||
current: videoFlg ? duration : '' },
|
||||
{ name: <>{label ('shared:labels.originalCreatedAt')}{' '}
|
||||
{label ('shared:labels.since')}</>,
|
||||
prev: post.originalCreatedFrom ?? '', current: originalCreatedFrom ?? '' },
|
||||
{ name: <>{label ('shared:labels.originalCreatedAt')}{' '}
|
||||
{label ('shared:labels.before')}</>,
|
||||
prev: post.originalCreatedBefore ?? '', current: originalCreatedBefore ?? '' }]
|
||||
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 ({
|
||||
@@ -179,8 +191,8 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
confirmText: label ('shared:actions.update'),
|
||||
description: (
|
||||
<dl className="max-h-[60dvh] overflow-y-auto space-y-3 text-left">
|
||||
{differences.map ((row, index) => (
|
||||
<div key={index}>
|
||||
{differences.map (row => (
|
||||
<div key={row.key}>
|
||||
<dt className="font-semibold">{row.name}</dt>
|
||||
<dd className="whitespace-pre-wrap break-words">
|
||||
{row.prev && (
|
||||
@@ -196,9 +208,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
</dl>) })))
|
||||
return
|
||||
|
||||
await update ({ id: post.id, title, tags, parentPostIds,
|
||||
duration: videoFlg ? duration : null,
|
||||
originalCreatedFrom, originalCreatedBefore },
|
||||
await update ({ id: post.id, ...current },
|
||||
{ baseVersionNo: post.versionNo })
|
||||
}
|
||||
finally
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする