コミットを比較

..
2 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker 8f7e6dbcb7 AI: address review on PR #464 2026-11-13 12:44:52 +09:00
Codex Night Worker 5528453a54 AI: address issue #446 2026-11-12 21:12:53 +09:00
8個のファイルの変更、38行の追加、42行の削除
+5 -2
ファイルの表示
@@ -69,8 +69,11 @@ class TagVersionsController < ApplicationController
parent_tags = parent_tags =
build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id) build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
.map do |h| .filter_map do |h|
{ tag: parent_json.fetch(h[:tag_id]), parent = parent_json[h[:tag_id]]
next unless parent
{ tag: parent,
type: h[:type] } type: h[:type] }
end end
+30
ファイルの表示
@@ -215,6 +215,36 @@ RSpec.describe 'TagVersions API', type: :request do
expect(first.fetch('created_at')).to eq(t_v1.iso8601) expect(first.fetch('created_at')).to eq(t_v1.iso8601)
end end
[:parent_shared, :parent_new, :parent_old].each do |parent_key|
it "omits deleted #{ parent_key } from parent diffs" do
deleted_parent = public_send(parent_key)
deleted_parent.tag_names.destroy_all
deleted_parent.destroy!
get '/tags/versions', params: { id: tag.id }
expect(response).to have_http_status(:ok)
expect(json.fetch('count')).to eq(2)
versions = json.fetch('versions')
expect(versions.map { _1.fetch('version_no') }).to eq([2, 1])
expected_parents = [
[parent_shared.id, 'context'],
[parent_new.id, 'added'],
[parent_old.id, 'removed']].reject { _1.first == deleted_parent.id }
expect(versions.first.fetch('parent_tags').map { |entry|
[entry.fetch('tag').fetch('id'), entry.fetch('type')]
}).to eq(expected_parents)
expected_first_parents = [parent_shared.id, parent_old.id]
.reject { _1 == deleted_parent.id }.map { [_1, 'added'] }
expect(versions.second.fetch('parent_tags').map { |entry|
[entry.fetch('tag').fetch('id'), entry.fetch('type')]
}).to eq(expected_first_parents)
end
end
it 'returns empty when the specified tag has no versions' do it 'returns empty when the specified tag has no versions' do
fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general) fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general)
-17
ファイルの表示
@@ -153,23 +153,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
setDisabled (true) setDisabled (true)
try try
{ {
const titleMissing = !title?.trim ()
const thumbnailMissing =
!(post.thumbnail?.trim () || post.thumbnailBase?.trim ())
if ((titleMissing || thumbnailMissing)
&& !(await dialogue.confirm ({
title: titleMissing
? label ('edit.titleMissingConfirmation')
: label ('shared:labels.thumbnailMissing'),
description: (titleMissing && thumbnailMissing)
? label ('shared:labels.thumbnailMissing')
: undefined,
confirmText: label ('shared:actions.update'),
cancelText: label ('shared:actions.cancel'),
closeLabel: label ('settings:actions.close') })))
return
await update ({ id: post.id, title, tags, parentPostIds, await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null, duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore }, originalCreatedFrom, originalCreatedBefore },
-10
ファイルの表示
@@ -70,16 +70,6 @@ describe ('SidebarComponent', () => {
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true) vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
}) })
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
renderSidebar ()
// jsdom has no layout; guard the responsive classes responsible for clipping.
const sidebar = screen.getByText ('Sidebar body')
expect (sidebar).not.toHaveClass ('overflow-y-auto')
expect (sidebar).toHaveClass ('md:overflow-y-auto')
})
it ('uses maxWidth without applying the container main-width reserve twice', async () => { it ('uses maxWidth without applying the container main-width reserve twice', async () => {
localStorage.setItem ('sidebar:test-sidebar:left:width', '700') localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
const onWidthChange = vi.fn () const onWidthChange = vi.fn ()
+1 -1
ファイルの表示
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
</style> </style>
</Helmet> </Helmet>
<div className="h-full md:overflow-y-auto p-4 sidebar"> <div className="h-full overflow-y-auto p-4 sidebar">
{children} {children}
</div> </div>
-2
ファイルの表示
@@ -1,5 +1,4 @@
{ {
"_untranslated": ["edit.titleMissingConfirmation"],
"list": { "list": {
"tagline": "{{brand}}", "tagline": "{{brand}}",
"empty": "ミンタㇻ タ ネン カ イサㇺ", "empty": "ミンタㇻ タ ネン カ イサㇺ",
@@ -32,7 +31,6 @@
"showExternal": "ソイタㇰ ソㇱ アヌカレ" "showExternal": "ソイタㇰ ソㇱ アヌカレ"
}, },
"edit": { "edit": {
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……", "validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!", "conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。", "conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
-1
ファイルの表示
@@ -22,7 +22,6 @@
"question": "表示しますか?", "showExternal": "外部ページを表示" "question": "表示しますか?", "showExternal": "外部ページを表示"
}, },
"edit": { "edit": {
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
"validationFailed": "更新はできなかったよ……", "validationFailed": "更新はできなかったよ……",
"conflictTitle": "競合が発生しました.", "conflictTitle": "競合が発生しました.",
"conflictDescription": "ほかの耕作員が先に更新してゐます.", "conflictDescription": "ほかの耕作員が先に更新してゐます.",
+2 -9
ファイルの表示
@@ -35,10 +35,6 @@ const renderPage = () =>
describe ('TagDetailPage', () => { describe ('TagDetailPage', () => {
beforeEach (() => { beforeEach (() => {
vi.clearAllMocks () vi.clearAllMocks ()
tagsApi.fetchTag.mockReset ()
api.apiPut.mockReset ()
api.isApiError.mockReset ()
toastApi.toast.mockReset ()
api.isApiError.mockReturnValue (false) api.isApiError.mockReturnValue (false)
}) })
@@ -55,11 +51,8 @@ describe ('TagDetailPage', () => {
}) })
it ('submits edited tag fields', async () => { it ('submits edited tag fields', async () => {
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] }) tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
tagsApi.fetchTag api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
.mockResolvedValue (updatedTag)
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
api.apiPut.mockResolvedValueOnce (updatedTag)
renderPage () renderPage ()