このコミットが含まれているのは:
@@ -4,6 +4,7 @@ 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'
|
||||
|
||||
import type { FC } from 'react'
|
||||
|
||||
@@ -14,7 +15,7 @@ type Props = {
|
||||
onEdit: () => void }
|
||||
|
||||
const toneClass = (row: PostImportRow): string[] => {
|
||||
const value = row.importStatus ?? row.status
|
||||
const value = effectivePostImportStatus (row)
|
||||
switch (value)
|
||||
{
|
||||
case 'created':
|
||||
@@ -63,7 +64,7 @@ const summaryDate = (row: PostImportRow): string =>
|
||||
const PostImportRowSummary: FC<Props> = ({ row, onEdit }) => {
|
||||
const error = summaryError (row)
|
||||
const warning = error == null ? summaryWarning (row) : null
|
||||
const importStatus = row.importStatus ?? 'pending'
|
||||
const effectiveStatus = effectivePostImportStatus (row)
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -77,7 +78,6 @@ const PostImportRowSummary: FC<Props> = ({ row, onEdit }) => {
|
||||
)}>
|
||||
<div className="space-y-1">
|
||||
<div className="text-sm font-medium">#{row.sourceRow}</div>
|
||||
<PostImportStatusBadge value={row.status}/>
|
||||
</div>
|
||||
<ThumbnailPreview
|
||||
url={String (row.attributes.thumbnailBase ?? '')}
|
||||
@@ -113,12 +113,7 @@ const PostImportRowSummary: FC<Props> = ({ row, onEdit }) => {
|
||||
</div>)}
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<PostImportStatusBadge value={importStatus}/>
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
{error
|
||||
? <PostImportStatusBadge value="error"/>
|
||||
: (warning ? <PostImportStatusBadge value="warning"/> : <PostImportStatusBadge value="ready"/>)}
|
||||
<PostImportStatusBadge value={effectiveStatus}/>
|
||||
</div>
|
||||
<div className="flex justify-end">
|
||||
<Button
|
||||
@@ -148,9 +143,7 @@ const PostImportRowSummary: FC<Props> = ({ row, onEdit }) => {
|
||||
{row.url}
|
||||
</div>
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<PostImportStatusBadge value={row.status}/>
|
||||
<PostImportStatusBadge value={importStatus}/>
|
||||
{warning && <PostImportStatusBadge value="warning"/>}
|
||||
<PostImportStatusBadge value={effectiveStatus}/>
|
||||
</div>
|
||||
{row.createdPostId && (
|
||||
<PrefetchLink
|
||||
|
||||
新しい課題から参照
ユーザをブロックする