A platform for community discussion. Free, open, simple.
DEV: Add helper methods for site.js for group access (#42337)
Martin Brennan7ccf6d44eb2f
diff --git a/frontend/discourse/admin/components/upsert-category/security.gjs b/frontend/discourse/admin/components/upsert-category/security.gjsindex c7eef5373e4..e903cfb329c 100644--- a/frontend/discourse/admin/components/upsert-category/security.gjs+++ b/frontend/discourse/admin/components/upsert-category/security.gjs@@ -115,7 +115,7 @@ export default class UpsertCategorySecurity extends Component {const newPermissions = [...(this.permissions || []),{- group_name: this.site.groupsById[groupId]?.name,+ group_name: this.site.groupName(groupId),group_id: groupId,permission_type: this.minimumPermission,},diff --git a/frontend/discourse/app/models/site.js b/frontend/discourse/app/models/site.jsindex 0178288e4a4..9c2d7dd0fc9 100644--- a/frontend/discourse/app/models/site.js+++ b/frontend/discourse/app/models/site.js@@ -114,6 +114,16 @@ export default class Site extends RestModel {return map;}+ groupName(groupId) {+ const group = this.groupsById[groupId];+ return group ? group.name : null;+ }++ groupFullName(groupId) {+ const group = this.groupsById[groupId];+ return group ? group.full_name : null;+ }+@dependentKeyCompatget desktopView() {return !this.mobileView;diff --git a/frontend/discourse/tests/fixtures/site-fixtures.js b/frontend/discourse/tests/fixtures/site-fixtures.jsindex 196be4c5b24..cc25b97f428 100644--- a/frontend/discourse/tests/fixtures/site-fixtures.js+++ b/frontend/discourse/tests/fixtures/site-fixtures.js@@ -20,16 +20,18 @@ const siteFixtures = {leader: 4,},groups: [- { id: 0, name: "everyone" },- { id: 1, name: "admins" },- { id: 2, name: "moderators" },- { id: 3, name: "staff" },- { id: 4, name: "custom_group" },- { id: 10, name: "trust_level_0" },- { id: 11, name: "trust_level_1" },- { id: 12, name: "trust_level_2" },- { id: 13, name: "trust_level_3" },- { id: 14, name: "trust_level_4" },+ { id: 0, name: "everyone", full_name: "Everyone", automatic: true },+ { id: 1, name: "admins", full_name: "Admins", automatic: true },+ { id: 2, name: "moderators", full_name: "Moderators", automatic: true },+ { id: 3, name: "staff", full_name: "Staff", automatic: true },+ { id: 4, name: "anonymous_users", full_name: "Anonymous users", automatic: true },+ { id: 5, name: "logged_in_users", full_name: "Logged in users", automatic: true },+ { id: 10, name: "trust_level_0", full_name: "Trust Level 0", automatic: true },+ { id: 11, name: "trust_level_1", full_name: "Trust Level 1", automatic: true },+ { id: 12, name: "trust_level_2", full_name: "Trust Level 2", automatic: true },+ { id: 13, name: "trust_level_3", full_name: "Trust Level 3", automatic: true },+ { id: 14, name: "trust_level_4", full_name: "Trust Level 4", automatic: true },+ { id: 50, name: "custom_group", full_name: "Custom group", automatic: false}],filters: ["latest",diff --git a/frontend/discourse/tests/unit/models/site-test.js b/frontend/discourse/tests/unit/models/site-test.jsindex a3020ae0784..20e52b01ae7 100644--- a/frontend/discourse/tests/unit/models/site-test.js+++ b/frontend/discourse/tests/unit/models/site-test.js@@ -2,6 +2,7 @@ import { getOwner } from "@ember/owner";import { setupTest } from "ember-qunit";import { module, test } from "qunit";import { removeValuesFromArray } from "discourse/lib/array-tools";+import { AUTO_GROUPS } from "discourse/lib/constants";import Site from "discourse/models/site";import Tag from "discourse/models/tag";@@ -22,6 +23,59 @@ module("Unit | Model | site", function (hooks) {assert.present(site.trustLevels, "The instance has a list of trust levels");});+ test("groupsById", function (assert) {+ const store = getOwner(this).lookup("service:store");+ const group = { id: 42, name: "test-group", full_name: "Test group" };+ const site = store.createRecord("site", { groups: [group] });++ assert.strictEqual(+ site.groupsById[AUTO_GROUPS.admins.id],+ AUTO_GROUPS.admins,+ "includes automatic groups"+ );+ assert.strictEqual(+ site.groupsById[group.id],+ group,+ "includes groups provided by the site"+ );+ });++ test("groupName", function (assert) {+ const store = getOwner(this).lookup("service:store");+ const site = store.createRecord("site", {+ groups: [{ id: 42, name: "test-group", full_name: "Test group" }],+ });++ assert.strictEqual(+ site.groupName(42),+ "test-group",+ "returns the group's name"+ );+ assert.strictEqual(+ site.groupName(999),+ null,+ "returns null when the group is not found"+ );+ });++ test("groupFullName", function (assert) {+ const store = getOwner(this).lookup("service:store");+ const site = store.createRecord("site", {+ groups: [{ id: 42, name: "test-group", full_name: "Test group" }],+ });++ assert.strictEqual(+ site.groupFullName(42),+ "Test group",+ "returns the group's full name"+ );+ assert.strictEqual(+ site.groupFullName(999),+ null,+ "returns null when the group is not found"+ );+ });+test("create categories", function (assert) {const store = getOwner(this).lookup("service:store");const site = store.createRecord("site", {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjsindex b789d6bdfea..e0dbe4ade00 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs@@ -16,9 +16,7 @@ export default class AiLlmQuotaModal extends Component {@actionsave(data) {const quota = { ...data };- quota.group_name = this.site.groups.find(- (item) => item.id === data.group_id- )?.name;+ quota.group_name = this.site.groupName(data.group_id);quota.llm_model_id = this.args.model.id;this.args.model.addItemToCollection(quota);