additional_tags 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6573f962ff7b251ce5afae13e2659985887d486d320fcb99f4c99892fa8a52
-  data.tar.gz: a258bcf71c8c53b40a5b7bcec92e9b6ff8a7dde6070fe5cfdc3eac0adb3d2ccb
+  metadata.gz: '094d1e57c687d9c643b002e5e6134a457d47791a2b086c3c159d690242228488'
+  data.tar.gz: dbfd7b4cb744aef1df5d132615bc1d8816ac85ccb7b837b04376d2b1eb9a76d6
 SHA512:
-  metadata.gz: 46e6f62fae40af6b03d6b09a2b237f4049ab4d54ce30289e1fa7a74b9ee7f57df586feb3cf695f4268a86478365fee580db550e9b044c84281fcb464e2fde321
-  data.tar.gz: 8b1c9a8b5873b2b993f27d80186e9c7e0a024e201aba3c0125f47331c6fda50d673cbb1f572c17b2aef1b613b687f6a66c86c17d9b325f8c20e9c2bd8e6bf103
+  metadata.gz: f95b50b1d98bb7f22c8a2d3bfc5d767ba85a6df06b5e259d9fe2a03ce2980f6577e948f6120f0fb831d3dee5155f88ebdab215534a3264fc24adb31749610122
+  data.tar.gz: 417da0e654d1d966592242c95dd12899638758023b0822499c92e2079d03c28f0b9788046ee161f6ce721df325a0cdd91f1bd6dfe621cb88f910d7b9c12dcd3e

data/.github/workflows/brakeman.yml

@@ -16,7 +16,8 @@ jobs:
 
     - name: Setup Gemfile
       run: |
-        cp test/support/gemfile.rb Gemfile
+        touch .enable_dev
+        sed -i "3isource 'https://rubygems.org'" Gemfile
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1

data/.github/workflows/linters.yml

@@ -16,7 +16,8 @@ jobs:
 
     - name: Setup Gemfile
       run: |
-        cp test/support/gemfile.rb Gemfile
+        touch .enable_dev
+        sed -i "3isource 'https://rubygems.org'" Gemfile
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1

data/.gitignore

@@ -6,3 +6,4 @@ Gemfile.lock
 .project
 .settings/
 ._*
+.enable_dev

data/.rubocop.yml

@@ -16,6 +16,10 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Enabled: false
 
+Metrics/ParameterLists:
+  Enabled: true
+  CountKeywordArgs: false
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -34,6 +38,12 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 25
 
+Style/ExpandPathArguments:
+  Enabled: true
+  Exclude:
+    - additional_tags.gemspec
+    - test/**/*
+
 Rails/ApplicationJob:
   Enabled: false
 
@@ -56,14 +66,37 @@ Style/AutoResourceCleanup:
   Enabled: true
 
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Enabled: true
+  Exclude:
+    - '/**/*.rsb'
 
 Style/Documentation:
   Enabled: false
 
-# required for travis/ci (symbolic links problem)
-Style/ExpandPathArguments:
-  Enabled: false
+Style/OptionHash:
+  Enabled: true
+  SuspiciousParamNames:
+    - options
+    - api_options
+    - opts
+    - args
+    - params
+    - parameters
+    - settings
+  Exclude:
+    - lib/additional_tags/patches/*.rb
+
+Style/ReturnNil:
+  Enabled: true
+
+Style/UnlessLogicalOperators:
+  Enabled: true
+
+Style/MethodCallWithArgsParentheses:
+  Enabled: true
+  AllowParenthesesInMultilineCall: true
+  AllowParenthesesInChaining: true
+  EnforcedStyle: omit_parentheses
 
 Style/HashTransformKeys:
   Enabled: false

data/.slim-lint.yml

@@ -17,10 +17,11 @@ linters:
       - Layout/MultilineMethodCallIndentation
       - Layout/MultilineMethodDefinitionBraceLayout
       - Layout/MultilineOperationIndentation
+      - Layout/SpaceBeforeBrackets
       - Layout/TrailingEmptyLines
       - Lint/Void
       - Rails/OutputSafety
+      - Style/FrozenStringLiteralComment
       - Style/IfUnlessModifier
-      - Style/WhileUntilModifier
       - Style/Next
-      - Layout/SpaceBeforeBrackets
+      - Style/WhileUntilModifier

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/additional_tags.gemspec

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 lib = File.expand_path '../lib', __FILE__
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 require 'additional_tags/version'
 
 Gem::Specification.new do |spec|
@@ -14,10 +16,10 @@ Gem::Specification.new do |spec|
   spec.license       = 'GPL-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^((test|spec|features)/|Gemfile)})
+    f.match %r{^((test|spec|features)/|Gemfile)}
   end
   spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5'
 

data/app/controllers/additional_tags_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdditionalTagsController < ApplicationController
   before_action :require_admin
   before_action :find_tag, only: %i[edit update]
@@ -56,7 +58,7 @@ class AdditionalTagsController < ApplicationController
   end
 
   def bulk_find_tags
-    @tags = ActsAsTaggableOn::Tag.joins("JOIN #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.taggings_table}" \
+    @tags = ActsAsTaggableOn::Tag.joins("LEFT JOIN #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.taggings_table}" \
                                         " ON #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.taggings_table}.tag_id =" \
                                         " #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id ")
                                  .select("#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id," \
@@ -67,6 +69,7 @@ class AdditionalTagsController < ApplicationController
                                  .group("#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id" \
                                         ", #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name" \
                                         ", #{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.taggings_count")
+
     raise ActiveRecord::RecordNotFound if @tags.empty?
   end
 

data/app/controllers/issue_tags_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class IssueTagsController < ApplicationController
   before_action :find_issues, only: %i[edit update]
 
@@ -25,7 +27,7 @@ class IssueTagsController < ApplicationController
       tags = params[:issue] && params[:issue][:tag_list] ? params[:issue][:tag_list].reject(&:empty?) : []
 
       unless User.current.allowed_to?(:create_issue_tags, @projects.first) || Issue.allowed_tags?(tags)
-        flash[:error] = t(:notice_failed_to_add_tags)
+        flash[:error] = t :notice_failed_to_add_tags
         return
       end
 
@@ -35,13 +37,13 @@ class IssueTagsController < ApplicationController
           issue.save!
         end
       end
-      flash[:notice] = t(:notice_tags_added)
+      flash[:notice] = t :notice_tags_added
     else
-      flash[:error] = t(:notice_failed_to_add_tags)
+      flash[:error] = t :notice_failed_to_add_tags
     end
   rescue StandardError => e
     Rails.logger.warn "Failed to add tags: #{e.inspect}"
-    flash[:error] = t(:notice_failed_to_add_tags)
+    flash[:error] = t :notice_failed_to_add_tags
   ensure
     redirect_to_referer_or { render text: 'Tags updated.', layout: true }
   end

data/app/helpers/additional_tags_helper.rb

@@ -1,4 +1,4 @@
-require 'digest/md5'
+# frozen_string_literal: true
 
 module AdditionalTagsHelper
   include ActsAsTaggableOn::TagsHelper
@@ -12,13 +12,13 @@ module AdditionalTagsHelper
 
     columns = {}
 
-    if AdditionalTags.setting?(:active_issue_tags)
+    if AdditionalTags.setting? :active_issue_tags
       columns[:issue] = { label: l(:label_issue_plural),
                           tag_controller: :issues,
                           counts: Issue.available_tags.map { |tag| [tag.id, tag.count] }.to_h }
     end
 
-    if AdditionalTags.setting?(:active_wiki_tags)
+    if AdditionalTags.setting? :active_wiki_tags
       columns[:wiki] = { label: l(:label_wiki),
                          counts: WikiPage.available_tags.map { |tag| [tag.id, tag.count] }.to_h }
     end
@@ -43,11 +43,11 @@ module AdditionalTagsHelper
     columns
   end
 
-  def render_tags_list(tags, options = {})
+  def render_tags_list(tags, **options)
     return if tags.blank?
 
-    style = options.delete(:style)
-    tags = tags.all.to_a if tags.respond_to?(:all)
+    style = options.delete :style
+    tags = tags.all.to_a if tags.respond_to? :all
 
     case "#{AdditionalTags.setting :tags_sort_by}:#{AdditionalTags.setting :tags_sort_order}"
     when 'name:desc'
@@ -71,7 +71,7 @@ module AdditionalTagsHelper
       raise 'Unknown list style'
     end
 
-    content = ''.html_safe
+    content = +''.html_safe
     if style == :list && AdditionalTags.setting(:tags_sort_by) == 'name'
       tags.group_by { |tag| tag.name.downcase.first }.each do |letter, grouped_tags|
         content << content_tag(item_el, letter.upcase, class: 'letter')
@@ -84,26 +84,26 @@ module AdditionalTagsHelper
     content_tag(list_el, content, class: 'tags-cloud', style: (style == :simple_cloud ? 'text-align: left;' : ''))
   end
 
-  def additional_tag_link(tag_object, options = {})
+  def additional_tag_link(tag_object, link: nil, link_wiki_tag: false, show_count: false, use_colors: nil, **options)
     tag_name = []
     tag_name << tag_object.name
 
     options[:project] = @project if options[:project].blank? && @project.present?
 
-    use_colors = AdditionalTags.setting?(:use_colors)
+    use_colors ||= AdditionalTags.setting? :use_colors
     if use_colors
       tag_bg_color = additional_tag_color tag_object.name
       tag_fg_color = additional_tag_fg_color tag_bg_color
       tag_style = "background-color: #{tag_bg_color}; color: #{tag_fg_color}"
     end
 
-    tag_name << tag.span("(#{tag_object.count})", class: 'tag-count') if options[:show_count]
+    tag_name << tag.span("(#{tag_object.count})", class: 'tag-count') if show_count
 
-    content = if options[:link]
+    content = if link
                 link_to safe_join(tag_name),
-                        options[:link],
+                        link,
                         style: tag_style
-              elsif options[:link_wiki_tag]
+              elsif link_wiki_tag
                 link = if options[:project].present?
                          project_wiki_index_path options[:project], tag: tag_object.name
                        else
@@ -112,7 +112,7 @@ module AdditionalTagsHelper
                 link_to safe_join(tag_name), link, style: tag_style
               else
                 link_to safe_join(tag_name),
-                        tag_url(tag_object.name, options),
+                        tag_url(tag_object.name, **options),
                         style: tag_style
               end
 
@@ -122,11 +122,11 @@ module AdditionalTagsHelper
               { class: 'tag-label' }
             end
 
-    tag.span content, style
+    tag.span content, **style
   end
 
   def additional_tag_color(tag_name)
-    "##{Digest::MD5.hexdigest(tag_name)[0..5]}"
+    "##{Digest::SHA256.hexdigest(tag_name)[0..5]}"
   end
 
   def additional_tag_fg_color(bg_color)
@@ -140,53 +140,51 @@ module AdditionalTagsHelper
   end
 
   # plain list of tags
-  def additional_plain_tag_list(tags, sep = ' ')
-    s = if tags.blank?
-          ['']
-        else
-          tags.map(&:name)
-        end
+  def additional_plain_tag_list(tags, sep: nil)
+    sep ||= "#{Query.additional_csv_separator} "
+
+    s = tags.present? ? tags.map(&:name) : ['']
     s.join sep
   end
 
-  def additional_tag_sep(use_colors)
-    if use_colors.nil? || use_colors
-      ' '
-    else
-      ', '
-    end
+  def additional_tag_sep(use_colors: true)
+    use_colors ? ' ' : ', '
+  end
+
+  def additional_tags_from_string(str)
+    str.to_s.split(',').map(&:strip)
   end
 
-  def additional_tag_links(tag_list, options = {})
+  def additional_tag_links(tag_list, **options)
     return if tag_list.blank?
 
-    unsorted = options.delete(:unsorted)
-    tag_list = AdditionalTags::Tags.sort_tag_list(tag_list) unless unsorted
+    unsorted = options.delete :unsorted
+    tag_list = AdditionalTags::Tags.sort_tag_list tag_list unless unsorted
 
-    safe_join tag_list.map { |tag| additional_tag_link tag, options },
-              additional_tag_sep(options[:use_colors])
+    safe_join tag_list.map { |tag| additional_tag_link tag, **options },
+              additional_tag_sep(use_colors: options[:use_colors])
   end
 
   private
 
-  def tag_url(tag_name, options = {})
-    action = options[:tag_action].presence || (controller_name == 'hrm_user_resources' ? 'show' : 'index')
+  def tag_url(tag_name, filter: nil, tag_action: nil, tag_controller: nil, project: nil)
+    action = tag_action.presence || (controller_name == 'hrm_user_resources' ? 'show' : 'index')
 
     fields = [:tags]
     values = { tags: [tag_name] }
     operators = { tags: '=' }
 
-    if options[:filter].present?
-      field = options[:filter][:field]
+    if filter.present?
+      field = filter[:field]
       fields << field
-      operators[field] = options[:filter][:operator]
-      values[field] = options[:filter][:value] if options[:filter].key?(:value)
+      operators[field] = filter[:operator]
+      values[field] = filter[:value] if filter.key? :value
     end
 
-    { controller: options[:tag_controller].presence || controller_name,
+    { controller: tag_controller.presence || controller_name,
       action: action,
       set_filter: 1,
-      project_id: options[:project],
+      project_id: project,
       f: fields,
       v: values,
       op: operators }

data/app/helpers/additional_tags_issues_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTagsIssuesHelper
   # Hacked render_api_custom_values to add plugin values to issue api
   def render_api_custom_values(custom_values, api)
@@ -9,7 +11,7 @@ module AdditionalTagsIssuesHelper
 
       api.array :tags do
         @issue.tags.each do |tag|
-          api.tag(id: tag.id, name: tag.name)
+          api.tag id: tag.id, name: tag.name
         end
       end
     end

data/app/helpers/additional_tags_wiki_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module AdditionalTagsWikiHelper
   def sidebar_tags
     unless @sidebar_tags
       @sidebar_tags = []
-      @sidebar_tags = WikiPage.available_tags(project: @project) if AdditionalTags.show_sidebar_tags?
+      @sidebar_tags = WikiPage.available_tags project: @project if AdditionalTags.show_sidebar_tags?
     end
     @sidebar_tags
   end
@@ -37,13 +39,13 @@ module AdditionalTagsWikiHelper
     scope = if wiki
               wiki.pages
             else
-              WikiPage.joins(wiki: :project)
+              WikiPage.joins wiki: :project
             end
 
-    scope = scope.visible(User.current, project: project) if scope.respond_to? :visible
+    scope = scope.visible User.current, project: project if scope.respond_to? :visible
 
     scope = scope.joins(AdditionalTags::Tags.tag_to_joins(WikiPage))
-                 .where("LOWER(#{ActiveRecord::Base.connection.quote_table_name(ActsAsTaggableOn.tags_table)}.name) = LOWER(:p)",
+                 .where("LOWER(#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name) = LOWER(:p)",
                         p: tag.to_s.strip)
                  .with_updated_on
                  .joins(wiki: :project)

data/app/jobs/additional_tags_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdditionalTagsJob < AdditionalsJob
   queue_as :additional_tags
 end

data/app/jobs/additional_tags_remove_unused_tag_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdditionalTagsRemoveUnusedTagJob < AdditionalTagsJob
   def perform
     AdditionalTags::Tags.remove_unused_tags

data/app/models/migrate_tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MigrateTag < ActiveRecord::Base
   self.table_name = 'tags'
   has_many :migrate_taggings, dependent: :destroy, foreign_key: :tag_id, inverse_of: :migrate_tag

data/app/models/migrate_tagging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MigrateTagging < ActiveRecord::Base
   self.table_name = 'taggings'
   belongs_to :migrate_tag, foreign_key: :tag_id, inverse_of: :migrate_taggings

data/app/models/query_tags_column.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class QueryTagsColumn < QueryRelationsColumn
+  def initialize(name = :tags, **options)
+    super name, **options
+  end
+end

data/app/views/additional_tags/_tag_list.html.slim

@@ -2,7 +2,7 @@
   .tags.attribute
     - unless defined? hide_label
       span.label
-        = l(:field_tag_list)
+        = l :field_tag_list
         ' :
     - if defined?(editable) && editable
       #tags-data

data/app/views/additional_tags/merge.html.slim

@@ -6,9 +6,10 @@ h2
 
 = form_tag merge_additional_tags_path(ids: @tags.map(&:id)), class: 'tabular' do
   = error_messages_for 'tag'
-  = additional_tag_links @tags, { show_count: true,
-                                  use_colors: AdditionalTags.setting?(:use_colors),
-                                  link: '#' }
+  = additional_tag_links @tags,
+                         show_count: true,
+                         use_colors: AdditionalTags.setting?(:use_colors),
+                         link: '#'
   .box
     p
       label[for="tag_name"]

data/app/views/additional_tags/settings/_manage_tags.html.slim

@@ -15,7 +15,7 @@
       - tags.each do |tag|
         tr.hascontextmenu id="#{tag.id}"
           td.checkbox.hide-when-print
-           = check_box_tag('ids[]', tag.id, false, id: nil)
+           = check_box_tag 'ids[]', tag.id, false, id: nil
           td = additional_tag_link tag, link: edit_additional_tag_path(tag)
           - manageable_tag_column_values(tag).each do |column|
             td = column

data/app/views/issue_tags/_edit_modal.html.slim

@@ -21,10 +21,10 @@ h3.title = l :label_add_tags
                                 placeholder: @is_bulk_editing ? t(:label_no_change_option) : '+ add tag',
                                 tags: User.current.allowed_to?(:create_issue_tags, @project)
     p.most_used_tags
-      = safe_join @most_used_tags.collect { |t| tag.span(t.name, class: 'most_used_tag') }, ', '
+      = safe_join @most_used_tags.collect { |t| tag.span t.name, class: 'most_used_tag' }, ', '
     = javascript_tag "var mostUsedTags = #{@most_used_tags.map(&:name)}"
 
   .buttons
     = submit_tag l(:button_add), name: nil
     '
-    = submit_tag l(:button_cancel), name: nil, onclick: 'hideModal(this);', type: 'button'
+    = link_to_function l(:button_cancel), 'hideModal(this);'

data/app/views/issues/_tags_form.html.slim

@@ -1,4 +1,4 @@
-- project = defined?(project) ? project : @project
+- project = @project unless defined?(project)
 - options = { multiple: true,
               width: '95%',
               url: issue_tags_auto_completes_path(project_id: project),

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   resources :auto_completes, only: [] do
     collection do

data/db/migrate/20201116145429_acts_as_taggable_migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActsAsTaggableMigration < ActiveRecord::Migration[5.2]
   def up
     create_table ActsAsTaggableOn.tags_table do |t|
@@ -30,7 +32,7 @@ class ActsAsTaggableMigration < ActiveRecord::Migration[5.2]
 
     return unless ActsAsTaggableOn::Utils.using_mysql?
 
-    execute("ALTER TABLE #{ActsAsTaggableOn.tags_table} MODIFY name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;")
+    execute "ALTER TABLE #{ActsAsTaggableOn.tags_table} MODIFY name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;"
   end
 
   def down

data/db/migrate/20201123093214_migrate_existing_tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MigrateExistingTags < ActiveRecord::Migration[5.2]
   def up
     return unless table_exists?(MigrateTag.table_name) && table_exists?(MigrateTagging.table_name)
@@ -11,7 +13,7 @@ class MigrateExistingTags < ActiveRecord::Migration[5.2]
         old_tag.migrate_taggings.each do |tagging|
           next if excluded_taggable_types.include? tagging.taggable_type
 
-          tag = ActsAsTaggableOn::Tag.create!(name: old_tag.name) if cnt.zero? && tag.nil?
+          tag = ActsAsTaggableOn::Tag.create! name: old_tag.name if cnt.zero? && tag.nil?
           context = tagging.respond_to?('context') && tagging.context.present? ? tagging.context : 'tags'
 
           # old data can include dups
@@ -28,7 +30,7 @@ class MigrateExistingTags < ActiveRecord::Migration[5.2]
           cnt += 1
         end
 
-        ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings) unless tag.nil?
+        ActsAsTaggableOn::Tag.reset_counters tag.id, :taggings unless tag.nil?
       end
     end
   end

data/init.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Redmine::Plugin.register :additional_tags do
   name        'Additional Tags'
   author      'AlphaNodes GmbH'

data/lib/additional_tags.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'additional_tags/version'
 require 'additional_tags/tags'
 
 module AdditionalTags
-  TAG_TABLE_NAME = 'additional_tags'.freeze
-  TAGGING_TABLE_NAME = 'additional_taggings'.freeze
+  TAG_TABLE_NAME = 'additional_tags'
+  TAGGING_TABLE_NAME = 'additional_taggings'
 
   class << self
     def setup
@@ -22,6 +24,7 @@ module AdditionalTags
       MyController.include AdditionalTags::Patches::MyControllerPatch
       Issue.include AdditionalTags::Patches::IssuePatch
       Journal.include AdditionalTags::Patches::JournalPatch
+      Query.include AdditionalTags::Patches::QueryPatch
       IssuesController.include AdditionalTags::Patches::IssuesControllerPatch
       ImportsController.include AdditionalTags::Patches::ImportsControllerPatch
       QueriesHelper.include AdditionalTags::Patches::QueriesHelperPatch
@@ -69,19 +72,6 @@ module AdditionalTags
       setting(:tags_sidebar).present? && setting(:tags_sidebar) != 'none'
     end
 
-    def sql_for_tags_field(klass, operator, values)
-      compare = ['=', '*'].include?(operator) ? 'IN' : 'NOT IN'
-
-      case operator
-      when '=', '!'
-        ids_list = klass.tagged_with(values, any: true).pluck :id
-        "(#{klass.table_name}.id #{compare} (#{ids_list.join ','}))" if ids_list.present?
-      else
-        entries = ActsAsTaggableOn::Tagging.where taggable_type: klass.name
-        "(#{klass.table_name}.id #{compare} (#{entries.select(:taggable_id).to_sql}))"
-      end
-    end
-
     private
 
     def settings

data/lib/additional_tags/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   class AdditionalTagsHookListener < Redmine::Hook::ViewListener
     render_on :view_issues_bulk_edit_details_bottom,

data/lib/additional_tags/patches/agile_boards_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileBoardsControllerPatch

data/lib/additional_tags/patches/agile_query_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileQueryPatch
@@ -10,19 +12,19 @@ module AdditionalTags
         alias_method :initialize_available_filters_without_tags, :initialize_available_filters
         alias_method :initialize_available_filters, :initialize_available_filters_with_tags
 
-        add_available_column QueryColumn.new(:tags)
+        add_available_column ::QueryTagsColumn.new
       end
 
       module InstanceMethods
         def sql_for_tags_field(_field, operator, value)
-          case operator
-          when '=', '!'
-            issues = Issue.tagged_with(value.clone, any: true)
-          when '!*'
-            issues = Issue.joins(:tags).uniq
-          else
-            issues = Issue.tagged_with(ActsAsTaggableOn::Tag.all.map(&:to_s), any: true)
-          end
+          issues = case operator
+                   when '=', '!'
+                     Issue.tagged_with value.clone, any: true
+                   when '!*'
+                     Issue.joins(:tags).uniq
+                   else
+                     Issue.tagged_with(ActsAsTaggableOn::Tag.all.map(&:to_s), any: true)
+                   end
 
           compare   = operator.include?('!') ? 'NOT IN' : 'IN'
           ids_list  = issues.collect(&:id).push(0).join(',')

data/lib/additional_tags/patches/agile_versions_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileVersionsControllerPatch

data/lib/additional_tags/patches/agile_versions_query_patch.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileVersionsQueryPatch
       extend ActiveSupport::Concern
 
       included do
-        add_available_column QueryColumn.new(:tags)
+        add_available_column ::QueryTagsColumn.new
       end
     end
   end

data/lib/additional_tags/patches/auto_completes_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AutoCompletesControllerPatch
@@ -30,7 +32,7 @@ module AdditionalTags
           return render_403 unless User.current.admin?
 
           @name = params[:q].to_s
-          sql_for_where = "LOWER(#{ActiveRecord::Base.connection.quote_table_name(ActsAsTaggableOn.tags_table)}.name) LIKE ?"
+          sql_for_where = "LOWER(#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name) LIKE ?"
           @tags = ActsAsTaggableOn::Tag.where(sql_for_where, "%#{@name.downcase}%")
                                        .order(name: :asc)
 

data/lib/additional_tags/patches/calendars_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module CalendarsControllerPatch

data/lib/additional_tags/patches/dashboard_async_blocks_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module DashboardAsyncBlocksControllerPatch

data/lib/additional_tags/patches/dashboards_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module DashboardsControllerPatch

data/lib/additional_tags/patches/gantts_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module GanttsControllerPatch

data/lib/additional_tags/patches/imports_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module ImportsControllerPatch

data/lib/additional_tags/patches/issue_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module IssuePatch
@@ -20,16 +22,16 @@ module AdditionalTags
       class_methods do
         def allowed_tags?(tags)
           allowed_tags = available_tags.map(&:name)
-          tags.all? { |tag| allowed_tags.include?(tag) }
+          tags.all? { |tag| allowed_tags.include? tag }
         end
 
         def by_tags(project, with_subprojects: false)
-          count_and_group_by(project: project, association: :tags, with_subprojects: with_subprojects)
+          count_and_group_by project: project, association: :tags, with_subprojects: with_subprojects
         end
 
-        def available_tags(options = {})
+        def available_tags(**options)
           options[:permission] = :view_issues
-          tags = AdditionalTags::Tags.available_tags self, options
+          tags = AdditionalTags::Tags.available_tags self, **options
           return tags unless options[:open_issues_only]
 
           tags.joins("JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{table_name}.status_id")
@@ -65,8 +67,8 @@ module AdditionalTags
           send 'safe_attributes_without_tags=', attrs, user
         end
 
-        def copy_from_with_tags(arg, options = {})
-          copy_from_without_tags(arg, options)
+        def copy_from_with_tags(arg, **options)
+          copy_from_without_tags(arg, **options)
           issue = arg.is_a?(Issue) ? arg : Issue.visible.find(arg)
           self.tag_list = issue.tag_list
           self

data/lib/additional_tags/patches/issue_query_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module IssueQueryPatch
@@ -5,6 +7,7 @@ module AdditionalTags
 
       included do
         include AdditionalsQuery
+        prepend InstanceOverwriteMethods
         include InstanceMethods
 
         alias_method :initialize_available_filters_without_tags, :initialize_available_filters
@@ -12,9 +15,20 @@ module AdditionalTags
 
         alias_method :available_columns_without_tags, :available_columns
         alias_method :available_columns, :available_columns_with_tags
+      end
+
+      module InstanceOverwriteMethods
+        def build_from_params(params, defaults = {})
+          super
+
+          return self if params[:tag_id].blank?
 
-        alias_method :build_from_params_without_tags, :build_from_params
-        alias_method :build_from_params, :build_from_params_with_tags
+          add_filter 'tags',
+                     '=',
+                     [ActsAsTaggableOn::Tag.find_by(id: params[:tag_id]).try(:name)]
+
+          self
+        end
       end
 
       module InstanceMethods
@@ -31,24 +45,13 @@ module AdditionalTags
             @available_columns = available_columns_without_tags
 
             if AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, project, global: true)
-              @available_columns << QueryColumn.new(:tags)
+              @available_columns << ::QueryTagsColumn.new
             end
           else
             available_columns_without_tags
           end
           @available_columns
         end
-
-        def build_from_params_with_tags(params, defaults = {})
-          build_from_params_without_tags params, defaults
-          return self if params[:tag_id].blank?
-
-          add_filter 'tags',
-                     '=',
-                     [ActsAsTaggableOn::Tag.find_by(id: params[:tag_id]).try(:name)]
-
-          self
-        end
       end
     end
   end

data/lib/additional_tags/patches/issues_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module IssuesControllerPatch

data/lib/additional_tags/patches/journal_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module JournalPatch

data/lib/additional_tags/patches/my_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module MyControllerPatch

data/lib/additional_tags/patches/queries_helper_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module QueriesHelperPatch
@@ -8,25 +10,11 @@ module AdditionalTags
 
         alias_method :column_content_without_tags, :column_content
         alias_method :column_content, :column_content_with_tags
-
-        alias_method :csv_content_without_tags, :csv_content
-        alias_method :csv_content, :csv_content_with_tags
       end
 
       module InstanceMethods
-        def csv_content_with_tags(column, item)
-          if item.is_a?(Issue) && column.name == :tags ||
-             item.is_a?(TimeEntry) && column.name == :issue_tags
-
-            additional_plain_tag_list column.value_object(item)
-          else
-            csv_content_without_tags column, item
-          end
-        end
-
         def column_content_with_tags(column, item)
-          if item.is_a?(Issue) && column.name == :tags ||
-             item.is_a?(TimeEntry) && column.name == :issue_tags
+          if column.name == :issue_tags || item.is_a?(Issue) && column.name == :tags
             additional_tag_links column.value(item),
                                  tag_controller: 'issues',
                                  use_colors: AdditionalTags.setting?(:use_colors)

data/lib/additional_tags/patches/query_patch.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module AdditionalTags
+  module Patches
+    module QueryPatch
+      extend ActiveSupport::Concern
+
+      included do
+        include InstanceMethods
+      end
+
+      module InstanceMethods
+        def sql_for_tags_field(field, _operator, values)
+          build_sql_for_tags_field klass: queried_class, operator: operator_for(field), values: values
+        end
+
+        def initialize_tags_filter(position: nil)
+          add_available_filter 'tags', order: position,
+                                       type: :list_optional,
+                                       values: -> { available_tag_values queried_class }
+        end
+
+        def initialize_issue_tags_filter
+          return unless AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, project, global: true)
+
+          add_available_filter 'issue.tags',
+                               type: :list_optional,
+                               name: l('label_attribute_of_issue', name: l(:field_tags)),
+                               values: -> { available_tag_values Issue }
+        end
+
+        def available_tag_values(klass)
+          klass.available_tags(project: project)
+               .pluck(:name)
+               .map { |name| [name, name] }
+        end
+
+        def build_subquery_for_tags_field(klass:, operator:, values:, joined_table:, joined_field:, target_field: 'issue_id')
+          quoted_joined_table = self.class.connection.quote_table_name joined_table
+          quoted_joined_field = self.class.connection.quote_column_name joined_field
+          quoted_target_field = self.class.connection.quote_column_name target_field
+          subsql = ActsAsTaggableOn::Tagging.joins("INNER JOIN #{quoted_joined_table}" \
+                                                   " ON additional_taggings.taggable_id = #{quoted_joined_table}.#{quoted_target_field}")
+                                            .where(taggable_type: klass.name)
+                                            .where("#{self.class.connection.quote_table_name queried_table_name}.id ="\
+                                                   " #{quoted_joined_table}.#{quoted_joined_field}")
+                                            .select(1)
+
+          if %w[= !].include? operator
+            ids_list = klass.tagged_with(values, any: true).pluck :id
+            subsql = subsql.where taggable_id: ids_list
+          end
+
+          if %w[= *].include? operator
+            " EXISTS(#{subsql.to_sql})"
+          else
+            " NOT EXISTS(#{subsql.to_sql})"
+          end
+        end
+
+        def build_sql_for_tags_field(klass:, operator:, values:)
+          compare = ['=', '*'].include?(operator) ? 'IN' : 'NOT IN'
+          case operator
+          when '=', '!'
+            ids_list = klass.tagged_with(values, any: true).pluck :id
+            "(#{klass.table_name}.id #{compare} (#{ids_list.join ','}))" if ids_list.present?
+          else
+            entries = ActsAsTaggableOn::Tagging.where taggable_type: klass.name
+            id_table = klass.table_name
+            "(#{id_table}.id #{compare} (#{entries.select(:taggable_id).to_sql}))"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/additional_tags/patches/reports_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module ReportsControllerPatch

data/lib/additional_tags/patches/settings_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module SettingsControllerPatch

data/lib/additional_tags/patches/time_entry_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module TimeEntryPatch

data/lib/additional_tags/patches/time_entry_query_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'time_entry_query'
 
 module AdditionalTags
@@ -18,13 +20,7 @@ module AdditionalTags
       module InstanceMethods
         def initialize_available_filters_with_tags
           initialize_available_filters_without_tags
-
-          return unless AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, project, global: true)
-
-          add_available_filter 'issue.tags',
-                               type: :list_optional,
-                               name: l('label_attribute_of_issue', name: l(:field_tags)),
-                               values: -> { available_issue_tags_values }
+          initialize_issue_tags_filter
         end
 
         def available_columns_with_tags
@@ -39,14 +35,8 @@ module AdditionalTags
           @available_columns
         end
 
-        def sql_for_issue_tags_field(_field, operator, value)
-          AdditionalTags.sql_for_tags_field Issue, operator, value
-        end
-
-        def available_issue_tags_values
-          Issue.available_tags(project: project)
-               .pluck(:name)
-               .map { |name| [name, name] }
+        def sql_for_issue_tags_field(_field, operator, values)
+          build_sql_for_tags_field klass: Issue, operator: operator, values: values
         end
       end
     end

data/lib/additional_tags/patches/time_report_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency 'query'
 
 module AdditionalTags

data/lib/additional_tags/patches/timelog_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module TimelogControllerPatch

data/lib/additional_tags/patches/wiki_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module WikiControllerPatch

data/lib/additional_tags/patches/wiki_page_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module WikiPagePatch
@@ -20,10 +22,10 @@ module AdditionalTags
            "JOIN #{Project.table_name} ON wikis.project_id = #{Project.table_name}.id"]
         end
 
-        def available_tags(options = {})
+        def available_tags(**options)
           options[:project_join] = project_joins
           options[:permission] = :view_wiki_pages
-          AdditionalTags::Tags.available_tags self, options
+          AdditionalTags::Tags.available_tags self, **options
         end
       end
 

data/lib/additional_tags/tags.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   class Tags
     class << self
-      def available_tags(klass, options = {})
+      def available_tags(klass, **options)
         user = options[:user].presence || User.current
 
         scope = ActsAsTaggableOn::Tag.where({})
-        scope = scope.where("#{Project.table_name}.id = ?", options[:project]) if options[:project]
+        scope = scope.where "#{Project.table_name}.id = ?", options[:project] if options[:project]
         if options[:permission]
-          scope = scope.where(tag_access(options[:permission], user))
+          scope = scope.where tag_access(options[:permission], user)
         elsif options[:visible_condition]
-          scope = scope.where(klass.visible_condition(user))
+          scope = scope.where klass.visible_condition(user)
         end
-        scope = scope.where("LOWER(#{TAG_TABLE_NAME}.name) LIKE ?", "%#{options[:name_like].downcase}%") if options[:name_like]
-        scope = scope.where("#{TAG_TABLE_NAME}.name=?", options[:name]) if options[:name]
-        scope = scope.where("#{TAGGING_TABLE_NAME}.taggable_id!=?", options[:exclude_id]) if options[:exclude_id]
-        scope = scope.where(options[:where_field] => options[:where_value]) if options[:where_field].present? && options[:where_value]
+        scope = scope.where "LOWER(#{TAG_TABLE_NAME}.name) LIKE ?", "%#{options[:name_like].downcase}%" if options[:name_like]
+        scope = scope.where "#{TAG_TABLE_NAME}.name=?", options[:name] if options[:name]
+        scope = scope.where "#{TAGGING_TABLE_NAME}.taggable_id!=?", options[:exclude_id] if options[:exclude_id]
+        scope = scope.where options[:where_field] => options[:where_value] if options[:where_field].present? && options[:where_value]
 
         columns = ["#{TAG_TABLE_NAME}.id",
                    "#{TAG_TABLE_NAME}.name",
@@ -24,14 +26,14 @@ module AdditionalTags
         columns << "MIN(#{TAGGING_TABLE_NAME}.created_at) AS last_created" if options[:sort_by] == 'last_created'
 
         scope.select(columns.join(', '))
-             .joins(tag_for_joins(klass, options))
+             .joins(tag_for_joins(klass, **options.slice(:project_join, :project, :without_projects)))
              .group("#{TAG_TABLE_NAME}.id, #{TAG_TABLE_NAME}.name, #{TAG_TABLE_NAME}.taggings_count").having('COUNT(*) > 0')
              .order(build_order_sql(options[:sort_by], options[:order]))
       end
 
-      def all_type_tags(klass, options = {})
-        ActsAsTaggableOn::Tag.where({})
-                             .joins(tag_for_joins(klass, options))
+      def all_type_tags(klass, without_projects: false)
+        ActsAsTaggableOn::Tag.all
+                             .joins(tag_for_joins(klass, without_projects: without_projects))
                              .distinct
                              .order("#{TAG_TABLE_NAME}.name")
       end
@@ -61,7 +63,7 @@ module AdditionalTags
           # remove old (merged) tags
           tags_to_merge.reject { |t| t.id == tag.id }.each(&:destroy)
           # remove duplicate taggings
-          dup_scope = ActsAsTaggableOn::Tagging.where(tag_id: tag.id)
+          dup_scope = ActsAsTaggableOn::Tagging.where tag_id: tag.id
           valid_ids = dup_scope.group(:tag_id, :taggable_id, :taggable_type, :tagger_id, :tagger_type, :context).pluck(Arel.sql('MIN(id)'))
           dup_scope.where.not(id: valid_ids).destroy_all if valid_ids.any?
           # recalc count for new tag
@@ -83,6 +85,15 @@ module AdditionalTags
         end
       end
 
+      def build_relation_tags(entries)
+        return [] if entries.none?
+
+        tags = entries.map(&:tags)
+        tags.flatten!
+
+        tags.uniq
+      end
+
       private
 
       def build_order_sql(sort_by, order)
@@ -100,16 +111,16 @@ module AdditionalTags
         Arel.sql sql
       end
 
-      def tag_for_joins(klass, options = {})
+      def tag_for_joins(klass, project_join: nil, project: nil, without_projects: false)
         table_name = klass.table_name
 
         joins = ["JOIN #{TAGGING_TABLE_NAME} ON #{TAGGING_TABLE_NAME}.tag_id = #{TAG_TABLE_NAME}.id"]
         joins << "JOIN #{table_name} " \
                  "ON #{table_name}.id = #{TAGGING_TABLE_NAME}.taggable_id AND #{TAGGING_TABLE_NAME}.taggable_type = '#{klass}'"
 
-        if options[:project_join]
-          joins << options[:project_join]
-        elsif options[:project] || !options[:without_projects]
+        if project_join
+          joins << project_join
+        elsif project || !without_projects
           joins << "JOIN #{Project.table_name} ON #{table_name}.project_id = #{Project.table_name}.id"
         end
 

data/lib/additional_tags/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
-  VERSION = '1.0.1'.freeze unless defined? VERSION
+  VERSION = '1.0.2' unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -80,6 +80,7 @@ files:
 - app/jobs/additional_tags_remove_unused_tag_job.rb
 - app/models/migrate_tag.rb
 - app/models/migrate_tagging.rb
+- app/models/query_tags_column.rb
 - app/views/additional_tags/_html_head.html.slim
 - app/views/additional_tags/_tag_list.html.slim
 - app/views/additional_tags/context_menu.html.slim
@@ -142,6 +143,7 @@ files:
 - lib/additional_tags/patches/journal_patch.rb
 - lib/additional_tags/patches/my_controller_patch.rb
 - lib/additional_tags/patches/queries_helper_patch.rb
+- lib/additional_tags/patches/query_patch.rb
 - lib/additional_tags/patches/reports_controller_patch.rb
 - lib/additional_tags/patches/settings_controller_patch.rb
 - lib/additional_tags/patches/time_entry_patch.rb