Skip to content

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

FIX: show group Assignments tab based on assignable_level (#39085)

Régis HANOL026eae73527a
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjs
index 6dfb3f1f036..9bd557df199 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjs
@@ -5,7 +5,7 @@ import { i18n } from "discourse-i18n";
const GroupAssignedMenuItem = <template>
<LinkTo @route="group.assigned">
{{icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}
- ({{@group.assignment_count}})
+ {{#if @group.assignment_count}}({{@group.assignment_count}}){{/if}}
</LinkTo>
</template>;
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 a716c656db6..589dd2bc9f7 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
@@ -6,11 +6,7 @@ import GroupAssignedMenuItem from "../../components/group-assigned-menu-item";
@tagName("")
export default class AssignedTopicList extends Component {
static shouldRender(args, context) {
- return (
- context.currentUser?.can_assign &&
- args.group.can_show_assigned_tab &&
- args.group.assignment_count > 0
- );
+ return context.currentUser?.can_assign && args.group.can_show_assigned_tab;
}
<template>
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.js b/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.js
index 4a8848c958a..b367f5620c9 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/controllers/group/assigned/show.js
@@ -1,5 +1,5 @@
import { inject as controller } from "@ember/controller";
-import { action } from "@ember/object";
+import { action, computed } from "@ember/object";
import { alias } from "@ember/object/computed";
import { service } from "@ember/service";
import UserTopicsList from "discourse/controllers/user-topics-list";
@@ -17,11 +17,18 @@ export default class GroupAssignedShow extends UserTopicsList {
ascending = false;
search = "";
bulkSelectEnabled = false;
+
bulkSelectHelper = new BulkSelectHelper(this);
+
selected = [];
@alias("currentUser.staff") canBulkSelect;
+ @computed("search", "model.topics.length")
+ get hasAssignments() {
+ return this.search || !!this.model?.topics?.length;
+ }
+
_setSearchTerm(searchTerm) {
this.set("search", searchTerm);
this.refreshModel();
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjs b/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjs
index 6a8a88f8c10..e18cae40577 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjs
@@ -2,51 +2,59 @@ import { Input } from "@ember/component";
import { on } from "@ember/modifier";
import BasicTopicList from "discourse/components/basic-topic-list";
import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
+import EmptyState from "discourse/components/empty-state";
import LoadMore from "discourse/components/load-more";
import withEventValue from "discourse/helpers/with-event-value";
import { i18n } from "discourse-i18n";
export default <template>
- <div class="topic-search-div">
- <div class="inline-form full-width">
- <Input
- {{on "input" (withEventValue @controller.onChangeFilter)}}
- @value={{readonly @controller.search}}
- @type="search"
- placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
- autocomplete="off"
- class="no-blur"
- />
+ {{#if @controller.hasAssignments}}
+ <div class="topic-search-div">
+ <div class="inline-form full-width">
+ <Input
+ {{on "input" (withEventValue @controller.onChangeFilter)}}
+ @value={{readonly @controller.search}}
+ @type="search"
+ placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
+ autocomplete="off"
+ class="no-blur"
+ />
+ </div>
</div>
- </div>
- <LoadMore
- @selector=".paginated-topics-list .topic-list tr"
- @action={{@controller.loadMore}}
- class="paginated-topics-list"
- >
- <BasicTopicList
- @topicList={{@controller.model}}
- @hideCategory={{@controller.hideCategory}}
- @showPosters={{@controller.showPosters}}
- @bulkSelectEnabled={{@controller.bulkSelectEnabled}}
- @canBulkSelect={{@controller.canBulkSelect}}
- @selected={{@controller.selected}}
- @hasIncoming={{@controller.hasIncoming}}
- @incomingCount={{@controller.incomingCount}}
- @showInserted={{@controller.showInserted}}
- @tagsForUser={{@controller.tagsForUser}}
- @changeSort={{@controller.changeSort}}
- @toggleBulkSelect={{@controller.toggleBulkSelect}}
- @bulkSelectAction={{@controller.refresh}}
- @bulkSelectHelper={{@controller.bulkSelectHelper}}
- @unassign={{@controller.unassign}}
- @reassign={{@controller.reassign}}
- @onScroll={{@controller.saveScrollPosition}}
- @scrollOnLoad={{true}}
- @listContext="assigned"
- />
+ <LoadMore
+ @selector=".paginated-topics-list .topic-list tr"
+ @action={{@controller.loadMore}}
+ class="paginated-topics-list"
+ >
+ <BasicTopicList
+ @topicList={{@controller.model}}
+ @hideCategory={{@controller.hideCategory}}
+ @showPosters={{@controller.showPosters}}
+ @bulkSelectEnabled={{@controller.bulkSelectEnabled}}
+ @canBulkSelect={{@controller.canBulkSelect}}
+ @selected={{@controller.selected}}
+ @hasIncoming={{@controller.hasIncoming}}
+ @incomingCount={{@controller.incomingCount}}
+ @showInserted={{@controller.showInserted}}
+ @tagsForUser={{@controller.tagsForUser}}
+ @changeSort={{@controller.changeSort}}
+ @toggleBulkSelect={{@controller.toggleBulkSelect}}
+ @bulkSelectAction={{@controller.refresh}}
+ @bulkSelectHelper={{@controller.bulkSelectHelper}}
+ @unassign={{@controller.unassign}}
+ @reassign={{@controller.reassign}}
+ @onScroll={{@controller.saveScrollPosition}}
+ @scrollOnLoad={{true}}
+ @listContext="assigned"
+ />
- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />
- </LoadMore>
+ <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />
+ </LoadMore>
+ {{else}}
+ <EmptyState
+ @title={{i18n "discourse_assign.group_no_assignments_title"}}
+ @body={{i18n "discourse_assign.group_no_assignments_body"}}
+ />
+ {{/if}}
</template>
diff --git a/plugins/discourse-assign/config/locales/client.en.yml b/plugins/discourse-assign/config/locales/client.en.yml
index 936ad4c282a..77da61a423c 100644
--- a/plugins/discourse-assign/config/locales/client.en.yml
+++ b/plugins/discourse-assign/config/locales/client.en.yml
@@ -30,6 +30,8 @@ en:
topic_search_placeholder: "Search topics by title or post content"
sidebar_name_filter_placeholder: "Name/Username"
assigned: "Assigned"
+ group_no_assignments_title: "No assignments"
+ group_no_assignments_body: "There are currently no active assignments for this group."
group_everyone: "Everyone"
assigned_to: "Assigned to"
assigned_topic_to: "Assigned topic to <a href='%{path}'>%{username}</a>"
diff --git a/plugins/discourse-assign/config/locales/server.en.yml b/plugins/discourse-assign/config/locales/server.en.yml
index 1f2f47baa7c..2530203f66b 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 and can be assigned topics."
+ assign_allowed_on_groups: "Users in these groups are allowed to assign topics."
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."
diff --git a/plugins/discourse-assign/plugin.rb b/plugins/discourse-assign/plugin.rb
index 41f93012c9e..c031f7622e3 100644
--- a/plugins/discourse-assign/plugin.rb
+++ b/plugins/discourse-assign/plugin.rb
@@ -99,23 +99,7 @@ after_initialize do
end
add_to_class(:group, :can_show_assigned_tab?) do
- allowed_group_ids = SiteSetting.assign_allowed_on_groups.split("|")
-
- group_has_disallowed_users =
- DB.query_single(<<~SQL, allowed_group_ids: allowed_group_ids, current_group_id: self.id)[0]
- SELECT EXISTS(
- SELECT 1 FROM users
- JOIN group_users current_group_users
- ON current_group_users.user_id=users.id
- AND current_group_users.group_id = :current_group_id
- LEFT JOIN group_users allowed_group_users
- ON allowed_group_users.user_id=users.id
- AND allowed_group_users.group_id IN (:allowed_group_ids)
- WHERE allowed_group_users.user_id IS NULL
- )
- SQL
-
- !group_has_disallowed_users
+ self.assignable_level > Group::ALIAS_LEVELS[:nobody]
end
add_to_class(:guardian, :can_assign?) { user && user.can_assign? }
diff --git a/plugins/discourse-assign/spec/models/group_spec.rb b/plugins/discourse-assign/spec/models/group_spec.rb
index 8ef058f6830..831fa118f21 100644
--- a/plugins/discourse-assign/spec/models/group_spec.rb
+++ b/plugins/discourse-assign/spec/models/group_spec.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require_relative "../support/assign_allowed_group"
-
RSpec.describe Group do
let(:group) { Fabricate(:group) }
@@ -37,32 +35,26 @@ RSpec.describe Group do
end
end
- describe "includes can_show_assigned_tab? method" do
- let(:admin) { Fabricate(:admin) }
- let(:user) { Fabricate(:user) }
- let(:user1) { Fabricate(:user) }
- let(:user2) { Fabricate(:user) }
-
- include_context "with group that is allowed to assign"
-
- before do
- add_to_assign_allowed_group(user)
- add_to_assign_allowed_group(user1)
- add_to_assign_allowed_group(admin)
+ describe "#can_show_assigned_tab?" do
+ it "returns false when assignable_level is nobody" do
+ group.update!(assignable_level: Group::ALIAS_LEVELS[:nobody])
+ expect(group.can_show_assigned_tab?).to eq(false)
end
- it "gives false in can_show_assigned_tab? when all users are not in assigned_allowed_group" do
- group.add(user)
- group.add(user1)
- group.add(user2)
+ it "returns true when assignable_level is only_admins" do
+ group.update!(assignable_level: Group::ALIAS_LEVELS[:only_admins])
+ expect(group.can_show_assigned_tab?).to eq(true)
+ end
- expect(group.can_show_assigned_tab?).to eq(false)
+ it "returns true when assignable_level is everyone" do
+ group.update!(assignable_level: Group::ALIAS_LEVELS[:everyone])
+ expect(group.can_show_assigned_tab?).to eq(true)
end
- it "gives true in can_show_assigned_tab? when all users are in assigned_allowed_group" do
+ it "does not depend on group members being in assign_allowed_on_groups" do
+ user = Fabricate(:user)
+ group.update!(assignable_level: Group::ALIAS_LEVELS[:everyone])
group.add(user)
- group.add(user1)
-
expect(group.can_show_assigned_tab?).to eq(true)
end
end
diff --git a/plugins/discourse-assign/spec/requests/list_controller_spec.rb b/plugins/discourse-assign/spec/requests/list_controller_spec.rb
index 84cf50e7a37..37a6fead0d5 100644
--- a/plugins/discourse-assign/spec/requests/list_controller_spec.rb
+++ b/plugins/discourse-assign/spec/requests/list_controller_spec.rb
@@ -90,7 +90,8 @@ describe ListController do
it "returns the correct more_topics_url with a unicode group name" do
SiteSetting.unicode_usernames = true
- unicode_group = Fabricate(:group, name: "管理员")
+ unicode_group =
+ Fabricate(:group, name: "管理员", assignable_level: Group::ALIAS_LEVELS[:everyone])
unicode_group.add(user)
SiteSetting.assign_allowed_on_groups += "|#{unicode_group.id}"
diff --git a/plugins/discourse-assign/spec/system/group_assigned_spec.rb b/plugins/discourse-assign/spec/system/group_assigned_spec.rb
index b1b541562be..fff3f7c1725 100644
--- a/plugins/discourse-assign/spec/system/group_assigned_spec.rb
+++ b/plugins/discourse-assign/spec/system/group_assigned_spec.rb
@@ -2,7 +2,7 @@
RSpec.describe "Assign | Group assigned" do
fab!(:admin)
- fab!(:group)
+ fab!(:group) { Fabricate(:group, assignable_level: Group::ALIAS_LEVELS[:everyone]) }
fab!(:topic)
fab!(:post) { Fabricate(:post, topic: topic) }
@@ -15,11 +15,18 @@ RSpec.describe "Assign | Group assigned" do
group.add(admin)
SiteSetting.assign_enabled = true
SiteSetting.assign_allowed_on_groups = group.id.to_s
- Assigner.new(topic, Discourse.system_user).assign(admin)
sign_in(admin)
end
+ it "shows empty state when group has no assignments" do
+ visit "/g/#{group.name}/assigned/everyone"
+
+ expect(page).to have_css(".empty-state")
+ expect(page).to have_css(".empty-state__title")
+ end
+
it "allows to bulk select assigned topics" do
+ Assigner.new(topic, Discourse.system_user).assign(admin)
visit "/g/#{group.name}/assigned/everyone"
topic_list_header.click_bulk_select_button