stream settings: Rename stream_subscription_info for readability.

We rename `stream_subscription_info.hbs` and its related
variables and functions to `stream_subscription_request_info.hbs`.
So that its clear that it is used for displaying info about
requests sent for stream subscriptions.

This is a follow-up for #18957.
This commit is contained in:
m-e-l-u-h-a-n
2021-07-01 02:27:50 +05:30
committed by Tim Abbott
parent 0997eeae9e
commit 2ac5ba0bf8
5 changed files with 21 additions and 15 deletions

View File

@@ -114,7 +114,11 @@ test_ui("subscriber_pills", ({override, mock_template}) => {
return html; return html;
}); });
mock_template("subscription_settings.hbs", false, () => "subscription_settings"); mock_template("subscription_settings.hbs", false, () => "subscription_settings");
mock_template("stream_subscription_info.hbs", false, () => "stream_subscription_info"); mock_template(
"stream_subscription_request_result.hbs",
false,
() => "stream_subscription_request_result",
);
override(stream_edit, "sort_but_pin_current_user_on_top", noop); override(stream_edit, "sort_but_pin_current_user_on_top", noop);

View File

@@ -3,7 +3,7 @@ import $ from "jquery";
import render_settings_deactivation_stream_modal from "../templates/confirm_dialog/confirm_deactivate_stream.hbs"; import render_settings_deactivation_stream_modal from "../templates/confirm_dialog/confirm_deactivate_stream.hbs";
import render_unsubscribe_private_stream_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs"; import render_unsubscribe_private_stream_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs";
import render_stream_member_list_entry from "../templates/stream_member_list_entry.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_stream_subscription_request_result from "../templates/stream_subscription_request_result.hbs";
import render_subscription_settings from "../templates/subscription_settings.hbs"; import render_subscription_settings from "../templates/subscription_settings.hbs";
import render_subscription_stream_privacy_modal from "../templates/subscription_stream_privacy_modal.hbs"; import render_subscription_stream_privacy_modal from "../templates/subscription_stream_privacy_modal.hbs";
@@ -234,7 +234,7 @@ export function invite_user_to_stream(user_ids, sub, success, failure) {
}); });
} }
function show_stream_subcription_info({ function show_stream_subscription_request_result({
message, message,
add_class, add_class,
remove_class, remove_class,
@@ -242,19 +242,21 @@ function show_stream_subcription_info({
already_subscribed_users, already_subscribed_users,
ignored_deactivated_users, ignored_deactivated_users,
}) { }) {
const stream_subscription_info_elem = $(".stream_subscription_info").expectOne(); const stream_subscription_req_result_elem = $(
const html = render_stream_subscription_info({ ".stream_subscription_request_result",
).expectOne();
const html = render_stream_subscription_request_result({
message, message,
subscribed_users, subscribed_users,
already_subscribed_users, already_subscribed_users,
ignored_deactivated_users, ignored_deactivated_users,
}); });
ui.get_content_element(stream_subscription_info_elem).html(html); ui.get_content_element(stream_subscription_req_result_elem).html(html);
if (add_class) { if (add_class) {
stream_subscription_info_elem.addClass(add_class); stream_subscription_req_result_elem.addClass(add_class);
} }
if (remove_class) { if (remove_class) {
stream_subscription_info_elem.removeClass(remove_class); stream_subscription_req_result_elem.removeClass(remove_class);
} }
} }
@@ -293,7 +295,7 @@ function submit_add_subscriber_form(e) {
); );
} }
if (user_ids.size === 0) { if (user_ids.size === 0) {
show_stream_subcription_info({ show_stream_subscription_request_result({
message: $t({defaultMessage: "No user to subscribe."}), message: $t({defaultMessage: "No user to subscribe."}),
add_class: "text-error", add_class: "text-error",
remove_class: "text-success", remove_class: "text-success",
@@ -312,7 +314,7 @@ function submit_add_subscriber_form(e) {
people.get_by_email(email), people.get_by_email(email),
); );
show_stream_subcription_info({ show_stream_subscription_request_result({
add_class: "text-success", add_class: "text-success",
remove_class: "text-error", remove_class: "text-error",
subscribed_users, subscribed_users,
@@ -323,7 +325,7 @@ function submit_add_subscriber_form(e) {
function invite_failure(xhr) { function invite_failure(xhr) {
const error = JSON.parse(xhr.responseText); const error = JSON.parse(xhr.responseText);
show_stream_subcription_info({ show_stream_subscription_request_result({
message: error.msg, message: error.msg,
add_class: "text-error", add_class: "text-error",
remove_class: "text-success", remove_class: "text-success",
@@ -885,7 +887,7 @@ export function initialize() {
} else { } else {
message = $t({defaultMessage: "User is already not subscribed."}); message = $t({defaultMessage: "User is already not subscribed."});
} }
show_stream_subcription_info({ show_stream_subscription_request_result({
message, message,
add_class: "text-success", add_class: "text-success",
remove_class: "text-remove", remove_class: "text-remove",
@@ -893,7 +895,7 @@ export function initialize() {
} }
function removal_failure() { function removal_failure() {
show_stream_subcription_info({ show_stream_subscription_request_result({
message: $t({defaultMessage: "Error removing user from this stream."}), message: $t({defaultMessage: "Error removing user from this stream."}),
add_class: "text-error", add_class: "text-error",
remove_class: "text-success", remove_class: "text-success",

View File

@@ -302,7 +302,7 @@
width: 100%; width: 100%;
margin: 10px auto; margin: 10px auto;
.stream_subscription_info { .stream_subscription_request_result {
a { a {
color: inherit; color: inherit;
} }

View File

@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
</form> </form>
<div class="stream_subscription_info"></div> <div class="stream_subscription_request_result"></div>
</div> </div>
<div class="clear-float"></div> <div class="clear-float"></div>
</div> </div>