コミットを比較
3
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
a259087840 | ||
|
|
006295dc45 | ||
|
|
c3c6f2bc48 |
@@ -5,7 +5,6 @@ class MaterialVersionsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ class MaterialsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ class NicoTagsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
post_tag_max_sql =
|
post_tag_max_sql =
|
||||||
PostExternalTag
|
PostExternalTag
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ class PostVersionsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ class TagVersionsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ class TheatreCommentsController < ApplicationController
|
|||||||
def index
|
def index
|
||||||
limit = params[:limit].to_i
|
limit = params[:limit].to_i
|
||||||
limit = 20 if limit <= 0
|
limit = 20 if limit <= 0
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
no_gt = params[:no_gt].to_i
|
no_gt = params[:no_gt].to_i
|
||||||
no_gt = 0 if no_gt < 0
|
no_gt = 0 if no_gt < 0
|
||||||
@@ -10,7 +9,6 @@ class TheatreCommentsController < ApplicationController
|
|||||||
comments = TheatreComment
|
comments = TheatreComment
|
||||||
.where(theatre_id: params[:theatre_id])
|
.where(theatre_id: params[:theatre_id])
|
||||||
.where('no > ?', no_gt)
|
.where('no > ?', no_gt)
|
||||||
.includes(:user)
|
|
||||||
.order(no: :desc)
|
.order(no: :desc)
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ class TheatreProgrammesController < ApplicationController
|
|||||||
def index
|
def index
|
||||||
limit = params[:limit].to_i
|
limit = params[:limit].to_i
|
||||||
limit = 100 if limit <= 0
|
limit = 100 if limit <= 0
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
position_gt = params[:position_gt].to_i
|
position_gt = params[:position_gt].to_i
|
||||||
position_gt = 0 if position_gt < 0
|
position_gt = 0 if position_gt < 0
|
||||||
@@ -11,7 +10,7 @@ class TheatreProgrammesController < ApplicationController
|
|||||||
.where(theatre_id: params[:theatre_id])
|
.where(theatre_id: params[:theatre_id])
|
||||||
.where('position > ?', position_gt)
|
.where('position > ?', position_gt)
|
||||||
.includes(:post)
|
.includes(:post)
|
||||||
.order(position: :desc)
|
.order(position: :desc).limit(100)
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
|
|
||||||
render json: programmes.map { |programme|
|
render json: programmes.map { |programme|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ class TheatreSkipEventsController < ApplicationController
|
|||||||
def index
|
def index
|
||||||
limit = params[:limit].to_i
|
limit = params[:limit].to_i
|
||||||
limit = 50 if limit <= 0
|
limit = 50 if limit <= 0
|
||||||
limit = 100 if limit > 100
|
|
||||||
|
|
||||||
events =
|
events =
|
||||||
TheatreSkipEvent
|
TheatreSkipEvent
|
||||||
|
|||||||
@@ -1,174 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'List API limits', type: :request do
|
|
||||||
shared_examples 'a capped list' do |default_count, minimum_count, paginated|
|
|
||||||
def response_rows
|
|
||||||
body = json
|
|
||||||
body.is_a?(Array) ? body : body.fetch(collection_key)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'caps oversized limits at 100 and preserves the 100 boundary' do
|
|
||||||
get path, params: { locale: 'ja', limit: 100 }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_rows.size).to eq(100)
|
|
||||||
boundary_rows = response_rows
|
|
||||||
|
|
||||||
[101, 10_000].each do |limit|
|
|
||||||
get path, params: { locale: 'ja', limit: }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_rows).to eq(boundary_rows)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'preserves the default, nonpositive and small positive limits' do
|
|
||||||
get path, params: { locale: 'ja' }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_rows.size).to eq(default_count)
|
|
||||||
|
|
||||||
[0, -1].each do |limit|
|
|
||||||
get path, params: { locale: 'ja', limit: }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_rows.size).to eq(minimum_count)
|
|
||||||
end
|
|
||||||
|
|
||||||
get path, params: { locale: 'ja', limit: 2 }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_rows.size).to eq(2)
|
|
||||||
end
|
|
||||||
|
|
||||||
if paginated
|
|
||||||
it 'uses the capped limit for page offsets and preserves total count' do
|
|
||||||
get path, params: { locale: 'ja', limit: 100 }
|
|
||||||
first_page = response_rows
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.fetch('count')).to eq(101)
|
|
||||||
|
|
||||||
get path, params: { locale: 'ja', limit: 100, page: 2 }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_rows.size).to eq(1)
|
|
||||||
second_page = response_rows
|
|
||||||
expect(first_page & second_page).to be_empty
|
|
||||||
|
|
||||||
get path, params: { locale: 'ja', limit: 101, page: 2 }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_rows).to eq(second_page)
|
|
||||||
expect(json.fetch('count')).to eq(101)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'posts' do
|
|
||||||
let(:path) { '/posts' }
|
|
||||||
let(:collection_key) { 'posts' }
|
|
||||||
before { create_list(:post, 101) }
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 1, true
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'tags' do
|
|
||||||
let(:path) { '/tags' }
|
|
||||||
let(:collection_key) { 'tags' }
|
|
||||||
before { create_list(:tag, 101) }
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 1, true
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'nico tags' do
|
|
||||||
let(:path) { '/tags/nico' }
|
|
||||||
let(:collection_key) { 'tags' }
|
|
||||||
before { create_list(:external_tag, 101) }
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 1, true
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'materials' do
|
|
||||||
let(:path) { '/materials' }
|
|
||||||
let(:collection_key) { 'materials' }
|
|
||||||
before do
|
|
||||||
101.times { |index| Material.create!(url: "https://example.com/material-#{ index }") }
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 1, true
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'post versions' do
|
|
||||||
let(:path) { '/posts/versions' }
|
|
||||||
let(:collection_key) { 'versions' }
|
|
||||||
let(:post) { create(:post) }
|
|
||||||
before do
|
|
||||||
101.times do |index|
|
|
||||||
PostVersion.create!(post:, version_no: index + 1, event_type: 'update',
|
|
||||||
url: post.url, tags: '', tags_json: [], parent_post_ids: '')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 1, true
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'tag versions' do
|
|
||||||
let(:path) { '/tags/versions' }
|
|
||||||
let(:collection_key) { 'versions' }
|
|
||||||
let(:tag) { create(:tag) }
|
|
||||||
before do
|
|
||||||
101.times do |index|
|
|
||||||
TagVersion.create!(tag:, version_no: index + 1, event_type: 'update',
|
|
||||||
name: 'limit tag', category: 'general', aliases: '',
|
|
||||||
parent_tag_ids: '', names: {
|
|
||||||
ja: { name: 'limit tag', script_code: 'Jpan',
|
|
||||||
auto_generated: false, aliases: [] } })
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 1, true
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'material versions' do
|
|
||||||
let(:path) { '/materials/versions' }
|
|
||||||
let(:collection_key) { 'versions' }
|
|
||||||
let(:material) { Material.create!(url: 'https://example.com/material') }
|
|
||||||
before do
|
|
||||||
101.times do |index|
|
|
||||||
MaterialVersion.create!(material:, version_no: index + 1,
|
|
||||||
event_type: 'update', url: material.url)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 1, true
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'theatre lists' do
|
|
||||||
let(:theatre) { create(:theatre) }
|
|
||||||
let(:post) { create(:post) }
|
|
||||||
|
|
||||||
context 'comments' do
|
|
||||||
let(:path) { "/theatres/#{ theatre.id }/comments" }
|
|
||||||
before { create_list(:theatre_comment, 101, theatre:, user: theatre.created_by_user) }
|
|
||||||
|
|
||||||
include_examples 'a capped list', 20, 20, false
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'programmes' do
|
|
||||||
let(:path) { "/theatres/#{ theatre.id }/programmes" }
|
|
||||||
before do
|
|
||||||
101.times do |index|
|
|
||||||
TheatreProgramme.create!(theatre:, post:, position: index + 1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'a capped list', 100, 100, false
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'skip events' do
|
|
||||||
let(:path) { "/theatres/#{ theatre.id }/skip_events" }
|
|
||||||
before do
|
|
||||||
101.times do |index|
|
|
||||||
TheatreSkipEvent.create!(theatre:, post:,
|
|
||||||
skipped_by_user: theatre.created_by_user,
|
|
||||||
created_at: Time.utc(2026, 1, 1) + index.seconds)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'a capped list', 50, 50, false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import { textContentOf } from '@/test/text'
|
import { textContentOf } from '@/test/text'
|
||||||
import PostEditForm from '@/components/PostEditForm'
|
import PostEditForm from '@/components/PostEditForm'
|
||||||
import { buildPost, buildTag } from '@/test/factories'
|
import { buildPost, buildTag } from '@/test/factories'
|
||||||
import { renderWithProviders as render } from '@/test/render'
|
import { renderWithProviders as render } from '@/test/render'
|
||||||
|
|
||||||
|
import type { DialogueAPI } from '@/lib/dialogues/useDialogue'
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
const postsApi = vi.hoisted (() => ({
|
||||||
updatePost: vi.fn (),
|
updatePost: vi.fn (),
|
||||||
}))
|
}))
|
||||||
@@ -18,18 +20,27 @@ const toastApi = vi.hoisted (() => ({
|
|||||||
toast: vi.fn (),
|
toast: vi.fn (),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
const dialogue = vi.hoisted (() => ({
|
||||||
|
confirm: vi.fn<DialogueAPI['confirm']> (),
|
||||||
|
choice: vi.fn () }))
|
||||||
|
|
||||||
vi.mock ('@/lib/posts', () => postsApi)
|
vi.mock ('@/lib/posts', () => postsApi)
|
||||||
vi.mock ('@/lib/api', () => api)
|
vi.mock ('@/lib/api', () => api)
|
||||||
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
||||||
vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
|
vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
|
||||||
...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
|
...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
|
||||||
default: () => ({
|
default: () => dialogue }))
|
||||||
choice: vi.fn (),
|
|
||||||
}),
|
|
||||||
}))
|
|
||||||
|
|
||||||
describe ('PostEditForm', () => {
|
describe ('PostEditForm', () => {
|
||||||
|
beforeEach (() => {
|
||||||
|
vi.resetAllMocks ()
|
||||||
|
})
|
||||||
|
|
||||||
it ('submits edited post fields with the current base version', async () => {
|
it ('submits edited post fields with the current base version', async () => {
|
||||||
|
const confirm = vi.fn<(value: boolean) => void> ()
|
||||||
|
dialogue.confirm.mockReturnValueOnce (new Promise<boolean> (resolve => {
|
||||||
|
confirm.mockImplementation (resolve)
|
||||||
|
}))
|
||||||
const onSave = vi.fn ()
|
const onSave = vi.fn ()
|
||||||
const post = buildPost ({
|
const post = buildPost ({
|
||||||
id: 8,
|
id: 8,
|
||||||
@@ -55,6 +66,16 @@ describe ('PostEditForm', () => {
|
|||||||
fireEvent.change (parentIds, { target: { value: '3 4' } })
|
fireEvent.change (parentIds, { target: { value: '3 4' } })
|
||||||
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
||||||
|
|
||||||
|
expect (postsApi.updatePost).not.toHaveBeenCalled ()
|
||||||
|
expect (dialogue.confirm).toHaveBeenCalledTimes (1)
|
||||||
|
const difference = textContentOf (
|
||||||
|
dialogue.confirm.mock.calls[0][0].description)
|
||||||
|
expect (difference).toContain ('oldnew')
|
||||||
|
expect (difference).toContain ('23 4')
|
||||||
|
expect (difference).not.toContain ('general-tag')
|
||||||
|
|
||||||
|
await act (async () => { confirm (true) })
|
||||||
|
|
||||||
await waitFor (() => {
|
await waitFor (() => {
|
||||||
expect (postsApi.updatePost).toHaveBeenCalledWith (
|
expect (postsApi.updatePost).toHaveBeenCalledWith (
|
||||||
expect.objectContaining ({
|
expect.objectContaining ({
|
||||||
@@ -71,6 +92,28 @@ describe ('PostEditForm', () => {
|
|||||||
expect (textContentOf (toastApi.toast.mock.calls[0][0].description)).toBe ('更新しました.')
|
expect (textContentOf (toastApi.toast.mock.calls[0][0].description)).toBe ('更新しました.')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it ('keeps edited fields without submitting when confirmation is cancelled', async () => {
|
||||||
|
const onSave = vi.fn ()
|
||||||
|
dialogue.confirm.mockResolvedValueOnce (false)
|
||||||
|
render (<PostEditForm post={buildPost ()} onSave={onSave}/>)
|
||||||
|
|
||||||
|
const [title, parentIds] = screen.getAllByRole ('textbox')
|
||||||
|
fireEvent.change (title, { target: { value: 'new' } })
|
||||||
|
fireEvent.change (parentIds, { target: { value: '3 4' } })
|
||||||
|
const button = screen.getByRole ('button', { name: '更新' })
|
||||||
|
fireEvent.submit (button.closest ('form')!)
|
||||||
|
|
||||||
|
await waitFor (() => {
|
||||||
|
expect (button).toBeEnabled ()
|
||||||
|
})
|
||||||
|
expect (dialogue.confirm).toHaveBeenCalledTimes (1)
|
||||||
|
expect (postsApi.updatePost).not.toHaveBeenCalled ()
|
||||||
|
expect (onSave).not.toHaveBeenCalled ()
|
||||||
|
expect (toastApi.toast).not.toHaveBeenCalled ()
|
||||||
|
expect (title).toHaveValue ('new')
|
||||||
|
expect (parentIds).toHaveValue ('3 4')
|
||||||
|
})
|
||||||
|
|
||||||
it ('preserves duration while the video tag is temporarily removed', () => {
|
it ('preserves duration while the video tag is temporarily removed', () => {
|
||||||
const post = buildPost ({
|
const post = buildPost ({
|
||||||
videoMs: 180_500,
|
videoMs: 180_500,
|
||||||
@@ -100,6 +143,7 @@ describe ('PostEditForm', () => {
|
|||||||
'shows deduplicated original-created endpoint errors on the shared datetime field',
|
'shows deduplicated original-created endpoint errors on the shared datetime field',
|
||||||
async () => {
|
async () => {
|
||||||
const post = buildPost ()
|
const post = buildPost ()
|
||||||
|
dialogue.confirm.mockResolvedValueOnce (true)
|
||||||
api.isApiError.mockReturnValue (true)
|
api.isApiError.mockReturnValue (true)
|
||||||
postsApi.updatePost.mockRejectedValueOnce ({
|
postsApi.updatePost.mockRejectedValueOnce ({
|
||||||
response: {
|
response: {
|
||||||
|
|||||||
@@ -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 = {
|
||||||
|
title, tags, parentPostIds,
|
||||||
duration: videoFlg ? duration : null,
|
duration: videoFlg ? duration : null,
|
||||||
originalCreatedFrom, originalCreatedBefore },
|
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
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする