From b58b1f080ec63d395a920d534c0002fbae2b8779 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 27 Feb 2021 16:22:20 -0800 Subject: [PATCH] js: Convert static/js/settings_invites.js to ES6 module. Signed-off-by: Anders Kaseorg --- .eslintrc.json | 1 - frontend_tests/node_tests/dispatch.js | 3 ++- static/js/bundles/app.js | 1 - static/js/global.d.ts | 1 - static/js/server_events_dispatch.js | 1 + static/js/settings_invites.js | 38 ++++++++++++--------------- static/js/settings_sections.js | 1 + 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f2cc3cb778..d8c891069e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -156,7 +156,6 @@ "recent_topics": false, "search_pill_widget": false, "settings": false, - "settings_invites": false, "settings_profile_fields": false, "settings_user_groups": false, "stream_list": false, diff --git a/frontend_tests/node_tests/dispatch.js b/frontend_tests/node_tests/dispatch.js index 72f3a9183e..c278c4d6f7 100644 --- a/frontend_tests/node_tests/dispatch.js +++ b/frontend_tests/node_tests/dispatch.js @@ -65,7 +65,8 @@ const settings_emoji = {__esModule: true}; rewiremock("../../static/js/settings_emoji").with(settings_emoji); const settings_exports = {__esModule: true}; rewiremock("../../static/js/settings_exports").with(settings_exports); -const settings_invites = set_global("settings_invites", {}); +const settings_invites = {__esModule: true}; +rewiremock("../../static/js/settings_invites").with(settings_invites); const settings_linkifiers = {__esModule: true}; rewiremock("../../static/js/settings_linkifiers").with(settings_linkifiers); const settings_notifications = {__esModule: true}; diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js index b8900969a5..f0bcf54d5a 100644 --- a/static/js/bundles/app.js +++ b/static/js/bundles/app.js @@ -35,7 +35,6 @@ import "../server_events"; import "../zulip"; import "../templates"; import "../dropdown_list_widget"; -import "../settings_invites"; import "../settings_user_groups"; import "../settings_profile_fields"; import "../settings"; diff --git a/static/js/global.d.ts b/static/js/global.d.ts index 5b73ab0137..7d0dcb5c8e 100644 --- a/static/js/global.d.ts +++ b/static/js/global.d.ts @@ -28,7 +28,6 @@ declare let reactions: any; declare let recent_topics: any; declare let search_pill_widget: any; declare let settings: any; -declare let settings_invites: any; declare let settings_profile_fields: any; declare let settings_user_groups: any; declare let stream_list: any; diff --git a/static/js/server_events_dispatch.js b/static/js/server_events_dispatch.js index 48ed341f08..d02412a420 100644 --- a/static/js/server_events_dispatch.js +++ b/static/js/server_events_dispatch.js @@ -27,6 +27,7 @@ import * as settings_config from "./settings_config"; import * as settings_display from "./settings_display"; import * as settings_emoji from "./settings_emoji"; import * as settings_exports from "./settings_exports"; +import * as settings_invites from "./settings_invites"; import * as settings_linkifiers from "./settings_linkifiers"; import * as settings_notifications from "./settings_notifications"; import * as settings_org from "./settings_org"; diff --git a/static/js/settings_invites.js b/static/js/settings_invites.js index a74263d8f7..fb1fb98ba4 100644 --- a/static/js/settings_invites.js +++ b/static/js/settings_invites.js @@ -1,24 +1,22 @@ -"use strict"; +import render_admin_invites_list from "../templates/admin_invites_list.hbs"; +import render_settings_revoke_invite_modal from "../templates/settings/revoke_invite_modal.hbs"; -const render_admin_invites_list = require("../templates/admin_invites_list.hbs"); -const render_settings_revoke_invite_modal = require("../templates/settings/revoke_invite_modal.hbs"); - -const channel = require("./channel"); -const ListWidget = require("./list_widget"); -const loading = require("./loading"); -const people = require("./people"); -const settings_config = require("./settings_config"); -const timerender = require("./timerender"); -const ui_report = require("./ui_report"); -const util = require("./util"); +import * as channel from "./channel"; +import * as ListWidget from "./list_widget"; +import * as loading from "./loading"; +import * as people from "./people"; +import * as settings_config from "./settings_config"; +import * as timerender from "./timerender"; +import * as ui_report from "./ui_report"; +import * as util from "./util"; const meta = { loaded: false, }; -exports.reset = function () { +export function reset() { meta.loaded = false; -}; +} function failed_listing_invites(xhr) { loading.destroy_indicator($("#admin_page_invites_loading_indicator")); @@ -121,7 +119,7 @@ function do_revoke_invite() { }); } -exports.set_up = function (initialize_event_handlers) { +export function set_up(initialize_event_handlers) { meta.loaded = true; if (typeof initialize_event_handlers === "undefined") { initialize_event_handlers = true; @@ -136,13 +134,13 @@ exports.set_up = function (initialize_event_handlers) { idempotent: true, timeout: 10 * 1000, success(data) { - exports.on_load_success(data, initialize_event_handlers); + on_load_success(data, initialize_event_handlers); }, error: failed_listing_invites, }); -}; +} -exports.on_load_success = function (invites_data, initialize_event_handlers) { +export function on_load_success(invites_data, initialize_event_handlers) { meta.loaded = true; populate_invites(invites_data); if (!initialize_event_handlers) { @@ -220,6 +218,4 @@ exports.on_load_success = function (invites_data, initialize_event_handlers) { }, }); }); -}; - -window.settings_invites = exports; +} diff --git a/static/js/settings_sections.js b/static/js/settings_sections.js index 304d7dcbd2..6320933b45 100644 --- a/static/js/settings_sections.js +++ b/static/js/settings_sections.js @@ -5,6 +5,7 @@ import * as settings_bots from "./settings_bots"; import * as settings_display from "./settings_display"; import * as settings_emoji from "./settings_emoji"; import * as settings_exports from "./settings_exports"; +import * as settings_invites from "./settings_invites"; import * as settings_linkifiers from "./settings_linkifiers"; import * as settings_muting from "./settings_muting"; import * as settings_notifications from "./settings_notifications";