コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
1881b8b384 | ||
|
|
936886a9bc |
@@ -69,11 +69,8 @@ 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)
|
||||||
.filter_map do |h|
|
.map do |h|
|
||||||
parent = parent_json[h[:tag_id]]
|
{ tag: parent_json.fetch(h[:tag_id]),
|
||||||
next unless parent
|
|
||||||
|
|
||||||
{ tag: parent,
|
|
||||||
type: h[:type] }
|
type: h[:type] }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -215,36 +215,6 @@ 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)
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,18 @@ describe ('TagDetailSidebar', () => {
|
|||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it ('inherits the sidebar width saved by the post list', () => {
|
||||||
|
localStorage.setItem ('sidebar:posts-index-tags:left:width', '320')
|
||||||
|
|
||||||
|
const { container } = renderWithProviders (
|
||||||
|
<TagDetailSidebar post={buildPost ()}/>)
|
||||||
|
const sidebar = container.querySelector<HTMLElement> (
|
||||||
|
'[style*="--sidebar-width"]')
|
||||||
|
|
||||||
|
expect (sidebar).toBeInTheDocument ()
|
||||||
|
expect (sidebar?.style.getPropertyValue ('--sidebar-width')).toBe ('320px')
|
||||||
|
})
|
||||||
|
|
||||||
it ('keeps internal and external tags with the same numeric id in flat mode', () => {
|
it ('keeps internal and external tags with the same numeric id in flat mode', () => {
|
||||||
setClientTagRelationDisplayMode ('flat')
|
setClientTagRelationDisplayMode ('flat')
|
||||||
|
|
||||||
|
|||||||
@@ -378,7 +378,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
}, [baseTags])
|
}, [baseTags])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SidebarComponent sidebarKey="post-detail-tags" className={className}>
|
<SidebarComponent sidebarKey="posts-index-tags" className={className}>
|
||||||
<TagSearch/>
|
<TagSearch/>
|
||||||
<DndContext
|
<DndContext
|
||||||
sensors={sensors}
|
sensors={sensors}
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする