paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose_validate: Explode validation_error into individual functions.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-03-27 17:24:17 -07:00
committed by Tim Abbott
parent 807a4428f6
commit 48e836f01c
2 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
web/src/compose_banner.ts
View File

@@ -1,9 +1,12 @@
import $ from "jquery";
import assert from "minimalistic-assert";
import render_compose_banner from "../templates/compose_banner/compose_banner.hbs";
import render_stream_does_not_exist_error from "../templates/compose_banner/stream_does_not_exist_error.hbs";
import {$t} from "./i18n";
import * as scroll_util from "./scroll_util";
import * as stream_data from "./stream_data";
export let scroll_to_message_banner_message_id: number | null = null;
export function set_scroll_to_message_banner_message_id(val: number | null): void {
@@ -179,3 +182,28 @@ export function show_stream_does_not_exist_error(stream_name: string): void {
// Open stream select dropdown.
$("#compose_select_recipient_widget").trigger("click");
}
export function show_stream_not_subscribed_error(stream_name: string): void {
const $banner_container = $("#compose_banners");
if ($(`#compose_banners .${CSS.escape(CLASSNAMES.user_not_subscribed)}`).length) {
return;
}
const sub = stream_data.get_sub(stream_name);
// We expect this to be a does-not-exist error if it was undefined.
assert(sub !== undefined);
const new_row_html = render_compose_banner({
banner_type: ERROR,
banner_text: $t({
defaultMessage:
"You're not subscribed to this stream. You will not be notified if other users reply to your message.",
}),
button_text: stream_data.can_toggle_subscription(sub)
? $t({defaultMessage: "Subscribe"})
: null,
classname: CLASSNAMES.user_not_subscribed,
// The message cannot be sent until the user subscribes to the stream, so
// closing the banner would be more confusing than helpful.
hide_close_button: true,
});
append_compose_banner_to_banner_list($(new_row_html), $banner_container);
}

44
web/src/compose_validate.ts
View File

@@ -1,5 +1,4 @@
import $ from "jquery";
import assert from "minimalistic-assert";
import * as resolved_topic from "../shared/src/resolved_topic";
import render_compose_banner from "../templates/compose_banner/compose_banner.hbs";
@@ -541,48 +540,12 @@ export function validate_stream_message_mentions(opts: StreamWildcardOptions): b
return true;
}
function validation_error(error_type: string, stream_name: string): boolean {
const $banner_container = $("#compose_banners");
switch (error_type) {
case "does-not-exist":
compose_banner.show_stream_does_not_exist_error(stream_name);
return false;
case "not-subscribed": {
if (
$(`#compose_banners .${CSS.escape(compose_banner.CLASSNAMES.user_not_subscribed)}`)
.length
) {
return false;
}
const sub = stream_data.get_sub(stream_name);
// We expect this to be a does-not-exist error if it was undefined.
assert(sub !== undefined);
const new_row_html = render_compose_banner({
banner_type: compose_banner.ERROR,
banner_text: $t({
defaultMessage:
"You're not subscribed to this stream. You will not be notified if other users reply to your message.",
}),
button_text: stream_data.can_toggle_subscription(sub)
? $t({defaultMessage: "Subscribe"})
: null,
classname: compose_banner.CLASSNAMES.user_not_subscribed,
// The message cannot be sent until the user subscribes to the stream, so
// closing the banner would be more confusing than helpful.
hide_close_button: true,
});
compose_banner.append_compose_banner_to_banner_list($(new_row_html), $banner_container);
return false;
}
}
return true;
}
export function validate_stream_message_address_info(stream_name: string): boolean {
if (stream_data.is_subscribed_by_name(stream_name)) {
return true;
}
return validation_error("not-subscribed", stream_name);
compose_banner.show_stream_not_subscribed_error(stream_name);
return false;
}
function validate_stream_message(scheduling_message: boolean): boolean {
@@ -615,7 +578,8 @@ function validate_stream_message(scheduling_message: boolean): boolean {
const sub = stream_data.get_sub_by_id(stream_id);
if (!sub) {
return validation_error("does-not-exist", stream_id.toString());
compose_banner.show_stream_does_not_exist_error(stream_id.toString());
return false;
}
if (!stream_data.can_post_messages_in_stream(sub)) {