A platform for community discussion. Free, open, simple.
FIX: Hide `anonymous_users` and `logged_in_users` from query audiences (#43088)
Renato Atilioe272e0d5a1a2
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.jsindex 5d46ec1aef0..8be3c3b6bab 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js@@ -142,9 +142,14 @@ export default class PluginsExplorerController extends Controller {get groupOptions() {return this.groups- .filter((g) => g.id !== AUTO_GROUPS.everyone.id)- .map((g) => {- return { id: g.id, name: g.name };+ .filter(+ (group) =>+ group.id !== AUTO_GROUPS.everyone.id &&+ group.id !== AUTO_GROUPS.anonymous_users.id &&+ group.id !== AUTO_GROUPS.logged_in_users.id+ )+ .map((group) => {+ return { id: group.id, name: group.name };});}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.jsindex ca0ce0ecd4a..d04a3d1e53b 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.js+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/new.js@@ -52,7 +52,12 @@ export default class AdminPluginsExplorerNew extends Controller {}get groupOptions() {- return (this.groups ?? []).filter((g) => g.id !== AUTO_GROUPS.everyone.id);+ return (this.groups ?? []).filter(+ (group) =>+ group.id !== AUTO_GROUPS.everyone.id &&+ group.id !== AUTO_GROUPS.anonymous_users.id &&+ group.id !== AUTO_GROUPS.logged_in_users.id+ );}get viewItems() {diff --git a/plugins/discourse-data-explorer/test/javascripts/acceptance/new-query-test.js b/plugins/discourse-data-explorer/test/javascripts/acceptance/new-query-test.jsindex 8bfca977ac6..a8c906c1a26 100644--- a/plugins/discourse-data-explorer/test/javascripts/acceptance/new-query-test.js+++ b/plugins/discourse-data-explorer/test/javascripts/acceptance/new-query-test.js@@ -45,6 +45,8 @@ acceptance("New Query", function (needs) {server.get("/admin/plugins/discourse-data-explorer/groups.json", () => {return helper.response([{ id: 0, name: "everyone" },+ { id: 4, name: "anonymous_users" },+ { id: 5, name: "logged_in_users" },{ id: 41, name: "support" },]);});@@ -155,7 +157,7 @@ acceptance("New Query", function (needs) {assert.deepEqual(groups.displayedContent().map((row) => row.name),["support"],- "the everyone group is not offered"+ "groups that cannot be granted access are not offered");await groups.selectRowByValue(41);@@ -243,6 +245,8 @@ acceptance("New Query - AI", function (needs) {server.get("/admin/plugins/discourse-data-explorer/groups.json", () =>helper.response([{ id: 0, name: "everyone" },+ { id: 4, name: "anonymous_users" },+ { id: 5, name: "logged_in_users" },{ id: 41, name: "support" },]));@@ -386,6 +390,13 @@ acceptance("New Query - AI", function (needs) {const groups = selectKit(".query-new__fields .query-group-select");await groups.expand();++ assert.deepEqual(+ groups.displayedContent().map((row) => row.name),+ ["support"],+ "groups that cannot be granted access are not offered"+ );+await groups.selectRowByValue(41);await click(".query-new__save-btn");