Feature: Allow assign on groups

app/controllers/discourse_assign/assign_controller.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module DiscourseAssign
-  class AssignController < Admin::AdminController
-    before_action :ensure_logged_in
+  class AssignController < ApplicationController
+    requires_login
+    before_action :ensure_logged_in, :ensure_assign_allowed
 
     def suggestions
       users = [current_user]
       users += User
-        .where('admin OR moderator')
         .where('users.id <> ?', current_user.id)
         .joins(<<~SQL
           JOIN(
@@ -18,7 +18,9 @@ def suggestions
                 HAVING COUNT(*) < #{SiteSetting.max_assigned_topics}
               ) as X ON X.user_id = users.id
         SQL
-        ).order('X.last_assigned DESC')
+        )
+        .assign_allowed
+        .order('X.last_assigned DESC')
         .limit(6)
 
       render json: ActiveModel::ArraySerializer.new(users,
@@ -88,5 +90,9 @@ def translate_failure(reason, user)
         { error: I18n.t('discourse_assign.too_many_assigns', username: user.username, max: max) }
       end
     end
+
+    def ensure_assign_allowed
+      raise Discourse::InvalidAccess.new unless current_user.can_assign?
+    end
   end
 end

assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.js.es6

@@ -3,7 +3,7 @@ import { getOwner } from "discourse-common/lib/get-owner";
 export default {
   shouldRender(args, component) {
     const needsButton =
-      component.currentUser && component.currentUser.get("staff");
+      component.currentUser && component.currentUser.get("can_assign");
     return (
       needsButton &&
       (!component.get("site.mobileView") || args.topic.get("isPrivateMessage"))

assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs

@@ -1,4 +1,4 @@
-{{#if currentUser.staff}}
+{{#if currentUser.can_assign}}
   {{#link-to 'userActivity.assigned'}}
     {{d-icon "user-plus"}} {{i18n 'discourse_assign.assigned'}}
   {{/link-to}}

assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.js.es6

@@ -1,6 +1,6 @@
 export function shouldShowAssigned(args, component) {
   const needsButton =
-    component.currentUser && component.currentUser.get("staff");
+    component.currentUser && component.currentUser.get("can_assign");
   return (
     needsButton &&
     (!component.get("site.mobileView") || args.model.get("isPrivateMessage"))

assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.js.es6

@@ -1,5 +1,5 @@
 export default {
   shouldRender(args, component) {
-    return component.currentUser && component.currentUser.get("staff");
+    return component.currentUser && component.currentUser.get("can_assign");
   }
 };

assets/javascripts/discourse-assign/controllers/assign-user.js.es6

@@ -3,6 +3,7 @@ import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 export default Ember.Controller.extend({
+  taskActions: Ember.inject.service(),
   assignSuggestions: function() {
     ajax("/assign/suggestions").then(users => {
       this.set("assignSuggestions", users);
@@ -23,6 +24,7 @@ export default Ember.Controller.extend({
   actions: {
     assignUser(user) {
       this.set("model.username", user.username);
+      this.set("model.allowedGroups", this.get("taskActions").allowedGroups);
       this.send("assign");
     },
 

assets/javascripts/discourse-assign/initializers/extend-for-assigns.js.es6

@@ -17,7 +17,7 @@ function modifySelectKit(api) {
   api
     .modifySelectKit("topic-footer-mobile-dropdown")
     .modifyContent((context, existingContent) => {
-      if (context.get("currentUser.staff")) {
+      if (context.get("currentUser.can_assign")) {
         const hasAssignement = context.get("topic.assigned_to_user");
         const button = {
           id: ACTION_ID,
@@ -31,7 +31,7 @@ function modifySelectKit(api) {
       return existingContent;
     })
     .onSelect((context, value) => {
-      if (!context.get("currentUser.staff") || value !== ACTION_ID) {
+      if (!context.get("currentUser.can_assign") || value !== ACTION_ID) {
         return;
       }
 
@@ -157,7 +157,7 @@ function initialize(api) {
   });
 
   api.addUserMenuGlyph(widget => {
-    if (widget.currentUser && widget.currentUser.get("staff")) {
+    if (widget.currentUser && widget.currentUser.get("can_assign")) {
       return {
         label: "discourse_assign.assigned",
         className: "assigned",

assets/javascripts/discourse/services/task-actions.js.es6

@@ -1,7 +1,16 @@
 import { ajax } from "discourse/lib/ajax";
 import showModal from "discourse/lib/show-modal";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Service.extend({
+  init() {
+    this._super(...arguments);
+
+    this.allowedGroups = getOwner(this)
+      .lookup("site-settings:main")
+      .assign_allowed_on_groups.split("|");
+  },
+
   unassign(topicId) {
     return ajax("/assign/unassign", {
       type: "PUT",
@@ -13,7 +22,8 @@ export default Ember.Service.extend({
     return showModal("assign-user", {
       model: {
         topic: topic,
-        username: topic.get("assigned_to_user.username")
+        username: topic.get("assigned_to_user.username"),
+        allowedGroups: this.allowedGroups
       }
     });
   }

assets/javascripts/discourse/templates/modal/assign-user.hbs

@@ -4,6 +4,7 @@
     single=true
     allowAny=false
     group="staff"
+    groupMembersOf=model.allowedGroups
     excludeCurrentUser=false
     includeMentionableGroups=false
     hasGroups=false

config/locales/server.en.yml

@@ -15,6 +15,7 @@ en:
     remind_assigns: "Remind users about pending assigns."
     remind_assigns_frequency: "Frequency for reminding users about assigned topics."
     max_assigned_topics: "Maximum number of topics that can be assigned to a user."
+    assign_allowed_on_groups: "Groups that are allowed to assign topics."
   discourse_assign:
     assigned_to: "Topic assigned to @%{username}"
     unassigned: "Topic was unassigned"

config/settings.yml

@@ -27,3 +27,10 @@ plugins:
     client: true
     default: 10
     min: 1
+  assign_allowed_on_groups:
+    client: true
+    type: group_list
+    list_type: compact
+    default: 'staff'
+    allow_any: false
+    refresh: true

jobs/scheduled/enqueue_reminders.rb

@@ -15,6 +15,11 @@ def skip_enqueue?
       SiteSetting.remind_assigns_frequency.nil? || !SiteSetting.assign_enabled?
     end
 
+    def allowed_group_ids
+      allowed_groups = SiteSetting.assign_allowed_on_groups.split('|')
+      Group.where(name: allowed_groups).pluck(:id).join(',')
+    end
+
     def user_ids
       global_frequency = SiteSetting.remind_assigns_frequency
       frequency = ActiveRecord::Base.sanitize_sql("COALESCE(user_frequency.value, '#{global_frequency}')::INT")
@@ -31,10 +36,10 @@ def user_ids
         ON topic_custom_fields.value::INT = user_frequency.user_id
         AND user_frequency.name = '#{PendingAssignsReminder::REMINDERS_FREQUENCY}'
 
-        INNER JOIN users ON topic_custom_fields.value::INT = users.id
+        INNER JOIN group_users ON topic_custom_fields.value::INT = group_users.user_id
         INNER JOIN topics ON topics.id = topic_custom_fields.topic_id AND (topics.deleted_at IS NULL)
 
-        WHERE (users.moderator OR users.admin)
+        WHERE group_users.group_id IN (#{allowed_group_ids})
         AND #{frequency} > 0
         AND (
           last_reminder.value IS NULL OR

lib/topic_assigner.rb

@@ -8,20 +8,20 @@ class ::TopicAssigner
   ASSIGNED_BY_ID = 'assigned_by_id'
 
   def self.backfill_auto_assign
-    staff_mention = User.where('moderator OR admin')
+    staff_mention = User.assign_allowed
       .pluck('username')
-      .map { |name| "p.cooked ILIKE '%mention%@#{name}%'" }
+      .map! { |name| "p.cooked ILIKE '%mention%@#{name}%'" }
       .join(' OR ')
 
-    sql = <<SQL
-    SELECT p.topic_id, MAX(post_number) post_number
-    FROM posts p
-    JOIN topics t ON t.id = p.topic_id
-    LEFT JOIN topic_custom_fields tc ON tc.name = '#{ASSIGNED_TO_ID}' AND tc.topic_id = p.topic_id
-    WHERE p.user_id IN (SELECT id FROM users WHERE moderator OR admin) AND
-      ( #{staff_mention} ) AND tc.value IS NULL AND NOT t.closed AND t.deleted_at IS NULL
-    GROUP BY p.topic_id
-SQL
+    sql = <<~SQL
+      SELECT p.topic_id, MAX(post_number) post_number
+      FROM posts p
+      JOIN topics t ON t.id = p.topic_id
+      LEFT JOIN topic_custom_fields tc ON tc.name = '#{ASSIGNED_TO_ID}' AND tc.topic_id = p.topic_id
+      WHERE p.user_id IN (SELECT id FROM users WHERE moderator OR admin) AND
+        ( #{staff_mention} ) AND tc.value IS NULL AND NOT t.closed AND t.deleted_at IS NULL
+      GROUP BY p.topic_id
+    SQL
 
     assigned = 0
     puts
@@ -54,7 +54,7 @@ def self.assign_other_passes?(post)
   def self.auto_assign(post, force: false)
     return unless SiteSetting.assigns_by_staff_mention
 
-    if post.user && post.topic && post.user.staff?
+    if post.user && post.topic && post.user.can_assign?
       can_assign = force || post.topic.custom_fields[ASSIGNED_TO_ID].nil?
 
       assign_other = assign_other_passes?(post) && mentioned_staff(post)
@@ -72,32 +72,31 @@ def self.auto_assign(post, force: false)
   end
 
   def self.is_last_staff_post?(post)
+    allowed_user_ids = User.assign_allowed.pluck(:id).join(',')
+
     sql = <<~SQL
       SELECT 1 FROM posts p
-       JOIN users u ON u.id = p.user_id AND (moderator OR admin)
+       JOIN users u ON u.id = p.user_id
        WHERE p.deleted_at IS NULL AND p.topic_id = :topic_id
+       AND u.id IN (#{allowed_user_ids})
        having max(post_number) = :post_number
-
     SQL
 
     args = {
       topic_id: post.topic_id,
       post_number: post.post_number
     }
 
-    # TODO post 2.1 release remove
-    if defined?(DB)
-      DB.exec(sql, args) == 1
-    else
-      Post.exec_sql(sql, args).to_a.length == 1
-    end
+    DB.exec(sql, args) == 1
   end
 
   def self.mentioned_staff(post)
     mentions = post.raw_mentions
     if mentions.present?
-      User.where('moderator OR admin')
-        .human_users
+      allowed_groups = SiteSetting.assign_allowed_on_groups.split('|')
+
+      User.human_users
+        .joins(:groups).where(groups: { name: allowed_groups })
         .where('username_lower IN (?)', mentions.map(&:downcase))
         .first
     end
@@ -108,8 +107,8 @@ def initialize(topic, user)
     @topic = topic
   end
 
-  def staff_ids
-    User.real.staff.pluck(:id)
+  def allowed_user_ids
+    User.assign_allowed.pluck(:id)
   end
 
   def can_assign_to?(user)
@@ -143,7 +142,7 @@ def assign(assign_to, silent: false)
         topic_id: @topic.id,
         assigned_to: BasicUserSerializer.new(assign_to, root: false).as_json
       },
-      user_ids: staff_ids
+      user_ids: allowed_user_ids
     )
 
     publish_topic_tracking_state(@topic, assign_to.id)
@@ -274,7 +273,7 @@ def unassign(silent: false)
           type: 'unassigned',
           topic_id: @topic.id,
         },
-        user_ids: staff_ids
+        user_ids: allowed_user_ids
       )
 
       publish_topic_tracking_state(@topic, assigned_user.id)