From 031fab76618e33bf8727cb989a9d1d62bdf19702 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Sat, 27 Feb 2021 15:55:38 -0800
Subject: [PATCH] js: Convert static/js/stream_edit.js to ES6 module.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 .eslintrc.json                           |   1 -
 frontend_tests/node_tests/compose.js     |   3 +-
 frontend_tests/node_tests/stream_edit.js |   6 +-
 frontend_tests/node_tests/ui_init.js     |   1 -
 static/js/bundles/app.js                 |   1 -
 static/js/click_handlers.js              |   1 +
 static/js/compose.js                     |   1 +
 static/js/global.d.ts                    |   1 -
 static/js/settings_notifications.js      |   1 +
 static/js/stream_edit.js                 | 208 +++++++++++------------
 static/js/stream_ui_updates.js           |   1 +
 static/js/subs.js                        |   1 +
 static/js/ui_init.js                     |   1 +
 13 files changed, 114 insertions(+), 113 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 8b9212beb1..5bc79590d7 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -212,7 +212,6 @@
                 "settings_user_groups": false,
                 "settings_users": false,
                 "starred_messages": false,
-                "stream_edit": false,
                 "stream_list": false,
                 "stream_popover": false,
                 "StripeCheckout": false,
diff --git a/frontend_tests/node_tests/compose.js b/frontend_tests/node_tests/compose.js
index d71a3d19fc..d837b8a3ed 100644
--- a/frontend_tests/node_tests/compose.js
+++ b/frontend_tests/node_tests/compose.js
@@ -65,7 +65,8 @@ const transmit = {__esModule: true};
 rewiremock("../../static/js/transmit").with(transmit);
 const channel = {__esModule: true};
 rewiremock("../../static/js/channel").with(channel);
-const stream_edit = set_global("stream_edit", {});
+const stream_edit = {__esModule: true};
+rewiremock("../../static/js/stream_edit").with(stream_edit);
 const markdown = {__esModule: true};
 rewiremock("../../static/js/markdown").with(markdown);
 const loading = {__esModule: true};
diff --git a/frontend_tests/node_tests/stream_edit.js b/frontend_tests/node_tests/stream_edit.js
index 2774786de0..a6ea433c6d 100644
--- a/frontend_tests/node_tests/stream_edit.js
+++ b/frontend_tests/node_tests/stream_edit.js
@@ -44,7 +44,7 @@ const stream_data = zrequire("stream_data");
 const stream_pill = zrequire("stream_pill");
 const user_pill = zrequire("user_pill");
 
-stream_edit.sort_but_pin_current_user_on_top = noop;
+stream_edit.__Rewire__("sort_but_pin_current_user_on_top", noop);
 
 const jill = {
     email: "jill@zulip.com",
@@ -135,11 +135,11 @@ test_ui("subscriber_pills", () => {
     let expected_user_ids = [];
     let input_typeahead_called = false;
     let add_subscribers_request = false;
-    stream_edit.invite_user_to_stream = (user_ids, sub) => {
+    stream_edit.__Rewire__("invite_user_to_stream", (user_ids, sub) => {
         assert.equal(sub.stream_id, denmark.stream_id);
         assert.deepEqual(user_ids.sort(), expected_user_ids.sort());
         add_subscribers_request = true;
-    };
+    });
 
     input_field_stub.typeahead = (config) => {
         assert.equal(config.items, 5);
diff --git a/frontend_tests/node_tests/ui_init.js b/frontend_tests/node_tests/ui_init.js
index 0f40b6d625..344ecf4e12 100644
--- a/frontend_tests/node_tests/ui_init.js
+++ b/frontend_tests/node_tests/ui_init.js
@@ -108,7 +108,6 @@ rewiremock.enable();
 const util = zrequire("util");
 
 zrequire("hash_util");
-zrequire("stream_edit");
 zrequire("condense");
 zrequire("lightbox");
 zrequire("overlays");
diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js
index fd9281ed76..df077abca2 100644
--- a/static/js/bundles/app.js
+++ b/static/js/bundles/app.js
@@ -25,7 +25,6 @@ import "../message_list";
 import "../narrow";
 import "../reload";
 import "../compose_actions";
-import "../stream_edit";
 import "../subs";
 import "../message_edit";
 import "../condense";
diff --git a/static/js/click_handlers.js b/static/js/click_handlers.js
index 1e30fc5f5e..b4075ed503 100644
--- a/static/js/click_handlers.js
+++ b/static/js/click_handlers.js
@@ -15,6 +15,7 @@ const message_edit_history = require("./message_edit_history");
 const muting_ui = require("./muting_ui");
 const rows = require("./rows");
 const settings_panel_menu = require("./settings_panel_menu");
+const stream_edit = require("./stream_edit");
 const user_status_ui = require("./user_status_ui");
 const util = require("./util");
 
diff --git a/static/js/compose.js b/static/js/compose.js
index e813a800a8..68f2ddb485 100644
--- a/static/js/compose.js
+++ b/static/js/compose.js
@@ -23,6 +23,7 @@ import * as rtl from "./rtl";
 import * as sent_messages from "./sent_messages";
 import * as settings_config from "./settings_config";
 import * as stream_data from "./stream_data";
+import * as stream_edit from "./stream_edit";
 import * as transmit from "./transmit";
 import * as upload from "./upload";
 import * as util from "./util";
diff --git a/static/js/global.d.ts b/static/js/global.d.ts
index 47b0d40d66..d54bb3b212 100644
--- a/static/js/global.d.ts
+++ b/static/js/global.d.ts
@@ -85,7 +85,6 @@ declare let settings_toggle: any;
 declare let settings_user_groups: any;
 declare let settings_users: any;
 declare let starred_messages: any;
-declare let stream_edit: any;
 declare let stream_list: any;
 declare let stream_popover: any;
 declare let subs: any;
diff --git a/static/js/settings_notifications.js b/static/js/settings_notifications.js
index d060ef7b60..d5e3b0f5eb 100644
--- a/static/js/settings_notifications.js
+++ b/static/js/settings_notifications.js
@@ -6,6 +6,7 @@ const channel = require("./channel");
 const settings_config = require("./settings_config");
 const settings_ui = require("./settings_ui");
 const stream_data = require("./stream_data");
+const stream_edit = require("./stream_edit");
 const unread_ui = require("./unread_ui");
 
 exports.get_notifications_table_row_data = function (notify_settings) {
diff --git a/static/js/stream_edit.js b/static/js/stream_edit.js
index 26b661ebb5..850a9b0b57 100644
--- a/static/js/stream_edit.js
+++ b/static/js/stream_edit.js
@@ -1,25 +1,25 @@
-"use strict";
+import render_settings_deactivation_stream_modal from "../templates/settings/deactivation_stream_modal.hbs";
+import render_stream_member_list_entry from "../templates/stream_member_list_entry.hbs";
+import render_stream_subscription_info from "../templates/stream_subscription_info.hbs";
+import render_subscription_settings from "../templates/subscription_settings.hbs";
+import render_subscription_stream_privacy_modal from "../templates/subscription_stream_privacy_modal.hbs";
 
-const render_settings_deactivation_stream_modal = require("../templates/settings/deactivation_stream_modal.hbs");
-const render_stream_member_list_entry = require("../templates/stream_member_list_entry.hbs");
-const render_stream_subscription_info = require("../templates/stream_subscription_info.hbs");
-const render_subscription_settings = require("../templates/subscription_settings.hbs");
-const render_subscription_stream_privacy_modal = require("../templates/subscription_stream_privacy_modal.hbs");
+import * as channel from "./channel";
+import * as narrow_state from "./narrow_state";
+import * as peer_data from "./peer_data";
+import * as people from "./people";
+import * as pill_typeahead from "./pill_typeahead";
+import * as settings_config from "./settings_config";
+import * as settings_data from "./settings_data";
+import * as settings_ui from "./settings_ui";
+import * as stream_color from "./stream_color";
+import * as stream_data from "./stream_data";
+import * as stream_pill from "./stream_pill";
+import * as stream_ui_updates from "./stream_ui_updates";
+import * as user_pill from "./user_pill";
+import * as util from "./util";
 
-const channel = require("./channel");
-const narrow_state = require("./narrow_state");
-const peer_data = require("./peer_data");
-const people = require("./people");
-const pill_typeahead = require("./pill_typeahead");
-const settings_config = require("./settings_config");
-const settings_data = require("./settings_data");
-const settings_ui = require("./settings_ui");
-const stream_color = require("./stream_color");
-const stream_data = require("./stream_data");
-const stream_pill = require("./stream_pill");
-const stream_ui_updates = require("./stream_ui_updates");
-const user_pill = require("./user_pill");
-const util = require("./util");
+export let pill_widget;
 
 function setup_subscriptions_stream_hash(sub) {
     const hash = hash_util.stream_edit_uri(sub);
@@ -37,7 +37,7 @@ function compare_by_name(a, b) {
     return a.full_name.localeCompare(b.full_name);
 }
 
-exports.setup_subscriptions_tab_hash = function (tab_key_value) {
+export function setup_subscriptions_tab_hash(tab_key_value) {
     if (tab_key_value === "all-streams") {
         hashchange.update_browser_history("#streams/all");
     } else if (tab_key_value === "subscribed") {
@@ -45,17 +45,17 @@ exports.setup_subscriptions_tab_hash = function (tab_key_value) {
     } else {
         blueslip.debug("Unknown tab_key_value: " + tab_key_value);
     }
-};
+}
 
-exports.settings_for_sub = function (sub) {
+export function settings_for_sub(sub) {
     return $(
         `#subscription_overlay .subscription_settings[data-stream-id='${CSS.escape(
             sub.stream_id,
         )}']`,
     );
-};
+}
 
-exports.is_sub_settings_active = function (sub) {
+export function is_sub_settings_active(sub) {
     // This function return whether the provided given sub object is
     // currently being viewed/edited in the stream edit UI.  This is
     // used to determine whether we need to rerender the stream edit
@@ -65,13 +65,13 @@ exports.is_sub_settings_active = function (sub) {
         return true;
     }
     return false;
-};
+}
 
-exports.get_users_from_subscribers = function (subscribers) {
+export function get_users_from_subscribers(subscribers) {
     return subscribers.map((user_id) => people.get_by_user_id(user_id));
-};
+}
 
-exports.get_retention_policy_text_for_subscription_type = function (sub) {
+export function get_retention_policy_text_for_subscription_type(sub) {
     let message_retention_days = sub.message_retention_days;
     // If both this stream and the organization-level policy are to retain forever,
     // there's no need to comment on retention policies when describing the stream.
@@ -98,9 +98,9 @@ exports.get_retention_policy_text_for_subscription_type = function (sub) {
         "Messages in this stream will be automatically deleted after __retention_days__ days.",
         {retention_days: message_retention_days},
     );
-};
+}
 
-exports.get_display_text_for_realm_message_retention_setting = function () {
+export function get_display_text_for_realm_message_retention_setting() {
     const realm_message_retention_days = page_params.realm_message_retention_days;
     if (realm_message_retention_days === settings_config.retain_message_forever) {
         return i18n.t("(forever)");
@@ -108,7 +108,7 @@ exports.get_display_text_for_realm_message_retention_setting = function () {
     return i18n.t("(__message_retention_days__ days)", {
         message_retention_days: realm_message_retention_days,
     });
-};
+}
 
 function change_stream_message_retention_days_block_display_property(value) {
     if (value === "retain_for_period") {
@@ -150,22 +150,22 @@ function get_sub_for_target(target) {
     return sub;
 }
 
-exports.open_edit_panel_for_row = function (stream_row) {
+export function open_edit_panel_for_row(stream_row) {
     const sub = get_sub_for_target(stream_row);
 
     $(".stream-row.active").removeClass("active");
     subs.show_subs_pane.settings();
     $(stream_row).addClass("active");
     setup_subscriptions_stream_hash(sub);
-    exports.show_settings_for(stream_row);
-};
+    show_settings_for(stream_row);
+}
 
-exports.open_edit_panel_empty = function () {
+export function open_edit_panel_empty() {
     const tab_key = $(subs.get_active_data().tabs[0]).attr("data-tab-key");
     $(".stream-row.active").removeClass("active");
     subs.show_subs_pane.nothing_selected();
-    exports.setup_subscriptions_tab_hash(tab_key);
-};
+    setup_subscriptions_tab_hash(tab_key);
+}
 
 function format_member_list_elem(person) {
     return render_stream_member_list_entry({
@@ -184,21 +184,21 @@ function get_subscriber_list(sub_row) {
     );
 }
 
-exports.update_stream_name = function (sub, new_name) {
-    const sub_settings = exports.settings_for_sub(sub);
+export function update_stream_name(sub, new_name) {
+    const sub_settings = settings_for_sub(sub);
     sub_settings.find(".email-address").text(sub.email_address);
     sub_settings.find(".stream-name-editable").text(new_name);
-};
+}
 
-exports.update_stream_description = function (sub) {
-    const stream_settings = exports.settings_for_sub(sub);
+export function update_stream_description(sub) {
+    const stream_settings = settings_for_sub(sub);
     stream_settings.find("input.description").val(sub.description);
     stream_settings
         .find(".stream-description-editable")
         .html(util.clean_user_content_links(sub.rendered_description));
-};
+}
 
-exports.invite_user_to_stream = function (user_ids, sub, success, failure) {
+export function invite_user_to_stream(user_ids, sub, success, failure) {
     // TODO: use stream_id when backend supports it
     const stream_name = sub.name;
     return channel.post({
@@ -210,7 +210,7 @@ exports.invite_user_to_stream = function (user_ids, sub, success, failure) {
         success,
         error: failure,
     });
-};
+}
 
 function submit_add_subscriber_form(e) {
     const sub = get_sub_for_target(e.target);
@@ -220,8 +220,8 @@ function submit_add_subscriber_form(e) {
     }
 
     const stream_subscription_info_elem = $(".stream_subscription_info").expectOne();
-    let user_ids = user_pill.get_user_ids(exports.pill_widget);
-    user_ids = user_ids.concat(stream_pill.get_user_ids(exports.pill_widget));
+    let user_ids = user_pill.get_user_ids(pill_widget);
+    user_ids = user_ids.concat(stream_pill.get_user_ids(pill_widget));
     user_ids = new Set(user_ids);
 
     if (user_ids.has(page_params.user_id) && sub.subscribed) {
@@ -240,7 +240,7 @@ function submit_add_subscriber_form(e) {
     user_ids = Array.from(user_ids);
 
     function invite_success(data) {
-        exports.pill_widget.clear();
+        pill_widget.clear();
         const subscribed_users = Object.keys(data.subscribed).map((email) =>
             people.get_by_email(email),
         );
@@ -261,10 +261,10 @@ function submit_add_subscriber_form(e) {
             .removeClass("text-success");
     }
 
-    exports.invite_user_to_stream(user_ids, sub, invite_success, invite_failure);
+    invite_user_to_stream(user_ids, sub, invite_success, invite_failure);
 }
 
-exports.remove_user_from_stream = function (user_id, sub, success, failure) {
+export function remove_user_from_stream(user_id, sub, success, failure) {
     // TODO: use stream_id when backend supports it
     const stream_name = sub.name;
     return channel.del({
@@ -273,9 +273,9 @@ exports.remove_user_from_stream = function (user_id, sub, success, failure) {
         success,
         error: failure,
     });
-};
+}
 
-exports.sort_but_pin_current_user_on_top = function (users) {
+export function sort_but_pin_current_user_on_top(users) {
     if (users === undefined) {
         blueslip.error("Undefined users are passed to function sort_but_pin_current_user_on_top");
         return;
@@ -295,27 +295,27 @@ exports.sort_but_pin_current_user_on_top = function (users) {
     } else {
         users.sort(compare_function);
     }
-};
+}
 
-exports.create_item_from_text = function (text, current_items) {
+export function create_item_from_text(text, current_items) {
     const item = stream_pill.create_item_from_stream_name(text, current_items);
     if (item) {
         return item;
     }
     return user_pill.create_item_from_email(text, current_items);
-};
+}
 
-exports.get_text_from_item = function (item) {
+export function get_text_from_item(item) {
     const text = stream_pill.get_stream_name_from_item(item);
     if (text) {
         return text;
     }
     return user_pill.get_email_from_item(item);
-};
+}
 
 function show_subscription_settings(sub) {
     const stream_id = sub.stream_id;
-    const sub_settings = exports.settings_for_sub(sub);
+    const sub_settings = settings_for_sub(sub);
 
     const colorpicker = sub_settings.find(".colorpicker");
     const color = stream_data.get_color(sub.name);
@@ -328,10 +328,10 @@ function show_subscription_settings(sub) {
         )}'] .pill-container`,
     );
 
-    exports.pill_widget = input_pill.create({
+    pill_widget = input_pill.create({
         container,
-        create_item_from_text: exports.create_item_from_text,
-        get_text_from_item: exports.get_text_from_item,
+        create_item_from_text,
+        get_text_from_item,
     });
 
     if (!sub.render_subscribers) {
@@ -345,12 +345,12 @@ function show_subscription_settings(sub) {
     list.empty();
 
     const user_ids = peer_data.get_subscribers(sub.stream_id);
-    const users = exports.get_users_from_subscribers(user_ids);
-    exports.sort_but_pin_current_user_on_top(users);
+    const users = get_users_from_subscribers(user_ids);
+    sort_but_pin_current_user_on_top(users);
 
     function get_users_for_subscriber_typeahead() {
         const potential_subscribers = peer_data.potential_subscribers(stream_id);
-        return user_pill.filter_taken_users(potential_subscribers, exports.pill_widget);
+        return user_pill.filter_taken_users(potential_subscribers, pill_widget);
     }
 
     ListWidget.create(list, users, {
@@ -380,19 +380,19 @@ function show_subscription_settings(sub) {
     });
 
     const opts = {source: get_users_for_subscriber_typeahead, stream: true};
-    pill_typeahead.set_up(sub_settings.find(".input"), exports.pill_widget, opts);
+    pill_typeahead.set_up(sub_settings.find(".input"), pill_widget, opts);
 }
 
-exports.is_notification_setting = function (setting_label) {
+export function is_notification_setting(setting_label) {
     if (setting_label.includes("_notifications")) {
         return true;
     } else if (setting_label.includes("_notify")) {
         return true;
     }
     return false;
-};
+}
 
-exports.stream_settings = function (sub) {
+export function stream_settings(sub) {
     const settings_labels = settings_config.general_notifications_table_labels.stream;
     const check_realm_setting = settings_config.all_notifications().show_push_notifications_tooltip;
 
@@ -402,9 +402,9 @@ exports.stream_settings = function (sub) {
             label: settings_labels[setting],
             disabled_realm_setting: check_realm_setting[setting],
             is_disabled: check_realm_setting[setting],
-            is_notification_setting: exports.is_notification_setting(setting),
+            is_notification_setting: is_notification_setting(setting),
         };
-        if (exports.is_notification_setting(setting)) {
+        if (is_notification_setting(setting)) {
             ret.is_checked = sub[setting + "_display"] && !check_realm_setting[setting];
             ret.is_disabled = ret.is_disabled || sub.is_muted;
             return ret;
@@ -413,29 +413,29 @@ exports.stream_settings = function (sub) {
         return ret;
     });
     return settings;
-};
+}
 
-exports.show_settings_for = function (node) {
+export function show_settings_for(node) {
     const stream_id = get_stream_id(node);
     const sub = stream_data.get_sub_by_id(stream_id);
 
     stream_data.update_calculated_fields(sub);
     const html = render_subscription_settings({
         sub,
-        settings: exports.stream_settings(sub),
+        settings: stream_settings(sub),
         stream_post_policy_values: stream_data.stream_post_policy_values,
-        message_retention_text: exports.get_retention_policy_text_for_subscription_type(sub),
+        message_retention_text: get_retention_policy_text_for_subscription_type(sub),
     });
     ui.get_content_element($(".subscriptions .right .settings")).html(html);
 
-    const sub_settings = exports.settings_for_sub(sub);
+    const sub_settings = settings_for_sub(sub);
 
     $(".nothing-selected").hide();
 
     sub_settings.addClass("show");
 
     show_subscription_settings(sub);
-};
+}
 
 function stream_is_muted_changed(e) {
     const sub = get_sub_for_target(e.target);
@@ -444,7 +444,7 @@ function stream_is_muted_changed(e) {
         return;
     }
 
-    const sub_settings = exports.settings_for_sub(sub);
+    const sub_settings = settings_for_sub(sub);
     const notification_checkboxes = sub_settings.find(".sub_notification_setting");
 
     subs.set_muted(
@@ -457,7 +457,7 @@ function stream_is_muted_changed(e) {
     notification_checkboxes.find("input[type='checkbox']").prop("disabled", sub.is_muted);
 }
 
-exports.stream_setting_changed = function (e, from_notification_settings) {
+export function stream_setting_changed(e, from_notification_settings) {
     if (e.target.name === "is_muted") {
         return;
     }
@@ -471,17 +471,17 @@ exports.stream_setting_changed = function (e, from_notification_settings) {
         blueslip.error("undefined sub in stream_setting_changed()");
         return;
     }
-    if (exports.is_notification_setting(setting) && sub[setting] === null) {
+    if (is_notification_setting(setting) && sub[setting] === null) {
         if (setting === "wildcard_mentions_notify") {
             sub[setting] = page_params[setting];
         } else {
             sub[setting] = page_params["enable_stream_" + setting];
         }
     }
-    exports.set_stream_property(sub, setting, e.target.checked, status_element);
-};
+    set_stream_property(sub, setting, e.target.checked, status_element);
+}
 
-exports.bulk_set_stream_property = function (sub_data, status_element) {
+export function bulk_set_stream_property(sub_data, status_element) {
     const url = "/json/users/me/subscriptions/properties";
     const data = {subscription_data: JSON.stringify(sub_data)};
     if (!status_element) {
@@ -494,12 +494,12 @@ exports.bulk_set_stream_property = function (sub_data, status_element) {
 
     settings_ui.do_settings_change(channel.post, url, data, status_element);
     return undefined;
-};
+}
 
-exports.set_stream_property = function (sub, property, value, status_element) {
+export function set_stream_property(sub, property, value, status_element) {
     const sub_data = {stream_id: sub.stream_id, property, value};
-    exports.bulk_set_stream_property([sub_data], status_element);
-};
+    bulk_set_stream_property([sub_data], status_element);
+}
 
 function get_message_retention_days_from_sub(sub) {
     if (sub.message_retention_days === null) {
@@ -591,7 +591,7 @@ function change_stream_privacy(e) {
     });
 }
 
-exports.change_stream_name = function (e) {
+export function change_stream_name(e) {
     e.preventDefault();
     const sub_settings = $(e.target).closest(".subscription_settings");
     const stream_id = get_stream_id(e.target);
@@ -621,18 +621,18 @@ exports.change_stream_name = function (e) {
             ui_report.error(i18n.t("Error"), xhr, $(".stream_change_property_info"));
         },
     });
-};
+}
 
-exports.set_raw_description = function (target, destination) {
+export function set_raw_description(target, destination) {
     const sub = get_sub_for_target(target);
     if (!sub) {
         blueslip.error("set_raw_description() fails");
         return;
     }
     destination.text(sub.description);
-};
+}
 
-exports.change_stream_description = function (e) {
+export function change_stream_description(e) {
     e.preventDefault();
 
     const sub_settings = $(e.target).closest(".subscription_settings");
@@ -673,9 +673,9 @@ exports.change_stream_description = function (e) {
             ui_report.error(i18n.t("Error"), xhr, $(".stream_change_property_info"));
         },
     });
-};
+}
 
-exports.delete_stream = function (stream_id, alert_element, stream_row) {
+export function delete_stream(stream_id, alert_element, stream_row) {
     channel.del({
         url: "/json/streams/" + stream_id,
         error(xhr) {
@@ -685,9 +685,9 @@ exports.delete_stream = function (stream_id, alert_element, stream_row) {
             stream_row.remove();
         },
     });
-};
+}
 
-exports.initialize = function () {
+export function initialize() {
     $("#main_div").on("click", ".stream_sub_unsub_button", (e) => {
         e.preventDefault();
         e.stopPropagation();
@@ -716,7 +716,7 @@ exports.initialize = function () {
             disable_message_retention_setting:
                 !page_params.zulip_plan_is_not_limited || !page_params.is_owner,
             stream_message_retention_days: stream.message_retention_days,
-            realm_message_retention_setting: exports.get_display_text_for_realm_message_retention_setting(),
+            realm_message_retention_setting: get_display_text_for_realm_message_retention_setting(),
             upgrade_text_for_wide_organization_logo:
                 page_params.upgrade_text_for_wide_organization_logo,
             is_stream_edit: true,
@@ -758,7 +758,7 @@ exports.initialize = function () {
     $("#subscriptions_table").on(
         "change",
         ".sub_setting_checkbox .sub_setting_control",
-        exports.stream_setting_changed,
+        stream_setting_changed,
     );
 
     $("#subscriptions_table").on("keyup", ".subscriber_list_add form", (e) => {
@@ -805,7 +805,7 @@ exports.initialize = function () {
                 .removeClass("text-success");
         }
 
-        exports.remove_user_from_stream(target_user_id, sub, removal_success, removal_failure);
+        remove_user_from_stream(target_user_id, sub, removal_success, removal_failure);
     });
 
     // This handler isn't part of the normal edit interface; it's the convenient
@@ -819,7 +819,7 @@ exports.initialize = function () {
         subs.sub_or_unsub(sub, stream_row);
 
         if (!sub.subscribed) {
-            exports.open_edit_panel_for_row(stream_row);
+            open_edit_panel_for_row(stream_row);
         }
         stream_ui_updates.update_regular_sub_settings(sub);
 
@@ -855,7 +855,7 @@ exports.initialize = function () {
             return;
         }
         const row = $(".stream-row.active");
-        exports.delete_stream(stream_id, $(".stream_change_property_info"), row);
+        delete_stream(stream_id, $(".stream_change_property_info"), row);
     });
 
     $("#subscriptions_table").on("hide.bs.modal", "#deactivation_stream_modal", () => {
@@ -864,7 +864,7 @@ exports.initialize = function () {
 
     $("#subscriptions_table").on("click", ".stream-row", function (e) {
         if ($(e.target).closest(".check, .subscription_settings").length === 0) {
-            exports.open_edit_panel_for_row(this);
+            open_edit_panel_for_row(this);
         }
     });
 
@@ -872,6 +872,4 @@ exports.initialize = function () {
         const dropdown_value = e.target.value;
         change_stream_message_retention_days_block_display_property(dropdown_value);
     });
-};
-
-window.stream_edit = exports;
+}
diff --git a/static/js/stream_ui_updates.js b/static/js/stream_ui_updates.js
index 1e828036cb..ff665d8cf0 100644
--- a/static/js/stream_ui_updates.js
+++ b/static/js/stream_ui_updates.js
@@ -2,6 +2,7 @@ import render_subscription_type from "../templates/subscription_type.hbs";
 
 import * as peer_data from "./peer_data";
 import * as stream_data from "./stream_data";
+import * as stream_edit from "./stream_edit";
 
 export function initialize_disable_btn_hint_popover(
     btn_wrapper,
diff --git a/static/js/subs.js b/static/js/subs.js
index 6b6597932f..dcf05fcd97 100644
--- a/static/js/subs.js
+++ b/static/js/subs.js
@@ -17,6 +17,7 @@ const scroll_util = require("./scroll_util");
 const search_util = require("./search_util");
 const stream_create = require("./stream_create");
 const stream_data = require("./stream_data");
+const stream_edit = require("./stream_edit");
 const stream_muting = require("./stream_muting");
 const stream_ui_updates = require("./stream_ui_updates");
 const util = require("./util");
diff --git a/static/js/ui_init.js b/static/js/ui_init.js
index 7108134901..1bdc233ef5 100644
--- a/static/js/ui_init.js
+++ b/static/js/ui_init.js
@@ -29,6 +29,7 @@ const sent_messages = require("./sent_messages");
 const spoilers = require("./spoilers");
 const stream_color = require("./stream_color");
 const stream_data = require("./stream_data");
+const stream_edit = require("./stream_edit");
 const topic_list = require("./topic_list");
 const topic_zoom = require("./topic_zoom");
 const tutorial = require("./tutorial");