コミットを比較
5
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
3bb95880d4 | ||
|
|
61135de727 | ||
|
|
39efe8caae | ||
|
|
e13a52db9a | ||
|
|
23ee19eee7 |
@@ -218,16 +218,63 @@ class TagsController < ApplicationController
|
|||||||
locale = resolve_locale!
|
locale = resolve_locale!
|
||||||
|
|
||||||
q = params[:q].to_s.strip.sub(/\Anot:/i, '')
|
q = params[:q].to_s.strip.sub(/\Anot:/i, '')
|
||||||
literal = ActiveRecord::Base.sanitize_sql_like(q)
|
prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%"
|
||||||
nico = bool?(:nico, default: true)
|
|
||||||
present = bool?(:present, default: true)
|
|
||||||
|
|
||||||
rows = autocomplete_rows(locale:, pattern: "#{ literal }%", nico:, present:)
|
with_nico = bool?(:nico, default: true)
|
||||||
if rows.length < 20 && q.present?
|
present_only = bool?(:present, default: true)
|
||||||
suffix_rows = autocomplete_rows(locale:, pattern: "%#{ literal }", nico:, present:)
|
|
||||||
rows = (rows + suffix_rows).uniq { [_1['category'], _1['id']] }.first(20)
|
alias_rows =
|
||||||
|
TagName
|
||||||
|
.where(language_code: locale.language_code, primary_flg: false)
|
||||||
|
.where('name LIKE ?', prefix)
|
||||||
|
.pluck(:tag_id, :name)
|
||||||
|
|
||||||
|
matched_alias_by_tag_id = { }
|
||||||
|
tag_ids = []
|
||||||
|
alias_rows.each do |tag_id, alias_name|
|
||||||
|
tag_ids << tag_id
|
||||||
|
matched_alias_by_tag_id[tag_id] ||= alias_name
|
||||||
end
|
end
|
||||||
|
|
||||||
|
base =
|
||||||
|
Tag
|
||||||
|
.joins(:tag_names)
|
||||||
|
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
|
||||||
|
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
|
||||||
|
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
|
||||||
|
deprecated_at: nil)
|
||||||
|
base = base.where('tags.post_count > 0') if present_only
|
||||||
|
|
||||||
|
canonical_hit = base.where('tag_names.name LIKE ?', prefix)
|
||||||
|
|
||||||
|
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
|
||||||
|
|
||||||
|
internal_rows =
|
||||||
|
internal_tags
|
||||||
|
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
|
||||||
|
.limit(20)
|
||||||
|
.map { |tag|
|
||||||
|
TagRepr.base(tag, language_code: locale.language_code)
|
||||||
|
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
|
||||||
|
}
|
||||||
|
|
||||||
|
return render json: internal_rows unless with_nico
|
||||||
|
|
||||||
|
external_base = ExternalTag.all
|
||||||
|
external_base = external_base.where('post_count > 0') if present_only
|
||||||
|
|
||||||
|
external_rows =
|
||||||
|
external_base
|
||||||
|
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", prefix, prefix)
|
||||||
|
.order(post_count: :desc, name: :asc)
|
||||||
|
.limit(20)
|
||||||
|
.map { external_tag_json(_1) }
|
||||||
|
|
||||||
|
rows =
|
||||||
|
(internal_rows + external_rows)
|
||||||
|
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
|
||||||
|
.first(20)
|
||||||
|
|
||||||
render json: rows
|
render json: rows
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -498,59 +545,6 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def autocomplete_rows locale:, pattern:, nico:, present:
|
|
||||||
alias_rows =
|
|
||||||
TagName
|
|
||||||
.where(language_code: locale.language_code, primary_flg: false)
|
|
||||||
.where('name LIKE ?', pattern)
|
|
||||||
.pluck(:tag_id, :name)
|
|
||||||
|
|
||||||
matched_alias_by_tag_id = { }
|
|
||||||
tag_ids = []
|
|
||||||
alias_rows.each do |tag_id, alias_name|
|
|
||||||
tag_ids << tag_id
|
|
||||||
matched_alias_by_tag_id[tag_id] ||= alias_name
|
|
||||||
end
|
|
||||||
|
|
||||||
base =
|
|
||||||
Tag
|
|
||||||
.joins(:tag_names)
|
|
||||||
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
|
|
||||||
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
|
|
||||||
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
|
|
||||||
deprecated_at: nil)
|
|
||||||
base = base.where('tags.post_count > 0') if present
|
|
||||||
|
|
||||||
canonical_hit = base.where('tag_names.name LIKE ?', pattern)
|
|
||||||
|
|
||||||
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
|
|
||||||
|
|
||||||
internal_rows =
|
|
||||||
internal_tags
|
|
||||||
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
|
|
||||||
.limit(20)
|
|
||||||
.map { |tag|
|
|
||||||
TagRepr.base(tag, language_code: locale.language_code)
|
|
||||||
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
|
|
||||||
}
|
|
||||||
|
|
||||||
return internal_rows unless nico
|
|
||||||
|
|
||||||
external_base = ExternalTag.all
|
|
||||||
external_base = external_base.where('post_count > 0') if present
|
|
||||||
|
|
||||||
external_rows =
|
|
||||||
external_base
|
|
||||||
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", pattern, pattern)
|
|
||||||
.order(post_count: :desc, name: :asc)
|
|
||||||
.limit(20)
|
|
||||||
.map { external_tag_json(_1) }
|
|
||||||
|
|
||||||
(internal_rows + external_rows)
|
|
||||||
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
|
|
||||||
.first(20)
|
|
||||||
end
|
|
||||||
|
|
||||||
def material_filter_param default:
|
def material_filter_param default:
|
||||||
value = params[:material_filter].to_s.presence
|
value = params[:material_filter].to_s.presence
|
||||||
return default unless ['present', 'missing', 'any'].include?(value)
|
return default unless ['present', 'missing', 'any'].include?(value)
|
||||||
|
|||||||
@@ -482,7 +482,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
create(:tag, category: :general, primary_name: name, post_count: 1)
|
create(:tag, category: :general, primary_name: name, post_count: 1)
|
||||||
create(:external_tag, name:, post_count: 1)
|
create(:external_tag, name:, post_count: 1)
|
||||||
end
|
end
|
||||||
create(:external_tag, name: 'suffix_combined', post_count: 100)
|
|
||||||
|
|
||||||
get '/tags/autocomplete', params: { q: 'combined' }
|
get '/tags/autocomplete', params: { q: 'combined' }
|
||||||
|
|
||||||
@@ -491,39 +490,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(json.map { |row| row.fetch('name') }).to eq(expected.first(20))
|
expect(json.map { |row| row.fetch('name') }).to eq(expected.first(20))
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'appends primary, alias, and external suffix matches without duplicate resources' do
|
|
||||||
prefix = create(:tag, primary_name: 'tail', post_count: 1)
|
|
||||||
create(:tag_name, :alias, name: 'tail_alias', tag: prefix)
|
|
||||||
create(:tag_name, :alias, name: 'alias_tail', tag: prefix)
|
|
||||||
create(:tag, primary_name: 'primary_tail', post_count: 4)
|
|
||||||
alias_target = create(:tag, primary_name: 'alias_target', post_count: 3)
|
|
||||||
create(:tag_name, :alias, name: 'suffix_tail', tag: alias_target)
|
|
||||||
external = create(:external_tag, id: prefix.id, name: 'external_tail', post_count: 5)
|
|
||||||
create(:tag, primary_name: 'middle_tail_only', post_count: 100)
|
|
||||||
create(:external_tag, name: 'middle_tail_only', post_count: 100)
|
|
||||||
|
|
||||||
get '/tags/autocomplete', params: { q: 'tail' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.map { |row| row.fetch('name') }).to eq(
|
|
||||||
['tail', 'nico:external_tail', 'primary_tail', 'alias_target'])
|
|
||||||
expect(json.first.fetch('matched_alias')).to eq('tail_alias')
|
|
||||||
expect(json.last.fetch('matched_alias')).to eq('suffix_tail')
|
|
||||||
expect(json[1]).to include('id' => external.id, 'category' => 'nico')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'fills only the remaining places with suffix matches' do
|
|
||||||
names = 19.times.map { |number| "capacity_#{ number.to_s.rjust(2, '0') }" }
|
|
||||||
names.each { create(:tag, primary_name: _1, post_count: 1) }
|
|
||||||
create(:tag, primary_name: 'first_capacity', post_count: 3)
|
|
||||||
create(:external_tag, name: 'second_capacity', post_count: 2)
|
|
||||||
|
|
||||||
get '/tags/autocomplete', params: { q: 'capacity' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.map { |row| row.fetch('name') }).to eq(names + ['first_capacity'])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'excludes external tags but preserves internal alias matches when nico is false' do
|
it 'excludes external tags but preserves internal alias matches when nico is false' do
|
||||||
internal = create(:tag, category: :general, primary_name: 'switch_internal', post_count: 1)
|
internal = create(:tag, category: :general, primary_name: 'switch_internal', post_count: 1)
|
||||||
alias_target = create(:tag, category: :general, primary_name: 'alias_target', post_count: 1)
|
alias_target = create(:tag, category: :general, primary_name: 'alias_target', post_count: 1)
|
||||||
@@ -552,20 +518,12 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
create(:external_tag, name: literal, post_count: 1)
|
create(:external_tag, name: literal, post_count: 1)
|
||||||
create(:tag, category: :general, primary_name: 'literalXmatch', post_count: 2)
|
create(:tag, category: :general, primary_name: 'literalXmatch', post_count: 2)
|
||||||
create(:external_tag, name: 'literalXmatch', post_count: 2)
|
create(:external_tag, name: 'literalXmatch', post_count: 2)
|
||||||
suffix = "suffix_literal#{ wildcard }"
|
|
||||||
create(:tag, primary_name: suffix, post_count: 1)
|
|
||||||
suffix_alias = create(:tag, primary_name: 'suffix_alias_target', post_count: 1)
|
|
||||||
create(:tag_name, :alias, name: "alias_#{ suffix }", tag: suffix_alias)
|
|
||||||
create(:external_tag, name: suffix, post_count: 1)
|
|
||||||
create(:tag, primary_name: 'suffix_literalX', post_count: 2)
|
|
||||||
create(:external_tag, name: 'suffix_literalX', post_count: 2)
|
|
||||||
|
|
||||||
get '/tags/autocomplete', params: { q: "literal#{ wildcard }" }
|
get '/tags/autocomplete', params: { q: "literal#{ wildcard }" }
|
||||||
|
|
||||||
expect(json.map { |row| row.fetch('name') })
|
expect(json.map { |row| row.fetch('name') })
|
||||||
.to contain_exactly(
|
.to contain_exactly(
|
||||||
literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }",
|
literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }")
|
||||||
suffix, 'suffix_alias_target', "nico:#{ suffix }")
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -153,6 +153,21 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
setDisabled (true)
|
setDisabled (true)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
const titleMissing = !title?.trim ()
|
||||||
|
const thumbnailMissing =
|
||||||
|
!titleMissing
|
||||||
|
&& !(post.thumbnail?.trim () || post.thumbnailBase?.trim ())
|
||||||
|
|
||||||
|
if ((titleMissing || thumbnailMissing)
|
||||||
|
&& !(await dialogue.confirm ({
|
||||||
|
title: titleMissing
|
||||||
|
? label ('edit.titleMissingConfirmation')
|
||||||
|
: label ('edit.thumbnailMissingConfirmation'),
|
||||||
|
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 },
|
||||||
|
|||||||
@@ -70,6 +70,16 @@ 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 ()
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
</style>
|
</style>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"_untranslated": ["edit.titleMissingConfirmation", "edit.thumbnailMissingConfirmation"],
|
||||||
"list": {
|
"list": {
|
||||||
"tagline": "{{brand}}",
|
"tagline": "{{brand}}",
|
||||||
"empty": "ミンタㇻ タ ネン カ イサㇺ",
|
"empty": "ミンタㇻ タ ネン カ イサㇺ",
|
||||||
@@ -31,6 +32,8 @@
|
|||||||
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
|
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
|
||||||
},
|
},
|
||||||
"edit": {
|
"edit": {
|
||||||
|
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
|
||||||
|
"thumbnailMissingConfirmation": "サムネールが設定されてゐません.更新しますか?",
|
||||||
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
|
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
|
||||||
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
|
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
|
||||||
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
|
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
|
||||||
|
|||||||
@@ -22,6 +22,8 @@
|
|||||||
"question": "表示しますか?", "showExternal": "外部ページを表示"
|
"question": "表示しますか?", "showExternal": "外部ページを表示"
|
||||||
},
|
},
|
||||||
"edit": {
|
"edit": {
|
||||||
|
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
|
||||||
|
"thumbnailMissingConfirmation": "サムネールが設定されてゐません.更新しますか?",
|
||||||
"validationFailed": "更新はできなかったよ……",
|
"validationFailed": "更新はできなかったよ……",
|
||||||
"conflictTitle": "競合が発生しました.",
|
"conflictTitle": "競合が発生しました.",
|
||||||
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
|
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ 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)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
it ('submits edited tag fields', async () => {
|
it ('submits edited tag fields', async () => {
|
||||||
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
|
||||||
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
|
tagsApi.fetchTag
|
||||||
|
.mockResolvedValue (updatedTag)
|
||||||
|
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||||
|
api.apiPut.mockResolvedValueOnce (updatedTag)
|
||||||
|
|
||||||
renderPage ()
|
renderPage ()
|
||||||
|
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする