Skip to content

Commit 9cb6686

Browse files
Lalit3716freshpex
authored andcommitted
user_topics: Pop user_topics from page_params.
This avoids accessing the global page_params directly.
1 parent fbc0bd5 commit 9cb6686

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

web/src/ui_init.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,8 @@ export function initialize_everything() {
609609

610610
const muted_users_params = pop_fields("muted_users");
611611

612+
const user_topics_params = pop_fields("user_topics");
613+
612614
const user_status_params = pop_fields("user_status");
613615
const i18n_params = pop_fields("language_list");
614616
const user_settings_params = pop_fields("user_settings");
@@ -693,7 +695,7 @@ export function initialize_everything() {
693695
stream_data.initialize(stream_data_params);
694696
user_group_edit_members.initialize();
695697
pm_conversations.recent.initialize(pm_conversations_params);
696-
user_topics.initialize();
698+
user_topics.initialize(user_topics_params);
697699
muted_users.initialize(muted_users_params);
698700
stream_settings_ui.initialize();
699701
user_group_settings_ui.initialize();

web/src/user_topics.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import * as feedback_widget from "./feedback_widget";
99
import {FoldDict} from "./fold_dict";
1010
import {$t} from "./i18n";
1111
import * as loading from "./loading";
12-
import {page_params} from "./page_params";
1312
import * as settings_ui from "./settings_ui";
1413
import * as sub_store from "./sub_store";
1514
import * as timerender from "./timerender";
@@ -196,6 +195,6 @@ export function set_user_topics(user_topics) {
196195
}
197196
}
198197

199-
export function initialize() {
200-
set_user_topics(page_params.user_topics);
198+
export function initialize(params) {
199+
set_user_topics(params.user_topics);
201200
}

web/tests/user_topics.test.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const {all_visibility_policies} = require("../src/user_topics");
77
const {zrequire} = require("./lib/namespace");
88
const {run_test} = require("./lib/test");
99
const blueslip = require("./lib/zblueslip");
10-
const {page_params} = require("./lib/zpage_params");
1110

1211
const user_topics = zrequire("user_topics");
1312
const stream_data = zrequire("stream_data");
@@ -255,40 +254,40 @@ test("set_user_topics", () => {
255254
assert.ok(!user_topics.is_topic_unmuted(office.stream_id, "lunch"));
256255
assert.ok(!user_topics.is_topic_followed(devel.stream_id, "dinner"));
257256

258-
page_params.user_topics = [
257+
const test_user_topics_params = [
259258
{
260259
stream_id: social.stream_id,
261260
topic_name: "breakfast",
262-
last_updated: "1577836800",
261+
last_updated: 1577836800,
263262
visibility_policy: all_visibility_policies.MUTED,
264263
},
265264
{
266265
stream_id: design.stream_id,
267266
topic_name: "typography",
268-
last_updated: "1577836800",
267+
last_updated: 1577836800,
269268
visibility_policy: all_visibility_policies.MUTED,
270269
},
271270
{
272271
stream_id: 999, // BOGUS STREAM ID
273272
topic_name: "random",
274-
last_updated: "1577836800",
273+
last_updated: 1577836800,
275274
visibility_policy: all_visibility_policies.MUTED,
276275
},
277276
{
278277
stream_id: office.stream_id,
279278
topic_name: "lunch",
280-
last_updated: "1577836800",
279+
last_updated: 1577836800,
281280
visibility_policy: all_visibility_policies.UNMUTED,
282281
},
283282
{
284283
stream_id: devel.stream_id,
285284
topic_name: "dinner",
286-
last_updated: "1577836800",
285+
last_updated: 1577836800,
287286
visibility_policy: all_visibility_policies.FOLLOWED,
288287
},
289288
];
290289

291-
user_topics.initialize();
290+
user_topics.initialize({user_topics: test_user_topics_params});
292291

293292
assert.deepEqual(
294293
user_topics

0 commit comments

Comments
 (0)