Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

dispatch: Update collapsed messages from update_message_flags events.

Aadyot11d46e045c0de
diff --git a/web/src/server_events_dispatch.js b/web/src/server_events_dispatch.js
index ebd5630e73b..dae4c19817e 100644
--- a/web/src/server_events_dispatch.js
+++ b/web/src/server_events_dispatch.js
@@ -17,6 +17,7 @@ import * as compose_pm_pill from "./compose_pm_pill.ts";
import * as compose_recipient from "./compose_recipient.ts";
import * as compose_state from "./compose_state.ts";
import * as compose_validate from "./compose_validate.ts";
+import * as condense from "./condense.ts";
import {electron_bridge} from "./electron_bridge.ts";
import * as emoji from "./emoji.ts";
import * as emoji_frequency from "./emoji_frequency.ts";
@@ -1184,6 +1185,19 @@ export function dispatch_normal_event(event) {
new_value,
);
break;
+ case "collapsed":
+ for (const message_id of event.messages) {
+ const message = message_store.get(message_id);
+ if (message === undefined) {
+ // If we don't have the message locally, do
+ // nothing; if later we fetch it, it'll come
+ // with the correct `collapsed` state.
+ continue;
+ }
+ message.collapsed = new_value;
+ condense.update_collapsed_view(message);
+ }
+ break;
}
break;
}
diff --git a/web/tests/dispatch.test.cjs b/web/tests/dispatch.test.cjs
index 68a748208b9..606eb8531d5 100644
--- a/web/tests/dispatch.test.cjs
+++ b/web/tests/dispatch.test.cjs
@@ -43,6 +43,7 @@ mock_esm("../src/compose_validate", {
validate_and_update_send_button_status: noop,
warn_if_guest_in_dm_recipient: noop,
});
+const condense = mock_esm("../src/condense");
const message_events = mock_esm("../src/message_events", {
update_views_filtered_on_message_property: noop,
update_current_view_for_topic_visibility: noop,
@@ -1538,6 +1539,40 @@ run_test("update_message (remove star)", () => {
assert.equal(msg.starred, false);
});
+run_test("update_message (collapse)", ({override}) => {
+ const updated_messages = [];
+ override(condense, "update_collapsed_view", (message) => {
+ updated_messages.push(message);
+ });
+
+ const event = event_fixtures.update_message_flags__collapsed_add;
+ dispatch(event);
+ const msg = message_store.get(test_message.id);
+ assert.equal(msg.collapsed, true);
+ assert.deepEqual(updated_messages, [msg]);
+
+ // A cached flag that already matches doesn't mean the rendered rows
+ // do, so we re-render them regardless of the flag's previous value.
+ dispatch(event);
+ assert.deepEqual(updated_messages, [msg, msg]);
+
+ // We don't have this message locally, so there's no view to update.
+ dispatch({...event, messages: [0]});
+ assert.deepEqual(updated_messages, [msg, msg]);
+});
+
+run_test("update_message (uncollapse)", ({override}) => {
+ const updated_messages = [];
+ override(condense, "update_collapsed_view", (message) => {
+ updated_messages.push(message);
+ });
+
+ dispatch(event_fixtures.update_message_flags__collapsed_remove);
+ const msg = message_store.get(test_message.id);
+ assert.equal(msg.collapsed, false);
+ assert.deepEqual(updated_messages, [msg]);
+});
+
run_test("update_message (wrong data)", () => {
const event = {
...event_fixtures.update_message_flags__starred_add,
diff --git a/web/tests/lib/events.cjs b/web/tests/lib/events.cjs
index 497cb7ec2a1..b497ba58cd0 100644
--- a/web/tests/lib/events.cjs
+++ b/web/tests/lib/events.cjs
@@ -947,6 +947,24 @@ exports.fixtures = {
recipients: [typing_person2],
},
+ update_message_flags__collapsed_add: {
+ type: "update_message_flags",
+ op: "add",
+ operation: "add",
+ flag: "collapsed",
+ messages: [exports.test_message.id],
+ all: false,
+ },
+
+ update_message_flags__collapsed_remove: {
+ type: "update_message_flags",
+ op: "remove",
+ operation: "remove",
+ flag: "collapsed",
+ messages: [exports.test_message.id],
+ all: false,
+ },
+
update_message_flags__read: {
type: "update_message_flags",
op: "add",