コミットを比較
4
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
a02037599a | ||
|
|
09df6d740a | ||
|
|
df9e98132e | ||
|
|
930817d077 |
@@ -37,7 +37,7 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
needs_history_join = order[0] == 'updated_at' || updated_between.any?(&:present?)
|
history_join_required = order[0] == 'updated_at' || updated_between.any?(&:present?)
|
||||||
|
|
||||||
q =
|
q =
|
||||||
filtered_posts(locale)
|
filtered_posts(locale)
|
||||||
@@ -57,8 +57,8 @@ class PostsController < ApplicationController
|
|||||||
q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
|
q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
|
||||||
q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
|
q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
|
||||||
count_scope = q
|
count_scope = q
|
||||||
if needs_history_join
|
if history_join_required
|
||||||
history_times = HistoryAccess.visible(PostVersion.all)
|
history_times = PostVersion.all
|
||||||
.select('post_id, MAX(created_at) AS latest_at').group(:post_id)
|
.select('post_id, MAX(created_at) AS latest_at').group(:post_id)
|
||||||
q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
|
q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
|
||||||
'ON history_times.post_id = posts.id')
|
'ON history_times.post_id = posts.id')
|
||||||
@@ -72,7 +72,7 @@ class PostsController < ApplicationController
|
|||||||
q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
|
q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
|
||||||
end
|
end
|
||||||
count_scope = q if updated_between.any?(&:present?)
|
count_scope = q if updated_between.any?(&:present?)
|
||||||
if needs_history_join
|
if history_join_required
|
||||||
q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
|
q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -92,10 +92,10 @@ class PostsController < ApplicationController
|
|||||||
.offset(offset)
|
.offset(offset)
|
||||||
.to_a
|
.to_a
|
||||||
latest_version_times =
|
latest_version_times =
|
||||||
if needs_history_join
|
if history_join_required
|
||||||
{ }
|
{ }
|
||||||
else
|
else
|
||||||
HistoryAccess.visible(PostVersion.where(post_id: posts.map(&:id)))
|
PostVersion.where(post_id: posts.map(&:id))
|
||||||
.group(:post_id).maximum(:created_at)
|
.group(:post_id).maximum(:created_at)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ class TagDescriptionsController < ApplicationController
|
|||||||
private
|
private
|
||||||
|
|
||||||
def representation description
|
def representation description
|
||||||
HistoryAccess.require_current!(description, TagDescriptionVersion)
|
|
||||||
description.as_json(only: [
|
description.as_json(only: [
|
||||||
:tag_id,
|
:tag_id,
|
||||||
:language_code,
|
:language_code,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
class TagGroupsController < ApplicationController
|
class TagGroupsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
locale = resolve_locale!
|
locale = resolve_locale!
|
||||||
groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).includes(:created_by_user, :updated_by_user).order(:id)
|
groups = TagGroup.includes(:created_by_user, :updated_by_user).order(:id)
|
||||||
render json: TagGroupRepr.many(locale, groups.to_a)
|
render json: TagGroupRepr.many(locale, groups.to_a)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -8,12 +8,11 @@ class WikiPagesController < ApplicationController
|
|||||||
|
|
||||||
title = params[:title].to_s.strip
|
title = params[:title].to_s.strip
|
||||||
descriptions =
|
descriptions =
|
||||||
HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
|
TagDescription.where(language_code: locale.language_code)
|
||||||
.where(language_code: locale.language_code)
|
|
||||||
.includes(tag: :tag_names)
|
.includes(tag: :tag_names)
|
||||||
|
|
||||||
descriptions = descriptions.order(updated_at: :desc, id: :asc)
|
descriptions = descriptions.order(updated_at: :desc, id: :asc)
|
||||||
tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
|
tag_groups = TagGroup.order(updated_at: :desc, id: :asc)
|
||||||
if title.present?
|
if title.present?
|
||||||
pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
|
pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
|
||||||
descriptions =
|
descriptions =
|
||||||
@@ -41,13 +40,13 @@ class WikiPagesController < ApplicationController
|
|||||||
return head :not_found unless language.is_a?(String)
|
return head :not_found unless language.is_a?(String)
|
||||||
return head :not_found unless Language.exists?(code: language)
|
return head :not_found unless Language.exists?(code: language)
|
||||||
|
|
||||||
names = HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
|
names = TagDescription.joins(tag: :tag_names)
|
||||||
.where(language_code: locale.language_code, tag_names: { language_code: language })
|
.where(language_code: locale.language_code, tag_names: { language_code: language })
|
||||||
.pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
|
.pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
|
||||||
candidates = names.map do |tag_id, description_id, name|
|
candidates = names.map do |tag_id, description_id, name|
|
||||||
WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
|
WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
|
||||||
end
|
end
|
||||||
candidates.concat(HistoryAccess.current(TagGroup.all, TagGroupVersion).order(:id).pluck(:id, :name).map do |id, name|
|
candidates.concat(TagGroup.order(:id).pluck(:id, :name).map do |id, name|
|
||||||
WikiPageRepr.autolink_group(locale, id:, name:, language:)
|
WikiPageRepr.autolink_group(locale, id:, name:, language:)
|
||||||
end)
|
end)
|
||||||
render json: candidates
|
render json: candidates
|
||||||
@@ -411,7 +410,7 @@ class WikiPagesController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def tag_description_by_title locale, title
|
def tag_description_by_title locale, title
|
||||||
HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
|
TagDescription.joins(tag: :tag_names)
|
||||||
.find_by(language_code: locale.language_code,
|
.find_by(language_code: locale.language_code,
|
||||||
tag_names: { language_code: locale.language_code, name: title })
|
tag_names: { language_code: locale.language_code, name: title })
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -147,29 +147,6 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
|
|||||||
scope.where(Arel.sql(sql(scope.klass, row)))
|
scope.where(Arel.sql(sql(scope.klass, row)))
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.current(scope, version_model)
|
|
||||||
return scope if admin?
|
|
||||||
|
|
||||||
table = scope.klass.table_name
|
|
||||||
keys = KEYS.fetch(version_model.table_name)
|
|
||||||
matches = keys.map do |key|
|
|
||||||
column = scope.klass.column_names.include?(key) ? key : 'id'
|
|
||||||
"current_snapshot.#{ key } = #{ table }.#{ column }"
|
|
||||||
end.join(' AND ')
|
|
||||||
boundary = "#{ matches } AND current_snapshot.version_no >= #{ table }.version_no " +
|
|
||||||
"AND current_snapshot.event_type = 'discard'"
|
|
||||||
scope = scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
|
|
||||||
"current_snapshot WHERE #{ boundary })"))
|
|
||||||
condition = "#{ matches } AND current_snapshot.version_no = #{ table }.version_no"
|
|
||||||
scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
|
|
||||||
"current_snapshot WHERE #{ condition } AND NOT (#{ sql(version_model, 'current_snapshot') }))"))
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.require_current!(record, version_model)
|
|
||||||
return if admin?
|
|
||||||
raise Forbidden unless current(record.class.where(id: record.id), version_model).exists?
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.blob_visible?(blob, seen = [])
|
def self.blob_visible?(blob, seen = [])
|
||||||
return true if admin?
|
return true if admin?
|
||||||
return false if seen.include?(blob.id)
|
return false if seen.include?(blob.id)
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ module TagGroupRepr
|
|||||||
end
|
end
|
||||||
|
|
||||||
def one locale, group
|
def one locale, group
|
||||||
HistoryAccess.require_current!(group, TagGroupVersion)
|
|
||||||
many(locale, [group]).first
|
many(locale, [group]).first
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ module WikiPageRepr
|
|||||||
module_function
|
module_function
|
||||||
|
|
||||||
def tag_description locale, description
|
def tag_description locale, description
|
||||||
HistoryAccess.require_current!(description, TagDescriptionVersion)
|
|
||||||
tag = description.tag
|
tag = description.tag
|
||||||
|
|
||||||
{ 'id' => description.id,
|
{ 'id' => description.id,
|
||||||
|
|||||||
@@ -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 ()
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする