additional_tags 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f425aa2c12ec481def256bfa8aab0bbcbd159635314a43f25be436c226b6a0f
-  data.tar.gz: a8a660768d48a774c25a22a4c3641d1e6a11e2afbe4697b43e28a9782ae16a3b
+  metadata.gz: d10d32f78d464486a2921a86274972ec068f3aad16c988f9037e89a433ac4efa
+  data.tar.gz: 50833ac552b8b3de0cba5eb5d9710cdbafdf17b3c2d53e742031ed22a52c9e86
 SHA512:
-  metadata.gz: 8edc1a8edc5244203a2db5acff0cdd9cecb28765e1aa2967cd6ef17a62426eec82d7b45949b36d813106f5d089bc6646be4b3e03c68f05c36f5b1b16117dfafd
-  data.tar.gz: d7c2d394c72bd948896b6a0da32528bd92581fa94ab241aaddfb341225fabe572b5e769dc003e2359a0a0f1c234e796bfee1ac69e7af183f3b7ba39f916b0154
+  metadata.gz: 837feb0dba819a2191dbd5151f523a3f65aac23918faaa2f93277a0b51c33e4483353c43dd7ae69ae98b43886099fe7f3005b33daafe9d05d4b593ce1866e657
+  data.tar.gz: 2d54a07615b231470a074e42ec5f4d275af5b5838338a360e8d7401fa742deeba0b500a1ca94069a3b37240e23947e9110c6b2f6f785ec3517ae1cfc63a66351

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '35 20 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.github/workflows/linters.yml

@@ -16,7 +16,7 @@ jobs:
 
     - name: Setup Gemfile
       run: |
-        touch .enable_dev
+        touch .enable_linters
         sed -i "3isource 'https://rubygems.org'" Gemfile
 
     - name: Setup Ruby
@@ -37,3 +37,7 @@ jobs:
       run: |
         bundle exec slim-lint app/views
       if: always()
+
+    - name: Run Brakeman
+      run: |
+        bundle exec brakeman -5

data/.github/workflows/tests.yml

@@ -87,6 +87,10 @@ jobs:
           libpq-dev
           libmysqlclient-dev
 
+      - name: Setup Gemfile
+        run: |
+          touch .enable_test
+
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -98,6 +102,7 @@ jobs:
         run: |
           cp plugins/additional_tags/test/support/database-${{ matrix.db }}.yml config/database.yml
           cp plugins/additional_tags/test/support/configuration.yml config/configuration.yml
+          cp plugins/additionals/test/support/additional_environment.rb config/additional_environment.rb
 
       - name: Install Ruby dependencies
         working-directory: redmine

data/.gitignore

@@ -5,6 +5,6 @@ tmp/
 Gemfile.lock
 .project
 .settings/
+.enable_*
 ._*
 *.gem
-.enable_dev

data/.rubocop.yml

@@ -92,6 +92,12 @@ Style/OptionHash:
     - parameters
     - settings
 
+# postgresql and mysql are supported
+# autodetect does not work without database configuration
+Rails/BulkChangeTable:
+  Enabled: true
+  Database: postgresql
+
 Style/ReturnNil:
   Enabled: true
 
@@ -114,3 +120,8 @@ Naming/VariableNumber:
   Enabled: true
   Exclude:
     - 'test/**/*'
+
+# see https://github.com/rubocop/rubocop-rails/issues/578
+# redmine does not use load_defaults: https://rails.rubystyle.guide/#config-defaults
+Rails/RedundantPresenceValidationOnBelongsTo:
+  Enabled: false

data/README.md

@@ -1,6 +1,6 @@
 # Additional Tags - Tags for Redmine
 
-[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=flat)](https://www.redmine.org/plugins/additional_tags) [![Run Linters](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Linters%22) [![Run Brakeman](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Brakeman/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Brakeman%22) [![Run Tests](https://github.com/AlphaNodes/additional_tags/workflows/Tests/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3ATests)
+[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=flat)](https://www.redmine.org/plugins/additional_tags) [![Run Linters](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Linters%22) [![Run Tests](https://github.com/AlphaNodes/additional_tags/workflows/Tests/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3ATests)
 
 ## Features
 

data/app/helpers/additional_tags_helper.rb

@@ -15,12 +15,12 @@ module AdditionalTagsHelper
     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 }
+                          counts: Issue.available_tags.to_h { |tag| [tag.id, tag.count] } }
     end
 
     if AdditionalTags.setting? :active_wiki_tags
       columns[:wiki] = { label: l(:label_wiki),
-                         counts: WikiPage.available_tags.map { |tag| [tag.id, tag.count] }.to_h }
+                         counts: WikiPage.available_tags.to_h { |tag| [tag.id, tag.count] } }
     end
 
     call_hook :helper_additional_manageable_tag_columns, columns: columns
@@ -111,7 +111,7 @@ module AdditionalTagsHelper
                   "background-color: #{tag_bg_color}; color: #{tag_fg_color}"
                 end
 
-    tag_name << tag.span("(#{tag_object.count})", class: 'tag-count') if show_count
+    tag_name << tag.span(tag_object.count, class: 'tag-count') if show_count
 
     content = if link
                 link_to safe_join(tag_name),
@@ -181,30 +181,8 @@ module AdditionalTagsHelper
               additional_tag_sep(use_colors: options[:use_colors])
   end
 
-  def scope_for_tags_aggr(project: nil, open_issues_only: nil)
-    Issue.available_tags project: project,
-                         open_issues_only: open_issues_only
-  end
-
-  def issues_count_group_by_tags(project, tags)
-    scope = Issue.group_by_status_with_tags project
-
-    issue_counts = {}
-    tags.each do |tag|
-      # binding.pry
-      open_issues = scope[[0, tag.id]] || scope[[false, tag.id]] || 0
-      closed_issues = scope[[1, tag.id]] || scope[[true, tag.id]] || 0
-      issue_counts[tag.name] = { open: open_issues,
-                                 closed: closed_issues,
-                                 total: open_issues + closed_issues,
-                                 tag: tag }
-    end
-
-    issue_counts
-  end
-
-  def link_to_totals_for_tags(issue_counts:, project:, open_issues_only:)
-    sum = if issue_counts.blank? || issue_counts.size.zero?
+  def link_to_issue_tags_totals(entries:, project:, open_issues_only:)
+    sum = if entries.blank? || entries.size.zero?
             0
           else
             query = IssueQuery.new project: project, name: '_'
@@ -220,6 +198,14 @@ module AdditionalTagsHelper
                                       status_id: open_issues_only ? 'o' : '*')
   end
 
+  def issue_tag_status_filter(operator: nil, open_issues_only: false)
+    if operator
+      { field: :status_id, operator: operator }
+    elsif open_issues_only
+      { field: :status_id, operator: 'o' }
+    end
+  end
+
   private
 
   def tag_url(tag_name, filter: nil, tag_action: nil, tag_controller: nil, project: nil)

data/app/helpers/additional_tags_issues_helper.rb

@@ -7,7 +7,7 @@ module AdditionalTagsIssuesHelper
 
     if @issue.present? &&
        (defined?(controller_name) && controller_name == 'issues' && action_name == 'show' || !defined?(controller_name)) &&
-       User.current.allowed_to?(:view_issues, @project)
+       AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, @project)
 
       api.array :tags do
         @issue.tags.each do |tag|
@@ -16,6 +16,16 @@ module AdditionalTagsIssuesHelper
       end
     end
 
+    if @time_entry.present? &&
+       (defined?(controller_name) && controller_name == 'timelog' && action_name == 'show' || !defined?(controller_name)) &&
+       AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, @project)
+      api.array :issue_tags do
+        @time_entry.issue_tags.each do |tag|
+          api.tag id: tag.id, name: tag.name
+        end
+      end
+    end
+
     rc
   end
 

data/app/jobs/additional_tags_remove_unused_tag_job.rb

@@ -4,7 +4,7 @@ class AdditionalTagsRemoveUnusedTagJob < AdditionalTagsJob
   def perform
     # only once a minute to reduce load
     cache_key = self.class.to_s
-    return if Rails.cache.read cache_key
+    return if Rails.cache.read(cache_key) && !Rails.env.test?
 
     Rails.cache.write cache_key, true, expires_in: 60
     AdditionalTags::Tags.remove_unused_tags

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

@@ -0,0 +1,19 @@
+= additionals_transform_to_select2 'assignee',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: assignee_auto_completes_path(project_id: @project)
+
+= additionals_transform_to_select2 'author',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: grouped_users_auto_completes_path(project_id: @project, with_ano: true, with_me: true)
+
+= additionals_transform_to_select2 'user_with_me',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: grouped_users_auto_completes_path(project_id: @project, with_me: true)
+
+= additionals_transform_to_select2 'user',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: grouped_users_auto_completes_path(project_id: @project)

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

@@ -1,6 +1,3 @@
 = stylesheet_link_tag 'tags', plugin: 'additional_tags'
 = javascript_include_tag 'tags', plugin: 'additional_tags'
-- if User.current.allowed_to?(:edit_issue_tags, @project, global: true) || \
-     User.current.allowed_to?(:create_issue_tags, @project, global: true) || \
-     User.current.allowed_to?(:add_wiki_tags, @project, global: true)
-  = additionals_library_load :select2
+= additionals_library_load :select2

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

@@ -1,29 +1,30 @@
 - tags = manageable_tags
 - if tags.present?
-  table.list.issues
-    thead
-      tr
-        th.checkbox.hide-when-print
-          = check_box_tag 'ids[]', '', false, class: 'toggle-selection',
-                          title: "#{l :button_check_all}/#{l :button_uncheck_all}"
+  .autoscroll
+    table.list.issues
+      thead
+        tr
+          th.checkbox.hide-when-print
+            = check_box_tag 'ids[]', '', false, class: 'toggle-selection',
+                            title: "#{l :button_check_all}/#{l :button_uncheck_all}"
 
-        th = l :field_name
-        - manageable_tag_columns.each do |_column, column_values|
-          th = column_values[:label]
-        th
-    tbody
-      - tags.each do |tag|
-        tr.hascontextmenu id="#{tag.id}"
-          td.checkbox.hide-when-print
-           = 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
-          td.buttons
-            = link_to l(:button_edit), edit_additional_tag_path(tag),
-                      class: 'icon icon-edit'
-            = link_to l(:button_delete), additional_tags_path(ids: tag), method: :delete,
-                      data: { confirm: l(:text_are_you_sure) }, class: 'icon icon-del'
+          th = l :field_name
+          - manageable_tag_columns.each do |_column, column_values|
+            th = column_values[:label]
+          th
+      tbody
+        - tags.each do |tag|
+          tr.hascontextmenu id="#{tag.id}"
+            td.checkbox.hide-when-print
+              = 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
+            td.buttons
+              = link_to l(:button_edit), edit_additional_tag_path(tag),
+                        class: 'icon icon-edit'
+              = link_to l(:button_delete), additional_tags_path(ids: tag), method: :delete,
+                        data: { confirm: l(:text_are_you_sure) }, class: 'icon icon-del'
 - else
   p.nodata = l :label_no_data
 

data/app/views/common/_tag_summary_block.html.slim

@@ -0,0 +1,11 @@
+ul.reporting-list.tag-summary
+  li.amount-tags
+    = l :label_amount_tags
+    ' :
+    span.value
+      = tags.to_a.size
+  li.amount-entities-with-tags
+    = l :label_amount_entities_with_tags, name: entities_label
+    ' :
+    span.value
+      = totals_link

data/app/views/dashboards/blocks/_issue_tags.html.slim

@@ -1,27 +1,22 @@
 h3 = block_definition[:label]
 
 - open_issues_only = RedminePluginKit.true? settings[:open_issues_only]
-- tags = scope_for_tags_aggr project: @project,
-                             open_issues_only: open_issues_only
-- issue_counts = issues_count_group_by_tags @project, tags
+- tags = Issue.available_tags project: @project, open_issues_only: open_issues_only
+- counts = AdditionalTags::Tags.entity_group_by scope: Issue.group_by_status_with_tags(@project),
+                                                tags: tags,
+                                                statuses: { true => :closed, false => :open },
+                                                group_id_is_bool: true
 
-ul.reporting-list.tag-summary
-  li.amount-tags
-    = l :label_amount_tags
-    ' :
-    span.value
-      = tags.to_a.size
-  li.amount-entities-with-tags
-    = l :label_amount_entities_with_tags, name: l(:label_issue_plural)
-    ' :
-    span.value
-      = link_to_totals_for_tags project: @project,
-                                issue_counts: issue_counts,
-                                open_issues_only: open_issues_only
+= render partial: 'common/tag_summary_block',
+         locals: { tags: tags,
+                   entities_label: l(:label_issue_plural),
+                   totals_link: link_to_issue_tags_totals(entries: counts,
+                                                          project: @project,
+                                                          open_issues_only: open_issues_only) }
 
 - if RedminePluginKit.true? settings[:with_table_of_values]
   - if tags.present?
-    - tags = sort_tags_for_list tags
+    - tags = sort_tags_for_list tags.to_a
     table.list.tags
       thead
         tr
@@ -38,26 +33,26 @@ ul.reporting-list.tag-summary
             td.name = additional_tag_link tag,
                                           tag_action: 'index',
                                           tag_controller: 'issues',
-                                          filter: open_issues_only ? { field: :status_id, operator: 'o' } : nil,
+                                          filter: issue_tag_status_filter(open_issues_only: open_issues_only),
                                           use_colors: RedminePluginKit.true?(settings[:use_colors])
             - unless open_issues_only
               td.value = additional_tag_link tag,
                                              tag_action: 'index',
                                              tag_controller: 'issues',
-                                             filter: { field: :status_id, operator: 'o' },
+                                             filter: issue_tag_status_filter(operator: 'o'),
                                              use_colors: false,
-                                             name: issue_counts[tag.name][:open]
+                                             name: counts[tag.name][:open]
               td.value = additional_tag_link tag,
                                              tag_action: 'index',
                                              tag_controller: 'issues',
-                                             filter: { field: :status_id, operator: 'c' },
+                                             filter: issue_tag_status_filter(operator: 'c'),
                                              use_colors: false,
-                                             name: issue_counts[tag.name][:closed]
+                                             name: counts[tag.name][:closed]
             td.value = additional_tag_link tag,
                                            tag_action: 'index',
                                            tag_controller: 'issues',
-                                           filter: open_issues_only ? { field: :status_id, operator: 'o' } : nil,
+                                           filter: issue_tag_status_filter(open_issues_only: open_issues_only),
                                            use_colors: false,
-                                           name: open_issues_only ? issue_counts[tag.name][:open] : issue_counts[tag.name][:total]
+                                           name: open_issues_only ? counts[tag.name][:open] : counts[tag.name][:total]
   - else
     p.nodata = l :label_no_data

data/assets/stylesheets/tags.css

@@ -26,8 +26,8 @@ ul.tags li { margin: 0.25em 0; }
 
 span.additional-tag-label-color {
   display: inline-block;
-  margin-bottom: 5px !important;
-  border-radius: 2px !important;
+  margin-bottom: 3px !important;
+  border-radius: 0.75rem !important;
 }
 
 td.tags span.additional-tag-label-color {
@@ -37,27 +37,41 @@ td.tags span.additional-tag-label-color {
 }
 
 .additional-tag-label-color {
-  padding: 2px 4px;
-  font-size: 10px !important;
+  padding: 0 5px;
+  line-height: initial;
+  font-size: 0.7rem !important;
   border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 2px;
+  border-radius: 0.75rem;
 }
 
-.additional-tag-label-color a::before {
-  font-family: Font Awesome\ 5 Free;
-  font-size: 0.9em;
-  font-weight: 900;
-  content: "\f02b"; /* fas fa-tag */
-  padding-right: 3px;
+.additional-tag-label-color .tag-count {
+  display: inline-block;
+  background: #fff;
+  color: #1f1f1f;
+  padding-right: 5px;
+  border-top-right-radius: 0.7rem;
+  border-bottom-right-radius: 0.7rem;
+  margin-right: -5px;
+  padding-left: 3px;
+}
+
+.tag-label .tag-count {
+  background: #f1f5fa;
+  border-radius: 5px;
+  padding: 0 5px;
+  color: #666;
+  border: 1px solid #ddd;
+  vertical-align: middle;
 }
 
 .additional-tag-label-color .tag-count,
 .tag-label .tag-count {
-  font-size: 0.75em;
+  font-size: 0.7rem;
   margin-left: 0.5em;
 }
 
-span.additional-tag-label-color:hover a {
+span.additional-tag-label-color:hover a,
+.tag-label .tag-count:hover a {
   text-decoration: none !important;
 }
 

data/db/migrate/20201123093214_migrate_existing_tags.rb

@@ -14,7 +14,7 @@ class MigrateExistingTags < ActiveRecord::Migration[5.2]
           next if excluded_taggable_types.include? tagging.taggable_type
 
           tag = ActsAsTaggableOn::Tag.create! name: old_tag.name if cnt.zero? && tag.nil?
-          context = tagging.respond_to?('context') && tagging.context.present? ? tagging.context : 'tags'
+          context = tagging.respond_to?(:context) && tagging.context.present? ? tagging.context : 'tags'
 
           # old data can include dups
           next if ActsAsTaggableOn::Tagging.exists? tag_id: tag.id,

data/lib/additional_tags/hooks/view_hook.rb

@@ -13,6 +13,7 @@ module AdditionalTags
       render_on :view_issues_show_details_bottom, partial: 'issues/tags'
       render_on :view_issues_sidebar_planning_bottom, partial: 'issues/tags_sidebar'
       render_on :view_layouts_base_html_head, partial: 'additional_tags/html_head'
+      render_on :view_layouts_base_body_bottom, partial: 'additional_tags/body_bottom'
       render_on :view_wiki_form_bottom, partial: 'tags_form_bottom'
       render_on :view_wiki_show_bottom, partial: 'tags_show'
       render_on :view_wiki_show_sidebar_bottom, partial: 'wiki/tags_sidebar'

data/lib/additional_tags/patches/auto_completes_controller_patch.rb

@@ -12,8 +12,7 @@ module AdditionalTags
       module InstanceMethods
         def issue_tags
           suggestion_order = AdditionalTags.setting(:tags_suggestion_order) || 'name'
-          @name = (params[:q] || params[:term]).to_s.strip
-          @tags = Issue.available_tags name_like: @name,
+          @tags = Issue.available_tags name_like: build_search_query_term(params),
                                        sort_by: suggestion_order,
                                        order: (suggestion_order == 'name' ? 'ASC' : 'DESC')
 
@@ -23,17 +22,17 @@ module AdditionalTags
         end
 
         def wiki_tags
-          @name = params[:q].to_s
-          @tags = WikiPage.available_tags project: nil, name_like: @name
+          @tags = WikiPage.available_tags project: nil,
+                                          name_like: build_search_query_term(params)
           render layout: false, partial: 'additional_tag_list', locals: { unsorted: true }
         end
 
         def all_tags
           return render_403 unless User.current.admin?
 
-          @name = params[:q].to_s
+          q = build_search_query_term params
           sql_for_where = "LOWER(#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name) LIKE ?"
-          @tags = ActsAsTaggableOn::Tag.where(sql_for_where, "%#{@name.downcase}%")
+          @tags = ActsAsTaggableOn::Tag.where(sql_for_where, "%#{q.downcase}%")
                                        .order(name: :asc)
 
           render layout: false, partial: 'additional_tag_list', locals: { unsorted: true }

data/lib/additional_tags/patches/issue_patch.rb

@@ -6,12 +6,16 @@ module AdditionalTags
       extend ActiveSupport::Concern
 
       included do
+        include Additionals::EntityMethodsGlobal
         include InstanceMethods
         acts_as_ordered_taggable
 
         before_save :prepare_save_tag_change
         before_save :sort_tag_list
 
+        after_commit :add_remove_unused_tags_job, on: %i[update destroy],
+                                                  if: proc { AdditionalTags.setting?(:active_issue_tags) }
+
         alias_method :safe_attributes_without_tags=, :safe_attributes=
         alias_method :safe_attributes=, :safe_attributes_with_tags=
 
@@ -26,11 +30,10 @@ module AdditionalTags
         end
 
         def group_by_status_with_tags(project = nil)
-          Issue.visible(User.current, project: project)
-               .joins(:status)
-               .joins(:tags)
-               .group(:is_closed, 'tag_id')
-               .count
+          visible(User.current, project: project).joins(:status)
+                                                 .joins(:tags)
+                                                 .group(:is_closed, 'tag_id')
+                                                 .count
         end
 
         def available_tags(**options)
@@ -41,10 +44,6 @@ module AdditionalTags
           tags.joins("JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{table_name}.status_id")
               .where(issue_statuses: { is_closed: false })
         end
-
-        def remove_unused_tags!
-          AdditionalTagsRemoveUnusedTagJob.perform_later
-        end
       end
 
       module InstanceMethods
@@ -68,7 +67,7 @@ module AdditionalTags
             end
           end
 
-          send 'safe_attributes_without_tags=', attrs, user
+          send :safe_attributes_without_tags=, attrs, user
         end
 
         # copy_from requires hash for Redmine - works with Ruby 3
@@ -81,15 +80,6 @@ module AdditionalTags
         end
         # rubocop: enable Style/OptionHash
 
-        def tags_to_journal(old_tags, new_tags)
-          return if current_journal.blank? || old_tags == new_tags
-
-          current_journal.details << JournalDetail.new(property: 'attr',
-                                                       prop_key: 'tag_list',
-                                                       old_value: old_tags,
-                                                       value: new_tags)
-        end
-
         private
 
         def sort_tag_list

data/lib/additional_tags/patches/query_patch.rb

@@ -35,14 +35,16 @@ module AdditionalTags
                .map { |name| [name, name] }
         end
 
-        def build_subquery_for_tags_field(klass:, operator:, values:, joined_table:, joined_field:, target_field: 'issue_id')
+        def build_subquery_for_tags_field(klass:, operator:, values:, joined_table:, joined_field:,
+                                          source_field: 'id', 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_source_field = self.class.connection.quote_column_name source_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 ="\
+                                            .where("#{self.class.connection.quote_table_name queried_table_name}.#{quoted_source_field} ="\
                                                    " #{quoted_joined_table}.#{quoted_joined_field}")
                                             .select(1)
 
@@ -63,7 +65,12 @@ module AdditionalTags
           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?
+            if ids_list.present?
+              "(#{klass.table_name}.id #{compare} (#{ids_list.join ','}))"
+            elsif values.present? && operator == '='
+              # special case: filter with deleted tag
+              '(1=0)'
+            end
           else
             entries = ActsAsTaggableOn::Tagging.where taggable_type: klass.name
             id_table = klass.table_name

data/lib/additional_tags/patches/wiki_page_patch.rb

@@ -28,16 +28,23 @@ module AdditionalTags
           AdditionalTags::Tags.available_tags self, **options
         end
 
-        def with_tags(tag, project: nil, order: 'title_asc', max_entries: nil)
-          wiki = project&.wiki
-
+        def with_tags_scope(project: nil, wiki: nil)
           scope = if wiki
                     wiki.pages
                   else
-                    WikiPage.joins wiki: :project
+                    scope = WikiPage.joins wiki: :project
+                    scope = scope.where wikis: { project_id: project.id } if project
+                    scope
                   end
 
           scope = scope.visible User.current, project: project if scope.respond_to? :visible
+          scope
+        end
+
+        def with_tags(tag, project: nil, order: 'title_asc', max_entries: nil)
+          wiki = project&.wiki
+
+          scope = with_tags_scope wiki: wiki, project: project
           scope = scope.limit max_entries if max_entries
 
           tags = Array tag
@@ -49,7 +56,6 @@ module AdditionalTags
 
           scope = scope.where(id: tagged_with(tags, any: true).ids)
                        .with_updated_on
-                       .joins(wiki: :project)
 
           return scope if order.nil?
 
@@ -89,7 +95,7 @@ module AdditionalTags
             end
           end
 
-          send 'safe_attributes_without_tags=', attrs, user
+          send :safe_attributes_without_tags=, attrs, user
         end
 
         private

data/lib/additional_tags/plugin_version.rb

@@ -2,6 +2,6 @@
 
 module AdditionalTags
   module PluginVersion
-    VERSION = '1.0.3' unless defined? VERSION
+    VERSION = '1.0.4' unless defined? VERSION
   end
 end

data/lib/additional_tags/tags.rb

@@ -64,7 +64,8 @@ module AdditionalTags
           tags_to_merge.reject { |t| t.id == tag.id }.each(&:destroy)
           # remove duplicate taggings
           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)'))
+          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
           ActsAsTaggableOn::Tag.reset_counters tag.id, :taggings
@@ -86,6 +87,7 @@ module AdditionalTags
       end
 
       def build_relation_tags(entries)
+        entries = Array entries
         return [] if entries.none?
 
         tags = entries.map(&:tags)
@@ -94,8 +96,55 @@ module AdditionalTags
         tags.uniq
       end
 
+      def entity_group_by(scope:, tags:, statuses: nil, sub_groups: nil, group_id_is_bool: false)
+        counts = {}
+        tags.each do |tag|
+          values = { tag: tag, total: 0, total_sub_groups: 0, groups: [] }
+
+          if statuses
+            statuses.each do |status|
+              group_id = status.first
+              group = status.second
+              values[group] = status_for_tag_value scope: scope,
+                                                   tag_id: tag.id,
+                                                   group_id: group_id,
+                                                   group_id_is_bool: group_id_is_bool
+              values[:groups] << { id: group_id, group: group, count: values[group] }
+              values[:total] += values[group]
+              values[:total_sub_groups] += values[group] if sub_groups&.include? group_id
+            end
+          else
+            values[:total] += status_for_tag_value scope: scope, tag_id: tag.id
+          end
+
+          values[:total_without_sub_groups] = values[:total] - values[:total_sub_groups]
+
+          counts[tag.name] = values
+        end
+
+        counts
+      end
+
       private
 
+      def status_for_tag_value(scope:, tag_id:, group_id: nil, group_id_is_bool: false)
+        value = if group_id_is_bool || group_id
+                  if group_id_is_bool
+                    if group_id
+                      scope[[1, tag_id]] || scope[[true, tag_id]]
+                    else
+                      scope[[0, tag_id]] || scope[[false, tag_id]]
+                    end
+                  else
+                    scope[[group_id, tag_id]]
+                  end
+                else
+                  scope[tag_id]
+                end
+
+        value || 0
+      end
+
       def build_order_sql(sort_by, order)
         order = order.present? && order == 'DESC' ? 'DESC' : 'ASC'
 

data/lib/additional_tags.rb

@@ -17,12 +17,7 @@ module AdditionalTags
     private
 
     def setup
-      # TODO: this check does not work with Rails 6 at the moment
-      # reason: ActiveSupport.on_load(:active_record) is used for setup
-      # as temp solution
-      if Rails.version < '6.0' && !Redmine::Plugin.installed?('additionals')
-        raise 'Please install additionals plugin (https://github.com/alphanodes/additionals)'
-      end
+      raise 'Please install additionals plugin (https://github.com/alphanodes/additionals)' unless Redmine::Plugin.installed? 'additionals'
 
       loader.incompatible? %w[redmine_tags
                               redmine_tagging
@@ -75,6 +70,10 @@ module AdditionalTags
 
     ActsAsTaggableOn.tags_table = TAG_TABLE_NAME
     ActsAsTaggableOn.taggings_table = TAGGING_TABLE_NAME
+    # NOTE: remove_unused_tags cannot be used, because tag is deleted before assign for tagging
+    # @see https://github.com/mbleigh/acts-as-taggable-on/issues/946
+    # NOTE2: merging tags is not compatible, too.
+    ActsAsTaggableOn.remove_unused_tags = false
 
     config.after_initialize do
       # engine_name could be used (additional_tags_plugin), but can

data/lib/tasks/additional_tags.rake

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+namespace :redmine do
+  namespace :additional_tags do
+    desc <<-DESCRIPTION
+    Remove unused tags.
+
+    Example:
+      bundle exec rake redmine:additional_tags:remove_unused_tags RAILS_ENV=production
+    DESCRIPTION
+    task remove_unused_tags: :environment do
+      AdditionalTags::Tags.remove_unused_tags
+
+      puts 'Unused tags has been removed.'
+      exit 0
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -74,7 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".eslintrc.yml"
-- ".github/workflows/brakeman.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/linters.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
@@ -95,6 +95,7 @@ files:
 - app/models/migrate_tag.rb
 - app/models/migrate_tagging.rb
 - app/models/query_tags_column.rb
+- app/views/additional_tags/_body_bottom.html.slim
 - app/views/additional_tags/_html_head.html.slim
 - app/views/additional_tags/_tag_list.html.slim
 - app/views/additional_tags/context_menu.html.slim
@@ -104,6 +105,7 @@ files:
 - app/views/additional_tags/settings/_manage_tags.html.slim
 - app/views/additional_tags/settings/_settings.html.slim
 - app/views/auto_completes/_additional_tag_list.slim
+- app/views/common/_tag_summary_block.html.slim
 - app/views/context_menus/_issues_tags.html.slim
 - app/views/dashboards/blocks/_issue_tags.html.slim
 - app/views/dashboards/blocks/_issue_tags_settings.html.slim
@@ -171,6 +173,7 @@ files:
 - lib/additional_tags/patches/wiki_page_patch.rb
 - lib/additional_tags/plugin_version.rb
 - lib/additional_tags/tags.rb
+- lib/tasks/additional_tags.rake
 homepage: https://github.com/alphanodes/additional_tags
 licenses:
 - GPL-2.0

data/.github/workflows/brakeman.yml

@@ -1,34 +0,0 @@
-name: Run Brakeman
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Install package dependencies
-      run: >
-        sudo apt-get install --yes --quiet pandoc
-
-    - name: Setup Gemfile
-      run: |
-        touch .enable_dev
-        sed -i "3isource 'https://rubygems.org'" Gemfile
-
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.6
-        bundler-cache: true
-
-    - name: Setup gems
-      run: |
-        bundle install --jobs 4 --retry 3
-
-    - name: Run Brakeman
-      run: |
-        bundle exec brakeman -5