FEATURE: move staff tags setting to tag group settings

app/models/category_group.rb

@@ -5,7 +5,7 @@ class CategoryGroup < ActiveRecord::Base
   delegate :name, to: :group, prefix: true
 
   def self.permission_types
-    @permission_types ||= Enum.new(:full, :create_post, :readonly)
+    @permission_types ||= Enum.new(full: 1, create_post: 2, readonly: 3)
   end
 
 end

app/models/tag.rb

@@ -49,7 +49,7 @@ class Tag < ActiveRecord::Base
 
     return [] if scope_category_ids.empty?
 
-    filter_sql = guardian&.is_staff? ? '' : (' AND ' + DiscourseTagging.filter_visible_sql)
+    filter_sql = guardian&.is_staff? ? '' : " AND tags.id NOT IN (#{DiscourseTagging.hidden_tags_query.select(:id).to_sql})"
 
     tag_names_with_counts = Tag.exec_sql <<~SQL
       SELECT tags.name as tag_name, SUM(stats.topic_count) AS sum_topic_count

app/models/tag_group.rb

@@ -9,6 +9,7 @@ class TagGroup < ActiveRecord::Base
 
   belongs_to :parent_tag, class_name: 'Tag'
 
+  before_create :init_permissions
   before_save :apply_permissions
 
   attr_accessor :permissions
@@ -45,6 +46,15 @@ class TagGroup < ActiveRecord::Base
     end
   end
 
+  def init_permissions
+    unless tag_group_permissions.present? || @permissions
+      tag_group_permissions.build(
+        group_id: Group::AUTO_GROUPS[:everyone],
+        permission_type: TagGroupPermission.permission_types[:full]
+      )
+    end
+  end
+
   def apply_permissions
     if @permissions
       tag_group_permissions.destroy_all
@@ -55,22 +65,27 @@ class TagGroup < ActiveRecord::Base
     end
   end
 
-  def visible_only_to_staff
-    # currently only "everyone" and "staff" groups are supported
-    tag_group_permissions.count > 0
-  end
-
   def self.allowed(guardian)
     if guardian.is_staff?
       TagGroup
     else
-      category_permissions_filter = <<~SQL
+      category_permissions_filter_sql = <<~SQL
         (id IN ( SELECT tag_group_id FROM category_tag_groups WHERE category_id IN (?))
         OR id NOT IN (SELECT tag_group_id FROM category_tag_groups))
-        AND id NOT IN (SELECT tag_group_id FROM tag_group_permissions)
+        AND id IN (
+          SELECT tag_group_id
+          FROM tag_group_permissions
+          WHERE group_id = ?
+            AND permission_type = ?
+        )
       SQL
 
-      TagGroup.where(category_permissions_filter, guardian.allowed_category_ids)
+      TagGroup.where(
+        category_permissions_filter_sql,
+        guardian.allowed_category_ids,
+        Group::AUTO_GROUPS[:everyone],
+        TagGroupPermission.permission_types[:full]
+      )
     end
   end
 end

app/models/tag_group_permission.rb

@@ -4,7 +4,7 @@ class TagGroupPermission < ActiveRecord::Base
   belongs_to :group
 
   def self.permission_types
-    @permission_types ||= Enum.new(full: 1) #, see: 2
+    @permission_types ||= Enum.new(full: 1, readonly: 3)
   end
 end