mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	left_sidebar: Rename stream-list-filter for global search.
This will be more readable once we've moved the search input.
This commit is contained in:
		@@ -585,7 +585,7 @@ html_rules: list["Rule"] = [
 | 
			
		||||
            "web/templates/settings/playground_settings_admin.hbs",
 | 
			
		||||
        },
 | 
			
		||||
        "good_lines": [
 | 
			
		||||
            '<input class="stream-list-filter" type="text" placeholder="{{ _(\'Filter streams\') }}" />'
 | 
			
		||||
            '<input class="left-sidebar-search-input" type="text" placeholder="{{ _(\'Filter streams\') }}" />'
 | 
			
		||||
        ],
 | 
			
		||||
        "bad_lines": ['<input placeholder="foo">'],
 | 
			
		||||
    },
 | 
			
		||||
@@ -611,7 +611,7 @@ html_rules: list["Rule"] = [
 | 
			
		||||
        "pattern": "placeholder='[^{]",
 | 
			
		||||
        "description": "`placeholder` value should be translatable.",
 | 
			
		||||
        "good_lines": [
 | 
			
		||||
            '<input class="stream-list-filter" type="text" placeholder="{{ _(\'Filter streams\') }}" />'
 | 
			
		||||
            '<input class="left-sidebar-search-input" type="text" placeholder="{{ _(\'Filter streams\') }}" />'
 | 
			
		||||
        ],
 | 
			
		||||
        "bad_lines": ["<input placeholder='foo'>"],
 | 
			
		||||
        "exclude": {
 | 
			
		||||
 
 | 
			
		||||
@@ -301,7 +301,7 @@ async function arrow(page: Page, direction: "Up" | "Down"): Promise<void> {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
async function test_search_venice(page: Page): Promise<void> {
 | 
			
		||||
    await common.clear_and_type(page, ".stream-list-filter", "vEnI"); // Must be case insensitive.
 | 
			
		||||
    await common.clear_and_type(page, ".left-sidebar-search-input", "vEnI"); // Must be case insensitive.
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Denmark"), {hidden: true});
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Verona"), {hidden: true});
 | 
			
		||||
    await page.waitForSelector((await get_stream_li(page, "Venice")) + ".highlighted_row", {
 | 
			
		||||
@@ -309,7 +309,7 @@ async function test_search_venice(page: Page): Promise<void> {
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // Clearing list gives back all the streams in the list
 | 
			
		||||
    await common.clear_and_type(page, ".stream-list-filter", "");
 | 
			
		||||
    await common.clear_and_type(page, ".left-sidebar-search-input", "");
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Denmark"), {visible: true});
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Venice"), {visible: true});
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Verona"), {visible: true});
 | 
			
		||||
@@ -326,7 +326,7 @@ async function test_stream_search_filters_stream_list(page: Page): Promise<void>
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Verona"), {visible: true});
 | 
			
		||||
 | 
			
		||||
    // Enter the search box and test highlighted suggestion
 | 
			
		||||
    await page.click(".stream-list-filter");
 | 
			
		||||
    await page.click(".left-sidebar-search-input");
 | 
			
		||||
 | 
			
		||||
    await page.waitForSelector("#stream_filters .highlighted_row", {visible: true});
 | 
			
		||||
    // First stream in list gets highlighted on clicking search.
 | 
			
		||||
@@ -380,14 +380,14 @@ async function test_stream_search_filters_stream_list(page: Page): Promise<void>
 | 
			
		||||
    await test_search_venice(page);
 | 
			
		||||
 | 
			
		||||
    // Search for beginning of "Verona".
 | 
			
		||||
    await page.type(".stream-list-filter", "ver");
 | 
			
		||||
    await page.type(".left-sidebar-search-input", "ver");
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "core team"), {hidden: true});
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Denmark"), {hidden: true});
 | 
			
		||||
    await page.waitForSelector(await get_stream_li(page, "Venice"), {hidden: true});
 | 
			
		||||
    await page.click(await get_stream_li(page, "Verona"));
 | 
			
		||||
    await expect_verona_stream_top_topic(page);
 | 
			
		||||
    assert.strictEqual(
 | 
			
		||||
        await common.get_text_from_selector(page, ".stream-list-filter"),
 | 
			
		||||
        await common.get_text_from_selector(page, ".left-sidebar-search-input"),
 | 
			
		||||
        "",
 | 
			
		||||
        "Clicking on stream didn't clear search",
 | 
			
		||||
    );
 | 
			
		||||
 
 | 
			
		||||
@@ -237,7 +237,7 @@ class StreamSidebar {
 | 
			
		||||
export const stream_sidebar = new StreamSidebar();
 | 
			
		||||
 | 
			
		||||
function get_search_term(): string {
 | 
			
		||||
    const $search_box = $<HTMLInputElement>("input.stream-list-filter").expectOne();
 | 
			
		||||
    const $search_box = $<HTMLInputElement>("input.left-sidebar-search-input").expectOne();
 | 
			
		||||
    const search_term = $search_box.val();
 | 
			
		||||
    assert(search_term !== undefined);
 | 
			
		||||
    return search_term.trim();
 | 
			
		||||
@@ -1276,7 +1276,7 @@ export function set_event_handlers({
 | 
			
		||||
        toggle_pm_header_icon();
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    const $search_input = $(".stream-list-filter").expectOne();
 | 
			
		||||
    const $search_input = $(".left-sidebar-search-input").expectOne();
 | 
			
		||||
 | 
			
		||||
    function keydown_enter_key(): void {
 | 
			
		||||
        const row = stream_cursor.get_key();
 | 
			
		||||
@@ -1365,11 +1365,11 @@ function toggle_inactive_or_muted_channels($section_container: JQuery): void {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function searching(): boolean {
 | 
			
		||||
    return $(".stream-list-filter").expectOne().is(":focus");
 | 
			
		||||
    return $(".left-sidebar-search-input").expectOne().is(":focus");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function test_clear_search(): void {
 | 
			
		||||
    const $filter = $(".stream-list-filter").expectOne();
 | 
			
		||||
    const $filter = $(".left-sidebar-search-input").expectOne();
 | 
			
		||||
    $filter.val("");
 | 
			
		||||
    $filter.trigger("blur");
 | 
			
		||||
    update_streams_for_search();
 | 
			
		||||
@@ -1378,7 +1378,7 @@ export function test_clear_search(): void {
 | 
			
		||||
export function initiate_search(): void {
 | 
			
		||||
    popovers.hide_all();
 | 
			
		||||
 | 
			
		||||
    const $filter = $(".stream-list-filter").expectOne();
 | 
			
		||||
    const $filter = $(".left-sidebar-search-input").expectOne();
 | 
			
		||||
 | 
			
		||||
    sidebar_ui.show_left_sidebar();
 | 
			
		||||
    $filter.trigger("focus");
 | 
			
		||||
@@ -1387,7 +1387,7 @@ export function initiate_search(): void {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function clear_search(): void {
 | 
			
		||||
    const $filter = $(".stream-list-filter").expectOne();
 | 
			
		||||
    const $filter = $(".left-sidebar-search-input").expectOne();
 | 
			
		||||
    if ($filter.val() !== "") {
 | 
			
		||||
        $filter.val("");
 | 
			
		||||
        update_streams_for_search();
 | 
			
		||||
 
 | 
			
		||||
@@ -55,7 +55,7 @@
 | 
			
		||||
        <div id="streams_list" class="zoom-out">
 | 
			
		||||
            <div id="stream-search-and-add" class="zoom-in-hide">
 | 
			
		||||
                {{#> input_wrapper input_type="filter-input" custom_classes="left-sidebar-search-section" icon="search" input_button_icon="close"}}
 | 
			
		||||
                    <input type="text" class="input-element stream-list-filter home-page-input" autocomplete="off" placeholder="{{t 'Filter channels' }}" />
 | 
			
		||||
                    <input type="text" class="input-element left-sidebar-search-input home-page-input" autocomplete="off" placeholder="{{t 'Filter channels' }}" />
 | 
			
		||||
                {{/input_wrapper}}
 | 
			
		||||
                <span id="add_streams_tooltip" class="add-stream-icon-container hidden-for-spectators">
 | 
			
		||||
                    <i id="streams_inline_icon" class="add_stream_icon zulip-icon zulip-icon-square-plus" aria-hidden="true" ></i>
 | 
			
		||||
 
 | 
			
		||||
@@ -490,7 +490,7 @@ test_ui("narrowing", ({override_rewire}) => {
 | 
			
		||||
test_ui("focusout_user_filter", () => {
 | 
			
		||||
    stream_list.set_event_handlers({show_channel_feed() {}});
 | 
			
		||||
    const e = {};
 | 
			
		||||
    const click_handler = $(".stream-list-filter").get_on_handler("focusout");
 | 
			
		||||
    const click_handler = $(".left-sidebar-search-input").get_on_handler("focusout");
 | 
			
		||||
    click_handler(e);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
@@ -503,7 +503,7 @@ test_ui("focus_user_filter", () => {
 | 
			
		||||
    const e = {
 | 
			
		||||
        stopPropagation() {},
 | 
			
		||||
    };
 | 
			
		||||
    const click_handler = $(".stream-list-filter").get_on_handler("click");
 | 
			
		||||
    const click_handler = $(".left-sidebar-search-input").get_on_handler("click");
 | 
			
		||||
    click_handler(e);
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -49,7 +49,7 @@ run_test("basics", ({override, override_rewire}) => {
 | 
			
		||||
    override(popovers, "hide_all", noop);
 | 
			
		||||
    override(sidebar_ui, "show_left_sidebar", noop);
 | 
			
		||||
 | 
			
		||||
    const $input = $(".stream-list-filter");
 | 
			
		||||
    const $input = $(".left-sidebar-search-input");
 | 
			
		||||
 | 
			
		||||
    expand_sidebar();
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user