コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
62f501be2e | ||
|
|
da63b46d4b |
@@ -3,8 +3,8 @@ class PostTagSearch
|
|||||||
def self.literals(locale, raw)
|
def self.literals(locale, raw)
|
||||||
tokens = raw.split.reject { _1.downcase == 'type:or' }
|
tokens = raw.split.reject { _1.downcase == 'type:or' }
|
||||||
names = tokens.map { _1.sub(/\Anot:/i, '') }
|
names = tokens.map { _1.sub(/\Anot:/i, '') }
|
||||||
registered = TagName.where(language_code: locale.language_code, name: names)
|
registered = matching_names(TagName.where(language_code: locale.language_code),
|
||||||
.pluck(:name, :tag_id).to_h
|
names, 'tag_names.name', :tag_id).to_h
|
||||||
primary = TagName.where(language_code: locale.language_code,
|
primary = TagName.where(language_code: locale.language_code,
|
||||||
tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
|
tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
|
||||||
tokens.zip(names).map do |token, name|
|
tokens.zip(names).map do |token, name|
|
||||||
@@ -19,12 +19,25 @@ class PostTagSearch
|
|||||||
|
|
||||||
def self.references_for(locale, literals)
|
def self.references_for(locale, literals)
|
||||||
names = literals.map { _1[:name] }.uniq
|
names = literals.map { _1[:name] }.uniq
|
||||||
internal = TagName.where(language_code: locale.language_code, name: names)
|
internal = matching_names(TagName.where(language_code: locale.language_code),
|
||||||
.pluck(:name, :tag_id).group_by(&:first)
|
names, 'tag_names.name', :tag_id).group_by(&:first)
|
||||||
external = names.empty? ? {} : ExternalTag.where(
|
external = matching_names(ExternalTag.all, names,
|
||||||
"CONCAT(platform, ':', name) IN (?)", names)
|
"CONCAT(external_tags.platform, ':', external_tags.name)", :id).group_by(&:first)
|
||||||
.pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
|
|
||||||
names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
|
names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
|
||||||
external.fetch(name, []).map(&:last).uniq]] }
|
external.fetch(name, []).map(&:last).uniq]] }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.matching_names(scope, names, expression, identifier)
|
||||||
|
return [] if names.empty?
|
||||||
|
|
||||||
|
queries = names.uniq.map do |name|
|
||||||
|
scope.klass.sanitize_sql_array(['SELECT ? AS name', name])
|
||||||
|
end
|
||||||
|
# Return the input spelling so Ruby does not recheck database equivalence.
|
||||||
|
scope.joins(<<~SQL).pluck(Arel.sql('search_names.name'), identifier)
|
||||||
|
INNER JOIN (#{ queries.join(' UNION ALL ') }) AS search_names
|
||||||
|
ON #{ expression } = search_names.name COLLATE utf8mb4_0900_ai_ci
|
||||||
|
SQL
|
||||||
|
end
|
||||||
|
private_class_method :matching_names
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする