Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Add category-level assignment permissions (#40412)

Mark VanLandingham2aaa6a5ca3be
diff --git a/frontend/discourse/app/lib/constants.js b/frontend/discourse/app/lib/constants.js
index 70d93ea5dbb..af5564be387 100644
--- a/frontend/discourse/app/lib/constants.js
+++ b/frontend/discourse/app/lib/constants.js
@@ -26,6 +26,9 @@ export const CATEGORY_STYLE_TYPES = { square: 0, icon: 1, emoji: 2 };
export const CATEGORY_TEXT_COLORS = ["FFFFFF", "000000"];
+export const CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS =
+ "additional_assign_allowed_on_groups";
+
// NOTE: Group names are changed based on the site's locale, see
// Group.refresh_automatic_group! for more details
export const AUTO_GROUPS = {
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 8d7cfc3422c..9159a400944 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -18,6 +18,9 @@ end
task "javascript:update_constants" => :environment do
task_name = "update_constants"
+ category_additional_assign_allowed_groups =
+ DiscourseAssign::AssignmentPermissions::CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS
+
auto_groups =
Group::AUTO_GROUPS.inject({}) do |result, (group_name, group_id)|
result.merge(group_name => { id: group_id, automatic: true, name: group_name })
@@ -66,6 +69,8 @@ task "javascript:update_constants" => :environment do
export const CATEGORY_TEXT_COLORS = #{Category::DEFAULT_TEXT_COLORS};
+ export const CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS = "#{category_additional_assign_allowed_groups}";
+
// NOTE: Group names are changed based on the site's locale, see
// Group.refresh_automatic_group! for more details
export const AUTO_GROUPS = #{auto_groups.to_json};
diff --git a/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb b/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb
index 2dccade2be0..2504b4e7c61 100644
--- a/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb
+++ b/plugins/discourse-assign/app/controllers/discourse_assign/assign_controller.rb
@@ -7,12 +7,30 @@ module DiscourseAssign
before_action :ensure_logged_in, :ensure_assign_allowed
def suggestions
- users = [current_user, *recent_assignees]
+ target = assignment_target_from_params
+ raise Discourse::InvalidAccess if target && !guardian.can_assign?(target)
+
+ users = [current_user, *recent_assignees(target)]
+ assign_allowed_groups =
+ if target
+ DiscourseAssign::AssignmentPermissions.assign_allowed_groups_for_target(
+ current_user,
+ target,
+ )
+ else
+ DiscourseAssign::AssignmentPermissions.assign_allowed_groups_for_user(current_user)
+ end
+ assignable_group_ids =
+ if target
+ DiscourseAssign::AssignmentPermissions.allowed_group_ids_for_target(current_user, target)
+ else
+ Group.assignable(current_user).pluck(:id)
+ end
+
render json: {
- assign_allowed_on_groups:
- Group.visible_groups(current_user).assign_allowed_groups.pluck(:name),
+ assign_allowed_on_groups: assign_allowed_groups.pluck(:name),
assign_allowed_for_groups:
- Group.visible_groups(current_user).assignable(current_user).pluck(:name),
+ Group.visible_groups(current_user).where(id: assignable_group_ids).pluck(:name),
suggestions:
ActiveModel::ArraySerializer.new(
users,
@@ -29,6 +47,7 @@ module DiscourseAssign
raise Discourse::NotFound if !Assignment.valid_type?(target_type)
target = target_type.constantize.where(id: target_id).first
raise Discourse::NotFound if target.blank? || !guardian.can_see?(target)
+ raise Discourse::InvalidAccess if !guardian.can_assign?(target)
assigner = Assigner.new(target, current_user)
assigner.unassign
@@ -130,6 +149,7 @@ module DiscourseAssign
group = Group.find_by(name: params[:group_name])
guardian.ensure_can_see_group_members!(group)
+ raise Discourse::InvalidAccess if !guardian.can_assign_globally?
users_with_assignments_count =
User
@@ -169,6 +189,8 @@ module DiscourseAssign
def translate_failure(reason, assign_to)
case reason
+ when :forbidden_assigner_not_allowed
+ { error: I18n.t("discourse_assign.forbidden_assigner_not_allowed") }
when :already_assigned
{ error: I18n.t("discourse_assign.already_assigned", username: assign_to.username) }
when :forbidden_assign_to
@@ -230,9 +252,17 @@ module DiscourseAssign
raise Discourse::InvalidAccess.new unless current_user.can_assign?
end
- def recent_assignees
+ def recent_assignees(target)
+ allowed_user_ids =
+ if target
+ DiscourseAssign::AssignmentPermissions.allowed_user_ids_for_target(target)
+ else
+ DiscourseAssign::AssignmentPermissions.assignable_user_ids_for_user(current_user)
+ end
+
User
.where.not(id: current_user.id)
+ .where(id: allowed_user_ids)
.joins(<<~SQL)
JOIN(
SELECT assigned_to_id user_id, MAX(created_at) last_assigned
@@ -250,9 +280,21 @@ module DiscourseAssign
) AS ucf on ucf.user_id = users.id
SQL
.where("ucf.name is NULL")
- .assign_allowed
.order("X.last_assigned DESC")
.limit(5)
end
+
+ def assignment_target_from_params
+ return if params[:target_id].blank? && params[:target_type].blank?
+
+ target_id = params.require(:target_id)
+ target_type = params.require(:target_type)
+ raise Discourse::NotFound if !Assignment.valid_type?(target_type)
+
+ target = target_type.constantize.where(id: target_id).first
+ raise Discourse::NotFound if target.blank? || !guardian.can_see?(target)
+
+ target
+ end
end
end
diff --git a/plugins/discourse-assign/app/jobs/scheduled/enqueue_reminders.rb b/plugins/discourse-assign/app/jobs/scheduled/enqueue_reminders.rb
index 186ca542751..def541e78aa 100644
--- a/plugins/discourse-assign/app/jobs/scheduled/enqueue_reminders.rb
+++ b/plugins/discourse-assign/app/jobs/scheduled/enqueue_reminders.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require_relative "../../../lib/discourse_assign/assignment_permissions"
+
module Jobs
class EnqueueReminders < ::Jobs::Scheduled
REMINDER_BUFFER_MINUTES = 120
@@ -15,11 +17,11 @@ module Jobs
def skip_enqueue?
SiteSetting.remind_assigns_frequency.nil? || !SiteSetting.assign_enabled? ||
- SiteSetting.assign_allowed_on_groups.blank?
+ DiscourseAssign::AssignmentPermissions.all_assign_allowed_group_ids.blank?
end
def allowed_group_ids
- Group.assign_allowed_groups.pluck(:id).join(",")
+ DiscourseAssign::AssignmentPermissions.all_assign_allowed_group_ids.join(",")
end
def reminder_threshold
diff --git a/plugins/discourse-assign/app/models/assignment.rb b/plugins/discourse-assign/app/models/assignment.rb
index 221b2bf8e16..1104e05da1d 100644
--- a/plugins/discourse-assign/app/models/assignment.rb
+++ b/plugins/discourse-assign/app/models/assignment.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require_relative "../../lib/discourse_assign/assignment_permissions"
+
class Assignment < ActiveRecord::Base
VALID_TYPES = %w[topic post].freeze
@@ -98,6 +100,10 @@ class Assignment < ActiveRecord::Base
def publish_topic_assignment
return if !assigned_to
+ allowed_user_ids =
+ DiscourseAssign::AssignmentPermissions.allowed_user_ids_for_target(target || topic)
+ return if allowed_user_ids.blank?
+
serializer_class = assigned_to_user? ? BasicUserSerializer : BasicGroupSerializer
MessageBus.publish(
"/staff/topic-assignment",
@@ -111,7 +117,7 @@ class Assignment < ActiveRecord::Base
assignment_note: note,
assignment_status: status,
},
- user_ids: User.assign_allowed.pluck(:id),
+ user_ids: allowed_user_ids,
)
end
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjs
index 28d9bc4e497..8d9bce8cf0a 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjs
@@ -5,7 +5,7 @@ import DButton from "discourse/ui-kit/d-button";
export default class AssignButton extends Component {
static shouldRender(args) {
- return !args.post.firstPost;
+ return !args.post.firstPost && args.post.can_assign;
}
static hidden(args) {
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjs
index dcab6be4016..937e13cbb26 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjs
@@ -19,6 +19,10 @@ export default class AssignedToPost extends Component {
}
}
+ get canAssign() {
+ return this.args.post.can_assign;
+ }
+
@action
unassign() {
this.taskActions.unassignPost(this.args.post);
@@ -48,30 +52,32 @@ export default class AssignedToPost extends Component {
{{/if}}
</a>
- <DMenu
- @identifier="post-assign-menu"
- @icon="ellipsis"
- class="btn-flat more-button"
- @autofocus={{true}}
- >
- <DDropdownMenu as |dropdown|>
- <dropdown.item>
- <DButton
- @action={{this.unassign}}
- @icon="user-plus"
- @label="discourse_assign.unassign.title"
- class="btn-transparent unassign-btn"
- />
- </dropdown.item>
- <dropdown.item>
- <DButton
- @action={{this.editAssignment}}
- @icon="group-plus"
- @label="discourse_assign.reassign.title_w_ellipsis"
- class="btn-transparent edit-assignment-btn"
- />
- </dropdown.item>
- </DDropdownMenu>
- </DMenu>
+ {{#if this.canAssign}}
+ <DMenu
+ @identifier="post-assign-menu"
+ @icon="ellipsis"
+ class="btn-flat more-button"
+ @autofocus={{true}}
+ >
+ <DDropdownMenu as |dropdown|>
+ <dropdown.item>
+ <DButton
+ @action={{this.unassign}}
+ @icon="user-plus"
+ @label="discourse_assign.unassign.title"
+ class="btn-transparent unassign-btn"
+ />
+ </dropdown.item>
+ <dropdown.item>
+ <DButton
+ @action={{this.editAssignment}}
+ @icon="group-plus"
+ @label="discourse_assign.reassign.title_w_ellipsis"
+ class="btn-transparent edit-assignment-btn"
+ />
+ </dropdown.item>
+ </DDropdownMenu>
+ </DMenu>
+ {{/if}}
</template>
}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assignment-chooser.js b/plugins/discourse-assign/assets/javascripts/discourse/components/assignment-chooser.js
new file mode 100644
index 00000000000..fbf6899e168
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assignment-chooser.js
@@ -0,0 +1,47 @@
+import { classNames } from "@ember-decorators/component";
+import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";
+import { selectKitOptions } from "discourse/select-kit/components/select-kit";
+
+@classNames("email-group-user-chooser")
+@selectKitOptions({
+ assignmentGroups: null,
+})
+export default class AssignmentChooser extends EmailGroupUserChooser {
+ async search(filter = "") {
+ const assignmentGroups = this.assignmentGroupResults(filter);
+ const resultsPromise = super.search(filter);
+
+ if (!resultsPromise) {
+ return assignmentGroups.length ? assignmentGroups : undefined;
+ }
+
+ const results = await resultsPromise;
+
+ if (!Array.isArray(results)) {
+ return results;
+ }
+
+ const resultIds = new Set(results.map((result) => result.id));
+ return [
+ ...results,
+ ...assignmentGroups.filter((group) => !resultIds.has(group.id)),
+ ];
+ }
+
+ assignmentGroupResults(filter) {
+ const normalizedFilter = (filter || "").toLowerCase();
+
+ return (this.selectKit.options.assignmentGroups || [])
+ .filter(
+ (groupName) =>
+ !normalizedFilter ||
+ groupName.toLowerCase().includes(normalizedFilter)
+ )
+ .map((groupName) => ({
+ id: groupName,
+ name: groupName,
+ full_name: groupName,
+ isGroup: true,
+ }));
+ }
+}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjs
index 19a392167a0..9c6f109b51f 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjs
@@ -4,11 +4,11 @@ import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
import ComboBox from "discourse/select-kit/components/combo-box";
-import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";
import { not } from "discourse/truth-helpers";
import DTextarea from "discourse/ui-kit/d-textarea";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
+import AssignmentChooser from "./assignment-chooser";
export default class Assignment extends Component {
@service siteSettings;
@@ -18,6 +18,29 @@ export default class Assignment extends Component {
return this.args.assignment.username || this.args.assignment.group_name;
}
+ get targetId() {
+ return this.args.assignment.targetId || this.args.assignment.target?.id;
+ }
+
+ get targetType() {
+ return this.args.assignment.targetType || "Topic";
+ }
+
+ get suggestions() {
+ return this.taskActions.suggestionsFor(this.targetId, this.targetType);
+ }
+
+ get allowedGroups() {
+ return this.taskActions.allowedGroupsFor(this.targetId, this.targetType);
+ }
+
+ get allowedGroupsForAssignment() {
+ return this.taskActions.allowedGroupsForAssignmentFor(
+ this.targetId,
+ this.targetType
+ );
+ }
+
get status() {
return this.args.assignment.status || this.assignStatuses[0];
}
@@ -52,7 +75,7 @@ export default class Assignment extends Component {
@action
setAssignee([newAssignee]) {
- if (this.taskActions.allowedGroupsForAssignment.includes(newAssignee)) {
+ if (this.allowedGroupsForAssignment.includes(newAssignee)) {
this.args.assignment.username = null;
this.args.assignment.group_name = newAssignee;
} else {
@@ -74,7 +97,7 @@ export default class Assignment extends Component {
{{if this.showAssigneeIeEmptyError 'assignee-error'}}"
>
<label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
- <EmailGroupUserChooser
+ <AssignmentChooser
autocomplete="off"
@id="assignee-chooser"
@value={{this.assignee}}
@@ -84,10 +107,10 @@ export default class Assignment extends Component {
mobilePlacementStrategy="absolute"
includeGroups=true
customSearchOptions=(hash
- assignableGroups=true
- defaultSearchResults=this.taskActions.suggestions
+ assignableGroups=true defaultSearchResults=this.suggestions
)
- groupMembersOf=this.taskActions.allowedGroups
+ assignmentGroups=this.allowedGroupsForAssignment
+ groupMembersOf=this.allowedGroups
maximum=1
tabindex=1
expandedOnInsert=(not this.assignee)
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.js b/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.js
index f5ec028f01a..21e7dca6c6a 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.js
@@ -9,17 +9,22 @@ import EditTopicAssignments from "../components/modal/edit-topic-assignments";
const DEPENDENT_KEYS = [
"topic.assigned_to_user",
"topic.assigned_to_group",
+ "topic.can_assign",
"currentUser.can_assign",
"topic.assigned_to_user.username",
];
+function canAssignTopic(context) {
+ return context.topic?.can_assign ?? context.currentUser?.can_assign;
+}
+
export default {
id: "reassign",
dependentKeys: DEPENDENT_KEYS,
classNames: ["reassign"],
async action(id) {
- if (!this.currentUser?.can_assign) {
+ if (!canAssignTopic(this)) {
return;
}
@@ -95,7 +100,7 @@ export default {
displayed() {
return (
- this.currentUser?.can_assign &&
+ canAssignTopic(this) &&
this.site.desktopView &&
(this.topic.isAssigned() || this.topic.hasAssignedPosts())
);
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjs
index b62536057f9..5bb1b5da424 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.gjs
@@ -9,7 +9,7 @@ import { i18n } from "discourse-i18n";
@tagName("")
export default class AssignedAdvancedSearch extends Component {
static shouldRender(args, { currentUser }) {
- return currentUser?.can_assign;
+ return currentUser?.can_assign_globally;
}
@action
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs
index 8cbe689565e..e110a1fa05c 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs
@@ -1,8 +1,17 @@
import Component from "@glimmer/component";
import { action } from "@ember/object";
+import { service } from "@ember/service";
+import {
+ AUTO_GROUPS,
+ CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS,
+} from "discourse/lib/constants";
+import GroupChooser from "discourse/select-kit/components/group-chooser";
import { i18n } from "discourse-i18n";
export default class AssignSettingsUpsert extends Component {
+ @service site;
+ @service siteSettings;
+
get enableUnassignedFilter() {
const value =
this.args.outletArgs.transientData?.custom_fields
@@ -10,15 +19,84 @@ export default class AssignSettingsUpsert extends Component {
return value?.toString() === "true";
}
+ get globalAssignAllowedGroupIds() {
+ return this.groupIdsFromValue(this.siteSettings.assign_allowed_on_groups);
+ }
+
+ get additionalAssignAllowedGroupIds() {
+ const value =
+ this.args.outletArgs.transientData?.custom_fields?.[
+ CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS
+ ];
+
+ return [
+ ...new Set([
+ ...this.globalAssignAllowedGroupIds,
+ ...this.groupIdsFromValue(value),
+ ]),
+ ];
+ }
+
+ get assignAllowedMandatoryGroupIds() {
+ return this.globalAssignAllowedGroupIds.join("|");
+ }
+
+ groupIdsFromValue(value) {
+ return (value || "")
+ .split("|")
+ .filter(Boolean)
+ .filter((groupId) => parseInt(groupId, 10) !== AUTO_GROUPS.everyone.id);
+ }
+
+ get assignableGroups() {
+ return (this.site.groups || [])
+ .filter((group) => group.id !== AUTO_GROUPS.everyone.id)
+ .map((group) => ({ ...group, id: group.id.toString() }));
+ }
+
@action
async onToggleUnassignedFilter(_, { set, name }) {
await set(name, this.enableUnassignedFilter ? "false" : "true");
}
+ @action
+ async onChangeAssignAllowedGroups(groupIds, { set, name }) {
+ await set(
+ name,
+ (groupIds || [])
+ .filter((groupId) => parseInt(groupId, 10) !== AUTO_GROUPS.everyone.id)
+ .filter(
+ (groupId) => !this.globalAssignAllowedGroupIds.includes(groupId)
+ )
+ .join("|")
+ );
+ }
+
<template>
{{#let @outletArgs.form as |form|}}
<form.Section @title={{i18n "discourse_assign.assign.title"}}>
<form.Object @name="custom_fields" as |customFields|>
+ <customFields.Field
+ @name={{CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS}}
+ @title={{i18n "discourse_assign.additional_assign_allowed_groups"}}
+ @description={{i18n
+ "discourse_assign.additional_assign_allowed_groups_description"
+ }}
+ @onSet={{this.onChangeAssignAllowedGroups}}
+ @type="custom"
+ @format="full"
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ @content={{this.assignableGroups}}
+ @value={{this.additionalAssignAllowedGroupIds}}
+ @mandatoryValues={{this.assignAllowedMandatoryGroupIds}}
+ @onChange={{field.set}}
+ />
+ </field.Control>
+ </customFields.Field>
+
<customFields.Field
@name="enable_unassigned_filter"
@title={{i18n "discourse_assign.add_unassigned_filter"}}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjs
index f51c1169643..17d48b1722b 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjs
@@ -7,7 +7,7 @@ import GroupAssignedMenuItem from "../../components/group-assigned-menu-item";
export default class AssignedTopicList extends Component {
static shouldRender(args, context) {
return (
- context.currentUser?.can_assign &&
+ context.currentUser?.can_assign_globally &&
args.group.can_show_assigned_tab &&
args.group.can_see_members
);
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjs
index f1103484fff..b7cbbce06c4 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjs
@@ -9,7 +9,7 @@ import { i18n } from "discourse-i18n";
export default class AssignedList extends Component {
<template>
<li class="user-activity-bottom-outlet assigned-list" ...attributes>
- {{#if this.currentUser.can_assign}}
+ {{#if this.currentUser.can_assign_globally}}
<LinkTo @route="userActivity.assigned">
{{dIcon "user-plus"}}
{{i18n "discourse_assign.assigned"}}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-extend-user-messages.js b/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-extend-user-messages.js
index f813ec324e3..f11ff116fc8 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-extend-user-messages.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-extend-user-messages.js
@@ -8,7 +8,10 @@ export default {
withPluginApi((api) => {
const currentUser = container.lookup("service:current-user");
- if (currentUser?.can_assign && api.addUserMessagesNavigationDropdownRow) {
+ if (
+ currentUser?.can_assign_globally &&
+ api.addUserMessagesNavigationDropdownRow
+ ) {
api.addUserMessagesNavigationDropdownRow(
"userPrivateMessages.assigned",
i18n("discourse_assign.assigned"),
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-user-menu.js b/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-user-menu.js
index f6afbe69147..11bf516aae1 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-user-menu.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/initializers/assign-user-menu.js
@@ -70,7 +70,7 @@ export default {
);
}
- if (api.registerUserMenuTab) {
+ if (currentUser?.can_assign_globally && api.registerUserMenuTab) {
api.registerUserMenuTab((UserMenuTab) => {
return class extends UserMenuTab {
id = "assign-list";
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js b/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js
index 58fb6632b7c..b6e2d28970e 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js
@@ -24,6 +24,7 @@ import { extendTopicModel } from "../models/topic";
const DEPENDENT_KEYS = [
"topic.assigned_to_user",
"topic.assigned_to_group",
+ "topic.can_assign",
"currentUser.can_assign",
"topic.assigned_to_user.username",
"topic.assigned_to_user.name",
@@ -40,6 +41,10 @@ function defaultTitle(topic) {
}
}
+function canAssignTopic(context) {
+ return context.topic?.can_assign ?? context.currentUser?.can_assign;
+}
+
function registerTopicFooterButtons(api) {
registerTopicFooterDropdown(TopicLevelAssignMenu);
@@ -63,7 +68,7 @@ function registerTopicFooterButtons(api) {
return i18n("discourse_assign.assign.title");
},
async action() {
- if (!this.currentUser?.can_assign) {
+ if (!canAssignTopic(this)) {
return;
}
@@ -90,7 +95,7 @@ function registerTopicFooterButtons(api) {
dependentKeys: DEPENDENT_KEYS,
displayed() {
return (
- this.currentUser?.can_assign &&
+ canAssignTopic(this) &&
!this.topic.isAssigned() &&
!this.topic.hasAssignedPosts()
);
@@ -126,13 +131,13 @@ function registerTopicFooterButtons(api) {
}
},
dropdown() {
- return this.currentUser?.can_assign && this.topic.isAssigned();
+ return canAssignTopic(this) && this.topic.isAssigned();
},
classNames: ["assign"],
dependentKeys: DEPENDENT_KEYS,
displayed() {
// only display the button in the mobile view
- return this.currentUser?.can_assign && this.site.mobileView;
+ return canAssignTopic(this) && this.site.mobileView;
},
});
@@ -155,7 +160,7 @@ function registerTopicFooterButtons(api) {
);
},
action() {
- if (!this.currentUser?.can_assign) {
+ if (!canAssignTopic(this)) {
return;
}
@@ -166,16 +171,14 @@ function registerTopicFooterButtons(api) {
taskActions.unassign(this.topic.id);
},
dropdown() {
- return this.currentUser?.can_assign && this.topic.isAssigned();
+ return canAssignTopic(this) && this.topic.isAssigned();
},
classNames: ["assign"],
dependentKeys: DEPENDENT_KEYS,
displayed() {
// only display the button in the mobile view
return (
- this.currentUser?.can_assign &&
- this.site.mobileView &&
- this.topic.isAssigned()
+ canAssignTopic(this) && this.site.mobileView && this.topic.isAssigned()
);
},
});
@@ -199,7 +202,7 @@ function registerTopicFooterButtons(api) {
);
},
async action() {
- if (!this.currentUser?.can_assign) {
+ if (!canAssignTopic(this)) {
return;
}
@@ -211,7 +214,7 @@ function registerTopicFooterButtons(api) {
await taskActions.reassignUserToTopic(this.currentUser, this.topic);
},
dropdown() {
- return this.currentUser?.can_assign && this.topic.isAssigned();
+ return canAssignTopic(this) && this.topic.isAssigned();
},
classNames: ["assign"],
dependentKeys: DEPENDENT_KEYS,
@@ -219,7 +222,7 @@ function registerTopicFooterButtons(api) {
return (
// only display the button in the mobile view
this.site.mobileView &&
- this.currentUser?.can_assign &&
+ canAssignTopic(this) &&
this.topic.isAssigned() &&
this.topic.assigned_to_user?.username !== this.currentUser.username
);
@@ -245,7 +248,7 @@ function registerTopicFooterButtons(api) {
);
},
async action() {
- if (!this.currentUser?.can_assign) {
+ if (!canAssignTopic(this)) {
return;
}
@@ -257,13 +260,13 @@ function registerTopicFooterButtons(api) {
});
},
dropdown() {
- return this.currentUser?.can_assign && this.topic.isAssigned();
+ return canAssignTopic(this) && this.topic.isAssigned();
},
classNames: ["assign"],
dependentKeys: DEPENDENT_KEYS,
displayed() {
// only display the button in the mobile view
- return this.currentUser?.can_assign && this.site.mobileView;
+ return canAssignTopic(this) && this.site.mobileView;
},
});
}
@@ -271,8 +274,9 @@ function registerTopicFooterButtons(api) {
function initialize(api) {
const siteSettings = api.container.lookup("service:site-settings");
const currentUser = api.getCurrentUser();
+ const canAssignGlobally = currentUser?.can_assign_globally;
- if (siteSettings.assigns_public || currentUser?.can_assign) {
+ if (siteSettings.assigns_public || canAssignGlobally) {
api.addNavigationBarItem({
name: "unassigned",
customFilter: (category) => {
@@ -295,14 +299,14 @@ function initialize(api) {
},
before: "top",
});
+ }
- if (api.getCurrentUser()?.can_assign) {
- customizePostMenu(api);
- }
+ if (currentUser?.can_assign) {
+ customizePostMenu(api);
}
api.addAdvancedSearchOptions(
- api.getCurrentUser()?.can_assign
+ canAssignGlobally
? {
inOptionsForUsers: [
{
@@ -541,7 +545,8 @@ function customizePost(api, siteSettings) {
"assigned_to_user",
"assigned_to_user_id",
"assignment_note",
- "assignment_status"
+ "assignment_status",
+ "can_assign"
);
api.modifyClass(
@@ -651,7 +656,7 @@ export default {
withPluginApi((api) => {
const currentUser = container.lookup("service:current-user");
- if (currentUser?.can_assign) {
+ if (currentUser?.can_assign_globally) {
api.modifyClass(
"component:search-advanced-options",
(Superclass) =>
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/models/topic.js b/plugins/discourse-assign/assets/javascripts/discourse/models/topic.js
index f872c4cf804..bb0aceade0e 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/models/topic.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/models/topic.js
@@ -12,6 +12,7 @@ export function extendTopicModel(api) {
@tracked assigned_to_user_id;
@tracked assignment_note;
@tracked assignment_status;
+ @tracked can_assign;
@tracked indirectly_assigned_to;
assignees() {
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/services/task-actions.js b/plugins/discourse-assign/assets/javascripts/discourse/services/task-actions.js
index 991314c8446..f7f92a7ba7c 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/services/task-actions.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/services/task-actions.js
@@ -1,4 +1,3 @@
-/* eslint-disable ember/no-side-effects */
import { tracked } from "@glimmer/tracking";
import Service, { service } from "@ember/service";
import { isEmpty } from "@ember/utils";
@@ -9,31 +8,99 @@ import AssignUser from "../components/modal/assign-user";
export default class TaskActions extends Service {
@service modal;
- @tracked allowedGroups;
- @tracked allowedGroupsForAssignment;
- #suggestionsPromise; // eslint-disable-line no-unused-private-class-members
- @tracked _suggestions;
+ @tracked suggestionsRevision = 0;
+ #allowedGroupsByTarget = new Map();
+ #allowedGroupsForAssignmentByTarget = new Map();
+ #suggestionsByTarget = new Map();
+ #suggestionsPromisesByTarget = new Map();
get suggestions() {
- if (this._suggestions) {
- return this._suggestions;
- }
+ return this.suggestionsFor();
+ }
+
+ get allowedGroups() {
+ return this.allowedGroupsFor();
+ }
+
+ get allowedGroupsForAssignment() {
+ return this.allowedGroupsForAssignmentFor();
+ }
+
+ suggestionsFor(targetId, targetType = "Topic") {
+ this.suggestionsRevision;
+ this.#ensureSuggestions(targetId, targetType);
+
+ return (
+ this.#suggestionsByTarget.get(
+ this.#suggestionsKey(targetId, targetType)
+ ) || null
+ );
+ }
+
+ allowedGroupsFor(targetId, targetType = "Topic") {
+ this.suggestionsRevision;
+ this.#ensureSuggestions(targetId, targetType);
+
+ return (
+ this.#allowedGroupsByTarget.get(
+ this.#suggestionsKey(targetId, targetType)
+ ) || []
+ );
+ }
- this.#suggestionsPromise ||= this.#fetchSuggestions();
+ allowedGroupsForAssignmentFor(targetId, targetType = "Topic") {
+ this.suggestionsRevision;
+ this.#ensureSuggestions(targetId, targetType);
- return null;
+ return (
+ this.#allowedGroupsForAssignmentByTarget.get(
+ this.#suggestionsKey(targetId, targetType)
+ ) || []
+ );
}
- async #fetchSuggestions() {
- const data = await ajax("/assign/suggestions");
+ #ensureSuggestions(targetId, targetType) {
+ const key = this.#suggestionsKey(targetId, targetType);
+
+ if (
+ this.#suggestionsByTarget.has(key) ||
+ this.#suggestionsPromisesByTarget.has(key)
+ ) {
+ return;
+ }
+
+ this.#suggestionsPromisesByTarget.set(
+ key,
+ this.#fetchSuggestions(key, targetId, targetType)
+ );
+ }
+
+ async #fetchSuggestions(key, targetId, targetType) {
+ const data = {};
+
+ if (targetId) {
+ data.target_id = targetId;
+ data.target_type = targetType;
+ }
+
+ const response = await ajax("/assign/suggestions", { data });
if (this.isDestroying || this.isDestroyed) {
return;
}
- this._suggestions = data.suggestions;
- this.allowedGroups = data.assign_allowed_on_groups;
- this.allowedGroupsForAssignment = data.assign_allowed_for_groups;
+ this.#suggestionsByTarget.set(key, response.suggestions);
+ this.#allowedGroupsByTarget.set(key, response.assign_allowed_on_groups);
+ this.#allowedGroupsForAssignmentByTarget.set(
+ key,
+ response.assign_allowed_for_groups
+ );
+ this.#suggestionsPromisesByTarget.delete(key);
+ this.suggestionsRevision++;
+ }
+
+ #suggestionsKey(targetId, targetType) {
+ return targetId ? `${targetType}:${targetId}` : "default";
}
unassign(targetId, targetType = "Topic") {
diff --git a/plugins/discourse-assign/config/locales/client.en.yml b/plugins/discourse-assign/config/locales/client.en.yml
index ccbd6a32223..e79346cbf97 100644
--- a/plugins/discourse-assign/config/locales/client.en.yml
+++ b/plugins/discourse-assign/config/locales/client.en.yml
@@ -25,6 +25,8 @@ en:
status_change: "Changed assignment status for %{who} %{when}"
discourse_assign:
add_unassigned_filter: "Add 'unassigned' filter to category"
+ additional_assign_allowed_groups: "Additional groups with assignment permission"
+ additional_assign_allowed_groups_description: "Members of these groups can assign topics in this category. Groups already allowed globally are shown and cannot be removed here. Parent category settings do not apply to subcategories."
cant_act: "You cannot act on flags that have been assigned to other users"
cant_act_unclaimed: "You must claim this topic before acting on flags."
topic_search_placeholder: "Search topics by title or post content"
diff --git a/plugins/discourse-assign/config/locales/server.en.yml b/plugins/discourse-assign/config/locales/server.en.yml
index 2602865948a..e627b2cf4c7 100644
--- a/plugins/discourse-assign/config/locales/server.en.yml
+++ b/plugins/discourse-assign/config/locales/server.en.yml
@@ -16,7 +16,7 @@ en:
remind_assigns_frequency: "Frequency for reminding users about assigned topics."
pending_assign_reminder_threshold: "Number of pending assignments that triggers a reminder notification."
max_assigned_topics: "Maximum number of topics that can be assigned to a user."
- assign_allowed_on_groups: "Users in these groups are allowed to assign topics."
+ assign_allowed_on_groups: "Users in these groups are allowed to assign topics. Additional groups with assignment permission can be specified in category settings."
enable_assign_status: "Add a customizable status field to every assignment."
assign_statuses: "List of statuses available to each assignment. The first status is the default status applied to every new assignment."
ignore_solved_topics_in_assigned_reminder: "Prevent reminders for assignments from including solved topics. Only relevant when using the discourse-solved plugin."
@@ -39,6 +39,7 @@ en:
already_assigned: "Topic is already assigned to @%{username}"
too_many_assigns: "@%{username} has already reached the maximum number of assigned topics (%{max})."
too_many_assigns_for_topic: "Limit of %{limit} assignments per topic has been reached."
+ forbidden_assigner_not_allowed: "You can only assign topics in categories allowed for your groups."
forbidden_assign_to: "@%{username} can't be assigned since they don't belong to assigned allowed groups."
forbidden_assignee_not_pm_participant: "@%{username} can't be assigned because they don't have access to this PM. You can grant @%{username} access by inviting them to this PM."
forbidden_assignee_cant_see_topic: "@%{username} can't be assigned because they don't have access to this topic."
diff --git a/plugins/discourse-assign/lib/assigner.rb b/plugins/discourse-assign/lib/assigner.rb
index 170695461f8..d596e79e104 100644
--- a/plugins/discourse-assign/lib/assigner.rb
+++ b/plugins/discourse-assign/lib/assigner.rb
@@ -3,6 +3,8 @@
require "email/sender"
require "nokogiri"
+require_relative "discourse_assign/assignment_permissions"
+
class ::Assigner
ASSIGNMENTS_PER_TOPIC_LIMIT = 5
@@ -70,7 +72,7 @@ class ::Assigner
def self.auto_assign(post, force: false)
return unless SiteSetting.assigns_by_staff_mention
- if post.user && post.topic && post.user.can_assign?
+ if post.user && post.topic && post.user.can_assign?(post.topic)
return if post.topic.assignment.present? && !force
# remove quotes, oneboxes and code blocks
@@ -94,27 +96,22 @@ class ::Assigner
end
def self.is_last_staff_post?(post)
- allowed_user_ids = User.assign_allowed.pluck(:id).join(",")
+ allowed_user_ids =
+ DiscourseAssign::AssignmentPermissions.allowed_user_ids_for_target(post.topic)
+ return false if allowed_user_ids.empty?
- sql = <<~SQL
- SELECT 1
- FROM posts p
- 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 }
-
- DB.exec(sql, args) == 1
+ Post.where(topic_id: post.topic_id, user_id: allowed_user_ids).maximum(:post_number) ==
+ post.post_number
end
def self.mentioned_staff(post)
mentions = post.raw_mentions
if mentions.present?
- User.human_users.assign_allowed.where("username_lower IN (?)", mentions.map(&:downcase)).first
+ User
+ .human_users
+ .where(id: DiscourseAssign::AssignmentPermissions.allowed_user_ids_for_target(post.topic))
+ .where(username_lower: mentions.map(&:downcase))
+ .first
end
end
@@ -130,11 +127,13 @@ class ::Assigner
end
def allowed_user_ids
- @allowed_user_ids ||= User.assign_allowed.pluck(:id)
+ @allowed_user_ids ||=
+ DiscourseAssign::AssignmentPermissions.allowed_user_ids_for_target(@target)
end
def allowed_group_ids
- @allowed_group_ids ||= Group.assignable(@assigned_by).pluck(:id)
+ @allowed_group_ids ||=
+ DiscourseAssign::AssignmentPermissions.allowed_group_ids_for_target(@assigned_by, @target)
end
def can_assign_to?(assign_to)
@@ -263,6 +262,10 @@ class ::Assigner
)
assigned_to_type = assign_to.is_a?(User) ? "User" : "Group"
+ if !@assigned_by&.guardian&.can_assign?(@target)
+ return { success: false, reason: :forbidden_assigner_not_allowed }
+ end
+
if topic.private_message? && SiteSetting.invite_on_assign
if assigned_to_type == "Group"
invite_group(assign_to, should_notify)
@@ -444,19 +447,21 @@ class ::Assigner
WebHook.enqueue_assign_hooks(type, payload.to_json)
end
- MessageBus.publish(
- "/staff/topic-assignment",
- {
- type: "unassigned",
- topic_id: topic.id,
- post_id: post_target? && @target.id,
- post_number: post_target? && @target.post_number,
- assigned_type: assignment.assigned_to.is_a?(User) ? "User" : "Group",
- assignment_note: nil,
- assignment_status: nil,
- },
- user_ids: allowed_user_ids,
- )
+ if allowed_user_ids.present?
+ MessageBus.publish(
+ "/staff/topic-assignment",
+ {
+ type: "unassigned",
+ topic_id: topic.id,
+ post_id: post_target? && @target.id,
+ post_number: post_target? && @target.post_number,
+ assigned_type: assignment.assigned_to.is_a?(User) ? "User" : "Group",
+ assignment_note: nil,
+ assignment_status: nil,
+ },
+ user_ids: allowed_user_ids,
+ )
+ end
end
end
diff --git a/plugins/discourse-assign/lib/discourse_assign/assignment_permissions.rb b/plugins/discourse-assign/lib/discourse_assign/assignment_permissions.rb
new file mode 100644
index 00000000000..a2fa91b9bb9
--- /dev/null
+++ b/plugins/discourse-assign/lib/discourse_assign/assignment_permissions.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module DiscourseAssign
+ module AssignmentPermissions
+ CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS = "additional_assign_allowed_on_groups"
+
+ class << self
+ def allowed_user_ids_for_target(target)
+ ids = Set.new(admin_user_ids)
+ ids.merge(user_ids_in_groups(global_group_ids))
+ ids.merge(user_ids_in_groups(scoped_group_ids_for_category(category_id_for(target))))
+ ids.to_a
+ end
+
+ def allowed_group_ids_for_target(user, target)
+ ids = Set.new(Group.assignable(user).pluck(:id))
+ ids.merge(scoped_group_ids_for_category(category_id_for(target)))
+ ids.to_a
+ end
+
+ def assign_allowed_groups_for_target(user, target)
+ Group.visible_groups(user).where(
+ id: global_group_ids | scoped_group_ids_for_category(category_id_for(target)),
+ )
+ end
+
+ def assign_allowed_groups_for_user(user)
+ group_ids =
+ if user&.guardian&.can_assign_globally?
+ global_group_ids | all_scoped_group_ids
+ else
+ global_group_ids | scoped_group_ids_for_user(user)
+ end
+
+ Group.visible_groups(user).where(id: group_ids)
+ end
+
+ def assignable_user_ids_for_user(user)
+ group_ids =
+ if user&.guardian&.can_assign_globally?
+ global_group_ids | all_scoped_group_ids
+ else
+ global_group_ids | scoped_group_ids_for_user(user)
+ end
+
+ (admin_user_ids | user_ids_in_groups(group_ids)).uniq
+ end
+
+ def all_assign_allowed_group_ids
+ global_group_ids | all_scoped_group_ids
+ end
+
+ def category_id_for(target)
+ case target
+ when Topic
+ target.category_id
+ when Post
+ target.topic&.category_id
+ else
+ nil
+ end
+ end
+
+ def global_group_ids
+ SiteSetting.assign_allowed_on_groups_map
+ end
+
+ def all_scoped_group_ids
+ CategoryCustomField
+ .where(name: CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS)
+ .pluck(:value)
+ .flat_map { |value| group_ids_from_value(value) }
+ .uniq
+ end
+
+ def scoped_group_ids_for_user(user)
+ return [] if user.blank?
+
+ all_scoped_group_ids & group_ids_for(user)
+ end
+
+ def scoped_group_ids_for_category(category_id)
+ return [] if category_id.blank?
+
+ group_ids_from_value(
+ CategoryCustomField.where(
+ category_id:,
+ name: CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS,
+ ).pick(:value),
+ )
+ end
+
+ private
+
+ def group_ids_for(user)
+ user.group_ids
+ end
+
+ def admin_user_ids
+ User.human_users.admins.pluck(:id)
+ end
+
+ def user_ids_in_groups(group_ids)
+ return [] if group_ids.blank?
+
+ GroupUser.where(group_id: group_ids).pluck(:user_id)
+ end
+
+ def group_ids_from_value(value)
+ value.to_s.split("|").map(&:to_i).reject(&:zero?)
+ end
+ end
+ end
+end
diff --git a/plugins/discourse-assign/lib/discourse_assign/guardian_extensions.rb b/plugins/discourse-assign/lib/discourse_assign/guardian_extensions.rb
new file mode 100644
index 00000000000..ed6d3ee09af
--- /dev/null
+++ b/plugins/discourse-assign/lib/discourse_assign/guardian_extensions.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module DiscourseAssign
+ module GuardianExtensions
+ def can_assign?(target = nil)
+ return false if user.blank?
+ return can_assign_target?(target) if target
+
+ @can_assign ||= can_assign_globally? || scoped_assign_group_ids_for_user.present?
+ end
+
+ def can_assign_globally?
+ return false if user.blank?
+ @can_assign_globally ||=
+ if user.admin?
+ true
+ else
+ allowed_group_ids = DiscourseAssign::AssignmentPermissions.global_group_ids
+ allowed_group_ids.present? && (allowed_group_ids & user.group_ids).present?
+ end
+ end
+
+ private
+
+ def can_assign_target?(target)
+ return true if can_assign_globally?
+
+ category_id = DiscourseAssign::AssignmentPermissions.category_id_for(target)
+ return false if category_id.blank?
+
+ (scoped_assign_group_ids_for_category(category_id) & user.group_ids).present?
+ end
+
+ def scoped_assign_group_ids_for_user
+ DiscourseAssign::AssignmentPermissions.scoped_group_ids_for_user(user)
+ end
+
+ def scoped_assign_group_ids_for_category(category_id)
+ @scoped_assign_group_ids_by_category ||= {}
+ @scoped_assign_group_ids_by_category[
+ category_id
+ ] ||= DiscourseAssign::AssignmentPermissions.scoped_group_ids_for_category(category_id)
+ end
+ end
+end
diff --git a/plugins/discourse-assign/lib/random_assign_utils.rb b/plugins/discourse-assign/lib/random_assign_utils.rb
index b53c1b99fd1..a3898ca8e71 100644
--- a/plugins/discourse-assign/lib/random_assign_utils.rb
+++ b/plugins/discourse-assign/lib/random_assign_utils.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require_relative "discourse_assign/assignment_permissions"
+
class RandomAssignUtils
attr_reader :context, :fields, :automation, :topic, :group
@@ -116,7 +118,7 @@ class RandomAssignUtils
users =
group
.users
- .where(id: User.assign_allowed.select(:id))
+ .where(id: DiscourseAssign::AssignmentPermissions.allowed_user_ids_for_target(topic))
.where.not(
id:
User
diff --git a/plugins/discourse-assign/plugin.rb b/plugins/discourse-assign/plugin.rb
index 410a226e17a..af708f5d05e 100644
--- a/plugins/discourse-assign/plugin.rb
+++ b/plugins/discourse-assign/plugin.rb
@@ -19,6 +19,8 @@ module ::DiscourseAssign
end
require_relative "lib/discourse_assign/engine"
+require_relative "lib/discourse_assign/assignment_permissions"
+require_relative "lib/discourse_assign/guardian_extensions"
require_relative "lib/validators/assign_statuses_validator"
after_initialize do
@@ -31,6 +33,7 @@ after_initialize do
UserUpdater::OPTION_ATTR.push(:notification_level_when_assigned)
reloadable_patch do |plugin|
+ Guardian.prepend(DiscourseAssign::GuardianExtensions)
Group.prepend(DiscourseAssign::GroupExtension)
ListController.prepend(DiscourseAssign::ListControllerExtension)
Post.prepend(DiscourseAssign::PostExtension)
@@ -59,7 +62,11 @@ after_initialize do
DiscoursePluginRegistry.serialized_current_user_fields << frequency_field
add_to_serializer(:user, :reminders_frequency) { RemindAssignsFrequencySiteSettings.values }
- add_to_serializer(:group_show, :assignment_count, include_condition: -> { scope.can_assign? }) do
+ add_to_serializer(
+ :group_show,
+ :assignment_count,
+ include_condition: -> { scope.can_assign_globally? },
+ ) do
Topic.joins(<<~SQL).where(<<~SQL, group_id: object.id).where("topics.deleted_at IS NULL").count
JOIN assignments a
ON topics.id = a.topic_id AND a.assigned_to_id IS NOT NULL
@@ -90,11 +97,20 @@ after_initialize do
where(id: allowed_groups)
end
- add_to_class(:user, :can_assign?) do
- return @can_assign if defined?(@can_assign)
+ add_to_class(:user, :can_assign?) do |target = nil|
+ if target
+ guardian.can_assign?(target)
+ else
+ return @can_assign if defined?(@can_assign)
- allowed_groups = SiteSetting.assign_allowed_on_groups_map
- @can_assign = admin? || (allowed_groups.present? && groups.where(id: allowed_groups).exists?)
+ @can_assign = guardian.can_assign?
+ end
+ end
+
+ add_to_class(:user, :can_assign_globally?) do
+ return @can_assign_globally if defined?(@can_assign_globally)
+
+ @can_assign_globally = guardian.can_assign_globally?
end
add_to_serializer(:current_user, :never_auto_track_topics) do
@@ -106,8 +122,6 @@ after_initialize do
add_to_class(:group, :can_show_assigned_tab?) { assignable_level > Group::ALIAS_LEVELS[:nobody] }
- add_to_class(:guardian, :can_assign?) { user && user.can_assign? }
-
add_class_method(:user, :assign_allowed) do
allowed_groups = SiteSetting.assign_allowed_on_groups.split("|")
@@ -149,7 +163,14 @@ after_initialize do
on(:unassign_topic) { |topic, unassigning_user| Assigner.new(topic, unassigning_user).unassign }
+ register_category_custom_field_type(
+ DiscourseAssign::AssignmentPermissions::CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS,
+ :string,
+ )
register_preloaded_category_custom_fields("enable_unassigned_filter")
+ register_preloaded_category_custom_fields(
+ DiscourseAssign::AssignmentPermissions::CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS,
+ )
BookmarkQuery.on_preload do |bookmarks, _bookmark_query|
if SiteSetting.assign_enabled?
@@ -286,7 +307,7 @@ after_initialize do
name = topic_query.options[:assigned]
next results if name.blank?
- next results if !topic_query.guardian.can_assign? && !SiteSetting.assigns_public
+ next results if !topic_query.guardian.can_assign_globally? && !SiteSetting.assigns_public
if name == "nobody"
next(
@@ -416,7 +437,7 @@ after_initialize do
add_to_class(:list_controller, :messages_assigned) do
user = User.find_by_username(params[:username])
raise Discourse::NotFound unless user
- raise Discourse::InvalidAccess unless current_user.can_assign?
+ raise Discourse::InvalidAccess unless guardian.can_assign_globally?
list_opts = build_topic_list_options
list_opts.merge!({ filter: :direct }) if params[:direct] == "true"
@@ -433,7 +454,7 @@ after_initialize do
guardian.ensure_can_see_group_members!(group)
raise Discourse::NotFound unless group
- raise Discourse::InvalidAccess unless current_user.can_assign?
+ raise Discourse::InvalidAccess unless guardian.can_assign_globally?
raise Discourse::InvalidAccess unless group.can_show_assigned_tab?
list_opts = build_topic_list_options
@@ -496,7 +517,7 @@ after_initialize do
options = object.instance_variable_get(:@opts)
if assigned_user = options.dig(:assigned)
- scope.can_assign? || assigned_user.downcase == scope.current_user&.username_lower
+ scope.can_assign_globally? || assigned_user.downcase == scope.current_user&.username_lower
end
end,
) do
@@ -507,11 +528,18 @@ after_initialize do
end
# TopicView serializer
+ add_to_serializer(
+ :topic_view,
+ :can_assign,
+ include_condition: -> { scope.current_user.present? },
+ ) { scope.can_assign?(object.topic) }
+
add_to_serializer(
:topic_view,
:assigned_to_user,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to.is_a?(User)
+ (SiteSetting.assigns_public || scope.can_assign?(object.topic)) &&
+ object.topic.assigned_to.is_a?(User)
end,
) { DiscourseAssign::Helpers.build_assigned_to_user(object.topic.assigned_to, object.topic) }
@@ -519,7 +547,8 @@ after_initialize do
:topic_view,
:assigned_to_group,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.topic.assigned_to.is_a?(Group)
+ (SiteSetting.assigns_public || scope.can_assign?(object.topic)) &&
+ object.topic.assigned_to.is_a?(Group)
end,
) { DiscourseAssign::Helpers.build_assigned_to_group(object.topic.assigned_to, object.topic) }
@@ -527,7 +556,7 @@ after_initialize do
:topic_view,
:indirectly_assigned_to,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) &&
+ (SiteSetting.assigns_public || scope.can_assign?(object.topic)) &&
object.topic.indirectly_assigned_to.present?
end,
) do
@@ -541,7 +570,8 @@ after_initialize do
:topic_view,
:assignment_note,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.topic.assignment.present?
+ (SiteSetting.assigns_public || scope.can_assign?(object.topic)) &&
+ object.topic.assignment.present?
end,
) { object.topic.assignment.note }
@@ -549,7 +579,8 @@ after_initialize do
:topic_view,
:assignment_status,
include_condition: -> do
- SiteSetting.enable_assign_status && (SiteSetting.assigns_public || scope.can_assign?) &&
+ SiteSetting.enable_assign_status &&
+ (SiteSetting.assigns_public || scope.can_assign?(object.topic)) &&
object.topic.assignment_status.present?
end,
) { object.topic.assignment_status }
@@ -559,7 +590,7 @@ after_initialize do
:suggested_topic,
:assigned_to_user,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(User)
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assigned_to.is_a?(User)
end,
) { DiscourseAssign::Helpers.build_assigned_to_user(object.assigned_to, object) }
@@ -567,7 +598,7 @@ after_initialize do
:suggested_topic,
:assigned_to_group,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(Group)
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assigned_to.is_a?(Group)
end,
) { DiscourseAssign::Helpers.build_assigned_to_group(object.assigned_to, object) }
@@ -575,16 +606,24 @@ after_initialize do
:suggested_topic,
:indirectly_assigned_to,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.indirectly_assigned_to.present?
+ (SiteSetting.assigns_public || scope.can_assign?(object)) &&
+ object.indirectly_assigned_to.present?
end,
) { DiscourseAssign::Helpers.build_indirectly_assigned_to(object.indirectly_assigned_to, object) }
+ add_to_serializer(
+ :topic_list_item,
+ :can_assign,
+ include_condition: -> { scope.current_user.present? },
+ ) { scope.can_assign?(object) }
+
# TopicListItem serializer
add_to_serializer(
:topic_list_item,
:indirectly_assigned_to,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.indirectly_assigned_to.present?
+ (SiteSetting.assigns_public || scope.can_assign?(object)) &&
+ object.indirectly_assigned_to.present?
end,
) { DiscourseAssign::Helpers.build_indirectly_assigned_to(object.indirectly_assigned_to, object) }
@@ -592,7 +631,7 @@ after_initialize do
:topic_list_item,
:assigned_to_user,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(User)
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assigned_to.is_a?(User)
end,
) { BasicUserSerializer.new(object.assigned_to, scope: scope, root: false).as_json }
@@ -600,7 +639,7 @@ after_initialize do
:topic_list_item,
:assigned_to_group,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(Group)
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assigned_to.is_a?(Group)
end,
) { AssignedGroupSerializer.new(object.assigned_to, scope: scope, root: false).as_json }
@@ -608,7 +647,8 @@ after_initialize do
:topic_list_item,
:assignment_status,
include_condition: -> do
- SiteSetting.enable_assign_status && (SiteSetting.assigns_public || scope.can_assign?) &&
+ SiteSetting.enable_assign_status &&
+ (SiteSetting.assigns_public || scope.can_assign?(object)) &&
object.assignment_status.present?
end,
) { object.assignment_status }
@@ -618,7 +658,7 @@ after_initialize do
:search_topic_list_item,
:assigned_to_user,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(User)
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assigned_to.is_a?(User)
end,
) { DiscourseAssign::Helpers.build_assigned_to_user(object.assigned_to, object) }
@@ -626,7 +666,7 @@ after_initialize do
:search_topic_list_item,
:assigned_to_group,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.assigned_to.is_a?(Group)
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assigned_to.is_a?(Group)
end,
) { AssignedGroupSerializer.new(object.assigned_to, scope: scope, root: false).as_json }
@@ -634,7 +674,8 @@ after_initialize do
:search_topic_list_item,
:indirectly_assigned_to,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.indirectly_assigned_to.present?
+ (SiteSetting.assigns_public || scope.can_assign?(object)) &&
+ object.indirectly_assigned_to.present?
end,
) { DiscourseAssign::Helpers.build_indirectly_assigned_to(object.indirectly_assigned_to, object) }
@@ -643,6 +684,8 @@ after_initialize do
if @user.can_assign?
assign_user = User.find_by_username(@operation[:username])
topics.each do |topic|
+ next if [email protected]_assign?(topic)
+
Assigner.new(topic, @user).assign(
assign_user,
status: @operation[:status],
@@ -654,7 +697,7 @@ after_initialize do
TopicsBulkAction.register_operation("unassign") do
if @user.can_assign?
- topics.each { |topic| Assigner.new(topic, @user).unassign if guardian.can_assign? }
+ topics.each { |topic| Assigner.new(topic, @user).unassign if guardian.can_assign?(topic) }
end
end
@@ -671,12 +714,17 @@ after_initialize do
%w[Post Topic].include?(bookmarkable_type)
end
+ add_to_class(:user_bookmark_base_serializer, :assignment_target) do
+ bookmarkable_type == "Topic" ? bookmarkable : bookmarkable.topic
+ end
+
add_to_serializer(
:user_bookmark_base,
:assigned_to_user,
include_condition: -> do
return false if !can_have_assignment?
- (SiteSetting.assigns_public || scope.can_assign?) && assigned_to.is_a?(User)
+ (SiteSetting.assigns_public || scope.can_assign?(assignment_target)) &&
+ assigned_to.is_a?(User)
end,
) do
return if !can_have_assignment?
@@ -688,7 +736,8 @@ after_initialize do
:assigned_to_group,
include_condition: -> do
return false if !can_have_assignment?
- (SiteSetting.assigns_public || scope.can_assign?) && assigned_to.is_a?(Group)
+ (SiteSetting.assigns_public || scope.can_assign?(assignment_target)) &&
+ assigned_to.is_a?(Group)
end,
) do
return if !can_have_assignment?
@@ -696,11 +745,15 @@ after_initialize do
end
# PostSerializer
+ add_to_serializer(:post, :can_assign, include_condition: -> { scope.current_user.present? }) do
+ scope.can_assign?(object)
+ end
+
add_to_serializer(
:post,
:assigned_to_user,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) &&
+ (SiteSetting.assigns_public || scope.can_assign?(object)) &&
object.assignment&.assigned_to.is_a?(User) && object.assignment.active
end,
) { BasicUserSerializer.new(object.assignment.assigned_to, scope: scope, root: false).as_json }
@@ -709,7 +762,7 @@ after_initialize do
:post,
:assigned_to_group,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) &&
+ (SiteSetting.assigns_public || scope.can_assign?(object)) &&
object.assignment&.assigned_to.is_a?(Group) && object.assignment.active
end,
) do
@@ -720,7 +773,7 @@ after_initialize do
:post,
:assignment_note,
include_condition: -> do
- (SiteSetting.assigns_public || scope.can_assign?) && object.assignment.present?
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assignment.present?
end,
) { object.assignment.note }
@@ -728,13 +781,14 @@ after_initialize do
:post,
:assignment_status,
include_condition: -> do
- SiteSetting.enable_assign_status && (SiteSetting.assigns_public || scope.can_assign?) &&
- object.assignment.present?
+ SiteSetting.enable_assign_status &&
+ (SiteSetting.assigns_public || scope.can_assign?(object)) && object.assignment.present?
end,
) { object.assignment.status }
# CurrentUser serializer
add_to_serializer(:current_user, :can_assign) { object.can_assign? }
+ add_to_serializer(:current_user, :can_assign_globally) { object.can_assign_globally? }
# FlaggedTopic serializer
add_to_serializer(
@@ -884,7 +938,7 @@ after_initialize do
end
add_filter_custom_filter("assigned") do |scope, filter_values, guardian|
- next if !guardian.can_assign? || filter_values.blank?
+ next if !guardian.can_assign_globally? || filter_values.blank?
# Handle multiple comma-separated values (user1,group1,user2)
names =
@@ -940,7 +994,7 @@ after_initialize do
end
register_modifier(:topics_filter_options) do |results, guardian|
- if guardian.can_assign?
+ if guardian.can_assign_globally?
results << {
name: "assigned:",
description: I18n.t("discourse_assign.filter.description.assigned"),
@@ -997,19 +1051,19 @@ after_initialize do
end
register_search_advanced_filter(/in:assigned/) do |posts|
- next if [email protected]_assign?
+ next if [email protected]_assign_globally?
posts.where("topics.id IN (SELECT a.topic_id FROM assignments a WHERE a.active)")
end
register_search_advanced_filter(/in:unassigned/) do |posts|
- next if [email protected]_assign?
+ next if [email protected]_assign_globally?
posts.where("topics.id NOT IN (SELECT a.topic_id FROM assignments a WHERE a.active)")
end
register_search_advanced_filter(/assigned:(.+)$/) do |posts, match|
- next if [email protected]_assign? || match.blank?
+ next if [email protected]_assign_globally? || match.blank?
if user_id = User.find_by_username(match)&.id
posts.where(<<~SQL, user_id)
topics.id IN (SELECT a.topic_id FROM assignments a WHERE a.assigned_to_id = ? AND a.assigned_to_type = 'User' AND a.active)
diff --git a/plugins/discourse-assign/spec/components/topic_query_spec.rb b/plugins/discourse-assign/spec/components/topic_query_spec.rb
index ff82c3c7355..b3578b22e8f 100644
--- a/plugins/discourse-assign/spec/components/topic_query_spec.rb
+++ b/plugins/discourse-assign/spec/components/topic_query_spec.rb
@@ -269,6 +269,21 @@ describe TopicQuery do
expect(query.topics.length).to eq(1)
expect(query.topics.first).to eq(assigned_topic)
end
+
+ it "ignores the assigned filter for scoped users" do
+ SiteSetting.assign_allowed_on_groups = ""
+ category = Fabricate(:category)
+ scoped_group = Fabricate(:group)
+ scoped_user = Fabricate(:user, groups: [scoped_group])
+ allow_group_to_assign_in_category(category, scoped_group)
+ assigned_topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: category) }
+ unassigned_topic = Fabricate(:topic)
+
+ Assigner.new(assigned_topic, scoped_user).assign(scoped_user)
+ query = TopicQuery.new(scoped_user, assigned: scoped_user.username).list_latest
+
+ expect(query.topics).to contain_exactly(assigned_topic, unassigned_topic)
+ end
end
def assign_to(topic, user, assignee)
diff --git a/plugins/discourse-assign/spec/components/topics_bulk_action_spec.rb b/plugins/discourse-assign/spec/components/topics_bulk_action_spec.rb
index acc96d059bd..9ab57e8291a 100644
--- a/plugins/discourse-assign/spec/components/topics_bulk_action_spec.rb
+++ b/plugins/discourse-assign/spec/components/topics_bulk_action_spec.rb
@@ -91,5 +91,31 @@ describe TopicsBulkAction do
expect(assigned_topics).to contain_exactly(post.topic, post1.topic, post2.topic)
end
+
+ it "category scoped users only unassign topics in allowed categories" do
+ SiteSetting.assign_allowed_on_groups = ""
+ allowed_category = Fabricate(:category)
+ other_category = Fabricate(:category)
+ post.topic.update!(category: allowed_category)
+ post1.topic.update!(category: other_category)
+ allow_group_to_assign_in_category(allowed_category, assign_allowed_group)
+ Fabricate(
+ :topic_assignment,
+ target: post.topic,
+ assigned_to: user,
+ assigned_by_user: Discourse.system_user,
+ )
+ Fabricate(
+ :topic_assignment,
+ target: post1.topic,
+ assigned_to: user,
+ assigned_by_user: Discourse.system_user,
+ )
+
+ TopicsBulkAction.new(user, [post.topic.id, post1.topic.id], type: "unassign").perform!
+
+ expect(post.topic.reload.assignment).to be_blank
+ expect(post1.topic.reload.assignment).to be_present
+ end
end
end
diff --git a/plugins/discourse-assign/spec/lib/assigner_spec.rb b/plugins/discourse-assign/spec/lib/assigner_spec.rb
index 0a662e15b1a..e6e905f0a41 100644
--- a/plugins/discourse-assign/spec/lib/assigner_spec.rb
+++ b/plugins/discourse-assign/spec/lib/assigner_spec.rb
@@ -400,6 +400,71 @@ RSpec.describe Assigner do
end
end
+ describe "category scoped assignment permissions" do
+ before { SiteSetting.assign_allowed_on_groups = "" }
+
+ it "allows group members to assign members of the same scoped group in the scoped category" do
+ category = Fabricate(:category)
+ topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: category) }
+ group = Fabricate(:group)
+ assigner = Fabricate(:user, groups: [group])
+ assignee = Fabricate(:user, groups: [group])
+ allow_group_to_assign_in_category(category, group)
+
+ result = described_class.new(topic, assigner).assign(assignee)
+
+ expect(result[:success]).to eq(true)
+ expect(topic.reload.assignment.assigned_to).to eq(assignee)
+ end
+
+ it "does not apply parent category rules to subcategories" do
+ parent_category = Fabricate(:category)
+ child_category = Fabricate(:category, parent_category: parent_category)
+ parent_topic =
+ Fabricate(:post).topic.tap { |topic| topic.update!(category: parent_category) }
+ child_topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: child_category) }
+ group = Fabricate(:group)
+ assigner = Fabricate(:user, groups: [group])
+ assignee = Fabricate(:user, groups: [group])
+ allow_group_to_assign_in_category(parent_category, group)
+
+ parent_result = described_class.new(parent_topic, assigner).assign(assignee)
+ child_result = described_class.new(child_topic, assigner).assign(assignee)
+
+ expect(parent_result[:success]).to eq(true)
+ expect(child_result).to eq(success: false, reason: :forbidden_assigner_not_allowed)
+ end
+
+ it "allows globally enabled group members to be assigned outside scoped categories" do
+ category = Fabricate(:category)
+ other_category = Fabricate(:category)
+ other_topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: other_category) }
+ group = Fabricate(:group)
+ assignee = Fabricate(:user, groups: [group])
+ allow_group_to_assign_in_category(category, group)
+
+ scoped_result = described_class.new(other_topic, admin).assign(assignee)
+ SiteSetting.assign_allowed_on_groups = group.id.to_s
+ global_result = described_class.new(other_topic, admin).assign(assignee)
+
+ expect(scoped_result).to eq(success: false, reason: :forbidden_assign_to)
+ expect(global_result[:success]).to eq(true)
+ end
+
+ it "allows the scoped group to be assigned directly in the scoped category" do
+ category = Fabricate(:category)
+ topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: category) }
+ group = Fabricate(:group)
+ assigner = Fabricate(:user, groups: [group])
+ allow_group_to_assign_in_category(category, group)
+
+ result = described_class.new(topic, assigner).assign(group)
+
+ expect(result[:success]).to eq(true)
+ expect(topic.reload.assignment.assigned_to).to eq(group)
+ end
+ end
+
it "assigns the PM to the moderator when it's included in the list of allowed users" do
pm.allowed_users << moderator
diff --git a/plugins/discourse-assign/spec/plugin_helper.rb b/plugins/discourse-assign/spec/plugin_helper.rb
new file mode 100644
index 00000000000..424ad1c549a
--- /dev/null
+++ b/plugins/discourse-assign/spec/plugin_helper.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module DiscourseAssignSpecHelpers
+ def allow_group_to_assign_in_category(category, group)
+ category.custom_fields[
+ DiscourseAssign::AssignmentPermissions::CATEGORY_ADDITIONAL_ASSIGN_ALLOWED_GROUPS
+ ] = group.id.to_s
+ category.save_custom_fields
+ end
+end
+
+RSpec.configure { |config| config.include DiscourseAssignSpecHelpers }
diff --git a/plugins/discourse-assign/spec/plugin_spec.rb b/plugins/discourse-assign/spec/plugin_spec.rb
index a27364b1833..12a33cc9ce6 100644
--- a/plugins/discourse-assign/spec/plugin_spec.rb
+++ b/plugins/discourse-assign/spec/plugin_spec.rb
@@ -34,6 +34,19 @@ RSpec.describe DiscourseAssign do
expect(assigned_option).to be_nil
end
+ it "does not add assigned filter option for scoped users" do
+ SiteSetting.assign_allowed_on_groups = ""
+ category = Fabricate(:category)
+ scoped_group = Fabricate(:group)
+ scoped_user = Fabricate(:user, groups: [scoped_group])
+ allow_group_to_assign_in_category(category, scoped_group)
+
+ options = TopicsFilter.option_info(scoped_user.guardian)
+
+ assigned_option = options.find { |option| option[:name] == "assigned:" }
+ expect(assigned_option).to be_nil
+ end
+
it "does not add assigned filter option for anonymous users" do
options = TopicsFilter.option_info(Guardian.new)
diff --git a/plugins/discourse-assign/spec/requests/assign_controller_spec.rb b/plugins/discourse-assign/spec/requests/assign_controller_spec.rb
index 03d5bd8c750..2321c0ca81e 100644
--- a/plugins/discourse-assign/spec/requests/assign_controller_spec.rb
+++ b/plugins/discourse-assign/spec/requests/assign_controller_spec.rb
@@ -116,6 +116,24 @@ RSpec.describe DiscourseAssign::AssignController do
expect(suggestions).to contain_exactly(admin.username)
end
+ it "returns target scoped groups when suggestions are requested for a scoped category" do
+ SiteSetting.assign_allowed_on_groups = ""
+ category = Fabricate(:category)
+ topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: category) }
+ scoped_group = Fabricate(:group)
+ scoped_user = Fabricate(:user, groups: [scoped_group])
+ allow_group_to_assign_in_category(category, scoped_group)
+
+ sign_in(scoped_user)
+ get "/assign/suggestions.json", params: { target_id: topic.id, target_type: "Topic" }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["assign_allowed_on_groups"]).to contain_exactly(scoped_group.name)
+ expect(response.parsed_body["assign_allowed_for_groups"]).to contain_exactly(
+ scoped_group.name,
+ )
+ end
+
def assign_user_to_post
assignee = Fabricate(:user, groups: [allowed_group])
Fabricate(:post_assignment, assigned_to: assignee, assigned_by_user: admin)
@@ -152,6 +170,34 @@ RSpec.describe DiscourseAssign::AssignController do
put "/assign/unassign.json", params: { target_id: pm_topic.id, target_type: "Topic" }
expect(response.status).to eq(404)
end
+
+ it "only allows category scoped users to unassign topics in the scoped category" do
+ SiteSetting.assign_allowed_on_groups = ""
+ allowed_category = Fabricate(:category)
+ other_category = Fabricate(:category)
+ allowed_topic =
+ Fabricate(:post).topic.tap { |topic| topic.update!(category: allowed_category) }
+ other_topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: other_category) }
+ scoped_group = Fabricate(:group)
+ scoped_user = Fabricate(:user, groups: [scoped_group])
+ allow_group_to_assign_in_category(allowed_category, scoped_group)
+ Fabricate(
+ :topic_assignment,
+ target: allowed_topic,
+ assigned_to: admin,
+ assigned_by_user: admin,
+ )
+ Fabricate(:topic_assignment, target: other_topic, assigned_to: admin, assigned_by_user: admin)
+
+ sign_in(scoped_user)
+ put "/assign/unassign.json", params: { target_id: other_topic.id, target_type: "Topic" }
+ expect(response.status).to eq(403)
+ expect(other_topic.reload.assignment).to be_present
+
+ put "/assign/unassign.json", params: { target_id: allowed_topic.id, target_type: "Topic" }
+ expect(response.status).to eq(200)
+ expect(allowed_topic.reload.assignment).to be_blank
+ end
end
describe "#assign" do
@@ -253,6 +299,39 @@ RSpec.describe DiscourseAssign::AssignController do
expect(post.topic.reload.assignment.assigned_to).to eq(assign_allowed_group)
end
+ it "only allows category scoped users to assign in the exact scoped category" do
+ SiteSetting.assign_allowed_on_groups = ""
+ parent_category = Fabricate(:category)
+ child_category = Fabricate(:category, parent_category: parent_category)
+ parent_topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: parent_category) }
+ child_topic = Fabricate(:post).topic.tap { |topic| topic.update!(category: child_category) }
+ scoped_group = Fabricate(:group)
+ scoped_user = Fabricate(:user, groups: [scoped_group])
+ assignee = Fabricate(:user, groups: [scoped_group])
+ allow_group_to_assign_in_category(parent_category, scoped_group)
+
+ sign_in(scoped_user)
+ put "/assign/assign.json",
+ params: {
+ target_id: parent_topic.id,
+ target_type: "Topic",
+ username: assignee.username,
+ }
+ expect(response.status).to eq(200)
+ expect(parent_topic.reload.assignment.assigned_to).to eq(assignee)
+
+ put "/assign/assign.json",
+ params: {
+ target_id: child_topic.id,
+ target_type: "Topic",
+ username: assignee.username,
+ }
+ expect(response.status).to eq(400)
+ expect(response.parsed_body["error"]).to eq(
+ I18n.t("discourse_assign.forbidden_assigner_not_allowed"),
+ )
+ end
+
it "fails to assign topic to the user if its already assigned to the same user" do
put "/assign/assign.json",
params: {
@@ -570,6 +649,19 @@ RSpec.describe DiscourseAssign::AssignController do
expect(response.status).to eq(403)
end
+ it "returns 403 for users who can only assign in scoped categories" do
+ SiteSetting.assign_allowed_on_groups = ""
+ category = Fabricate(:category)
+ scoped_group = Fabricate(:group)
+ scoped_user = Fabricate(:user, groups: [scoped_group])
+ allow_group_to_assign_in_category(category, scoped_group)
+
+ sign_in(scoped_user)
+
+ get "/assign/members/#{scoped_group.name}.json"
+ expect(response.status).to eq(403)
+ end
+
it "allows non-member-admin" do
non_member_admin = Fabricate(:admin)
diff --git a/plugins/discourse-assign/spec/requests/list_controller_spec.rb b/plugins/discourse-assign/spec/requests/list_controller_spec.rb
index 37a6fead0d5..fb17f385992 100644
--- a/plugins/discourse-assign/spec/requests/list_controller_spec.rb
+++ b/plugins/discourse-assign/spec/requests/list_controller_spec.rb
@@ -27,6 +27,22 @@ describe ListController do
expect(response.status).to eq(403)
end
+ it "filters requests from users who can only assign in scoped categories" do
+ SiteSetting.assign_allowed_on_groups = ""
+ category = Fabricate(:category)
+ scoped_group = Fabricate(:group, assignable_level: Group::ALIAS_LEVELS[:everyone])
+ scoped_user = Fabricate(:user, groups: [scoped_group])
+ allow_group_to_assign_in_category(category, scoped_group)
+
+ sign_in(scoped_user)
+
+ get "/topics/group-topics-assigned/#{scoped_group.name}.json"
+ expect(response.status).to eq(403)
+
+ get "/topics/messages-assigned/#{scoped_user.username_lower}.json"
+ expect(response.status).to eq(403)
+ end
+
it "as an anon user" do
get "/topics/group-topics-assigned/#{get_assigned_allowed_group_name}.json"
expect(response.status).to eq(403)
diff --git a/plugins/discourse-assign/spec/serializers/group_show_serializer_spec.rb b/plugins/discourse-assign/spec/serializers/group_show_serializer_spec.rb
index a581a54f2dc..4d1b1003dba 100644
--- a/plugins/discourse-assign/spec/serializers/group_show_serializer_spec.rb
+++ b/plugins/discourse-assign/spec/serializers/group_show_serializer_spec.rb
@@ -23,4 +23,11 @@ RSpec.describe GroupShowSerializer do
Assigner.new(topic2, user).assign(group)
expect(serializer.as_json[:group_show][:assignment_count]).to eq(2)
end
+
+ it "omits assignment count for scoped users" do
+ SiteSetting.assign_allowed_on_groups = ""
+ allow_group_to_assign_in_category(Fabricate(:category), group)
+
+ expect(serializer.as_json[:group_show]).not_to have_key(:assignment_count)
+ end
end
diff --git a/plugins/discourse-assign/test/javascripts/acceptance/assign-enabled-test.js b/plugins/discourse-assign/test/javascripts/acceptance/assign-enabled-test.js
index da170ba0569..a90f66d6fb8 100644
--- a/plugins/discourse-assign/test/javascripts/acceptance/assign-enabled-test.js
+++ b/plugins/discourse-assign/test/javascripts/acceptance/assign-enabled-test.js
@@ -1,6 +1,7 @@
import { click, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
import { cloneJSON } from "discourse/lib/object";
+import topicFixtures from "discourse/tests/fixtures/topic";
import userFixtures from "discourse/tests/fixtures/user-fixtures";
import pretender, {
parsePostData,
@@ -12,6 +13,14 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
import selectKit from "discourse/tests/helpers/select-kit-helper";
+function topicWithAssignablePosts() {
+ const topic = cloneJSON(topicFixtures["/t/280/1.json"]);
+ topic.can_assign = true;
+ topic.post_stream.posts.forEach((post) => (post.can_assign = true));
+
+ return topic;
+}
+
acceptance("Assign mobile", function (needs) {
needs.user();
needs.mobileView();
@@ -20,6 +29,13 @@ acceptance("Assign mobile", function (needs) {
});
needs.pretender((server, helper) => {
+ server.get("/t/280.json", () =>
+ helper.response(topicWithAssignablePosts())
+ );
+ server.get("/t/280/:post_number.json", () =>
+ helper.response(topicWithAssignablePosts())
+ );
+
server.get("/assign/suggestions", () => {
return helper.response({
success: true,
@@ -54,6 +70,13 @@ acceptance("Assign desktop", function (needs) {
});
needs.pretender((server, helper) => {
+ server.get("/t/280.json", () =>
+ helper.response(topicWithAssignablePosts())
+ );
+ server.get("/t/280/:post_number.json", () =>
+ helper.response(topicWithAssignablePosts())
+ );
+
server.get("/assign/suggestions", () => {
return helper.response({
success: true,
diff --git a/plugins/discourse-assign/test/javascripts/acceptance/assigns-tab-user-menu-test.js b/plugins/discourse-assign/test/javascripts/acceptance/assigns-tab-user-menu-test.js
index 30b5e7365a3..a5cda1f9c18 100644
--- a/plugins/discourse-assign/test/javascripts/acceptance/assigns-tab-user-menu-test.js
+++ b/plugins/discourse-assign/test/javascripts/acceptance/assigns-tab-user-menu-test.js
@@ -80,6 +80,7 @@ acceptance("user menu | assign_enabled setting is disabled", function (needs) {
acceptance("user menu", function (needs) {
needs.user({
can_assign: true,
+ can_assign_globally: true,
grouped_unread_notifications: {
34: 173, // assigned notification type
},
diff --git a/plugins/discourse-assign/test/javascripts/acceptance/category-test.js b/plugins/discourse-assign/test/javascripts/acceptance/category-test.js
index 1218ca7c27d..5a5d155b515 100644
--- a/plugins/discourse-assign/test/javascripts/acceptance/category-test.js
+++ b/plugins/discourse-assign/test/javascripts/acceptance/category-test.js
@@ -26,7 +26,7 @@ function stubCategory(needs, customFields) {
}
acceptance("Categories for users that can assign", function (needs) {
- needs.user({ can_assign: true });
+ needs.user({ can_assign: true, can_assign_globally: true });
needs.settings({
assign_enabled: true,
assigns_user_url_path: "/",
diff --git a/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.js b/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.js
index 48ae81016ec..541bcb9ce36 100644
--- a/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.js
+++ b/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.js
@@ -46,7 +46,7 @@ acceptance("GroupAssignments", function (needs) {
});
test("does not show the Assignments tab when group members are hidden", async function (assert) {
- updateCurrentUser({ can_assign: true });
+ updateCurrentUser({ can_assign: true, can_assign_globally: true });
canSeeMembers = false;
await visit("/g/discourse");
diff --git a/plugins/discourse-assign/test/javascripts/acceptance/search-full-test.js b/plugins/discourse-assign/test/javascripts/acceptance/search-full-test.js
index 8873eb8c99a..0b3ac7b06dd 100644
--- a/plugins/discourse-assign/test/javascripts/acceptance/search-full-test.js
+++ b/plugins/discourse-assign/test/javascripts/acceptance/search-full-test.js
@@ -5,7 +5,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
acceptance("Search - Full Page", function (needs) {
needs.settings({ assign_enabled: true });
- needs.user({ can_assign: true });
+ needs.user({ can_assign: true, can_assign_globally: true });
needs.pretender((server, helper) => {
server.get("/u/search/users", () => {
return helper.response({
diff --git a/plugins/discourse-assign/test/javascripts/acceptance/user-private-messages-assigned-test.js b/plugins/discourse-assign/test/javascripts/acceptance/user-private-messages-assigned-test.js
index a9c9a56ee14..1b9894c5223 100644
--- a/plugins/discourse-assign/test/javascripts/acceptance/user-private-messages-assigned-test.js
+++ b/plugins/discourse-assign/test/javascripts/acceptance/user-private-messages-assigned-test.js
@@ -11,6 +11,7 @@ import AssignedTopics from "../fixtures/assigned-topics-fixtures";
acceptance("User Private Messages", function (needs) {
needs.user({
can_assign: true,
+ can_assign_globally: true,
});
needs.settings({ assign_enabled: true, assigns_user_url_path: "/" });
diff --git a/plugins/discourse-assign/test/javascripts/fixtures/topic-with-assigned-posts.js b/plugins/discourse-assign/test/javascripts/fixtures/topic-with-assigned-posts.js
index 70cabf3ff11..0309f9c2cdd 100644
--- a/plugins/discourse-assign/test/javascripts/fixtures/topic-with-assigned-posts.js
+++ b/plugins/discourse-assign/test/javascripts/fixtures/topic-with-assigned-posts.js
@@ -7,6 +7,8 @@ export default function topicWithAssignedPosts() {
const firstReply = topic.post_stream.posts[1];
const secondReply = topic.post_stream.posts[2];
+ firstReply["can_assign"] = true;
+ secondReply["can_assign"] = true;
topic["indirectly_assigned_to"] = {
[firstReply.id]: {
assigned_to: {
diff --git a/plugins/discourse-assign/test/javascripts/integration/components/assignment-chooser-test.gjs b/plugins/discourse-assign/test/javascripts/integration/components/assignment-chooser-test.gjs
new file mode 100644
index 00000000000..45b914637a3
--- /dev/null
+++ b/plugins/discourse-assign/test/javascripts/integration/components/assignment-chooser-test.gjs
@@ -0,0 +1,78 @@
+import { hash } from "@ember/helper";
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import AssignmentChooser from "discourse/plugins/discourse-assign/discourse/components/assignment-chooser";
+
+module("Integration | Component | AssignmentChooser", function (hooks) {
+ setupRenderingTest(hooks);
+
+ hooks.beforeEach(function () {
+ this.set("assignmentGroups", ["category_team", "staff"]);
+ this.set("assignee", null);
+ this.set("onChange", () => {});
+ this.set("subject", selectKit(".email-group-user-chooser"));
+ });
+
+ test("includes assignment groups missing from user search", async function (assert) {
+ pretender.get("/u/search/users", () =>
+ response({
+ users: [{ username: "category_user" }],
+ groups: [],
+ })
+ );
+
+ await render(
+ <template>
+ <AssignmentChooser
+ @value={{this.assignee}}
+ @onChange={{this.onChange}}
+ @options={{hash
+ includeGroups=true
+ assignmentGroups=this.assignmentGroups
+ customSearchOptions=(hash assignableGroups=true)
+ }}
+ />
+ </template>
+ );
+
+ await this.subject.expand();
+ await this.subject.fillInFilter("category");
+
+ assert
+ .dom(".email-group-user-chooser-row[data-value='category_team']")
+ .exists("the category-scoped group is included");
+ });
+
+ test("does not duplicate groups returned by user search", async function (assert) {
+ pretender.get("/u/search/users", () =>
+ response({
+ users: [],
+ groups: [{ name: "staff", full_name: "Staff" }],
+ })
+ );
+
+ await render(
+ <template>
+ <AssignmentChooser
+ @value={{this.assignee}}
+ @onChange={{this.onChange}}
+ @options={{hash
+ includeGroups=true
+ assignmentGroups=this.assignmentGroups
+ customSearchOptions=(hash assignableGroups=true)
+ }}
+ />
+ </template>
+ );
+
+ await this.subject.expand();
+ await this.subject.fillInFilter("staff");
+
+ assert
+ .dom(".email-group-user-chooser-row[data-value='staff']")
+ .exists({ count: 1 }, "the group appears once");
+ });
+});