A platform for community discussion. Free, open, simple.
FIX: Id collisions in member-selector (#40576)
Jarek Radosz8c752f62629b
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjsindex 288a025e160..16af08b620b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs@@ -23,12 +23,12 @@ export default class MembersSelector extends Component {get items() {return this.chatables.filter(- (c) => !this.highlightedMemberIds.includes(c.model.id)+ (c) => !this.selectedIdentifiers.includes(c.identifier));}- get highlightedMemberIds() {- return this.args.members.map((u) => u.model.id);+ get selectedIdentifiers() {+ return this.args.members.map((member) => member.identifier);}@action@@ -57,7 +57,7 @@ export default class MembersSelector extends Component {return;}- if (this.highlightedMemberIds.includes(chatable.model.id)) {+ if (this.selectedIdentifiers.includes(chatable.identifier)) {this.unselectMember(chatable);} else {this.args.onChange?.([...this.args.members, chatable]);diff --git a/plugins/chat/test/javascripts/components/members-selector-test.gjs b/plugins/chat/test/javascripts/components/members-selector-test.gjsnew file mode 100644index 00000000000..2dbab5f8582--- /dev/null+++ b/plugins/chat/test/javascripts/components/members-selector-test.gjs@@ -0,0 +1,66 @@+import { fillIn, 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 MembersSelector from "discourse/plugins/chat/discourse/components/chat/message-creator/members-selector";+import ChatChatable from "discourse/plugins/chat/discourse/models/chat-chatable";++module("Component | MembersSelector", function (hooks) {+ setupRenderingTest(hooks);++ test("lists a group result even when a selected user shares its numeric id", async function (assert) {+ // A user and a group can have the same numeric id (different tables). The+ // selected member here is `u-42`; the searched group is `g-42`. They must+ // not be treated as the same chatable.+ pretender.get("/chat/api/chatables", () =>+ response({+ users: [],+ groups: [+ {+ identifier: "g-42",+ type: "group",+ match_quality: 1,+ model: {+ id: 42,+ name: "team",+ can_chat: true,+ chat_enabled_user_count: 3,+ },+ },+ ],+ direct_message_channels: [],+ category_channels: [],+ })+ );++ const members = [+ ChatChatable.createUser({+ id: 42,+ username: "alice",+ has_chat_enabled: true,+ }),+ ];+ const noop = () => {};++ await render(+ <template>+ <MembersSelector+ @members={{members}}+ @membersCount={{0}}+ @maxReached={{false}}+ @onChange={{noop}}+ @close={{noop}}+ @cancel={{noop}}+ />+ </template>+ );++ await fillIn(".chat-message-creator__members-input", "team");++ assert+ .dom(".chat-message-creator__list-item[data-identifier='g-42']")+ .exists(+ "the group row is listed despite the id collision with a selected user"+ );+ });+});