Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

stream_settings: Fix stream row switching behavior when adding subscribers. #29839

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions web/src/hash_parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,20 @@ export function is_create_new_stream_narrow(): boolean {
return window.location.hash === "#streams/new";
}

// This checks whether the user is in the stream settings menu
// and is opening the 'Subscribers' tab on the right panel.
export function is_subscribers_section_opened_for_stream(): boolean {
const hash_components = window.location.hash.slice(1).split(/\//);

if (hash_components[0] !== "streams") {
return false;
}
if (!hash_components[3]) {
return false;
}
return hash_components[3] === "subscribers";
}

export const allowed_web_public_narrows = [
"channels",
"channel",
Expand Down
7 changes: 7 additions & 0 deletions web/src/stream_settings_ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,17 @@ export function launch(section, left_side_tab, right_side_tab) {

export function switch_rows(event) {
const active_data = stream_settings_components.get_active_data();
const $add_subscriber_pill_input = $(".add_subscribers_container .input");
let $switch_row;
if (hash_parser.is_create_new_stream_narrow()) {
// Prevent switching stream rows when creating a new stream
return false;
} else if (
hash_parser.is_subscribers_section_opened_for_stream() &&
$add_subscriber_pill_input.is(":focus")
) {
// Prevent switching stream rows when adding a subscriber
return false;
} else if (!active_data.id || active_data.$row.hasClass("notdisplayed")) {
$switch_row = $("div.stream-row:not(.notdisplayed)").first();
if ($("#search_stream_name").is(":focus")) {
Expand Down
17 changes: 17 additions & 0 deletions web/tests/hash_util.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,23 @@ run_test("test_is_create_new_stream_narrow", () => {
assert.equal(hash_parser.is_create_new_stream_narrow(), false);
});

run_test("test_is_subscribers_section_opened_for_stream", () => {
window.location.hash = "#streams/1/Design/subscribers";
assert.equal(hash_parser.is_subscribers_section_opened_for_stream(), true);

window.location.hash = "#streams/99/.EC.A1.B0.EB.A6.AC.EB.B2.95.20.F0.9F.98.8E/subscribers";
assert.equal(hash_parser.is_subscribers_section_opened_for_stream(), true);

window.location.hash = "#streams/random/subscribers";
assert.equal(hash_parser.is_subscribers_section_opened_for_stream(), false);

window.location.hash = "#some/random/place/subscribers";
assert.equal(hash_parser.is_subscribers_section_opened_for_stream(), false);

window.location.hash = "#";
assert.equal(hash_parser.is_subscribers_section_opened_for_stream(), false);
});
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add a test for something more like the empty string.


run_test("test_parse_narrow", () => {
assert.deepEqual(hash_util.parse_narrow(["narrow", "stream", "99-frontend"]), [
{negated: false, operator: "stream", operand: "frontend"},
Expand Down