コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
23ee19eee7 |
@@ -69,11 +69,8 @@ class TagVersionsController < ApplicationController
|
||||
|
||||
parent_tags =
|
||||
build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
|
||||
.filter_map do |h|
|
||||
parent = parent_json[h[:tag_id]]
|
||||
next unless parent
|
||||
|
||||
{ tag: parent,
|
||||
.map do |h|
|
||||
{ tag: parent_json.fetch(h[:tag_id]),
|
||||
type: h[:type] }
|
||||
end
|
||||
|
||||
|
||||
@@ -215,36 +215,6 @@ RSpec.describe 'TagVersions API', type: :request do
|
||||
expect(first.fetch('created_at')).to eq(t_v1.iso8601)
|
||||
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
|
||||
fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general)
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ import { useEffect, useMemo, useState } from 'react'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
import FieldWarning from '@/components/common/FieldWarning'
|
||||
import PostDurationField from '@/components/posts/PostDurationField'
|
||||
import PostTagsField from '@/components/posts/PostTagsField'
|
||||
import PostTextField from '@/components/posts/PostTextField'
|
||||
@@ -172,6 +173,9 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
|
||||
<FieldError messages={baseErrors}/>
|
||||
{!(post.thumbnail?.trim () || post.thumbnailBase?.trim ()) && (
|
||||
<FieldWarning
|
||||
messages={[label ('shared:labels.thumbnailMissing')]}/>)}
|
||||
|
||||
<PostTextField
|
||||
label={label ('shared:labels.title')}
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする