A platform for community discussion. Free, open, simple.
FIX: Show userGroup flair in autoGroupFlairForUser (#45426)
small-lovely-cat7866a3fe1ca6
diff --git a/frontend/discourse/app/lib/avatar-flair.js b/frontend/discourse/app/lib/avatar-flair.jsindex 1abd0f266a4..275994e765a 100644--- a/frontend/discourse/app/lib/avatar-flair.js+++ b/frontend/discourse/app/lib/avatar-flair.js@@ -1,6 +1,6 @@import { AUTO_GROUPS } from "discourse/lib/constants";-let _autoGroupFlair, _noAutoFlair;+let _autoGroupFlair, _userGroupFlair, _noAutoFlair;// All automatic groups except "everyone" (which doesn't have flair)const FLAIR_AUTO_GROUP_IDS = Object.values(AUTO_GROUPS)@@ -8,6 +8,14 @@ const FLAIR_AUTO_GROUP_IDS = Object.values(AUTO_GROUPS).map((g) => g.id);export default function autoGroupFlairForUser(site, user) {+ if (!_userGroupFlair) {+ initializeUserGroupFlair(site);+ }++ if (user.flair_group_id && _userGroupFlair[user.flair_group_id]) {+ return _userGroupFlair[user.flair_group_id];+ }+if (!_autoGroupFlair) {initializeAutoGroupFlair(site);}@@ -43,9 +51,28 @@ export default function autoGroupFlairForUser(site, user) {export function resetFlair() {_autoGroupFlair = null;+ _userGroupFlair = null;_noAutoFlair = null;}+function initializeUserGroupFlair(site) {+ _userGroupFlair = {};++ Object.values(site.groupsById || {}).forEach((group) => {+ if (+ !FLAIR_AUTO_GROUP_IDS.includes(group.id) &&+ (group.flair_url || group.flair_bg_color)+ ) {+ _userGroupFlair[group.id] = {+ flair_name: group.name.replace(/_/g, " "),+ flair_url: group.flair_url,+ flair_bg_color: group.flair_bg_color,+ flair_color: group.flair_color,+ };+ }+ });+}+function initializeAutoGroupFlair(site) {_autoGroupFlair = {};_noAutoFlair = true;diff --git a/frontend/discourse/tests/integration/ui-kit/d-user-avatar-flair-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-user-avatar-flair-test.gjsindex 6b3d824d429..4639fc25e5e 100644--- a/frontend/discourse/tests/integration/ui-kit/d-user-avatar-flair-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-user-avatar-flair-test.gjs@@ -37,6 +37,13 @@ function setupSiteGroups(that) {flair_bg_color: "CC0002",flair_color: "FFFFF2",},+ {+ id: 41,+ name: "Band Geeks",+ flair_url: "xmark",+ flair_bg_color: "123456",+ flair_color: "B0B0B0",+ },];}@@ -180,6 +187,21 @@ module("Integration | ui-kit | DUserAvatarFlair", function (hooks) {});});+ test("avatar flair resolves the selected group", async function (assert) {+ this.set("args", {+ flair_group_id: 41,+ });+ setupSiteGroups(this);++ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);++ assert.dom("svg.d-icon-xmark").exists();+ assert.dom(".avatar-flair").hasStyle({+ backgroundColor: "rgb(18, 52, 86)",+ color: "rgb(176, 176, 176)",+ });+ });+test("user-avatar-flair for user with no flairs", async function (assert) {this.set("args", {admin: false,