miteruzo/btrc-hub
1
0
フォーク 0
コード 課題 61 Pull リクエスト 1 リリース Wiki アクティビティ

#399

ソースを参照
このコミットが含まれているのは:
みてるぞ
2026-07-14 18:39:24 +09:00
親 bc660676ef
コミット d035da99ad
14個のファイルの変更，188行の追加，232行の削除
Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む
frontend/src/components/posts/import/PostImportRowDialog.tsx
+34 -11
ファイルの表示
@@ -43,11 +43,27 @@ const originOf = (
): PostImportOrigin =>
row.provenance[field] ?? 'automatic'
const originalCreatedOrigin = (row: PostImportRow): PostImportOrigin =>
originOf (row, 'originalCreatedFrom') === 'manual'
|| originOf (row, 'originalCreatedBefore') === 'manual'
const changedOrigin = (
changed: boolean,
row: PostImportRow,
field: string,
): PostImportOrigin =>
changed ? 'manual' : originOf (row, field)
const originalCreatedOrigin = (
row: PostImportRow,
originalDraft: Draft,
draft: Draft,
): PostImportOrigin =>
originalDraft.originalCreatedFrom !== draft.originalCreatedFrom
|| originalDraft.originalCreatedBefore !== draft.originalCreatedBefore
? 'manual'
: 'automatic'
: (
originOf (row, 'originalCreatedFrom') === 'manual'
|| originOf (row, 'originalCreatedBefore') === 'manual'
? 'manual'
: 'automatic'
)
const buildDraft = (row: PostImportRow): Draft => ({
url: row.url,
@@ -78,6 +94,10 @@ const PostImportRowDialog: FC<Props> = (
if (!(row) || !(draft))
return null
const originalDraft = buildDraft (row)
const fieldOrigin = (field: keyof Draft): PostImportOrigin =>
changedOrigin (draft[field] !== originalDraft[field], row, field)
const update = <Key extends keyof Draft,> (
key: Key,
value: Draft[Key],
@@ -117,21 +137,21 @@ const PostImportRowDialog: FC<Props> = (
<DialogTextField
label="URL"
value={draft.url}
origin={originOf (row, 'url')}
origin={fieldOrigin ('url')}
warnings={row.fieldWarnings.url}
errors={groupedMessages (row.validationErrors.url, row.importErrors?.url)}
onChange={value => update ('url', value)}/>
<DialogTextField
label="タイトル"
value={draft.title}
origin={originOf (row, 'title')}
origin={fieldOrigin ('title')}
warnings={row.fieldWarnings.title}
errors={groupedMessages (row.validationErrors.title, row.importErrors?.title)}
onChange={value => update ('title', value)}/>
<DialogTextField
label="サムネール基底 URL"
value={draft.thumbnailBase}
origin={originOf (row, 'thumbnailBase')}
origin={fieldOrigin ('thumbnailBase')}
warnings={row.fieldWarnings.thumbnailBase}
errors={groupedMessages (
row.validationErrors.thumbnailBase,
@@ -139,7 +159,10 @@ const PostImportRowDialog: FC<Props> = (
)}
onChange={value => update ('thumbnailBase', value)}/>
<PostOriginalCreatedTimeField
labelAddon={<PostImportStatusBadge value={originalCreatedOrigin (row)}/>}
labelAddon={
<PostImportStatusBadge
value={originalCreatedOrigin (row, originalDraft, draft)}/>
}
originalCreatedFrom={draft.originalCreatedFrom || null}
setOriginalCreatedFrom={value => update ('originalCreatedFrom', value ?? '')}
originalCreatedBefore={draft.originalCreatedBefore || null}
@@ -155,7 +178,7 @@ const PostImportRowDialog: FC<Props> = (
<DialogTextField
label="動画時間"
value={draft.duration}
origin={originOf (row, 'duration')}
origin={fieldOrigin ('duration')}
errors={groupedMessages (
row.validationErrors.duration,
row.validationErrors.videoMs,
@@ -166,14 +189,14 @@ const PostImportRowDialog: FC<Props> = (
<DialogAreaField
label="タグ"
value={draft.tags}
origin={originOf (row, 'tags')}
origin={fieldOrigin ('tags')}
warnings={row.fieldWarnings.tags}
errors={groupedMessages (row.validationErrors.tags, row.importErrors?.tags)}
onChange={value => update ('tags', value)}/>
<DialogTextField
label="親投稿"
value={draft.parentPostIds}
origin={originOf (row, 'parentPostIds')}
origin={fieldOrigin ('parentPostIds')}
errors={groupedMessages (
row.validationErrors.parentPostIds,
row.importErrors?.parentPostIds,
frontend/src/components/posts/import/PostImportRowSummary.tsx
+2 -18
ファイルの表示
@@ -1,7 +1,6 @@
import { Button } from '@/components/ui/button'
import { cn } from '@/lib/utils'
import PrefetchLink from '@/components/PrefetchLink'
import PostImportStatusBadge from '@/components/posts/import/PostImportStatusBadge'
import ThumbnailPreview from '@/components/posts/import/ThumbnailPreview'
import { effectivePostImportStatus } from '@/components/posts/import/postImportRowStatus'
@@ -71,10 +70,9 @@ const PostImportRowSummary: FC<Props> = ({ row, onEdit }) => {
<div
className={cn (
'hidden items-center gap-4 rounded-lg border p-4 md:grid',
'md:grid-cols-[4rem_5rem_minmax(0,1fr)_auto_auto_auto]',
'md:grid-cols-[4rem_5rem_minmax(0,1fr)_auto_auto]',
toneClass (row),
'hover:bg-slate-50',
'dark:hover:bg-neutral-800',
'transition-shadow hover:shadow-sm',
)}>
<div className="space-y-1">
<div className="text-sm font-medium">#{row.sourceRow}</div>
@@ -96,13 +94,6 @@ const PostImportRowSummary: FC<Props> = ({ row, onEdit }) => {
{summaryDate (row) || '日時未取得'}
{row.attributes.duration ? ` / ${ row.attributes.duration }` : ''}
</div>
{row.createdPostId && (
<PrefetchLink
to={`/posts/${ row.createdPostId }`}
className="inline-block text-xs text-sky-700 underline
dark:text-sky-300">
投稿 #{row.createdPostId}
</PrefetchLink>)}
{warning && (
<div className="text-xs text-amber-700 dark:text-amber-200">
{warning}
@@ -145,13 +136,6 @@ const PostImportRowSummary: FC<Props> = ({ row, onEdit }) => {
<div className="flex flex-wrap gap-2">
<PostImportStatusBadge value={effectiveStatus}/>
</div>
{row.createdPostId && (
<PrefetchLink
to={`/posts/${ row.createdPostId }`}
className="inline-block text-xs text-sky-700 underline
dark:text-sky-300">
投稿 #{row.createdPostId}
</PrefetchLink>)}
{error && (
<div className="text-xs text-red-700 dark:text-red-200">
{error}
frontend/src/components/posts/import/PostImportStatusBadge.tsx
+4 -14
ファイルの表示
@@ -2,22 +2,12 @@ import { cn } from '@/lib/utils'
import type { FC } from 'react'
import type { PostImportOrigin } from '@/lib/postImportSession'
type BadgeValue =
'ready'
| 'warning'
| 'error'
| 'pending'
| 'created'
| 'skipped'
| 'failed'
| PostImportOrigin
import type { PostImportBadgeValue } from '@/components/posts/import/postImportRowStatus'
type Props = {
value: BadgeValue }
value: PostImportBadgeValue }
const LABELS: Record<BadgeValue, string> = {
const LABELS: Record<PostImportBadgeValue, string> = {
ready: '登録可能',
warning: '警告',
error: '要修正',
@@ -28,7 +18,7 @@ const LABELS: Record<BadgeValue, string> = {
automatic: '自動取得',
manual: '手修正' }
const STYLES: Record<BadgeValue, string[]> = {
const STYLES: Record<PostImportBadgeValue, string[]> = {
ready: [
'border-emerald-300 bg-emerald-50 text-emerald-700',
'dark:border-emerald-900 dark:bg-emerald-950 dark:text-emerald-200'],
frontend/src/components/posts/import/postImportRowStatus.ts
+7 -1
ファイルの表示
@@ -1,4 +1,5 @@
import type { PostImportRow } from '@/lib/postImportSession'
import type { PostImportOrigin,
PostImportRow } from '@/lib/postImportSession'
export type PostImportEffectiveStatus =
'created'
@@ -8,6 +9,11 @@ export type PostImportEffectiveStatus =
| 'warning'
| 'ready'
export type PostImportBadgeValue =
PostImportEffectiveStatus
| 'pending'
| PostImportOrigin
export const effectivePostImportStatus = (
row: PostImportRow,
frontend/src/lib/postImportSession.ts
+22 -4
ファイルの表示
@@ -5,6 +5,7 @@ export type PostImportStatus =
| 'created'
| 'skipped'
| 'failed'
export type PostImportSkipReason = 'existing'
export type PostImportResultStatus = 'created' | 'skipped' | 'failed'
export type PostImportAttributeValue = string | number
@@ -19,6 +20,8 @@ export type PostImportRow = {
provenance: Record<string, PostImportOrigin>
tagSources?: Record<PostImportOrigin, string>
status: 'ready' | 'warning' | 'error'
skipReason?: PostImportSkipReason
existingPostId?: number
metadataUrl?: string
createdPostId?: number
importStatus?: PostImportStatus }
@@ -185,6 +188,12 @@ const isValidOrigin = (
value === 'automatic' || value === 'manual'
const isValidSkipReason = (
value: unknown,
): value is PostImportSkipReason =>
value === 'existing'
const sanitiseRow = (value: unknown): PostImportRow | null => {
if (!(isPlainObject (value)))
return null
@@ -200,6 +209,8 @@ const sanitiseRow = (value: unknown): PostImportRow | null => {
return null
if (value.importStatus != null && !(isValidImportStatus (value.importStatus)))
return null
if (value.skipReason != null && !(isValidSkipReason (value.skipReason)))
return null
const validationErrors = ensureStringListRecord (value.validationErrors)
const fieldWarnings = ensureStringListRecord (value.fieldWarnings)
@@ -239,6 +250,9 @@ const sanitiseRow = (value: unknown): PostImportRow | null => {
provenance: value.provenance as Record<string, PostImportOrigin>,
tagSources: value.tagSources as Record<PostImportOrigin, string> | undefined,
status: value.status,
skipReason: value.skipReason,
existingPostId:
Number.isInteger (value.existingPostId) ? Number (value.existingPostId) : undefined,
metadataUrl: typeof value.metadataUrl === 'string' ? value.metadataUrl : undefined,
createdPostId:
Number.isInteger (value.createdPostId) ? Number (value.createdPostId) : undefined,
@@ -422,6 +436,8 @@ export const mergeValidatedImportRows = (
attributes: row.attributes,
provenance: row.provenance,
tagSources: row.tagSources,
skipReason: row.skipReason,
existingPostId: row.existingPostId,
fieldWarnings,
baseWarnings:
row.baseWarnings.length > 0 || row.metadataUrl !== previous.metadataUrl
@@ -469,6 +485,8 @@ export const mergePreviewImportRows = (
attributes: mergedAttributes,
provenance: mergedProvenance,
tagSources: mergedTagSources,
skipReason: row.skipReason,
existingPostId: row.existingPostId,
createdPostId: previous.createdPostId,
importStatus: previous.importStatus,
importErrors: previous.importErrors }
@@ -584,8 +602,8 @@ export const validateImportSource = (
}
const hasSkipWarning = (row: PostImportRow): boolean =>
(row.fieldWarnings.url ?? []).includes ('既存投稿のためスキップします．')
const hasSkipReason = (row: PostImportRow): boolean =>
row.skipReason === 'existing'
export const submittableImportRows = (rows: PostImportRow[]): PostImportRow[] =>
@@ -594,7 +612,7 @@ export const submittableImportRows = (rows: PostImportRow[]): PostImportRow[] =>
return false
if (row.importStatus === 'skipped')
return false
if (hasSkipWarning (row))
if (hasSkipReason (row))
return false
if (row.importStatus === 'failed')
return false
@@ -609,6 +627,6 @@ export const reviewSummaryCounts = (rows: PostImportRow[]) => ({
&& Object.keys (row.validationErrors ?? { }).length === 0).length,
invalid: rows.filter (row => Object.keys (row.validationErrors ?? { }).length > 0).length,
skipPlanned: rows.filter (row =>
hasSkipWarning (row) && row.importStatus !== 'created').length,
hasSkipReason (row) && row.importStatus !== 'created').length,
created: rows.filter (row => row.importStatus === 'created').length,
failed: rows.filter (row => row.importStatus === 'failed').length })
frontend/src/pages/posts/PostImportResultPage.tsx
-7
ファイルの表示
@@ -192,13 +192,6 @@ const PostImportResultPage: FC<Props> = ({ user }) => {
<div className="text-xs text-neutral-500 dark:text-neutral-400">
{row.url}
</div>
{row.createdPostId && (
<PrefetchLink
to={`/posts/${ row.createdPostId }`}
className="inline-block text-xs text-sky-700 underline
dark:text-sky-300">
投稿 #{row.createdPostId}
</PrefetchLink>)}
<FieldError messages={Object.values (row.importErrors ?? { }).flat ()}/>
</div>
frontend/src/pages/posts/PostImportSourcePage.tsx
+15 -2
ファイルの表示
@@ -29,6 +29,8 @@ import type { User } from '@/types'
type Props = { user: User | null }
const MAX_ROWS = 100
const SOURCE_ERROR_ID = 'post-import-source-error'
const SOURCE_ISSUES_ID = 'post-import-source-issues'
const PostImportSourcePage: FC<Props> = ({ user }) => {
@@ -45,6 +47,11 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
const lineCount = countImportSourceLines (source)
const messages = sourceError ? [sourceError] : []
const sourceDescribedBy = [
sourceError ? SOURCE_ERROR_ID : null,
sourceIssues.length > 0 ? SOURCE_ISSUES_ID : null]
.filter (_1 => _1 != null)
.join (' ')
useEffect (() => {
cleanupExpiredPostImportSessions (message =>
@@ -134,6 +141,8 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
<textarea
value={source}
rows={14}
aria-invalid={messages.length > 0 || sourceIssues.length > 0}
aria-describedby={sourceDescribedBy || undefined}
className={inputClass (
messages.length > 0 || sourceIssues.length > 0,
'font-mono text-sm',
@@ -150,8 +159,12 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
setSourceIssues ([])
}}/>)}
</FormField>
<FieldError messages={messages}/>
<ul className="space-y-2 text-sm text-red-700 dark:text-red-300">
<div id={messages.length > 0 ? SOURCE_ERROR_ID : undefined}>
<FieldError messages={messages}/>
</div>
<ul
id={SOURCE_ISSUES_ID}
className="space-y-2 text-sm text-red-700 dark:text-red-300">
{sourceIssues.map (issue => (
<li key={`${ issue.sourceRow }-${ issue.message }-${ issue.url }`}>
<div>{issue.sourceRow} 行目: {issue.message}</div>
frontend/src/pages/posts/PostNewPage.tsx
+2 -2
ファイルの表示
@@ -176,7 +176,7 @@ const PostNewPage: FC<Props> = ({ user }) => {
<Button
type="button"
variant="outline"
onClick={fetchTitle}
onClick={() => void fetchTitle()}
disabled={!(url) || titleLoading}>
取得
</Button>
@@ -193,7 +193,7 @@ const PostNewPage: FC<Props> = ({ user }) => {
<Button
type="button"
variant="outline"
onClick={fetchThumbnail}
onClick={() => void fetchThumbnail()}
disabled={!(url) || thumbnailLoading}>
取得
</Button>