redmineup 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd9e2b69c72c5f3ec376bd59f68cd701bcb28a1ac81c7fbf31085acdd422e18
-  data.tar.gz: 52bf3b2fd440ace540ba8d1eba5d297243ded63da5e806a9496d41c796f9d628
+  metadata.gz: 497432257e3dd60a1140adb02b491af3e36a669a8c2af4cb42fb810f09b26b4c
+  data.tar.gz: e07c21fc5a9358e9706fb2d922919c994a17013704d583cfd87282162a03c40e
 SHA512:
-  metadata.gz: 1d196b8b574b8643412d71618072da558649c48748b92b471e7594743ebe6c7c2f03f8c3c523e5774034040bb4a802d77fe00713acfeb50b978bb1a46f605cee
-  data.tar.gz: '07478c4976432e4103a50630d60fa691d153434a238e3811bae0d393ad4c1e24a5e17246268e569a1a03b023bd8b704ec15c55536dbb045ffd83db1cb1f12c56'
+  metadata.gz: '09ea94ec0283833d3c2daa10ca34239374eb64dccbfd8130dabea3f292947c0d9f88e92e33b5e17c544bacf0014f782aa712fbc280a5b7e45e5368d1f07ebb17'
+  data.tar.gz: 959335aba0d22370913ced0db6b826a93eb2a856422aa0e22a3f85d21a2c6d0cba6a5788068391441944db221ac300a555b7339dca588ee40a6348011bc58ab4

data/doc/CHANGELOG

@@ -4,6 +4,10 @@ Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2026 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2026-10-11 v1.1.15
+
+* Speeded up the tags list query (available_tags) on pages with a lot of tagged records
+
 == 2026-10-09 v1.1.14
 
 * Fixed missing calendar icons and extra padding in Redmine 6/7

data/lib/redmineup/acts_as_taggable/up_acts_as_taggable.rb

@@ -129,43 +129,43 @@ module Redmineup
         #Return all avalible tags for a project or global
         #Example: Question.available_tags(:project => @project_id )
         def available_tags(options = {})
-          projects = [[options[:project]], options[:projects]].flatten.compact
           limit = options[:limit].to_i.zero? ? 30 : options[:limit].to_i
-          scope = Tag.where({})
-          class_name = quote_string_value(base_class.name)
-          join = []
-          join << "JOIN #{Tagging.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id "
-          join << "JOIN #{table_name} ON #{table_name}.id = #{Tagging.table_name}.taggable_id
-            AND #{Tagging.table_name}.taggable_type = #{class_name} "
-          if attribute_names.include?('project_id') && projects.any?
-            join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
-            scope = scope.where("#{table_name}.project_id IN (%s)", projects.map(&:id).join(','))
-          end
+          counts_sql = Tag.connection.unprepared_statement { tagged_records_scope(options).to_sql }
 
+          scope = Tag.joins("JOIN (#{counts_sql}) tag_counts ON tag_counts.tag_id = #{Tag.table_name}.id")
+          scope = scope.select("#{Tag.table_name}.*, tag_counts.count AS count")
           if options[:name_like].present?
             scope = scope.where("LOWER(#{Tag.table_name}.name) LIKE LOWER(?)", "%#{options[:name_like]}%")
           end
+          scope.order("#{Tag.table_name}.name").limit(limit)
+        end
 
-          group_fields = ''
-          group_fields << ", #{Tag.table_name}.created_at" if Tag.respond_to?(:created_at)
-          group_fields << ", #{Tag.table_name}.updated_at" if Tag.respond_to?(:updated_at)
-          group_fields << ", #{Tag.table_name}.color" if Tag.column_names.include?('color')
+        # tag_id => number of visible taggables. Extension point for available_tags.
+        def tagged_records_scope(options = {})
+          projects = [[options[:project]], options[:projects]].flatten.compact
+          scope = Tagging.unscoped.
+            joins("JOIN #{table_name} ON #{table_name}.id = #{Tagging.table_name}.taggable_id").
+            where("#{Tagging.table_name}.taggable_type = ?", base_class.name).
+            group("#{Tagging.table_name}.tag_id").
+            select("#{Tagging.table_name}.tag_id, COUNT(DISTINCT #{Tagging.table_name}.taggable_id) AS count")
+
+          projects_joined = false
+          if attribute_names.include?('project_id') && projects.any?
+            scope = scope.joins("JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id").
+              where("#{table_name}.project_id IN (?)", projects.map(&:id))
+            projects_joined = true
+          end
 
           if base_class.respond_to?(:visible_condition)
             visible_condition = base_class.visible_condition(User.current)
-            if visible_condition.include?('project_id') && join.all? { |jn| jn.exclude?('JOIN projects') }
-              join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
+            if visible_condition.include?('project_id') && !projects_joined
+              scope = scope.joins("JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id")
             end
             scope = scope.where(visible_condition)
           end
-          scope = scope.joins(join.join(' '))
-          scope = scope.select("#{Tag.table_name}.*, COUNT(DISTINCT #{Tagging.table_name}.taggable_id) AS count")
-          scope = scope.group("#{Tag.table_name}.id, #{Tag.table_name}.name #{group_fields}")
-          scope = scope.having('COUNT(*) > 0')
-          scope = scope.order("#{Tag.table_name}.name")
-          scope = scope.limit(limit)
           scope
         end
+
         # Returns an array of related tags.
         # Related tags are all the other tags that are found on the models tagged with the provided tags.
         #

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.1.14'
+  VERSION = '1.1.15'
 end

data/redmineup.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://www.redmineup.com"
   spec.license       = "GPL-2.0"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?("doc/dev/") || %w[AGENTS.md GLOSSARY.md].include?(f) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-09 00:00:00.000000000 Z
+date: 2026-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails