From 4e7f9100fc66028c61c024018babbd6876585e1f Mon Sep 17 00:00:00 2001 From: evykassirer Date: Tue, 4 Apr 2023 20:37:14 -0700 Subject: [PATCH] upload: Rename hide_upload_status to hide_upload_banner. This will be clearer naming for when there are multiple banners, but is likely a more intuitive name even for the current state of the code. --- web/src/upload.js | 6 +++--- web/tests/upload.test.js | 34 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/web/src/upload.js b/web/src/upload.js index e2bedcdb04..ca35a1a118 100644 --- a/web/src/upload.js +++ b/web/src/upload.js @@ -95,7 +95,7 @@ export function get_item(key, config) { } } -export function hide_upload_status(config) { +export function hide_upload_banner(config) { get_item("send_button", config).prop("disabled", false); get_item("upload_banner", config).remove(); } @@ -175,7 +175,7 @@ export async function upload_files(uppy, config, files) { compose_ui.autosize_textarea(get_item("textarea", config)); uppy.cancelAll(); get_item("textarea", config).trigger("focus"); - hide_upload_status(config); + hide_upload_banner(config); }); for (const file of files) { @@ -321,7 +321,7 @@ export function setup_upload(config) { // Hide upload status for 100ms after the 1s transition to 100% // so that the user can see the progress bar at 100%. setTimeout(() => { - hide_upload_status(config); + hide_upload_banner(config); }, 1100); } }); diff --git a/web/tests/upload.test.js b/web/tests/upload.test.js index 5ed97f14b2..bc1d94672e 100644 --- a/web/tests/upload.test.js +++ b/web/tests/upload.test.js @@ -163,14 +163,14 @@ test("get_item", () => { ); }); -test("hide_upload_status", () => { +test("hide_upload_banner", () => { let banner_removed = false; $("#compose_banners .upload_banner").remove = () => { banner_removed = true; }; $("#compose-send-button").prop("disabled", true); - upload.hide_upload_status({mode: "compose"}); + upload.hide_upload_banner({mode: "compose"}); assert.ok(banner_removed); assert.equal($("#compose-send-button").prop("disabled"), false); @@ -228,9 +228,9 @@ test("upload_files", async ({mock_template, override_rewire}) => { }, getFiles: () => [...files], }; - let hide_upload_status_called = false; - override_rewire(upload, "hide_upload_status", (config) => { - hide_upload_status_called = true; + let hide_upload_banner_called = false; + override_rewire(upload, "hide_upload_banner", (config) => { + hide_upload_banner_called = true; assert.equal(config.mode, "compose"); }); const config = {mode: "compose"}; @@ -311,7 +311,7 @@ test("upload_files", async ({mock_template, override_rewire}) => { assert.ok(banner_shown); assert.equal(add_file_counter, 1); - hide_upload_status_called = false; + hide_upload_banner_called = false; uppy_cancel_all_called = false; let compose_ui_replace_syntax_called = false; files = [ @@ -328,14 +328,14 @@ test("upload_files", async ({mock_template, override_rewire}) => { }); on_click_close_button_callback(); assert.ok(uppy_cancel_all_called); - assert.ok(hide_upload_status_called); + assert.ok(hide_upload_banner_called); assert.ok(compose_ui_autosize_textarea_called); assert.ok(compose_ui_replace_syntax_called); - hide_upload_status_called = false; + hide_upload_banner_called = false; compose_ui_replace_syntax_called = false; $("#compose-textarea").val("user modified text"); on_click_close_button_callback(); - assert.ok(hide_upload_status_called); + assert.ok(hide_upload_banner_called); assert.ok(compose_ui_autosize_textarea_called); assert.ok(compose_ui_replace_syntax_called); assert.equal($("#compose-textarea").val(), "user modified text"); @@ -568,9 +568,9 @@ test("uppy_events", ({override, override_rewire, mock_template}) => { set_global("setTimeout", (func) => { func(); }); - let hide_upload_status_called = false; - override_rewire(upload, "hide_upload_status", () => { - hide_upload_status_called = true; + let hide_upload_banner_called = false; + override_rewire(upload, "hide_upload_banner", () => { + hide_upload_banner_called = true; }); $("#compose_banner .upload_banner").removeClass("error"); files = [ @@ -588,16 +588,16 @@ test("uppy_events", ({override, override_rewire, mock_template}) => { }, ]; on_complete_callback(); - assert.ok(hide_upload_status_called); + assert.ok(hide_upload_banner_called); assert.equal(files.length, 0); - hide_upload_status_called = false; + hide_upload_banner_called = false; $("#compose_banners .upload_banner").addClass("error"); on_complete_callback(); - assert.ok(!hide_upload_status_called); + assert.ok(!hide_upload_banner_called); $("#compose_banners .upload_banner").removeClass("error"); - hide_upload_status_called = false; + hide_upload_banner_called = false; files = [ { id: "uppy-zulip/jpeg-1e-image/jpeg-163515-1578367331279", @@ -613,7 +613,7 @@ test("uppy_events", ({override, override_rewire, mock_template}) => { }, ]; on_complete_callback(); - assert.ok(!hide_upload_status_called); + assert.ok(!hide_upload_banner_called); assert.equal(files.length, 1); mock_template("compose_banner/upload_banner.hbs", false, (data) => {