osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REFACTOR: chat-msgactions (#18969)

Browse Source 
- s/chat-msg-actions/chat-message-actions
- s/chat-msgactions-hover/chat-message-actions-container
- creates dedicated css files for this component
- removes useless code
- removes grayscale
This commit is contained in:
Joffrey JAFFEUX
2022-11-10 15:08:14 +01:00
committed by GitHub
parent 8abd150c98
commit 07e1b0591f
22 changed files with 392 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/chat/test/javascripts/acceptance/chat-flagging-test.js
+4 -2
View File
@@ -53,7 +53,9 @@ acceptance("Discourse Chat - Flagging test", function (needs) {
assert.notOk(exists(".chat-live-pane .chat-message .chat-message-flagged"));
await triggerEvent(".chat-message-container", "mouseenter");
let moreButtons = selectKit(".chat-msgactions-hover .more-buttons");
const moreButtons = selectKit(
".chat-message-actions-container .more-buttons"
);
await moreButtons.expand();
const content = moreButtons.displayedContent();
@@ -85,7 +87,7 @@ acceptance("Discourse Chat - Flagging test", function (needs) {
await visit("/chat/channel/9/@hawk");
await triggerEvent(".chat-message-container", "mouseenter");
let moreButtons = selectKit(".chat-msgactions .more-buttons");
const moreButtons = selectKit(".chat-message-actions .more-buttons");
await moreButtons.expand();
const content = moreButtons.displayedContent();
plugins/chat/test/javascripts/acceptance/chat-live-pane-silenced-user-test.js
+1 -1
View File
@@ -75,7 +75,7 @@ acceptance("Discourse Chat - Chat live pane", function (needs) {
test("Textarea and message interactions are disabled when user is silenced", async function (assert) {
await visit("/chat/channel/1/cat");
assert.equal(query(".chat-composer-input").disabled, true);
assert.notOk(exists(".chat-msgactions-hover"));
assert.notOk(exists(".chat-message-actions-container"));
assert.notOk(exists(".chat-message-react-btn"));
});
});
plugins/chat/test/javascripts/acceptance/chat-live-pane-test.js
+2 -2
View File
@@ -305,11 +305,11 @@ acceptance(
const message = query(".chat-message-container");
await tap(message);
assert.ok(exists(".chat-msgactions-backdrop"));
assert.ok(exists(".chat-message-actions-backdrop"));
await tap(".collapse-area");
assert.notOk(exists(".chat-msgactions-backdrop"));
assert.notOk(exists(".chat-message-actions-backdrop"));
});
}
);
plugins/chat/test/javascripts/acceptance/chat-message-bookmarking-test.js
+4 -4
View File
@@ -46,7 +46,7 @@ acceptance("Discourse Chat | bookmarking | desktop", function (needs) {
const message = query(".chat-message-container");
await triggerEvent(message, "mouseenter");
await click(".chat-msgactions .bookmark-btn");
await click(".chat-message-actions .bookmark-btn");
assert.ok(
exists("#bookmark-reminder-modal"),
"it shows the bookmark modal"
@@ -60,7 +60,7 @@ acceptance("Discourse Chat | bookmarking | desktop", function (needs) {
"the message should be bookmarked and show the icon on the message info"
);
assert.ok(
".chat-msgactions .bookmark-btn .d-icon-discourse-bookmark-clock",
".chat-message-actions .bookmark-btn .d-icon-discourse-bookmark-clock",
"the message actions icon shows the reminder icon"
);
});
@@ -71,7 +71,7 @@ acceptance("Discourse Chat | bookmarking | desktop", function (needs) {
const message = query(".chat-message-container");
await triggerEvent(message, "mouseenter");
await click(".chat-msgactions .bookmark-btn");
await click(".chat-message-actions .bookmark-btn");
assert.ok(
exists("#bookmark-reminder-modal"),
"it shows the bookmark modal"
@@ -83,7 +83,7 @@ acceptance("Discourse Chat | bookmarking | desktop", function (needs) {
"the message should be bookmarked and show the icon on the message info"
);
assert.ok(
exists(".chat-msgactions .bookmark-btn .d-icon-bookmark"),
exists(".chat-message-actions .bookmark-btn .d-icon-bookmark"),
"the message actions icon shows the bookmark icon"
);
});
plugins/chat/test/javascripts/acceptance/chat-message-test.js
+1 -1
View File
@@ -77,7 +77,7 @@ acceptance("Discourse Chat - Chat Message", function (needs) {
await visit("/chat/channel/4/public-category");
await triggerEvent(".chat-message-container[data-id='176']", "mouseenter");
await click(".chat-msgactions-hover .react-btn");
await click(".chat-message-actions-container .react-btn");
await click(`[data-emoji="grinning"]`);
assert.deepEqual(
plugins/chat/test/javascripts/acceptance/chat-move-message-to-channel-test.js
+4 -4
View File
@@ -57,7 +57,7 @@ acceptance(
assert.ok(exists(".chat-message-container"));
const firstMessage = query(".chat-message-container");
await triggerEvent(firstMessage, "mouseenter");
const dropdown = selectKit(".chat-msgactions .more-buttons");
const dropdown = selectKit(".chat-message-actions .more-buttons");
await dropdown.expand();
await dropdown.selectRowByValue("selectMessage");
@@ -109,7 +109,7 @@ acceptance(
assert.ok(exists(".chat-message-container"));
const firstMessage = query(".chat-message-container");
await triggerEvent(firstMessage, "mouseenter");
const dropdown = selectKit(".chat-msgactions .more-buttons");
const dropdown = selectKit(".chat-message-actions .more-buttons");
await dropdown.expand();
await dropdown.selectRowByValue("selectMessage");
assert.ok(firstMessage.classList.contains("selecting-messages"));
@@ -151,7 +151,7 @@ acceptance(
assert.ok(exists(".chat-message-container"));
const firstMessage = query(".chat-message-container");
await triggerEvent(firstMessage, "mouseenter");
const dropdown = selectKit(".chat-msgactions .more-buttons");
const dropdown = selectKit(".chat-message-actions .more-buttons");
await dropdown.expand();
await dropdown.selectRowByValue("selectMessage");
@@ -168,7 +168,7 @@ acceptance(
const firstMessage = query(".chat-message-container");
await triggerEvent(firstMessage, "mouseenter");
const dropdown = selectKit(
`.chat-msgactions-hover[data-id="${firstMessage.dataset.id}"] .more-buttons`
`.chat-message-actions-container[data-id="${firstMessage.dataset.id}"] .more-buttons`
);
await dropdown.expand();
await dropdown.selectRowByValue("selectMessage");
plugins/chat/test/javascripts/acceptance/chat-quoting-test.js
+1 -1
View File
@@ -62,7 +62,7 @@ acceptance("Discourse Chat | Copying messages", function (needs) {
const firstMessage = query(".chat-message-container");
await triggerEvent(firstMessage, "mouseenter");
const dropdown = selectKit(
`.chat-msgactions-hover[data-id="${firstMessage.dataset.id}"] .more-buttons`
`.chat-message-actions-container[data-id="${firstMessage.dataset.id}"] .more-buttons`
);
await dropdown.expand();
await dropdown.selectRowByValue("selectMessage");
plugins/chat/test/javascripts/acceptance/chat-test.js
+18 -16
View File
@@ -217,7 +217,7 @@ acceptance("Discourse Chat - without unread", function (needs) {
await triggerEvent(".chat-message-container[data-id='174']", "mouseenter");
const currentUserDropdown = selectKit(
".chat-msgactions-hover[data-id='174'] .more-buttons"
".chat-message-actions-container[data-id='174'] .more-buttons"
);
await currentUserDropdown.expand();
@@ -243,7 +243,7 @@ acceptance("Discourse Chat - without unread", function (needs) {
);
const notCurrentUserDropdown = selectKit(
".chat-msgactions-hover[data-id='175'] .more-buttons"
".chat-message-actions-container[data-id='175'] .more-buttons"
);
await triggerEvent(".chat-message-container[data-id='175']", "mouseenter");
await notCurrentUserDropdown.expand();
@@ -259,12 +259,12 @@ acceptance("Discourse Chat - without unread", function (needs) {
// User created this message
assert.ok(
".chat-msgactions-hover[data-id='174'] .reply-btn",
".chat-message-actions-container[data-id='174'] .reply-btn",
"it shows the reply button"
);
const currentUserDropdown = selectKit(
".chat-msgactions-hover[data-id='174'] .more-buttons"
".chat-message-actions-container[data-id='174'] .more-buttons"
);
await currentUserDropdown.expand();
@@ -301,11 +301,11 @@ acceptance("Discourse Chat - without unread", function (needs) {
// User _didn't_ create this message
await triggerEvent(".chat-message-container[data-id='175']", "mouseenter");
assert.ok(
".chat-msgactions-hover[data-id='175'] .reply-btn",
".chat-message-actions-container[data-id='175'] .reply-btn",
"it shows the reply button"
);
const notCurrentUserDropdown = selectKit(
".chat-msgactions-hover[data-id='175'] .more-buttons"
".chat-message-actions-container[data-id='175'] .more-buttons"
);
await notCurrentUserDropdown.expand();
@@ -376,7 +376,7 @@ acceptance("Discourse Chat - without unread", function (needs) {
await click(".topic-chat-drawer-header__return-to-channels-btn");
await click(".chat-channel-row.chat-channel-9");
await triggerEvent(".chat-message-container[data-id='174']", "mouseenter");
await click(".chat-msgactions-hover[data-id='174'] .reply-btn");
await click(".chat-message-actions-container[data-id='174'] .reply-btn");
// Reply-to line is present
assert.ok(exists(".chat-composer-message-details .chat-reply"));
await click(".topic-chat-drawer-header__return-to-channels-btn");
@@ -386,7 +386,7 @@ acceptance("Discourse Chat - without unread", function (needs) {
// Now click on reply btn and cancel it on channel 7
await triggerEvent(".chat-message-container[data-id='174']", "mouseenter");
await click(".chat-msgactions-hover[data-id='174'] .reply-btn");
await click(".chat-message-actions-container[data-id='174'] .reply-btn");
await click(".cancel-message-action");
// Go back to channel 9 and check that reply-to is present
@@ -687,7 +687,7 @@ Widget.triangulate(arg: "test")
const firstMessage = query(".chat-message-container");
await triggerEvent(firstMessage, "mouseenter");
const dropdown = selectKit(
`.chat-msgactions-hover[data-id="${firstMessage.dataset.id}"] .more-buttons`
`.chat-message-actions-container[data-id="${firstMessage.dataset.id}"] .more-buttons`
);
await dropdown.expand();
await dropdown.selectRowByValue("selectMessage");
@@ -700,7 +700,9 @@ Widget.triangulate(arg: "test")
updateCurrentUser({ admin: false, moderator: false });
await visit("/chat/channel/11/another-category");
assert.notOk(
exists(".chat-message-container .chat-msgactions-hover .select-btn")
exists(
".chat-message-container .chat-message-actions-container .select-btn"
)
);
});
@@ -735,7 +737,7 @@ Widget.triangulate(arg: "test")
const message = query(".chat-message-container");
await triggerEvent(message, "mouseenter");
assert.notOk(message.querySelector(".chat-message-reaction-list"));
await click(".chat-msgactions .react-btn");
await click(".chat-message-actions .react-btn");
await click(`.chat-emoji-picker .emoji[alt="grinning"]`);
assert.ok(message.querySelector(".chat-message-reaction-list"));
@@ -831,7 +833,7 @@ Widget.triangulate(arg: "test")
assert.deepEqual(lastMessage.dataset.id, "202");
await triggerEvent(lastMessage, "mouseenter");
await click(
`.chat-msgactions-hover[data-id="${lastMessage.dataset.id}"] .react-btn`
`.chat-message-actions-container[data-id="${lastMessage.dataset.id}"] .react-btn`
);
await click(`.emoji[alt="grinning"]`);
@@ -937,7 +939,7 @@ Widget.triangulate(arg: "test")
test("changing channel resets message selection", async function (assert) {
await visit("/chat/channel/11/another-category");
await triggerEvent(".chat-message-container", "mouseenter");
const dropdown = selectKit(".chat-msgactions .more-buttons");
const dropdown = selectKit(".chat-message-actions .more-buttons");
await dropdown.expand();
await dropdown.selectRowByValue("selectMessage");
await click("#chat-copy-btn");
@@ -1631,7 +1633,7 @@ acceptance(
test("read only channels do not show the reply, react, delete, edit, restore, or rebuild options for messages", async function (assert) {
await visit("/chat/channel/5/public-category");
await triggerEvent(".chat-message-container", "mouseenter");
const dropdown = selectKit(".chat-msgactions .more-buttons");
const dropdown = selectKit(".chat-message-actions .more-buttons");
await dropdown.expand();
assert.notOk(exists(".select-kit-row[data-value='edit']"));
assert.notOk(exists(".select-kit-row[data-value='deleteMessage']"));
@@ -1684,7 +1686,7 @@ acceptance(
await visit("/chat/channel/4/public-category");
await triggerEvent(".chat-message-container", "mouseenter");
const dropdown = selectKit(".chat-msgactions .more-buttons");
const dropdown = selectKit(".chat-message-actions .more-buttons");
await dropdown.expand();
assert.notOk(exists(".select-kit-row[data-value='edit']"));
@@ -1729,7 +1731,7 @@ acceptance(
test("closed channels show the reply, react, delete, edit, restore, or rebuild options for messages", async function (assert) {
await visit("/chat/channel/4/public-category");
await triggerEvent(".chat-message-container", "mouseenter");
const dropdown = selectKit(".chat-msgactions .more-buttons");
const dropdown = selectKit(".chat-message-actions .more-buttons");
await dropdown.expand();
assert.ok(
exists(".select-kit-row[data-value='edit']"),