コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
006295dc45 | ||
|
|
c3c6f2bc48 |
@@ -15,7 +15,7 @@ import { msToTime } from '@/lib/utils'
|
|||||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||||
import { useUITranslation } from '@/lib/useUITranslation'
|
import { useUITranslation } from '@/lib/useUITranslation'
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent, ReactNode } from 'react'
|
||||||
|
|
||||||
import type { Post, TagWithSections } from '@/types'
|
import type { Post, TagWithSections } from '@/types'
|
||||||
|
|
||||||
@@ -23,6 +23,8 @@ type PostFormField =
|
|||||||
'parentPostIds' | 'tags' | 'videoMs'
|
'parentPostIds' | 'tags' | 'videoMs'
|
||||||
| 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
|
| 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
|
||||||
|
|
||||||
|
type PostEditData = Omit<Parameters<typeof updatePost>[0], 'id'>
|
||||||
|
|
||||||
const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
|
const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
|
||||||
[...new Set (values.flatMap (value => value ?? []))]
|
[...new Set (values.flatMap (value => value ?? []))]
|
||||||
|
|
||||||
@@ -150,12 +152,63 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
const handleSubmit = async (e: FormEvent) => {
|
const handleSubmit = async (e: FormEvent) => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
|
|
||||||
|
if (disabled) return
|
||||||
|
|
||||||
setDisabled (true)
|
setDisabled (true)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await update ({ id: post.id, title, tags, parentPostIds,
|
const current: PostEditData = {
|
||||||
duration: videoFlg ? duration : null,
|
title, tags, parentPostIds,
|
||||||
originalCreatedFrom, originalCreatedBefore },
|
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 ({
|
||||||
|
title: label ('shared:actions.diff'),
|
||||||
|
confirmText: label ('shared:actions.update'),
|
||||||
|
description: (
|
||||||
|
<dl className="max-h-[60dvh] overflow-y-auto space-y-3 text-left">
|
||||||
|
{differences.map (row => (
|
||||||
|
<div key={row.key}>
|
||||||
|
<dt className="font-semibold">{row.name}</dt>
|
||||||
|
<dd className="whitespace-pre-wrap break-words">
|
||||||
|
{row.prev && (
|
||||||
|
<del className="block text-red-600 dark:text-red-400">
|
||||||
|
{row.prev}
|
||||||
|
</del>)}
|
||||||
|
{row.current && (
|
||||||
|
<ins className="block text-green-700 dark:text-green-400">
|
||||||
|
{row.current}
|
||||||
|
</ins>)}
|
||||||
|
</dd>
|
||||||
|
</div>))}
|
||||||
|
</dl>) })))
|
||||||
|
return
|
||||||
|
|
||||||
|
await update ({ id: post.id, ...current },
|
||||||
{ baseVersionNo: post.versionNo })
|
{ baseVersionNo: post.versionNo })
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
||||||
import { PassThrough } from 'node:stream'
|
import { PassThrough } from 'node:stream'
|
||||||
import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server'
|
import { renderToPipeableStream } from 'react-dom/server'
|
||||||
import { HelmetProvider } from 'react-helmet-async'
|
import { HelmetProvider } from 'react-helmet-async'
|
||||||
import { I18nextProvider } from 'react-i18next'
|
import { I18nextProvider } from 'react-i18next'
|
||||||
import { createStaticHandler, createStaticRouter,
|
import { createStaticHandler, createStaticRouter,
|
||||||
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
|
|||||||
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
||||||
import { apiGet, isApiError } from '@/lib/api'
|
import { apiGet, isApiError } from '@/lib/api'
|
||||||
import { createUII18n } from '@/lib/i18n'
|
import { createUII18n } from '@/lib/i18n'
|
||||||
import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales'
|
import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales'
|
||||||
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
||||||
import { withRenderContext } from '@/lib/renderContext.server'
|
import { withRenderContext } from '@/lib/renderContext.server'
|
||||||
|
|
||||||
@@ -171,26 +171,8 @@ export const render = async (
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
const helmet = helmetContext.helmet!
|
const helmet = helmetContext.helmet!
|
||||||
const alternates = status === 200 && known != null
|
|
||||||
? await Promise.all (locales.locales.map (entry => entry.code)
|
|
||||||
.filter (isLocaleCode)
|
|
||||||
.filter (code => known.route.handle?.locale == null
|
|
||||||
|| known.route.handle.locale === code)
|
|
||||||
.map (async targetLocale => {
|
|
||||||
const location = { pathname: url.pathname, search: url.search, hash: '' }
|
|
||||||
const path = targetLocale === locale
|
|
||||||
? url.pathname + url.search
|
|
||||||
: (known.route.handle?.switchLocale != null
|
|
||||||
? await known.route.handle.switchLocale ({
|
|
||||||
location, params: known.params, locale, targetLocale })
|
|
||||||
: switchLocalePath (location, targetLocale))
|
|
||||||
return <link key={targetLocale} rel="alternate" hrefLang={targetLocale}
|
|
||||||
href={new URL (path, origin).href}/>
|
|
||||||
}))
|
|
||||||
: []
|
|
||||||
const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
|
const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
|
||||||
.map (entry => entry.toString ()).join ('')
|
.map (entry => entry.toString ()).join ('')
|
||||||
+ renderToStaticMarkup (<>{alternates}</>)
|
|
||||||
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
||||||
query.state.status !== 'pending'
|
query.state.status !== 'pending'
|
||||||
&& query.meta?.clientOnly !== true
|
&& query.meta?.clientOnly !== true
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする