Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: removes silence from chat message actions (#19282)

This commit is contained in:
Joffrey JAFFEUX 2022-12-01 15:32:22 +01:00 committed by GitHub
parent b83d9fa802
commit fca6805aca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/chat/assets/javascripts/discourse/components/chat-message.js
View File

@ -213,14 +213,6 @@ export default Component.extend({
}); });
} }
if (this.showSilenceButton) {
buttons.push({
id: "silence",
name: I18n.t("chat.silence"),
icon: "microphone-slash",
});
}
if (this.showDeleteButton) { if (this.showDeleteButton) {
buttons.push({ buttons.push({
id: "deleteMessage", id: "deleteMessage",
@ -256,7 +248,6 @@ export default Component.extend({
edit: this.edit, edit: this.edit,
selectMessage: this.selectMessage, selectMessage: this.selectMessage,
flag: this.flag, flag: this.flag,
silence: this.silence,
deleteMessage: this.deleteMessage, deleteMessage: this.deleteMessage,
restore: this.restore, restore: this.restore,
rebakeMessage: this.rebakeMessage, rebakeMessage: this.rebakeMessage,
@ -393,15 +384,6 @@ export default Component.extend({
); );
}, },
@discourseComputed("message")
showSilenceButton(message) {
return (
this.currentUser?.staff &&
this.currentUser?.id !== message.user?.id &&
!message.chat_webhook_event
);
},
@discourseComputed("message") @discourseComputed("message")
canManageDeletion(message) { canManageDeletion(message) {
return this.currentUser?.id === message.user?.id return this.currentUser?.id === message.user?.id
@ -693,11 +675,6 @@ export default Component.extend({
} }
}, },
@action
silence() {
this.adminTools.showSilenceModal(EmberObject.create(this.message.user));
},
@action @action
expand() { expand() {
this.message.set("expanded", true); this.message.set("expanded", true);

20
plugins/chat/test/javascripts/acceptance/chat-test.js
View File

@ -236,21 +236,6 @@ acceptance("Discourse Chat - without unread", function (needs) {
currentUserDropdown.rowByValue("rebakeMessage").exists(), currentUserDropdown.rowByValue("rebakeMessage").exists(),
"it shows the rebake button" "it shows the rebake button"
); );
assert.notOk(
currentUserDropdown.rowByValue("silence").exists(),
"it hides the silence button"
);
const notCurrentUserDropdown = selectKit(
".chat-message-actions-container[data-id='175'] .more-buttons"
);
await triggerEvent(".chat-message-container[data-id='175']", "mouseenter");
await notCurrentUserDropdown.expand();
assert.ok(
notCurrentUserDropdown.rowByValue("silence").exists(),
"it shows the silence button"
);
}); });
test("Message controls are present and correct for permissions", async function (assert) { test("Message controls are present and correct for permissions", async function (assert) {
@ -288,11 +273,6 @@ acceptance("Discourse Chat - without unread", function (needs) {
"it hides the flag button" "it hides the flag button"
); );
assert.notOk(
currentUserDropdown.rowByValue("silence").exists(),
"it hides the silence button"
);
assert.ok( assert.ok(
currentUserDropdown.rowByValue("deleteMessage").exists(), currentUserDropdown.rowByValue("deleteMessage").exists(),
"it shows the delete button" "it shows the delete button"